From 5378b5f6f408a15ffe19d7e80a0275571f031eb9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 21 Nov 2024 10:33:05 +0000 Subject: [PATCH 01/97] python312Packages.mkdocs-material: 9.5.39 -> 9.5.45 --- pkgs/development/python-modules/mkdocs-material/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mkdocs-material/default.nix b/pkgs/development/python-modules/mkdocs-material/default.nix index 1d78557d796e..4eafbac1307e 100644 --- a/pkgs/development/python-modules/mkdocs-material/default.nix +++ b/pkgs/development/python-modules/mkdocs-material/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "mkdocs-material"; - version = "9.5.39"; + version = "9.5.45"; pyproject = true; disabled = pythonOlder "3.7"; @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "squidfunk"; repo = "mkdocs-material"; rev = "refs/tags/${version}"; - hash = "sha256-ArCd7NbqvPw3kHJd4MG62FplgXwW1gFTfdCHZqfxuqU="; + hash = "sha256-uhUatalHcObQbar1xbdR44FnQs/+qS4ad0sdB2jH/OU="; }; nativeBuildInputs = [ From bee089e0e10f2d1c81f941c36d818cb6e870c800 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 19 Nov 2024 19:30:04 +0000 Subject: [PATCH 02/97] python312Packages.langcodes: 3.4.1 -> 3.5.0 --- .../development/python-modules/langcodes/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/langcodes/default.nix b/pkgs/development/python-modules/langcodes/default.nix index 342459baea45..c69eaa54f189 100644 --- a/pkgs/development/python-modules/langcodes/default.nix +++ b/pkgs/development/python-modules/langcodes/default.nix @@ -12,22 +12,22 @@ buildPythonPackage rec { pname = "langcodes"; - version = "3.4.1"; - format = "pyproject"; + version = "3.5.0"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-okh5/tI4ATrDryQkudESTji0o4sgRP0pfI/zjlkS5xg="; + hash = "sha256-Hu+BaNB+UeExokl//srUtmP2II58OuO43BXFFzSm+AE="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ language-data marisa-trie setuptools # pkg_resources import in language_data/util.py From e94e7536ead97e24fe6e36d9a1e5046e4af93334 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Nov 2024 02:58:28 +0000 Subject: [PATCH 03/97] python312Packages.peewee: 3.17.7 -> 3.17.8 --- pkgs/development/python-modules/peewee/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/peewee/default.nix b/pkgs/development/python-modules/peewee/default.nix index 422f427c6ed6..9f1d47939b22 100644 --- a/pkgs/development/python-modules/peewee/default.nix +++ b/pkgs/development/python-modules/peewee/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "peewee"; - version = "3.17.7"; + version = "3.17.8"; pyproject = true; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "coleifer"; repo = "peewee"; rev = "refs/tags/${version}"; - hash = "sha256-j10c3mnrHISk04l65ieUB11jt3a3iiQsroTt/L0tKaw="; + hash = "sha256-2mViwo39adzzhpFS056C1JU5fXr3zKorzkVyJrKKRhI="; }; build-system = [ setuptools ]; From 0794fe0425b1e7dfb1a7d344e334d6f10748f4a0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Nov 2024 19:15:55 +0000 Subject: [PATCH 04/97] python312Packages.etils: 1.10.0 -> 1.11.0 --- pkgs/development/python-modules/etils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/etils/default.nix b/pkgs/development/python-modules/etils/default.nix index 6b853fd9d9bf..637bc2903ede 100644 --- a/pkgs/development/python-modules/etils/default.nix +++ b/pkgs/development/python-modules/etils/default.nix @@ -29,14 +29,14 @@ buildPythonPackage rec { pname = "etils"; - version = "1.10.0"; + version = "1.11.0"; pyproject = true; disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; - hash = "sha256-Tqqdckj9Tut15E1HyimHWlzOoETMFKF0NXlL+KwRagU="; + hash = "sha256-r/Mnijvn/d8wLf2AM16fkkJEZmxxI5zZHoNvPQVfHEo="; }; nativeBuildInputs = [ flit-core ]; From bfa5fe24d7416e56e6e04132b805205bc76a248d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 1 Dec 2024 11:19:33 +0000 Subject: [PATCH 05/97] python312Packages.viv-utils: 0.7.11 -> 0.7.13 --- pkgs/development/python-modules/viv-utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/viv-utils/default.nix b/pkgs/development/python-modules/viv-utils/default.nix index 7bb87b98bc56..f9435e61a32e 100644 --- a/pkgs/development/python-modules/viv-utils/default.nix +++ b/pkgs/development/python-modules/viv-utils/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "viv-utils"; - version = "0.7.11"; + version = "0.7.13"; pyproject = true; disabled = pythonOlder "3.9"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "williballenthin"; repo = "viv-utils"; rev = "refs/tags/v${version}"; - hash = "sha256-zYamhG5oeoYYVLEvv1EdZ1buFDByZatuCxbl0uRhk6Y="; + hash = "sha256-NiXLNsRQ/ah+fB2r91A1oqf/8Yt95Vdt2JQFJE73HXo="; }; build-system = [ setuptools-scm ]; From 7a66174fcf4b5ff722b944f902a708ceeda31e64 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 1 Dec 2024 17:34:49 +0000 Subject: [PATCH 06/97] python312Packages.wheel-inspect: 1.7.1 -> 1.7.2 --- pkgs/development/python-modules/wheel-inspect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/wheel-inspect/default.nix b/pkgs/development/python-modules/wheel-inspect/default.nix index ed966cace713..45e1cd6db59b 100644 --- a/pkgs/development/python-modules/wheel-inspect/default.nix +++ b/pkgs/development/python-modules/wheel-inspect/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "wheel-inspect"; - version = "1.7.1"; + version = "1.7.2"; pyproject = true; disabled = pythonOlder "3.6"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "jwodder"; repo = "wheel-inspect"; rev = "refs/tags/v${version}"; - hash = "sha256-pB9Rh+A7GlxnYuka2mTSBoxpoyYCzoaMPVgsHDlpos0="; + hash = "sha256-Mdw9IlY/2qDlb5FumNH+VHmg7vrUzo3vn+03QsUGgo8="; }; pythonRelaxDeps = [ From b67dd357d718b2ee7395990bff055bf052395fb6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 3 Dec 2024 00:19:51 +0000 Subject: [PATCH 07/97] python312Packages.python-sql: 1.5.1 -> 1.5.2 --- pkgs/development/python-modules/python-sql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-sql/default.nix b/pkgs/development/python-modules/python-sql/default.nix index a7d91fcb759a..f41e54f406aa 100644 --- a/pkgs/development/python-modules/python-sql/default.nix +++ b/pkgs/development/python-modules/python-sql/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "python-sql"; - version = "1.5.1"; + version = "1.5.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "python_sql"; inherit version; - hash = "sha256-93RnHx0IT6a6Q4mJJM3r5O0NAHHfjWCAQKzU8cjYaqM="; + hash = "sha256-c19SNyGHy5VrGu6MoHADn3O6iRO7i33vlC78FNUGzTY="; }; nativeCheckInputs = [ pytestCheckHook ]; From 92d110561b29131122be665248daba2bda5bf4e8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 3 Dec 2024 02:35:10 +0000 Subject: [PATCH 08/97] python312Packages.libusbsio: 2.1.12 -> 2.1.13 --- pkgs/development/python-modules/libusbsio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/libusbsio/default.nix b/pkgs/development/python-modules/libusbsio/default.nix index 4ebd50e349ec..ab099c119279 100644 --- a/pkgs/development/python-modules/libusbsio/default.nix +++ b/pkgs/development/python-modules/libusbsio/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "libusbsio"; format = "setuptools"; - version = "2.1.12"; + version = "2.1.13"; # If the versions come back into sync switch back to inheriting from c lib # inherit (libusbsio) version; src = fetchPypi { inherit pname version; - hash = "sha256-RdUhwilBOwg19ay3Po3zsxqlBV9FTy3btJDbO4YEKS8="; + hash = "sha256-3xudSyqfXq3wsFdOgBeGK1nSY0NZjx9UhmTqbQGXWyU="; }; # The source includes both the python module directly and also prebuilt binaries From 5eee2fa2b081e5c39a0b0af8ba969d63e748aa0c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 3 Dec 2024 11:55:44 +0000 Subject: [PATCH 09/97] python312Packages.pyexcel: 0.7.0 -> 0.7.1 --- pkgs/development/python-modules/pyexcel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyexcel/default.nix b/pkgs/development/python-modules/pyexcel/default.nix index 404f29068aff..bb1605b74c79 100644 --- a/pkgs/development/python-modules/pyexcel/default.nix +++ b/pkgs/development/python-modules/pyexcel/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pyexcel"; - version = "0.7.0"; + version = "0.7.1"; format = "setuptools"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - hash = "sha256-+/Du5dk7ls728ZqfAHA/IsCmTxlyjZG5VCgAmlISlwk="; + hash = "sha256-yHWZHB3pAUBjRdE8fd5sSs/V8IsWr2xKiBpSxsPDqwY="; }; propagatedBuildInputs = [ From 2553f4b738d63dede25a2a1abf14ed9f77988633 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 3 Dec 2024 20:43:20 +0000 Subject: [PATCH 10/97] python312Packages.py-scrypt: 0.8.24 -> 0.8.27 --- pkgs/development/python-modules/py-scrypt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/py-scrypt/default.nix b/pkgs/development/python-modules/py-scrypt/default.nix index c0fe6b756b34..10b9ec015050 100644 --- a/pkgs/development/python-modules/py-scrypt/default.nix +++ b/pkgs/development/python-modules/py-scrypt/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "py-scrypt"; - version = "0.8.24"; + version = "0.8.27"; src = fetchPypi { pname = "scrypt"; inherit version; - hash = "sha256-mP/eReSpVGHXPe1UunomhXZ5kg1Pj/Mg9vet5uKVMb0="; + hash = "sha256-p7Y3hI7VGMHqKzGp7Kqj9JYWWY2EQt6HBs8fAfur8Kc="; }; buildInputs = [ openssl ]; From 8e5455e9a199d42453aec2e91ed382686323b2c3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 3 Dec 2024 23:47:32 +0000 Subject: [PATCH 11/97] python312Packages.rjsmin: 1.2.2 -> 1.2.3 --- pkgs/development/python-modules/rjsmin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rjsmin/default.nix b/pkgs/development/python-modules/rjsmin/default.nix index b3984446c404..c48b87d54094 100644 --- a/pkgs/development/python-modules/rjsmin/default.nix +++ b/pkgs/development/python-modules/rjsmin/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "rjsmin"; - version = "1.2.2"; + version = "1.2.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-jBvNghFD/s8jJCAStV4TYQhAqDnNRns1jxY1kBDWLa4="; + hash = "sha256-E4i1JJOkwE+8lwotdXwwH6BaPDdkAxTCzp38jYpzDMY="; }; # The package does not ship tests, and the setup machinary confuses From 31c61b198472ab806447fd755fed04802a7672b3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Dec 2024 04:25:52 +0000 Subject: [PATCH 12/97] python312Packages.mecab-python3: 1.0.9 -> 1.0.10 --- pkgs/development/python-modules/mecab-python3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mecab-python3/default.nix b/pkgs/development/python-modules/mecab-python3/default.nix index 5eebd19f53cf..d25a2a7f34fa 100644 --- a/pkgs/development/python-modules/mecab-python3/default.nix +++ b/pkgs/development/python-modules/mecab-python3/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "mecab-python3"; - version = "1.0.9"; + version = "1.0.10"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "mecab_python3"; inherit version; - hash = "sha256-LYkfSgEZ+3Zvp5bijYgaVXk6DDVE5EbP9k3JRq1yJ8w="; + hash = "sha256-Ic1EFgQ+mpk/z7mG3ek+Q2agdUPdlYSbXvLlDJqa/M4="; }; nativeBuildInputs = [ From 63b17a2c79f45c995ec934b69031afcc2aa542af Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Dec 2024 08:20:14 +0000 Subject: [PATCH 13/97] python312Packages.pylibftdi: 0.22.0 -> 0.23.0 --- pkgs/development/python-modules/pylibftdi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pylibftdi/default.nix b/pkgs/development/python-modules/pylibftdi/default.nix index f6c317cc924a..359af2a577d8 100644 --- a/pkgs/development/python-modules/pylibftdi/default.nix +++ b/pkgs/development/python-modules/pylibftdi/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pylibftdi"; - version = "0.22.0"; + version = "0.23.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-haaqtDj3ZTQoQ6otWbso+7DTCEemIfuYAJhRhZkPAa8="; + hash = "sha256-v1tMa6c9eab234ScNFsAunY9AjIBvtm6Udh2pDl7Ftg="; }; build-system = [ poetry-core ]; From b1f0148854a4a9d67a9e155d902ade7d7d895e8d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Dec 2024 09:26:11 +0000 Subject: [PATCH 14/97] python312Packages.types-dateutil: 2.9.0.20240906 -> 2.9.0.20241003 --- pkgs/development/python-modules/types-dateutil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-dateutil/default.nix b/pkgs/development/python-modules/types-dateutil/default.nix index a4027dc808f7..fde52c82ab8f 100644 --- a/pkgs/development/python-modules/types-dateutil/default.nix +++ b/pkgs/development/python-modules/types-dateutil/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "types-dateutil"; - version = "2.9.0.20240906"; + version = "2.9.0.20241003"; pyproject = true; src = fetchPypi { pname = "types-python-dateutil"; inherit version; - hash = "sha256-lwbDtoKEwlrf/Ecxnsx5R+W7hrN3P4Q8c5Bv1Zi8F24="; + hash = "sha256-WMuFRJsqVtZoTkGu77TEKAYxJGoNoacZvb5vP7AxdEY="; }; nativeBuildInputs = [ setuptools ]; From 5e8a956b37219c196f460ae3e1ecfbea0d3e292e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Dec 2024 10:23:18 +0000 Subject: [PATCH 15/97] python312Packages.sphinxawesome-theme: 5.2.0 -> 5.3.2 --- .../python-modules/sphinxawesome-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sphinxawesome-theme/default.nix b/pkgs/development/python-modules/sphinxawesome-theme/default.nix index 8d028f2c63e7..aff028d3ba89 100644 --- a/pkgs/development/python-modules/sphinxawesome-theme/default.nix +++ b/pkgs/development/python-modules/sphinxawesome-theme/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "sphinxawesome-theme"; - version = "5.2.0"; + version = "5.3.2"; pyproject = true; src = fetchPypi { inherit version; pname = "sphinxawesome_theme"; - hash = "sha256-wk8eXAueR1OA0W/F8fO/2ElVgX2gkF2V9+IICdfNPF0="; + hash = "sha256-BinTi4Cu/CebEYbFOnpvryHnIbWy7NoU9IjKEHTiYx8="; }; build-system = [ poetry-core ]; From bedca36b94bcd80b363049c67b6e67e656a8fc6c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Dec 2024 11:11:26 +0000 Subject: [PATCH 16/97] python312Packages.manuel: 1.12.4 -> 1.13.0 --- pkgs/development/python-modules/manuel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/manuel/default.nix b/pkgs/development/python-modules/manuel/default.nix index 89a7dc660532..52aede44e28c 100644 --- a/pkgs/development/python-modules/manuel/default.nix +++ b/pkgs/development/python-modules/manuel/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "manuel"; - version = "1.12.4"; + version = "1.13.0"; format = "setuptools"; disabled = isPy27; src = fetchPypi { inherit pname version; - hash = "sha256-A5Wq32mR+SSseVz61Z2l3AYYcyqMxYrQ9HSWWrco9/Q="; + hash = "sha256-XWMSDej6bZJ3gLaa4oqj6dFmmxCvPTJ4Xz+6EaW+iFo="; }; patches = lib.optionals (lib.versionAtLeast python.version "3.11") [ From 38c44c5ffcb2460ddbd540eff819ae1e2a17489e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Dec 2024 11:31:25 +0000 Subject: [PATCH 17/97] python312Packages.fabio: 2024.4.0 -> 2024.9.0 --- pkgs/development/python-modules/fabio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fabio/default.nix b/pkgs/development/python-modules/fabio/default.nix index 8692d8a3c3da..d9bfea658144 100644 --- a/pkgs/development/python-modules/fabio/default.nix +++ b/pkgs/development/python-modules/fabio/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "fabio"; - version = "2024.4.0"; + version = "2024.9.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-NPVxu4sZ7hIvrHrh1iRakraa5fj1cUnH259tTDByRNc="; + hash = "sha256-+HPfUfRoUxwRqufgzYihTyIfTvCUMfvFpspnse1HU1s="; }; pythonImportsCheck = [ "fabio" ]; From 75b51039a3e97e22ec37839822ca00798f60c76f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Dec 2024 13:06:33 +0000 Subject: [PATCH 18/97] python312Packages.hg-evolve: 11.1.4 -> 11.1.6 --- pkgs/development/python-modules/hg-evolve/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hg-evolve/default.nix b/pkgs/development/python-modules/hg-evolve/default.nix index 4ff230e62cd1..ddd303bcbea1 100644 --- a/pkgs/development/python-modules/hg-evolve/default.nix +++ b/pkgs/development/python-modules/hg-evolve/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "hg-evolve"; - version = "11.1.4"; + version = "11.1.6"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-Yph2g254fSnPVfgmkmeRSqlmsUfHgP+wqN0GHLIV/wc="; + hash = "sha256-Jun1gZYZXv8nuJBnberK1bcTPTLCDgGGd543OeOEVOs="; }; nativeCheckInputs = [ mercurial ]; From 22f07059a53844e6e6f6767f05281d4a0612e29f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Dec 2024 13:22:28 +0000 Subject: [PATCH 19/97] python312Packages.virtualenvwrapper: 6.1.0 -> 6.1.1 --- pkgs/development/python-modules/virtualenvwrapper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/virtualenvwrapper/default.nix b/pkgs/development/python-modules/virtualenvwrapper/default.nix index 37662921905a..6466e08496f6 100644 --- a/pkgs/development/python-modules/virtualenvwrapper/default.nix +++ b/pkgs/development/python-modules/virtualenvwrapper/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "virtualenvwrapper"; - version = "6.1.0"; + version = "6.1.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-1Ge+rFpEvgD7XNG88zI5jD2rX7O9OveBXqhrTWuz06Q="; + hash = "sha256-ES5+o0qaPOkKrqVBgvDTr+9NGpE+63XpiiY7SXjNc8Y="; }; # pip depend on $HOME setting From 6eceecf590a2a896b0349b7503668bc946dcac49 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Dec 2024 15:18:06 +0000 Subject: [PATCH 20/97] python312Packages.line-profiler: 4.1.3 -> 4.2.0 --- pkgs/development/python-modules/line-profiler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/line-profiler/default.nix b/pkgs/development/python-modules/line-profiler/default.nix index dce3a93374e0..11d65dd7c148 100644 --- a/pkgs/development/python-modules/line-profiler/default.nix +++ b/pkgs/development/python-modules/line-profiler/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "line-profiler"; - version = "4.1.3"; + version = "4.2.0"; format = "setuptools"; disabled = pythonOlder "3.6" || isPyPy; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "line_profiler"; inherit version; - hash = "sha256-5fESPDZywyGLoGPCO9ZKURWeRGSf7WeAuZPHgfte0xg="; + hash = "sha256-CeEPJfh2UUOAs/rubek/sMIoq7qFgguhpZHds+tFGpY="; }; nativeBuildInputs = [ From 9b92e9d2afec93cb53ddc5f897a2fc6f6c636ac5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Dec 2024 18:05:31 +0000 Subject: [PATCH 21/97] python312Packages.torchdiffeq: 0.2.4 -> 0.2.5 --- pkgs/development/python-modules/torchdiffeq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/torchdiffeq/default.nix b/pkgs/development/python-modules/torchdiffeq/default.nix index 455450a718c1..fed9c71ce546 100644 --- a/pkgs/development/python-modules/torchdiffeq/default.nix +++ b/pkgs/development/python-modules/torchdiffeq/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "torchdiffeq"; - version = "0.2.4"; + version = "0.2.5"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-wOV8PIif7dp/I6YBXb/Nba5QcqBt1u0Q6CAMIAmEQEM="; + hash = "sha256-tQ03YNE/0TjczqxlH0uAOW9E/vzr0DegM/7P6qnMEuc="; }; propagatedBuildInputs = [ From 6c907c5e7daa44fce69d104837c467c24226db75 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Dec 2024 21:09:56 +0000 Subject: [PATCH 22/97] python312Packages.dploot: 3.0.0 -> 3.0.3 --- pkgs/development/python-modules/dploot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dploot/default.nix b/pkgs/development/python-modules/dploot/default.nix index 13ea26e68c2c..d7f86993b7f1 100644 --- a/pkgs/development/python-modules/dploot/default.nix +++ b/pkgs/development/python-modules/dploot/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "dploot"; - version = "3.0.0"; + version = "3.0.3"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-G39dzP5A6ZySo7AhDIZWXjhtk2zm15wSnrdknLqHHcY="; + hash = "sha256-MBuO9anCe8wDD+72pR/bFrV5pAmEIWY2pKSvPSTq0yQ="; }; pythonRelaxDeps = [ From 0bc6a534e8105ffa3a6e9762b711eeee3b20a5f9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Dec 2024 05:39:34 +0000 Subject: [PATCH 23/97] python312Packages.consolekit: 1.7.1 -> 1.7.2 --- pkgs/development/python-modules/consolekit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/consolekit/default.nix b/pkgs/development/python-modules/consolekit/default.nix index cd1a76e840a6..2d747f8919be 100644 --- a/pkgs/development/python-modules/consolekit/default.nix +++ b/pkgs/development/python-modules/consolekit/default.nix @@ -12,12 +12,12 @@ }: buildPythonPackage rec { pname = "consolekit"; - version = "1.7.1"; + version = "1.7.2"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-TU5sufqJ0znCD/QOidrT7jB1NCXJ1p8Z7FPFNPp97qg="; + hash = "sha256-3qa58lA2nquII99W+SGEQHHlb1BRrAWdihUOiQYmcns="; }; build-system = [ flit-core ]; From e461d525e289493804cfb8a6edc61ccbb2e1f5a3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Dec 2024 08:57:28 +0000 Subject: [PATCH 24/97] python312Packages.azure-servicebus: 7.12.3 -> 7.13.0 --- pkgs/development/python-modules/azure-servicebus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-servicebus/default.nix b/pkgs/development/python-modules/azure-servicebus/default.nix index 997d52e12897..bac13da083f7 100644 --- a/pkgs/development/python-modules/azure-servicebus/default.nix +++ b/pkgs/development/python-modules/azure-servicebus/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "azure-servicebus"; - version = "7.12.3"; + version = "7.13.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "azure_servicebus"; inherit version; - hash = "sha256-PwdZcxrSIRxo60sh5byimCf31v8Ccr3H7vEDwcE/gyI="; + hash = "sha256-p16aYUNco606eX8di/T90Nhz66nl04OJSsh+9eGnDPA="; }; build-system = [ setuptools ]; From 49f13ed21c39e56ecccc43cb05dedfc18c180972 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Dec 2024 09:16:52 +0000 Subject: [PATCH 25/97] python312Packages.pywebpush: 2.0.1 -> 2.0.3 --- pkgs/development/python-modules/pywebpush/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pywebpush/default.nix b/pkgs/development/python-modules/pywebpush/default.nix index 71ba2f75af49..08487c7109c9 100644 --- a/pkgs/development/python-modules/pywebpush/default.nix +++ b/pkgs/development/python-modules/pywebpush/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "pywebpush"; - version = "2.0.1"; + version = "2.0.3"; pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-cuNYauyJoGNzwFheb5fG/QuBUZ5B8yiWo2OZCez0XbA="; + hash = "sha256-WEh448JD6HOiLbiJVQXZVxW8eW73TMG4/pn1lhdBYeM="; }; build-system = [ setuptools ]; From ab20832614cb9332e92f8305309cdc4a80dfbed5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Dec 2024 11:55:54 +0000 Subject: [PATCH 26/97] python312Packages.bottleneck: 1.4.0 -> 1.4.2 --- pkgs/development/python-modules/bottleneck/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bottleneck/default.nix b/pkgs/development/python-modules/bottleneck/default.nix index f89ea81255e4..d85050c73961 100644 --- a/pkgs/development/python-modules/bottleneck/default.nix +++ b/pkgs/development/python-modules/bottleneck/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "bottleneck"; - version = "1.4.0"; + version = "1.4.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-vrNt9Rm4cJ59NXwMljmwO4hcpjVbv15TdSxoXeUWBbg="; + hash = "sha256-+o6OF5nepUg85maUYmYPnZqVZJ9vmKgNMVuE7In0SfQ="; }; propagatedBuildInputs = [ numpy ]; From fbe948038821c9309c724b9a82da41e2d586bded Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Dec 2024 05:41:49 +0000 Subject: [PATCH 27/97] python312Packages.mkdocs-git-authors-plugin: 0.9.0 -> 0.9.2 --- .../python-modules/mkdocs-git-authors-plugin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/mkdocs-git-authors-plugin/default.nix b/pkgs/development/python-modules/mkdocs-git-authors-plugin/default.nix index 0c346aac1d0c..3d9997d25a20 100644 --- a/pkgs/development/python-modules/mkdocs-git-authors-plugin/default.nix +++ b/pkgs/development/python-modules/mkdocs-git-authors-plugin/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "mkdocs-git-authors-plugin"; - version = "0.9.0"; + version = "0.9.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "timvink"; repo = "mkdocs-git-authors-plugin"; - rev = "refs/tags/v${version}"; - hash = "sha256-UomcEXWNt5aVE9JxP9wskkHkFYXKN/+jXwr1SXCmeyE="; + tag = "v${version}"; + hash = "sha256-2ITro34lZ+tz7ev7Yuh1wJjsSNik6VUTt3dupIajmLU="; }; propagatedBuildInputs = [ mkdocs ]; From 0be5b527df50ddb32636b9281f0311ec6fdcce4f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Dec 2024 12:15:13 +0000 Subject: [PATCH 28/97] python312Packages.cx-freeze: 7.2.2 -> 7.2.7 --- .../python-modules/cx-freeze/default.nix | 35 ++++++++++++------- 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/cx-freeze/default.nix b/pkgs/development/python-modules/cx-freeze/default.nix index ea2d9d1b0ca6..92713066e5ba 100644 --- a/pkgs/development/python-modules/cx-freeze/default.nix +++ b/pkgs/development/python-modules/cx-freeze/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, distutils, fetchPypi, @@ -8,21 +9,24 @@ packaging, setuptools, filelock, - wheel, patchelf, + tomli, + importlib-metadata, + typing-extensions, + dmgbuild, }: buildPythonPackage rec { pname = "cx-freeze"; - version = "7.2.2"; + version = "7.2.7"; pyproject = true; - disabled = pythonOlder "3.11"; + disabled = pythonOlder "3.8"; src = fetchPypi { pname = "cx_freeze"; inherit version; - hash = "sha256-6bLEvWjr9PuZtq8v8oHA5TewSa7pSIBcxKAo4XGKvGo="; + hash = "sha256-xNQ6TlNXNSrFqJID/aOoz63wM9Q2gvc6u+/ThgzlD7Q="; }; postPatch = '' @@ -34,18 +38,25 @@ buildPythonPackage rec { build-system = [ setuptools - wheel ]; buildInputs = [ ncurses ]; - dependencies = [ - distutils - filelock - packaging - setuptools - wheel - ]; + dependencies = + [ + distutils + packaging + setuptools + ] + ++ lib.optionals (pythonOlder "3.11") [ + tomli + ] + ++ lib.optionals (pythonOlder "3.10") [ + importlib-metadata + typing-extensions + ] + ++ lib.optional stdenv.hostPlatform.isLinux filelock + ++ lib.optional stdenv.hostPlatform.isDarwin dmgbuild; makeWrapperArgs = [ "--prefix" From 340016f92aae2012c9b2bae783702bce6ba7c8e9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 8 Dec 2024 20:00:11 +0000 Subject: [PATCH 29/97] python312Packages.rotary-embedding-torch: 0.8.5 -> 0.8.6 --- .../python-modules/rotary-embedding-torch/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/rotary-embedding-torch/default.nix b/pkgs/development/python-modules/rotary-embedding-torch/default.nix index aa8c563a5218..facd9e0b2363 100644 --- a/pkgs/development/python-modules/rotary-embedding-torch/default.nix +++ b/pkgs/development/python-modules/rotary-embedding-torch/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "rotary-embedding-torch"; - version = "0.8.5"; + version = "0.8.6"; pyproject = true; src = fetchFromGitHub { owner = "lucidrains"; repo = "rotary-embedding-torch"; - rev = "refs/tags/${version}"; - hash = "sha256-sd2zi0dKXLo9HCFDQrLr4icaJnwWeMPoaeTV8qaoyhQ="; + tag = version; + hash = "sha256-4/vKf5RwWbiFYKCQo4kAQzXLM85L4CwaL/MR7/xTkH8="; }; nativeBuildInputs = [ From d62793a21854df347652d086be7512addbb33da2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 8 Dec 2024 20:11:46 +0000 Subject: [PATCH 30/97] python312Packages.meraki: 1.52.0 -> 1.53.0 --- pkgs/development/python-modules/meraki/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/meraki/default.nix b/pkgs/development/python-modules/meraki/default.nix index 14ff9dcf67e1..7c258307de3a 100644 --- a/pkgs/development/python-modules/meraki/default.nix +++ b/pkgs/development/python-modules/meraki/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "meraki"; - version = "1.52.0"; + version = "1.53.0"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-8fNrHRZZ58FW0UOBdbUUzI3y+Y6kAyue4uHnPoODdzw="; + hash = "sha256-GC07gpx0Yeajm8LPcHFtkz/Uuc4kO46TUQs58/IEzyg="; }; propagatedBuildInputs = [ From 3cc811b0ae6791341e50fe6154687ab155c7ea37 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 11 Dec 2024 07:39:50 +0000 Subject: [PATCH 31/97] python312Packages.confluent-kafka: 2.5.3 -> 2.6.1 --- pkgs/development/python-modules/confluent-kafka/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/confluent-kafka/default.nix b/pkgs/development/python-modules/confluent-kafka/default.nix index ecdcd5759349..1a7d54470677 100644 --- a/pkgs/development/python-modules/confluent-kafka/default.nix +++ b/pkgs/development/python-modules/confluent-kafka/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "confluent-kafka"; - version = "2.5.3"; + version = "2.6.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -26,8 +26,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "confluentinc"; repo = "confluent-kafka-python"; - rev = "refs/tags/v${version}"; - hash = "sha256-b9RTz4wUtDzGkoeB0cp5vbZEBk8jSw2JiXEx6tUuPVw="; + tag = "v${version}"; + hash = "sha256-SFmZ/KriysvLkGT5mvIS9SJcUHWmvZXrqFAY0lC6bGc="; }; buildInputs = [ rdkafka ]; From 88a702963c3788ec12c6d714b86a5d561c0cca59 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 14 Dec 2024 11:32:10 +0000 Subject: [PATCH 32/97] python312Packages.pytapo: 3.3.32 -> 3.3.37 --- pkgs/development/python-modules/pytapo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytapo/default.nix b/pkgs/development/python-modules/pytapo/default.nix index 7cec1417bfc8..7d6537386687 100644 --- a/pkgs/development/python-modules/pytapo/default.nix +++ b/pkgs/development/python-modules/pytapo/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pytapo"; - version = "3.3.32"; + version = "3.3.37"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-OYRcgX30O0/F+0H4x2jbPyVNh6xVeBSdfqbtuqUgoNE="; + hash = "sha256-InDbfWzRb+Q+E6feeatHIliq83g83oUfo3Yze/BAJdM="; }; build-system = [ setuptools ]; From 23ddc7b6e5e19e785b5936d98e7a966d0707868e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 16 Dec 2024 16:07:57 +0000 Subject: [PATCH 33/97] python312Packages.django-soft-delete: 1.0.14 -> 1.0.16 --- .../development/python-modules/django-soft-delete/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-soft-delete/default.nix b/pkgs/development/python-modules/django-soft-delete/default.nix index ef55f085d2be..ee3bd1b35746 100644 --- a/pkgs/development/python-modules/django-soft-delete/default.nix +++ b/pkgs/development/python-modules/django-soft-delete/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "django-soft-delete"; - version = "1.0.14"; + version = "1.0.16"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-Qo31bqT7sT9C1PdS8R8qUXqjGsPRtFDmt4xMXV2d/Ds="; + hash = "sha256-zEA5jM2GnHWm1rp/Um4WxK/isMCBHCE6MY2Wu0xYp4c="; }; dependencies = [ django ]; From f6f318bea594c8e814086c67078b33dc61dca9ee Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 17 Dec 2024 07:32:45 +0000 Subject: [PATCH 34/97] python312Packages.google-cloud-dataproc: 5.12.0 -> 5.16.0 --- .../python-modules/google-cloud-dataproc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-dataproc/default.nix b/pkgs/development/python-modules/google-cloud-dataproc/default.nix index 480bf6f76d87..039d89b18faa 100644 --- a/pkgs/development/python-modules/google-cloud-dataproc/default.nix +++ b/pkgs/development/python-modules/google-cloud-dataproc/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "google-cloud-dataproc"; - version = "5.12.0"; + version = "5.16.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_dataproc"; inherit version; - hash = "sha256-S1jXIPAgxONTeKKeqHzoKGr2Mes7w4LMvL/zncAZnik="; + hash = "sha256-I7LYrk9kjgG2b+0KvqEUtgDTNj2VW4VYx2Rak/KNbjw="; }; build-system = [ setuptools ]; From ed5141d4972872bdc39509106173cd9a3e63b0d1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 17 Dec 2024 09:52:25 +0000 Subject: [PATCH 35/97] python312Packages.ansitable: 0.11.3 -> 0.11.4 --- pkgs/development/python-modules/ansitable/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ansitable/default.nix b/pkgs/development/python-modules/ansitable/default.nix index e722d504d61f..0080974e646d 100644 --- a/pkgs/development/python-modules/ansitable/default.nix +++ b/pkgs/development/python-modules/ansitable/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "ansitable"; - version = "0.11.3"; + version = "0.11.4"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-navayezkSSHgwOysC3fbgTQahRZjIV24JzIAQl+X5Jk="; + hash = "sha256-XUjXVs9/ETlbbtvYz8YJqCsP1BFajqQKQfSM+Rvm4O0="; }; build-system = [ setuptools ]; From 11c826d556b9881adfce377b5c5b06e6a417743a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 17 Dec 2024 13:29:17 +0000 Subject: [PATCH 36/97] python312Packages.google-cloud-dlp: 3.25.1 -> 3.26.0 --- pkgs/development/python-modules/google-cloud-dlp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-dlp/default.nix b/pkgs/development/python-modules/google-cloud-dlp/default.nix index 5aad5fed6900..0b19ec7c7a37 100644 --- a/pkgs/development/python-modules/google-cloud-dlp/default.nix +++ b/pkgs/development/python-modules/google-cloud-dlp/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "google-cloud-dlp"; - version = "3.25.1"; + version = "3.26.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_dlp"; inherit version; - hash = "sha256-6R4CSOyB+beTUPNtj8wQc7uQmMUxhyO8lebV0PDu1Lg="; + hash = "sha256-+kxjk9deiNQU+Vhjs53Xpgo/UZEtA2gDylr7WR1obzQ="; }; build-system = [ setuptools ]; From 53bcab7eb37febc5ac9cc1a442d1451104a5f1b6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 17 Dec 2024 18:44:32 +0000 Subject: [PATCH 37/97] python312Packages.pydata-sphinx-theme: 0.16.0 -> 0.16.1 --- .../python-modules/pydata-sphinx-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pydata-sphinx-theme/default.nix b/pkgs/development/python-modules/pydata-sphinx-theme/default.nix index 6bb1c8386bce..beacd7d79138 100644 --- a/pkgs/development/python-modules/pydata-sphinx-theme/default.nix +++ b/pkgs/development/python-modules/pydata-sphinx-theme/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pydata-sphinx-theme"; - version = "0.16.0"; + version = "0.16.1"; format = "wheel"; @@ -24,7 +24,7 @@ buildPythonPackage rec { dist = "py3"; python = "py3"; pname = "pydata_sphinx_theme"; - hash = "sha256-GMgQ7k5n4FKB43HhVsH7W7D6HydHJARhsiUnL32NV9g="; + hash = "sha256-IlMx6KxLMmgsGPysWlem9xfE5jLOpd0OJHtVFV+uzN4="; }; propagatedBuildInputs = [ From d05d12c3b1beba58e61e6ee96b4d97af9966ef7f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 2 Dec 2024 16:01:10 +0000 Subject: [PATCH 38/97] python312Packages.jianpu-ly: 1.801 -> 1.826 --- pkgs/development/python-modules/jianpu-ly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jianpu-ly/default.nix b/pkgs/development/python-modules/jianpu-ly/default.nix index 411f7df5ee45..2469f6569f35 100644 --- a/pkgs/development/python-modules/jianpu-ly/default.nix +++ b/pkgs/development/python-modules/jianpu-ly/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "jianpu-ly"; - version = "1.801"; + version = "1.826"; pyproject = true; src = fetchPypi { inherit version; pname = "jianpu_ly"; - hash = "sha256-piK9Ym94cKdaHGz/ogX7ylyAF1ww0jCdRXnHN6lu2MI="; + hash = "sha256-9vNCwXCOEHG2WNu8nDqCKJ3Z4vrsfX1lwKvkVGRrPPA="; }; dependencies = [ lilypond ]; From bda27514741adacab583711c7f209ce1e479d1ab Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 2 Dec 2024 05:16:36 +0000 Subject: [PATCH 39/97] python312Packages.types-s3transfer: 0.10.2 -> 0.10.4 --- pkgs/development/python-modules/types-s3transfer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-s3transfer/default.nix b/pkgs/development/python-modules/types-s3transfer/default.nix index bb2211a43dfb..e18bd2e288e7 100644 --- a/pkgs/development/python-modules/types-s3transfer/default.nix +++ b/pkgs/development/python-modules/types-s3transfer/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "types-s3transfer"; - version = "0.10.2"; + version = "0.10.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "types_s3transfer"; inherit version; - hash = "sha256-YBZ6O/tcU27GzbWBj3+aKO3KncPgtf+FrjdFJvxeV24="; + hash = "sha256-AxI0d+MGTIHv5xK/nTcsfHLyeQcRQx+bqlnPlupgcmc="; }; build-system = [ setuptools ]; From 2a2527f59b6e3da964d7823c9ed40977a49fbe2b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 2 Dec 2024 07:48:48 +0000 Subject: [PATCH 40/97] python312Packages.cloudsmith-api: 2.0.13 -> 2.0.16 --- pkgs/development/python-modules/cloudsmith-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cloudsmith-api/default.nix b/pkgs/development/python-modules/cloudsmith-api/default.nix index 8fd6f490f042..57a790c3326c 100644 --- a/pkgs/development/python-modules/cloudsmith-api/default.nix +++ b/pkgs/development/python-modules/cloudsmith-api/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "cloudsmith-api"; - version = "2.0.13"; + version = "2.0.16"; format = "wheel"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "cloudsmith_api"; inherit format version; - hash = "sha256-xPPARaxclTRy7thJXtXaMK0F5/91q7o35LyzSmx1HPU="; + hash = "sha256-Hgg2mwBdUwW26h0mkgTIFLyigefAENDItQ0EvPGAOc0="; }; propagatedBuildInputs = [ From 18df25f754e6f2484107ced9424cf9da130db778 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 2 Dec 2024 13:52:37 +0000 Subject: [PATCH 41/97] python312Packages.yark: 1.2.10 -> 1.2.12 --- pkgs/development/python-modules/yark/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yark/default.nix b/pkgs/development/python-modules/yark/default.nix index c1a0a6cc900f..3474c86b2751 100644 --- a/pkgs/development/python-modules/yark/default.nix +++ b/pkgs/development/python-modules/yark/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "yark"; - version = "1.2.10"; + version = "1.2.12"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-Y1fWHpvrqGuBPyJ2dO2y0W2zhEgcTJABtkOAoZ7uyZU="; + hash = "sha256-K66LC/HhajAMCWU7PPfxkoaK84kLlAccYAH5FXoc+yE="; }; pythonRelaxDeps = [ From a288bb9c3e60c1d9cdaae530fd52fd826b414fe7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 2 Dec 2024 16:01:08 +0000 Subject: [PATCH 42/97] python312Packages.bandit: 1.7.10 -> 1.8.0 --- pkgs/development/python-modules/bandit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bandit/default.nix b/pkgs/development/python-modules/bandit/default.nix index bb91d65287bf..686fb846b297 100644 --- a/pkgs/development/python-modules/bandit/default.nix +++ b/pkgs/development/python-modules/bandit/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "bandit"; - version = "1.7.10"; + version = "1.8.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-We1cr12Stq2kv2W8ZDf+6kqdoQkzhERf7U1HKsxs/3s="; + hash = "sha256-tb/lWglavZ/iAJkXinxsBg+ES/1P5MdtKONeTFK50x4="; }; nativeBuildInputs = [ pbr ]; From 304aca53888f4d5a22de1c304f8210892657e929 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 18 Dec 2024 09:14:28 +0000 Subject: [PATCH 43/97] python312Packages.linode-api: 5.22.0 -> 5.25.0 --- pkgs/development/python-modules/linode-api/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/linode-api/default.nix b/pkgs/development/python-modules/linode-api/default.nix index e98a78f9bc1d..86114e43b097 100644 --- a/pkgs/development/python-modules/linode-api/default.nix +++ b/pkgs/development/python-modules/linode-api/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "linode-api"; - version = "5.22.0"; + version = "5.25.0"; pyproject = true; disabled = pythonOlder "3.6"; @@ -23,8 +23,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "linode"; repo = "python-linode-api"; - rev = "refs/tags/v${version}"; - hash = "sha256-f9v9xhlOfSCKEWHmzi/tpoMIXccGwA6isoAAIZOf3r4="; + tag = "v${version}"; + hash = "sha256-rEBMZft4o7R2e0N7x1ZEaCisRmhKggMbZWdtDvraoD0="; }; nativeBuildInputs = [ setuptools ]; From 470956763783e67a2c24130bcb1dfa34b6284f68 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 11 Dec 2024 13:57:09 +0000 Subject: [PATCH 44/97] cairo-lang: 2.8.5 -> 2.9.2 --- pkgs/by-name/ca/cairo-lang/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cairo-lang/package.nix b/pkgs/by-name/ca/cairo-lang/package.nix index c7c6fb5d55b0..21a2201d1a30 100644 --- a/pkgs/by-name/ca/cairo-lang/package.nix +++ b/pkgs/by-name/ca/cairo-lang/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "cairo"; - version = "2.8.5"; + version = "2.9.2"; src = fetchFromGitHub { owner = "starkware-libs"; repo = "cairo"; rev = "v${version}"; - hash = "sha256-zNSQVMF5ciGGUBQyPFvIVtePNMbJ3e0LXBmRWMohoGA="; + hash = "sha256-zjgCOrTlIPN4aU0+FCohJmISPiwpppj3zO/7unVi/iU="; }; - cargoHash = "sha256-jVQErw89rCm9f3uJftmyytru1xQa+FKsUkszHJWBGNU="; + cargoHash = "sha256-2qm2hL4M2xHidRYF9Fhxxn2IG22mPEBZW5yhu6wPVDY="; # openssl crate requires perl during build process nativeBuildInputs = [ From 54d0eb383b8d09693c871d75477e371cd80cec5a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Dec 2024 20:44:09 +0000 Subject: [PATCH 45/97] python312Packages.awscrt: 0.23.0 -> 0.23.6 --- pkgs/development/python-modules/awscrt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/awscrt/default.nix b/pkgs/development/python-modules/awscrt/default.nix index ef55f5eebefc..050cbce9cf70 100644 --- a/pkgs/development/python-modules/awscrt/default.nix +++ b/pkgs/development/python-modules/awscrt/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "awscrt"; - version = "0.23.0"; + version = "0.23.6"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-/fV2FX2CMt3jjpnJ4XjhfWVa1yWmWna7eYO/6npPxig="; + hash = "sha256-FMT4E0TseXccmqk4AFlClu5+qknbD7n9FatmKiH634o="; }; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ From 0fc370504fd21c2866551ce8d7f31fb80d61422d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Dec 2024 10:24:07 +0000 Subject: [PATCH 46/97] python312Packages.panel: 1.5.1 -> 1.5.5 --- pkgs/development/python-modules/panel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/panel/default.nix b/pkgs/development/python-modules/panel/default.nix index ab7927abbc28..a2b34a52dcb7 100644 --- a/pkgs/development/python-modules/panel/default.nix +++ b/pkgs/development/python-modules/panel/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "panel"; - version = "1.5.1"; + version = "1.5.5"; format = "wheel"; @@ -25,7 +25,7 @@ buildPythonPackage rec { # tries to fetch even more artifacts src = fetchPypi { inherit pname version format; - hash = "sha256-cglT8X3x6tb5ewWluKdTNDi4lFUQqeJQIBSmHGAGDmI="; + hash = "sha256-MfdvzTr+OoawjPGstBAhK7XpkqgVxk/CMApYsllRVv0="; dist = "py3"; python = "py3"; }; From 7c9c25edc1aaa9481a5f0e47f82ff6c8c51b6baf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Dec 2024 11:43:50 +0000 Subject: [PATCH 47/97] python312Packages.strawberry-graphql: 0.253.1 -> 0.254.0 --- .../python-modules/strawberry-graphql/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/strawberry-graphql/default.nix b/pkgs/development/python-modules/strawberry-graphql/default.nix index 28e192318adc..986b87ef7273 100644 --- a/pkgs/development/python-modules/strawberry-graphql/default.nix +++ b/pkgs/development/python-modules/strawberry-graphql/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { pname = "strawberry-graphql"; - version = "0.253.1"; + version = "0.254.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -52,8 +52,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "strawberry-graphql"; repo = "strawberry"; - rev = "refs/tags/${version}"; - hash = "sha256-lerQynV/c0fLX+Du1j9bX0i2kvuWKmtH7RIBZxuDkK8="; + tag = version; + hash = "sha256-lD5TQvBxv4+1fuDHoX45kkTFRHrURRL2jLH/rPfCzzA="; }; postPatch = '' From db3e62b1f2f351bd31478fc3067a9de415d58a40 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Dec 2024 12:03:44 +0000 Subject: [PATCH 48/97] python312Packages.num2words: 0.5.13 -> 0.5.14 --- pkgs/development/python-modules/num2words/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/num2words/default.nix b/pkgs/development/python-modules/num2words/default.nix index cde2beff63bd..3e818f7c33f0 100644 --- a/pkgs/development/python-modules/num2words/default.nix +++ b/pkgs/development/python-modules/num2words/default.nix @@ -8,13 +8,13 @@ }: buildPythonPackage rec { - version = "0.5.13"; + version = "0.5.14"; format = "setuptools"; pname = "num2words"; src = fetchPypi { inherit pname version; - hash = "sha256-owZHFvu/kNdcRJRQzr+8c6ahPmOyUx0JvezDqxoiCc8="; + hash = "sha256-sGbsGOVrZhajs4CGtXR9qvuqiGiyJqNhJ+BFHAzzecY="; }; propagatedBuildInputs = [ docopt ]; From d59e60c4ac54d8a8fd301ebed0e79d8f7bfc31f1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 24 Dec 2024 17:34:24 +0000 Subject: [PATCH 49/97] coursier: 2.1.19 -> 2.1.22 --- pkgs/by-name/co/coursier/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/co/coursier/package.nix b/pkgs/by-name/co/coursier/package.nix index 37bf0f40d9a3..74fbec4ad226 100644 --- a/pkgs/by-name/co/coursier/package.nix +++ b/pkgs/by-name/co/coursier/package.nix @@ -20,11 +20,11 @@ let in stdenv.mkDerivation rec { pname = "coursier"; - version = "2.1.19"; + version = "2.1.22"; src = fetchurl { url = "https://github.com/coursier/coursier/releases/download/v${version}/coursier"; - hash = "sha256-E6LEi2m/BMCT9T5UYzMbIcoj42MKP2OIc27XGDMUI7w="; + hash = "sha256-0ugWgvG3AHt7h8F8W8kCksyx93YO51i5StqGAEZXGmg="; }; dontUnpack = true; From 1ed6811f3a508ef4b827a5f754b8ee13a9052a03 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 25 Dec 2024 00:22:14 +0000 Subject: [PATCH 50/97] python312Packages.berkeleydb: 18.1.10 -> 18.1.12 --- pkgs/development/python-modules/berkeleydb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/berkeleydb/default.nix b/pkgs/development/python-modules/berkeleydb/default.nix index efb065b17194..b82658ed4b8c 100644 --- a/pkgs/development/python-modules/berkeleydb/default.nix +++ b/pkgs/development/python-modules/berkeleydb/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "berkeleydb"; - version = "18.1.10"; + version = "18.1.12"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-QmNBoWAHqQAtmHpvTZcib46v/8saBIhIgFPTijEnyBo="; + hash = "sha256-SVqBecajayLQ+i9ogfp4PPdSIUooV2BSlgX2CBAd6yg="; }; build-system = [ setuptools ]; From f1d389fc1d51787e9bde68d0f141d295217cdea9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 26 Dec 2024 00:12:40 +0000 Subject: [PATCH 51/97] python312Packages.pyspellchecker: 0.8.1 -> 0.8.2 --- pkgs/development/python-modules/pyspellchecker/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyspellchecker/default.nix b/pkgs/development/python-modules/pyspellchecker/default.nix index e1696d0382a1..693863346bb7 100644 --- a/pkgs/development/python-modules/pyspellchecker/default.nix +++ b/pkgs/development/python-modules/pyspellchecker/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pyspellchecker"; - version = "0.8.1"; + version = "0.8.2"; format = "pyproject"; src = fetchFromGitHub { owner = "barrust"; repo = "pyspellchecker"; - rev = "refs/tags/v${version}"; - hash = "sha256-8IwTMj/RqMc9UqhzyvmrirPGuMEwj3iMr+FmF+8312U="; + tag = "v${version}"; + hash = "sha256-sQNYtm+EK/F4S/Kfy87MwqDjCfV33/v8bYi48UBz+qc="; }; nativeBuildInputs = [ setuptools ]; From 29c3471b7c632a06f540dcebbc4bd1a25a39aabd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 Dec 2024 07:28:25 +0000 Subject: [PATCH 52/97] python312Packages.limnoria: 2024.8.26 -> 2024.12.20 --- pkgs/development/python-modules/limnoria/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/limnoria/default.nix b/pkgs/development/python-modules/limnoria/default.nix index 3e53e25e0b1d..74ddf2035eb7 100644 --- a/pkgs/development/python-modules/limnoria/default.nix +++ b/pkgs/development/python-modules/limnoria/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "limnoria"; - version = "2024.8.26"; + version = "2024.12.20"; pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-X1Nvm7bccwHn9KIKQuRb+mLzUwEdeiLNkzyxKa2Jk8Y="; + hash = "sha256-e8YvB29tggssX8aMRSoLvprsSBWeKVKfhDrSZeA2rCQ="; }; build-system = [ setuptools ]; From 1a056e8bfe1db4d3045414dc6e732a96f6579d58 Mon Sep 17 00:00:00 2001 From: William G Underwood <42812654+WGUNDERWOOD@users.noreply.github.com> Date: Sun, 29 Dec 2024 00:17:56 +0000 Subject: [PATCH 53/97] tex-fmt: 0.4.7 -> 0.5.1 --- pkgs/by-name/te/tex-fmt/package.nix | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/te/tex-fmt/package.nix b/pkgs/by-name/te/tex-fmt/package.nix index f1a44bfda5fc..8a48ffb6f6f3 100644 --- a/pkgs/by-name/te/tex-fmt/package.nix +++ b/pkgs/by-name/te/tex-fmt/package.nix @@ -2,24 +2,36 @@ lib, fetchFromGitHub, rustPlatform, + installShellFiles, }: rustPlatform.buildRustPackage rec { pname = "tex-fmt"; - version = "0.4.7"; + version = "0.5.1"; src = fetchFromGitHub { owner = "WGUNDERWOOD"; repo = "tex-fmt"; rev = "refs/tags/v${version}"; - hash = "sha256-jVrd3yZ07+ppsdt+8sNKX1rdmU+UiRCyx80EMXdoK54="; + hash = "sha256-LeoV500tnvnvl869NXi4b4LpBvX1FclYJzYAcC0QVRo="; }; - cargoHash = "sha256-XQ1oEF+axp8pC6OkLlab1qI7RJeAyeSb58oChgaaS1s="; + cargoHash = "sha256-jjBPGrdCJ3zk/kuIImEXkZTI5+492yekt5+iNyYhHGM="; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installManPage man/tex-fmt.1 + installShellCompletion \ + --bash completion/tex-fmt.bash \ + --fish completion/tex-fmt.fish \ + --zsh completion/_tex-fmt + ''; meta = { description = "LaTeX formatter written in Rust"; homepage = "https://github.com/WGUNDERWOOD/tex-fmt"; + changelog = "https://github.com/WGUNDERWOOD/tex-fmt/releases/tag/v${version}"; license = lib.licenses.mit; mainProgram = "tex-fmt"; maintainers = with lib.maintainers; [ wgunderwood ]; From 95cafc46cc55a84fe3f7b02f45591fd74eea6634 Mon Sep 17 00:00:00 2001 From: Korrat Date: Sun, 29 Dec 2024 09:58:10 +0100 Subject: [PATCH 54/97] ardour: switch to librdf_raptor2 Since both lrdf and librdf_rasqal propagate librdf_raptor2, this patch removes the direct dependency. --- pkgs/applications/audio/ardour/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix index b81b3a1283d3..f923356b5604 100644 --- a/pkgs/applications/audio/ardour/default.nix +++ b/pkgs/applications/audio/ardour/default.nix @@ -29,7 +29,6 @@ , libltc , libogg , libpulseaudio -, librdf_raptor , librdf_rasqal , libsamplerate , libsigcxx @@ -133,7 +132,6 @@ stdenv.mkDerivation rec { libltc libogg libpulseaudio - librdf_raptor librdf_rasqal libsamplerate libsigcxx From 9e85f4b4a99b81712225f4fe4a055a34f28cfba6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 29 Dec 2024 15:49:18 +0000 Subject: [PATCH 55/97] python312Packages.githubkit: 0.12.1 -> 0.12.3 --- pkgs/development/python-modules/githubkit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/githubkit/default.nix b/pkgs/development/python-modules/githubkit/default.nix index 1937656cba93..7cf3361a6604 100644 --- a/pkgs/development/python-modules/githubkit/default.nix +++ b/pkgs/development/python-modules/githubkit/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "githubkit"; - version = "0.12.1"; + version = "0.12.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "yanyongyu"; repo = "githubkit"; tag = "v${version}"; - hash = "sha256-ewPCALnkGDhzxn3P9GO5QUaFZDhqsbQNeCmyTCXd7kE="; + hash = "sha256-sI24tSvwbh+zPTPVjkNlBg7TM6D5qMxfeF4pfj+6Q+E="; }; pythonRelaxDeps = [ "hishel" ]; From 78ca1422a5f25788a0486ee1e836068d42f69e67 Mon Sep 17 00:00:00 2001 From: Sergei Zimmerman <145775305+xokdvium@users.noreply.github.com> Date: Sun, 29 Dec 2024 12:17:33 +0300 Subject: [PATCH 56/97] avro-cpp: 1.11.3 -> 1.12.0 This is a major change to the public API. Now avro-cpp public headers depend on fmt as well as boost. The build system tries to do FetchContent on fmtlib unconditionally, which requires patching to circumvent. Looks like the least painful thing to do is to propagate both boost and fmt and hope that dependant packages don't break too much. --- .../0001-get-rid-of-fmt-fetchcontent.patch | 21 ++++++++++++++++ pkgs/by-name/av/avro-cpp/package.nix | 25 +++++++------------ 2 files changed, 30 insertions(+), 16 deletions(-) create mode 100644 pkgs/by-name/av/avro-cpp/0001-get-rid-of-fmt-fetchcontent.patch diff --git a/pkgs/by-name/av/avro-cpp/0001-get-rid-of-fmt-fetchcontent.patch b/pkgs/by-name/av/avro-cpp/0001-get-rid-of-fmt-fetchcontent.patch new file mode 100644 index 000000000000..09ff008d332c --- /dev/null +++ b/pkgs/by-name/av/avro-cpp/0001-get-rid-of-fmt-fetchcontent.patch @@ -0,0 +1,21 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 19059a41b..6e3ae0ad7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -82,15 +82,7 @@ endif () + find_package (Boost 1.38 REQUIRED + COMPONENTS filesystem iostreams program_options regex system) + +-include(FetchContent) +-FetchContent_Declare( +- fmt +- GIT_REPOSITORY https://github.com/fmtlib/fmt.git +- GIT_TAG 10.2.1 +- GIT_PROGRESS TRUE +- USES_TERMINAL_DOWNLOAD TRUE +-) +-FetchContent_MakeAvailable(fmt) ++find_package(fmt REQUIRED) + + find_package(Snappy) + if (SNAPPY_FOUND) diff --git a/pkgs/by-name/av/avro-cpp/package.nix b/pkgs/by-name/av/avro-cpp/package.nix index f82ef1924dbe..a21d247bb272 100644 --- a/pkgs/by-name/av/avro-cpp/package.nix +++ b/pkgs/by-name/av/avro-cpp/package.nix @@ -2,41 +2,34 @@ lib, stdenv, fetchurl, - fetchpatch, cmake, boost, python3, + fmt, }: stdenv.mkDerivation rec { pname = "avro-c++"; - version = "1.11.3"; + version = "1.12.0"; src = fetchurl { url = "mirror://apache/avro/avro-${version}/cpp/avro-cpp-${version}.tar.gz"; - hash = "sha256-+6JCrvd+yBnQdWH8upN1FyGVbejQyujh8vMAtUszG64="; + hash = "sha256-8u33cSanWw7BrRZncr4Fg1HOo9dESL5+LO8gBQwPmKs="; }; + patches = [ - # This patch fixes boost compatibility and can be removed when - # upgrading beyond 1.11.3 https://github.com/apache/avro/pull/1920 - (fetchpatch { - name = "fix-boost-compatibility.patch"; - url = "https://github.com/apache/avro/commit/016323828f147f185d03f50d2223a2f50bfafce1.patch"; - hash = "sha256-hP/5J2JzSplMvg8EjEk98Vim8DfTyZ4hZ/WGiVwvM1A="; - }) + ./0001-get-rid-of-fmt-fetchcontent.patch ]; - patchFlags = [ "-p3" ]; nativeBuildInputs = [ cmake python3 ]; - buildInputs = [ boost ]; - preConfigure = '' - substituteInPlace test/SchemaTests.cc --replace "BOOST_CHECKPOINT" "BOOST_TEST_CHECKPOINT" - substituteInPlace test/buffertest.cc --replace "BOOST_MESSAGE" "BOOST_TEST_MESSAGE" - ''; + propagatedBuildInputs = [ + boost + fmt + ]; meta = { description = "C++ library which implements parts of the Avro Specification"; From def661a1ae187db45baaf52162e3aa01624dedd9 Mon Sep 17 00:00:00 2001 From: Sergei Zimmerman <145775305+xokdvium@users.noreply.github.com> Date: Sun, 29 Dec 2024 12:38:22 +0300 Subject: [PATCH 57/97] avro-cpp: enable tests Unit tests are built unconditionally by the build system. Might as well run them, since they take very little time to execute. --- pkgs/by-name/av/avro-cpp/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/av/avro-cpp/package.nix b/pkgs/by-name/av/avro-cpp/package.nix index a21d247bb272..753b374e9039 100644 --- a/pkgs/by-name/av/avro-cpp/package.nix +++ b/pkgs/by-name/av/avro-cpp/package.nix @@ -31,6 +31,8 @@ stdenv.mkDerivation rec { fmt ]; + doCheck = true; + meta = { description = "C++ library which implements parts of the Avro Specification"; mainProgram = "avrogencpp"; From ba1797363431e25f95466ab2cb9d357c5a0bce4a Mon Sep 17 00:00:00 2001 From: Sergei Zimmerman <145775305+xokdvium@users.noreply.github.com> Date: Sun, 29 Dec 2024 12:45:38 +0300 Subject: [PATCH 58/97] avro-cpp: use versionCheckHook --- pkgs/by-name/av/avro-cpp/package.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/by-name/av/avro-cpp/package.nix b/pkgs/by-name/av/avro-cpp/package.nix index 753b374e9039..b0bd09a65756 100644 --- a/pkgs/by-name/av/avro-cpp/package.nix +++ b/pkgs/by-name/av/avro-cpp/package.nix @@ -6,6 +6,7 @@ boost, python3, fmt, + versionCheckHook, }: stdenv.mkDerivation rec { @@ -33,6 +34,13 @@ stdenv.mkDerivation rec { doCheck = true; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + doInstallCheck = true; + versionCheckProgram = "${placeholder "out"}/bin/avrogencpp"; + versionCheckProgramArg = [ "--version" ]; + meta = { description = "C++ library which implements parts of the Avro Specification"; mainProgram = "avrogencpp"; From 205802ea4001b5d661f8450533cb51247760f1cc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 30 Dec 2024 13:45:49 +0000 Subject: [PATCH 59/97] python312Packages.oci: 2.139.0 -> 2.141.1 --- pkgs/development/python-modules/oci/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/oci/default.nix b/pkgs/development/python-modules/oci/default.nix index 7bc6e2f1da4d..eb3346301a59 100644 --- a/pkgs/development/python-modules/oci/default.nix +++ b/pkgs/development/python-modules/oci/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "oci"; - version = "2.139.0"; + version = "2.141.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "oracle"; repo = "oci-python-sdk"; tag = "v${version}"; - hash = "sha256-FjP68c1h97KwCCuqLVB677YyR4/HMstGfwlLUqdtNLU="; + hash = "sha256-D2iaEK25ryU1oRRahnlC3wuEIxtyjR6rAa7TXFTaRi4="; }; pythonRelaxDeps = [ From 1fdba131451fc1a98207241b03440d0fa871b81f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 30 Dec 2024 16:20:55 +0000 Subject: [PATCH 60/97] python312Packages.redshift-connector: 2.1.3 -> 2.1.5 --- .../python-modules/redshift-connector/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/redshift-connector/default.nix b/pkgs/development/python-modules/redshift-connector/default.nix index 6273cd695f39..af6ffede5aed 100644 --- a/pkgs/development/python-modules/redshift-connector/default.nix +++ b/pkgs/development/python-modules/redshift-connector/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "redshift-connector"; - version = "2.1.3"; + version = "2.1.5"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -24,8 +24,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "aws"; repo = "amazon-redshift-python-driver"; - rev = "refs/tags/v${version}"; - hash = "sha256-NjUgmvmy0buBFpXjcEsZU0F2JNeXE3GBpkaxClvo4T0="; + tag = "v${version}"; + hash = "sha256-q8OF8osAfnAXL1BSgnhE3vQpLHfD/8vPeU2+wCCGSQs="; }; # remove addops as they add test directory and coverage parameters to pytest From c24cf895bab315be0f1fc32c9ea68fb6d83586ca Mon Sep 17 00:00:00 2001 From: lucasew Date: Mon, 30 Dec 2024 15:50:27 -0300 Subject: [PATCH 61/97] flexget: 3.13.2 -> 3.13.5 Signed-off-by: lucasew --- pkgs/by-name/fl/flexget/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fl/flexget/package.nix b/pkgs/by-name/fl/flexget/package.nix index e16386bcf7a7..58d027701ec9 100644 --- a/pkgs/by-name/fl/flexget/package.nix +++ b/pkgs/by-name/fl/flexget/package.nix @@ -6,7 +6,7 @@ python3.pkgs.buildPythonApplication rec { pname = "flexget"; - version = "3.13.2"; + version = "3.13.5"; pyproject = true; # Fetch from GitHub in order to use `requirements.in` @@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec { owner = "Flexget"; repo = "Flexget"; tag = "v${version}"; - hash = "sha256-UjKYHZwAOOv3Adj13r2zJkVmxwEpJLQk87UslddX9Qk="; + hash = "sha256-R6E5NWnrnezJsDm+Nnqgibv4e6mXVrOrKaCl/MBqUnY="; }; # relax dep constrains, keep environment constraints From 3c65f3d84651fd1b120db0d26bc140f6275aafec Mon Sep 17 00:00:00 2001 From: Emily Date: Mon, 30 Dec 2024 19:42:51 +0000 Subject: [PATCH 62/97] flattenReferencesGraph: avoid `lib.fileset` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I am not sure `nix-gitignore.gitignoreSource` fares any better with chroot stores, but so far it’s always been `lib.fileset` that has caused issues with the installer ISO, and a blanket ban on `lib.fileset` seems like the simplest remedy unless it turns out that one of the other source filtering helpers causes issues. This could probably be omitted entirely as it’s just an aid for development convenience, anyway. This reverts commit ba5a5fac7bb68edfb1de329ca037ebe0d4094560. This reverts commit 9ae0f7757760d269c0f3865aed98a3dfaafd6d3d. --- pkgs/by-name/fl/flattenReferencesGraph/package.nix | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/fl/flattenReferencesGraph/package.nix b/pkgs/by-name/fl/flattenReferencesGraph/package.nix index 9adb9a320e0c..c3c7edb17609 100644 --- a/pkgs/by-name/fl/flattenReferencesGraph/package.nix +++ b/pkgs/by-name/fl/flattenReferencesGraph/package.nix @@ -1,25 +1,19 @@ { callPackage, - lib, + nix-gitignore, python3Packages, }: let - inherit (lib) fileset; helpers = callPackage ./helpers.nix { }; pythonPackages = python3Packages; + in pythonPackages.buildPythonApplication { version = "0.1.0"; pname = "flatten-references-graph"; - src = fileset.toSource { - root = ./src; - fileset = fileset.unions [ - ./src/.flake8 - ./src/flatten_references_graph - ./src/setup.py - ]; - }; + # Note: this uses only ./src/.gitignore + src = nix-gitignore.gitignoreSource [ ] ./src; propagatedBuildInputs = with pythonPackages; [ igraph From 2eae7d63e29c74afb9bca17746528dc62ba5486d Mon Sep 17 00:00:00 2001 From: Emily Date: Mon, 30 Dec 2024 20:09:11 +0000 Subject: [PATCH 63/97] nixpkgs-manual: avoid `lib.fileset` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I don’t love this, and I’m not convinced it doesn’t have the same pitfalls as filesets, but see the `flattenReferencesGraph` commit for reasoning. It may be better to ban the relevant builtins entirely and just move things into subdirectories when needed, but I didn’t want to do more surgery to this part of the tree than necessary to solve the immediate problem. --- doc/doc-support/lib-function-docs.nix | 7 +++---- doc/doc-support/package.nix | 26 ++++++++++++++++---------- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/doc/doc-support/lib-function-docs.nix b/doc/doc-support/lib-function-docs.nix index 51b4601975c3..9a2f0667dd60 100644 --- a/doc/doc-support/lib-function-docs.nix +++ b/doc/doc-support/lib-function-docs.nix @@ -90,10 +90,7 @@ stdenvNoCC.mkDerivation { name = "nixpkgs-lib-docs"; - src = lib.fileset.toSource { - root = ../..; - fileset = ../../lib; - }; + src = ../../lib; nativeBuildInputs = [ nixdoc @@ -101,6 +98,8 @@ stdenvNoCC.mkDerivation { ]; installPhase = '' + cd .. + export NIX_STATE_DIR=$(mktemp -d) nix-instantiate --eval --strict --json ${./lib-function-locations.nix} \ --arg nixpkgsPath "./." \ diff --git a/doc/doc-support/package.nix b/doc/doc-support/package.nix index c2bbdf09e533..bc5566f3cbd3 100644 --- a/doc/doc-support/package.nix +++ b/doc/doc-support/package.nix @@ -25,16 +25,22 @@ stdenvNoCC.mkDerivation ( nativeBuildInputs = [ nixos-render-docs ]; - src = lib.fileset.toSource { - root = ../.; - fileset = lib.fileset.unions [ - (lib.fileset.fileFilter (file: file.hasExt "md" || file.hasExt "md.in") ../.) - ../style.css - ../anchor-use.js - ../anchor.min.js - ../manpage-urls.json - ../redirects.json - ]; + src = lib.cleanSourceWith { + src = ../.; + filter = + path: type: + type == "directory" + || lib.hasSuffix ".md" path + || lib.hasSuffix ".md.in" path + || lib.elem path ( + map toString [ + ../style.css + ../anchor-use.js + ../anchor.min.js + ../manpage-urls.json + ../redirects.json + ] + ); }; postPatch = '' From f6ce575a03505ef90dbb864009058ac8d1392c3f Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 31 Dec 2024 00:14:30 +0000 Subject: [PATCH 64/97] nixos/test-driver: avoid `lib.fileset` --- nixos/lib/test-driver/default.nix | 12 +----------- .../lib/test-driver/nixos-test-driver-docstrings.nix | 2 +- .../lib/test-driver/{ => src}/extract-docstrings.py | 0 nixos/lib/test-driver/{ => src}/pyproject.toml | 0 .../test-driver/{ => src}/test_driver/__init__.py | 0 .../lib/test-driver/{ => src}/test_driver/driver.py | 0 .../lib/test-driver/{ => src}/test_driver/logger.py | 0 .../lib/test-driver/{ => src}/test_driver/machine.py | 0 .../{ => src}/test_driver/polling_condition.py | 0 nixos/lib/test-driver/{ => src}/test_driver/py.typed | 0 nixos/lib/test-driver/{ => src}/test_driver/qmp.py | 0 nixos/lib/test-driver/{ => src}/test_driver/vlan.py | 0 12 files changed, 2 insertions(+), 12 deletions(-) rename nixos/lib/test-driver/{ => src}/extract-docstrings.py (100%) rename nixos/lib/test-driver/{ => src}/pyproject.toml (100%) rename nixos/lib/test-driver/{ => src}/test_driver/__init__.py (100%) rename nixos/lib/test-driver/{ => src}/test_driver/driver.py (100%) rename nixos/lib/test-driver/{ => src}/test_driver/logger.py (100%) rename nixos/lib/test-driver/{ => src}/test_driver/machine.py (100%) rename nixos/lib/test-driver/{ => src}/test_driver/polling_condition.py (100%) rename nixos/lib/test-driver/{ => src}/test_driver/py.typed (100%) rename nixos/lib/test-driver/{ => src}/test_driver/qmp.py (100%) rename nixos/lib/test-driver/{ => src}/test_driver/vlan.py (100%) diff --git a/nixos/lib/test-driver/default.nix b/nixos/lib/test-driver/default.nix index 35471f74949c..f22744806d48 100644 --- a/nixos/lib/test-driver/default.nix +++ b/nixos/lib/test-driver/default.nix @@ -14,22 +14,12 @@ extraPythonPackages ? (_: [ ]), nixosTests, }: -let - fs = lib.fileset; -in python3Packages.buildPythonApplication { pname = "nixos-test-driver"; version = "1.1"; pyproject = true; - src = fs.toSource { - root = ./.; - fileset = fs.unions [ - ./pyproject.toml - ./test_driver - ./extract-docstrings.py - ]; - }; + src = ./src; build-system = with python3Packages; [ setuptools diff --git a/nixos/lib/test-driver/nixos-test-driver-docstrings.nix b/nixos/lib/test-driver/nixos-test-driver-docstrings.nix index b76da9ac5fb2..b6450685e047 100644 --- a/nixos/lib/test-driver/nixos-test-driver-docstrings.nix +++ b/nixos/lib/test-driver/nixos-test-driver-docstrings.nix @@ -11,6 +11,6 @@ in runCommand "nixos-test-driver-docstrings" env '' mkdir $out - python3 ${./extract-docstrings.py} ${./test_driver/machine.py} \ + python3 ${./src/extract-docstrings.py} ${./src/test_driver/machine.py} \ > $out/machine-methods.md '' diff --git a/nixos/lib/test-driver/extract-docstrings.py b/nixos/lib/test-driver/src/extract-docstrings.py similarity index 100% rename from nixos/lib/test-driver/extract-docstrings.py rename to nixos/lib/test-driver/src/extract-docstrings.py diff --git a/nixos/lib/test-driver/pyproject.toml b/nixos/lib/test-driver/src/pyproject.toml similarity index 100% rename from nixos/lib/test-driver/pyproject.toml rename to nixos/lib/test-driver/src/pyproject.toml diff --git a/nixos/lib/test-driver/test_driver/__init__.py b/nixos/lib/test-driver/src/test_driver/__init__.py similarity index 100% rename from nixos/lib/test-driver/test_driver/__init__.py rename to nixos/lib/test-driver/src/test_driver/__init__.py diff --git a/nixos/lib/test-driver/test_driver/driver.py b/nixos/lib/test-driver/src/test_driver/driver.py similarity index 100% rename from nixos/lib/test-driver/test_driver/driver.py rename to nixos/lib/test-driver/src/test_driver/driver.py diff --git a/nixos/lib/test-driver/test_driver/logger.py b/nixos/lib/test-driver/src/test_driver/logger.py similarity index 100% rename from nixos/lib/test-driver/test_driver/logger.py rename to nixos/lib/test-driver/src/test_driver/logger.py diff --git a/nixos/lib/test-driver/test_driver/machine.py b/nixos/lib/test-driver/src/test_driver/machine.py similarity index 100% rename from nixos/lib/test-driver/test_driver/machine.py rename to nixos/lib/test-driver/src/test_driver/machine.py diff --git a/nixos/lib/test-driver/test_driver/polling_condition.py b/nixos/lib/test-driver/src/test_driver/polling_condition.py similarity index 100% rename from nixos/lib/test-driver/test_driver/polling_condition.py rename to nixos/lib/test-driver/src/test_driver/polling_condition.py diff --git a/nixos/lib/test-driver/test_driver/py.typed b/nixos/lib/test-driver/src/test_driver/py.typed similarity index 100% rename from nixos/lib/test-driver/test_driver/py.typed rename to nixos/lib/test-driver/src/test_driver/py.typed diff --git a/nixos/lib/test-driver/test_driver/qmp.py b/nixos/lib/test-driver/src/test_driver/qmp.py similarity index 100% rename from nixos/lib/test-driver/test_driver/qmp.py rename to nixos/lib/test-driver/src/test_driver/qmp.py diff --git a/nixos/lib/test-driver/test_driver/vlan.py b/nixos/lib/test-driver/src/test_driver/vlan.py similarity index 100% rename from nixos/lib/test-driver/test_driver/vlan.py rename to nixos/lib/test-driver/src/test_driver/vlan.py From 6ff076b1b121970ed13a38ffee0f58b540d417e8 Mon Sep 17 00:00:00 2001 From: Emily Date: Mon, 30 Dec 2024 19:24:54 +0000 Subject: [PATCH 65/97] tests.makeBinaryWrapper: avoid `lib.fileset` --- .../make-binary-wrapper/{ => add-flags}/add-flags.c | 0 .../{ => add-flags}/add-flags.cmdline | 0 .../make-binary-wrapper/{ => add-flags}/add-flags.env | 0 pkgs/test/make-binary-wrapper/{ => argv0}/argv0.c | 0 .../make-binary-wrapper/{ => argv0}/argv0.cmdline | 0 pkgs/test/make-binary-wrapper/{ => argv0}/argv0.env | 0 pkgs/test/make-binary-wrapper/{ => basic}/basic.c | 0 .../make-binary-wrapper/{ => basic}/basic.cmdline | 0 pkgs/test/make-binary-wrapper/{ => basic}/basic.env | 0 pkgs/test/make-binary-wrapper/{ => chdir}/chdir.c | 0 .../make-binary-wrapper/{ => chdir}/chdir.cmdline | 0 pkgs/test/make-binary-wrapper/{ => chdir}/chdir.env | 0 .../{ => combination}/combination.c | 0 .../{ => combination}/combination.cmdline | 0 .../{ => combination}/combination.env | 0 pkgs/test/make-binary-wrapper/default.nix | 11 +---------- pkgs/test/make-binary-wrapper/{ => env}/env.c | 0 pkgs/test/make-binary-wrapper/{ => env}/env.cmdline | 0 pkgs/test/make-binary-wrapper/{ => env}/env.env | 0 .../{ => inherit-argv0}/inherit-argv0.c | 0 .../{ => inherit-argv0}/inherit-argv0.cmdline | 0 .../{ => inherit-argv0}/inherit-argv0.env | 0 .../{ => invalid-env}/invalid-env.c | 0 .../{ => invalid-env}/invalid-env.cmdline | 0 .../{ => overlength-strings}/overlength-strings.c | 0 .../overlength-strings.cmdline | 0 .../{ => overlength-strings}/overlength-strings.env | 0 pkgs/test/make-binary-wrapper/{ => prefix}/prefix.c | 0 .../make-binary-wrapper/{ => prefix}/prefix.cmdline | 0 pkgs/test/make-binary-wrapper/{ => prefix}/prefix.env | 0 pkgs/test/make-binary-wrapper/{ => suffix}/suffix.c | 0 .../make-binary-wrapper/{ => suffix}/suffix.cmdline | 0 pkgs/test/make-binary-wrapper/{ => suffix}/suffix.env | 0 33 files changed, 1 insertion(+), 10 deletions(-) rename pkgs/test/make-binary-wrapper/{ => add-flags}/add-flags.c (100%) rename pkgs/test/make-binary-wrapper/{ => add-flags}/add-flags.cmdline (100%) rename pkgs/test/make-binary-wrapper/{ => add-flags}/add-flags.env (100%) rename pkgs/test/make-binary-wrapper/{ => argv0}/argv0.c (100%) rename pkgs/test/make-binary-wrapper/{ => argv0}/argv0.cmdline (100%) rename pkgs/test/make-binary-wrapper/{ => argv0}/argv0.env (100%) rename pkgs/test/make-binary-wrapper/{ => basic}/basic.c (100%) rename pkgs/test/make-binary-wrapper/{ => basic}/basic.cmdline (100%) rename pkgs/test/make-binary-wrapper/{ => basic}/basic.env (100%) rename pkgs/test/make-binary-wrapper/{ => chdir}/chdir.c (100%) rename pkgs/test/make-binary-wrapper/{ => chdir}/chdir.cmdline (100%) rename pkgs/test/make-binary-wrapper/{ => chdir}/chdir.env (100%) rename pkgs/test/make-binary-wrapper/{ => combination}/combination.c (100%) rename pkgs/test/make-binary-wrapper/{ => combination}/combination.cmdline (100%) rename pkgs/test/make-binary-wrapper/{ => combination}/combination.env (100%) rename pkgs/test/make-binary-wrapper/{ => env}/env.c (100%) rename pkgs/test/make-binary-wrapper/{ => env}/env.cmdline (100%) rename pkgs/test/make-binary-wrapper/{ => env}/env.env (100%) rename pkgs/test/make-binary-wrapper/{ => inherit-argv0}/inherit-argv0.c (100%) rename pkgs/test/make-binary-wrapper/{ => inherit-argv0}/inherit-argv0.cmdline (100%) rename pkgs/test/make-binary-wrapper/{ => inherit-argv0}/inherit-argv0.env (100%) rename pkgs/test/make-binary-wrapper/{ => invalid-env}/invalid-env.c (100%) rename pkgs/test/make-binary-wrapper/{ => invalid-env}/invalid-env.cmdline (100%) rename pkgs/test/make-binary-wrapper/{ => overlength-strings}/overlength-strings.c (100%) rename pkgs/test/make-binary-wrapper/{ => overlength-strings}/overlength-strings.cmdline (100%) rename pkgs/test/make-binary-wrapper/{ => overlength-strings}/overlength-strings.env (100%) rename pkgs/test/make-binary-wrapper/{ => prefix}/prefix.c (100%) rename pkgs/test/make-binary-wrapper/{ => prefix}/prefix.cmdline (100%) rename pkgs/test/make-binary-wrapper/{ => prefix}/prefix.env (100%) rename pkgs/test/make-binary-wrapper/{ => suffix}/suffix.c (100%) rename pkgs/test/make-binary-wrapper/{ => suffix}/suffix.cmdline (100%) rename pkgs/test/make-binary-wrapper/{ => suffix}/suffix.env (100%) diff --git a/pkgs/test/make-binary-wrapper/add-flags.c b/pkgs/test/make-binary-wrapper/add-flags/add-flags.c similarity index 100% rename from pkgs/test/make-binary-wrapper/add-flags.c rename to pkgs/test/make-binary-wrapper/add-flags/add-flags.c diff --git a/pkgs/test/make-binary-wrapper/add-flags.cmdline b/pkgs/test/make-binary-wrapper/add-flags/add-flags.cmdline similarity index 100% rename from pkgs/test/make-binary-wrapper/add-flags.cmdline rename to pkgs/test/make-binary-wrapper/add-flags/add-flags.cmdline diff --git a/pkgs/test/make-binary-wrapper/add-flags.env b/pkgs/test/make-binary-wrapper/add-flags/add-flags.env similarity index 100% rename from pkgs/test/make-binary-wrapper/add-flags.env rename to pkgs/test/make-binary-wrapper/add-flags/add-flags.env diff --git a/pkgs/test/make-binary-wrapper/argv0.c b/pkgs/test/make-binary-wrapper/argv0/argv0.c similarity index 100% rename from pkgs/test/make-binary-wrapper/argv0.c rename to pkgs/test/make-binary-wrapper/argv0/argv0.c diff --git a/pkgs/test/make-binary-wrapper/argv0.cmdline b/pkgs/test/make-binary-wrapper/argv0/argv0.cmdline similarity index 100% rename from pkgs/test/make-binary-wrapper/argv0.cmdline rename to pkgs/test/make-binary-wrapper/argv0/argv0.cmdline diff --git a/pkgs/test/make-binary-wrapper/argv0.env b/pkgs/test/make-binary-wrapper/argv0/argv0.env similarity index 100% rename from pkgs/test/make-binary-wrapper/argv0.env rename to pkgs/test/make-binary-wrapper/argv0/argv0.env diff --git a/pkgs/test/make-binary-wrapper/basic.c b/pkgs/test/make-binary-wrapper/basic/basic.c similarity index 100% rename from pkgs/test/make-binary-wrapper/basic.c rename to pkgs/test/make-binary-wrapper/basic/basic.c diff --git a/pkgs/test/make-binary-wrapper/basic.cmdline b/pkgs/test/make-binary-wrapper/basic/basic.cmdline similarity index 100% rename from pkgs/test/make-binary-wrapper/basic.cmdline rename to pkgs/test/make-binary-wrapper/basic/basic.cmdline diff --git a/pkgs/test/make-binary-wrapper/basic.env b/pkgs/test/make-binary-wrapper/basic/basic.env similarity index 100% rename from pkgs/test/make-binary-wrapper/basic.env rename to pkgs/test/make-binary-wrapper/basic/basic.env diff --git a/pkgs/test/make-binary-wrapper/chdir.c b/pkgs/test/make-binary-wrapper/chdir/chdir.c similarity index 100% rename from pkgs/test/make-binary-wrapper/chdir.c rename to pkgs/test/make-binary-wrapper/chdir/chdir.c diff --git a/pkgs/test/make-binary-wrapper/chdir.cmdline b/pkgs/test/make-binary-wrapper/chdir/chdir.cmdline similarity index 100% rename from pkgs/test/make-binary-wrapper/chdir.cmdline rename to pkgs/test/make-binary-wrapper/chdir/chdir.cmdline diff --git a/pkgs/test/make-binary-wrapper/chdir.env b/pkgs/test/make-binary-wrapper/chdir/chdir.env similarity index 100% rename from pkgs/test/make-binary-wrapper/chdir.env rename to pkgs/test/make-binary-wrapper/chdir/chdir.env diff --git a/pkgs/test/make-binary-wrapper/combination.c b/pkgs/test/make-binary-wrapper/combination/combination.c similarity index 100% rename from pkgs/test/make-binary-wrapper/combination.c rename to pkgs/test/make-binary-wrapper/combination/combination.c diff --git a/pkgs/test/make-binary-wrapper/combination.cmdline b/pkgs/test/make-binary-wrapper/combination/combination.cmdline similarity index 100% rename from pkgs/test/make-binary-wrapper/combination.cmdline rename to pkgs/test/make-binary-wrapper/combination/combination.cmdline diff --git a/pkgs/test/make-binary-wrapper/combination.env b/pkgs/test/make-binary-wrapper/combination/combination.env similarity index 100% rename from pkgs/test/make-binary-wrapper/combination.env rename to pkgs/test/make-binary-wrapper/combination/combination.env diff --git a/pkgs/test/make-binary-wrapper/default.nix b/pkgs/test/make-binary-wrapper/default.nix index 036b70f7594e..6f086de299a0 100644 --- a/pkgs/test/make-binary-wrapper/default.nix +++ b/pkgs/test/make-binary-wrapper/default.nix @@ -20,16 +20,7 @@ let runCommand "make-binary-wrapper-test-${testname}" env '' mkdir -p tmp/foo # for the chdir test - source=${ - lib.fileset.toSource { - root = ./.; - fileset = lib.fileset.unions [ - (./. + "/${testname}.cmdline") - (./. + "/${testname}.c") - (lib.fileset.maybeMissing (./. + "/${testname}.env")) - ]; - } - } + source=${./${testname}} params=$(<"$source/${testname}.cmdline") eval "makeCWrapper /send/me/flags $params" > wrapper.c diff --git a/pkgs/test/make-binary-wrapper/env.c b/pkgs/test/make-binary-wrapper/env/env.c similarity index 100% rename from pkgs/test/make-binary-wrapper/env.c rename to pkgs/test/make-binary-wrapper/env/env.c diff --git a/pkgs/test/make-binary-wrapper/env.cmdline b/pkgs/test/make-binary-wrapper/env/env.cmdline similarity index 100% rename from pkgs/test/make-binary-wrapper/env.cmdline rename to pkgs/test/make-binary-wrapper/env/env.cmdline diff --git a/pkgs/test/make-binary-wrapper/env.env b/pkgs/test/make-binary-wrapper/env/env.env similarity index 100% rename from pkgs/test/make-binary-wrapper/env.env rename to pkgs/test/make-binary-wrapper/env/env.env diff --git a/pkgs/test/make-binary-wrapper/inherit-argv0.c b/pkgs/test/make-binary-wrapper/inherit-argv0/inherit-argv0.c similarity index 100% rename from pkgs/test/make-binary-wrapper/inherit-argv0.c rename to pkgs/test/make-binary-wrapper/inherit-argv0/inherit-argv0.c diff --git a/pkgs/test/make-binary-wrapper/inherit-argv0.cmdline b/pkgs/test/make-binary-wrapper/inherit-argv0/inherit-argv0.cmdline similarity index 100% rename from pkgs/test/make-binary-wrapper/inherit-argv0.cmdline rename to pkgs/test/make-binary-wrapper/inherit-argv0/inherit-argv0.cmdline diff --git a/pkgs/test/make-binary-wrapper/inherit-argv0.env b/pkgs/test/make-binary-wrapper/inherit-argv0/inherit-argv0.env similarity index 100% rename from pkgs/test/make-binary-wrapper/inherit-argv0.env rename to pkgs/test/make-binary-wrapper/inherit-argv0/inherit-argv0.env diff --git a/pkgs/test/make-binary-wrapper/invalid-env.c b/pkgs/test/make-binary-wrapper/invalid-env/invalid-env.c similarity index 100% rename from pkgs/test/make-binary-wrapper/invalid-env.c rename to pkgs/test/make-binary-wrapper/invalid-env/invalid-env.c diff --git a/pkgs/test/make-binary-wrapper/invalid-env.cmdline b/pkgs/test/make-binary-wrapper/invalid-env/invalid-env.cmdline similarity index 100% rename from pkgs/test/make-binary-wrapper/invalid-env.cmdline rename to pkgs/test/make-binary-wrapper/invalid-env/invalid-env.cmdline diff --git a/pkgs/test/make-binary-wrapper/overlength-strings.c b/pkgs/test/make-binary-wrapper/overlength-strings/overlength-strings.c similarity index 100% rename from pkgs/test/make-binary-wrapper/overlength-strings.c rename to pkgs/test/make-binary-wrapper/overlength-strings/overlength-strings.c diff --git a/pkgs/test/make-binary-wrapper/overlength-strings.cmdline b/pkgs/test/make-binary-wrapper/overlength-strings/overlength-strings.cmdline similarity index 100% rename from pkgs/test/make-binary-wrapper/overlength-strings.cmdline rename to pkgs/test/make-binary-wrapper/overlength-strings/overlength-strings.cmdline diff --git a/pkgs/test/make-binary-wrapper/overlength-strings.env b/pkgs/test/make-binary-wrapper/overlength-strings/overlength-strings.env similarity index 100% rename from pkgs/test/make-binary-wrapper/overlength-strings.env rename to pkgs/test/make-binary-wrapper/overlength-strings/overlength-strings.env diff --git a/pkgs/test/make-binary-wrapper/prefix.c b/pkgs/test/make-binary-wrapper/prefix/prefix.c similarity index 100% rename from pkgs/test/make-binary-wrapper/prefix.c rename to pkgs/test/make-binary-wrapper/prefix/prefix.c diff --git a/pkgs/test/make-binary-wrapper/prefix.cmdline b/pkgs/test/make-binary-wrapper/prefix/prefix.cmdline similarity index 100% rename from pkgs/test/make-binary-wrapper/prefix.cmdline rename to pkgs/test/make-binary-wrapper/prefix/prefix.cmdline diff --git a/pkgs/test/make-binary-wrapper/prefix.env b/pkgs/test/make-binary-wrapper/prefix/prefix.env similarity index 100% rename from pkgs/test/make-binary-wrapper/prefix.env rename to pkgs/test/make-binary-wrapper/prefix/prefix.env diff --git a/pkgs/test/make-binary-wrapper/suffix.c b/pkgs/test/make-binary-wrapper/suffix/suffix.c similarity index 100% rename from pkgs/test/make-binary-wrapper/suffix.c rename to pkgs/test/make-binary-wrapper/suffix/suffix.c diff --git a/pkgs/test/make-binary-wrapper/suffix.cmdline b/pkgs/test/make-binary-wrapper/suffix/suffix.cmdline similarity index 100% rename from pkgs/test/make-binary-wrapper/suffix.cmdline rename to pkgs/test/make-binary-wrapper/suffix/suffix.cmdline diff --git a/pkgs/test/make-binary-wrapper/suffix.env b/pkgs/test/make-binary-wrapper/suffix/suffix.env similarity index 100% rename from pkgs/test/make-binary-wrapper/suffix.env rename to pkgs/test/make-binary-wrapper/suffix/suffix.env From f6cc18e0e46a4d3c9cace01eb698ac9c26cbed78 Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 31 Dec 2024 00:42:35 +0000 Subject: [PATCH 66/97] tests.haskell.cabalSdist: avoid `lib.fileset` --- pkgs/test/haskell/cabalSdist/default.nix | 18 +++--------------- .../cabalSdist/{local => }/generated.nix | 5 +++-- 2 files changed, 6 insertions(+), 17 deletions(-) rename pkgs/test/haskell/cabalSdist/{local => }/generated.nix (64%) diff --git a/pkgs/test/haskell/cabalSdist/default.nix b/pkgs/test/haskell/cabalSdist/default.nix index d9dc2bada6e2..147602126ded 100644 --- a/pkgs/test/haskell/cabalSdist/default.nix +++ b/pkgs/test/haskell/cabalSdist/default.nix @@ -6,18 +6,7 @@ }: let - src = lib.fileset.toSource { - root = ./local; - fileset = lib.fileset.unions [ - ./local/app - ./local/CHANGELOG.md - ./local/local.cabal - ]; - }; - # This prevents the source from depending on the formatting of the ./local/generated.nix file - localRaw = haskell.lib.compose.overrideSrc { - inherit src; - } (haskellPackages.callPackage ./local/generated.nix { }); + localRaw = haskellPackages.callPackage ./generated.nix { }; in lib.recurseIntoAttrs rec { @@ -28,7 +17,6 @@ lib.recurseIntoAttrs rec { localFromCabalSdist = haskellPackages.buildFromCabalSdist localRaw; - # NOTE: ./local refers to the "./." path in `./local/generated.nix`. # This test makes sure that localHasNoDirectReference can actually fail if # it doesn't do anything. If this test fails, either the test setup was broken, # or Haskell packaging has changed the way `src` is treated in such a way that @@ -39,7 +27,7 @@ lib.recurseIntoAttrs rec { drvPath = builtins.unsafeDiscardOutputDependency localRaw.drvPath; } '' - grep ${src} $drvPath >/dev/null + grep ${localRaw.src} $drvPath >/dev/null touch $out ''; @@ -49,7 +37,7 @@ lib.recurseIntoAttrs rec { drvPath = builtins.unsafeDiscardOutputDependency localFromCabalSdist.drvPath; } '' - grep -v ${src} $drvPath >/dev/null + grep -v ${localRaw.src} $drvPath >/dev/null touch $out ''; } diff --git a/pkgs/test/haskell/cabalSdist/local/generated.nix b/pkgs/test/haskell/cabalSdist/generated.nix similarity index 64% rename from pkgs/test/haskell/cabalSdist/local/generated.nix rename to pkgs/test/haskell/cabalSdist/generated.nix index f0f52a03e0d0..0cf12d6d565d 100644 --- a/pkgs/test/haskell/cabalSdist/local/generated.nix +++ b/pkgs/test/haskell/cabalSdist/generated.nix @@ -1,4 +1,4 @@ -# nix run ../../../../..#cabal2nix -- ./. +# nix run ../../../../..#cabal2nix -- ./local { mkDerivation, base, @@ -7,10 +7,11 @@ mkDerivation { pname = "local"; version = "0.1.0.0"; - src = ./.; # also referred to as ./local in the test; these are the same path constants + src = ./local; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base ]; description = "Nixpkgs test case"; license = lib.licenses.mit; + mainProgram = "local"; } From 77def225cb60ae7c35ae9c82034aababed016f50 Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 31 Dec 2024 00:52:44 +0000 Subject: [PATCH 67/97] tests.haskell.setBuildTarget: avoid `lib.fileset` --- pkgs/test/haskell/setBuildTarget/default.nix | 14 +++----------- pkgs/test/haskell/setBuildTarget/{ => src}/Bar.hs | 0 pkgs/test/haskell/setBuildTarget/{ => src}/Foo.hs | 0 .../test/haskell/setBuildTarget/{ => src}/Setup.hs | 0 .../{ => src}/haskell-setBuildTarget.cabal | 0 5 files changed, 3 insertions(+), 11 deletions(-) rename pkgs/test/haskell/setBuildTarget/{ => src}/Bar.hs (100%) rename pkgs/test/haskell/setBuildTarget/{ => src}/Foo.hs (100%) rename pkgs/test/haskell/setBuildTarget/{ => src}/Setup.hs (100%) rename pkgs/test/haskell/setBuildTarget/{ => src}/haskell-setBuildTarget.cabal (100%) diff --git a/pkgs/test/haskell/setBuildTarget/default.nix b/pkgs/test/haskell/setBuildTarget/default.nix index 012bce8541e6..68f9b25dba75 100644 --- a/pkgs/test/haskell/setBuildTarget/default.nix +++ b/pkgs/test/haskell/setBuildTarget/default.nix @@ -1,7 +1,7 @@ { pkgs, haskellPackages }: let - # This can be regenerated by running `cabal2nix .` in the current directory. + # This can be regenerated by running `cabal2nix ./src` in the current directory. pkgDef = { mkDerivation, @@ -11,19 +11,11 @@ let mkDerivation { pname = "haskell-setBuildTarget"; version = "0.1.0.0"; - src = lib.fileset.toSource { - root = ./.; - fileset = lib.fileset.unions [ - ./haskell-setBuildTarget.cabal - ./Bar.hs - ./Foo.hs - ./Setup.hs - ]; - }; + src = ./src; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base ]; - license = lib.licenses.bsd3; + license = "unknown"; }; drv = haskellPackages.callPackage pkgDef { }; diff --git a/pkgs/test/haskell/setBuildTarget/Bar.hs b/pkgs/test/haskell/setBuildTarget/src/Bar.hs similarity index 100% rename from pkgs/test/haskell/setBuildTarget/Bar.hs rename to pkgs/test/haskell/setBuildTarget/src/Bar.hs diff --git a/pkgs/test/haskell/setBuildTarget/Foo.hs b/pkgs/test/haskell/setBuildTarget/src/Foo.hs similarity index 100% rename from pkgs/test/haskell/setBuildTarget/Foo.hs rename to pkgs/test/haskell/setBuildTarget/src/Foo.hs diff --git a/pkgs/test/haskell/setBuildTarget/Setup.hs b/pkgs/test/haskell/setBuildTarget/src/Setup.hs similarity index 100% rename from pkgs/test/haskell/setBuildTarget/Setup.hs rename to pkgs/test/haskell/setBuildTarget/src/Setup.hs diff --git a/pkgs/test/haskell/setBuildTarget/haskell-setBuildTarget.cabal b/pkgs/test/haskell/setBuildTarget/src/haskell-setBuildTarget.cabal similarity index 100% rename from pkgs/test/haskell/setBuildTarget/haskell-setBuildTarget.cabal rename to pkgs/test/haskell/setBuildTarget/src/haskell-setBuildTarget.cabal From 44475aafe3c1f67f7a1f304632c9271c61589a02 Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 31 Dec 2024 01:02:53 +0000 Subject: [PATCH 68/97] tests.testers.shellcheck: avoid `lib.fileset` --- .../testers/shellcheck/{ => src}/example.sh | 0 pkgs/build-support/testers/shellcheck/tester.nix | 11 ++++++----- pkgs/build-support/testers/shellcheck/tests.nix | 12 ++---------- 3 files changed, 8 insertions(+), 15 deletions(-) rename pkgs/build-support/testers/shellcheck/{ => src}/example.sh (100%) diff --git a/pkgs/build-support/testers/shellcheck/example.sh b/pkgs/build-support/testers/shellcheck/src/example.sh similarity index 100% rename from pkgs/build-support/testers/shellcheck/example.sh rename to pkgs/build-support/testers/shellcheck/src/example.sh diff --git a/pkgs/build-support/testers/shellcheck/tester.nix b/pkgs/build-support/testers/shellcheck/tester.nix index 131a64a85157..caa4f51f9927 100644 --- a/pkgs/build-support/testers/shellcheck/tester.nix +++ b/pkgs/build-support/testers/shellcheck/tester.nix @@ -2,6 +2,7 @@ { lib, stdenv, + runCommand, shellcheck, }: @@ -10,7 +11,7 @@ # Tests: ./tests.nix { src }: let - inherit (lib) fileset pathType isPath; + inherit (lib) pathType isPath; in stdenv.mkDerivation { name = "run-shellcheck"; @@ -18,10 +19,10 @@ stdenv.mkDerivation { if isPath src && pathType src == "regular" # note that for strings this would have been IFD, which we prefer to avoid then - fileset.toSource { - root = dirOf src; - fileset = src; - } + runCommand "testers-shellcheck-src" { } '' + mkdir $out + cp ${src} $out + '' else src; nativeBuildInputs = [ shellcheck ]; diff --git a/pkgs/build-support/testers/shellcheck/tests.nix b/pkgs/build-support/testers/shellcheck/tests.nix index 0128670dbe70..4a9ebdf9ffb1 100644 --- a/pkgs/build-support/testers/shellcheck/tests.nix +++ b/pkgs/build-support/testers/shellcheck/tests.nix @@ -6,9 +6,6 @@ testers, runCommand, }: -let - inherit (lib) fileset; -in lib.recurseIntoAttrs { example-dir = @@ -16,12 +13,7 @@ lib.recurseIntoAttrs { { failure = testers.testBuildFailure ( testers.shellcheck { - src = fileset.toSource { - root = ./.; - fileset = fileset.unions [ - ./example.sh - ]; - }; + src = ./src; } ); } @@ -37,7 +29,7 @@ lib.recurseIntoAttrs { { failure = testers.testBuildFailure ( testers.shellcheck { - src = ./example.sh; + src = ./src/example.sh; } ); } From ba42e09bf2dca362e84500f1169b921164bbb8de Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 31 Dec 2024 00:03:59 +0000 Subject: [PATCH 69/97] yarn2nix-moretea: avoid `lib.fileset` --- .../yarn2nix-moretea/{yarn2nix => }/default.nix | 14 +++----------- .../{yarn2nix => }/internal/fixup_bin.js | 0 .../{yarn2nix => }/internal/fixup_yarn_lock.js | 0 .../{yarn2nix => }/nix/expectShFunctions.sh | 0 .../tools/yarn2nix-moretea/{yarn2nix => }/yarn.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 6 files changed, 4 insertions(+), 12 deletions(-) rename pkgs/development/tools/yarn2nix-moretea/{yarn2nix => }/default.nix (98%) rename pkgs/development/tools/yarn2nix-moretea/{yarn2nix => }/internal/fixup_bin.js (100%) rename pkgs/development/tools/yarn2nix-moretea/{yarn2nix => }/internal/fixup_yarn_lock.js (100%) rename pkgs/development/tools/yarn2nix-moretea/{yarn2nix => }/nix/expectShFunctions.sh (100%) rename pkgs/development/tools/yarn2nix-moretea/{yarn2nix => }/yarn.nix (100%) diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix b/pkgs/development/tools/yarn2nix-moretea/default.nix similarity index 98% rename from pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix rename to pkgs/development/tools/yarn2nix-moretea/default.nix index 3cc5e31c3c15..94048c28f88b 100644 --- a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix +++ b/pkgs/development/tools/yarn2nix-moretea/default.nix @@ -398,15 +398,7 @@ in rec { }); yarn2nix = mkYarnPackage { - src = lib.fileset.toSource { - root = ./.; - fileset = lib.fileset.unions [ - ./bin - ./lib - ./package.json - ./yarn.lock - ]; - }; + src = ./yarn2nix; # yarn2nix is the only package that requires the yarnNix option. # All the other projects can auto-generate that file. @@ -415,7 +407,7 @@ in rec { # Using the filter above and importing package.json from the filtered # source results in an error in restricted mode. To circumvent this, # we import package.json from the unfiltered source - packageJSON = ./package.json; + packageJSON = ./yarn2nix/package.json; yarnFlags = defaultYarnFlags ++ [ "--ignore-scripts" "--production=true" ]; @@ -446,7 +438,7 @@ in rec { mkdir -p $out/lib mkdir -p $out/bin - cp ${./lib/urlToName.js} $out/lib/urlToName.js + cp ${./yarn2nix/lib/urlToName.js} $out/lib/urlToName.js cp ${./internal/fixup_yarn_lock.js} $out/bin/fixup_yarn_lock patchShebangs $out diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/internal/fixup_bin.js b/pkgs/development/tools/yarn2nix-moretea/internal/fixup_bin.js similarity index 100% rename from pkgs/development/tools/yarn2nix-moretea/yarn2nix/internal/fixup_bin.js rename to pkgs/development/tools/yarn2nix-moretea/internal/fixup_bin.js diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/internal/fixup_yarn_lock.js b/pkgs/development/tools/yarn2nix-moretea/internal/fixup_yarn_lock.js similarity index 100% rename from pkgs/development/tools/yarn2nix-moretea/yarn2nix/internal/fixup_yarn_lock.js rename to pkgs/development/tools/yarn2nix-moretea/internal/fixup_yarn_lock.js diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/nix/expectShFunctions.sh b/pkgs/development/tools/yarn2nix-moretea/nix/expectShFunctions.sh similarity index 100% rename from pkgs/development/tools/yarn2nix-moretea/yarn2nix/nix/expectShFunctions.sh rename to pkgs/development/tools/yarn2nix-moretea/nix/expectShFunctions.sh diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/yarn.nix b/pkgs/development/tools/yarn2nix-moretea/yarn.nix similarity index 100% rename from pkgs/development/tools/yarn2nix-moretea/yarn2nix/yarn.nix rename to pkgs/development/tools/yarn2nix-moretea/yarn.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f2d42a1fdc98..6761f05b422d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5679,7 +5679,7 @@ with pkgs; yarn-berry = callPackage ../development/tools/yarn-berry { }; - yarn2nix-moretea = callPackage ../development/tools/yarn2nix-moretea/yarn2nix { pkgs = pkgs.__splicedPackages; }; + yarn2nix-moretea = callPackage ../development/tools/yarn2nix-moretea { pkgs = pkgs.__splicedPackages; }; inherit (yarn2nix-moretea) yarn2nix From 4e30014c062cec5059552c0dfc4a4656d7d59dd4 Mon Sep 17 00:00:00 2001 From: Emily Date: Mon, 30 Dec 2024 23:17:08 +0000 Subject: [PATCH 70/97] shopify-cli: avoid `lib.fileset` --- .../sh/shopify-cli/{ => manifests}/package-lock.json | 0 pkgs/by-name/sh/shopify-cli/{ => manifests}/package.json | 0 pkgs/by-name/sh/shopify-cli/package.nix | 8 +------- pkgs/by-name/sh/shopify-cli/update.sh | 5 +++++ 4 files changed, 6 insertions(+), 7 deletions(-) rename pkgs/by-name/sh/shopify-cli/{ => manifests}/package-lock.json (100%) rename pkgs/by-name/sh/shopify-cli/{ => manifests}/package.json (100%) diff --git a/pkgs/by-name/sh/shopify-cli/package-lock.json b/pkgs/by-name/sh/shopify-cli/manifests/package-lock.json similarity index 100% rename from pkgs/by-name/sh/shopify-cli/package-lock.json rename to pkgs/by-name/sh/shopify-cli/manifests/package-lock.json diff --git a/pkgs/by-name/sh/shopify-cli/package.json b/pkgs/by-name/sh/shopify-cli/manifests/package.json similarity index 100% rename from pkgs/by-name/sh/shopify-cli/package.json rename to pkgs/by-name/sh/shopify-cli/manifests/package.json diff --git a/pkgs/by-name/sh/shopify-cli/package.nix b/pkgs/by-name/sh/shopify-cli/package.nix index b49e430de8be..a45f65ce7506 100644 --- a/pkgs/by-name/sh/shopify-cli/package.nix +++ b/pkgs/by-name/sh/shopify-cli/package.nix @@ -6,13 +6,7 @@ buildNpmPackage { pname = "shopify"; version = version; - src = lib.fileset.toSource { - root = ./.; - fileset = with lib.fileset; unions [ - ./package.json - ./package-lock.json - ]; - }; + src = ./manifests; npmDepsHash = "sha256-QhbOKOs/0GEOeySG4uROzgtD4o7C+6tS/TAaPcmC3xk="; dontNpmBuild = true; diff --git a/pkgs/by-name/sh/shopify-cli/update.sh b/pkgs/by-name/sh/shopify-cli/update.sh index 6421f59a3a17..a63a81b59057 100755 --- a/pkgs/by-name/sh/shopify-cli/update.sh +++ b/pkgs/by-name/sh/shopify-cli/update.sh @@ -18,6 +18,8 @@ if [[ "$UPDATE_NIX_OLD_VERSION" == "$version" ]]; then exit 0 fi +pushd manifests + # Update the package.json sed -i "s|$UPDATE_NIX_OLD_VERSION|$version|g" package.json @@ -25,6 +27,9 @@ sed -i "s|$UPDATE_NIX_OLD_VERSION|$version|g" package.json rm -f package-lock.json npm i --package-lock-only npm_hash=$(prefetch-npm-deps package-lock.json) + +popd + sed -i "s|npmDepsHash = \".*\";|npmDepsHash = \"$npm_hash\";|" package.nix popd From 34a6c331e79081db4d133fc6692105552bbeb52b Mon Sep 17 00:00:00 2001 From: Emily Date: Mon, 30 Dec 2024 21:48:15 +0000 Subject: [PATCH 71/97] purescm: avoid `lib.fileset` --- pkgs/by-name/pu/purescm/README.rst | 4 ++-- .../pu/purescm/{ => manifests}/.gitignore | 0 .../purescm/{ => manifests}/package-lock.json | 0 .../pu/purescm/{ => manifests}/package.json | 0 pkgs/by-name/pu/purescm/package.nix | 19 +++---------------- 5 files changed, 5 insertions(+), 18 deletions(-) rename pkgs/by-name/pu/purescm/{ => manifests}/.gitignore (100%) rename pkgs/by-name/pu/purescm/{ => manifests}/package-lock.json (100%) rename pkgs/by-name/pu/purescm/{ => manifests}/package.json (100%) diff --git a/pkgs/by-name/pu/purescm/README.rst b/pkgs/by-name/pu/purescm/README.rst index 635d4b46d811..ff34f3913009 100644 --- a/pkgs/by-name/pu/purescm/README.rst +++ b/pkgs/by-name/pu/purescm/README.rst @@ -14,6 +14,6 @@ Suggested additional ``buildInputs`` To update this package ====================== -#. Bump the ``./package.json`` version pin -#. Run ``nix-shell -p nodejs --command "npm i --package-lock-only"`` +#. Bump the ``./manifests/package.json`` version pin +#. Run ``(cd manifests && nix-shell -p nodejs --command "npm i --package-lock-only")`` #. Update ``npmDeps.hash`` in the ``package.nix`` diff --git a/pkgs/by-name/pu/purescm/.gitignore b/pkgs/by-name/pu/purescm/manifests/.gitignore similarity index 100% rename from pkgs/by-name/pu/purescm/.gitignore rename to pkgs/by-name/pu/purescm/manifests/.gitignore diff --git a/pkgs/by-name/pu/purescm/package-lock.json b/pkgs/by-name/pu/purescm/manifests/package-lock.json similarity index 100% rename from pkgs/by-name/pu/purescm/package-lock.json rename to pkgs/by-name/pu/purescm/manifests/package-lock.json diff --git a/pkgs/by-name/pu/purescm/package.json b/pkgs/by-name/pu/purescm/manifests/package.json similarity index 100% rename from pkgs/by-name/pu/purescm/package.json rename to pkgs/by-name/pu/purescm/manifests/package.json diff --git a/pkgs/by-name/pu/purescm/package.nix b/pkgs/by-name/pu/purescm/package.nix index faee196e3eb9..9dd16d489a0c 100644 --- a/pkgs/by-name/pu/purescm/package.nix +++ b/pkgs/by-name/pu/purescm/package.nix @@ -8,7 +8,7 @@ let inherit (lib) fileset; - packageLock = builtins.fromJSON (builtins.readFile ./package-lock.json); + packageLock = builtins.fromJSON (builtins.readFile ./manifests/package-lock.json); pname = "purescm"; version = packageLock.packages."node_modules/${pname}".version; @@ -16,24 +16,11 @@ let package = buildNpmPackage { inherit pname version; - src = fileset.toSource { - root = ./.; - fileset = fileset.unions [ - ./package.json - ./package-lock.json - ./.gitignore - ]; - }; + src = ./manifests; dontNpmBuild = true; npmDeps = fetchNpmDeps { - src = fileset.toSource { - root = ./.; - fileset = fileset.unions [ - ./package-lock.json - ./package.json - ]; - }; + src = ./manifests; hash = "sha256-ljeFcLvIET77Q0OR6O5Ok1fGnaxaKaoywpcy2aHq/6o="; }; From bc419f5949c49e1779da9ffecb201e42fc819b71 Mon Sep 17 00:00:00 2001 From: Emily Date: Mon, 30 Dec 2024 21:40:19 +0000 Subject: [PATCH 72/97] python312Packages.waitress-django: avoid `lib.fileset` --- .../python-modules/waitress-django/default.nix | 12 +----------- .../waitress-django/{ => src}/setup.py | 3 +-- 2 files changed, 2 insertions(+), 13 deletions(-) rename pkgs/development/python-modules/waitress-django/{ => src}/setup.py (76%) diff --git a/pkgs/development/python-modules/waitress-django/default.nix b/pkgs/development/python-modules/waitress-django/default.nix index 9358f20e1a33..cb0c46abb611 100644 --- a/pkgs/development/python-modules/waitress-django/default.nix +++ b/pkgs/development/python-modules/waitress-django/default.nix @@ -6,22 +6,12 @@ waitress, }: -let - fs = lib.fileset; -in - buildPythonPackage { pname = "waitress-django"; version = "1.0.0"; pyproject = true; - src = fs.toSource { - root = ./.; - fileset = fs.unions [ - ./setup.py - ./src - ]; - }; + src = ./src; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/waitress-django/setup.py b/pkgs/development/python-modules/waitress-django/src/setup.py similarity index 76% rename from pkgs/development/python-modules/waitress-django/setup.py rename to pkgs/development/python-modules/waitress-django/src/setup.py index 16fde78f42a9..65f51237b589 100644 --- a/pkgs/development/python-modules/waitress-django/setup.py +++ b/pkgs/development/python-modules/waitress-django/src/setup.py @@ -7,6 +7,5 @@ setup( name = "waitress-django" , description = "A waitress WSGI server serving django" , author = "Bas van Dijk" , author_email = "v.dijk.bas@gmail.com" - , package_dir = {"" : "src"} - , scripts = ["src/waitress-serve-django"] + , scripts = ["waitress-serve-django"] ) From a38901aa8539613589598f59f567b9001199badd Mon Sep 17 00:00:00 2001 From: Emily Date: Mon, 30 Dec 2024 20:00:27 +0000 Subject: [PATCH 73/97] cudaPackages.saxpy: avoid `lib.fileset` --- pkgs/development/cuda-modules/saxpy/default.nix | 9 +-------- .../cuda-modules/saxpy/{ => src}/CMakeLists.txt | 0 pkgs/development/cuda-modules/saxpy/{ => src}/saxpy.cu | 0 3 files changed, 1 insertion(+), 8 deletions(-) rename pkgs/development/cuda-modules/saxpy/{ => src}/CMakeLists.txt (100%) rename pkgs/development/cuda-modules/saxpy/{ => src}/saxpy.cu (100%) diff --git a/pkgs/development/cuda-modules/saxpy/default.nix b/pkgs/development/cuda-modules/saxpy/default.nix index 57b6120ccea9..c1d1711fc997 100644 --- a/pkgs/development/cuda-modules/saxpy/default.nix +++ b/pkgs/development/cuda-modules/saxpy/default.nix @@ -18,19 +18,12 @@ let libcublas ; inherit (lib) getDev getLib getOutput; - fs = lib.fileset; in backendStdenv.mkDerivation { pname = "saxpy"; version = "unstable-2023-07-11"; - src = fs.toSource { - root = ./.; - fileset = fs.unions [ - ./CMakeLists.txt - ./saxpy.cu - ]; - }; + src = ./src; __structuredAttrs = true; strictDeps = true; diff --git a/pkgs/development/cuda-modules/saxpy/CMakeLists.txt b/pkgs/development/cuda-modules/saxpy/src/CMakeLists.txt similarity index 100% rename from pkgs/development/cuda-modules/saxpy/CMakeLists.txt rename to pkgs/development/cuda-modules/saxpy/src/CMakeLists.txt diff --git a/pkgs/development/cuda-modules/saxpy/saxpy.cu b/pkgs/development/cuda-modules/saxpy/src/saxpy.cu similarity index 100% rename from pkgs/development/cuda-modules/saxpy/saxpy.cu rename to pkgs/development/cuda-modules/saxpy/src/saxpy.cu From 8725e466ef2bcc5be69106c16dbf69b9ef989273 Mon Sep 17 00:00:00 2001 From: Emily Date: Mon, 30 Dec 2024 15:36:05 +0000 Subject: [PATCH 74/97] release: forbid use of `lib.fileset` in Nixpkgs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Due to Nix bug , `builtins.filterSource` and chroot stores interact in a confusing and broken way that breaks `lib.fileset`. This means that uses of the API inside Nixpkgs keep breaking the NixOS installer, blocking the channel. The resulting error messages are inscrutable (they look like “the installer test is trying to download `curl`…?” and eventually bottom out in a derivation that has the wrong `outPath` because of the chroot store causing an incorrect `lib.fileset` result). Whenever this happens, someone (well, in practice K900 or I) has to bisect the change that introduced it and remove the use of `lib.fileset`. This has happened at least three times in the past four months (I believe I might actually be missing one here, but these are the ones I remember and could easily dig up): * * * The options I see here are: 1. Forbid use of `lib.fileset` within Nixpkgs until the Nix bug is fixed. This is the approach taken here. External users of Nixpkgs can continue to use the API as normal, but using it from within something that affects any release jobset `outPath`s will cause an evaluation failure with a hopefully‐helpful error message. 2. Forbid `lib.fileset` and also all of the other library APIs that use `builtins.filterSource`. I’m happy to do this, but so far none of those have broken the installer, so I decided to start small and worry about the others if they end up causing a problem in practice. 3. Forbid `builtins.filterSource` directly. This is hard and would require more invasive `builtins.scopedImport` crimes to do at evaluation time. I think this would realistically have to be done in something like nixpkgs-vet instead and I didn’t have much luck shoehorning a check like this into that codebase when I tried. 4. Fix the Nix bug. This would be great! But also it doesn’t seem to be happening any time soon, it seems difficult to fix in a way that doesn’t subtly break compatibility with the previous semantics, and arguably the fix would need backporting all the way back to 2.3 given our minimum version policy. 5. Do nothing; have people continue to innocuously use `lib.fileset` throughout Nixpkgs, breaking the installer whenever one of them sneaks in to that closure, causing the channel to be blocked and requiring expensive bisections to narrow down the inscrutable test failure to the package using `lib.fileset`, which then needs moving back off it. This sucks for the people who keep having to track it down, holds back important channel bumps, and the criteria for when it’s okay to use `lib.fileset` are not realistically possible to teach to all contributors. I'd be happy to work on (2) as an alternative; (3) would be difficult and seems like overkill, (4) is not really something I trust myself to do and wouldn’t address the immediate problem, and (5) isn’t sustainable. I think that the current approach here is the best trade‐off for now, as `lib.fileset` seems to be the only prominent user of the `builtins.filterSource` API that works with full store paths, exposing it to the Nix bug. It’s unfortunate to lose the nice API, but since we can’t rely on it to produce correct results and the channels keep getting blocked as a result, I don’t think we really have an alternative right now. --- pkgs/top-level/default.nix | 23 +++++++++++++++++- pkgs/top-level/release-cross.nix | 5 +++- pkgs/top-level/release-cuda.nix | 2 ++ pkgs/top-level/release-lib.nix | 5 +++- pkgs/top-level/release-outpaths.nix | 2 ++ pkgs/top-level/release-python.nix | 2 ++ pkgs/top-level/release-small.nix | 2 ++ .../release-unfree-redistributable.nix | 2 ++ pkgs/top-level/release.nix | 24 +++++++++++-------- 9 files changed, 54 insertions(+), 13 deletions(-) diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix index 5c224802d5bf..fd443ac773ff 100644 --- a/pkgs/top-level/default.nix +++ b/pkgs/top-level/default.nix @@ -27,6 +27,10 @@ , # Allow a configuration attribute set to be passed in as an argument. config ? {} +, # Temporary hack to let Nixpkgs forbid internal use of `lib.fileset` + # until is fixed. + __allowFileset ? true + , # List of overlays layers used to extend Nixpkgs. overlays ? [] @@ -47,7 +51,24 @@ let # Rename the function arguments crossSystem0 = crossSystem; in let - lib = import ../../lib; + pristineLib = import ../../lib; + + lib = + if __allowFileset then + pristineLib + else + pristineLib.extend (_: _: { + fileset = abort '' + + The use of `lib.fileset` is currently forbidden in Nixpkgs due to the + upstream Nix bug . This + causes difficult‐to‐debug errors when combined with chroot stores, + such as in the NixOS installer. + + For packages that require source to be vendored inside Nixpkgs, + please use a subdirectory of the package instead. + ''; + }); inherit (lib) throwIfNot; diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index 1ce8f8f709e2..492a7503a03d 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -17,7 +17,10 @@ , # Strip most of attributes when evaluating to spare memory usage scrubJobs ? true , # Attributes passed to nixpkgs. Don't build packages marked as unfree. - nixpkgsArgs ? { config = { allowUnfree = false; inHydra = true; }; } + nixpkgsArgs ? { + config = { allowUnfree = false; inHydra = true; }; + __allowFileset = false; + } }: let diff --git a/pkgs/top-level/release-cuda.nix b/pkgs/top-level/release-cuda.nix index 945f0e6d2954..a19bc6f8ecaa 100644 --- a/pkgs/top-level/release-cuda.nix +++ b/pkgs/top-level/release-cuda.nix @@ -43,6 +43,8 @@ in "${variant}Support" = true; inHydra = true; }; + + __allowFileset = false; }, ... }@args: diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix index c7581c47d341..a2821386ce3e 100644 --- a/pkgs/top-level/release-lib.nix +++ b/pkgs/top-level/release-lib.nix @@ -3,7 +3,10 @@ , packageSet ? (import ../..) , scrubJobs ? true , # Attributes passed to nixpkgs. Don't build packages marked as unfree. - nixpkgsArgs ? { config = { allowUnfree = false; inHydra = true; }; } + nixpkgsArgs ? { + config = { allowUnfree = false; inHydra = true; }; + __allowFileset = false; + } }: let diff --git a/pkgs/top-level/release-outpaths.nix b/pkgs/top-level/release-outpaths.nix index 0b70ea631244..e6caabec04e9 100644 --- a/pkgs/top-level/release-outpaths.nix +++ b/pkgs/top-level/release-outpaths.nix @@ -57,6 +57,8 @@ let inHydra = true; }; + + __allowFileset = false; }; }; recurseIntoAttrs = attrs: attrs // { recurseForDerivations = true; }; diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix index a6222acaad53..161a6ddb68c3 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -15,6 +15,8 @@ allowUnfree = false; inHydra = true; }; + + __allowFileset = false; }, }: diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix index 42cf6e79b732..511cef6a0d8a 100644 --- a/pkgs/top-level/release-small.nix +++ b/pkgs/top-level/release-small.nix @@ -19,6 +19,8 @@ allowUnfree = false; inHydra = true; }; + + __allowFileset = false; }, }: diff --git a/pkgs/top-level/release-unfree-redistributable.nix b/pkgs/top-level/release-unfree-redistributable.nix index 96384e9fb020..45940c4d02cc 100644 --- a/pkgs/top-level/release-unfree-redistributable.nix +++ b/pkgs/top-level/release-unfree-redistributable.nix @@ -37,6 +37,8 @@ cudaSupport = true; inHydra = true; }; + + __allowFileset = false; }, # We only build the full package set on infrequently releasing channels. full ? false, diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 0140f0bd9d6a..78bdf1491125 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -28,16 +28,20 @@ # Strip most of attributes when evaluating to spare memory usage , scrubJobs ? true # Attributes passed to nixpkgs. Don't build packages marked as unfree. -, nixpkgsArgs ? { config = { - allowUnfree = false; - inHydra = true; - # Exceptional unsafe packages that we still build and distribute, - # so users choosing to allow don't have to rebuild them every time. - permittedInsecurePackages = [ - "olm-3.2.16" # see PR #347899 - "kanidm_1_3-1.3.3" - ]; - }; } +, nixpkgsArgs ? { + config = { + allowUnfree = false; + inHydra = true; + # Exceptional unsafe packages that we still build and distribute, + # so users choosing to allow don't have to rebuild them every time. + permittedInsecurePackages = [ + "olm-3.2.16" # see PR #347899 + "kanidm_1_3-1.3.3" + ]; + }; + + __allowFileset = false; + } # This flag, if set to true, will inhibit the use of `mapTestOn` # and `release-lib.packagePlatforms`. Generally, it causes the From fe268b5b30b0ad27c6cd32afcec9e812bc30d1a9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 31 Dec 2024 17:16:30 +0000 Subject: [PATCH 75/97] bodyclose: 0-unstable-2024-10-17 -> 0-unstable-2024-12-22 --- pkgs/by-name/bo/bodyclose/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/bo/bodyclose/package.nix b/pkgs/by-name/bo/bodyclose/package.nix index ed791e7546c6..a563e6d4782c 100644 --- a/pkgs/by-name/bo/bodyclose/package.nix +++ b/pkgs/by-name/bo/bodyclose/package.nix @@ -7,13 +7,13 @@ buildGoModule { pname = "bodyclose"; - version = "0-unstable-2024-10-17"; + version = "0-unstable-2024-12-22"; src = fetchFromGitHub { owner = "timakin"; repo = "bodyclose"; - rev = "adbc21e6bf369ca6d936dbb140733f34867639bd"; - hash = "sha256-GNZNzXEZnIxep5BS1sBZsMl876FwwIkOBwHAMk/73fo="; + rev = "1db5c5ca4d6719fe28430df1ae8d337ee2ac09c7"; + hash = "sha256-s5bWvpV6gHGEsuiNXJl2ZuyDaffD82/rCbusov3zsyw="; }; vendorHash = "sha256-8grdJuV8aSETsJr2VazC/3ctfnGh3UgjOWD4/xf3uC8="; From eb5573ad6263822f2b2dd24adc1baf65ec1875f9 Mon Sep 17 00:00:00 2001 From: happysalada Date: Tue, 31 Dec 2024 13:20:56 -0500 Subject: [PATCH 76/97] termscp: darwin fix --- pkgs/by-name/te/termscp/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/te/termscp/package.nix b/pkgs/by-name/te/termscp/package.nix index 812d30c14d85..a0ee8fcd7d91 100644 --- a/pkgs/by-name/te/termscp/package.nix +++ b/pkgs/by-name/te/termscp/package.nix @@ -53,6 +53,7 @@ rustPlatform.buildRustPackage rec { ++ lib.optionals stdenvNoCC.hostPlatform.isDarwin [ "--skip=system::watcher::test::should_poll_file_removed" "--skip=system::watcher::test::should_poll_file_update" + "--skip=system::watcher::test::should_poll_nothing" ]; passthru = { From f69b3fc343fa6e540e1e0383e2c387b0c05e59df Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 31 Dec 2024 18:39:27 +0000 Subject: [PATCH 77/97] simplex-chat-desktop: 6.2.1 -> 6.2.3 --- pkgs/by-name/si/simplex-chat-desktop/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/si/simplex-chat-desktop/package.nix b/pkgs/by-name/si/simplex-chat-desktop/package.nix index c1767f1388fd..347f2428a0a8 100644 --- a/pkgs/by-name/si/simplex-chat-desktop/package.nix +++ b/pkgs/by-name/si/simplex-chat-desktop/package.nix @@ -7,11 +7,11 @@ let pname = "simplex-chat-desktop"; - version = "6.2.1"; + version = "6.2.3"; src = fetchurl { url = "https://github.com/simplex-chat/simplex-chat/releases/download/v${version}/simplex-desktop-x86_64.AppImage"; - hash = "sha256-JEe4dmbb/T2A4+t1ycvgJofes2CkEphytFMnWJgpZ7s="; + hash = "sha256-yS3KnR9JLUEwtV8e2J5l4WW+XNHWg7PDOKtlfT/zfUE="; }; appimageContents = appimageTools.extract { From cbdee318dac44cee1262de92951dcd977576558d Mon Sep 17 00:00:00 2001 From: lucasew Date: Mon, 30 Dec 2024 15:50:58 -0300 Subject: [PATCH 78/97] flexget: minor tweaks, enable tests on linux Signed-off-by: lucasew --- pkgs/by-name/fl/flexget/package.nix | 76 ++++++++++++++++--- .../python-modules/flask-restx/default.nix | 3 + 2 files changed, 70 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/fl/flexget/package.nix b/pkgs/by-name/fl/flexget/package.nix index 58d027701ec9..7ca46e9e1cdb 100644 --- a/pkgs/by-name/fl/flexget/package.nix +++ b/pkgs/by-name/fl/flexget/package.nix @@ -1,10 +1,11 @@ { lib, - python3, + python3Packages, fetchFromGitHub, + stdenv, }: -python3.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "flexget"; version = "3.13.5"; pyproject = true; @@ -20,9 +21,9 @@ python3.pkgs.buildPythonApplication rec { # relax dep constrains, keep environment constraints pythonRelaxDeps = true; - build-system = with python3.pkgs; [ setuptools ]; + build-system = with python3Packages; [ setuptools ]; - dependencies = with python3.pkgs; [ + dependencies = with python3Packages; [ # See https://github.com/Flexget/Flexget/blob/master/pyproject.toml # and https://github.com/Flexget/Flexget/blob/develop/requirements.txt apscheduler @@ -40,6 +41,7 @@ python3.pkgs.buildPythonApplication rec { pyrss2gen python-dateutil pyyaml + rarfile rebulk requests rich @@ -66,6 +68,7 @@ python3.pkgs.buildPythonApplication rec { deluge-client cloudscraper python-telegram-bot + boto3 ]; pythonImportsCheck = [ @@ -93,14 +96,69 @@ python3.pkgs.buildPythonApplication rec { "flexget.plugins.services.pogcal_acquired" ]; - # ~400 failures - doCheck = false; + nativeCheckInputs = [ + python3Packages.pytestCheckHook + python3Packages.pytest-vcr + python3Packages.paramiko + ]; - meta = with lib; { + doCheck = !stdenv.isDarwin; + + disabledTests = [ + # reach the Internet + "TestExistsMovie" + "TestImdb" + "TestImdbLookup" + "TestImdbParser" + "TestInputHtml" + "TestInputSites" + "TestNfoLookupWithMovies" + "TestNpoWatchlistInfo" + "TestNpoWatchlistLanguageTheTVDBLookup" + "TestNpoWatchlistPremium" + "TestPlex" + "TestRadarrListActions" + "TestRssOnline" + "TestSeriesRootAPI" + "TestSftpDownload" + "TestSftpList" + "TestSonarrListActions" + "TestSubtitleList" + "TestTMDBMovieLookupAPI" + "TestTVDBEpisodeABSLookupAPI" + "TestTVDBEpisodeAirDateLookupAPI" + "TestTVDBEpisodeLookupAPI" + "TestTVDBExpire" + "TestTVDBFavorites" + "TestTVDBLanguages" + "TestTVDBList" + "TestTVDBLookup" + "TestTVDBLookup" + "TestTVDBSeriesActorsLookupAPI" + "TestTVDBSeriesLookupAPI" + "TestTVDSearchIMDBLookupAPI" + "TestTVDSearchNameLookupAPI" + "TestTVDSearchZAP2ITLookupAPI" + "TestTVMAzeSeriesLookupAPI" + "TestTVMazeSeasonLookup" + "TestTVMazeShowLookup" + "TestTVMazeUnicodeLookup" + "TestTaskParsing::test_selected_parser_cleared" + "TestTheTVDBLanguages" + "TestTheTVDBList" + "TestTmdbLookup" + "TestURLRewriters" + "TestURLRewriters::test_ettv" + # others + "TestRegexp" + "TestYamlLists" + ]; + + meta = { homepage = "https://flexget.com/"; changelog = "https://github.com/Flexget/Flexget/releases/tag/v${version}"; description = "Multipurpose automation tool for all of your media"; - license = licenses.mit; - maintainers = with maintainers; [ pbsds ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pbsds ]; }; } diff --git a/pkgs/development/python-modules/flask-restx/default.nix b/pkgs/development/python-modules/flask-restx/default.nix index a817e75cb91b..2a40ee42ea4c 100644 --- a/pkgs/development/python-modules/flask-restx/default.nix +++ b/pkgs/development/python-modules/flask-restx/default.nix @@ -17,6 +17,7 @@ pytest-flask, pytest-mock, pytest-benchmark, + pytest-vcr, pytestCheckHook, setuptools, }: @@ -55,6 +56,7 @@ buildPythonPackage rec { pytest-benchmark pytest-flask pytest-mock + pytest-vcr pytestCheckHook ]; @@ -70,6 +72,7 @@ buildPythonPackage rec { ]; disabledTests = [ + "test_specs_endpoint_host_and_subdomain" # broken in werkzeug 2.3 upgrade "test_media_types_method" "test_media_types_q" From 12279de652bbc5f2acf833092a7ded68395ccb13 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 31 Dec 2024 21:36:44 +0000 Subject: [PATCH 79/97] open-in-mpv: 2.4.0 -> 2.4.2 --- pkgs/by-name/op/open-in-mpv/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/op/open-in-mpv/package.nix b/pkgs/by-name/op/open-in-mpv/package.nix index 219f708b10e4..2bd21ae35ab0 100644 --- a/pkgs/by-name/op/open-in-mpv/package.nix +++ b/pkgs/by-name/op/open-in-mpv/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "open-in-mpv"; - version = "2.4.0"; + version = "2.4.2"; src = fetchFromGitHub { owner = "Baldomo"; repo = "open-in-mpv"; rev = "v${version}"; - hash = "sha256-EkWz28X+pPfSjinYEMP2y1YiZ46HdnjRGjXRDwO28PY="; + hash = "sha256-5Hu/BXUMI8CSOvE09I0YXfQ6BuIRA37yLlSTqWrrqy0="; }; vendorHash = "sha256-G6GZO2+CfEAYcf7zBcqDa808A0eJjM8dq7+4VGZ+P4c="; From a49bc1e407c9e1270b685013669ccd839cbe7ff0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 31 Dec 2024 22:19:02 +0000 Subject: [PATCH 80/97] python312Packages.json-repair: 0.32.0 -> 0.35.0 --- pkgs/development/python-modules/json-repair/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/json-repair/default.nix b/pkgs/development/python-modules/json-repair/default.nix index a99720cce80d..91cab6837f9b 100644 --- a/pkgs/development/python-modules/json-repair/default.nix +++ b/pkgs/development/python-modules/json-repair/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "json-repair"; - version = "0.32.0"; + version = "0.35.0"; pyproject = true; src = fetchFromGitHub { owner = "mangiucugna"; repo = "json_repair"; tag = "v${version}"; - hash = "sha256-js2XTplrRZyyVHztA3yGicdjfBFNoUTvjzT/U2NESWQ="; + hash = "sha256-39MxXX3bBYLmpaUpNYLWq+8Huoy0zQSyURQiZvXFaZc="; }; build-system = [ setuptools ]; From 4e6e0aec9561b6403560c9c4e7c306ca44c5cfca Mon Sep 17 00:00:00 2001 From: Sergei Zimmerman <145775305+xokdvium@users.noreply.github.com> Date: Mon, 30 Dec 2024 12:06:44 +0300 Subject: [PATCH 81/97] libserdes: fix build with avro-cpp 1.12.0 Some finagling is required to make the configure scripts cooperate with the required bump to the minimum C++ standard version. avro-cpp needs at least C++17, but libserdes is stuck at C++11. --- pkgs/by-name/li/libserdes/package.nix | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/li/libserdes/package.nix b/pkgs/by-name/li/libserdes/package.nix index 5a8cc69e0016..f42ff147381e 100644 --- a/pkgs/by-name/li/libserdes/package.nix +++ b/pkgs/by-name/li/libserdes/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, perl, which, - boost, rdkafka, jansson, curl, @@ -35,7 +34,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - boost rdkafka jansson curl @@ -43,10 +41,26 @@ stdenv.mkDerivation rec { avro-cpp ]; - makeFlags = [ "GEN_PKG_CONFIG=y" ]; + configureFlags = [ + # avro-cpp public headers use at least C++17 features, but libserdes configure scripts + # basically cap it at C++11. It's really unfortunate that we have to patch the configure scripts for this, + # but this seems to be the most sensible way. + # - NIX_CFLAGS_COMPILE - fails because of -Werror in compiler checks since --std=... has no effect for C compilers. + # - CXXFLAGS without patching configure.self does nothing, because --std=c++11 is appended to the final flags, overriding + # everything specified manually. + "--CXXFLAGS=${toString [ "--std=c++17" ]}" + ]; + + makeFlags = [ + "GEN_PKG_CONFIG=y" + ]; postPatch = '' patchShebangs configure lds-gen.pl + # Don't append the standard to CXXFLAGS, since we want to set it higher for avro-cpp. + substituteInPlace configure.self --replace-fail \ + 'mkl_mkvar_append CXXFLAGS CXXFLAGS "--std=c++11"' \ + ":" # Do nothing, we set the standard ourselves. ''; # Has a configure script but it’s not Autoconf so steal some bits from multiple-outputs.sh: From 86e0d389a86d64d2d52230f72542ce51aa5e79be Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 1 Jan 2025 00:35:37 +0100 Subject: [PATCH 82/97] python312Packages.mkdocs-git-authors-plugin: drop support for python 3.7 Co-authored-by: Nick Cao --- .../python-modules/mkdocs-git-authors-plugin/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/mkdocs-git-authors-plugin/default.nix b/pkgs/development/python-modules/mkdocs-git-authors-plugin/default.nix index 3d9997d25a20..5b249d65626e 100644 --- a/pkgs/development/python-modules/mkdocs-git-authors-plugin/default.nix +++ b/pkgs/development/python-modules/mkdocs-git-authors-plugin/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { version = "0.9.2"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "timvink"; From 5ded9ec756434c4b04758c2b34bfc9d276b8b865 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 2 Dec 2024 02:43:11 +0000 Subject: [PATCH 83/97] python312Packages.returns: 0.23.0 -> 0.24.0 --- pkgs/development/python-modules/returns/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/returns/default.nix b/pkgs/development/python-modules/returns/default.nix index 27fa225ba7d0..5745751eacde 100644 --- a/pkgs/development/python-modules/returns/default.nix +++ b/pkgs/development/python-modules/returns/default.nix @@ -18,16 +18,16 @@ buildPythonPackage rec { pname = "returns"; - version = "0.23.0"; - format = "pyproject"; + version = "0.24.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "dry-python"; repo = "returns"; - rev = "refs/tags/${version}"; - hash = "sha256-4ZP/wvPgqQQec/BaXuL9r7BEc2G+LztMdFul0NeEJTc="; + tag = version; + hash = "sha256-qmBxW1XxUlFpAqf2t2ix01TN5NSxOtnYqLyE5ovZU58="; }; postPatch = '' From 4b72571dcc6e1f893bc1c791ff7373830c67a98e Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 1 Jan 2025 02:11:36 +0100 Subject: [PATCH 84/97] python312Packages.bandit: drop support for python 3.8 --- pkgs/development/python-modules/bandit/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/bandit/default.nix b/pkgs/development/python-modules/bandit/default.nix index 686fb846b297..31bf7bbbb09f 100644 --- a/pkgs/development/python-modules/bandit/default.nix +++ b/pkgs/development/python-modules/bandit/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { version = "1.8.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; From c44821d5fcbe4797868daa0838002577105a161f Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Tue, 31 Dec 2024 19:14:08 -0600 Subject: [PATCH 85/97] ghostty: 1.0.0 -> 1.0.1 (#369782) --- pkgs/by-name/gh/ghostty/deps.nix | 14 +++++++------- pkgs/by-name/gh/ghostty/package.nix | 18 ++++++------------ 2 files changed, 13 insertions(+), 19 deletions(-) diff --git a/pkgs/by-name/gh/ghostty/deps.nix b/pkgs/by-name/gh/ghostty/deps.nix index 81a99677a703..4653a16a3153 100644 --- a/pkgs/by-name/gh/ghostty/deps.nix +++ b/pkgs/by-name/gh/ghostty/deps.nix @@ -1,4 +1,5 @@ # generated by zon2nix (https://github.com/Cloudef/zig2nix) + { lib, linkFarm, @@ -8,14 +9,13 @@ zig, name ? "zig-packages", }: + with builtins; with lib; + let unpackZigArtifact = - { - name, - artifact, - }: + { name, artifact }: runCommandLocal name { nativeBuildInputs = [ zig ]; @@ -169,11 +169,11 @@ linkFarm name [ }; } { - name = "12204358b2848ffd993d3425055bff0a5ba9b1b60bead763a6dea0517965d7290a6c"; + name = "1220cc25b537556a42b0948437c791214c229efb78b551c80b1e9b18d70bf0498620"; path = fetchZigArtifact { name = "iterm2_themes"; - url = "https://github.com/mbadolato/iTerm2-Color-Schemes/archive/d6c42066b3045292e0b1154ad84ff22d6863ebf7.tar.gz"; - hash = "sha256-s6us3PkOPmQCtLS9QNPM7BDLt7x+37KbmYF9d4NMD/c="; + url = "https://github.com/mbadolato/iTerm2-Color-Schemes/archive/e030599a6a6e19fcd1ea047c7714021170129d56.tar.gz"; + hash = "sha256-hFGjD0rNfZ7Qd7uJZgVn+FmIVXunbjLT+E1BoXhXoJE="; }; } { diff --git a/pkgs/by-name/gh/ghostty/package.nix b/pkgs/by-name/gh/ghostty/package.nix index 7242ba82c9da..2db4e3637f6c 100644 --- a/pkgs/by-name/gh/ghostty/package.nix +++ b/pkgs/by-name/gh/ghostty/package.nix @@ -44,8 +44,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "ghostty"; - version = "1.0.0"; - + version = "1.0.1"; outputs = [ "out" "man" @@ -58,15 +57,9 @@ stdenv.mkDerivation (finalAttrs: { owner = "ghostty-org"; repo = "ghostty"; tag = "v${finalAttrs.version}"; - hash = "sha256-AHI1Z4mfgXkNwQA8xYq4tS0/BARbHL7gQUT41vCxQTM="; + hash = "sha256-BiXFNeoL+BYpiqzCuDIrZGQ6JVI8cBOXerJH48CbnxU="; }; - # Avoid using runtime hacks to help find X11 - postPatch = lib.optionalString (appRuntime == "gtk") '' - substituteInPlace src/apprt/gtk/x11.zig \ - --replace-warn 'std.DynLib.open("libX11.so");' 'std.DynLib.open("${lib.getLib libX11}/lib/libX11.so");' - ''; - deps = callPackage ./deps.nix { name = "${finalAttrs.pname}-cache-${finalAttrs.version}"; }; @@ -118,8 +111,7 @@ stdenv.mkDerivation (finalAttrs: { zigCheckFlags = finalAttrs.zigBuildFlags; - # Unit tests currently fail inside the sandbox - doCheck = false; + doCheck = true; /** Ghostty really likes all of it's resources to be in the same directory, so link them back after we split them @@ -186,7 +178,9 @@ stdenv.mkDerivation (finalAttrs: { ''; homepage = "https://ghostty.org/"; downloadPage = "https://ghostty.org/download"; - + changelog = "https://ghostty.org/docs/install/release-notes/${ + builtins.replaceStrings [ "." ] [ "-" ] finalAttrs.version + }"; license = lib.licenses.mit; mainProgram = "ghostty"; maintainers = with lib.maintainers; [ From 7dab57af5fd8628ab57fa796ef32437c0fffddaf Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 1 Jan 2025 02:31:31 +0100 Subject: [PATCH 86/97] python312Packages.dploot: drop support for python 3.9 Co-authored-by: Nick Cao --- pkgs/development/python-modules/dploot/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/dploot/default.nix b/pkgs/development/python-modules/dploot/default.nix index d7f86993b7f1..d4577d545cf8 100644 --- a/pkgs/development/python-modules/dploot/default.nix +++ b/pkgs/development/python-modules/dploot/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { version = "3.0.3"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; From 498e1d12d265e69706839b31dd8d2d85cc332570 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 1 Jan 2025 02:43:01 +0100 Subject: [PATCH 87/97] python312Packages.bottleneck: drop support for python 3.8 Co-authored-by: Nick Cao --- pkgs/development/python-modules/bottleneck/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/bottleneck/default.nix b/pkgs/development/python-modules/bottleneck/default.nix index d85050c73961..46abe5a8c483 100644 --- a/pkgs/development/python-modules/bottleneck/default.nix +++ b/pkgs/development/python-modules/bottleneck/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { version = "1.4.2"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; From 1f23900df0c9cca61c1b2270df340d6afffce81f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 1 Jan 2025 02:41:43 +0100 Subject: [PATCH 88/97] Revert "libportal: 0.8.1 -> 0.9.0" This reverts commit 354b423fcc3e4076f52a061c3f7376384ab551ff. --- pkgs/by-name/li/libportal/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libportal/package.nix b/pkgs/by-name/li/libportal/package.nix index 5b76dc8ccdcd..832146707d16 100644 --- a/pkgs/by-name/li/libportal/package.nix +++ b/pkgs/by-name/li/libportal/package.nix @@ -21,7 +21,7 @@ assert stdenv.mkDerivation rec { pname = "libportal" + lib.optionalString (variant != null) "-${variant}"; - version = "0.9.0"; + version = "0.8.1"; outputs = [ "out" @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { owner = "flatpak"; repo = "libportal"; rev = version; - sha256 = "sha256-uKblVaJB3s01En/T3ofT8uZHHarPKAO1qyLidLZ/b/g="; + sha256 = "sha256-NAkD5pAQpmAtVxsFZt74PwURv+RbGBfqENIwyxEEUSc="; }; depsBuildBuild = [ From 84653e6908a6537d82fe3661792281341f9f517f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Dec 2024 09:46:49 +0000 Subject: [PATCH 89/97] python312Packages.import-expression: 2.1.0.post1 -> 2.2.1.post1 --- .../python-modules/import-expression/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/import-expression/default.nix b/pkgs/development/python-modules/import-expression/default.nix index 4bed24b4bdae..b7f9e0447007 100644 --- a/pkgs/development/python-modules/import-expression/default.nix +++ b/pkgs/development/python-modules/import-expression/default.nix @@ -5,12 +5,11 @@ pytestCheckHook, pythonOlder, setuptools, - typing-extensions, }: buildPythonPackage rec { pname = "import-expression"; - version = "2.1.0.post1"; + version = "2.2.1.post1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -18,13 +17,11 @@ buildPythonPackage rec { src = fetchPypi { pname = "import_expression"; inherit version; - hash = "sha256-mclYGeuISXUDrOS1mhpVgDp1439KnHAwzHKIbRtdibQ="; + hash = "sha256-HIMb8mvvft82qXs0xoe5Yuer4GEWxm8A4U+aMhhiPU8="; }; build-system = [ setuptools ]; - dependencies = [ typing-extensions ]; - nativeCheckInputs = [ pytestCheckHook ]; pytestFlagsArray = [ "tests.py" ]; From c22bbe775a83407f964cbba6962e0ab767209ba6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 2 Dec 2024 19:01:06 +0000 Subject: [PATCH 90/97] python312Packages.types-redis: 4.6.0.20240903 -> 4.6.0.20241004 --- pkgs/development/python-modules/types-redis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-redis/default.nix b/pkgs/development/python-modules/types-redis/default.nix index 5878c4bd88a6..1b832700620b 100644 --- a/pkgs/development/python-modules/types-redis/default.nix +++ b/pkgs/development/python-modules/types-redis/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "types-redis"; - version = "4.6.0.20240903"; + version = "4.6.0.20241004"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-S6saN42/I8LJXDcN/biajwM5V8T9GlP+5xtSnBgv4Ag="; + hash = "sha256-XxfSs/kJGrdThBU7+idmGf+hz2o42mDhDV5nScxbkC4="; }; build-system = [ setuptools ]; From 01a5cf08e5c425c5a6d8799ef552a4d652599e06 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 1 Jan 2025 03:04:19 +0100 Subject: [PATCH 91/97] python312Packages.line-profiler: drop support for python 3.7 --- pkgs/development/python-modules/line-profiler/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/line-profiler/default.nix b/pkgs/development/python-modules/line-profiler/default.nix index 11d65dd7c148..91e77789b4b1 100644 --- a/pkgs/development/python-modules/line-profiler/default.nix +++ b/pkgs/development/python-modules/line-profiler/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { version = "4.2.0"; format = "setuptools"; - disabled = pythonOlder "3.6" || isPyPy; + disabled = pythonOlder "3.8" || isPyPy; src = fetchPypi { pname = "line_profiler"; From 91548962664547ff7210e611072393c6f4a0d88d Mon Sep 17 00:00:00 2001 From: natsukium Date: Wed, 1 Jan 2025 11:11:30 +0900 Subject: [PATCH 92/97] python312Packages.json-repair: move pytestCheckHook from nativeBuildInputs to nativeCheckInputs --- pkgs/development/python-modules/json-repair/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/json-repair/default.nix b/pkgs/development/python-modules/json-repair/default.nix index 91cab6837f9b..481abb883c86 100644 --- a/pkgs/development/python-modules/json-repair/default.nix +++ b/pkgs/development/python-modules/json-repair/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { build-system = [ setuptools ]; - nativeBuildInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; disabledTestPaths = [ "tests/test_performance.py" From 1be8da7361619929d9de579df5b3aa7e8f52b117 Mon Sep 17 00:00:00 2001 From: natsukium Date: Wed, 1 Jan 2025 11:22:33 +0900 Subject: [PATCH 93/97] python312Packages.oci: refactor --- pkgs/development/python-modules/oci/default.nix | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/oci/default.nix b/pkgs/development/python-modules/oci/default.nix index eb3346301a59..2e2391e5d4b1 100644 --- a/pkgs/development/python-modules/oci/default.nix +++ b/pkgs/development/python-modules/oci/default.nix @@ -7,7 +7,6 @@ fetchFromGitHub, pyopenssl, python-dateutil, - pythonOlder, pytz, setuptools, }: @@ -15,9 +14,7 @@ buildPythonPackage rec { pname = "oci"; version = "2.141.1"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; + pyproject = true; src = fetchFromGitHub { owner = "oracle"; @@ -31,11 +28,9 @@ buildPythonPackage rec { "pyOpenSSL" ]; - nativeBuildInputs = [ - setuptools - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ certifi circuitbreaker cryptography @@ -49,14 +44,14 @@ buildPythonPackage rec { pythonImportsCheck = [ "oci" ]; - meta = with lib; { + meta = { description = "Oracle Cloud Infrastructure Python SDK"; homepage = "https://github.com/oracle/oci-python-sdk"; changelog = "https://github.com/oracle/oci-python-sdk/blob/v${version}/CHANGELOG.rst"; - license = with licenses; [ + license = with lib.licenses; [ asl20 # or upl ]; - maintainers = with maintainers; [ ilian ]; + maintainers = with lib.maintainers; [ ilian ]; }; } From 64f2571324cdab15d831640e75917522de72fdb9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Dec 2024 16:49:47 +0000 Subject: [PATCH 94/97] python312Packages.simplemma: 1.1.1 -> 1.1.2 --- pkgs/development/python-modules/simplemma/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/simplemma/default.nix b/pkgs/development/python-modules/simplemma/default.nix index 191fbb5df796..197642db2dcd 100644 --- a/pkgs/development/python-modules/simplemma/default.nix +++ b/pkgs/development/python-modules/simplemma/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "simplemma"; - version = "1.1.1"; + version = "1.1.2"; pyproject = true; src = fetchFromGitHub { owner = "adbar"; repo = "simplemma"; rev = "refs/tags/v${version}"; - hash = "sha256-X0mqFPdCo0/sTexv4bi4bND7LFHOJvlOPH6tB39ybZY="; + hash = "sha256-aFN/cOSqsrTJ5GMw0/SM7uoC+T1RhDTQFf8AF00Tz/o="; }; build-system = [ From 6a571077240b57f768b60ff5b2c1bcea3489030b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Dec 2024 16:47:31 +0000 Subject: [PATCH 95/97] python312Packages.glyphslib: 6.9.0 -> 6.9.5 --- pkgs/development/python-modules/glyphslib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/glyphslib/default.nix b/pkgs/development/python-modules/glyphslib/default.nix index 895e9f1ab25e..3f142eb84be4 100644 --- a/pkgs/development/python-modules/glyphslib/default.nix +++ b/pkgs/development/python-modules/glyphslib/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "glyphslib"; - version = "6.9.0"; + version = "6.9.5"; format = "pyproject"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "googlefonts"; repo = "glyphsLib"; rev = "refs/tags/v${version}"; - hash = "sha256-NanqjZZkxrhPaBsR+FrARvsO3vdT2MYnWFtkO0hpbQg="; + hash = "sha256-9b4nPiGyBsTplEhfmPdhjalV0fexYXerdRqUbOUXlh0="; }; nativeBuildInputs = [ setuptools-scm ]; From fef16d676635a7868938b3d88a669966543e28d3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Dec 2024 07:17:08 +0000 Subject: [PATCH 96/97] python312Packages.django-pglock: 1.7.0 -> 1.7.1 --- .../python-modules/django-pglock/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/django-pglock/default.nix b/pkgs/development/python-modules/django-pglock/default.nix index 7db93173c742..16500e9515e4 100644 --- a/pkgs/development/python-modules/django-pglock/default.nix +++ b/pkgs/development/python-modules/django-pglock/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "django-pglock"; - version = "1.7.0"; + version = "1.7.1"; pyproject = true; src = fetchFromGitHub { - owner = "Opus10"; + owner = "AmbitionEng"; repo = "django-pglock"; tag = version; - hash = "sha256-7PBZvI4OTDIZjjLWnfOwGAdEJr3D6snmR20hPboLvXc="; + hash = "sha256-WbifapA2A0grxePozwDSPzREIzmgBV+V5wpA9jeYfJ8="; }; build-system = [ poetry-core ]; @@ -30,8 +30,8 @@ buildPythonPackage rec { meta = { description = "Postgres advisory locks, table locks, and blocking lock management"; - homepage = "https://github.com/Opus10/django-pglock"; - changelog = "https://github.com/Opus10/django-pglock/blob/${version}/CHANGELOG.md"; + homepage = "https://github.com/AmbitionEng/django-pglock"; + changelog = "https://github.com/AmbitionEng/django-pglock/blob/${version}/CHANGELOG.md"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ jopejoe1 ]; }; From 514b5ddc4e8237c102942ffd43bc5c3182df07a1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Dec 2024 07:17:33 +0000 Subject: [PATCH 97/97] python312Packages.django-pgactivity: 1.7.0 -> 1.7.1 --- .../python-modules/django-pgactivity/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/django-pgactivity/default.nix b/pkgs/development/python-modules/django-pgactivity/default.nix index 7438dd381025..db2044f9b565 100644 --- a/pkgs/development/python-modules/django-pgactivity/default.nix +++ b/pkgs/development/python-modules/django-pgactivity/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "django-pgactivity"; - version = "1.7.0"; + version = "1.7.1"; pyproject = true; src = fetchFromGitHub { - owner = "Opus10"; + owner = "AmbitionEng"; repo = "django-pgactivity"; tag = version; - hash = "sha256-XJDnNMhkoaRQBVsAdDqnFjOobUHi/RaMQZJnI61MuVI="; + hash = "sha256-PDJJf0PI5aqFn1HODv6wRSgTCr9ajfpPSDCB8twrFcQ="; }; build-system = [ poetry-core ]; @@ -30,8 +30,8 @@ buildPythonPackage rec { meta = { description = "View, filter, and kill Postgres queries"; - homepage = "https://github.com/Opus10/django-pgactivity"; - changelog = "https://github.com/Opus10/django-pgactivity/blob/${version}/CHANGELOG.md"; + homepage = "https://github.com/AmbitionEng/django-pgactivity"; + changelog = "https://github.com/AmbitionEng/django-pgactivity/blob/${version}/CHANGELOG.md"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ jopejoe1 ]; };