Merge master into staging-next

NixOS · Aug 11, 2024 · d151126 · d151126
2 parents 25c969a + e64441f
commit d151126
Show file tree

Hide file tree

Showing 52 changed files with 458 additions and 175 deletions.
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
@@ -2544,6 +2544,13 @@
     githubId = 410028;
     name = "Tobias Bergkvist";
   };
+  berquist = {
+    name = "Eric Berquist";
+    email = "[email protected]";
+    github = "berquist";
+    githubId = 727571;
+    keys = [ { fingerprint = "AAD4 3B70 A504 9675 CFC8  B101 BAFD 205D 5FA2 B329"; } ];
+  };
   berryp = {
     email = "[email protected]";
     github = "berryp";

diff --git a/pkgs/applications/file-managers/nnn/default.nix b/pkgs/applications/file-managers/nnn/default.nix
@@ -20,9 +20,9 @@
 }:
 
 # Mutually exclusive options
-assert withIcons -> (withNerdIcons == false && withEmojis == false);
-assert withNerdIcons -> (withIcons == false && withEmojis == false);
-assert withEmojis -> (withIcons == false && withNerdIcons == false);
+assert withIcons -> (!withNerdIcons && !withEmojis);
+assert withNerdIcons -> (!withIcons && !withEmojis);
+assert withEmojis -> (!withIcons && !withNerdIcons);
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "nnn";

diff --git a/pkgs/applications/networking/cluster/zarf/default.nix b/pkgs/applications/networking/cluster/zarf/default.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "zarf";
-  version = "0.35.0";
+  version = "0.37.0";
 
   src = fetchFromGitHub {
     owner = "defenseunicorns";
     repo = "zarf";
     rev = "v${version}";
-    hash = "sha256-HxHINy+zwkwLvckQUoDy1KqLhTYSH371+cucQGWJNIw=";
+    hash = "sha256-GgvpBYFPH1corqNCA6NQCg6Rkbdez9mFwv5HlmOCKvE=";
   };
 
-  vendorHash = "sha256-+3VYBvcA8TzO9uBl0863uATOavPY9cjt8xtgW7N7C4w=";
+  vendorHash = "sha256-gLnUvNxuxrMu6i+b0jgindgcbGOA+tk4N5N4owGV7B8=";
   proxyVendor = true;
 
   nativeBuildInputs = [ installShellFiles ];

diff --git a/pkgs/applications/networking/instant-messengers/feishu/default.nix b/pkgs/applications/networking/instant-messengers/feishu/default.nix
@@ -65,12 +65,12 @@
 let
   sources = {
     x86_64-linux = fetchurl {
-      url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/7e382fc2/Feishu-linux_x64-7.15.13.deb";
-      sha256 = "sha256-CyQmQKfyYcWqpty5LxTNqm73AVnPdm7biBwICkbBEco=";
+      url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/88a232d5/Feishu-linux_x64-7.18.11.deb";
+      sha256 = "sha256-EneDVW8eQ6J+M49hn9xLtvlqiDOx4Rs8VMLt1cqSbak=";
     };
     aarch64-linux = fetchurl {
-      url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/4c8c2fbf/Feishu-linux_arm64-7.15.13.deb";
-      sha256 = "sha256-nxtu5xOafZ1tlN/f0+5VF2I6ISfHmPJTztOI+AQwp9c=";
+      url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/f29ac73d/Feishu-linux_arm64-7.18.11.deb";
+      sha256 = "sha256-ghAWPQgVEBSom7zBHUKb56O3EZR4rOnQlz9BRSJBNp4=";
     };
   };
 
