From 6da8f606837b9c51e185f5753babc44b98630a8c Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sat, 11 Sep 2021 02:31:55 +0000 Subject: [PATCH 1/7] aws-sam-cli: further loosen 'requests' dependency --- pkgs/development/tools/aws-sam-cli/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/aws-sam-cli/default.nix b/pkgs/development/tools/aws-sam-cli/default.nix index 40c9958c3447..c370cddbe436 100644 --- a/pkgs/development/tools/aws-sam-cli/default.nix +++ b/pkgs/development/tools/aws-sam-cli/default.nix @@ -44,7 +44,7 @@ python3.pkgs.buildPythonApplication rec { --replace "Flask~=1.1.2" "Flask~=2.0" \ --replace "dateparser~=0.7" "dateparser>=0.7" \ --replace "docker~=4.2.0" "docker>=4.2.0" \ - --replace "requests==" "requests~=" \ + --replace "requests==" "requests #" \ --replace "watchdog==" "watchdog #" ''; From 222c5477e205a7c2f68ba96a656851d52281a720 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sat, 11 Sep 2021 02:33:29 +0000 Subject: [PATCH 2/7] python3Packages.pythran: use LLVM openmp when using clang This fixes pythran (and, therefore, also scipy, etc.) under Darwin builds, which use LLVM by default. --- pkgs/development/python-modules/pythran/default.nix | 3 ++- pkgs/top-level/python-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pythran/default.nix b/pkgs/development/python-modules/pythran/default.nix index cb25b09dad72..382a01e7b870 100644 --- a/pkgs/development/python-modules/pythran/default.nix +++ b/pkgs/development/python-modules/pythran/default.nix @@ -2,6 +2,7 @@ , python , buildPythonPackage , fetchFromGitHub +, openmp , pytest-runner , ply , networkx @@ -34,7 +35,7 @@ in buildPythonPackage rec { # Hardcode path to mp library (substituteAll { src = ./0001-hardcode-path-to-libgomp.patch; - gomp = "${stdenv.cc.cc.lib}/lib/libgomp${stdenv.hostPlatform.extensions.sharedLibrary}"; + gomp = "${if stdenv.cc.isClang then openmp else stdenv.cc.cc.lib}/lib/libgomp${stdenv.hostPlatform.extensions.sharedLibrary}"; }) ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9d2558d2d71d..e90190c3febd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7341,7 +7341,9 @@ in { python-xmp-toolkit = callPackage ../development/python-modules/python-xmp-toolkit { }; - pythran = callPackage ../development/python-modules/pythran { }; + pythran = callPackage ../development/python-modules/pythran { + inherit (pkgs.llvmPackages) openmp; + }; pyeverlights = callPackage ../development/python-modules/pyeverlights { }; From 83d16774f2fc8db795926f1d3cf58b2bf6700fab Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sat, 11 Sep 2021 02:51:11 +0000 Subject: [PATCH 3/7] awscli2: add older awscrt to make build work --- pkgs/tools/admin/awscli2/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/awscli2/default.nix b/pkgs/tools/admin/awscli2/default.nix index 0c5d08fd25c5..0b7be59231ca 100644 --- a/pkgs/tools/admin/awscli2/default.nix +++ b/pkgs/tools/admin/awscli2/default.nix @@ -2,6 +2,14 @@ let py = python3.override { packageOverrides = self: super: { + awscrt = super.awscrt.overridePythonAttrs (oldAttrs: rec { + version = "0.11.24"; + src = self.fetchPypi { + inherit (oldAttrs) pname; + inherit version; + sha256 = "sha256-uKpovKQEvwCFvgVw7/W1QtAffo48D5sIWav+XgcBYv8="; + }; + }); botocore = super.botocore.overridePythonAttrs (oldAttrs: rec { version = "2.0.0dev138"; src = fetchFromGitHub { @@ -43,12 +51,12 @@ with py.pkgs; buildPythonApplication rec { postPatch = '' substituteInPlace setup.py \ - --replace "awscrt==0.11.24" "awscrt" \ --replace "colorama>=0.2.5,<0.4.4" "colorama" \ --replace "cryptography>=3.3.2,<3.4.0" "cryptography" \ --replace "docutils>=0.10,<0.16" "docutils" \ --replace "ruamel.yaml>=0.15.0,<0.16.0" "ruamel.yaml" \ - --replace "wcwidth<0.2.0" "wcwidth" + --replace "wcwidth<0.2.0" "wcwidth" \ + --replace "distro>=1.5.0,<1.6.0" "distro" ''; checkInputs = [ jsonschema mock nose ]; From 87a72a58b707822ae2a0ae15c776c87a3e9f487e Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sat, 11 Sep 2021 02:57:24 +0000 Subject: [PATCH 4/7] python3Packages.lexid: disable lib3to6 usage to fix build --- pkgs/development/python-modules/lexid/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/lexid/default.nix b/pkgs/development/python-modules/lexid/default.nix index 400643383773..5ef175d57878 100644 --- a/pkgs/development/python-modules/lexid/default.nix +++ b/pkgs/development/python-modules/lexid/default.nix @@ -9,6 +9,12 @@ buildPythonPackage rec { sha256 = "509a3a4cc926d3dbf22b203b18a4c66c25e6473fb7c0e0d30374533ac28bafe5"; }; + prePatch = '' + # Disable lib3to6, since we're only building this on 3.6+ anyway. + substituteInPlace setup.py \ + --replace 'if any(arg.startswith("bdist") for arg in sys.argv):' 'if False:' + ''; + propagatedBuildInputs = [ click ]; checkInputs = [ pytestCheckHook ]; From fc77b402c066a3ae201631db74bb5d8196df13fd Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sat, 11 Sep 2021 03:06:54 +0000 Subject: [PATCH 5/7] conan: 1.35.0 -> 1.40.0 --- .../tools/build-managers/conan/default.nix | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix index f59e74b02f4e..95994e0924db 100644 --- a/pkgs/development/tools/build-managers/conan/default.nix +++ b/pkgs/development/tools/build-managers/conan/default.nix @@ -21,13 +21,6 @@ let newPython = python3.override { sha256 = "1dv6mjsm67l1razcgmq66riqmsb36wns17mnipqr610v0z0zf5j0"; }; }); - urllib3 = super.urllib3.overridePythonAttrs (oldAttrs: rec { - version = "1.25.11"; - src = oldAttrs.src.override { - inherit version; - sha256 = "18hpzh1am1dqx81fypn57r2wk565fi4g14292qrc5jm1h9dalzld"; - }; - }); # https://github.com/conan-io/conan/issues/8876 pyjwt = super.pyjwt.overridePythonAttrs (oldAttrs: rec { version = "1.7.1"; @@ -59,14 +52,14 @@ let newPython = python3.override { }; in newPython.pkgs.buildPythonApplication rec { - version = "1.35.0"; + version = "1.40.0"; pname = "conan"; src = fetchFromGitHub { owner = "conan-io"; repo = "conan"; rev = version; - sha256 = "19rgylkjxvv47vz5vgh46rw108xskpv7lmax8y2fnm2wd1j3bq9c"; + sha256 = "1sb4w4wahasrwxkag1g79f135601sca6iafv4r4836f2vi48ka2d"; }; propagatedBuildInputs = with newPython.pkgs; [ @@ -106,12 +99,6 @@ in newPython.pkgs.buildPythonApplication rec { # Not enabled right now due to time constraints/failing tests that I didn't have time to track down doCheck = false; - postPatch = '' - substituteInPlace conans/requirements.txt \ - --replace "deprecation>=2.0, <2.1" "deprecation" \ - --replace "six>=1.10.0,<=1.15.0" "six>=1.10.0,<=1.16.0" - ''; - meta = with lib; { homepage = "https://conan.io"; description = "Decentralized and portable C/C++ package manager"; From b44357045a1257a9be6e153a728597c61d9f7341 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sat, 11 Sep 2021 03:08:43 +0000 Subject: [PATCH 6/7] python3Packages.agate-excel: add missing olefile dep --- pkgs/development/python-modules/agate-excel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/agate-excel/default.nix b/pkgs/development/python-modules/agate-excel/default.nix index cbf49d8477c3..4d970b182217 100644 --- a/pkgs/development/python-modules/agate-excel/default.nix +++ b/pkgs/development/python-modules/agate-excel/default.nix @@ -1,5 +1,5 @@ { lib, fetchPypi, buildPythonPackage -, agate, openpyxl, xlrd, pytestCheckHook +, agate, openpyxl, xlrd, olefile, pytestCheckHook }: buildPythonPackage rec { @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "62315708433108772f7f610ca769996b468a4ead380076dbaf6ffe262831b153"; }; - propagatedBuildInputs = [ agate openpyxl xlrd ]; + propagatedBuildInputs = [ agate openpyxl xlrd olefile ]; checkInputs = [ pytestCheckHook ]; From daa1175255391663ee97d1dd0940d7a7eb5c0078 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sat, 11 Sep 2021 03:19:22 +0000 Subject: [PATCH 7/7] cmake: 3.21.1 -> 3.21.2 3.21.1 has a bug which causes darktable to fail to compile (passes weird arguments to ar in the ninja-generated files), which is fixed in 3.21.2. --- pkgs/development/tools/build-managers/cmake/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index a4532781943f..6cb257256fc0 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { + lib.optionalString isBootstrap "-boot" + lib.optionalString useNcurses "-cursesUI" + lib.optionalString withQt5 "-qt5UI"; - version = "3.21.1"; + version = "3.21.2"; src = fetchurl { url = "https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz"; - sha256 = "sha256-+sORUXHU3/JZE5ddcS925prvRL9zi6e5dnk6RYtM/tQ="; + sha256 = "sha256-lCdeC2HIS7QnEPUyCiPG3LLG7gMq59KmFvU/aLPSFlk="; }; patches = [