From e2d72f9e54e0125605fa9c41338e8b6c35cb7dff Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Tue, 24 Oct 2023 17:01:08 +0000
Subject: [PATCH] cross: snapper: push patches upstream

---
 nixpatches/list.nix |  5 +++++
 overlays/cross.nix  | 20 ++++++++++----------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/nixpatches/list.nix b/nixpatches/list.nix
index a11e90d5..9eae069a 100644
--- a/nixpatches/list.nix
+++ b/nixpatches/list.nix
@@ -52,6 +52,11 @@ in [
     prUrl = "https://github.com/NixOS/nixpkgs/pull/263182";
     hash = "sha256-Wau+PB+EUQDvWX8Kycw1sNrM3GkPVjKSS4niIDI0sjM=";
   })
+  (fetchpatch' {
+    title = "snapper: remove runtime references to build packages";
+    prUrl = "https://github.com/NixOS/nixpkgs/pull/263187";
+    hash = "sha256-+NJtox6BsoQwpO6DxehrA4l/eWf/vgGN7EopCt4ZIFk=";
+  })
   (fetchpatch' {
     title = "trust-dns: 0.23.0 -> 0.24.0";
     prUrl = "https://github.com/NixOS/nixpkgs/pull/263054";
diff --git a/overlays/cross.nix b/overlays/cross.nix
index 0b6a6916..fdb7a747 100644
--- a/overlays/cross.nix
+++ b/overlays/cross.nix
@@ -1800,16 +1800,16 @@ in {
   #   inherit (emulated) stdenv;
   # };
 
-  # 2023/10/23: upstreaming is unblocked
-  snapper = prev.snapper.overrideAttrs (upstream: {
-    # replace references to build diff/rm to runtime diff/rm
-    # also reduces closure 305628736 -> 262698112
-    configureFlags = (upstream.configureFlags or []) ++ [
-      "DIFFBIN=${final.diffutils}/bin/diff"
-      "RMBIN=${final.coreutils}/bin/rm"
-    ];
-    # strictDeps = true;  #< doesn't actually prevent original symptom
-  });
+  # 2023/10/23: upstreaming: <https://github.com/NixOS/nixpkgs/pull/263187>
+  # snapper = prev.snapper.overrideAttrs (upstream: {
+  #   # replace references to build diff/rm to runtime diff/rm
+  #   # also reduces closure 305628736 -> 262698112
+  #   configureFlags = (upstream.configureFlags or []) ++ [
+  #     "DIFFBIN=${final.diffutils}/bin/diff"
+  #     "RMBIN=${final.coreutils}/bin/rm"
+  #   ];
+  #   # strictDeps = true;  #< doesn't actually prevent original symptom
+  # });
 
   spandsp = prev.spandsp.overrideAttrs (upstream: {
     configureFlags = upstream.configureFlags or [] ++ [