@@ -131,7 +131,7 @@ let
   ];
 in
 stdenv.mkDerivation {
-  version = "7.15.13";
+  version = "7.18.11";
   pname = "feishu";
 
   src = sources.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");

diff --git a/pkgs/applications/networking/shellhub-agent/default.nix b/pkgs/applications/networking/shellhub-agent/default.nix
@@ -11,18 +11,18 @@
 
 buildGoModule rec {
   pname = "shellhub-agent";
-  version = "0.15.1";
+  version = "0.16.0";
 
   src = fetchFromGitHub {
     owner = "shellhub-io";
     repo = "shellhub";
     rev = "v${version}";
-    hash = "sha256-QwbxGym0eesCzrT//1+Hcr15B4nFck5u1VNRU8xE3Qo=";
+    hash = "sha256-CJ9ZkoQmZlDI9mgZkEOWuJn66Dvt2f1DjPGf140qJDg=";
   };
 
   modRoot = "./agent";
 
-  vendorHash = "sha256-JlfQRYdmxghGrKGwrn8jK1m32EhskmhMiyxNHZma0N0=";
+  vendorHash = "sha256-QWscqQlkvpfvJnI4C74qqD2P9V7ZAY29kCLF1WTTJ7Q=";
 
   ldflags = [ "-s" "-w" "-X main.AgentVersion=v${version}" ];
 

diff --git a/pkgs/applications/virtualization/colima/default.nix b/pkgs/applications/virtualization/colima/default.nix
@@ -17,13 +17,13 @@
 
 buildGoModule rec {
   pname = "colima";
-  version = "0.6.10";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "abiosoft";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-gXLKqSmlj3TJNmqYuByJ2CcUCV3xD239YeuWzrN97lo=";
+    hash = "sha256-fl1QtGbcaUwHDz4Jg+UgK27GPTHyJUyK76LXyaYj4Fo=";
     # We need the git revision
     leaveDotGit = true;
     postFetch = ''

diff --git a/pkgs/by-name/ei/eigenlayer/package.nix b/pkgs/by-name/ei/eigenlayer/package.nix
@@ -6,16 +6,16 @@
 }:
 buildGoModule rec {
   pname = "eigenlayer";
-  version = "0.9.2";
+  version = "0.9.3";
 
   src = fetchFromGitHub {
     owner = "Layr-Labs";
     repo = "eigenlayer-cli";
     rev = "v${version}";
-    hash = "sha256-KdSCXvzUCEw5BTvKOejxUP+KXKXCpXvtvFmZ2JmihK4=";
+    hash = "sha256-NUO6WgiBljd4mbz7K5XX/z27L0j5ZYcOvt97ERFYZts=";
   };
 
-  vendorHash = "sha256-uC6HMIf+wbHx2/Ico1UOj+S27xtVe1mCrcBy1CacIVs=";
+  vendorHash = "sha256-nQcUyxrdGbwqaFeEEfoc15zffrQG6WuEhF7YZkpGADs=";
 
   ldflags = ["-s" "-w"];
   subPackages = ["cmd/eigenlayer"];

diff --git a/pkgs/by-name/ga/gamescope/package.nix b/pkgs/by-name/ga/gamescope/package.nix
@@ -45,14 +45,14 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "gamescope";
-  version = "3.14.26";
+  version = "3.14.29";
 
   src = fetchFromGitHub {
     owner = "ValveSoftware";
     repo = "gamescope";
     rev = "refs/tags/${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-vCPKySLB1D9oKgCrYrXqt/s0hV+/ocuWOrcDUzKbdKI=";
+    hash = "sha256-q3HEbFqUeNczKYUlou+quxawCTjpM5JNLrML84tZVYE=";
   };
 
   patches = [

diff --git a/pkgs/by-name/ha/handheld-daemon/package.nix b/pkgs/by-name/ha/handheld-daemon/package.nix
@@ -8,14 +8,14 @@
 }:
 python3.pkgs.buildPythonApplication rec {
   pname = "handheld-daemon";
-  version = "3.3.3";
+  version = "3.3.7";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "hhd-dev";
     repo = "hhd";
     rev = "refs/tags/v${version}";
-    hash = "sha256-n7UtzI4wYVMldDl7FcK9hhIOTl9jkvATGFjR+pV545U=";
+    hash = "sha256-nRI1YrKBg7J14PQbWLLNaCI9p3v6Yl+Q506EOlSqqVc=";
   };
 
   propagatedBuildInputs = with python3.pkgs; [

diff --git a/pkgs/by-name/ha/hare/package.nix b/pkgs/by-name/ha/hare/package.nix
@@ -3,7 +3,6 @@
   stdenv,
   fetchFromSourcehut,
   harec,
-  gitUpdater,
   scdoc,
   tzdata,
   mailcap,
@@ -154,7 +153,6 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   passthru = {
-    updateScript = gitUpdater { };
     tests =
       lib.optionalAttrs enableCrossCompilation {
         crossCompilation = callPackage ./cross-compilation-tests.nix { hare = finalAttrs.finalPackage; };

diff --git a/pkgs/by-name/ha/harec/package.nix b/pkgs/by-name/ha/harec/package.nix
@@ -1,4 +1,5 @@
 {
+  _experimental-update-script-combinators,
   fetchFromSourcehut,
   gitUpdater,
   lib,
@@ -52,7 +53,19 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   passthru = {
-    updateScript = gitUpdater { };
+    updateScript = _experimental-update-script-combinators.sequence (
+      builtins.map (item: item.command) [
+        (gitUpdater {
+          attrPath = "harec";
+          ignoredVersions = [ "-rc[0-9]{1,}" ];
+        })
+        (gitUpdater {
+          attrPath = "hare";
+          url = "https://git.sr.ht/~sircmpwn/hare";
+          ignoredVersions = [ "-rc[0-9]{1,}" ];
+        })
+      ]
+    );
     # To be kept in sync with the hare package.
     inherit qbe;
   };

diff --git a/pkgs/by-name/mo/mokuro/package.nix b/pkgs/by-name/mo/mokuro/package.nix
@@ -6,26 +6,26 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "mokuro";
-  version = "0.1.8";
+  version = "0.2.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "kha-white";
     repo = "mokuro";
     rev = "v${version}";
-    hash = "sha256-w+hhUt2fTl9zrca4xotK5eNhbfragYNC0u5WDwNGb7k=";
+    hash = "sha256-+hcc3spbpktavqJ8q4kuQFpkm0PYIru6UdpkU7L8XI4=";
     fetchSubmodules = true;
   };
 
   postPatch = ''
-    substituteInPlace setup.py \
+    substituteInPlace pyproject.toml \
         --replace-fail 'opencv-python' 'opencv'
   '';
 
 
   pythonRelaxDeps = [ "torchvision" ];
 
-  build-system = with python3Packages; [ setuptools ];
+  build-system = with python3Packages; [ setuptools-scm ];
 
   dependencies = with python3Packages; [
     fire

diff --git a/pkgs/by-name/op/opcua-commander/package.nix b/pkgs/by-name/op/opcua-commander/package.nix
@@ -8,16 +8,16 @@
 }:
 buildNpmPackage rec {
   pname = "opcua-commander";
-  version = "0.37.0";
+  version = "0.39.0";
 
   src = fetchFromGitHub {
     owner = "node-opcua";
     repo = "opcua-commander";
     rev = version;
-    hash = "sha256-wQXSSNinY85Ti+D/zklYP2N8IP3OsN9xQNJuuQr4kVU=";
+    hash = "sha256-7KYwIdrhlvGR9RHZBfMFOcBa+opwx7Q/crCdvwZD6Y8=";
   };
 
-  npmDepsHash = "sha256-Ux1X/3sam9WHrTfqoWv1r9p3pJOs6BaeFsxHizAvjXA=";
+  npmDepsHash = "sha256-g4WFLh+UnziQR2NZ4eL84Vrk+Mz99kFQiBkdGmBEMHE=";
   nativeBuildInputs = [ esbuild typescript makeWrapper ];
 
   postPatch = ''

diff --git a/pkgs/by-name/qq/qq/sources.nix b/pkgs/by-name/qq/qq/sources.nix
@@ -1,9 +1,9 @@
 # Generated by ./update.sh - do not update manually!
-# Last updated: 2024-08-05
+# Last updated: 2024-08-10
 {
-  version = "3.2.12-26740";
-  amd64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/769073aa/linuxqq_3.2.12-26740_amd64.deb";
-  arm64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/769073aa/linuxqq_3.2.12-26740_arm64.deb";
-  arm64_hash = "sha256-y2qWXNtqIinXB91nvIT0FC8fM1r71qX5fXjrBAjZxzA=";
-  amd64_hash = "sha256-SQQ6biLr1ZCpBq+2TzKpjipoCb1aFkxlr0CZYKmA8Zg=";
+  version = "3.2.12";
+  amd64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.12_240808_amd64_01.deb";
+  arm64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.12_240808_arm64_01.deb";
+  arm64_hash = "sha256-fx1+CNabeWNCRHzYh/nRnnBeFt5WyrMBIfzuw7e/CTc=";
+  amd64_hash = "sha256-gzoM8xq51iUwzHWirXLd7LPMPQ36KxOyp0iS6az3y6E=";
 }
diff --git a/pkgs/by-name/si/simdutf/package.nix b/pkgs/by-name/si/simdutf/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "simdutf";
-  version = "5.3.1";
+  version = "5.3.4";
 
   src = fetchFromGitHub {
     owner = "simdutf";
     repo = "simdutf";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-3heABmBXz4lA43H+q26+HYg+SOsusIMiOfA3Pr4iV+s=";
+    hash = "sha256-zttqfzTF9P1czM2+HECcDC2j2XPfsJn0r+qpnNDfLWw=";
   };
 
   # Fix build on darwin

diff --git a/pkgs/by-name/te/tenv/package.nix b/pkgs/by-name/te/tenv/package.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "tenv";
-  version = "2.7.9";
+  version = "3.0.0";
 
   src = fetchFromGitHub {
     owner = "tofuutils";
     repo = "tenv";
     rev = "v${version}";
-    hash = "sha256-oeMbpnYCkJ5GjfgOlNyQpwy80DbrupXIFS2dx4W2xo4=";
+    hash = "sha256-h380ZkVZS2NOTJvaxfqd2O5WEai0raFENqJQACC1Qtg=";
   };
 
-  vendorHash = "sha256-/4RiOF9YU4GEZlJcx2S2bLhJ1Q6F+8To3XiyWzGGHUU=";
+  vendorHash = "sha256-BHr8n7GJmNV3kDYqVjpjGVNctIGsWh/UzAh0u8WSESs=";
 
   # Tests disabled for requiring network access to release.hashicorp.com
   doCheck = false;

diff --git a/pkgs/data/misc/v2ray-domain-list-community/default.nix b/pkgs/data/misc/v2ray-domain-list-community/default.nix
@@ -3,12 +3,12 @@
 let
   generator = pkgsBuildBuild.buildGoModule rec {
     pname = "v2ray-domain-list-community";
-    version = "20240726161926";
+    version = "20240810010807";
     src = fetchFromGitHub {
       owner = "v2fly";
       repo = "domain-list-community";
       rev = version;
-      hash = "sha256-z0UVwobRvQW4R/5FItPNsw8SP9x92aBKB1QxRz/TTFI=";
+      hash = "sha256-pxb29QO1K9e4CwAAdNUi6jxoiXhJYELqnu/A7DuB0zQ=";
     };
     vendorHash = "sha256-NLh14rXRci4hgDkBJVJDIDvobndB7KYRKAX7UjyqSsg=";
     meta = with lib; {

diff --git a/pkgs/data/themes/whitesur/default.nix b/pkgs/data/themes/whitesur/default.nix
@@ -91,9 +91,9 @@ stdenv.mkDerivation rec {
       ${lib.optionalString (nautilusSize != null) ("--size " + nautilusSize)} \
       ${lib.optionalString (panelOpacity != null) ("--panel-opacity " + panelOpacity)} \
       ${lib.optionalString (panelSize != null) ("--panel-size " + panelSize)} \
-      ${lib.optionalString (roundedMaxWindow == true) "--roundedmaxwindow"} \
-      ${lib.optionalString (nordColor == true) "--nordcolor"} \
-      ${lib.optionalString (darkerColor == true) "--darkercolor"} \
+      ${lib.optionalString roundedMaxWindow "--roundedmaxwindow"} \
+      ${lib.optionalString nordColor "--nordcolor"} \
+      ${lib.optionalString darkerColor "--darkercolor"} \
       --dest $out/share/themes
 
     jdupes --quiet --link-soft --recurse $out/share

diff --git a/pkgs/development/libraries/lightgbm/default.nix b/pkgs/development/libraries/lightgbm/default.nix
@@ -4,9 +4,9 @@
 , rLibrary ? false, cudaPackages, opencl-headers, ocl-icd, boost
 , llvmPackages, openmpi, openjdk, swig, hadoop, R, rPackages, pandoc }:
 
-assert doCheck -> mpiSupport != true;
-assert openclSupport -> cudaSupport != true;
-assert cudaSupport -> openclSupport != true;
+assert doCheck -> !mpiSupport;
+assert openclSupport -> !cudaSupport;
+assert cudaSupport -> !openclSupport;
 
 stdenv.mkDerivation rec {
   pnameBase = "lightgbm";

diff --git a/pkgs/development/libraries/xgboost/default.nix b/pkgs/development/libraries/xgboost/default.nix
@@ -22,7 +22,7 @@ assert ncclSupport -> (cudaSupport && !cudaPackages.nccl.meta.unsupported);
 # 2) the R package creates a different binary shared
 # object that isn't compatible with the regular CLI
 # tests.
-assert rLibrary -> doCheck != true;
+assert rLibrary -> !doCheck;
 
 let
   # This ensures xgboost gets the correct libstdc++ when

diff --git a/pkgs/development/php-packages/ast/default.nix b/pkgs/development/php-packages/ast/default.nix
@@ -5,7 +5,7 @@
 }:
 
 let
-  version = "1.1.1";
+  version = "1.1.2";
 in
 buildPecl {
   inherit version;
@@ -15,7 +15,7 @@ buildPecl {
     owner = "nikic";
     repo = "php-ast";
     rev = "v${version}";
-    sha256 = "sha256-ulMLufhLf9E11Z6+rVBZ14CY3ILp/NrhMjRXmrUHnBA=";
+    sha256 = "sha256-9HP+hKcpkWmvsx335JiCVjFG+xyAMEm5dWxWC1nZPxU=";
   };
 
   meta = with lib; {