From cbac1e5c7bc70010b79c029817e5d08b9335043c Mon Sep 17 00:00:00 2001 From: Mark Nipper Date: Tue, 10 Dec 2024 10:25:44 -0800 Subject: Remove PR input --- flake.nix | 4 ++-- hosts/richese/default.nix | 3 +-- overlays/default.nix | 12 ++++++------ 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/flake.nix b/flake.nix index 95e6374..7b5c173 100644 --- a/flake.nix +++ b/flake.nix @@ -23,7 +23,7 @@ # per https://nixos-and-flakes.thiscute.world/nixos-with-flakes/downgrade-or-upgrade-packages nixpkgs-67e692392.url = "github:nixos/nixpkgs/67e69239226f37168d1adb8d29bd61150756a03e"; nixpkgs-master.url = "github:nixos/nixpkgs"; - nixpkgs-pr363651.url = "github:SuperSandro2000/nixpkgs/openstack-socks"; + #nixpkgs-pr363651.url = "github:SuperSandro2000/nixpkgs/openstack-socks"; nixpkgs-stable.url = "github:nixos/nixpkgs/release-24.05"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; @@ -39,7 +39,7 @@ }; - outputs = { disko, home-manager-stable, home-manager, nixos-hardware, nixpkgs-67e692392, nixpkgs-master, nixpkgs-pr363651, nixpkgs-stable, nixpkgs, nvidia-patch, self, sops-nix, ... } @ inputs: let + outputs = { disko, home-manager-stable, home-manager, nixos-hardware, nixpkgs-67e692392, nixpkgs-master, nixpkgs-stable, nixpkgs, nvidia-patch, self, sops-nix, ... } @ inputs: let inherit (self) outputs; systems = [ #"aarch64-linux" diff --git a/hosts/richese/default.nix b/hosts/richese/default.nix index 7b7d15d..d612b07 100644 --- a/hosts/richese/default.nix +++ b/hosts/richese/default.nix @@ -9,7 +9,7 @@ environment.systemPackages = with pkgs; [ git-review - pr363651.openstackclient-full + openstackclient-full ]; imports = [ @@ -41,7 +41,6 @@ outputs.overlays.additions outputs.overlays.modifications outputs.overlays.master-packages - outputs.overlays.pr363651-packages outputs.overlays.stable-packages ]; }; diff --git a/overlays/default.nix b/overlays/default.nix index 18b3d48..f243c62 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -38,12 +38,12 @@ }; }; - pr363651-packages = final: _prev: { - pr363651 = import inputs.nixpkgs-pr363651 { - inherit (final) system; - config.allowUnfree = true; - }; - }; + #pr363651-packages = final: _prev: { + # pr363651 = import inputs.nixpkgs-pr363651 { + # inherit (final) system; + # config.allowUnfree = true; + # }; + #}; # When applied, the stable nixpkgs set (declared in the flake inputs) will # be accessible through 'pkgs.stable' -- cgit v1.2.3