nixpkgs: 0-unstable-2024-08-21 -> 0-unstable-2024-08-25

hosts/common/programs/assorted.nix

@@ -232,7 +232,7 @@ in
     gameApps = declPackageSet [
       "animatch"
       "gnome-2048"
-      "gnome.hitori"  # like sudoku
+      "hitori"  # like sudoku
     ];
 
     pcGameApps = declPackageSet [
@@ -291,14 +291,13 @@ in
       "geary"  # adaptive e-mail client; uses webkitgtk 4.1
       "gnome-calculator"
       "gnome-calendar"
-      "gnome.gnome-clocks"
+      "gnome-clocks"
-      "gnome.gnome-maps"
       # "gnome-podcasts"
       # "gnome.gnome-system-monitor"
       # "gnome.gnome-terminal"  # works on phosh
-      "gnome.gnome-weather"
-      # "seahorse"  # keyring/secret manager
       "gnome-frog"  # OCR/QR decoder
+      "gnome-maps"
+      "gnome-weather"
       "gpodder"
       # "gst-device-monitor"  # for debugging audio/video
       # "gthumb"
@@ -317,7 +316,7 @@ in
       "pavucontrol"
       "pwvucontrol"  # pipewire version of pavu
       # "picard"  # music tagging
-      # "libsForQt5.plasmatube"  # Youtube player
+      # "seahorse"  # keyring/secret manager
       "signal-desktop"
       # "snapshot"  # camera app
       # "spot"  # Gnome Spotify client
@@ -695,9 +694,9 @@ in
     # 1. no number may appear unshaded more than once in the same row/column
     # 2. no two shaded tiles can be direct N/S/E/W neighbors
     # - win once (1) and (2) are satisfied
-    "gnome.hitori".buildCost = 1;
+    hitori.buildCost = 1;
-    "gnome.hitori".sandbox.method = "bwrap";
+    hitori.sandbox.method = "bwrap";
-    "gnome.hitori".sandbox.whitelistWayland = true;
+    hitori.sandbox.whitelistWayland = true;
 
     gnugrep.sandbox.method = "bwrap";
     gnugrep.sandbox.autodetectCliPaths = "existing";

hosts/common/programs/gnome-clocks.nix

@@ -1,6 +1,6 @@
 { pkgs, ... }: {
-  sane.programs."gnome.gnome-clocks" = {
+  sane.programs.gnome-clocks = {
-    packageUnwrapped = pkgs.gnome.gnome-clocks.overrideAttrs (upstream: {
+    packageUnwrapped = pkgs.gnome-clocks.overrideAttrs (upstream: {
       # TODO: upstream this
       buildInputs = upstream.buildInputs ++ (with pkgs; [
         # gnome-clocks needs `playbin` (gst-plugins-base) and `scaletempo` (gst-plugins-good)

hosts/common/programs/gnome-maps.nix

@@ -18,8 +18,8 @@
 #   even temporarily enabling the portal for OSM doesn't work *after* the portal has been disabled -- because then gnome-maps can't access its passwords (?)
 { pkgs, ... }:
 {
-  sane.programs."gnome.gnome-maps" = {
+  sane.programs.gnome-maps = {
-    packageUnwrapped = pkgs.rmDbusServicesInPlace (pkgs.gnome.gnome-maps.overrideAttrs (base: {
+    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 \

hosts/common/programs/gnome-weather.nix

@@ -2,7 +2,7 @@
 # cache dir is just for weather data (or maybe a http cache)
 { ... }:
 {
-  sane.programs."gnome.gnome-weather" = {
+  sane.programs.gnome-weather = {
     buildCost = 1;
 
     sandbox.method = "bwrap";

overlays/cross.nix

@@ -439,16 +439,25 @@ in with final; {
     '';
   });
 
+  gnome-maps = prev.gnome-maps.overrideAttrs (upstream: {
+    # 2024/08/12: upstreaming is blocked by libgweather (direct dependency)
+    postPatch = (upstream.postPatch or "") + ''
+      # fixes: "ERROR: Program 'gjs' not found or not executable"
+      substituteInPlace meson.build \
+        --replace-fail "find_program('gjs')" "find_program('${gjs}/bin/gjs')"
+    '';
+  });
+
+  # 2024/05/08: fix: "meson.build:85:11: ERROR: Dependency "dbus-1" not found, tried pkgconfig".
+  # 2024/08/12: upstreaming is unblocked
+  gnome-online-accounts = mvToBuildInputs [ dbus ] prev.gnome-online-accounts;
+
   # 2024/08/12: upstreaming is blocked on gnome-user-share (apache-httpd)
   # gnome-terminal = prev.gnome-terminal.overrideAttrs (orig: {
   #   # fixes "meson.build:343:0: ERROR: Dependency "libpcre2-8" not found, tried pkgconfig"
   #   buildInputs = orig.buildInputs ++ [ pcre2 ];
   # });
 
-  # 2024/05/08: fix: "meson.build:85:11: ERROR: Dependency "dbus-1" not found, tried pkgconfig".
-  # 2024/08/12: upstreaming is unblocked
-  gnome-online-accounts = mvToBuildInputs [ dbus ] prev.gnome-online-accounts;
-
   # 2024/08/12: upstreaming is blocked on apache-httpd (via mod_dnssd)
   # fixes: meson.build:111:6: ERROR: Program 'glib-compile-schemas' not found or not executable
   # gnome-user-share = addNativeInputs [ glib ] prev.gnome-user-share;
@@ -457,15 +466,6 @@ in with final; {
     # 2024/05/31: upstreaming is blocked by a LOT: qtbase, qtsvg, webp-pixbuf-loader, libgweather, gnome-color-manager, appstream, apache-httpd, ibus
     # fixes "subprojects/gvc/meson.build:30:0: ERROR: Program 'glib-mkenums mkenums' not found or not executable"
     # gnome-control-center = mvToNativeInputs [ glib ] super.gnome-control-center;
-
-    gnome-maps = super.gnome-maps.overrideAttrs (upstream: {
-      # 2024/08/12: upstreaming is blocked by libgweather (direct dependency)
-      postPatch = (upstream.postPatch or "") + ''
-        # fixes: "ERROR: Program 'gjs' not found or not executable"
-        substituteInPlace meson.build \
-          --replace-fail "find_program('gjs')" "find_program('${gjs}/bin/gjs')"
-      '';
-    });
     # 2024/08/12: upstreaming is blocked on ibus, libgweather
     # gnome-shell = super.gnome-shell.overrideAttrs (orig: {
     #   # fixes "meson.build:128:0: ERROR: Program 'gjs' not found or not executable"

pkgs/additional/nixpkgs/default.nix

@@ -27,12 +27,12 @@
 }:
 let
   lock = {
-    master.rev = "60fb1cbc700a87f368d3dcc08431d63fdb8f375a";
+    master.rev = "61d815a20bdb9fd827c379de088a345aa8adfc60";
-    master.sha256 = "sha256-AKus23PklBSlw+yp4c0t0eek0Gjd23ZfiPv1NJJBHGY=";
+    master.sha256 = "sha256-CyhuwWACUApIW7tq38FjddWdPhLHQXCXhhd/ivu4FeE=";
-    staging.rev = "60fb1cbc700a87f368d3dcc08431d63fdb8f375a";
+    staging.rev = "61d815a20bdb9fd827c379de088a345aa8adfc60";
-    staging.sha256 = "sha256-AKus23PklBSlw+yp4c0t0eek0Gjd23ZfiPv1NJJBHGY=";
+    staging.sha256 = "sha256-CyhuwWACUApIW7tq38FjddWdPhLHQXCXhhd/ivu4FeE=";
-    staging-next.rev = "60fb1cbc700a87f368d3dcc08431d63fdb8f375a";
+    staging-next.rev = "61d815a20bdb9fd827c379de088a345aa8adfc60";
-    staging-next.sha256 = "sha256-AKus23PklBSlw+yp4c0t0eek0Gjd23ZfiPv1NJJBHGY=";
+    staging-next.sha256 = "sha256-CyhuwWACUApIW7tq38FjddWdPhLHQXCXhhd/ivu4FeE=";
   };
   lock' = lock."${variant}";
   unpatchedSrc = fetchzip {
@@ -84,7 +84,7 @@ in
     src.overrideAttrs (base: {
       # attributes needed for update scripts
       pname = "nixpkgs";
-      version = "0-unstable-2024-08-21";
+      version = "0-unstable-2024-08-25";
       passthru = (base.passthru or {}) // nixpkgs // {
         src = unpatchedSrc // {
           inherit (lock') rev;

pkgs/additional/nixpkgs/list.nix

@@ -32,32 +32,20 @@ in
   #   hash = "sha256-fGuS46f9qSMRHvWZvTmcirKufIqlXHwwhckeK1RNejE=";
   # })
 
-  (fetchpatch' {
-    title = "librewolf-unwrapped: use nvidia explicit sync vendored patches";
-    prUrl = "https://github.com/NixOS/nixpkgs/pull/336304";
-    hash = "sha256-JkN7Yapfiz4FbxiCf/aPcnvaITXbZXGnTadBhVsAuFY=";
-  })
-
   (fetchpatch' {
     title = "nixos/pam: replace apparmor warnings with assertions";
     prUrl = "https://github.com/NixOS/nixpkgs/pull/332119";
-    saneCommit = "17e5fa9dc3c6d9f1fbfa2b23f6e1ae5c7e17bebd";
+    # saneCommit = "17e5fa9dc3c6d9f1fbfa2b23f6e1ae5c7e17bebd";
-    hash = "sha256-9UrJB/ijXL07H/SESquCCqI1boVoYpDcYqxD+Mx2Mwc=";
+    hash = "sha256-8aQ/kI5Gd78KqR1DmiXZpJMyeL2JLVW4ZAWkk8PbvEA=";
   })
 
   (fetchpatch' {
-    # TODO: send upstream: <https://github.com/uninsane/nixpkgs/pull/new/pr-flatpak-cross-2>
     title = "flatpak: fix cross compilation for 1.14.10";
+    prUrl = "https://github.com/NixOS/nixpkgs/pull/337412";
     saneCommit = "8359a34a1b944082ea1bd76fee61819e7b86e00e";
     hash = "sha256-OnWu15IgZREWOohUnF2uqHPQd920aEDJ7oBT4h5vpu4=";
   })
 
-  (fetchpatch' {
-    title = "hare-ev: 2024-07-11 -> 2024-08-06";
-    prUrl = "https://github.com/NixOS/nixpkgs/pull/333378";
-    hash = "sha256-3RnqId/Rk0A5YyvsixLvKyLFOiFuvlThKdT00D6hjWI=";
-  })
-
   # (fetchpatch' {
   #   # this causes a rebuild of systemd and everything above it:
   #   # PR against staging is live: <https://github.com/NixOS/nixpkgs/pull/332399>