Merge master into staging-nixos

pkgs/applications/networking/cluster/terraform-providers/providers.json

@@ -1283,13 +1283,13 @@
     "vendorHash": "sha256-rWiafaFE1RolO9JUN1WoW4EWJjR7kpfeVEOTLf21j50="
   },
   "tailscale_tailscale": {
-    "hash": "sha256-hw8psXRFtFkBF3x1gj/72bxcnFkuZ5RYXENNeiWB7gc=",
+    "hash": "sha256-iWiZ0FizqJbY80pL6vVwzw3h/WpXJFjHF7vwJOpxD7k=",
     "homepage": "https://registry.terraform.io/providers/tailscale/tailscale",
     "owner": "tailscale",
     "repo": "terraform-provider-tailscale",
-    "rev": "v0.26.0",
+    "rev": "v0.27.0",
     "spdx": "MIT",
-    "vendorHash": "sha256-gc8JCbYzA0nz0JBSNBSZsK0VLTAPmXRhXW2MZiadC90="
+    "vendorHash": "sha256-oAMg/9YnUmkR5Pcb9EIuTgrghM7vS5h8N2NO24szabs="
   },
   "telmate_proxmox": {
     "hash": "sha256-1aKKlOIk1mH4yx66eD635d1IaUWXIiBGHEt4A2F2mGM=",
@@ -1445,13 +1445,13 @@
     "vendorHash": "sha256-B4W8rzWHucYqA0HXrMrtKQ91ZfFAgcxHqFMvMnVuGfk="
   },
   "vmware_avi": {
-    "hash": "sha256-RJ3qPBIJheOMN+MqW5ew8bWb+LlNfMTE+o6laM30pxY=",
+    "hash": "sha256-Zc9kvJgUeoYApurIAgghKoicpLuPoU+e52MedqPWhyA=",
     "homepage": "https://registry.terraform.io/providers/vmware/avi",
     "owner": "vmware",
     "repo": "terraform-provider-avi",
-    "rev": "v31.2.1",
+    "rev": "v31.2.2",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-AiI/O9393xrg8ZdLMGLPWWMnOLSv+EkVyH/voaAe4VM="
+    "vendorHash": "sha256-bmMJcNmB9Pt4Y14YLGrZt2ynnLbSm4rmrqPtdrbDU08="
   },
   "vmware_vcd": {
     "hash": "sha256-W+ffIT70IaePg3xfOaQgCjPTWTN3iSAYwkf+s+zkB84=",

pkgs/applications/networking/instant-messengers/discord/linux.nix

@@ -181,7 +181,7 @@ stdenv.mkDerivation (finalAttrs: {
   installPhase = ''
     runHook preInstall
 
-    mkdir -p $out/{bin,opt/${binaryName},share/pixmaps,share/icons/hicolor/256x256/apps}
+    mkdir -p $out/{bin,opt/${binaryName},share/icons/hicolor/256x256/apps}
     mv * $out/opt/${binaryName}
 
     chmod +x $out/opt/${binaryName}/${binaryName}
@@ -205,7 +205,6 @@ stdenv.mkDerivation (finalAttrs: {
     # Without || true the install would fail on case-insensitive filesystems
     ln -s $out/opt/${binaryName}/${binaryName} $out/bin/${lib.strings.toLower binaryName} || true
 
-    ln -s $out/opt/${binaryName}/discord.png $out/share/pixmaps/${pname}.png
     ln -s $out/opt/${binaryName}/discord.png $out/share/icons/hicolor/256x256/apps/${pname}.png
 
     ln -s "$desktopItem/share/applications" $out/share/

pkgs/by-name/bi/bitbox/package.nix

@@ -5,7 +5,7 @@
   runCommand,
   buildNpmPackage,
   clang,
-  go_1_24,
+  go,
   libsForQt5,
   qt6,
   udevCheckHook,
@@ -21,14 +21,14 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "bitbox";
-  version = "4.49.0";
+  version = "4.50.1";
 
   src = fetchFromGitHub {
     owner = "BitBoxSwiss";
     repo = "bitbox-wallet-app";
     tag = "v${version}";
     fetchSubmodules = true;
-    hash = "sha256-pl7vtRQCxRwG58bBnT8iAi2qfsdeJrHbzDeHJsYwjnQ=";
+    hash = "sha256-ZK1US/RF67QPyV0xRVIw4mecNZM/82GhWvjhJ47rKHU=";
   };
 
   postPatch = ''
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
     inherit version;
     inherit src;
     sourceRoot = "${src.name}/frontends/web";
-    npmDepsHash = "sha256-J3jT286MZGTHgmRXKiXj7lod9wgoEVQrCfOGCtSyG/s=";
+    npmDepsHash = "sha256-kIYyUeaTgj4dJXfAJ1+3WDIYSADFcs5ypRGTODlxwDI=";
     installPhase = "cp -r build $out";
   };
 
@@ -81,7 +81,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     clang
-    go_1_24
+    go
     qt6.wrapQtAppsHook
     rcc
     udevCheckHook

pkgs/by-name/go/gomuks-web/package.nix

@@ -11,15 +11,17 @@
 buildGoModule (
   finalAttrs:
   let
-    rev = "82abf26775d59c642fa7ea5274cf8631cd6942c6";
-    srcHash = "sha256-CC4CNizoi91dfyoNsaIqxAuBB62j8JB076QEIpncky1=";
-    vendorHash = "sha256-opx/NlWgLk1rUHbLJ6Vp2dMLheBdOtL+NgCmWE89H9g=";
-    npmDepsHash = "sha256-mYeT07XfdAFYjwD4EfLRAgCZY0S8zj68p8UNGBpcpmQ=";
+    ver = "0.2025.11";
+    revDate = "2025-11-01";
+    rev = "be0d4487871c196d0c47bb1b6ac7ce9252d424de";
+    srcHash = "sha256-x7M7d8obnt8mpH1ZRev8c39PE5ZlgssgusGvrLaF/vg=";
+    vendorHash = "sha256-TDvTZ0n324pNPAPMZMhWq0LdDUqFrzBXNVNdfMlxqeQ=";
+    npmDepsHash = "sha256-4Ir4uq9Hg6Hwj21P/H7xWdVPzYrDrXiouEtjnLJj4Ko=";
 
   in
   {
     pname = "gomuks-web";
-    version = "0.2601.0";
+    version = "${ver}-unstable-${revDate}";
 
     inherit vendorHash;
 
@@ -45,7 +47,7 @@ buildGoModule (
 
     postPatch = ''
       substituteInPlace ./web/build-wasm.sh \
-        --replace-fail 'go.mau.fi/gomuks/version.Tag=$(git describe --exact-match --tags 2>/dev/null)' "go.mau.fi/gomuks/version.Tag=v${finalAttrs.version}" \
+        --replace-fail 'go.mau.fi/gomuks/version.Tag=$(git describe --exact-match --tags 2>/dev/null)' "go.mau.fi/gomuks/version.Tag=v${ver}" \
         --replace-fail 'go.mau.fi/gomuks/version.Commit=$(git rev-parse HEAD)' "go.mau.fi/gomuks/version.Commit=${rev}"
     '';
 
@@ -54,7 +56,7 @@ buildGoModule (
     tags = [ "goolm" ];
 
     ldflags = [
-      "-X 'go.mau.fi/gomuks/version.Tag=v${finalAttrs.version}'"
+      "-X 'go.mau.fi/gomuks/version.Tag=v${ver}'"
       "-X 'go.mau.fi/gomuks/version.Commit=${rev}'"
       "-X \"go.mau.fi/gomuks/version.BuildTime=$(date -Iseconds)\""
       "-X \"maunium.net/go/mautrix.GoModVersion=$(cat go.mod | grep 'maunium.net/go/mautrix ' | head -n1 | awk '{ print $2 })\""

pkgs/by-name/go/gopls/package.nix

@@ -11,17 +11,17 @@
 
 buildGoLatestModule (finalAttrs: {
   pname = "gopls";
-  version = "0.21.0";
+  version = "0.21.1";
 
   src = fetchFromGitHub {
     owner = "golang";
     repo = "tools";
     tag = "gopls/v${finalAttrs.version}";
-    hash = "sha256-fPG8//DWA0mzqZkYasiBdB5hw5FDRkr/3+ZXm7fNHRg=";
+    hash = "sha256-D/HBqFy5pNSOhMxx/G102HuL+l+oPljsG8rPNLZjUCs=";
   };
 
   modRoot = "gopls";
-  vendorHash = "sha256-9HP+CQiOHoOrcLzzJLRzfpt+I2zJ/AQKtPUqJQwveS8=";
+  vendorHash = "sha256-hT0rvmTyniUdZx1ZVd80nJgsWUpOMKkb9VaCAlKM4lk=";
 
   # https://github.com/golang/tools/blob/9ed98faa/gopls/main.go#L27-L30
   ldflags = [ "-X main.version=v${finalAttrs.version}" ];

pkgs/development/compilers/crystal/default.nix

@@ -202,9 +202,8 @@ let
       env = {
         LLVM_CONFIG = "${llvmPackages.llvm.dev}/bin/llvm-config";
 
-        FLAGS = [
-          "--single-module" # needed for deterministic builds
-        ];
+        # needed for deterministic builds
+        FLAGS = "--single-module";
 
         # This makes sure we don't keep depending on the previous version of
         # crystal used to build this one.