From bccad6e5e7e4c670b16f1093210b9b74470d9a4c Mon Sep 17 00:00:00 2001
From: Mark Nipper <nipsy@bitgnome.net>
Date: Mon, 2 Mar 2026 11:07:49 -0800
Subject: Remove staging branch

---
 flake.nix                 |  4 ++--
 hosts/caladan/default.nix |  3 +--
 overlays/default.nix      | 12 ++++++------
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/flake.nix b/flake.nix
index eb3936f..fed1213 100644
--- a/flake.nix
+++ b/flake.nix
@@ -27,7 +27,7 @@
     # persistent base NixOS URLs
     nixpkgs-master.url = "github:NixOS/nixpkgs";
     nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-25.11";
-    nixpkgs-staging.url = "github:NixOS/nixpkgs/staging-nixos";
+    #nixpkgs-staging.url = "github:NixOS/nixpkgs/staging-nixos";
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
 
     # per https://nixos-and-flakes.thiscute.world/nixos-with-flakes/downgrade-or-upgrade-packages
@@ -57,7 +57,7 @@
     nixpkgs-master,
     #nixpkgs-pr495610,
     nixpkgs-stable,
-    nixpkgs-staging,
+    #nixpkgs-staging,
     #nixpkgs-wine9_22,
     nixpkgs,
     nvidia-patch,
diff --git a/hosts/caladan/default.nix b/hosts/caladan/default.nix
index 6065ef3..5f812e5 100644
--- a/hosts/caladan/default.nix
+++ b/hosts/caladan/default.nix
@@ -50,7 +50,6 @@
     #pkgs.moc
     pkgs.ncftp
     pkgs.nethack
-    pkgs.staging.nixos-rebuild-ng
     pkgs.openttd
     pkgs.piper
     #pkgs.qbittorrent-nox
@@ -143,7 +142,7 @@
       #outputs.overlays.my-nixpkgs-packages
       #outputs.overlays.pr495610-packages
       outputs.overlays.stable-packages
-      outputs.overlays.staging-packages
+      #outputs.overlays.staging-packages
       #outputs.overlays.wine9_22-packages
     ];
   };
diff --git a/overlays/default.nix b/overlays/default.nix
index d8aabb0..287012e 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -110,10 +110,10 @@
 
   # When applied, the staging nixpkgs set (declared in the flake inputs) will
   # be accessible through 'pkgs.staging'
-  staging-packages = final: _prev: {
-    staging = import inputs.nixpkgs-staging {
-      inherit (final) system;
-      config.allowUnfree = true;
-    };
-  };
+  #staging-packages = final: _prev: {
+  #  staging = import inputs.nixpkgs-staging {
+  #    inherit (final) system;
+  #    config.allowUnfree = true;
+  #  };
+  #};
 }
-- 
cgit v1.2.3