Merge staging-next-26.05 into staging-26.05

2026-10-03 21:40:12 +00:00 · 2026-09-12 00:27:46 +00:00
parent 1c8cb0ef7d f12ef728b1
commit 48e847bba7
15 changed files with 58 additions and 52 deletions
--- a/pkgs/applications/networking/instant-messengers/ferdium/default.nix
+++ b/pkgs/applications/networking/instant-messengers/ferdium/default.nix
@@ -24,15 +24,15 @@ let

  hash =
    {
-      x86_64-linux = "sha256-ODQKFjBa2riJY26aPaAfLzuCyLYkB5oYSxIE28nMmwY=";
-      aarch64-linux = "sha256-CYHoTw6JUyU63iTd9tAbfWVnb48WcZgGtjthqnlAD8I=";
+      x86_64-linux = "sha256-+KP107a8Tmr2qR8pH+gHuXqEqiC5ExPGXoYOqV1Urbo=";
+      aarch64-linux = "sha256-6XnuSqHOJxAURTGWfi4QUBv4ictLmjeJAoyrPg+o+Bg=";
    }
    .${system} or throwSystem;
 in
 mkFranzDerivation rec {
  pname = "ferdium";
  name = "Ferdium";
-  version = "7.1.2";
+  version = "7.2.3";
  src = fetchurl {
    url = "https://github.com/ferdium/ferdium-app/releases/download/v${version}/Ferdium-linux-${version}-${arch}.deb";
    inherit hash;
--- a/pkgs/by-name/bc/bcachefs-tools/package.nix
+++ b/pkgs/by-name/bc/bcachefs-tools/package.nix
@@ -32,18 +32,18 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "bcachefs-tools";
-  version = "1.39.4";
+  version = "1.39.5";

  src = fetchFromGitHub {
    owner = "koverstreet";
    repo = "bcachefs-tools";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-cnSlmUH+1odSO1knyrXrWUf7EjY9U4n2IlxVKMczB3Y=";
+    hash = "sha256-k9JW6GMXFwphkYGcYMwA59uafNj0EV96wTnbzeuVM1w=";
  };

  cargoDeps = rustPlatform.fetchCargoVendor {
    inherit (finalAttrs) src;
-    hash = "sha256-Jpl4SBSX9M45zFHpckNHMdZGA5y00YfhrPwmZabWj3Q=";
+    hash = "sha256-hbh4+vpZtVpda2yVZK+fkdPXWd5+GYLbWYPfJsYtPfM=";
  };

  postPatch = ''
--- a/pkgs/by-name/db/dbeaver-bin/package.nix
+++ b/pkgs/by-name/db/dbeaver-bin/package.nix
@@ -19,7 +19,7 @@

 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "dbeaver-bin";
-  version = "26.1.3";
+  version = "26.2.0";

  src =
    let
@@ -32,10 +32,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
        aarch64-darwin = "macos-aarch64.dmg";
      };
      hash = selectSystem {
-        x86_64-linux = "sha256-cPRmReV6F+pCkrbF7d1m+bQjOaJCCFndNSThMWPGrsY=";
-        aarch64-linux = "sha256-bT1bCKzeiAMJbPa6I6fqQq7OrbkKhgDYAUEKuURHP5g=";
-        x86_64-darwin = "sha256-cT4r0QbA0mhO+fStnU7ORgvSPjNiyz3a0asins0kYaE=";
-        aarch64-darwin = "sha256-NYX651gUpEDh2O720ZKl7fUTYLFKpTJzyC/YnN4Vnys=";
+        x86_64-linux = "sha256-9QTnCnR2OqAuC2PWhCuFymRSb2gr5Fez8w4zDMEHSO0=";
+        aarch64-linux = "sha256-atqAOjnAcvyPHHdwZpKY6So1AXRKbh/5GXlKDe35WWM=";
+        x86_64-darwin = "sha256-Q8O9S2fCcnyv0pAcCHWpZDcLXDfv9eYWZDzrFFmJ98E=";
+        aarch64-darwin = "sha256-YqA6qIQp1O7zV2VQOXquddJXagEt7aDIPUtE9fvNSj8=";
      };
    in
    fetchurl {
--- a/pkgs/by-name/gi/gitaly/package.nix
+++ b/pkgs/by-name/gi/gitaly/package.nix
@@ -7,7 +7,7 @@
 }:

 let
-  version = "19.3.1";
+  version = "19.3.2";
  package_version = "v${lib.versions.major version}";
  gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";

@@ -21,7 +21,7 @@ let
      owner = "gitlab-org";
      repo = "gitaly";
      rev = "v${version}";
-      hash = "sha256-fr6M8Va488o8wzoZuH6eO4Pe1Abf0+DpvpXqE4WYo3M=";
+      hash = "sha256-bfRCH++tvhrGg+GGnPYFu4EF7IdAHAEu+XI0yPMWryQ=";
    };

    vendorHash = "sha256-r9sPLLC8d29ny/07zqJkYQiSVF3MSAHAbnYK0T5xHWU=";
