Merge release-26.05 into staging-nixos-26.05

2026-10-04 14:00:04 +00:00 · 2026-08-30 00:32:29 +00:00
parent 99aab757a5 6ed7e4deec
commit a71fc3190a
15 changed files with 431 additions and 300 deletions
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_esr_sources.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_esr_sources.nix
--- a/pkgs/by-name/cy/cyberia/package.nix
+++ b/pkgs/by-name/cy/cyberia/package.nix
@@ -0,0 +1,73 @@
+{
+  rustPlatform,
+  fetchFromForgejo,
+  fetchNpmDeps,
+  cargo-tauri,
+  nodejs,
+  npmHooks,
+  pkg-config,
+  lib,
+  stdenv,
+  wrapGAppsHook4,
+  dbus,
+  glib-networking,
+  gtk3,
+  webkitgtk_4_1,
+  alsa-lib,
+  libappindicator,
+}:
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "cyberia";
+  version = "0.2.8";
+
+  __structuredAttrs = true;
+
+  src = fetchFromForgejo {
+    domain = "git.gay";
+    owner = "zutyosh";
+    repo = "Cyberia";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-MKq3Q0g02JiTnwyjUNv1CzCCmG43ZFCffRa7BmUU5SU=";
+  };
+
+  cargoRoot = "src-tauri";
+  buildAndTestSubdir = finalAttrs.cargoRoot;
+  cargoHash = "sha256-ghdZyJt/hE+r/D+FqyLrUNSvVDZf+FRv463K33XrNbs=";
+
+  npmDeps = fetchNpmDeps {
+    name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps";
+    inherit (finalAttrs) src;
+    hash = "sha256-aZsQHb1Hj7dmz/04E6KJ5AMKKTcN+4fSK8phwDg2YAU=";
+  };
+
+  nativeBuildInputs = [
+    cargo-tauri.hook
+
+    nodejs
+    npmHooks.npmConfigHook
+
+    pkg-config
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ wrapGAppsHook4 ];
+
+  buildInputs = [
+    dbus
+    gtk3
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    glib-networking
+    webkitgtk_4_1
+    alsa-lib
+    libappindicator
+  ];
+
+  meta = {
+    description = "VRCX style client for Resonite";
+    homepage = "https://git.gay/zutyosh/Cyberia";
+    changelog = "https://git.gay/zutyosh/Cyberia/releases/tag/v${finalAttrs.version}";
+    mainProgram = "cyberia";
+    platforms = lib.platforms.linux;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ toasteruwu ];
+  };
+})
--- a/pkgs/by-name/fl/fluxcd/package.nix
+++ b/pkgs/by-name/fl/fluxcd/package.nix
@@ -9,10 +9,10 @@
 }:

 let
-  version = "2.8.8";
-  srcHash = "sha256-ECFEzYhnhse2yrfWYaeN5dE+HUvCy5RKZ2OceCb5+sA=";
-  vendorHash = "sha256-pV7eoiGhWk6KYZbK8bamXJY/NdK7ZYqrVcCTX9ccLJc=";
-  manifestsHash = "sha256-fF21nDstKUrlW6fgm0DrDtntR/0cnHMEzRltjBm9nwA=";
+  version = "2.9.4";
+  srcHash = "sha256-7Suhsg1tWn6gzkPDQT4BII0hTCM3HCCZTTtFVNumA9A=";
+  vendorHash = "sha256-3CMj5MI5cILnyWoWkcBzD5X626nsQ6nfipeqN35IQEk=";
+  manifestsHash = "sha256-+187K4w//AxtSYcrA3NoVCSFpTkjNqZmfOlbdzD9YmI=";

  manifests = fetchzip {
    url = "https://github.com/fluxcd/flux2/releases/download/v${version}/manifests.tar.gz";
@@ -85,7 +85,6 @@ buildGoModule rec {
      ryan4yin
      SchahinRohani
      stealthybox
-      superherointj
    ];
    mainProgram = "flux";
  };
