From c3ae149e91fc44f8add91c8ce7bd26b13fd5579e Mon Sep 17 00:00:00 2001 From: Tom Repetti Date: Sun, 30 Oct 2022 15:04:25 -0400 Subject: [PATCH 01/15] build-systems: add flit_scm to exceptiongroup --- overrides/build-systems.json | 1 + 1 file changed, 1 insertion(+) diff --git a/overrides/build-systems.json b/overrides/build-systems.json index e2e674d..920404f 100644 --- a/overrides/build-systems.json +++ b/overrides/build-systems.json @@ -4566,6 +4566,7 @@ ], "exceptiongroup": [ "flit-core", + "flit-scm", "flitBuildHook", "setuptools" ], From fb0628877f72b4780e37c9e135bf4c84d7a68921 Mon Sep 17 00:00:00 2001 From: Tom Repetti Date: Sun, 30 Oct 2022 15:08:25 -0400 Subject: [PATCH 02/15] build-systems: add setuptools to lunarcalendar --- overrides/build-systems.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/overrides/build-systems.json b/overrides/build-systems.json index 920404f..28d64c2 100644 --- a/overrides/build-systems.json +++ b/overrides/build-systems.json @@ -7905,6 +7905,9 @@ "luhn": [ "setuptools" ], + "lunarcalendar": [ + "setuptools" + ], "lupa": [ "cython", "setuptools" From 0f08745e3b45e771c1074b6aa14b714ed576c0d4 Mon Sep 17 00:00:00 2001 From: Tom Repetti Date: Sun, 30 Oct 2022 15:11:43 -0400 Subject: [PATCH 03/15] build-systems: add jupyter-packaging to jupyter-server --- overrides/build-systems.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/overrides/build-systems.json b/overrides/build-systems.json index 28d64c2..c60de9b 100644 --- a/overrides/build-systems.json +++ b/overrides/build-systems.json @@ -7256,7 +7256,11 @@ "setuptools" ], "jupyter-server": [ - "setuptools" + "setuptools", + { + "buildSystem": "jupyter-packaging", + "from": "1.21.0" + } ], "jupyter-server-mathjax": [ "jupyter-packaging", From 20e0631de43d06ea61eda615612bf8977359e663 Mon Sep 17 00:00:00 2001 From: Tom Repetti Date: Sun, 30 Oct 2022 15:13:42 -0400 Subject: [PATCH 04/15] build-systems: add hatchling to notebook-shim --- overrides/build-systems.json | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/overrides/build-systems.json b/overrides/build-systems.json index c60de9b..8723595 100644 --- a/overrides/build-systems.json +++ b/overrides/build-systems.json @@ -9127,7 +9127,14 @@ ], "notebook-shim": [ "jupyter-packaging", - "setuptools" + { + "buildSystem": "setuptools", + "until": "0.2.0" + }, + { + "buildSystem": "hatchling", + "from": "0.2.0" + } ], "notedown": [ "setuptools" From 026261d69812ca8f8576c13334dd3eb8cb3ba1bc Mon Sep 17 00:00:00 2001 From: Tom Repetti Date: Sun, 30 Oct 2022 15:15:57 -0400 Subject: [PATCH 05/15] build-systems: add setuptools expiry to jupyter-server --- overrides/build-systems.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/overrides/build-systems.json b/overrides/build-systems.json index 8723595..dc591f5 100644 --- a/overrides/build-systems.json +++ b/overrides/build-systems.json @@ -7256,7 +7256,10 @@ "setuptools" ], "jupyter-server": [ - "setuptools", + { + "buildSystem": "setuptools", + "until": "1.21.0" + }, { "buildSystem": "jupyter-packaging", "from": "1.21.0" From ba478ac16a088626f5af8ccca53613f58b447663 Mon Sep 17 00:00:00 2001 From: Tom Repetti Date: Sun, 30 Oct 2022 16:13:07 -0400 Subject: [PATCH 06/15] build-systems: add setuptools to cmdstanpy --- overrides/build-systems.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/overrides/build-systems.json b/overrides/build-systems.json index dc591f5..51e875c 100644 --- a/overrides/build-systems.json +++ b/overrides/build-systems.json @@ -2778,6 +2778,9 @@ "cmdline": [ "setuptools" ], + "cmdstanpy": [ + "setuptools" + ], "cmigemo": [ "setuptools" ], From 4bdb18d0f9897d6c7b333f118b6ee5c4458d4c59 Mon Sep 17 00:00:00 2001 From: Tom Repetti Date: Sun, 30 Oct 2022 16:14:56 -0400 Subject: [PATCH 07/15] build-systems: add setuptools to shap --- overrides/build-systems.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/overrides/build-systems.json b/overrides/build-systems.json index 51e875c..f06ec30 100644 --- a/overrides/build-systems.json +++ b/overrides/build-systems.json @@ -15000,6 +15000,9 @@ "shamir-mnemonic": [ "setuptools" ], + "shap": [ + "setuptools" + ], "shapely": [ "cython", "setuptools" From 23be656eaef0d85b48a43a9f9297ea5598947ebf Mon Sep 17 00:00:00 2001 From: Tom Repetti Date: Sun, 30 Oct 2022 16:25:26 -0400 Subject: [PATCH 08/15] cmdstanpy: add build and runtime dependency on cmdstan --- overrides/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/overrides/default.nix b/overrides/default.nix index 90533ef..8ca2864 100644 --- a/overrides/default.nix +++ b/overrides/default.nix @@ -309,6 +309,12 @@ lib.composeManyExtensions [ ) ); + cmdstanpy = super.cmdstanpy.overridePythonAttrs ( + old: { + propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ pkgs.cmdstan ]; + } + ); + contourpy = super.contourpy.overridePythonAttrs ( old: { buildInputs = (old.buildInputs or [ ]) ++ [ self.pybind11 ]; From e4126d58afbc20805e2568d418a797b36fdf4712 Mon Sep 17 00:00:00 2001 From: Tom Repetti Date: Sun, 30 Oct 2022 16:26:36 -0400 Subject: [PATCH 09/15] build-systems: add setuptools to statsforecast --- overrides/build-systems.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/overrides/build-systems.json b/overrides/build-systems.json index f06ec30..2388c5d 100644 --- a/overrides/build-systems.json +++ b/overrides/build-systems.json @@ -15767,6 +15767,9 @@ "statsd": [ "setuptools" ], + "statsforecast": [ + "setuptools" + ], "statsmodels": [ "cython", "setuptools" From 8f70220254fe00a171f634546a2cca3360d33eec Mon Sep 17 00:00:00 2001 From: Tom Repetti Date: Sun, 30 Oct 2022 16:28:09 -0400 Subject: [PATCH 10/15] build-systems: add setuptools to pmdarima --- flake.lock | 42 ++++++++++++++++++++++++++++++++++++ overrides/build-systems.json | 3 +++ 2 files changed, 45 insertions(+) create mode 100644 flake.lock diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..9749148 --- /dev/null +++ b/flake.lock @@ -0,0 +1,42 @@ +{ + "nodes": { + "flake-utils": { + "locked": { + "lastModified": 1667077288, + "narHash": "sha256-bdC8sFNDpT0HK74u9fUkpbf1MEzVYJ+ka7NXCdgBoaA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "6ee9ebb6b1ee695d2cacc4faa053a7b9baa76817", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1667161038, + "narHash": "sha256-LFAzLBvayTTyzd2zVckUoyVX/iZTh0lArvIVIpXQOAI=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "946ff82ce0ea1d0896e303c12fae204bf90f23ca", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/overrides/build-systems.json b/overrides/build-systems.json index 2388c5d..5e90a75 100644 --- a/overrides/build-systems.json +++ b/overrides/build-systems.json @@ -10325,6 +10325,9 @@ "plyvel": [ "setuptools" ], + "pmdarima": [ + "setuptools" + ], "pmsensor": [ "setuptools" ], From 0b059b67122c2dc63f346d3d3725315722392cac Mon Sep 17 00:00:00 2001 From: Tom Repetti Date: Sun, 30 Oct 2022 17:00:14 -0400 Subject: [PATCH 11/15] overrides: fix cmdstanpy path --- overrides/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/overrides/default.nix b/overrides/default.nix index 8ca2864..3dd7e45 100644 --- a/overrides/default.nix +++ b/overrides/default.nix @@ -312,6 +312,12 @@ lib.composeManyExtensions [ cmdstanpy = super.cmdstanpy.overridePythonAttrs ( old: { propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ pkgs.cmdstan ]; + patchPhase = '' + substituteInPlace cmdstanpy/model.py \ + --replace 'cmd = [make]' \ + 'cmd = ["${pkgs.cmdstan}/bin/stan"]' + ''; + CMDSTAN="${pkgs.cmdstan}"; } ); @@ -1514,6 +1520,12 @@ lib.composeManyExtensions [ propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.setuptools ]; }); + prophet = super.prophet.overridePythonAttrs (old: { + propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ pkgs.cmdstan self.cmdstanpy ]; + PROPHET_REPACKAGE_CMDSTAN = "false"; + CMDSTAN="${pkgs.cmdstan}"; + }); + psycopg2 = super.psycopg2.overridePythonAttrs ( old: { buildInputs = (old.buildInputs or [ ]) From 50ecb0b0c97f206d21fea6ee75e418263f3b22e0 Mon Sep 17 00:00:00 2001 From: Tom Repetti Date: Sun, 30 Oct 2022 17:01:02 -0400 Subject: [PATCH 12/15] build-systems: add setuptools to tbats --- overrides/build-systems.json | 3 +++ overrides/default.nix | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/overrides/build-systems.json b/overrides/build-systems.json index 5e90a75..87c108b 100644 --- a/overrides/build-systems.json +++ b/overrides/build-systems.json @@ -16070,6 +16070,9 @@ "taxi": [ "setuptools" ], + "tbats": [ + "setuptools" + ], "tblib": [ "setuptools" ], diff --git a/overrides/default.nix b/overrides/default.nix index 3dd7e45..c1b4be3 100644 --- a/overrides/default.nix +++ b/overrides/default.nix @@ -317,7 +317,7 @@ lib.composeManyExtensions [ --replace 'cmd = [make]' \ 'cmd = ["${pkgs.cmdstan}/bin/stan"]' ''; - CMDSTAN="${pkgs.cmdstan}"; + CMDSTAN = "${pkgs.cmdstan}"; } ); @@ -1523,7 +1523,7 @@ lib.composeManyExtensions [ prophet = super.prophet.overridePythonAttrs (old: { propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ pkgs.cmdstan self.cmdstanpy ]; PROPHET_REPACKAGE_CMDSTAN = "false"; - CMDSTAN="${pkgs.cmdstan}"; + CMDSTAN = "${pkgs.cmdstan}"; }); psycopg2 = super.psycopg2.overridePythonAttrs ( From 0596e9788fb379e6b599d6feabbc3bf24c940196 Mon Sep 17 00:00:00 2001 From: Tom Repetti Date: Mon, 31 Oct 2022 11:13:24 -0400 Subject: [PATCH 13/15] overrides: fix pytorch-lightning unpackPhase --- overrides/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/overrides/default.nix b/overrides/default.nix index c1b4be3..ace06a0 100644 --- a/overrides/default.nix +++ b/overrides/default.nix @@ -1800,6 +1800,16 @@ lib.composeManyExtensions [ } ); + pytorch-lightning = super.pytorch-lightning.override { + unpackPhase = '' + # $src remains a gzipped tarball otherwise. + mkdir -p tmp + tar xvf $src --directory=tmp + mv tmp/pytorch-lightning*/* . + rm -rf tmp + ''; + }; + pyqt5 = let qt5 = selectQt5 super.pyqt5.version; From f5d5642591076b9ab92a5ad5536d98b992b7a2cf Mon Sep 17 00:00:00 2001 From: Tom Repetti Date: Mon, 31 Oct 2022 11:18:41 -0400 Subject: [PATCH 14/15] overrides: prefer wheel for darts --- overrides/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/overrides/default.nix b/overrides/default.nix index ace06a0..47d4954 100644 --- a/overrides/default.nix +++ b/overrides/default.nix @@ -432,6 +432,10 @@ lib.composeManyExtensions [ ''; }); + darts = super.darts.override { + preferWheel = true; + }; + datadog-lambda = super.datadog-lambda.overridePythonAttrs (old: { postPatch = '' substituteInPlace setup.py --replace "setuptools==" "setuptools>=" From 4f92e5c4a73e688ccaa2d52d80508524bc59b3d7 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Tue, 1 Nov 2022 12:03:00 +1300 Subject: [PATCH 15/15] Delete flake.lock --- flake.lock | 42 ------------------------------------------ 1 file changed, 42 deletions(-) delete mode 100644 flake.lock diff --git a/flake.lock b/flake.lock deleted file mode 100644 index 9749148..0000000 --- a/flake.lock +++ /dev/null @@ -1,42 +0,0 @@ -{ - "nodes": { - "flake-utils": { - "locked": { - "lastModified": 1667077288, - "narHash": "sha256-bdC8sFNDpT0HK74u9fUkpbf1MEzVYJ+ka7NXCdgBoaA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "6ee9ebb6b1ee695d2cacc4faa053a7b9baa76817", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "nixpkgs": { - "locked": { - "lastModified": 1667161038, - "narHash": "sha256-LFAzLBvayTTyzd2zVckUoyVX/iZTh0lArvIVIpXQOAI=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "946ff82ce0ea1d0896e303c12fae204bf90f23ca", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "type": "github" - } - }, - "root": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" - } - } - }, - "root": "root", - "version": 7 -}