[NOT FOR MOBY DEPLOY] nixpkgs: 2025-07-06 -> 2025-07-16

moby has broken sound output (kernel ASoC log errors), and GUI is unresponsive

hosts/by-name/servo/services/email/dovecot.nix

@@ -143,5 +143,5 @@
     '';
   };
 
-  systemd.services.dovecot2.serviceConfig.RestartSec = lib.mkForce "15s";  # nixos defaults this to 1s
+  systemd.services.dovecot.serviceConfig.RestartSec = lib.mkForce "15s";  # nixos defaults this to 1s
 }

hosts/common/programs/assorted.nix

@@ -360,7 +360,7 @@ in
       # "tdesktop"  # broken on phosh
       # "tokodon"
       "tuba"  # mastodon/pleroma client (stores pw in keyring)
-      "v4l-utils"  # for `media-ctl`; to debug cameras: <https://wiki.postmarketos.org/wiki/PINE64_PinePhone_(pine64-pinephone)#Cameras>
+      # "v4l-utils"  # for `media-ctl`; to debug cameras: <https://wiki.postmarketos.org/wiki/PINE64_PinePhone_(pine64-pinephone)#Cameras> (2025/07/16: disabled because broken cross build)
       "video-trimmer"
       "vulkan-tools"  # vulkaninfo
       # "whalebird"  # pleroma client (Electron). input is broken on phosh.

hosts/common/programs/mimeo/default.nix

@@ -61,13 +61,6 @@ in
         })
       ];
 
-      # upstream mimeo doesn't run preInstall/postInstall hooks, but we need that for the .desktop file
-      installPhase = ''
-        runHook preInstall
-        ${upstream.installPhase}
-        runHook postInstall
-      '';
-
       passthru = (upstream.passthru or {}) // {
         inherit mimeo-open-desktop;
       };

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

@@ -14,8 +14,8 @@
   mkNixpkgs ? import ./mkNixpkgs.nix {},
 }:
 mkNixpkgs {
-  rev = "bd1b503584438365b59c8c36c337001ac6886cf3";
+  rev = "c3ec3a7cf333dbbb6ca8c3afc58f6ddca63255b9";
-  sha256 = "sha256-Hp+fAJx0N3Bc5RQqTQGiZvCf6D6LgoXqxSheQS6/tdg=";
+  sha256 = "sha256-To2KEQAiExBEtm1yrVwf4LAahiktD7/bhskG0ey7TAs=";
-  version = "unstable-2025-07-06";
+  version = "unstable-2025-07-16";
   branch = "master";
 }

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

@@ -38,13 +38,28 @@ in
   })
 
   (fetchpatch' {
-    # 2025-06-22: merged into staging
+    # 2025-07-13: merged into staging
-    name = "perl540: fix cross compilation";
+    # fixes cross compilation
-    # saneCommit = "fb694775923041a4e5b6f40b2d2ee88b1749c82b";
+    name = "tinysparql: add patch making the dbus optional";
-    prUrl = "https://github.com/NixOS/nixpkgs/pull/418640";
+    prUrl = "https://github.com/NixOS/nixpkgs/pull/424119";
-    hash = "sha256-8qbR7RMcKuo5bNZbddh8oDu1HBUBSPC0vOly8bdY5/k=";
+    hash = "sha256-D425Swpd2LLuR9TuedoO/lsPKpHS/kXWybKEyQL1iwY=";
   })
 
+  (fetchpatch' {
+    # 2025-07-15: merged into master
+    name = "gimp: fix build with gettext 0.25";
+    prUrl = "https://github.com/NixOS/nixpkgs/pull/425710";
+    hash = "sha256-E1ibtfCVyBldawqSi8YdfQpxPLhcMp/SpvCpTixhUaI=";
+  })
+
+  # (fetchpatch' {
+  #   # 2025-06-22: merged into staging
+  #   name = "perl540: fix cross compilation";
+  #   # saneCommit = "fb694775923041a4e5b6f40b2d2ee88b1749c82b";
+  #   prUrl = "https://github.com/NixOS/nixpkgs/pull/418640";
+  #   hash = "sha256-8qbR7RMcKuo5bNZbddh8oDu1HBUBSPC0vOly8bdY5/k=";
+  # })
+
   # (fetchpatch' {
   #   # 2025-06-23: merged into staging
   #   # out for PR: <https://github.com/NixOS/nixpkgs/pull/418644>
