Merge staging-next into staging

nixos/tests/phosh.nix

@@ -54,11 +54,16 @@ in
     import time
 
     start_all()
+
+    # Prevent the RTC from setting the time to an undesired value after we already set it to a different value
+    phone.wait_for_file("/dev/rtc0")
+    phone.succeed("hwclock --set --date '2022-01-01 07:00'")
+
     phone.wait_for_unit("phosh.service")
 
     with subtest("Check that we can see the lock screen info page"):
         # Saturday, January 1
-        phone.succeed("timedatectl set-time '2022-01-01 07:00'")
+        phone.succeed("date -s '2022-01-01 07:00'")
 
         phone.wait_for_text("Saturday")
         phone.screenshot("01lockinfo")
@@ -73,14 +78,10 @@ in
         phone.wait_for_text("All Apps")
         phone.screenshot("03launcher")
 
-    with subtest("Check the on-screen keyboard shows"):
-        phone.send_chars("mobile setting", delay=0.2)
-        phone.wait_for_text("123") # A button on the OSK
-        phone.screenshot("04osk")
-
     with subtest("Check mobile-phosh-settings starts"):
+       phone.send_chars("mobile setting", delay=0.2)
        phone.send_chars("\n")
        phone.wait_for_text("Tweak advanced mobile settings");
-       phone.screenshot("05settings")
+       phone.screenshot("04settings")
   '';
 }

pkgs/applications/emulators/libretro/cores/prboom.nix

@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "prboom";
-  version = "0-unstable-2026-03-31";
+  version = "0-unstable-2026-04-10";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "libretro-prboom";
-    rev = "535b8315e42f22887f36715de3ffc72b34d2dad5";
-    hash = "sha256-aAlGfOcjVB1nOnA+QjVB2VfPX0Ry71QENfxIFdf/L18=";
+    rev = "79d35037b742532e273b82088efad9c5c0af8a6d";
+    hash = "sha256-BR1orEzjT8NQF59uPfHt6WlXwb23bDRnUV8F2itc/HM=";
   };
 
   makefile = "Makefile";

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