--- a/pkgs/by-name/fr/freetube/package.nix
+++ b/pkgs/by-name/fr/freetube/package.nix
@@ -23,13 +23,13 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "freetube";
-  version = "0.25.2";
+  version = "0.25.3";

  src = fetchFromGitHub {
    owner = "FreeTubeApp";
    repo = "FreeTube";
    tag = "v${finalAttrs.version}-beta";
-    hash = "sha256-A25I64GP4FRyP21W5QuVvrWpThyU7hDosO25vkIx0UY=";
+    hash = "sha256-eaf10W8dBMJDlqOFd57hsqQqRcBOYAMavLrfmkuRbSw=";
  };

  __structuredAttrs = true;
@@ -58,7 +58,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
    inherit (finalAttrs) pname version src;
    inherit pnpm;
    fetcherVersion = 4;
-    hash = "sha256-1OnmJi4xCxMALAac4jnLOKg5N/t3pcHgM0AgvF1+DpM=";
+    hash = "sha256-rsgDxK6X2EzgPwIb9A9I+STkKI882i8jDuL4pO5kJHU=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/gi/gitlab-container-registry/package.nix
+++ b/pkgs/by-name/gi/gitlab-container-registry/package.nix
@@ -6,7 +6,7 @@

 buildGo125Module rec {
  pname = "gitlab-container-registry";
-  version = "4.40.2";
+  version = "4.41.0";
  rev = "v${version}-gitlab";

  # nixpkgs-update: no auto update
@@ -14,10 +14,10 @@ buildGo125Module rec {
    owner = "gitlab-org";
    repo = "container-registry";
    inherit rev;
-    hash = "sha256-k94uEM2VoOtdFRXWm6CDmeRt8LMXSNegRGes3ZKPg0I=";
+    hash = "sha256-i/bC+vZxm4jMFwVvtOUk+Q5IX25vYtr5x6Ejc3kqk/8=";
  };

-  vendorHash = "sha256-MD98JYwTo/t5/E7clIlUfjmv8t7nDPpVElbuYDRjMMc=";
+  vendorHash = "sha256-AFJqc3Fdk6mYSacA2VWFY9TCl7DEcsL7VkpRodlwbxQ=";

  excludedPackages = [
    "devvm/*"
--- a/pkgs/by-name/gu/guile-hoot/package.nix
+++ b/pkgs/by-name/gu/guile-hoot/package.nix
@@ -62,7 +62,10 @@ stdenv.mkDerivation (finalAttrs: {
  meta = {
    description = "Scheme to WebAssembly compiler backend for GNU Guile and a general purpose WASM toolchain";
    homepage = "https://codeberg.org/spritely/hoot";
-    license = lib.licenses.asl20;
+    license = with lib.licenses; [
+      asl20
+      lgpl3Plus
+    ];
    maintainers = with lib.maintainers; [ jinser ];
    platforms = lib.platforms.unix;
    mainProgram = "hoot";
--- a/pkgs/by-name/ne/necesse-server/package.nix
+++ b/pkgs/by-name/ne/necesse-server/package.nix
@@ -6,7 +6,7 @@
 }:

 let
-  version = "1.3.2-24650233";
+  version = "1.3.3-24926468";
  urlVersion = lib.replaceStrings [ "." ] [ "-" ] version;

 in
@@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation {

  src = fetchzip {
    url = "https://necesse.pwn.sh/server/necesse-server-linux64-${urlVersion}.zip";
-    hash = "sha256-csFBev2t0i49GbD/oiIP2h7081ZFRdnlXVZh+2dabBs=";
+    hash = "sha256-aql6KgkuA8lwCkt4DOgekvNyBMtP885SnOH8VK979vc=";
  };

  # removing packaged jre since we use our own
--- a/pkgs/by-name/pr/proton-authenticator/package.nix
+++ b/pkgs/by-name/pr/proton-authenticator/package.nix
@@ -37,12 +37,16 @@ stdenvNoCC.mkDerivation (finalAttrs: {
    install -Dm755 usr/bin/proton-authenticator $out/bin/${finalAttrs.meta.mainProgram}
    cp -r usr/share $out

-    wrapProgram "$out/bin/${finalAttrs.meta.mainProgram}" \
-      --prefix GIO_EXTRA_MODULES : "${glib-networking}/lib/gio/modules"
-
    runHook postInstall
  '';

+  preFixup = ''
+    gappsWrapperArgs+=(
+      --prefix GIO_EXTRA_MODULES : "${glib-networking}/lib/gio/modules"
+      --set WEBKIT_DISABLE_COMPOSITING_MODE 1
+    )
+  '';
+
  meta = {
    description = "Two-factor authentication manager with optional sync";
    homepage = "https://proton.me/authenticator";
--- a/pkgs/by-name/sy/syncthing/package.nix
+++ b/pkgs/by-name/sy/syncthing/package.nix
@@ -22,16 +22,16 @@ assert builtins.elem target [

 buildGoModule (finalAttrs: {
  pname = "syncthing";
-  version = "2.1.2";
+  version = "2.1.3";

  src = fetchFromGitHub {
    owner = "syncthing";
    repo = "syncthing";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-tR4yXoEYbCi8Uh3wCyATc+J4+cGvD7k0d9egjHS5H4k=";
+    hash = "sha256-uTjmOAjis2eBm2SnZbyvDDiQXKN8De+DhjNHbFLLbn0=";
  };

-  vendorHash = "sha256-t2wjl4eWvcUHMaBS7KEPzZejqrlI+7c5fRqWqxuCZy8=";
+  vendorHash = "sha256-ueUf9YEa5z7mG6MofIJ3Xco+PxVPi/85Rdi+1aean6c=";

  nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
    # Recent versions of macOS seem to require binaries to be signed when
--- a/pkgs/by-name/xr/xr-chaperone/package.nix
+++ b/pkgs/by-name/xr/xr-chaperone/package.nix
@@ -0,0 +1,52 @@
+{
+  rustPlatform,
+  fetchFromGitHub,
+  autoPatchelfHook,
+  cmake,
+  gitMinimal,
+  python3,
+  openxr-loader,
+  libxkbcommon,
+  lib,
+}:
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "xr-chaperone";
+  version = "0-unstable-2026-05-20";
+
+  src = fetchFromGitHub {
+    owner = "FrostyCoolSlug";
+    repo = "xr-chaperone";
+    rev = "a0351bd00f208e9f7c7917d413de2accbf9208eb";
+    hash = "sha256-d3h3xBxEMza4MmmpDiUCHeaC6MVg1yUwZjMCwBEyLos=";
+  };
+
+  cargoHash = "sha256-9uEosKwKGNruwxp/uslXj0WAFowY4Tu2CikWa2JiOf4=";
+
+  nativeBuildInputs = [
+    autoPatchelfHook
+    cmake
+    gitMinimal
+    python3
+  ];
+
+  buildInputs = [ openxr-loader ];
+
+  runtimeDependencies = [ libxkbcommon ];
+
+  postInstall = ''
+    install -m 444 -D resources/xr-chaperone.desktop $out/share/applications/xr-chaperone.desktop
+    install -m 444 -D resources/xr-chaperone.png $out/share/icons/hicolor/256x256/apps/xr-chaperone.png
+    install -m 444 -D resources/xr-chaperone.svg $out/share/icons/hicolor/scalable/apps/xr-chaperone.svg
+  '';
+
+  __structuredAttrs = true;
+
+  meta = {
+    description = "VR Chaperone System for OpenXR ";
+    homepage = "https://github.com/FrostyCoolSlug/xr-chaperone";
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux;
+    mainProgram = "xr-chaperone";
+    maintainers = with lib.maintainers; [ toasteruwu ];
+  };
+})
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -81,7 +81,7 @@ in
    hash = "sha256-KGiQRHWIUQ3xEO3p6c4J8etPmFZjC0f9xA7OcOIDc88=";
  };
  php85 = mkPhp {
-    version = "8.5.9";
-    hash = "sha256-cDwIKtnSlGrGR/NZaBIwDSxis2DS8xqZkCFpKps5R2w=";
+    version = "8.5.10";
+    hash = "sha256-15vU86kkjly1gzdmug1RzTXdAbhyfyPzC826b6vFHT4=";
  };
 }
--- a/pkgs/development/libraries/nss/latest.nix
+++ b/pkgs/development/libraries/nss/latest.nix
@@ -5,8 +5,8 @@
 #       Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert

 import ./generic.nix {
-  version = "3.127";
-  hash = "sha256-SiaKDkDTHqhTCs/pcwOAk0lgIayeMKOwGLAZr9WKS4Q=";
+  version = "3.128";
+  hash = "sha256-C9SGEyoxR16F6j7zOUsudS0aH/qIHc7DgV5FbBbz90Q=";
  filename = "latest.nix";
  versionRegex = "NSS_(\\d+)_(\\d+)(?:_(\\d+))?_RTM";
 }
--- a/pkgs/development/tools/continuous-integration/woodpecker/common.nix
+++ b/pkgs/development/tools/continuous-integration/woodpecker/common.nix
@@ -1,8 +1,8 @@
 { lib, fetchFromGitHub }:
 let
-  version = "3.16.0";
-  vendorHash = "sha256-z87enzlH2jVq/BI6uVbpLG6jKsO5Wr2alJOcFjt/+MM=";
-  nodeModulesHash = "sha256-6sWSybiSJj7G1KO2iv81yylmOV6DBVN1D15PFYpilC0=";
+  version = "3.18.0";
+  vendorHash = "sha256-BLqkVqMadojMeL27L3YbRn2rmgtqixZidrpbhmE63lg=";
+  nodeModulesHash = "sha256-1gz7R1bkW4spv8gFWa6uGyGzmCy7LerVMpd7leLQuLw=";
 in
 {
  inherit version vendorHash nodeModulesHash;
@@ -11,7 +11,7 @@ in
    owner = "woodpecker-ci";
    repo = "woodpecker";
    tag = "v${version}";
-    hash = "sha256-9Bc7225CZFELgra5gnmo7KeNeY4X7+YpyvVGG/Y+sAs=";
+    hash = "sha256-4RJ6iSrTbHzucVT/eu/wfe0bAKn7wEp5l6zd9GmGvO4=";
  };

  postInstall = ''
--- a/pkgs/development/tools/continuous-integration/woodpecker/webui.nix
+++ b/pkgs/development/tools/continuous-integration/woodpecker/webui.nix
@@ -5,12 +5,12 @@
  nodejs,
  fetchPnpmDeps,
  pnpmConfigHook,
-  pnpm_10,
+  pnpm_11,
 }:
 let
  common = callPackage ./common.nix { };

-  pnpm = pnpm_10;
+  pnpm = pnpm_11;
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "woodpecker-webui";
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
    inherit (finalAttrs) pname version src;
    inherit pnpm;
    sourceRoot = "${common.src.name}/web";
-    fetcherVersion = 3;
+    fetcherVersion = 4;
    hash = common.nodeModulesHash;
  };

--- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
@@ -15,14 +15,14 @@ let
  variants = {
    # ./update-xanmod.sh lts
    lts = {
-      version = "6.18.46";
-      hash = "sha256-MQm9lAw5U3s9p99XT8eDechXj4lhsv6Gmf79+QF3xYU=";
+      version = "6.18.47";
+      hash = "sha256-FdC/RgaV7p3asZp2skiJKJ4JCx5TI+L4eZxOx2+Pdz0=";
      isLTS = true;
    };
    # ./update-xanmod.sh main
    main = {
-      version = "7.1.10";
-      hash = "sha256-W5ipVe/kCQtR2YNsbB7YDEMM1FQUxWrF3HcFzf7i7/I=";
+      version = "7.1.11";
+      hash = "sha256-Ao0TJVW4PyMHe9HXDRbnFYlz/ikrgNAMiA3K3LAwFeM=";
    };
  };