diff options
| author | Mark Nipper <nipsy@bitgnome.net> | 2026-03-02 11:07:49 -0800 |
|---|---|---|
| committer | Mark Nipper <nipsy@bitgnome.net> | 2026-03-02 11:07:49 -0800 |
| commit | bccad6e5e7e4c670b16f1093210b9b74470d9a4c (patch) | |
| tree | 0b0a300c3f7549570f0320cbcc1429dd3be54f09 | |
| parent | 2c94d0f7cb53212ae2606a756fc96bf258e33382 (diff) | |
| download | nix-bccad6e5e7e4c670b16f1093210b9b74470d9a4c.tar nix-bccad6e5e7e4c670b16f1093210b9b74470d9a4c.tar.gz nix-bccad6e5e7e4c670b16f1093210b9b74470d9a4c.tar.bz2 nix-bccad6e5e7e4c670b16f1093210b9b74470d9a4c.tar.lz nix-bccad6e5e7e4c670b16f1093210b9b74470d9a4c.tar.xz nix-bccad6e5e7e4c670b16f1093210b9b74470d9a4c.tar.zst nix-bccad6e5e7e4c670b16f1093210b9b74470d9a4c.zip | |
| -rw-r--r-- | flake.nix | 4 | ||||
| -rw-r--r-- | hosts/caladan/default.nix | 3 | ||||
| -rw-r--r-- | overlays/default.nix | 12 |
3 files changed, 9 insertions, 10 deletions
@@ -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; + # }; + #}; } |