@@ -54,12 +69,13 @@ in
   #   hash = "sha256-M7shgRayQj/S0K6AMwED1BYS0T7wc/fFYfN5OxddVA0=";
   # })
 
-  (fetchpatch' {
+  # (fetchpatch' {
-    name = "sdl3: fix cross compilation";
+  #   # 2025-06-24: merged into staging
-    # saneCommit = "7047d2272f3877f5f2aeeb42d4b7421e4e3e52a6";
+  #   name = "sdl3: fix cross compilation";
-    prUrl = "https://github.com/NixOS/nixpkgs/pull/418646";
+  #   # saneCommit = "7047d2272f3877f5f2aeeb42d4b7421e4e3e52a6";
-    hash = "sha256-Px9gHer6dnsEG3Ln5CzmHnnjya71IcFJv1aET7jtBBM=";
+  #   prUrl = "https://github.com/NixOS/nixpkgs/pull/418646";
-  })
+  #   hash = "sha256-Px9gHer6dnsEG3Ln5CzmHnnjya71IcFJv1aET7jtBBM=";
+  # })
 
   (fetchpatch' {
     name = "zelda64recomp: init at 1.2.0";
@@ -67,13 +83,15 @@ in
     hash = "sha256-p8PTaGfBxz1s3UhY2QGbfGfHTzZTlC/20XKpyWoi3T0=";
   })
 
-  (fetchpatch' {
+  # (fetchpatch' {
-    name = "openssh: fix compilation to static hosts";
+  #   # 2025-06-29: merged into staging
-    prUrl = "https://github.com/NixOS/nixpkgs/pull/420469";
+  #   name = "openssh: fix compilation to static hosts";
-    hash = "sha256-G9oUnE7dUmNQRu8kJSlEkgyVuQMgCGBRd6TYSCzifzg=";
+  #   prUrl = "https://github.com/NixOS/nixpkgs/pull/420469";
-  })
+  #   hash = "sha256-G9oUnE7dUmNQRu8kJSlEkgyVuQMgCGBRd6TYSCzifzg=";
+  # })
 
   (fetchpatch' {
+    # 2025-07-15: merged into staging
     name = "treewide: populate arch and platform for more node packages";
     prUrl = "https://github.com/NixOS/nixpkgs/pull/422938";
     hash = "sha256-lN99K0k9dCUBFXc99XB97cZSVDu5A74pHL40vw9cobY=";

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

@@ -2,8 +2,8 @@
   mkNixpkgs ? import ./mkNixpkgs.nix {},
 }:
 mkNixpkgs {
-  rev = "b6e14a059a3a40865c6ec336008636cfac266bc8";
+  rev = "a8600a4994584dfece2a620cb6e4a1397563905b";
-  sha256 = "sha256-Ity96H4lr3QGqMbSFCx28aUIjW+QHHr7ny6oM7FAE8o=";
+  sha256 = "sha256-cpgm/kfc4rbzBPXw31H3czeN70QD61FJ73xxXBTPMN8=";
-  version = "unstable-2025-07-06";
+  version = "unstable-2025-07-16";
   branch = "staging-next";
 }

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

@@ -2,8 +2,8 @@
   mkNixpkgs ? import ./mkNixpkgs.nix {},
 }:
 mkNixpkgs {
-  rev = "1cb33f7c217a03be5c4f73a4ff2d1f44f0fb1120";
+  rev = "04d7b948baa0c6778f44a48ef55f36424d1baaf0";
-  sha256 = "sha256-CbJM7bp3GpeDxBUbgbLo6EABu+uP/PtCYWy4x9VchkE=";
+  sha256 = "sha256-o4jxORiJW+UNE//pS4zbe4F9LEyt9z2/HzxJStuY9Ls=";
-  version = "unstable-2025-07-06";
+  version = "unstable-2025-07-16";
   branch = "staging";
 }

pkgs/by-name/sane-scripts/src/sane-stop-all-servo

@@ -3,7 +3,7 @@
 systemctl stop \
   bitcoind-mainnet \
   coturn \
-  dovecot2 \
+  dovecot \
   duplicity \
   duplicity.timer \
   dyn-dns \