nixpkgs: 0-unstable-2025-03-22 -> 0-unstable-2025-03-24

hosts/common/programs/fftest.nix

@@ -1,12 +1,29 @@
 # fftest can test the haptics/vibrator on a phone:
 # - `fftest /dev/input/by-path/platform-vibrator-event`
 { pkgs, ... }:
+let
+  # fftestOnly = pkgs.linkIntoOwnPackage linuxConsoleTools [
+  #   "bin/fftest"
+  #   "share/man/man1/fftest.1.gz"
+  # ];
+  #
+  # XXX(2025-03-24): upstream `linuxConsoleTools` depends on SDL, which doesn't cross compile.
+  # but `fftest` component doesn't use SDL, so if we build only that then it can cross compile:
+  fftestOnly = pkgs.linuxConsoleTools.overrideAttrs (upstream: {
+    buildInputs = [ ];  #< disable SDL
+    buildFlags = (upstream.buildFlags or []) ++ [
+      "-C" "utils" "fftest"
+    ];
+
+    installPhase = ''
+      install -Dm755 utils/fftest $out/bin/fftest
+      install -Dm644 docs/fftest.1 $out/share/man/man1/fftest.1
+    '';
+  });
+in
 {
   sane.programs.fftest = {
-    packageUnwrapped = pkgs.linkIntoOwnPackage pkgs.linuxConsoleTools [
-      "bin/fftest"
-      "share/man/man1/fftest.1.gz"
-    ];
+    packageUnwrapped = fftestOnly;
     sandbox.autodetectCliPaths = "existing";
   };
 }

overlays/cross.nix

@@ -269,6 +269,8 @@ in with final; {
     cargo = crossCargo;  #< fixes openssl not being able to find its library
   };
 
+  # extra-cmake-modules = buildPackages.extra-cmake-modules;
+
   # 2025/01/25: upstreaming is unblocked
   # firejail = prev.firejail.overrideAttrs (upstream: {
   #   # firejail executes its build outputs to produce the default filter list.
@@ -756,6 +758,16 @@ in with final; {
   #   });
   # });
 
+
+  # 2025/03/24: xcb-imdkit is only needed on x11.
+  # it breaks because of a dependency on extra-cmake-modules, which pulls in conflicting `qtsvg`.
+  # path to upstreaming is to remove extra-cmake-modules' dependency on qtsvg.
+  # it's only there because of `wrapQtAppsHook`, which is a noop when building extra-cmake-modules,
+  # but the qt5 nixpkgs stuff is a dumpster fire so have fun with that...
+  rofi-unwrapped = prev.rofi-unwrapped.override {
+    xcb-imdkit = null;
+  };
+
   # 2024/05/31: upstreaming is unblocked; requires some changes, as configure tries to invoke our `python`
   # implemented (broken) on servo cross-staging-2023-07-30 branch
   # rpm = prev.rpm.overrideAttrs (upstream: {

pkgs/by-name/nixpkgs-bootstrap/master.nix

@@ -8,8 +8,8 @@
   mkNixpkgs ? import ./mkNixpkgs.nix {},
 }:
 mkNixpkgs {
-  rev = "50acc73b63ecc76682b592c0c5db6c3fcd56135f";
-  sha256 = "sha256-JBvv3ZieBEcnwog+chK1dQq/byBP7JaMXPzzQ3vsuYk=";
-  version = "0-unstable-2025-03-22";
+  rev = "badeba75aa01faa7c323beecd4557c840480add6";
+  sha256 = "sha256-MGRa2w0ejQCcF4IMR6Mpvgu1lh8XjHF+Po0DO1kLtWo=";
+  version = "0-unstable-2025-03-24";
   branch = "master";
 }

pkgs/by-name/nixpkgs-bootstrap/staging-next.nix

@@ -2,8 +2,8 @@
   mkNixpkgs ? import ./mkNixpkgs.nix {},
 }:
 mkNixpkgs {
-  rev = "a05324373598c6562f2fb69a8613837a0d1eb074";
-  sha256 = "sha256-aHAfur5/P1NLqhKjCf3WlFqgk2wj1yaUi7wIag81Qls=";
-  version = "0-unstable-2025-03-22";
+  rev = "e28407cd08645e26cd42e37b941d52256478bd6e";
+  sha256 = "sha256-1bkBfGKoqIMwhl6dfujLOYldKSw9xcFy4Z+rot+SdIs=";
+  version = "0-unstable-2025-03-24";
   branch = "staging-next";
 }

pkgs/by-name/nixpkgs-bootstrap/staging.nix

@@ -2,8 +2,8 @@
   mkNixpkgs ? import ./mkNixpkgs.nix {},
 }:
 mkNixpkgs {
-  rev = "c060400edc4cb0f2dcfc241cfd0ee4f9d0df55ed";
-  sha256 = "sha256-qAXU4o8syarZKZuVnROED9/pJ8lQIiO1x+OGwx/ktow=";
-  version = "0-unstable-2025-03-22";
+  rev = "b4d0fe2499f4f31c5a71e704488ad43d6bbe82f1";
+  sha256 = "sha256-59ZaYqpMFzoYuJyhQitDafbHzLknkoIG6gi1O6CaN6U=";
+  version = "0-unstable-2025-03-24";
   branch = "staging";
 }