Merge master into staging-next

ci/eval/README.md

@@ -5,14 +5,16 @@ The code in this directory is used by the [eval.yml](../../.github/workflows/eva
 Furthermore it also allows local evaluation using
 ```
 nix-build ci -A eval.full \
-  --max-jobs 4
-  --cores 2
-  --arg chunkSize 10000
+  --max-jobs 4 \
+  --cores 2 \
+  --arg chunkSize 10000 \
+  --arg evalSystems '["x86_64-linux" "aarch64-darwin"]'
 ```
 
 - `--max-jobs`: The maximum number of derivations to run at the same time. Only each [supported system](../supportedSystems.nix) gets a separate derivation, so it doesn't make sense to set this higher than that number.
 - `--cores`: The number of cores to use for each job. Recommended to set this to the amount of cores on your system divided by `--max-jobs`.
 - `chunkSize`: The number of attributes that are evaluated simultaneously on a single core. Lowering this decreases memory usage at the cost of increased evaluation time. If this is too high, there won't be enough chunks to process them in parallel, and will also increase evaluation time.
+- `evalSystems`: The set of systems for which `nixpkgs` should be evaluated. Defaults to the four official platforms (`x86_64-linux`, `aarch64-linux`, `x86_64-darwin` and `aarch64-darwin`).
 
 A good default is to set `chunkSize` to 10000, which leads to about 3.6GB max memory usage per core, so suitable for fully utilising machines with 4 cores and 16GB memory, 8 cores and 32GB memory or 16 cores and 64GB memory.
 

ci/eval/default.nix

@@ -259,14 +259,13 @@ let
 
   full =
     {
-      # Whether to evaluate just a single system, by default all are evaluated
-      evalSystem ? if quickTest then "x86_64-linux" else null,
+      # Whether to evaluate on a specific set of systems, by default all are evaluated
+      evalSystems ? if quickTest then [ "x86_64-linux" ] else supportedSystems,
       # The number of attributes per chunk, see ./README.md for more info.
       chunkSize,
       quickTest ? false,
     }:
     let
-      systems = if evalSystem == null then supportedSystems else [ evalSystem ];
       results = linkFarm "results" (
         map (evalSystem: {
           name = evalSystem;
@@ -274,7 +273,7 @@ let
             inherit quickTest evalSystem chunkSize;
             attrpathFile = attrpathsSuperset + "/paths.json";
           };
-        }) systems
+        }) evalSystems
       );
     in
     combine {

pkgs/applications/networking/cluster/kubernetes/default.nix

@@ -21,13 +21,13 @@
 
 buildGoModule rec {
   pname = "kubernetes";
-  version = "1.31.2";
+  version = "1.32.0";
 
   src = fetchFromGitHub {
     owner = "kubernetes";
     repo = "kubernetes";
     rev = "v${version}";
-    hash = "sha256-L+x1a9wttu2OBY5T6AY8k91ystu0uZAGd3px4oNVptM=";
+    hash = "sha256-VpinMMWvFYpcqDC9f3q/oEqUHRz7thHMs0bKt6AaNms=";
   };
 
   vendorHash = null;

pkgs/by-name/gi/git-nomad/package.nix

@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "git-nomad";
-  version = "0.7.1";
+  version = "0.8.0";
 
   src = fetchFromGitHub {
     owner = "rraval";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-N+iPr389l9PDfJIhvRL6ziGSPI6pgvfdGX6wxmapLhA=";
+    sha256 = "sha256-G/i+mCKZSe8tPMuCLzymkU9SGyFNHY74cGhcC4ru0/k=";
   };
 
-  cargoHash = "sha256-7CZC29y9dLpyanolO+epKd0KwmRc1iGY+sPM9f/j5hk=";
+  cargoHash = "sha256-DEGYOPUr3tWDak1J0EkY2yjaLlXjKRH+9puC/oDJacg=";
 
   nativeCheckInputs = [ git ];
 

pkgs/by-name/ip/iproute2mac/package.nix

@@ -7,14 +7,14 @@
   python3,
 }:
 
-stdenv.mkDerivation rec {
-  version = "1.5.4";
+stdenv.mkDerivation (finalAttrs: {
   pname = "iproute2mac";
+  version = "1.5.4";
 
   src = fetchFromGitHub {
     owner = "brona";
     repo = "iproute2mac";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-hmSqJ2gc0DOXUuFrp1ZG8usjFdo07zjV/1JLs5r/E04=";
   };
 
@@ -52,4 +52,4 @@ stdenv.mkDerivation rec {
     maintainers = with lib.maintainers; [ jiegec ];
     platforms = lib.platforms.darwin;
   };
-}
+})

pkgs/by-name/ir/iro/package.nix

@@ -0,0 +1,27 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+}:
+
+rustPlatform.buildRustPackage {
+  pname = "iro";
+  version = "0-unstable-2024-10-24";
+
+  src = fetchFromGitHub {
+    owner = "kyoheiu";
+    repo = "iro";
+    rev = "ba4adc00e13da9086389357b0e92e608928a8b39";
+    hash = "sha256-hGGrEGG1LyzfUCEnV7ahhRO0GrLk28xDWZEFqUHk1rE=";
+  };
+
+  cargoHash = "sha256-ZP0YO+5juxFGc2rtvNBvknlTJBrtr8HiuN6/kKW1WNU=";
+
+  meta = {
+    description = "CLI tool to convet Hex color code or RGB to color code, RGB, HSL and color name";
+    homepage = "https://github.com/kyoheiu/iro";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ airrnot ];
+    mainProgram = "iro";
+  };
+}

