Merge master into staging-next

.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

pkgs/by-name/lf/lf/package.nix

@@ -4,20 +4,21 @@
   buildGoModule,
   fetchFromGitHub,
   installShellFiles,
+  versionCheckHook,
 }:
 
 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 ];
 
@@ -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 = ''

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

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;
     };
   };