nixpkgs-bootstrap: 0-unstable-2024-10-30 -> 0-unstable-2024-11-07

hosts/common/programs/gnome-maps.nix

@@ -20,11 +20,6 @@
 {
   sane.programs.gnome-maps = {
     packageUnwrapped = pkgs.rmDbusServicesInPlace (pkgs.gnome-maps.overrideAttrs (base: {
-      # default .desktop file is trying to do some dbus launch (?) which fails even *if* i install `gapplication` (glib.bin)
-      postPatch = (base.postPatch or "") + ''
-        substituteInPlace data/org.gnome.Maps.desktop.in.in \
-          --replace-fail 'Exec=gapplication launch @app-id@' 'Exec=gnome-maps'
-      '';
       # TODO: set up portal-based location services, but until that works, explicitly disable portals here.
       preFixup = (base.preFixup or "") + ''
         gappsWrapperArgs+=(

pkgs/by-name/curlftpfs-sane/package.nix

@@ -1,21 +1,9 @@
 {
-  curl,
   curlftpfs,
-  fetchpatch,
   fetchFromGitea,
   fuse3,
 }:
 (curlftpfs.override {
-  curl = curl.overrideAttrs (base: {
-    patches = (base.patches or []) ++ [
-      (fetchpatch {
-        # fix regression in curl 8.8.0 -> 8.9.0 which broke curlftpfs
-        url = "https://github.com/curl/curl/pull/14629.diff";
-        name = "setopt: allow CURLOPT_INTERFACE to be set to NULL";
-        hash = "sha256-cpiw0izhFY74y8xa7KEoQOtD79GBIfrm1hU3sLrObJg=";
-      })
-    ];
-  });
   fuse = fuse3;
 }).overrideAttrs (upstream: {
   # my (master branch) fork includes:

pkgs/by-name/libfuse-sane/package.nix

@@ -15,11 +15,11 @@ let
     # wrap so that it looks for mount helpers in /run/current-system/sw/bin,
     # and furthermore so that those mount helpers inherit the sandboxed wrappers in /run/current-system/sw/bin
     postInstall = (upstream.postInstall or "") + ''
-      wrapProgram $out/sbin/mount.fuse3 \
+      wrapProgram $bin/sbin/mount.fuse3 \
         --suffix PATH : /run/current-system/sw/bin
     '';
     postFixup = (upstream.postFixup or "") + ''
-      ln -s $out/bin/mount.fuse3 $out/bin/mount.fuse3.sane
+      ln -s $bin/bin/mount.fuse3 $bin/bin/mount.fuse3.sane
       moveToOutput bin/mount.fuse3.sane "$sane"
     '';
     meta = (upstream.meta or {}) // {

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

@@ -2,8 +2,8 @@
   mkNixpkgs ? import ./mkNixpkgs.nix {}
 }:
 mkNixpkgs {
-  rev = "72bc35e74bc68177f92740d941cc62111c1df051";
+  rev = "8f3c3f6a0355fa4793b686a3975b56cd7f88d8aa";
-  sha256 = "sha256-bz8XFlUYIQhyn2dMS7dBMGvqXDWcNn2qaOLcSkzSjSE=";
+  sha256 = "sha256-2yAMEkupi1x/FLH70/2h5KV/MOeuEKcR6UV5f0J683o=";
-  version = "0-unstable-2024-10-30";
+  version = "0-unstable-2024-11-07";
   branch = "master";
 }

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

@@ -40,10 +40,10 @@ in
   # })
 
   (fetchpatch' {
-    # 2024-10-14: servo matrix-appservice-irc build-fix
+    # merged into *staging* 2024/11/06
-    name = "Upgrade matrix-sdk-crypto-nodejs and reverse-deps to fix build with new rust version";
+    name = "gssdp: fix cross compilation";
-    prUrl = "https://github.com/NixOS/nixpkgs/pull/348448";
+    prUrl = "https://github.com/NixOS/nixpkgs/pull/353433";
-    hash = "sha256-QbnEJe//b5WOGyMXKS1mMcLSRp2kjWa3q89/q7E4y4g=";
+    hash = "sha256-KcntclyvkV8leyZEKkASdF1I2YKGv9Xlr8seL0TDtnQ=";
   })
 
   (fetchpatch' {
@@ -74,13 +74,6 @@ in
     hash = "sha256-xkT86fa0KNBE00gtIa0qqXVV6cU7SJ9X/dxPPrik+Ps=";
   })
 
-  (fetchpatch' {
-    name = "libjxl: build plugins/loaders unconditionally";
-    prUrl = "https://github.com/NixOS/nixpkgs/pull/345306";
-    saneCommit = "14dedbaa92dce20c6e342e1e763821da9381c68d";
-    hash = "sha256-4RbeIEpKLmZECGkpsWNkqwE28vfNjW/lV3S7bIilg0k=";
-  })
-
   (fetchpatch' {
     name = "libpeas2: fix cross compilation";
     prUrl = "https://github.com/NixOS/nixpkgs/pull/345305";
@@ -110,11 +103,11 @@ in
     hash = "sha256-+7iAefzfYzAHO+f+q5JROejGjCujnwhvt8ItkU562DA=";
   })
 
-  (fetchpatch' {
+  # (fetchpatch' {
-    name = "unl0kr: 2.0.0 -> 3.2.0";
+  #   name = "unl0kr: 2.0.0 -> 3.2.0";
-    prUrl = "https://github.com/NixOS/nixpkgs/pull/319126";
+  #   prUrl = "https://github.com/NixOS/nixpkgs/pull/319126";
-    hash = "sha256-frSOcOQs6n+++w95DWz92H8SVwrs8ZJyJ1KHwOQ6ql8=";
+  #   hash = "sha256-frSOcOQs6n+++w95DWz92H8SVwrs8ZJyJ1KHwOQ6ql8=";
-  })
+  # })
 
   (fetchpatch' {
     name = "nixos/networkmanager: split ModemManager bits into own module";