pkgs/by-name/mi/minizign/package.nix

@@ -1,30 +1,37 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, zig_0_11
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  zig_0_13,
+  apple-sdk_11,
 }:
 
-stdenv.mkDerivation {
+let
+  zig = zig_0_13;
+in
+stdenv.mkDerivation (finalAttrs: {
   pname = "minizign";
-  version = "unstable-2023-08-13";
+  version = "0.1.4";
 
   src = fetchFromGitHub {
     owner = "jedisct1";
     repo = "zig-minisign";
-    rev = "47edc26d0c7bcfb531fe08e3b2411d8dda516d47";
-    hash = "sha256-zyxjUFxg+VufEVycYGCQPdjERE3p5Vz5iIi2UDujEjI=";
+    rev = finalAttrs.version;
+    hash = "sha256-Su66UohRc9C4INIp+7NHiW28sUq5YBfrI0EoEbGojG0=";
   };
 
   nativeBuildInputs = [
-    zig_0_11.hook
+    zig.hook
   ];
 
-  meta = with lib; {
+  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
+
+  meta = {
     description = "Minisign reimplemented in Zig";
     homepage = "https://github.com/jedisct1/zig-minisign";
-    license = licenses.isc;
-    maintainers = with maintainers; [ figsoda ];
+    license = lib.licenses.isc;
+    maintainers = with lib.maintainers; [ figsoda ];
     mainProgram = "minizign";
-    inherit (zig_0_11.meta) platforms;
+    inherit (zig.meta) platforms;
   };
-}
+})

pkgs/by-name/pi/pinocchio/package.nix

@@ -21,13 +21,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pinocchio";
-  version = "3.3.0";
+  version = "3.3.1";
 
   src = fetchFromGitHub {
     owner = "stack-of-tasks";
     repo = "pinocchio";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-8lRGdtN3V0pfRH3f70H8n2pt5CGQkUY1wKg9gUY0toQ=";
+    hash = "sha256-dm5xfYAnn5N/8ZKTMyZNFM5/j3LLBrG+NOgmtxCAI6I=";
   };
 
   outputs = [

pkgs/by-name/pi/pixi/package.nix

@@ -1,35 +1,40 @@
-{ lib
-, stdenv
-, rustPlatform
-, fetchFromGitHub
-, pkg-config
-, libgit2
-, openssl
-, installShellFiles
-, darwin
-, testers
-, pixi
+{
+  lib,
+  stdenv,
+  rustPlatform,
+  fetchFromGitHub,
+  pkg-config,
+  libgit2,
+  openssl,
+  installShellFiles,
+  testers,
+  pixi,
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "pixi";
-  version = "0.34.0";
+  version = "0.38.0";
 
   src = fetchFromGitHub {
     owner = "prefix-dev";
     repo = "pixi";
     rev = "v${version}";
-    hash = "sha256-pXJna0WuosQ21u+ImIc70OaG63xVODLaWFkuYqxUc/Y=";
+    hash = "sha256-F15GDw6zolaa4IheKyJ9kdmdiLazUiDUhnUM8gH/hgk=";
   };
 
+  postPatch = ''
+    # There are multiple `version-ranges` entries which is not supported by buildRustPackage.
+    cp -f ${./Cargo.lock} Cargo.lock
+  '';
+
   cargoLock = {
     lockFile = ./Cargo.lock;
     outputHashes = {
       "async_zip-0.0.17" = "sha256-3k9rc4yHWhqsCUJ17K55F8aQoCKdVamrWAn6IDWo3Ss=";
-      "cache-key-0.0.1" = "sha256-JEGcX4dT/cVLb07n2Y0nai17jW0tXpV18qaYVnoEpew=";
-      "pubgrub-0.2.1" = "sha256-pU+F6hwqy+r6tz5OBoB6gU0+vdH6F3ikUaPrcvYRX2c=";
-      "reqwest-middleware-0.3.3" = "sha256-csQN7jZTifliSTsOm6YrjPVgsXBOfelY7LkHD1HkNGQ=";
+      "pubgrub-0.2.1" = "sha256-8TrOQ6fYJrYgFNuqiqnGztnHOqFIEDi2MFZEBA+oks4=";
+      "reqwest-middleware-0.3.3" = "sha256-KjyXB65a7SAfwmxokH2PQFFcJc6io0xuIBQ/yZELJzM=";
       "tl-0.7.8" = "sha256-F06zVeSZA4adT6AzLzz1i9uxpI1b8P1h+05fFfjm3GQ=";
+      "uv-auth-0.0.1" = "sha256-xy/fgy3+YvSdfq5ngPVbAmRpYyJH27Cft5QxBwFQumU=";
     };
   };
 
@@ -41,9 +46,7 @@ rustPlatform.buildRustPackage rec {
   buildInputs = [
     libgit2
     openssl
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin (
-    with darwin.apple_sdk_11_0.frameworks; [ CoreFoundation IOKit SystemConfiguration Security ]
-  );
+  ];
 
   env = {
     LIBGIT2_NO_VENDOR = 1;
@@ -64,11 +67,14 @@ rustPlatform.buildRustPackage rec {
     package = pixi;
   };
 
-  meta = with lib; {
+  meta = {
     description = "Package management made easy";
     homepage = "https://pixi.sh/";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ aaronjheng edmundmiller ];
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [
+      aaronjheng
+      edmundmiller
+    ];
     mainProgram = "pixi";
   };
 }

pkgs/by-name/st/staruml/package.nix

@@ -60,12 +60,12 @@ let
   ];
 in
 stdenv.mkDerivation (finalAttrs: {
-  version = "6.3.0";
+  version = "6.3.1";
   pname = "staruml";
 
   src = fetchurl {
     url = "https://files.staruml.io/releases-v6/StarUML_${finalAttrs.version}_amd64.deb";
-    sha256 = "sha256-G63MxjefAJ0J40HzrI9j/sRkHLIdUzBf0GSbw6fAFoI=";
+    sha256 = "sha256-HJCQZr3vphxLeuHVkq6fSZai8PfJKyhuaooFeOUGxSI=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/zt/ztags/package.nix

@@ -1,36 +1,43 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, scdoc
-, zig_0_11
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  scdoc,
+  zig_0_13,
+  apple-sdk_11,
 }:
 
-stdenv.mkDerivation {
+let
+  zig = zig_0_13;
+in
+stdenv.mkDerivation (finalAttrs: {
   pname = "ztags";
-  version = "unstable-2023-09-07";
+  version = "1.0.1";
 
   src = fetchFromGitHub {
     owner = "gpanders";
     repo = "ztags";
-    rev = "6cdbd6dcdeda0d1ab9ad30261000e3d21b2407e6";
-    hash = "sha256-lff5L7MG8RJdJM/YebJKDkKfkG4oumC0HytiCUOUG5Q=";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-XDwHuQ+UwScolxyxCHJUmxxG+OgKvZmNGQEZlfywV2s=";
   };
 
   nativeBuildInputs = [
     scdoc
-    zig_0_11.hook
+    zig.hook
   ];
 
+  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
+
   postInstall = ''
     zig build docs --prefix $out
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Generate tags files for Zig projects";
     homepage = "https://github.com/gpanders/ztags";
-    license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ figsoda ];
     mainProgram = "ztags";
-    inherit (zig_0_11.meta) platforms;
+    inherit (zig.meta) platforms;
   };
-}
+})

pkgs/data/fonts/source-han/default.nix

@@ -97,8 +97,8 @@ in
   serif = makeSuperOTC {
     family = "serif";
     description = "serif";
-    rev = "2.001R";
-    hash = "sha256-ULdrtPLtzsgfZEHWkr4ebC/FSROHBWJJVD+PzdIJ6Og=";
+    rev = "2.003R";
+    hash = "sha256-buaJq1eJSuNa9gSnPpXDcr2gMGYQ/6F5pHCOjNR6eV8=";
     zip = ".zip";
     prefix = "01_";
   };
@@ -126,15 +126,15 @@ in
 
   serif-vf-otf = makeVariable {
     family = "serif";
-    version = "2.002";
-    hash = "sha256-8sD4bU6w7HBm4vBuPAjcjpxN2rtEJugAw+X0bAOcmjA=";
+    version = "2.003";
+    hash = "sha256-a6295Ukha9QY5ByMr2FUy13j5gZ1itnezvfJWmJjqt0=";
     format = "otf";
   };
 
   serif-vf-ttf = makeVariable {
     family = "serif";
-    version = "2.002";
-    hash = "sha256-dmTZFRsD55WCOg2+sqd8bkmTSnSNn5xUYf0PgzIvzww=";
+    version = "2.003";
+    hash = "sha256-F+FUQunfyAEBVV10lZxC3dzGTWhHgHzpTO8CjC3n4WY=";
     format = "ttf";
   };
 }

pkgs/development/php-packages/redis/default.nix

@@ -3,11 +3,10 @@
   lib,
   php,
   fetchFromGitHub,
-  fetchpatch,
 }:
 
 let
-  version = "6.0.2";
+  version = "6.1.0";
 in
 buildPecl {
   inherit version;
@@ -17,29 +16,9 @@ buildPecl {
     repo = "phpredis";
     owner = "phpredis";
     rev = version;
-    hash = "sha256-Ie31zak6Rqxm2+jGXWg6KN4czHe9e+190jZRQ5VoB+M=";
+    hash = "sha256-zuvdWBJl6vBDnIAR0txfar1+c06VqGnwtobZnxok2uU=";
   };
 
-  patches = [
-    # Fix build with PHP 8.4.
-    (fetchpatch {
-      url = "https://github.com/phpredis/phpredis/commit/a51215ce2b22bcd1f506780c35b6833471e0b8cb.patch";
-      hash = "sha256-DoGPMyuI/IZdF+8jG5faoyG2aM+WDz0obH6S7HoOMX8=";
-    })
-
-    # Fix warning on Darwin.
-    (fetchpatch {
-      url = "https://github.com/phpredis/phpredis/commit/7de29d57d919f835f902f87a83312ed2549c1a13.patch";
-      hash = "sha256-INsSQTwcHQhQiqplAYQGS4zAtaIHWABG61MxnPCsrUM=";
-    })
-
-    # Fix build on Darwin.
-    (fetchpatch {
-      url = "https://github.com/phpredis/phpredis/commit/c139de3abac1dd33b97ef0de5af41b6e3a78f7ab.patch";
-      hash = "sha256-jM9N4ktGU5KAk81sZZJQmzV7y//39nVnfc52KqIvfpU=";
-    })
-  ];
-
   internalDeps = with php.extensions; [ session ];
 
   meta = with lib; {

pkgs/development/python-modules/pyaprilaire/default.nix

@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "pyaprilaire";
-  version = "0.7.4";
+  version = "0.7.6";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "chamberlain2007";
     repo = "pyaprilaire";
-    rev = "refs/tags/${version}";
-    hash = "sha256-+/yQO0JF2nkxaM71iNj6ODB8raM9s4qiLLi6/borcr4=";
+    tag = version;
+    hash = "sha256-7jTV0F7g6IMsBUYk1GMakyvQ66k7glOUNWv6tdKjdnQ=";
   };
 
   build-system = [ setuptools ];