From 1c05c25f2637d1ae10fde407222208740c1e3277 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 8 Dec 2025 05:06:52 +0000 Subject: [PATCH 1/5] linuxKernel.kernels.linux_lqx: 6.17.9 -> 6.17.11 --- pkgs/os-specific/linux/kernel/zen-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index 9c8c1c626a62..5a2cc3759914 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -23,9 +23,9 @@ let }; # ./update-zen.py lqx lqx = { - version = "6.17.9"; # lqx + version = "6.17.11"; # lqx suffix = "lqx1"; # lqx - sha256 = "0c1b73yzj5g783qrz3pydq2ilk57bmb867y48spxr1jxncxml8dz"; # lqx + sha256 = "1dllgir1afk7va698sdv07sjisbb4x5p95y871m4y72zw3i71sa2"; # lqx isLqx = true; }; }; From 5bcaf54680546ff4c50c4401c80a9226b0c54086 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 10 Dec 2025 07:47:24 +0000 Subject: [PATCH 2/5] lf: 39 -> 40 --- pkgs/by-name/lf/lf/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/lf/lf/package.nix b/pkgs/by-name/lf/lf/package.nix index d40c604a6f13..e5b1cb3a8001 100644 --- a/pkgs/by-name/lf/lf/package.nix +++ b/pkgs/by-name/lf/lf/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "lf"; - version = "39"; + version = "40"; src = fetchFromGitHub { owner = "gokcehan"; repo = "lf"; tag = "r${version}"; - hash = "sha256-6M6xMVWHTLPlnG5i6/dC3KEV6RXezz8KK0V81P8RcE0="; + hash = "sha256-NPbv64ezcuGn6n6qQOCBLeofS08uX9ZWpSXTVpmQr+A="; }; - vendorHash = "sha256-93VPbrNPRW6NyKHJBvmAadbJ+DLsH2jTAXjTKkPdYBA="; + vendorHash = "sha256-ybcwACun2GrANW47Nny60l8M+L9TZHzD95+qxVJKHpA="; nativeBuildInputs = [ installShellFiles ]; From 55fc31bdd8fb58148593fe67e3db2a87f26ac6fd Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Mon, 22 Sep 2025 14:38:30 -0400 Subject: [PATCH 3/5] python313Packages.monai: 1.5.0 -> 1.5.1 Add postFetch to mitigate versioneer and git-archive modifying the source, invalidating its checksum --- .../python-modules/monai/default.nix | 24 +++++++------------ 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/monai/default.nix b/pkgs/development/python-modules/monai/default.nix index 2b46ecb02d93..9cdc1eb8b733 100644 --- a/pkgs/development/python-modules/monai/default.nix +++ b/pkgs/development/python-modules/monai/default.nix @@ -13,24 +13,20 @@ buildPythonPackage rec { pname = "monai"; - version = "1.5.0"; + version = "1.5.1"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "Project-MONAI"; repo = "MONAI"; tag = version; - hash = "sha256-SUZSWChO0oQlLblPwmCg2zt2Jp5QnpM1CXWnMiOiLhw="; - # note: upstream consistently seems to modify the tag shortly after release, - # so best to wait a few days before updating + hash = "sha256-GhyUOp/iLpuKKQAwQsA6D7IiW8ym8QTC4OmRxEKydVA="; + # fix source non-reproducibility due to versioneer + git-archive, as with Numba, Pytensor etc. derivations: + postFetch = '' + sed -i 's/git_refnames = "[^"]*"/git_refnames = " (tag: ${src.tag})"/' $out/monai/_version.py + ''; }; - postPatch = '' - substituteInPlace pyproject.toml --replace-fail 'torch>=2.4.1, <2.7.0' 'torch' - ''; - preBuild = '' export MAX_JOBS=$NIX_BUILD_CORES; ''; @@ -48,8 +44,6 @@ buildPythonPackage rec { torch ]; - pythonRelaxDeps = [ "torch" ]; - env.BUILD_MONAI = 1; doCheck = false; # takes too long; tries to download data @@ -70,11 +64,11 @@ buildPythonPackage rec { "monai.visualize" ]; - meta = with lib; { + meta = { description = "Pytorch framework (based on Ignite) for deep learning in medical imaging"; homepage = "https://github.com/Project-MONAI/MONAI"; changelog = "https://github.com/Project-MONAI/MONAI/releases/tag/${version}"; - license = licenses.asl20; - maintainers = [ maintainers.bcdarwin ]; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.bcdarwin ]; }; } From 62283c3f1544934f733b5b2ef8fbe8abdffa6593 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 10 Dec 2025 09:40:35 -0800 Subject: [PATCH 4/5] lf: run versionCheckHook --- pkgs/by-name/lf/lf/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/lf/lf/package.nix b/pkgs/by-name/lf/lf/package.nix index e5b1cb3a8001..d2af98e695e7 100644 --- a/pkgs/by-name/lf/lf/package.nix +++ b/pkgs/by-name/lf/lf/package.nix @@ -4,6 +4,7 @@ buildGoModule, fetchFromGitHub, installShellFiles, + versionCheckHook, }: buildGoModule rec { @@ -37,6 +38,10 @@ buildGoModule rec { installShellCompletion etc/lf.{bash,zsh,fish} ''; + doInstallCheck = true; + + nativeInstallCheckInputs = [ versionCheckHook ]; + meta = { description = "Terminal file manager written in Go and heavily inspired by ranger"; longDescription = '' From d720c3006f5400476801f0ebcdc6f7788940c2c9 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Wed, 10 Dec 2025 18:53:07 +0100 Subject: [PATCH 5/5] .git-blame-ignore-revs: add meta = with cleanup --- .git-blame-ignore-revs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 9685de407b97..4bf4b58bfec3 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -307,3 +307,6 @@ c283f32d296564fd649ef3ed268c1f1f7b199c49 # !autorebase nix-shell --run treefmt # aliases: keep-sorted 48ce0739044bd6eba83c3a43bd4ad1046399cdad # !autorebase nix-shell --run treefmt + +# treewide: clean up 'meta = with' pattern +567e8dfd8eddc5468e6380fc563ab8a27422ab1d