Merge master into staging-next

2026-07-18 22:51:21 +00:00 · 2026-07-09 07:13:03 +00:00
parent 02be72a9e5 3bd00e4470
commit 2b92585264
22 changed files with 50 additions and 46 deletions
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -20161,7 +20161,7 @@
    name = "Nindouja";
  };
  ninelore = {
-    email = "9l+nix@9lo.re";
+    email = "9l@9lo.re";
    matrix = "@9lore:tchncs.de";
    github = "ninelore";
    githubId = 21343557;
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1175,13 +1175,13 @@
    "vendorHash": "sha256-InCRL4k6v0avmnNja+b6Ozg5+injxa8EmrRHIWrq4Ag="
  },
  "sap_btp": {
-    "hash": "sha256-kTH3diM9jbncv80+I//mj+zCWGosIXjjMETXa6IS2HU=",
+    "hash": "sha256-1+gi+iRTKe/LHM6O3IBMRk9nba0kQ6+AbjYkrRXa5hM=",
    "homepage": "https://registry.terraform.io/providers/SAP/btp",
    "owner": "SAP",
    "repo": "terraform-provider-btp",
-    "rev": "v1.23.1",
+    "rev": "v1.24.0",
    "spdx": "Apache-2.0",
-    "vendorHash": "sha256-w/AmSHydCeyp/EURgPY2c/E2LjqAXXCORI53X1hEdxY="
+    "vendorHash": "sha256-uCw5Xdqp3VjLj6IytoVfO0atxkT69FNqJmAlA6eCmfs="
  },
  "scaleway_scaleway": {
    "hash": "sha256-rO5xmAJB2ndhVh7Lkun1Gxi04+I2lGVtkbbCbmngp3E=",
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -200,9 +200,9 @@ rec {
  mkTerraform = attrs: pluggable (generic attrs);

  terraform_1 = mkTerraform {
-    version = "1.15.7";
-    hash = "sha256-FF3LEovWjEDrKp6e6opRfCt8c4wghva3mjN97vCxq3E=";
-    vendorHash = "sha256-3y9+KCmvskJ24X4F6gSLglmsl4hUlvzBb/ep4kcbS8A=";
+    version = "1.15.8";
+    hash = "sha256-FeXebcNl/npEkEyMvwzeMYTEsl9t8Iz+4lBHd/HzQHQ=";
+    vendorHash = "sha256-l5n5PS2buGPvmx/U8vQeKk6BlZdJQQEujJxlPMTdg0k=";
    patches = [ ./provider-path-0_15.patch ];
    passthru = {
      inherit plugins;
--- a/pkgs/applications/networking/instant-messengers/discord/darwin.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/darwin.nix
@@ -107,6 +107,7 @@ stdenv.mkDerivation {
  sourceRoot = ".";

  dontUnpack = true;
+  dontStrip = true;

  installPhase = ''
    runHook preInstall
--- a/pkgs/by-name/dm/dms-shell/package.nix
+++ b/pkgs/by-name/dm/dms-shell/package.nix
@@ -28,18 +28,18 @@ buildGoModule (
  in
  {
    pname = "dms-shell";
-    version = "1.4.6";
+    version = "1.5.0";

    src = fetchFromGitHub {
      owner = "AvengeMedia";
      repo = "DankMaterialShell";
      tag = "v${finalAttrs.version}";
-      hash = "sha256-g6r/Gx8PTDzO3jCNzzySA+Ff1lmLF9nDlMCNyyoQjoE=";
+      hash = "sha256-zdHsPGPE5MVi/y+uIt548XScTfZjQzdF21dME7ISEJM=";
    };

    sourceRoot = "${finalAttrs.src.name}/core";

-    vendorHash = "sha256-cVUJXgzYMRSM0od1xzDVkMTdxHu3OIQX2bQ8AJbGQ1Q=";
+    vendorHash = "sha256-nvxFHQhOfBGl3h51fgYDb39K0NCj+H8mAEyKr1qOwJQ=";

    ldflags = [
      "-s"
--- a/pkgs/by-name/js/jsonschema-cli/package.nix
+++ b/pkgs/by-name/js/jsonschema-cli/package.nix
@@ -9,15 +9,15 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "jsonschema-cli";
-  version = "0.46.6";
+  version = "0.47.0";

  src = fetchCrate {
    pname = "jsonschema-cli";
    inherit (finalAttrs) version;
-    hash = "sha256-IMhobv10ru+7WBpdrv9Pt1s/E2oO8yxPv3oCRx3jov4=";
+    hash = "sha256-0U9NBfkpqCZnNQIxQhNjErX/LehI3xOcUvHiYRKwrXo=";
  };

-  cargoHash = "sha256-MKSSvJQWwUGwJr0z6/QvWLXQDMVj/7iv+Szr/r+blkA=";
+  cargoHash = "sha256-q/3Nvl+hND94im0mzHqZRepE8GcB5Fec/0HurPgqOmY=";

  preCheck = ''
    export SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt
--- a/pkgs/by-name/ku/kulala-core/package.nix
+++ b/pkgs/by-name/ku/kulala-core/package.nix
@@ -10,7 +10,7 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "kulala-core";
-  version = "0.26.1";
+  version = "0.28.1";

  strictDeps = true;
  __structuredAttrs = true;
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
    owner = "mistweaverco";
    repo = "kulala-core";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-htVt972fRv/KvRKT5YBxFCqWbyow2kL0BCfrxB3tET0=";
+    hash = "sha256-8NG9Qw7hJwiMb2iU8WbtEGVv1+Z3P0dQR3b1Nrwwn80=";
  };

  node_modules = stdenv.mkDerivation {
--- a/pkgs/by-name/ll/llama-cpp/package.nix
+++ b/pkgs/by-name/ll/llama-cpp/package.nix
@@ -81,7 +81,7 @@ let
 in
 effectiveStdenv.mkDerivation (finalAttrs: {
  pname = "llama-cpp";
-  version = "9842";
+  version = "9925";

  outputs = [
    "out"
@@ -92,7 +92,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
    owner = "ggml-org";
    repo = "llama.cpp";
    tag = "b${finalAttrs.version}";
-    hash = "sha256-wtaHsVOyCNCITABe1TvDo/MiWpNlH2YqZewBDxERtt4=";
+    hash = "sha256-yX8BrHA0fIgIozBGOXnN72KlfqIcR/mnO5ttUBLvxZE=";
    leaveDotGit = true;
    postFetch = ''
      git -C "$out" rev-parse --short HEAD > $out/COMMIT
@@ -125,7 +125,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
    ++ [ openssl ];

  npmRoot = "tools/ui";
-  npmDepsHash = "sha256-X1DZgmhS/zHTqDT5zq0kywwntthcJ9vRXeqyO3zz6UU=";
+  npmDepsHash = "sha256-6s9skw1wzEfm9QKktTqea3J+oudQAsS6O2VnZEMXAdw=";
  npmDeps = fetchNpmDeps {
    name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps";
    inherit (finalAttrs) src patches;
--- a/pkgs/by-name/me/melos/package.nix
+++ b/pkgs/by-name/me/melos/package.nix
@@ -5,12 +5,12 @@
 }:
 buildDartApplication (finalAttrs: {
  pname = "melos";
-  version = "8.0.0";
+  version = "8.2.0";
  src = fetchFromGitHub {
    owner = "invertase";
    repo = "melos";
    tag = "melos-v${finalAttrs.version}";
-    hash = "sha256-txT2xIvhhmL9i8gE6uUzDa6/k5ZzDBsiPZ1V4Gc4U/I=";
+    hash = "sha256-phbEUBRkAcATyNvWtqoqLoQyq7TmOvi4K821eHzicEY=";
  };

  patches = [
--- a/pkgs/by-name/me/melos/pubspec.lock.json
+++ b/pkgs/by-name/me/melos/pubspec.lock.json
@@ -64,11 +64,11 @@
      "dependency": "transitive",
      "description": {
        "name": "build",
-        "sha256": "a156715e7cd728130c592f30552575908aae5b100005fbc1f0fb16b3c03a3d10",
+        "sha256": "45d14a0fb23e018d8287c32fc98d726ce466b231928ed9b9200f29bd3ccd39ae",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "4.0.6"
+      "version": "4.0.7"
    },
    "built_collection": {
      "dependency": "transitive",
--- a/pkgs/by-name/nu/nushell/package.nix
+++ b/pkgs/by-name/nu/nushell/package.nix
@@ -24,16 +24,16 @@ rustPlatform.buildRustPackage (finalAttrs: {
  # NOTE: when updating this to a new non-patch version, please also try to
  # update the plugins. Plugins only work if they are compiled for the same
  # major/minor version.
-  version = "0.113.1";
+  version = "0.114.0";

  src = fetchFromGitHub {
    owner = "nushell";
    repo = "nushell";
    tag = finalAttrs.version;
-    hash = "sha256-sV2fN9TOWQVyPVFSWdNLPOtOdLuynPTvt9+uqJsgtds=";
+    hash = "sha256-vLWfaci1lAPUXZJU2bfUvVNnMqFr6cMyX+R0aDWvRss=";
  };

-  cargoHash = "sha256-yfJPhx+Y+Y3vkIQU/w3DCKJpH4LsEmzDzyEuyor5PDc=";
+  cargoHash = "sha256-3+H1VuqdLxjcPTzkrpNiBmHbWG8g4rr3WuFFQhyyMtI=";

  nativeBuildInputs = [
    pkg-config
--- a/pkgs/by-name/of/officecli/package.nix
+++ b/pkgs/by-name/of/officecli/package.nix
@@ -8,7 +8,7 @@

 buildDotnetModule (finalAttrs: {
  pname = "officecli";
-  version = "1.0.116";
+  version = "1.0.129";

  strictDeps = true;
  __structuredAttrs = true;
@@ -17,7 +17,7 @@ buildDotnetModule (finalAttrs: {
    owner = "iOfficeAI";
    repo = "OfficeCLI";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-QDMBX5oX318WXItcKXsCR4IYwojlVq2kCTj1+wTQlyY=";
+    hash = "sha256-r7hGIK6tp/Z5Nt2SASkvuXsjjq3apP7CuhHNi6FAc0k=";
  };

  projectFile = "src/officecli/officecli.csproj";
--- a/pkgs/by-name/po/podman-desktop/package.nix
+++ b/pkgs/by-name/po/podman-desktop/package.nix
@@ -17,6 +17,7 @@
  gnugrep,
  podman,
  krunkit,
+  extraPackages ? [ ],
 }:

 let
@@ -122,7 +123,9 @@ stdenv.mkDerivation (finalAttrs: {
  installPhase =
    let
      prefixPackages = lib.makeBinPath (
-        [ podman ] ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform krunkit) krunkit
+        [ podman ]
+        ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform krunkit) krunkit
+        ++ extraPackages
      );
      commonWrapperArgs = "--prefix PATH : ${prefixPackages}";
    in
--- a/pkgs/by-name/sa/salt/package.nix
+++ b/pkgs/by-name/sa/salt/package.nix
@@ -11,12 +11,12 @@

 python3.pkgs.buildPythonApplication (finalAttrs: {
  pname = "salt";
-  version = "3008.1";
+  version = "3008.2";
  format = "setuptools";

  src = fetchPypi {
    inherit (finalAttrs) pname version;
-    hash = "sha256-abf3Phwx7IjP7CqbvVZsf84Ajdqrmiab4xfPeyb2j/w=";
+    hash = "sha256-RKHiBqlVv1eq/74/HftfRHbJRC1k86EDznrAqmi/qQc=";
  };

  patches = [
--- a/pkgs/by-name/sh/shader-slang/package.nix
+++ b/pkgs/by-name/sh/shader-slang/package.nix
@@ -21,13 +21,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "shader-slang";
-  version = "2026.12";
+  version = "2026.12.2";

  src = fetchFromGitHub {
    owner = "shader-slang";
    repo = "slang";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-TG7jb6zECiUU6T4LALw6mZaANtI38MtxANn67vyCgZ0=";
+    hash = "sha256-kSc8+McxHQ6Vh7M+AUDx6zre7zjjq0w5A8QZhLZ3wGw=";
    fetchSubmodules = true;
  };

--- a/pkgs/by-name/wi/wireshark/package.nix
+++ b/pkgs/by-name/wi/wireshark/package.nix
@@ -60,7 +60,7 @@ in

 stdenv.mkDerivation (finalAttrs: {
  pname = "wireshark-${if withQt then "qt" else "cli"}";
-  version = "4.6.6";
+  version = "4.6.7";

  outputs = [
    "out"
@@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: {
    repo = "wireshark";
    owner = "wireshark";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-ysSfCLnCakxsjLKt+UxzrcPWNXiqdvTlI/1dq56lMfA=";
+    hash = "sha256-+y2OyCXHnUYNKVbUNeqcATKcTPZz+ikOHPAEs1C2hww=";
  };

  patches = [
--- a/pkgs/by-name/wp/wpprobe/package.nix
+++ b/pkgs/by-name/wp/wpprobe/package.nix
@@ -8,13 +8,13 @@

 buildGoModule (finalAttrs: {
  pname = "wpprobe";
-  version = "0.12.3";
+  version = "0.12.4";

  src = fetchFromGitHub {
    owner = "Chocapikk";
    repo = "wpprobe";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-V/g7yPiW41Q8iGWQQ3l4QJrNslJNa/iq/8JxCPigFms=";
+    hash = "sha256-vwoMC0uWijyije8//Vtxc4NfRhRL+GnPTL5HGFUZxCQ=";
  };

  vendorHash = "sha256-pAKFrdja+rH0kiJH6hToZwLjE8lLBHFAUCjnCLbgxVo=";
--- a/pkgs/development/python-modules/aioamazondevices/default.nix
+++ b/pkgs/development/python-modules/aioamazondevices/default.nix
@@ -15,14 +15,14 @@

 buildPythonPackage (finalAttrs: {
  pname = "aioamazondevices";
-  version = "14.1.8";
+  version = "14.2.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "chemelli74";
    repo = "aioamazondevices";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-54nlWZGLYTHbieVtYqUyP1Y3VZ98NhDEnmSzx+cPfJQ=";
+    hash = "sha256-KP1Rc+8c5RNTtCmuNjbjVhNEElwMKOGvumdWF+BIn0I=";
  };

  build-system = [ poetry-core ];
--- a/pkgs/development/python-modules/aioimmich/default.nix
+++ b/pkgs/development/python-modules/aioimmich/default.nix
@@ -14,14 +14,14 @@

 buildPythonPackage rec {
  pname = "aioimmich";
-  version = "0.15.1";
+  version = "0.16.1";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "mib1185";
    repo = "aioimmich";
    tag = "v${version}";
-    hash = "sha256-2WdQnK25vrBtNKzkgpSaWcdkrfEggtBhe3DI7DuMS8k=";
+    hash = "sha256-/Y4wSiaXpQXn0V+g56rL62fdE7SWl9L4sBeEL3nkGD8=";
  };

  postPatch = ''
--- a/pkgs/development/python-modules/aiosomecomfort/default.nix
+++ b/pkgs/development/python-modules/aiosomecomfort/default.nix
@@ -9,14 +9,14 @@

 buildPythonPackage rec {
  pname = "aiosomecomfort";
-  version = "0.0.36";
+  version = "0.0.37";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "mkmer";
    repo = "AIOSomecomfort";
    tag = version;
-    hash = "sha256-Da2Nvke01S7Pt+md2G5RRJqyUc6M3tcj4qsdSJVoQds=";
+    hash = "sha256-xyGJsSgxE/UwTEfA2BzVHvgqG1c47/SokLHrysPkFAU=";
  };

  build-system = [
--- a/pkgs/development/python-modules/elevenlabs/default.nix
+++ b/pkgs/development/python-modules/elevenlabs/default.nix
@@ -14,14 +14,14 @@

 buildPythonPackage (finalAttrs: {
  pname = "elevenlabs";
-  version = "2.54.0";
+  version = "2.56.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "elevenlabs";
    repo = "elevenlabs-python";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-YA7rh/mz522f5Ak9s+NeXCl91ugJ+pnpwZijNEGBn+I=";
+    hash = "sha256-Ps4W8uSv2eH5DSJpDBmaitrv+AegA+UJKjiiAfK5gOQ=";
  };

  build-system = [ poetry-core ];
--- a/pkgs/development/python-modules/python-jsonpath/default.nix
+++ b/pkgs/development/python-modules/python-jsonpath/default.nix
@@ -9,7 +9,7 @@

 buildPythonPackage (finalAttrs: {
  pname = "python-jsonpath";
-  version = "2.1.0";
+  version = "2.2.1";
  pyproject = true;

  src = fetchFromGitHub {
@@ -17,7 +17,7 @@ buildPythonPackage (finalAttrs: {
    repo = "python-jsonpath";
    tag = "v${finalAttrs.version}";
    fetchSubmodules = true;
-    hash = "sha256-2AV+X3Vs+pYi3Iv7zy9/nXna5PgrofHmrH0xyaumZWk=";
+    hash = "sha256-7kXDGm+pV0daeMEGW/hVb/U69svLFgZfZKklVgV+EJ4=";
  };

  build-system = [ hatchling ];