Merge master into staging-next
This commit is contained in:
commit
bfd28dc574
|
@ -22,6 +22,7 @@
|
||||||
, libnsl
|
, libnsl
|
||||||
, lz4
|
, lz4
|
||||||
, minio
|
, minio
|
||||||
|
, ninja
|
||||||
, nlohmann_json
|
, nlohmann_json
|
||||||
, openssl
|
, openssl
|
||||||
, perl
|
, perl
|
||||||
|
@ -30,6 +31,7 @@
|
||||||
, rapidjson
|
, rapidjson
|
||||||
, re2
|
, re2
|
||||||
, snappy
|
, snappy
|
||||||
|
, sqlite
|
||||||
, thrift
|
, thrift
|
||||||
, tzdata
|
, tzdata
|
||||||
, utf8proc
|
, utf8proc
|
||||||
|
@ -54,26 +56,26 @@ let
|
||||||
arrow-testing = fetchFromGitHub {
|
arrow-testing = fetchFromGitHub {
|
||||||
owner = "apache";
|
owner = "apache";
|
||||||
repo = "arrow-testing";
|
repo = "arrow-testing";
|
||||||
rev = "1d8525e109a12a8c67c489eba48715a199609153";
|
rev = "634739c664433cec366b4b9a81d1e1044a8c5eda";
|
||||||
hash = "sha256-tesDW/1yRyhZtpLbPvCVEsocs6KtstYofxB5GiSMEFM=";
|
hash = "sha256-r1WVgJJsI7v485L6Qb+5i7kFO4Tvxyk1T0JBb4og6pg=";
|
||||||
};
|
};
|
||||||
|
|
||||||
parquet-testing = fetchFromGitHub {
|
parquet-testing = fetchFromGitHub {
|
||||||
owner = "apache";
|
owner = "apache";
|
||||||
repo = "parquet-testing";
|
repo = "parquet-testing";
|
||||||
rev = "d4d485956a643c693b5549e1a62d52ca61c170f1";
|
rev = "acd375eb86a81cd856476fca0f52ba6036a067ff";
|
||||||
hash = "sha256-GmOAS8gGhzDI0WzORMkWHRRUl/XBwmNen2d3VefZxxc=";
|
hash = "sha256-z/kmi+4dBO/dsVkJA4NgUoxl0pXi8RWIGvI8MGu/gcc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "arrow-cpp";
|
pname = "arrow-cpp";
|
||||||
version = "6.0.1";
|
version = "7.0.0";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url =
|
url =
|
||||||
"mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz";
|
"mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz";
|
||||||
hash = "sha256-N4az0t+VTQeLPmj5jS5a7Lqj+irM8HXXo6E8GHucUpQ=";
|
hash = "sha256-6PSbFJoV7O9OQPz6sbh8ETxrHuGGAFwWnlzfldMamd4=";
|
||||||
};
|
};
|
||||||
sourceRoot = "apache-arrow-${version}/cpp";
|
sourceRoot = "apache-arrow-${version}/cpp";
|
||||||
|
|
||||||
|
@ -85,8 +87,8 @@ stdenv.mkDerivation rec {
|
||||||
# ./cpp/thirdparty/versions.txt
|
# ./cpp/thirdparty/versions.txt
|
||||||
owner = "microsoft";
|
owner = "microsoft";
|
||||||
repo = "mimalloc";
|
repo = "mimalloc";
|
||||||
rev = "v1.7.2";
|
rev = "v1.7.3";
|
||||||
hash = "sha256-yHupYFgC8mJuLUSpuEAfwF7l6Ue4EiuO1Q4qN4T6wWc=";
|
hash = "sha256-Ca877VitpWyKmZNHavqgewk/P+tyd2xHDNVqveKh87M=";
|
||||||
};
|
};
|
||||||
|
|
||||||
ARROW_XSIMD_URL = fetchFromGitHub {
|
ARROW_XSIMD_URL = fetchFromGitHub {
|
||||||
|
@ -103,6 +105,7 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
cmake
|
cmake
|
||||||
|
ninja
|
||||||
autoconf # for vendored jemalloc
|
autoconf # for vendored jemalloc
|
||||||
flatbuffers
|
flatbuffers
|
||||||
] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
|
] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
|
||||||
|
@ -156,6 +159,10 @@ stdenv.mkDerivation rec {
|
||||||
"-DARROW_COMPUTE=ON"
|
"-DARROW_COMPUTE=ON"
|
||||||
"-DARROW_CSV=ON"
|
"-DARROW_CSV=ON"
|
||||||
"-DARROW_DATASET=ON"
|
"-DARROW_DATASET=ON"
|
||||||
|
"-DARROW_ENGINE=ON"
|
||||||
|
"-DARROW_FILESYSTEM=ON"
|
||||||
|
"-DARROW_FLIGHT_SQL=${if enableFlight then "ON" else "OFF"}"
|
||||||
|
"-DARROW_IPC=ON"
|
||||||
"-DARROW_JEMALLOC=${if enableJemalloc then "ON" else "OFF"}"
|
"-DARROW_JEMALLOC=${if enableJemalloc then "ON" else "OFF"}"
|
||||||
"-DARROW_JSON=ON"
|
"-DARROW_JSON=ON"
|
||||||
"-DARROW_PLASMA=ON"
|
"-DARROW_PLASMA=ON"
|
||||||
|
@ -201,13 +208,10 @@ stdenv.mkDerivation rec {
|
||||||
"TestMinioServer.Connect"
|
"TestMinioServer.Connect"
|
||||||
"TestS3FS.*"
|
"TestS3FS.*"
|
||||||
"TestS3FSGeneric.*"
|
"TestS3FSGeneric.*"
|
||||||
] ++ lib.optionals enableGcs [
|
|
||||||
"GcsFileSystem.FileSystemCompare"
|
|
||||||
"GcsIntegrationTest.*"
|
|
||||||
];
|
];
|
||||||
in
|
in
|
||||||
lib.optionalString doInstallCheck "-${builtins.concatStringsSep ":" filteredTests}";
|
lib.optionalString doInstallCheck "-${builtins.concatStringsSep ":" filteredTests}";
|
||||||
installCheckInputs = [ perl which ] ++ lib.optional enableS3 minio;
|
installCheckInputs = [ perl which sqlite ] ++ lib.optional enableS3 minio;
|
||||||
installCheckPhase =
|
installCheckPhase =
|
||||||
let
|
let
|
||||||
excludedTests = lib.optionals stdenv.isDarwin [
|
excludedTests = lib.optionals stdenv.isDarwin [
|
||||||
|
@ -215,7 +219,7 @@ stdenv.mkDerivation rec {
|
||||||
# path on Darwin. See https://github.com/NixOS/nix/pull/1085
|
# path on Darwin. See https://github.com/NixOS/nix/pull/1085
|
||||||
"plasma-external-store-tests"
|
"plasma-external-store-tests"
|
||||||
"plasma-client-tests"
|
"plasma-client-tests"
|
||||||
];
|
] ++ [ "arrow-gcsfs-test" ];
|
||||||
in
|
in
|
||||||
''
|
''
|
||||||
runHook preInstallCheck
|
runHook preInstallCheck
|
||||||
|
|
|
@ -29,6 +29,7 @@
|
||||||
, pytest-xdist
|
, pytest-xdist
|
||||||
, pytestCheckHook
|
, pytestCheckHook
|
||||||
, python
|
, python
|
||||||
|
, pythonAtLeast
|
||||||
, python-dateutil
|
, python-dateutil
|
||||||
, pytz
|
, pytz
|
||||||
, pyyaml
|
, pyyaml
|
||||||
|
@ -43,6 +44,7 @@
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "apache-beam";
|
pname = "apache-beam";
|
||||||
version = "2.35.0";
|
version = "2.35.0";
|
||||||
|
disabled = pythonAtLeast "3.10";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "apache";
|
owner = "apache";
|
||||||
|
@ -60,7 +62,8 @@ buildPythonPackage rec {
|
||||||
# See https://github.com/NixOS/nixpkgs/issues/156957.
|
# See https://github.com/NixOS/nixpkgs/issues/156957.
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
substituteInPlace setup.py \
|
substituteInPlace setup.py \
|
||||||
--replace "typing-extensions>=3.7.0,<4" "typing-extensions"
|
--replace "typing-extensions>=3.7.0,<4" "typing-extensions" \
|
||||||
|
--replace "pyarrow>=0.15.1,<7.0.0" "pyarrow"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
sourceRoot = "source/sdks/python";
|
sourceRoot = "source/sdks/python";
|
||||||
|
|
|
@ -1,37 +1,60 @@
|
||||||
{ lib
|
{ lib
|
||||||
, buildPythonPackage
|
, buildPythonPackage
|
||||||
, fetchPypi
|
, fetchFromGitHub
|
||||||
, pythonOlder
|
, pythonOlder
|
||||||
, pytest
|
, pytestCheckHook
|
||||||
, numpy
|
|
||||||
, nbconvert
|
|
||||||
, pandas
|
|
||||||
, mock
|
|
||||||
, jinja2
|
|
||||||
, branca
|
, branca
|
||||||
|
, jinja2
|
||||||
|
, nbconvert
|
||||||
|
, numpy
|
||||||
|
, pandas
|
||||||
|
, pillow
|
||||||
, requests
|
, requests
|
||||||
|
, selenium
|
||||||
|
, setuptools-scm
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "folium";
|
pname = "folium";
|
||||||
version = "0.12.1.post1";
|
version = "0.12.1.post1";
|
||||||
|
|
||||||
src = fetchPypi {
|
|
||||||
inherit pname version;
|
|
||||||
sha256 = "e91e57d8298f3ccf4cce3c5e065bea6eb17033e3c5432b8a22214009c266b2ab";
|
|
||||||
};
|
|
||||||
|
|
||||||
disabled = pythonOlder "3.5";
|
disabled = pythonOlder "3.5";
|
||||||
|
|
||||||
checkInputs = [ pytest nbconvert pandas mock ];
|
src = fetchFromGitHub {
|
||||||
propagatedBuildInputs = [ jinja2 branca requests numpy ];
|
owner = "python-visualization";
|
||||||
|
repo = "folium";
|
||||||
|
rev = "v${version}";
|
||||||
|
sha256 = "sha256-4UseN/3ojZdDUopwZLpHZEBon1qDDvCWfdzxodi/BeA=";
|
||||||
|
};
|
||||||
|
|
||||||
# No tests in archive
|
SETUPTOOLS_SCM_PRETEND_VERSION = "v${version}";
|
||||||
doCheck = false;
|
|
||||||
|
|
||||||
checkPhase = ''
|
nativeBuildInputs = [
|
||||||
py.test
|
setuptools-scm
|
||||||
'';
|
];
|
||||||
|
|
||||||
|
propagatedBuildInputs = [
|
||||||
|
branca
|
||||||
|
jinja2
|
||||||
|
numpy
|
||||||
|
requests
|
||||||
|
];
|
||||||
|
|
||||||
|
checkInputs = [
|
||||||
|
nbconvert
|
||||||
|
pytestCheckHook
|
||||||
|
pandas
|
||||||
|
pillow
|
||||||
|
selenium
|
||||||
|
];
|
||||||
|
|
||||||
|
disabledTests = [
|
||||||
|
# requires internet connection
|
||||||
|
"test_geojson"
|
||||||
|
"test_heat_map_with_weights"
|
||||||
|
"test_json_request"
|
||||||
|
"test_notebook"
|
||||||
|
];
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "Make beautiful maps with Leaflet.js & Python";
|
description = "Make beautiful maps with Leaflet.js & Python";
|
||||||
|
|
|
@ -1,8 +1,11 @@
|
||||||
{ lib
|
{ lib
|
||||||
, aiohttp
|
, aiohttp
|
||||||
|
, aresponses
|
||||||
, buildPythonPackage
|
, buildPythonPackage
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, poetry-core
|
, poetry-core
|
||||||
|
, pytest-asyncio
|
||||||
|
, pytestCheckHook
|
||||||
, pythonOlder
|
, pythonOlder
|
||||||
, yarl
|
, yarl
|
||||||
}:
|
}:
|
||||||
|
@ -21,6 +24,12 @@ buildPythonPackage rec {
|
||||||
sha256 = "1ciaclgq4aknldjqlqa08jcab28sbqrjxy5nqqwlnb2wlprg5ijz";
|
sha256 = "1ciaclgq4aknldjqlqa08jcab28sbqrjxy5nqqwlnb2wlprg5ijz";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
postPatch = ''
|
||||||
|
substituteInPlace pyproject.toml \
|
||||||
|
--replace '"0.0.0"' '"${version}"' \
|
||||||
|
--replace 'addopts = "--cov"' ""
|
||||||
|
'';
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
poetry-core
|
poetry-core
|
||||||
];
|
];
|
||||||
|
@ -30,8 +39,11 @@ buildPythonPackage rec {
|
||||||
yarl
|
yarl
|
||||||
];
|
];
|
||||||
|
|
||||||
# Project has no tests
|
checkInputs = [
|
||||||
doCheck = false;
|
aresponses
|
||||||
|
pytest-asyncio
|
||||||
|
pytestCheckHook
|
||||||
|
];
|
||||||
|
|
||||||
pythonImportsCheck = [ "p1monitor" ];
|
pythonImportsCheck = [ "p1monitor" ];
|
||||||
|
|
||||||
|
|
|
@ -6,13 +6,13 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "pypinyin";
|
pname = "pypinyin";
|
||||||
version = "0.44.0";
|
version = "0.45.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "mozillazg";
|
owner = "mozillazg";
|
||||||
repo = "python-pinyin";
|
repo = "python-pinyin";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-LYiiZvpM/V3QRyTUXGWGnSnR0AnqWfTW0xJB4Vnw7lI=";
|
sha256 = "0jz5b5a2bqz2pvx4imnlvz9n765b5yji27fmpijspalkpjcnpa4q";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
|
|
@ -15,6 +15,8 @@ buildPythonPackage rec {
|
||||||
sha256 = "sha256-xwzaJuiQxExUA5W4kW7t1713S6NOvDNagcD3/dwA+DE=";
|
sha256 = "sha256-xwzaJuiQxExUA5W4kW7t1713S6NOvDNagcD3/dwA+DE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
VERSION = version;
|
||||||
|
|
||||||
propagatedBuildInputs = [ requests ];
|
propagatedBuildInputs = [ requests ];
|
||||||
|
|
||||||
# Project has no tests
|
# Project has no tests
|
||||||
|
|
|
@ -26,7 +26,8 @@ buildPythonPackage rec {
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
substituteInPlace pyproject.toml \
|
substituteInPlace pyproject.toml \
|
||||||
--replace "--cov" ""
|
--replace "--cov" "" \
|
||||||
|
--replace '"0.0.0"' '"${version}"'
|
||||||
'';
|
'';
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -11,6 +11,11 @@ buildPythonPackage rec {
|
||||||
sha256 = "1axv2214ykgv5adajv10v2zy5fr9v77db54rkik6ja29p66zl90n";
|
sha256 = "1axv2214ykgv5adajv10v2zy5fr9v77db54rkik6ja29p66zl90n";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
postPatch = ''
|
||||||
|
substituteInPlace setup.py \
|
||||||
|
--replace "get_version(pypi=True)" '"${version}"'
|
||||||
|
'';
|
||||||
|
|
||||||
checkInputs = [ git ];
|
checkInputs = [ git ];
|
||||||
|
|
||||||
pythonImportsCheck = [ "versiontag" ];
|
pythonImportsCheck = [ "versiontag" ];
|
||||||
|
|
|
@ -1,11 +1,16 @@
|
||||||
{ buildPythonPackage, django, waitress }:
|
{ lib, buildPythonPackage, django, waitress }:
|
||||||
|
|
||||||
buildPythonPackage {
|
buildPythonPackage {
|
||||||
pname = "waitress-django";
|
pname = "waitress-django";
|
||||||
version = "0.0.0";
|
version = "1.0.0";
|
||||||
|
|
||||||
src = ./.;
|
src = ./.;
|
||||||
pythonPath = [ django waitress ];
|
pythonPath = [ django waitress ];
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
meta.description = "A waitress WSGI server serving django";
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "A waitress WSGI server serving django";
|
||||||
|
license = licenses.mit;
|
||||||
|
maintainers = with maintainers; [ basvandijk ];
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
from distutils.core import setup
|
from distutils.core import setup
|
||||||
|
|
||||||
setup( name = "waitress-django"
|
setup( name = "waitress-django"
|
||||||
, version = "0.0.0"
|
, version = "1.0.0"
|
||||||
, description = "A waitress WSGI server serving django"
|
, description = "A waitress WSGI server serving django"
|
||||||
, author = "Bas van Dijk"
|
, author = "Bas van Dijk"
|
||||||
, author_email = "v.dijk.bas@gmail.com"
|
, author_email = "v.dijk.bas@gmail.com"
|
||||||
|
|
Loading…
Reference in a new issue