From 9c0c6b382654ccd479cb50b2d6e997cfdd0ba8fa Mon Sep 17 00:00:00 2001 From: wucke13 Date: Wed, 30 Jul 2025 14:46:47 +0200 Subject: [PATCH 01/16] wasilibc: 22-unstable-2024-10-26 -> 27-unstable-2025-07-27 Update the wasilibc to the current release. Signed-off-by: wucke13 --- pkgs/by-name/wa/wasilibc/package.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/wa/wasilibc/package.nix b/pkgs/by-name/wa/wasilibc/package.nix index 4ec6324d61c1..54dbd7d0a139 100644 --- a/pkgs/by-name/wa/wasilibc/package.nix +++ b/pkgs/by-name/wa/wasilibc/package.nix @@ -8,7 +8,7 @@ let pname = "wasilibc"; - version = "22-unstable-2024-10-16"; + version = "27-unstable-2025-07-27"; in stdenvNoLibc.mkDerivation { inherit pname version; @@ -16,8 +16,8 @@ stdenvNoLibc.mkDerivation { src = buildPackages.fetchFromGitHub { owner = "WebAssembly"; repo = "wasi-libc"; - rev = "98897e29fcfc81e2b12e487e4154ac99188330c4"; - hash = "sha256-NFKhMJj/quvN3mR7lmxzA9w46KhX92iG0rQA9qDeS8I="; + rev = "3f7eb4c7d6ede4dde3c4bffa6ed14e8d656fe93f"; + hash = "sha256-RIjph1XdYc1aGywKks5JApcLajbNFEuWm+Wy/GMHddg="; fetchSubmodules = true; }; @@ -31,6 +31,7 @@ stdenvNoLibc.mkDerivation { postPatch = '' substituteInPlace Makefile \ --replace "-Werror" "" + patchShebangs scripts/ ''; preBuild = '' From d8603c74deac7e0a7a9b4d202dd30ae91a136810 Mon Sep 17 00:00:00 2001 From: wucke13 Date: Wed, 30 Jul 2025 14:49:16 +0200 Subject: [PATCH 02/16] wasilibc: refactor and clean up the package - remove unused import - remove unnecessary `let .. in` binding - it is unclear to me what the benefit of this binding was, likely a remnant from more elaborate src fetching in the past - replace `buildPackages.fetchFromGitHub` by just `fetchFromGitHub` - it is unclear to me why manual splicing would be needed here - remove old fix from previous version - The bugreport was initially for version 16, the last activity in it mentions version 20 of the sdk, we are now at version 27 - add myself as maintainer Co-authored-by: applePrincess Signed-off-by: wucke13 --- pkgs/by-name/wa/wasilibc/package.nix | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/wa/wasilibc/package.nix b/pkgs/by-name/wa/wasilibc/package.nix index 54dbd7d0a139..91747c477733 100644 --- a/pkgs/by-name/wa/wasilibc/package.nix +++ b/pkgs/by-name/wa/wasilibc/package.nix @@ -1,22 +1,19 @@ { stdenvNoLibc, - buildPackages, + fetchFromGitHub, lib, firefox-unwrapped, firefox-esr-unwrapped, }: -let +stdenvNoLibc.mkDerivation (finalAttrs: { pname = "wasilibc"; - version = "27-unstable-2025-07-27"; -in -stdenvNoLibc.mkDerivation { - inherit pname version; + version = "27"; - src = buildPackages.fetchFromGitHub { + src = fetchFromGitHub { owner = "WebAssembly"; repo = "wasi-libc"; - rev = "3f7eb4c7d6ede4dde3c4bffa6ed14e8d656fe93f"; + tag = "wasi-sdk-${finalAttrs.version}"; hash = "sha256-RIjph1XdYc1aGywKks5JApcLajbNFEuWm+Wy/GMHddg="; fetchSubmodules = true; }; @@ -43,10 +40,7 @@ stdenvNoLibc.mkDerivation { "SYSROOT_LIB:=$SYSROOT_LIB" "SYSROOT_INC:=$SYSROOT_INC" "SYSROOT_SHARE:=$SYSROOT_SHARE" - # https://bugzilla.mozilla.org/show_bug.cgi?id=1773200 - "BULK_MEMORY_SOURCES:=" ) - ''; enableParallelBuilding = true; @@ -63,13 +57,14 @@ stdenvNoLibc.mkDerivation { }; meta = with lib; { - changelog = "https://github.com/WebAssembly/wasi-sdk/releases/tag/wasi-sdk-${version}"; + changelog = "https://github.com/WebAssembly/wasi-sdk/releases/tag/wasi-sdk-${finalAttrs.version}"; description = "WASI libc implementation for WebAssembly"; homepage = "https://wasi.dev"; platforms = platforms.wasi; maintainers = with maintainers; [ matthewbauer rvolosatovs + wucke13 ]; license = with licenses; [ asl20 @@ -77,4 +72,4 @@ stdenvNoLibc.mkDerivation { mit ]; }; -} +}) From 6a4aac01d9b272341ace89c1da27cc219f56d407 Mon Sep 17 00:00:00 2001 From: wucke13 Date: Wed, 30 Jul 2025 15:05:46 +0200 Subject: [PATCH 03/16] wasilibc: enable posix thread-model via opt-in arg Signed-off-by: wucke13 --- pkgs/by-name/wa/wasilibc/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/wa/wasilibc/package.nix b/pkgs/by-name/wa/wasilibc/package.nix index 91747c477733..9b58b0ca2f05 100644 --- a/pkgs/by-name/wa/wasilibc/package.nix +++ b/pkgs/by-name/wa/wasilibc/package.nix @@ -4,6 +4,7 @@ lib, firefox-unwrapped, firefox-esr-unwrapped, + enablePosixThreads ? false, }: stdenvNoLibc.mkDerivation (finalAttrs: { @@ -40,6 +41,7 @@ stdenvNoLibc.mkDerivation (finalAttrs: { "SYSROOT_LIB:=$SYSROOT_LIB" "SYSROOT_INC:=$SYSROOT_INC" "SYSROOT_SHARE:=$SYSROOT_SHARE" + ${lib.strings.optionalString enablePosixThreads "THREAD_MODEL:=posix"} ) ''; From 6d516d5d9bfc03559c9c445a6f5b9e1d277aebbe Mon Sep 17 00:00:00 2001 From: nat Date: Tue, 29 Jul 2025 11:05:10 +0200 Subject: [PATCH 04/16] euphonica: add updateScript --- pkgs/by-name/eu/euphonica/package.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/by-name/eu/euphonica/package.nix b/pkgs/by-name/eu/euphonica/package.nix index 007714d76cd0..6a101d8d4817 100644 --- a/pkgs/by-name/eu/euphonica/package.nix +++ b/pkgs/by-name/eu/euphonica/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + nix-update-script, cargo, meson, ninja, @@ -35,6 +36,13 @@ stdenv.mkDerivation (finalAttrs: { fetchSubmodules = true; }; + passthru.updateScript = nix-update-script { + # to be dropped once there are stable releases + extraArgs = [ + "--version=unstable" + ]; + }; + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; hash = "sha256-zFGFmiPozfBSIYxCu4fHynb2eh9emfVPtj3grPAoZeA="; From ad662d85a7a446089add7404131865c93afe5e36 Mon Sep 17 00:00:00 2001 From: nat Date: Tue, 29 Jul 2025 11:46:15 +0200 Subject: [PATCH 05/16] euphonica: build release profile --- pkgs/by-name/eu/euphonica/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/eu/euphonica/package.nix b/pkgs/by-name/eu/euphonica/package.nix index 6a101d8d4817..42e2b06c490c 100644 --- a/pkgs/by-name/eu/euphonica/package.nix +++ b/pkgs/by-name/eu/euphonica/package.nix @@ -48,6 +48,8 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-zFGFmiPozfBSIYxCu4fHynb2eh9emfVPtj3grPAoZeA="; }; + mesonBuildType = "release"; + nativeBuildInputs = [ cargo meson From 51ea4a3d0eaabb3ebeab8c0c47a9164f4f5e0cab Mon Sep 17 00:00:00 2001 From: nat Date: Tue, 12 Aug 2025 19:04:07 +0200 Subject: [PATCH 06/16] euphonica: 0.96.1-beta -> 0.96.3-beta --- pkgs/by-name/eu/euphonica/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/eu/euphonica/package.nix b/pkgs/by-name/eu/euphonica/package.nix index 42e2b06c490c..d64563b41bc0 100644 --- a/pkgs/by-name/eu/euphonica/package.nix +++ b/pkgs/by-name/eu/euphonica/package.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "euphonica"; - version = "0.96.1-beta"; + version = "0.96.3-beta"; src = fetchFromGitHub { owner = "htkhiem"; repo = "euphonica"; tag = "v${finalAttrs.version}"; - hash = "sha256-MMrTabKE+zqVSmbjOg0NCsI47eSu1c73RnsPDgCbhCo="; + hash = "sha256-IxU0LXSh516I2x8keLuuoFwfjVF+Xp0Dc56ryYY6w10="; fetchSubmodules = true; }; @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-zFGFmiPozfBSIYxCu4fHynb2eh9emfVPtj3grPAoZeA="; + hash = "sha256-j4btvkBIQ+SppqE1rvIHWbQSgBn8ORcKGFDXYypEqsA="; }; mesonBuildType = "release"; From e4688fcbde0e3bbe50ab8ea5e04f5bf6c405058a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 24 Aug 2025 18:57:15 +0000 Subject: [PATCH 07/16] tombi: 0.5.6 -> 0.5.18 --- pkgs/by-name/to/tombi/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/to/tombi/package.nix b/pkgs/by-name/to/tombi/package.nix index 333d98c90df7..c6feb47dd225 100644 --- a/pkgs/by-name/to/tombi/package.nix +++ b/pkgs/by-name/to/tombi/package.nix @@ -7,19 +7,19 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "tombi"; - version = "0.5.6"; + version = "0.5.18"; src = fetchFromGitHub { owner = "tombi-toml"; repo = "tombi"; tag = "v${finalAttrs.version}"; - hash = "sha256-EjKvVBIiG20qsr4XmGtjx7I39/tvl9HGPza5fpbwMeg="; + hash = "sha256-bzoBNSAqTBbdwsbxFJ2Gosh7s9/ZLx3D7bZ+PFLV+so="; }; # Tests relies on the presence of network doCheck = false; cargoBuildFlags = [ "--package tombi-cli" ]; - cargoHash = "sha256-TlGGkj0YtVp00swQfgjRqmYkKHDBxEUh3e4FYh6vRgk="; + cargoHash = "sha256-rq7uuyHCrsSpRUeTiSbsv7HtwJUhMUigyZ2e8JOzEeI="; postPatch = '' substituteInPlace Cargo.toml \ From e82d0ac21dd78d745f471c88f90d05a3809bcd58 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 24 Aug 2025 20:05:04 +0000 Subject: [PATCH 08/16] fosrl-pangolin: 1.8.0 -> 1.9.0 --- pkgs/by-name/fo/fosrl-pangolin/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fo/fosrl-pangolin/package.nix b/pkgs/by-name/fo/fosrl-pangolin/package.nix index 5b0770516cd8..50ca8ad15e5c 100644 --- a/pkgs/by-name/fo/fosrl-pangolin/package.nix +++ b/pkgs/by-name/fo/fosrl-pangolin/package.nix @@ -28,16 +28,16 @@ in buildNpmPackage (finalAttrs: { pname = "pangolin"; - version = "1.8.0"; + version = "1.9.0"; src = fetchFromGitHub { owner = "fosrl"; repo = "pangolin"; tag = finalAttrs.version; - hash = "sha256-Cy5COyZAH0NPQDMpKUmweYWkyupDC2sNf2CP+EJ5GiE="; + hash = "sha256-X8Jvk/1gDj4cqXP3vlsrhWEM5lR42FsQ0HaSNeNxTXg="; }; - npmDepsHash = "sha256-OGqYmOO6pizcOrdaoSGgjDQgqpjU0SIw3ceh57eyjr4="; + npmDepsHash = "sha256-OygskQhveT9CiymOOd5gx+aR9v3nMUZj72k/om3IF/c="; nativeBuildInputs = [ esbuild From c7348c8e35dedb8ab74229e88fbcf130cca46eba Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 24 Aug 2025 22:55:37 +0000 Subject: [PATCH 09/16] artichoke: 0-unstable-2025-08-03 -> 0-unstable-2025-08-18 --- pkgs/by-name/ar/artichoke/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ar/artichoke/package.nix b/pkgs/by-name/ar/artichoke/package.nix index 25bfac1bca1b..46829ca62052 100644 --- a/pkgs/by-name/ar/artichoke/package.nix +++ b/pkgs/by-name/ar/artichoke/package.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage { pname = "artichoke"; - version = "0-unstable-2025-08-03"; + version = "0-unstable-2025-08-18"; src = fetchFromGitHub { owner = "artichoke"; repo = "artichoke"; - rev = "ff0b17820a5f64ea9e8b744cef4a9111df3ed252"; - hash = "sha256-0SUU/1gp7A0gjluc8ZyF9C4ZxAgNsM6jwuT3E8GxFQY="; + rev = "2dc4c45dc3f925b9aaefc44c33e75dec7586b6ad"; + hash = "sha256-miZWT1oMyKJLA+6zO881cy4kJrkkmOpfm/l7Su/ECUw="; }; cargoHash = "sha256-JD+qt0pu5wxIuLa3Bd9eadQFE7dyKzqxsAKPebG7+Zg="; From 7e861fb7f29383385481a1806bb9179bb552f8ce Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 24 Aug 2025 23:55:53 +0000 Subject: [PATCH 10/16] upbound: 0.40.1 -> 0.40.3 --- pkgs/by-name/up/upbound/sources-stable.json | 34 ++++++++++----------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/pkgs/by-name/up/upbound/sources-stable.json b/pkgs/by-name/up/upbound/sources-stable.json index b0e6f4902754..b43015f58698 100644 --- a/pkgs/by-name/up/upbound/sources-stable.json +++ b/pkgs/by-name/up/upbound/sources-stable.json @@ -8,38 +8,38 @@ "fetchurlAttrSet": { "docker-credential-up": { "aarch64-darwin": { - "hash": "sha256-IDF8VsXux30yPRf6tn0ZVzUjYWOH8M9RxkuCJeiQI9s=", - "url": "https://cli.upbound.io/stable/v0.40.1/bundle/docker-credential-up/darwin_arm64.tar.gz" + "hash": "sha256-RuYUtOeraMygkwwlwbqcSfhLfKclbhInkppOVFBxwuU=", + "url": "https://cli.upbound.io/stable/v0.40.3/bundle/docker-credential-up/darwin_arm64.tar.gz" }, "aarch64-linux": { - "hash": "sha256-25NSIXdbXa6RYiAgfRo9GIAP79uvbKMopQsO+nFcDLQ=", - "url": "https://cli.upbound.io/stable/v0.40.1/bundle/docker-credential-up/linux_arm64.tar.gz" + "hash": "sha256-qvZFOXKnj27h69/JPhqH5wu86nqAa/7pHZzzTxwSTcg=", + "url": "https://cli.upbound.io/stable/v0.40.3/bundle/docker-credential-up/linux_arm64.tar.gz" }, "x86_64-darwin": { - "hash": "sha256-z469M2QsNPXhES06tPJUrHVvgp2UomBLBeWKMujX+AI=", - "url": "https://cli.upbound.io/stable/v0.40.1/bundle/docker-credential-up/darwin_amd64.tar.gz" + "hash": "sha256-o7JMbBeCHAN0pqUzAGDHTuIzS+9QRLeQuQnDQU2aCLw=", + "url": "https://cli.upbound.io/stable/v0.40.3/bundle/docker-credential-up/darwin_amd64.tar.gz" }, "x86_64-linux": { - "hash": "sha256-EAHYUYUWwXOWIuZCQnvp1quu3c2CsaO9nWcqBpNGMi0=", - "url": "https://cli.upbound.io/stable/v0.40.1/bundle/docker-credential-up/linux_amd64.tar.gz" + "hash": "sha256-eU9GsVmJtQZ5T6YrnrvV3cNZPCBD29JCqDIhyLt37Hk=", + "url": "https://cli.upbound.io/stable/v0.40.3/bundle/docker-credential-up/linux_amd64.tar.gz" } }, "up": { "aarch64-darwin": { - "hash": "sha256-euLretQd2QML9t9F/vEhopJRA0gWgfuIPA7vdAFQsOE=", - "url": "https://cli.upbound.io/stable/v0.40.1/bundle/up/darwin_arm64.tar.gz" + "hash": "sha256-9gwYejmN5mu2tYYHOiaC/R/38IdksZKP36BUXec/K9U=", + "url": "https://cli.upbound.io/stable/v0.40.3/bundle/up/darwin_arm64.tar.gz" }, "aarch64-linux": { - "hash": "sha256-Td0OBK37mRBUgXBAV+ayBfMDn+/ycLS5WTaW42SMzOc=", - "url": "https://cli.upbound.io/stable/v0.40.1/bundle/up/linux_arm64.tar.gz" + "hash": "sha256-XiGtOrWEfF8CQvsrutyiP2XXGaAft0WC02sqiXTOBqs=", + "url": "https://cli.upbound.io/stable/v0.40.3/bundle/up/linux_arm64.tar.gz" }, "x86_64-darwin": { - "hash": "sha256-l5ApNOnc+j9z/ghW+reo+S60UHBaJdJGhS46tu59ZLM=", - "url": "https://cli.upbound.io/stable/v0.40.1/bundle/up/darwin_amd64.tar.gz" + "hash": "sha256-kt2pvAJSDK91BrHD21HPX1+XnkeQaPfXPpr0Gwk6+8M=", + "url": "https://cli.upbound.io/stable/v0.40.3/bundle/up/darwin_amd64.tar.gz" }, "x86_64-linux": { - "hash": "sha256-XXuotsGjY6nKDXbobBOa0Yaw4qRSX3hF89DZ/m8wfmg=", - "url": "https://cli.upbound.io/stable/v0.40.1/bundle/up/linux_amd64.tar.gz" + "hash": "sha256-17C2Igba/apKI4iTu8hIzlcI7PkXAAwM/eqoBeuWcpw=", + "url": "https://cli.upbound.io/stable/v0.40.3/bundle/up/linux_amd64.tar.gz" } } }, @@ -49,5 +49,5 @@ "x86_64-darwin", "x86_64-linux" ], - "version": "0.40.1" + "version": "0.40.3" } From 15fad33a2715884a3082ab277949b191571eeaa3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 24 Aug 2025 14:17:00 -0700 Subject: [PATCH 11/16] mat2: use python312 On Python 3.13, `tests/test_libmat2.py::TestCleaning::test_html` fails with ValueError: The closing tag title doesn't have a corresponding opening one in ./tests/data/clean.html. --- pkgs/by-name/ma/mat2/package.nix | 9 +++++++++ pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 pkgs/by-name/ma/mat2/package.nix diff --git a/pkgs/by-name/ma/mat2/package.nix b/pkgs/by-name/ma/mat2/package.nix new file mode 100644 index 000000000000..ac4f59620916 --- /dev/null +++ b/pkgs/by-name/ma/mat2/package.nix @@ -0,0 +1,9 @@ +{ + # On Python 3.13, `tests/test_libmat2.py::TestCleaning::test_html` fails with + # + # ValueError: The closing tag title doesn't have a corresponding opening one in ./tests/data/clean.html. + python312Packages, +}: + +with python312Packages; +toPythonApplication mat2 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b6d8b2a70fa6..b549f107d024 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2228,8 +2228,6 @@ with pkgs; maliit-keyboard = libsForQt5.callPackage ../applications/misc/maliit-keyboard { }; - mat2 = with python3.pkgs; toPythonApplication mat2; - materialx = with python3Packages; toPythonApplication materialx; # while building documentation meson may want to run binaries for host From bd953fc1a80da0e86a40f89a4d0bfdc99270dd3e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 25 Aug 2025 02:32:59 +0200 Subject: [PATCH 12/16] python3Packages.vcver: drop Was introduced as a dependency of deepmerge, which dropped it in 2021. --- .../python-modules/vcver/default.nix | 33 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 3 files changed, 1 insertion(+), 35 deletions(-) delete mode 100644 pkgs/development/python-modules/vcver/default.nix diff --git a/pkgs/development/python-modules/vcver/default.nix b/pkgs/development/python-modules/vcver/default.nix deleted file mode 100644 index d1f5d20566f4..000000000000 --- a/pkgs/development/python-modules/vcver/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - packaging, -}: - -buildPythonPackage { - pname = "vcver"; - version = "0.2.12"; - format = "setuptools"; - - src = fetchFromGitHub { - owner = "toumorokoshi"; - repo = "vcver-python"; - rev = "c5d8a6f1f0e49bb25f5dbb07312e42cb4da096d6"; - sha256 = "1cvgs70jf7ki78338zaglaw2dkvyndmx15ybd6k4zqwwsfgk490b"; - }; - - propagatedBuildInputs = [ packaging ]; - - # circular dependency on test tool uranium https://pypi.org/project/uranium/ - doCheck = false; - - pythonImportsCheck = [ "vcver" ]; - - meta = with lib; { - description = "Reference Implementation of vcver"; - homepage = "https://github.com/toumorokoshi/vcver-python"; - license = licenses.mit; - maintainers = with maintainers; [ hexa ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index b5830cf6fe21..cb4854915657 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -836,6 +836,7 @@ mapAliases ({ uuid = throw "uuid is a Python standard module"; # added 2024-04-18 validictory = throw "validictory has been removed, since it abandoned"; # added 2023-07-07 validphys2 = throw "validphys2 has been removed, since it had a broken dependency that was removed"; # added 2023-07-07 + vcver = throw "vcver has been removed, since it was an unused leaf package"; # added 2025-08-25 vega_datasets = vega-datasets; # added 2023-11-04 ViennaRNA = viennarna; # added 2023-08-23 virtual-display = throw "virtual-display has been renamed to PyVirtualDisplay"; # added 2023-01-07 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e3429aee40ea..2e8e93b25913 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -19465,8 +19465,6 @@ self: super: with self; { vcrpy = callPackage ../development/python-modules/vcrpy { }; - vcver = callPackage ../development/python-modules/vcver { }; - vcversioner = callPackage ../development/python-modules/vcversioner { }; vdf = callPackage ../development/python-modules/vdf { }; From 3fdaa0ba4a7c5898d7151482fe2b7c5958a8bf5c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Aug 2025 02:55:41 +0000 Subject: [PATCH 13/16] firefly-iii: 6.2.21 -> 6.3.2 --- pkgs/by-name/fi/firefly-iii/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/fi/firefly-iii/package.nix b/pkgs/by-name/fi/firefly-iii/package.nix index 07c086943366..405888e0793d 100644 --- a/pkgs/by-name/fi/firefly-iii/package.nix +++ b/pkgs/by-name/fi/firefly-iii/package.nix @@ -13,13 +13,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "firefly-iii"; - version = "6.2.21"; + version = "6.3.2"; src = fetchFromGitHub { owner = "firefly-iii"; repo = "firefly-iii"; tag = "v${finalAttrs.version}"; - hash = "sha256-zyaur3CjSZ8Or2E0rQKubQ440xjwwzJE7i6QXfmn5vk="; + hash = "sha256-pXnz2a8Z9KRl6L4PUOq/zfxYaRZmxB9whE4fS6d+5x4="; }; buildInputs = [ php84 ]; @@ -38,13 +38,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { composerNoScripts = true; composerStrictValidation = true; strictDeps = true; - vendorHash = "sha256-mo2oHmFtuY62AcT+ti/zPxxS39a6Qb0cPStyyvyVCag="; + vendorHash = "sha256-I/SoFoCquuLqRoe6ibqkwPXg66uZQt+0zx3BQ/S9ucs="; }; npmDeps = fetchNpmDeps { inherit (finalAttrs) src; name = "${finalAttrs.pname}-npm-deps"; - hash = "sha256-T8Kv4vbr5n+tVQntFEaNozvSu6CKJCA3V256Ml7yzHA="; + hash = "sha256-XxQseVs11XxxgBMBOxM5aCq2acfzEj5gD+HTQolwEUs="; }; preInstall = '' From d4c8961f72ec70a67e285b0dbccc3567cd52d61b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 25 Aug 2025 06:02:55 +0200 Subject: [PATCH 14/16] python3Packages.pyssim: drop obsolete patch --- .../python-modules/pyssim/default.nix | 25 ++++++------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/pyssim/default.nix b/pkgs/development/python-modules/pyssim/default.nix index 6c08c68b5278..52eaafa2349f 100644 --- a/pkgs/development/python-modules/pyssim/default.nix +++ b/pkgs/development/python-modules/pyssim/default.nix @@ -6,7 +6,6 @@ scipy, pillow, pywavelets, - fetchpatch, setuptools, }: @@ -15,6 +14,14 @@ buildPythonPackage rec { version = "0.7.1"; pyproject = true; + # PyPI tarball doesn't contain test images so let's use GitHub + src = fetchFromGitHub { + owner = "jterrace"; + repo = "pyssim"; + tag = "v${version}"; + hash = "sha256-6393EATaXg12pYXPaHty+8LepUM6kgtZ0zSjZ1Izytg="; + }; + build-system = [ setuptools ]; @@ -26,22 +33,6 @@ buildPythonPackage rec { pywavelets ]; - # PyPI tarball doesn't contain test images so let's use GitHub - src = fetchFromGitHub { - owner = "jterrace"; - repo = "pyssim"; - tag = "v${version}"; - sha256 = "sha256-6393EATaXg12pYXPaHty+8LepUM6kgtZ0zSjZ1Izytg="; - }; - - patches = [ - # "Use PyWavelets for continuous wavelet transform"; signal.cwt was removed and broke the build - (fetchpatch { - url = "https://github.com/jterrace/pyssim/commit/64a58687f261eb397e9c22609b5d48497ef02762.patch?full_index=1"; - hash = "sha256-u6okuWZgGcYlf/SW0QLrAv0IYuJi7D8RHHEr8DeXKcw="; - }) - ]; - # Tests are copied from .github/workflows/python-package.yml checkPhase = '' runHook preCheck From 0331ac1a11ebc689b4328a482d97b757243d9f1a Mon Sep 17 00:00:00 2001 From: Luna Nova Date: Sun, 24 Aug 2025 21:49:02 -0700 Subject: [PATCH 15/16] Revert "python3Packages.albucore: 0.0.24 -> 0.0.33" This reverts commit 6ca4b4658e52218e6348d03fb6f93d6bfac318f1. albumentations isn't compatible with 0.0.33 --- pkgs/development/python-modules/albucore/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/albucore/default.nix b/pkgs/development/python-modules/albucore/default.nix index 6a4491840858..4ca66b260401 100644 --- a/pkgs/development/python-modules/albucore/default.nix +++ b/pkgs/development/python-modules/albucore/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "albucore"; - version = "0.0.33"; + version = "0.0.24"; pyproject = true; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "albumentations-team"; repo = "albucore"; tag = version; - hash = "sha256-OQYIvJM3pLna5rr1H7pVDhUR9sLmx032AZ9SWXQqMjc="; + hash = "sha256-frVMPW3au/6vPRY89GIt7chCPkUMl13DpPqCPqIjz/o="; }; pythonRelaxDeps = [ "opencv-python" ]; @@ -43,7 +43,7 @@ buildPythonPackage rec { meta = { description = "High-performance image processing library to optimize and extend Albumentations with specialized functions for image transformations"; homepage = "https://github.com/albumentations-team/albucore"; - changelog = "https://github.com/albumentations-team/albucore/releases/tag/${src.tag}"; + changelog = "https://github.com/albumentations-team/albucore/releases/tag/${version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ bcdarwin ]; }; From 6052b3ba6d4f14b0a9c459c7186871ea9c369ffb Mon Sep 17 00:00:00 2001 From: Luna Nova Date: Sun, 24 Aug 2025 21:55:35 -0700 Subject: [PATCH 16/16] python3Packages.albucore: set skipBulkUpdate so albumentations doesn't break --- pkgs/development/python-modules/albucore/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/albucore/default.nix b/pkgs/development/python-modules/albucore/default.nix index 4ca66b260401..d7a20c46fb34 100644 --- a/pkgs/development/python-modules/albucore/default.nix +++ b/pkgs/development/python-modules/albucore/default.nix @@ -40,6 +40,10 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; + # albumentations doesn't support newer versions of albucore + # and has been archived upstream in favor of relicensed `albumentationsx` + passthru.skipBulkUpdate = true; + meta = { description = "High-performance image processing library to optimize and extend Albumentations with specialized functions for image transformations"; homepage = "https://github.com/albumentations-team/albucore";