nixpkgs: 0-unstable-2025-01-18 -> 0-unstable-2025-01-19

this includes a staging -> master merge, yay

hosts/common/programs/sway/default.nix

@@ -3,6 +3,19 @@
 # docs: https://nixos.wiki/wiki/Sway
 # sway-config docs: `man 5 sway`
 let
+  pkgs' = pkgs // {
+    # sway/wlroots release **less than once per year**.
+    # i use the `nixpkgs-wayland` version (which is akin to running tip) instead of the stable version from nixpkgs
+    # because then when things go wrong i have an actual shot at bisecting.
+    # this has been useful as recently as 2024/08 when sway/wlroots updates straight up don't render output:
+    # <https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/4715#note_2523517>
+    #
+    # TODO(2025-01-19): nixpkgs-wayland.sway-unwrapped DOES NOT BUILD; re-enable this once it does.
+    # inherit (pkgs.nixpkgs-wayland)
+    #   sway-unwrapped
+    #   wlroots
+    # ;
+  };
   cfg = config.sane.programs.sway;
   enableXWayland = config.sane.programs.xwayland.enabled;
   wrapSway = configuredSway: let
@@ -32,7 +45,7 @@ let
       passthru.sway-unwrapped = configuredSway;
     };
 
-  wlroots = (pkgs.nixpkgs-wayland.wlroots.override {
+  wlroots = (pkgs'.wlroots.override {
     # wlroots seems to launch Xwayland itself, and i can't easily just do that myself externally.
     # so in order for the Xwayland it launches to be sandboxed, i need to patch the sandboxed version in here.
     xwayland = config.sane.programs.xwayland.package;
@@ -64,12 +77,7 @@ let
     '';
   });
   swayPackage = wrapSway (
-    # sway/wlroots release **less than once per year**.
+    (pkgs'.sway-unwrapped.override {
-    # i use the `nixpkgs-wayland` version (which is akin to running tip) instead of the stable version from nixpkgs
-    # because then when things go wrong i have an actual shot at bisecting.
-    # this has been useful as recently as 2024/08 when sway/wlroots updates straight up don't render output:
-    # <https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/4715#note_2523517>
-    (pkgs.nixpkgs-wayland.sway-unwrapped.override {
       inherit wlroots;
       # about xwayland:
       # - required by many electron apps, though some electron apps support NIXOS_OZONE_WL=1 for native wayland.

overlays/cross.nix

@@ -888,6 +888,12 @@ in with final; {
     '';
   });
 
+  # 2025/01/19: upstreaming is unblocked
+  tree-sitter = prev.tree-sitter.overrideAttrs (upstream: {
+    # shell completions were enabled, but aren't cross-compatible: <https://github.com/nixos/nixpkgs/pull/368976>
+    postInstall = lib.replaceStrings [ "installShellCompletion" ] [ "true || installShellCompletion" ] upstream.postInstall;
+  });
+
   # fixes: "ar: command not found"
   # `ar` is provided by bintools
   # 2024/05/31: upstreaming is blocked on gnustep-base cross compilation

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

@@ -8,8 +8,8 @@
   mkNixpkgs ? import ./mkNixpkgs.nix {}
 }:
 mkNixpkgs {
-  rev = "77538077358d989c679cfb96c0d7774884e6d3ad";
+  rev = "edc63aabe4605bc459eabb95ff567b73e518ecd0";
-  sha256 = "sha256-kGTjTJDMHurVesjcdEYyNntTSkpzWtraPlO1LLLd6c0=";
+  sha256 = "sha256-M7xydS3m3a7KWlcptBjeymwB9S3M/FRIXgBT7Xbnf5c=";
-  version = "0-unstable-2025-01-18";
+  version = "0-unstable-2025-01-19";
   branch = "master";
 }

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

@@ -31,21 +31,6 @@ in
 [
   ./2024-10-01-python-cross-resource-usage.patch
 
-  (fetchpatch' {
-    # merged into staging 2024-12-13
-    name = "python312Packages.contourpy: fix cross compilation";
-    prUrl = "https://github.com/NixOS/nixpkgs/pull/328218";
-    saneCommit = "74a003b0af9820f6f7c6c62b3d2bec6df3a8d7b8";
-    hash = "sha256-+7iAefzfYzAHO+f+q5JROejGjCujnwhvt8ItkU562DA=";
-  })
-
-  (fetchpatch' {
-    # merged into staging 2024-12-28
-    name = "python3Packages.meson-python: honor mesonFlagsArray";
-    saneCommit = "38681f9dbd65e92bc4c3f49f0ce9c7b15dcbe9ea";
-    hash = "sha256-YzS6eX6sPbEx3CzAGaz8alz/s8O5JjkXtg+/Wk7ndZ0=";
-  })
-
   # (fetchpatch' {
   #   # 2024-12-26: required to build ollama (with AMD acceleration)
   #   name = "rocm-6: bump packages to 6.3.1 and add missing packages";
@@ -67,12 +52,6 @@ in
     hash = "sha256-/51SnUExwsqSSwgR3dxUozDAMf5wHoMIT7+NDpIdYNI=";
   })
 
-  (fetchpatch' {
-    name = "gnome-settings-daemon: fix cross compilation";
-    prUrl = "https://github.com/NixOS/nixpkgs/pull/373666";
-    hash = "sha256-Mdyw34MhFiscGUYYcPhOoQBrXDzAvPiWp3/OuB7kB30=";
-  })
-
   (fetchpatch' {
     # patch should be safe to remove; keeping it here to track the upstreaming status
     name = "nixos/gitea: don't configure the database if `createDatabase == false`";

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

@@ -2,8 +2,8 @@
   mkNixpkgs ? import ./mkNixpkgs.nix {}
 }:
 mkNixpkgs {
-  rev = "c12baeb6ca57d5b195de97db0b2c73c8580f5091";
+  rev = "cb92d2dad2f0881c58c05197a55299e6cc11d427";
-  sha256 = "sha256-ZakBk2ouWA0qW3aoC2H94fTDGFPN39rMe8a8eNhKN0o=";
+  sha256 = "sha256-T6hdIUwmJ2ND5pEEETOwSvWqQG+kesCbn27i9HOWX6I=";
-  version = "0-unstable-2025-01-18";
+  version = "0-unstable-2025-01-19";
   branch = "staging";
 }