--- a/pkgs/by-name/gi/gitlab-elasticsearch-indexer/package.nix
+++ b/pkgs/by-name/gi/gitlab-elasticsearch-indexer/package.nix
@@ -11,17 +11,23 @@ let
 in
 buildGoModule (finalAttrs: {
  pname = "gitlab-elasticsearch-indexer";
-  version = "5.14.7";
+  version = "5.14.13";

  # nixpkgs-update: no auto update
  src = fetchFromGitLab {
    owner = "gitlab-org";
    repo = "gitlab-elasticsearch-indexer";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-1fVBCem23X8u1NQ6ph37EiXRvMpzF/8Yac+VefAe9Yg=";
+    hash = "sha256-HtsZHxdRlopndeJp0dwza9AUsjbkx17gtqnF6XnIe7o=";
  };

-  vendorHash = "sha256-cUHXrUd+pSMiS6iSwKKA+o1B6ZHbaQYHYPeVk1Y6wYM=";
+  # A dependency rather than an actual package to build.
+  # Can be removed once GitLab Elasticsearch Indexer upstreams their changes
+  excludedPackages = [
+    "third_party/icu"
+  ];
+
+  vendorHash = "sha256-hUArtddPPhj06A4pN8F1sUVXTfVBzlytJ977neTKw34=";

  buildInputs = [ icu ];
  nativeBuildInputs = [ pkg-config ];
--- a/pkgs/by-name/gi/gitlab-pages/package.nix
+++ b/pkgs/by-name/gi/gitlab-pages/package.nix
@@ -6,14 +6,14 @@

 buildGoModule (finalAttrs: {
  pname = "gitlab-pages";
-  version = "19.3.1";
+  version = "19.3.2";

  # nixpkgs-update: no auto update
  src = fetchFromGitLab {
    owner = "gitlab-org";
    repo = "gitlab-pages";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-4SNECjrdXv/tE6BckPGCJbTdImiJ7p4ukzTppbt1PNA=";
+    hash = "sha256-aLcgYvtb4wk21oXGVmiPcb6vG6+//mL+3N0Q/ha1ap0=";
  };

  vendorHash = "sha256-81Q5xtkQhJS9TQYTgXA4yi7zny6yFPTVAOHETOCyHNE=";
--- a/pkgs/by-name/gi/gitlab/data.json
+++ b/pkgs/by-name/gi/gitlab/data.json
@@ -1,17 +1,17 @@
 {
-  "version": "19.3.1",
-  "repo_hash": "sha256-DpnRcYGRyzNFkJCQEs5YxLgbNs42nXRIpPPMN4E+IrY=",
+  "version": "19.3.2",
+  "repo_hash": "sha256-z+Sd3YiRSrZuiKQmc24hgM1CPxZsKmkAYuSYSNCXrkY=",
  "yarn_hash": "sha256-o4HYadByTvPYoBVeJh5Gqeiuin+FpJcqvnXASga0bxk=",
  "frontend_islands_yarn_hash": "sha256-EvGQin+5DqqIgM36jlVkVI49WcJzVvceYnkSS9ybfcY=",
  "owner": "gitlab-org",
  "repo": "gitlab",
-  "rev": "v19.3.1-ee",
+  "rev": "v19.3.2-ee",
  "passthru": {
-    "GITALY_SERVER_VERSION": "19.3.1",
-    "GITLAB_KAS_VERSION": "19.3.1",
-    "GITLAB_PAGES_VERSION": "19.3.1",
+    "GITALY_SERVER_VERSION": "19.3.2",
+    "GITLAB_KAS_VERSION": "19.3.2",
+    "GITLAB_PAGES_VERSION": "19.3.2",
    "GITLAB_SHELL_VERSION": "14.56.1",
-    "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.14.7",
-    "GITLAB_WORKHORSE_VERSION": "19.3.1"
+    "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.14.13",
+    "GITLAB_WORKHORSE_VERSION": "19.3.2"
  }
 }
--- a/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix
+++ b/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix
@@ -10,7 +10,7 @@ in
 buildGoModule (finalAttrs: {
  pname = "gitlab-workhorse";

-  version = "19.3.1";
+  version = "19.3.2";

  # nixpkgs-update: no auto update
  src = fetchFromGitLab {
--- a/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile
+++ b/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile
@@ -172,7 +172,7 @@ gem 'gitlab-grape-openapi', '~> 0.3.0', feature_category: :api
 gem 'rack-cors', '~> 2.0.1', require: 'rack/cors', feature_category: :api

 # GraphQL API
-gem 'graphql', '2.6.3', feature_category: :api
+gem 'graphql', '~> 2.6.10', feature_category: :api
 gem 'graphql-docs', '~> 5.2.0', group: [:development, :test], feature_category: :api
 gem 'apollo_upload_server', '~> 2.1.6', feature_category: :api

--- a/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock
+++ b/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock
@@ -1130,7 +1130,7 @@ GEM
      grape (>= 2.4.0)
      rack
    graphlyte (1.0.0)
-    graphql (2.6.3)
+    graphql (2.6.10)
      base64
      fiber-storage
      logger
@@ -2378,7 +2378,7 @@ GEM
      hashdiff (>= 0.4.0, < 2.0.0)
    webrick (1.9.2)
    websocket (1.2.10)
-    websocket-driver (0.8.0)
+    websocket-driver (0.8.2)
      base64
      websocket-extensions (>= 0.1.0)
    websocket-extensions (0.1.5)
@@ -2582,7 +2582,7 @@ DEPENDENCIES
  grape-swagger-entity (~> 0.7.0)
  grape_logging (~> 3.0)
  graphlyte (~> 1.0.0)
-  graphql (= 2.6.3)
+  graphql (~> 2.6.10)
  graphql-docs (~> 5.2.0)
  grpc (~> 1.81.0)
  grpc-tools (~> 1.83.0)
@@ -3124,7 +3124,7 @@ CHECKSUMS
  grape-swagger-entity (0.7.1) sha256=082144811cdd14c15b9d9f0a27a4e3ff9c27c7081130d334a3de59953769b37d
  grape_logging (3.0.0) sha256=7b62d984ce96df15d120508668debe307e6a59ac1c511f1d9b5f3b4bea793e13
  graphlyte (1.0.0) sha256=b5af4ab67dde6e961f00ea1c18f159f73b52ed11395bb4ece297fe628fa1804d
-  graphql (2.6.3) sha256=31fe845b509fda27db38d09380f27ffc0de1c7ea2f9f3b12fa42bdde8317239b
+  graphql (2.6.10) sha256=9b7c8633767f516ff9d48a8d6305b2a00a2101c82aa871b92e69086944f9f83e
  graphql-docs (5.2.0) sha256=44d41724529f531adf9265ded7478b74b0c4b927cddc8b9f114337a73f32de08
  grpc (1.81.1) sha256=9e5772153fe13a389654e9d397a90400f0077307fb4369f79f941d96c72e89cb
  grpc (1.81.1-aarch64-linux-gnu) sha256=aa24d7253a2b15d2c3570265a2f58bb8aca0ecd2e1116b7a259d633ebf582445
@@ -3609,7 +3609,7 @@ CHECKSUMS
  webmock (3.26.2) sha256=774556f2ea6371846cca68c01769b2eac0d134492d21f6d0ab5dd643965a4c90
  webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131
  websocket (1.2.10) sha256=2cc1a4a79b6e63637b326b4273e46adcddf7871caa5dc5711f2ca4061a629fa8
-  websocket-driver (0.8.0) sha256=ed0dba4b943c22f17f9a734817e808bc84cdce6a7e22045f5315aa57676d4962
+  websocket-driver (0.8.2) sha256=97c556b019bf3410b4961002ac501621e9322d3f8a7bc02161a09301cc4c4146
  websocket-extensions (0.1.5) sha256=1c6ba63092cda343eb53fc657110c71c754c56484aad42578495227d717a8241
  wikicloth (0.8.1) sha256=7ac8a9ca0a948cf472851e521afc6c2a6b04a8f91ef1d824ba6a61ffbd60e6ca
  wisper (2.0.1) sha256=ce17bc5c3a166f241a2e6613848b025c8146fce2defba505920c1d1f3f88fae6
--- a/pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix
+++ b/pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix
@@ -4152,10 +4152,10 @@ src: {
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "16r32y1xxga2z893p7rgxb3y23gwgzr814yh73djgnlza1dq9zii";
+      sha256 = "0gpqz526j2395swp3a1ar00j22m0n82n73caskwnylbzfqrqcz4v";
      type = "gem";
    };
-    version = "2.6.3";
+    version = "2.6.10";
  };
  graphql-docs = {
    dependencies = [
@@ -10573,10 +10573,10 @@ src: {
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "0qj9dmkmgahmadgh88kydb7cv15w13l1fj3kk9zz28iwji5vl3gd";
+      sha256 = "0ij19k6034x0c4hw0ywa7wnk5s912r8aq0hhjss10d5z36q5dicp";
      type = "gem";
    };
-    version = "0.8.0";
+    version = "0.8.2";
  };
  websocket-extensions = {
    groups = [
--- a/pkgs/by-name/hi/hickory-dns/package.nix
+++ b/pkgs/by-name/hi/hickory-dns/package.nix
@@ -9,16 +9,16 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "hickory-dns";
-  version = "0.26.2";
+  version = "0.26.3";

  src = fetchFromGitHub {
    owner = "hickory-dns";
    repo = "hickory-dns";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-qwyMfjo3LTyvxwRlQ/4Odc3yZsSuA4cn7zj/KLCfRSs=";
+    hash = "sha256-zm8qMYqdDEZjtNC9arMzCAxPpBRRRwiHsb3lsP/cHIg=";
  };

-  cargoHash = "sha256-TsawTK+MaQ8isxa+/lROTgnA2u26XKjZCtRFUKLRbrw=";
+  cargoHash = "sha256-u6Uf9lhrFgWfzIXZ3DIPk2JdDTdd1qBTkqUgmSspR9c=";

  buildFeatures = [
    "blocklist"
--- a/pkgs/by-name/li/librewolf-unwrapped/src.json
+++ b/pkgs/by-name/li/librewolf-unwrapped/src.json
@@ -1,11 +1,11 @@
 {
-  "packageVersion": "155.0-1",
+  "packageVersion": "155.0.1-1",
  "source": {
-    "rev": "155.0-1",
-    "hash": "sha256-LPLkMuKnEHJ+jYF5LnitnOzHaokDdRIyxZegWKEJ2wo="
+    "rev": "155.0.1-1",
+    "hash": "sha256-UjGUEDRohgDcNYUnX7EhNvDRPHUcYuC3GsNOpJ3yYFw="
  },
  "firefox": {
-    "version": "155.0",
-    "hash": "sha512-JCkmgZJO258ElOt3p7GZlAOau8OowLowTw5HK0mpQ4OFZXI96YO8jvCOAZlx4CowFMjSQbuIxkWgamJcis4Nag=="
+    "version": "155.0.1",
+    "hash": "sha512-bRN6ejFcsdCqwaP+MUr4D+KQxJt8Lkf4aHsl1HIJJ7Kg3HGj2p119sq0eQZ9sRTKpnMtF+iIsKv86ZI4qK8POQ=="
  }
 }
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -30,13 +30,13 @@
        "lts": true
    },
    "6.18": {
-        "version": "6.18.50",
-        "hash": "sha256:0q842zpaqb5vi749g2lawa62p9gsb3h3p99vbrjdj4afmcfh9z6j",
+        "version": "6.18.51",
+        "hash": "sha256:04znimsjfimxxaarzaksn4jvkj1xr5ba7yh1j691ykdzb3w60bxs",
        "lts": true
    },
    "7.2": {
-        "version": "7.2.4",
-        "hash": "sha256:1p98bi0zzk3al2d0i28ms4h8vq2ps3n2prdsy69c9nip2zh0ww81",
+        "version": "7.2.5",
+        "hash": "sha256:0y1bcg3pg6zm59bjfrgh1bsy68kxjy9vvxygdzcxmn95hggz1pam",
        "lts": false
    }
 }
--- a/pkgs/servers/kanidm/1_11.nix
+++ b/pkgs/servers/kanidm/1_11.nix
@@ -1,5 +1,5 @@
 import ./generic.nix {
-  version = "1.11.1";
-  hash = "sha256-IQmXHl+Gx7QLuLUCmIh919o+ziCy2q2NvVabwQwhML0=";
-  cargoHash = "sha256-DSYynKWb9jjFp3u3c6z9dFXts8ydgEho7xoFlL6cPXs=";
+  version = "1.11.2";
+  hash = "sha256-W7LkbHu2jS5pB63eTvmKsypOzL/bzm/5ssnzlpME6jc=";
+  cargoHash = "sha256-pn1g0sesG9YtFf/qUvrSHW/m+2rHEyeZGzW1V5XRT+Y=";
 }