@@ -9,15 +9,15 @@
 
 buildGoModule (finalAttrs: {
   pname = "kubernetes-helm";
-  version = "3.19.1";
+  version = "3.20.1";
 
   src = fetchFromGitHub {
     owner = "helm";
     repo = "helm";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-1Cc7W6qyawcg5ZfjsGWH7gScdRhcYpqppjzD83QWV60=";
+    sha256 = "sha256-fSMfHJCl2/Lc6mcYn/m0kR0viH88rRgRTMOoJjFVERQ=";
   };
-  vendorHash = "sha256-81qCRwp57PpzK/eavycOLFYsuD8uVq46h12YVlJRK7Y=";
+  vendorHash = "sha256-kqx23LekpuZJFisVZUoXBY9vHh9zviKyaW5NSa4ecxM=";
 
   subPackages = [ "cmd/helm" ];
   ldflags = [
@@ -39,6 +39,11 @@ buildGoModule (finalAttrs: {
     ldflags="''${ldflags} -X helm.sh/helm/v3/pkg/chartutil.k8sVersionMinor=''${K8S_MODULES_MINOR_VER}"
   '';
 
+  overrideModAttrs = _: {
+    # the goModules derivation will otherwise inherit the preBuild phase defined above
+    preBuild = "";
+  };
+
   __darwinAllowLocalNetworking = true;
 
   preCheck = ''

pkgs/by-name/be/bepasty/package.nix

@@ -10,6 +10,14 @@ let
   bepastyPython = python3.override {
     self = bepastyPython;
     packageOverrides = self: super: {
+      xstatic-bootstrap = super.xstatic-bootstrap.overridePythonAttrs (oldAttrs: rec {
+        version = "4.5.3.1";
+        src = oldAttrs.src.override {
+          pname = "XStatic-Bootstrap";
+          inherit version;
+          hash = "sha256-z2fSBUN7MlCKiLaafnxbviylqK5xCXORpqb1EOv9KCA=";
+        };
+      });
       xstatic-font-awesome = super.xstatic-font-awesome.overridePythonAttrs (oldAttrs: rec {
         version = "4.7.0.0";
         src = oldAttrs.src.override {

pkgs/by-name/ca/caido-cli/package.nix

@@ -0,0 +1,69 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  autoPatchelfHook,
+  unzip,
+  libgcc,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "caido-cli";
+  version = "0.55.3";
+
+  src = fetchurl (
+    {
+      x86_64-linux = {
+        url = "https://caido.download/releases/v${finalAttrs.version}/caido-cli-v${finalAttrs.version}-linux-x86_64.tar.gz";
+        hash = "sha256-ys5gMO0jGy5d8ncwQo9ES0gn7Ddckf3496CAyGgKEus=";
+      };
+      aarch64-linux = {
+        url = "https://caido.download/releases/v${finalAttrs.version}/caido-cli-v${finalAttrs.version}-linux-aarch64.tar.gz";
+        hash = "sha256-JvWktRnNyzu98NeSOFJ6nhF60uQfSL6ys5BmTkYuwCQ=";
+      };
+      x86_64-darwin = {
+        url = "https://caido.download/releases/v${finalAttrs.version}/caido-cli-v${finalAttrs.version}-mac-x86_64.zip";
+        hash = "sha256-bnFGa8GMDTdCjk9xJL9rGvZ1H6MMzzXrlWXGRlE5XPg=";
+      };
+      aarch64-darwin = {
+        url = "https://caido.download/releases/v${finalAttrs.version}/caido-cli-v${finalAttrs.version}-mac-aarch64.zip";
+        hash = "sha256-UVBQKkGsYJ84cthFkCXrHI85t8LJPy4z5sP5TobVNeA=";
+      };
+    }
+    .${stdenv.hostPlatform.system}
+      or (throw "caido-cli: unsupported system ${stdenv.hostPlatform.system}")
+  );
+
+  nativeBuildInputs =
+    lib.optionals stdenv.isLinux [ autoPatchelfHook ] ++ lib.optionals stdenv.isDarwin [ unzip ];
+
+  buildInputs = lib.optionals stdenv.isLinux [ libgcc ];
+
+  sourceRoot = ".";
+
+  installPhase = ''
+    runHook preInstall
+    install -m 755 -D caido-cli $out/bin/caido-cli
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Caido CLI — lightweight web security auditing toolkit";
+    homepage = "https://caido.io/";
+    changelog = "https://github.com/caido/caido/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.unfree;
+    mainProgram = "caido-cli";
+    maintainers = with lib.maintainers; [
+      blackzeshi
+      m0streng0
+      octodi
+    ];
+    platforms = [
+      "x86_64-linux"
+      "aarch64-linux"
+      "x86_64-darwin"
+      "aarch64-darwin"
+    ];
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+  };
+})

pkgs/by-name/ca/caido-desktop/package.nix

@@ -0,0 +1,119 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  appimageTools,
+  makeWrapper,
+  _7zz,
+}:
+
+let
+  pname = "caido-desktop";
+  version = "0.55.3";
+
+  sources = {
+    x86_64-linux = {
+      url = "https://caido.download/releases/v${version}/caido-desktop-v${version}-linux-x86_64.AppImage";
+      hash = "sha256-pGRmFYE7uO5Ka94Kfjl9LR5PAwZ5dCxHqCqJKhtLPco=";
+    };
+    aarch64-linux = {
+      url = "https://caido.download/releases/v${version}/caido-desktop-v${version}-linux-aarch64.AppImage";
+      hash = "sha256-s99+HXf7Ada2wiPUZ/5M/p09JiadFn5GnKrzqo9yNPQ=";
+    };
+    x86_64-darwin = {
+      url = "https://caido.download/releases/v${version}/caido-desktop-v${version}-mac-x86_64.dmg";
+      hash = "sha256-V33bRaTwhxozBR/wV83bU89TZluenKpFc8GU0KaaO8w=";
+    };
+    aarch64-darwin = {
+      url = "https://caido.download/releases/v${version}/caido-desktop-v${version}-mac-aarch64.dmg";
+      hash = "sha256-fEzPN84zoSvlIgUBYVmPta7SUmTDRQghoJMTZXW7eI4=";
+    };
+  };
+
+  src = fetchurl (
+    sources.${stdenv.hostPlatform.system}
+      or (throw "caido-desktop: unsupported system ${stdenv.hostPlatform.system}")
+  );
+
+  meta = {
+    description = "Caido Desktop — lightweight web security auditing toolkit";
+    homepage = "https://caido.io/";
+    changelog = "https://github.com/caido/caido/releases/tag/v${version}";
+    license = lib.licenses.unfree;
+    mainProgram = "caido-desktop";
+    maintainers = with lib.maintainers; [
+      blackzeshi
+      m0streng0
+      octodi
+    ];
+    platforms = [
+      "x86_64-linux"
+      "aarch64-linux"
+      "x86_64-darwin"
+      "aarch64-darwin"
+    ];
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+  };
+
+  appimageContents = appimageTools.extractType2 { inherit pname version src; };
+
+  linux = appimageTools.wrapType2 {
+    inherit
+      pname
+      version
+      src
+      meta
+      ;
+
+    nativeBuildInputs = [ makeWrapper ];
+    extraPkgs = pkgs: [ pkgs.libthai ];
+
+    extraInstallCommands = ''
+      install -m 444 -D ${appimageContents}/caido.desktop \
+        -t $out/share/applications
+      install -m 444 -D ${appimageContents}/caido.png \
+        $out/share/icons/hicolor/512x512/apps/caido.png
+      wrapProgram $out/bin/${pname} \
+        --set WEBKIT_DISABLE_COMPOSITING_MODE 1 \
+        --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}"
+    '';
+  };
+
+  darwin = stdenv.mkDerivation {
+    inherit
+      pname
+      version
+      src
+      meta
+      ;
+
+    nativeBuildInputs = [
+      _7zz
+      makeWrapper
+    ];
+
+    unpackPhase = ''
+      runHook preUnpack
+      7zz x $src || true
+      runHook postUnpack
+    '';
+
+    sourceRoot = "Caido.app";
+
+    installPhase = ''
+      runHook preInstall
+      mkdir -p $out/Applications/Caido.app $out/bin
+      cp -R . $out/Applications/Caido.app/
+      makeWrapper $out/Applications/Caido.app/Contents/MacOS/Caido \
+        $out/bin/${pname}
+      runHook postInstall
+    '';
+  };
+
+in
+if stdenv.isLinux then
+  linux
+else if stdenv.isDarwin then
+  darwin
+else
+  throw "caido-desktop: unsupported platform ${stdenv.hostPlatform.system}"

pkgs/by-name/ca/caido/package.nix

@@ -1,208 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  appimageTools,
-  makeWrapper,
-  autoPatchelfHook,
-  _7zz,
-  unzip,
-  libgcc,
-  appVariants ? [ ],
-}:
-let
-  pname = "caido";
-  appVariantList = [
-    "cli"
-    "desktop"
-  ];
-  version = "0.55.1";
-
-  system = stdenv.hostPlatform.system;
-  isLinux = stdenv.isLinux;
-  isDarwin = stdenv.isDarwin;
-
-  # CLI sources
-  cliSources = {
-    x86_64-linux = {
-      url = "https://caido.download/releases/v${version}/caido-cli-v${version}-linux-x86_64.tar.gz";
-      hash = "sha256-4xRkEN/ZA+JUFMB2qoEZT0Bzv2Qc7Y9kcj251MCAhKE=";
-    };
-    aarch64-linux = {
-      url = "https://caido.download/releases/v${version}/caido-cli-v${version}-linux-aarch64.tar.gz";
-      hash = "sha256-gMQkF0+mq2nRBy0oBenFvp69byWCkqmt8E4ZpKuNxKw=";
-    };
-    x86_64-darwin = {
-      url = "https://caido.download/releases/v${version}/caido-cli-v${version}-mac-x86_64.zip";
-      hash = "sha256-C+EfmSBJMyxYXLfzxCrY7ZVtg8nwtie8w0Lj1Dy7o/k=";
-    };
-    aarch64-darwin = {
-      url = "https://caido.download/releases/v${version}/caido-cli-v${version}-mac-aarch64.zip";
-      hash = "sha256-b0cBS3RwsiLgJNqHWxi672MVZNfTYNOEJ2k0h2qNnP0=";
-    };
-  };
-
-  # Desktop sources
-  desktopSources = {
-    x86_64-linux = {
-      url = "https://caido.download/releases/v${version}/caido-desktop-v${version}-linux-x86_64.AppImage";
-      hash = "sha256-zfts2h8QWTxe/dISwgKRQiSx2nD6vtE1atPfREyGX/U=";
-    };
-    aarch64-linux = {
-      url = "https://caido.download/releases/v${version}/caido-desktop-v${version}-linux-aarch64.AppImage";
-      hash = "sha256-fYqzukRptCB466LIPbVre2EwBFt4Bsq9amQ4kjQuV2Q=";
-    };
-    x86_64-darwin = {
-      url = "https://caido.download/releases/v${version}/caido-desktop-v${version}-mac-x86_64.dmg";
-      hash = "sha256-UsGT5n0MGVwWCXACo74Harb4J/qt/3TyD0+EFYNmPxw=";
-    };
-    aarch64-darwin = {
-      url = "https://caido.download/releases/v${version}/caido-desktop-v${version}-mac-aarch64.dmg";
-      hash = "sha256-iZHZayj2VYjMY9+p+xrlX+vP/DcbCRPQizQEqtF39EU=";
-    };
-  };
-
-  cliSource = cliSources.${system} or (throw "Unsupported system for caido-cli: ${system}");
-  desktopSource =
-    desktopSources.${system} or (throw "Unsupported system for caido-desktop: ${system}");
-
-  cli = fetchurl {
-    url = cliSource.url;
-    hash = cliSource.hash;
-  };
-
-  desktop = fetchurl {
-    url = desktopSource.url;
-    hash = desktopSource.hash;
-  };
-
-  appimageContents = appimageTools.extractType2 {
-    inherit pname version;
-    src = desktop;
-  };
-
-  wrappedDesktop =
-    if isLinux then
-      appimageTools.wrapType2 {
-        src = desktop;
-        inherit pname version;
-
-        nativeBuildInputs = [ makeWrapper ];
-
-        extraPkgs = pkgs: [ pkgs.libthai ];
-
-        extraInstallCommands = ''
-          install -m 444 -D ${appimageContents}/caido.desktop -t $out/share/applications
-          install -m 444 -D ${appimageContents}/caido.png \
-            $out/share/icons/hicolor/512x512/apps/caido.png
-          wrapProgram $out/bin/caido \
-            --set WEBKIT_DISABLE_COMPOSITING_MODE 1 \
-            --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}"
-        '';
-      }
-    else if isDarwin then
-      stdenv.mkDerivation {
-        src = desktop;
-        inherit pname version;
-
-        nativeBuildInputs = [ _7zz ];
-        sourceRoot = ".";
-
-        unpackPhase = ''
-          runHook preUnpack
-          ${_7zz}/bin/7zz x $src
-          runHook postUnpack
-        '';
-
-        installPhase = ''
-          runHook preInstall
-          mkdir -p $out/Applications
-          cp -r Caido.app $out/Applications/
-          mkdir -p $out/bin
-          ln -s $out/Applications/Caido.app/Contents/MacOS/Caido $out/bin/caido
-          runHook postInstall
-        '';
-
-        meta = {
-          platforms = [
-            "x86_64-darwin"
-            "aarch64-darwin"
-          ];
-        };
-      }
-    else
-      throw "Desktop variant is not supported on ${stdenv.hostPlatform.system}";
-
-  wrappedCli =
-    if isLinux then
-      stdenv.mkDerivation {
-        src = cli;
-        inherit pname version;
-
-        nativeBuildInputs = [ autoPatchelfHook ];
-        buildInputs = [ libgcc ];
-        sourceRoot = ".";
-
-        installPhase = ''
-          runHook preInstall
-          install -m755 -D caido-cli $out/bin/caido-cli
-          runHook postInstall
-        '';
-      }
-    else if isDarwin then
-      stdenv.mkDerivation {
-        src = cli;
-        inherit pname version;
-
-        nativeBuildInputs = [ unzip ];
-        sourceRoot = ".";
-
-        installPhase = ''
-          runHook preInstall
-          install -m755 -D caido-cli $out/bin/caido-cli
-          runHook postInstall
-        '';
-
-        meta = {
-          platforms = [
-            "x86_64-darwin"
-            "aarch64-darwin"
-          ];
-        };
-      }
-    else
-      throw "CLI variant is not supported on ${stdenv.hostPlatform.system}";
-
-  meta = {
-    description = "Lightweight web security auditing toolkit";
-    homepage = "https://caido.io/";
-    changelog = "https://github.com/caido/caido/releases/tag/v${version}";
-    license = lib.licenses.unfree;
-    maintainers = with lib.maintainers; [
-      octodi
-      blackzeshi
-    ];
-    platforms = [
-      "x86_64-linux"
-      "aarch64-linux"
-      "x86_64-darwin"
-      "aarch64-darwin"
-    ];
-  };
-in
-lib.checkListOfEnum "${pname}: appVariants" appVariantList appVariants (
-  if appVariants == [ "desktop" ] then
-    wrappedDesktop
-  else if appVariants == [ "cli" ] then
-    wrappedCli
-  else
-    stdenv.mkDerivation {
-      inherit pname version meta;
-      dontUnpack = true;
-      installPhase = ''
-        mkdir -p $out/bin
-        ln -s ${wrappedDesktop}/bin/caido $out/bin/caido
-        ln -s ${wrappedCli}/bin/caido-cli $out/bin/caido-cli
-      '';
-    }
-)

pkgs/by-name/ds/dstask/package.nix

@@ -40,6 +40,5 @@ buildGoModule (finalAttrs: {
     homepage = finalAttrs.src.meta.homepage;
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ stianlagstad ];
-    platforms = lib.platforms.linux;
   };
 })

pkgs/by-name/ff/fflogs/package.nix

@@ -18,11 +18,13 @@ appimageTools.wrapType2 {
 
   extraInstallCommands = ''
     mkdir -p $out/share/applications
-    cp -r ${extracted}/usr/share/icons $out/share/
+    mkdir -p $out/share/icons/hicolor/512x512/apps
+    cp -r ${extracted}/usr/share/icons/hicolor/512x512/apps/'FF Logs Uploader.png' $out/share/icons/hicolor/512x512/apps/fflogs.png
     chmod -R +w $out/share/
     test ! -e $out/share/icons/hicolor/0x0 # check for regression of https://github.com/electron-userland/electron-builder/issues/5294
     cp ${extracted}/'FF Logs Uploader.desktop' $out/share/applications/fflogs.desktop
     sed -i 's@^Exec=AppRun --no-sandbox@Exec=fflogs@g' $out/share/applications/fflogs.desktop
+    sed -i 's@^Icon=FF Logs Uploader@Icon=fflogs@g' $out/share/applications/fflogs.desktop
   '';
 
   meta = {

pkgs/by-name/ma/mautrix-slack/package.nix

@@ -14,17 +14,17 @@
 }:
 buildGoModule rec {
   pname = "mautrix-slack";
-  version = "25.11";
-  tag = "v0.2511.0";
+  version = "26.03";
+  tag = "v0.2603.0";
 
   src = fetchFromGitHub {
     owner = "mautrix";
     repo = "slack";
     inherit tag;
-    hash = "sha256-9f+GL0eziA2Z9qFXY9VRwj6PK0jUm4bo90pJEuNR1IY=";
+    hash = "sha256-YR8t8UNKkMS8cn5rJa2NaRRkJlzwb45O+dWOyDp8qi8=";
   };
 
-  vendorHash = "sha256-djNvUIlJuWqqREV3tYmEe9yolKymhuzA0jsp714qfOQ=";
+  vendorHash = "sha256-qkEoG4J+dS9jkgmgF3Ztm5Q68YB2uSUMCPcKYuU5PWc=";
 
   buildInputs = lib.optional (!withGoolm) olm;
   tags = lib.optional withGoolm "goolm";

pkgs/by-name/mu/musicfree-desktop/package.nix

@@ -34,6 +34,7 @@ buildNpmPackage (finalAttrs: {
     # update sharp to recognize SHARP_FORCE_GLOBAL_LIBVIPS
     # update node-abi to support newer Electron
     # update nan to fix build with newer Electron (https://github.com/nodejs/nan/issues/921)
+    # update better-sqlite3 to fix build with newer Electron
     # see update.sh for how this patch was generated
     ./bump-deps.patch
 
@@ -57,7 +58,7 @@ buildNpmPackage (finalAttrs: {
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcodebuild ]; # Used by better-sqlite3
 
-  npmDepsHash = "sha256-lxDEbf++QH1/DaIEgXMnmqMD9d5Ak7IJMc5pQjysKBA=";
+  npmDepsHash = "sha256-pEpU3JuxeMl0Oo/ZnmzH9/WdJ/3O2RUGofm7KXrKcAo=";
 
   postConfigure = ''
     # use Electron's headers to make node-gyp compile against the Electron ABI

pkgs/by-name/mu/musicfree-desktop/update.sh

@@ -24,7 +24,7 @@ else
   mv package.json package.json.old
   jq '.dependencies.sharp |= (if . != null and . < "^0.33.4" then "^0.33.4" else . end)' package.json.old > package.json
   cp package-lock.json package-lock.json.old
-  npm update sharp node-abi nan --package-lock-only
+  npm update sharp node-abi nan better-sqlite3 --package-lock-only
   diff -u --label a/package.json package.json.old --label b/package.json package.json > $patch || true
   diff -u --label a/package-lock.json package-lock.json.old --label b/package-lock.json package-lock.json >> $patch || true
 fi

pkgs/by-name/ph/phoc/package.nix

@@ -3,6 +3,7 @@
   stdenv,
   stdenvNoCC,
   fetchFromGitLab,
+  callPackage,
   meson,
   ninja,
   pkg-config,
@@ -39,15 +40,17 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "phoc";
-  version = "0.51.0";
+  version = "0.53.0";
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
     group = "World";
     owner = "Phosh";
     repo = "phoc";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-6glG5QvphanjBvf9xKiXjkVceWBQ8EjFkRywdfYc7E4=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-qBeOsHxdcJjAx/KGJEQKuqkexp1lGWeEaJPBjAy1Yxw=";
+    # Workaround for https://github.com/NixOS/nixpkgs/issues/485701
+    forceFetchGit = true;
   };
 
   nativeBuildInputs = [
@@ -101,6 +104,7 @@ stdenv.mkDerivation (finalAttrs: {
     tests.version = testers.testVersion {
       package = finalAttrs.finalPackage;
     };
+    tests.dependency-versions = callPackage ./test-dependency-versions.nix { inherit gvdb; };
     updateScript = nix-update-script { };
   };
 

pkgs/by-name/ph/phoc/test-dependency-versions.nix

@@ -0,0 +1,18 @@
+{
+  lib,
+  runCommand,
+  yq-go,
+  phoc,
+  gvdb,
+}:
+
+runCommand "phoc-test-dependency-versions" { } ''
+  phoc_wants_gvdb_revision="$('${lib.getExe yq-go}' --input-format ini --output-format ini '.wrap-git.revision' '${phoc.src}/subprojects/gvdb.wrap')"
+  phoc_gets_gvdb_revision='${gvdb.rev}'
+
+  if [ "$phoc_wants_gvdb_revision" != "$phoc_gets_gvdb_revision" ]; then
+    echo "Wrong GVDB version! Phoc wants GVDB Git revision $phoc_wants_gvdb_revision but we're providing $phoc_gets_gvdb_revision."
+    exit 1
+  fi
+  touch "$out"
+''

pkgs/by-name/pr/prowlarr/deps.json

@@ -64,6 +64,36 @@
     "version": "6.12.0",
     "hash": "sha256-LGlPe+G7lBwj5u3ttQZiKX2+C195ddRAHPuDkY6x0BE="
   },
+  {
+    "pname": "FluentMigrator",
+    "version": "6.2.0",
+    "hash": "sha256-ile8oQnbeJWcoHiK4wESAGSq4VtbSsuUZWbvYZZsWes="
+  },
+  {
+    "pname": "FluentMigrator.Abstractions",
+    "version": "6.2.0",
+    "hash": "sha256-jzrMDqysTXQw4F+XuBq6dTtLjfqyerlrOrR6V85RlPY="
+  },
+  {
+    "pname": "FluentMigrator.Extensions.Postgres",
+    "version": "6.2.0",
+    "hash": "sha256-FdV3OPXLdu+C74Zbrk2IG5Dz52u54D/7wYSsloqA5hs="
+  },
+  {
+    "pname": "FluentMigrator.Runner.Core",
+    "version": "6.2.0",
+    "hash": "sha256-uUXhvxCkwyxmDBSlPSp5K1ycSTSssWYNui2dN6Ql5Wk="
+  },
+  {
+    "pname": "FluentMigrator.Runner.Postgres",
+    "version": "6.2.0",
+    "hash": "sha256-zqgNUE8oiZ+wJ+Xni6AcQiMDiTOLDMqe0rMmn/DuiI0="
+  },
+  {
+    "pname": "FluentMigrator.Runner.SQLite",
+    "version": "6.2.0",
+    "hash": "sha256-nzeaThuaPs/jqgIpsj7SWlAICAciXNTM1447R3s/18U="
+  },
   {
     "pname": "FluentValidation",
     "version": "9.5.4",
@@ -149,11 +179,6 @@
     "version": "8.0.0",
     "hash": "sha256-9BPsASlxrV8ilmMCjdb3TiUcm5vFZxkBnAI/fNBSEyA="
   },
-  {
-    "pname": "Microsoft.Extensions.Configuration.Abstractions",
-    "version": "2.0.1",
-    "hash": "sha256-UXWzOFT0lc2Jtt3zNJ4xCEv0LCRPnWCnSoHQO2s3kZg="
-  },
   {
     "pname": "Microsoft.Extensions.Configuration.Abstractions",
     "version": "8.0.0",
@@ -189,11 +214,6 @@
     "version": "8.0.1",
     "hash": "sha256-yGvWfwBhyFudcIv96pKWaQ1MIMOiv5LHSCn+9J7Doz0="
   },
-  {
-    "pname": "Microsoft.Extensions.DependencyInjection",
-    "version": "2.0.0",
-    "hash": "sha256-+KqiuV8ncy9b1xhtDExh4s4U57tKxqx4pAyr6d//EQU="
-  },
   {
     "pname": "Microsoft.Extensions.DependencyInjection",
     "version": "8.0.0",
@@ -204,11 +224,6 @@
     "version": "8.0.1",
     "hash": "sha256-O9g0jWS+jfGoT3yqKwZYJGL+jGSIeSbwmvomKDC3hTU="
   },
-  {
-    "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
-    "version": "2.0.0",
-    "hash": "sha256-H1rEnq/veRWvmp8qmUsrQkQIcVlKilUNzmmKsxJ0md8="
-  },
   {
     "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
     "version": "7.0.0",
@@ -264,11 +279,6 @@
     "version": "8.0.1",
     "hash": "sha256-JBrZuv1RxpJf5wR81g91bE1/JQgBeOtnJDvA98rlYKE="
   },
-  {
-    "pname": "Microsoft.Extensions.Logging",
-    "version": "2.0.1",
-    "hash": "sha256-5VJLg/kfx3LWvCrWPx3407EKElA3m7Yn+NI4KtIyE7Y="
-  },
   {
     "pname": "Microsoft.Extensions.Logging",
     "version": "8.0.0",
@@ -279,11 +289,6 @@
     "version": "8.0.1",
     "hash": "sha256-vkfVw4tQEg86Xg18v6QO0Qb4Ysz0Njx57d1XcNuj6IU="
   },
-  {
-    "pname": "Microsoft.Extensions.Logging.Abstractions",
-    "version": "2.0.1",
-    "hash": "sha256-J/NwPGVWtiNpwHP9M0tDR1eNUcFiz/r1Sn5v2xuE0tA="
-  },
   {
     "pname": "Microsoft.Extensions.Logging.Abstractions",
     "version": "8.0.0",
@@ -324,11 +329,6 @@
     "version": "8.0.1",
     "hash": "sha256-EINT/PgfB4Dvf+1JBzL1plPT35ezT7kyS8y/XMMgYxA="
   },
-  {
-    "pname": "Microsoft.Extensions.Options",
-    "version": "2.0.1",
-    "hash": "sha256-hbe+3YXlSQ3urCX11D2MIZl1XrWvr+mmnBc/bj53zfY="
-  },
   {
     "pname": "Microsoft.Extensions.Options",
     "version": "8.0.0",
@@ -344,11 +344,6 @@
     "version": "8.0.0",
     "hash": "sha256-A5Bbzw1kiNkgirk5x8kyxwg9lLTcSngojeD+ocpG1RI="
   },
-  {
-    "pname": "Microsoft.Extensions.Primitives",
-    "version": "2.0.0",
-    "hash": "sha256-q44LtMvyNEKSvgERvA+BrasKapP92Sc91QR4u2TJ9/Y="
-  },
   {
     "pname": "Microsoft.Extensions.Primitives",
     "version": "8.0.0",
@@ -419,11 +414,6 @@
     "version": "1.1.1",
     "hash": "sha256-8hLiUKvy/YirCWlFwzdejD2Db3DaXhHxT7GSZx/znJg="
   },
-  {
-    "pname": "Microsoft.NETCore.Platforms",
-    "version": "3.1.0",
-    "hash": "sha256-cnygditsEaU86bnYtIthNMymAHqaT/sf9Gjykhzqgb0="
-  },
   {
     "pname": "Microsoft.NETCore.Platforms",
     "version": "5.0.0",
@@ -835,120 +825,6 @@
     "version": "4.0.2",
     "hash": "sha256-TzsAxAYqB2SdcSl+r92+nd5obgUBW1DCFP/nXzAZE4U="
   },
-  {
-    "pname": "Servarr.FluentMigrator",
-    "version": "3.3.2.9",
-    "hash": "sha256-vJEcb2uxbOAoYB8niFO+f3Zer7iNkfx6kF8NNkIjy9M=",
-    "url": "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/323efe4e-c7d8-4bcd-acfe-5afb38d520bf/nuget/v3/flat2/servarr.fluentmigrator/3.3.2.9/servarr.fluentmigrator.3.3.2.9.nupkg"
-  },
-  {
-    "pname": "Servarr.FluentMigrator.Abstractions",
-    "version": "3.3.2.9",
-    "hash": "sha256-lYrOaKbdDkxspsAOhnHj7QwQtR3tyy7Gy2K/9gaCBpg=",
-    "url": "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/323efe4e-c7d8-4bcd-acfe-5afb38d520bf/nuget/v3/flat2/servarr.fluentmigrator.abstractions/3.3.2.9/servarr.fluentmigrator.abstractions.3.3.2.9.nupkg"
-  },
-  {
-    "pname": "Servarr.FluentMigrator.Extensions.Oracle",
-    "version": "3.3.2.9",
-    "hash": "sha256-0vHyF48Jr9ZWaA8oQGoKAWWoddLKf/3Vi68GhJ6um5M=",
-    "url": "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/323efe4e-c7d8-4bcd-acfe-5afb38d520bf/nuget/v3/flat2/servarr.fluentmigrator.extensions.oracle/3.3.2.9/servarr.fluentmigrator.extensions.oracle.3.3.2.9.nupkg"
-  },
-  {
-    "pname": "Servarr.FluentMigrator.Extensions.Postgres",
-    "version": "3.3.2.9",
-    "hash": "sha256-D0AuYHgvs8/rALlHoMj5KCLhpp84YZ7nat4Y27sMDW8=",
-    "url": "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/323efe4e-c7d8-4bcd-acfe-5afb38d520bf/nuget/v3/flat2/servarr.fluentmigrator.extensions.postgres/3.3.2.9/servarr.fluentmigrator.extensions.postgres.3.3.2.9.nupkg"
-  },
-  {
-    "pname": "Servarr.FluentMigrator.Extensions.SqlAnywhere",
-    "version": "3.3.2.9",
-    "hash": "sha256-i2o82mr8cNVnP6yryzCKpVlhvlCSugphoICorDiR59c=",
-    "url": "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/323efe4e-c7d8-4bcd-acfe-5afb38d520bf/nuget/v3/flat2/servarr.fluentmigrator.extensions.sqlanywhere/3.3.2.9/servarr.fluentmigrator.extensions.sqlanywhere.3.3.2.9.nupkg"
-  },
-  {
-    "pname": "Servarr.FluentMigrator.Extensions.SqlServer",
-    "version": "3.3.2.9",
-    "hash": "sha256-Hw1CHZ5ZewkLKWpRH42Nm4rBv33aFFGPBhPZn1DjQRM=",
-    "url": "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/323efe4e-c7d8-4bcd-acfe-5afb38d520bf/nuget/v3/flat2/servarr.fluentmigrator.extensions.sqlserver/3.3.2.9/servarr.fluentmigrator.extensions.sqlserver.3.3.2.9.nupkg"
-  },
-  {
-    "pname": "Servarr.FluentMigrator.Runner",
-    "version": "3.3.2.9",
-    "hash": "sha256-koza7zbpTLpzFEnlrLkVxPVSSgZcD9bECZuFVFDZFQg=",
-    "url": "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/323efe4e-c7d8-4bcd-acfe-5afb38d520bf/nuget/v3/flat2/servarr.fluentmigrator.runner/3.3.2.9/servarr.fluentmigrator.runner.3.3.2.9.nupkg"
-  },
-  {
-    "pname": "Servarr.FluentMigrator.Runner.Core",
-    "version": "3.3.2.9",
-    "hash": "sha256-wLwHIeJrn/c3fKZG/xBf0Wxe0C/YFw4uDL5oDHgjw6c=",
-    "url": "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/323efe4e-c7d8-4bcd-acfe-5afb38d520bf/nuget/v3/flat2/servarr.fluentmigrator.runner.core/3.3.2.9/servarr.fluentmigrator.runner.core.3.3.2.9.nupkg"
-  },
-  {
-    "pname": "Servarr.FluentMigrator.Runner.Db2",
-    "version": "3.3.2.9",
-    "hash": "sha256-ciLtDPc4H/3JCa27ssdBMjNhxmW6polIRygauK0Ca8Y=",
-    "url": "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/323efe4e-c7d8-4bcd-acfe-5afb38d520bf/nuget/v3/flat2/servarr.fluentmigrator.runner.db2/3.3.2.9/servarr.fluentmigrator.runner.db2.3.3.2.9.nupkg"
-  },
-  {
-    "pname": "Servarr.FluentMigrator.Runner.Firebird",
-    "version": "3.3.2.9",
-    "hash": "sha256-rLNjYe0seSWj3YFvaaToCHZmHxi2Texu7i4NW/zgux0=",
-    "url": "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/323efe4e-c7d8-4bcd-acfe-5afb38d520bf/nuget/v3/flat2/servarr.fluentmigrator.runner.firebird/3.3.2.9/servarr.fluentmigrator.runner.firebird.3.3.2.9.nupkg"
-  },
-  {
-    "pname": "Servarr.FluentMigrator.Runner.Hana",
-    "version": "3.3.2.9",
-    "hash": "sha256-7Cmn2kwdoWwX+yNCQ6GPICLaPVSCPAbraLj/GHAX0YE=",
-    "url": "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/323efe4e-c7d8-4bcd-acfe-5afb38d520bf/nuget/v3/flat2/servarr.fluentmigrator.runner.hana/3.3.2.9/servarr.fluentmigrator.runner.hana.3.3.2.9.nupkg"
-  },
-  {
-    "pname": "Servarr.FluentMigrator.Runner.MySql",
-    "version": "3.3.2.9",
-    "hash": "sha256-MY4G+SFZqmQSeValnUVNz5QP1BU4Hv/CSOdrpsz179k=",
-    "url": "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/323efe4e-c7d8-4bcd-acfe-5afb38d520bf/nuget/v3/flat2/servarr.fluentmigrator.runner.mysql/3.3.2.9/servarr.fluentmigrator.runner.mysql.3.3.2.9.nupkg"
-  },
-  {
-    "pname": "Servarr.FluentMigrator.Runner.Oracle",
-    "version": "3.3.2.9",
-    "hash": "sha256-4Gy/rhaGYYhwtKywuxA5ECRJkYPu5chS4Iq9shf4J3g=",
-    "url": "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/323efe4e-c7d8-4bcd-acfe-5afb38d520bf/nuget/v3/flat2/servarr.fluentmigrator.runner.oracle/3.3.2.9/servarr.fluentmigrator.runner.oracle.3.3.2.9.nupkg"
-  },
-  {
-    "pname": "Servarr.FluentMigrator.Runner.Postgres",
-    "version": "3.3.2.9",
-    "hash": "sha256-MaZjUZENrdyzFDTVcJfDh4xIvbE7m8hLD2sUrZhgR54=",
-    "url": "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/323efe4e-c7d8-4bcd-acfe-5afb38d520bf/nuget/v3/flat2/servarr.fluentmigrator.runner.postgres/3.3.2.9/servarr.fluentmigrator.runner.postgres.3.3.2.9.nupkg"
-  },
-  {
-    "pname": "Servarr.FluentMigrator.Runner.Redshift",
-    "version": "3.3.2.9",
-    "hash": "sha256-jnKGzc/saQ8g7Xnqh/qE8divtR1z2tpAC16t6mIpwPA=",
-    "url": "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/323efe4e-c7d8-4bcd-acfe-5afb38d520bf/nuget/v3/flat2/servarr.fluentmigrator.runner.redshift/3.3.2.9/servarr.fluentmigrator.runner.redshift.3.3.2.9.nupkg"
-  },
-  {
-    "pname": "Servarr.FluentMigrator.Runner.SqlAnywhere",
-    "version": "3.3.2.9",
-    "hash": "sha256-qZ3tBRp8tkhzn8dCE90Lkqg5lT8QnZVp8hIulpSa7rs=",
-    "url": "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/323efe4e-c7d8-4bcd-acfe-5afb38d520bf/nuget/v3/flat2/servarr.fluentmigrator.runner.sqlanywhere/3.3.2.9/servarr.fluentmigrator.runner.sqlanywhere.3.3.2.9.nupkg"
-  },
-  {
-    "pname": "Servarr.FluentMigrator.Runner.SQLite",
-    "version": "3.3.2.9",
-    "hash": "sha256-dfRiBhT0kwhcWyc2Ib2rbzZj4ZlPfWI0u2CF8QljA6Q=",
-    "url": "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/323efe4e-c7d8-4bcd-acfe-5afb38d520bf/nuget/v3/flat2/servarr.fluentmigrator.runner.sqlite/3.3.2.9/servarr.fluentmigrator.runner.sqlite.3.3.2.9.nupkg"
-  },
-  {
-    "pname": "Servarr.FluentMigrator.Runner.SqlServer",
-    "version": "3.3.2.9",
-    "hash": "sha256-mDIfUT35CqEUbf858hrtJE0E65U7ZJlygoZAHi2Hlf8=",
-    "url": "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/323efe4e-c7d8-4bcd-acfe-5afb38d520bf/nuget/v3/flat2/servarr.fluentmigrator.runner.sqlserver/3.3.2.9/servarr.fluentmigrator.runner.sqlserver.3.3.2.9.nupkg"
-  },
-  {
-    "pname": "Servarr.FluentMigrator.Runner.SqlServerCe",
-    "version": "3.3.2.9",
-    "hash": "sha256-kx3ZjLj1zz/1buiWrAJPuB5GXCohpntpq4ak5WG1SR4=",
-    "url": "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/323efe4e-c7d8-4bcd-acfe-5afb38d520bf/nuget/v3/flat2/servarr.fluentmigrator.runner.sqlserverce/3.3.2.9/servarr.fluentmigrator.runner.sqlserverce.3.3.2.9.nupkg"
-  },
   {
     "pname": "SharpZipLib",
     "version": "1.4.2",
@@ -1011,8 +887,8 @@
   },
   {
     "pname": "System.ComponentModel.Annotations",
-    "version": "4.4.1",
-    "hash": "sha256-8NZ0tWPqRYf3ovkn4OQapGsHeseEYKg91nqZAU33hrQ="
+    "version": "5.0.0",
+    "hash": "sha256-0pST1UHgpeE6xJrYf5R+U7AwIlH3rVC3SpguilI/MAg="
   },
   {
     "pname": "System.ComponentModel.Primitives",
@@ -1264,11 +1140,6 @@
     "version": "4.3.0",
     "hash": "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg="
   },
-  {
-    "pname": "System.Runtime.CompilerServices.Unsafe",
-    "version": "4.4.0",
-    "hash": "sha256-SeTI4+yVRO2SmAKgOrMni4070OD+Oo8L1YiEVeKDyig="
-  },
   {
     "pname": "System.Runtime.CompilerServices.Unsafe",
     "version": "6.0.0",
@@ -1304,11 +1175,6 @@
     "version": "4.3.0",
     "hash": "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc="
   },
-  {
-    "pname": "System.Security.AccessControl",
-    "version": "4.7.0",
-    "hash": "sha256-/9ZCPIHLdhzq7OW4UKqTsR0O93jjHd6BRG1SRwgHE1g="
-  },
   {
     "pname": "System.Security.AccessControl",
     "version": "5.0.0",
@@ -1374,11 +1240,6 @@
     "version": "4.3.0",
     "hash": "sha256-MG3V/owDh273GCUPsGGraNwaVpcydupl3EtPXj6TVG0="
   },
-  {
-    "pname": "System.Security.Permissions",
-    "version": "4.7.0",
-    "hash": "sha256-BGgXMLUi5rxVmmChjIhcXUxisJjvlNToXlyaIbUxw40="
-  },
   {
     "pname": "System.Security.Principal",
     "version": "4.3.0",
@@ -1389,11 +1250,6 @@
     "version": "4.3.0",
     "hash": "sha256-mbdLVUcEwe78p3ZnB6jYsizNEqxMaCAWI3tEQNhRQAE="
   },
-  {
-    "pname": "System.Security.Principal.Windows",
-    "version": "4.7.0",
-    "hash": "sha256-rWBM2U8Kq3rEdaa1MPZSYOOkbtMGgWyB8iPrpIqmpqg="
-  },
   {
     "pname": "System.Security.Principal.Windows",
     "version": "5.0.0",
@@ -1471,19 +1327,14 @@
   },
   {
     "pname": "System.ValueTuple",
-    "version": "4.4.0",
-    "hash": "sha256-LqpI3bSaXqVPqfEdfsWE2qX9tzFV6VPU6x4A/fVzzfM="
+    "version": "4.5.0",
+    "hash": "sha256-niH6l2fU52vAzuBlwdQMw0OEoRS/7E1w5smBFoqSaAI="
   },
   {
     "pname": "System.ValueTuple",
     "version": "4.6.1",
     "hash": "sha256-Hb87MPcNdHQRlREDzFEKU8ZqtKN26bjyAiimJmm6LWI="
   },
-  {
-    "pname": "System.Windows.Extensions",
-    "version": "4.7.0",
-    "hash": "sha256-yW+GvQranReaqPw5ZFv+mSjByQ5y1pRLl05JIEf3tYU="
-  },
   {
     "pname": "System.Xml.ReaderWriter",
     "version": "4.3.0",

pkgs/by-name/pr/prowlarr/package.nix

@@ -20,7 +20,7 @@
   applyPatches,
 }:
 let
-  version = "2.3.0.5236";
+  version = "2.3.5.5327";
   # The dotnet8 compatibility patches also change `yarn.lock`, so we must pass
   # the already patched lockfile to `fetchYarnDeps`.
   src = applyPatches {
@@ -28,7 +28,7 @@ let
       owner = "Prowlarr";
       repo = "Prowlarr";
       tag = "v${version}";
-      hash = "sha256-ImRmOn53TMgozdkVPK5B0pXJTbFWoxy8PLQ2WoOdUcE=";
+      hash = "sha256-mHYEY49uczfo0lAaweCmA04dHDxRMFq5lYybKGirlQk=";
     };
     postPatch = ''
       mv src/NuGet.config NuGet.Config
@@ -50,7 +50,7 @@ buildDotnetModule {
 
   yarnOfflineCache = fetchYarnDeps {
     yarnLock = "${src}/yarn.lock";
-    hash = "sha256-QVyjo/Zshy+61qocGKa3tZS8gnHvvVqenf79FkiXDBM=";
+    hash = "sha256-FYLfOR5gm9lg1F8RGyDN6MkFAcaxWIdIxd/IDBVUMUQ=";
   };
 
   postConfigure = ''

pkgs/by-name/qu/quickemu/package.nix

@@ -5,6 +5,7 @@
   makeWrapper,
   gitUpdater,
   cdrtools,
+  coreutils,
   curl,
   gawk,
   mesa-demos,
@@ -32,6 +33,7 @@
 let
   runtimePaths = [
     cdrtools
+    coreutils
     curl
     gawk
     gnugrep

pkgs/by-name/ra/raffi/package.nix

@@ -3,32 +3,58 @@
   fetchFromGitHub,
   rustPlatform,
   makeBinaryWrapper,
+  pkg-config,
   fuzzel,
+  wayland,
+  libxkbcommon,
+  writableTmpDirAsHomeHook,
   additionalPrograms ? [ ],
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "raffi";
-  version = "0.12.0";
+  version = "0.20.0";
 
   src = fetchFromGitHub {
     owner = "chmouel";
     repo = "raffi";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-v+Y+x9DCxMDn8qtUmsq9c4Zbc5sG7mLX9Y1ZKgXcPEI=";
+    hash = "sha256-WAYSHQIQRd37xTpOs4EhK0V4wcBLWIRP7KvA7XjIZ0g=";
   };
 
-  cargoHash = "sha256-uXZ3OWLGrYUzS5eailvMvWpr2eadvG/bIs2ZdO1WCSo=";
+  cargoHash = "sha256-VPgMavPK6HGKICmGgPIM1YDvsRJrdndfbetAOqMAQ0M=";
 
   nativeBuildInputs = [
     makeBinaryWrapper
+    pkg-config
+    writableTmpDirAsHomeHook
   ];
 
-  checkFlags = [ "--skip=tests::test_read_config_from_reader" ];
+  buildInputs = [
+    wayland
+    libxkbcommon
+  ];
+
+  preCheck = ''
+    # Several tests use `firefox` in their config fixtures. The test parses configs
+    # via `read_config_from_reader` which validates that referenced binaries exist
+    # in PATH, filtering out entries with missing binaries. Provide a stub so these
+    # tests can run in the sandbox.
+    mkdir -p "$TMPDIR/fake-bin"
+    touch "$TMPDIR/fake-bin/firefox"
+    chmod +x "$TMPDIR/fake-bin/firefox"
+    export PATH="$TMPDIR/fake-bin:$PATH"
+  '';
 
   postFixup = ''
     wrapProgram $out/bin/raffi \
-      --prefix PATH : ${lib.makeBinPath ([ fuzzel ] ++ additionalPrograms)}
+      --prefix PATH : ${lib.makeBinPath ([ fuzzel ] ++ additionalPrograms)} \
+      --prefix LD_LIBRARY_PATH : ${
+        lib.makeLibraryPath [
+          wayland
+          libxkbcommon
+        ]
+      }
   '';
 
   meta = {
@@ -36,7 +62,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
     homepage = "https://github.com/chmouel/raffi";
     changelog = "https://github.com/chmouel/raffi/releases/tag/v${finalAttrs.version}";
     license = with lib.licenses; [ asl20 ];
-    maintainers = with lib.maintainers; [ aos ];
+    maintainers = with lib.maintainers; [
+      aos
+      chmouel
+      vdemeester
+    ];
     mainProgram = "raffi";
     platforms = lib.platforms.linux;
   };

pkgs/by-name/we/wechat-uos/sources.nix

@@ -1,17 +1,17 @@
 # Generated by ./update.sh - do not update manually!
-# Last updated: 2025-11-04
+# Last updated: 2026-04-01
 {
-  version = "4.1.0.12";
+  version = "4.1.1.4";
   x86_64-linux = {
-    url = "https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.tencent.wechat/com.tencent.wechat_4.1.0.12_amd64.deb";
-    hash = "sha256-qnu7ZPJ/xSuF8QV87y3MNkpf8FIfFR8OuPzpE2pn0LA=";
+    url = "https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.tencent.wechat/com.tencent.wechat_4.1.1.4_amd64.deb";
+    hash = "sha256-kizJow0voh21LSq6HIuSsI/oijDRT98c8Fu1gg+N/tc=";
   };
   aarch64-linux = {
-    url = "https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.tencent.wechat/com.tencent.wechat_4.1.0.12_arm64.deb";
-    hash = "sha256-+XEVzVBlKZoPfTWgHjjKDLvzkGsH2Ul8m64H9Y1u7bE=";
+    url = "https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.tencent.wechat/com.tencent.wechat_4.1.1.4_arm64.deb";
+    hash = "sha256-UKo7s1WyX6vJaobXZ8r7tuu6jFNtvi4+BWGSkPmTeBs=";
   };
   loongarch64-linux = {
-    url = "https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.tencent.wechat/com.tencent.wechat_4.1.0.12_loongarch64.deb";
-    hash = "sha256-A+k/xfwWwMaDR8FT02b+TZSKn9HL6b5WC/Jkaeu6mTc=";
+    url = "https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.tencent.wechat/com.tencent.wechat_4.1.1.4_loongarch64.deb";
+    hash = "sha256-kG1BwPD4yu+ZGi8me/l5ePUbw9SxX4jJ3Zy11MCMiSs=";
   };
 }

pkgs/by-name/wl/wleave/package.nix

@@ -19,16 +19,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "wleave";
-  version = "0.6.2";
+  version = "0.7.1";
 
   src = fetchFromGitHub {
     owner = "AMNatty";
     repo = "wleave";
     rev = finalAttrs.version;
-    hash = "sha256-+0EKnaxRaHRxRvhASuvfpUijEZJFimR4zSzOyC3FOkQ=";
+    hash = "sha256-AiZVa8+nCrxgi6E54Aa6+At+6JUZkwESpe5v72S8HyA=";
   };
 
-  cargoHash = "sha256-MRVWiQNzETFbWeKwYeoXSUY9gncRCsYdPEZhpOKcTvA=";
+  cargoHash = "sha256-tBjL1l9YH0P6effTYES9urYdKtUh/H3hCI5hUphb9tQ=";
 
   nativeBuildInputs = [
     installShellFiles
@@ -59,16 +59,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
     install -Dm644 -t "$out/etc/wleave" {"style.css","layout.json"}
     install -Dm644 -t "$out/share/wleave/icons" icons/*
 
-    for f in man/*.scd; do
-      local page="man/$(basename "$f" .scd)"
-      scdoc < "$f" > "$page"
-      installManPage "$page"
-    done
-
-    installShellCompletion --cmd wleave \
-      --bash <(cat completions/wleave.bash) \
-      --fish <(cat completions/wleave.fish) \
-      --zsh <(cat completions/_wleave)
+    # Man pages are currently broken due to upstream scdoc syntax errors.
+    # Disable generation until upstream fixes them.
   '';
 
   passthru.updateScript = nix-update-script { };

pkgs/top-level/aliases.nix

@@ -415,6 +415,7 @@ mapAliases {
   bwidget = throw "'bwidget' has been renamed to/replaced by 'tclPackages.bwidget'"; # Converted to throw 2025-10-27
   bzrtp = throw "'bzrtp' has been moved to 'linphonePackages.bzrtp'"; # Added 2025-09-20
   c0 = throw "'c0' has been removed due to being broken for more than a year; see RFC 180"; # Added 2026-02-05
+  caido = warnAlias "'caido' has been split into 'caido-cli' and 'caido-desktop'." caido-desktop; # Added 2026-03-03
   calculix = throw "'calculix' has been renamed to/replaced by 'calculix-ccx'"; # Converted to throw 2025-10-27
   calligra = throw "'calligra' has been renamed to/replaced by 'kdePackages.calligra'"; # Converted to throw 2025-10-27
   callPackage_i686 = throw "'callPackage_i686' has been renamed to/replaced by 'pkgsi686Linux.callPackage'"; # Converted to throw 2025-10-27