diff options
| -rw-r--r-- | flake.nix | 4 | ||||
| -rw-r--r-- | hosts/arrakis/default.nix | 1 | ||||
| -rw-r--r-- | hosts/common/core/default.nix | 2 | ||||
| -rw-r--r-- | hosts/common/optional/services/dhcp.nix | 4 | ||||
| -rw-r--r-- | hosts/darkstar/default.nix | 1 | ||||
| -rw-r--r-- | overlays/default.nix | 12 |
6 files changed, 11 insertions, 13 deletions
@@ -27,7 +27,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-pr369712.url = "github:7c6f434c/nixpkgs/fix-tftp-hpa"; + #nixpkgs-pr369712.url = "github:7c6f434c/nixpkgs/fix-tftp-hpa"; nixpkgs-stable.url = "github:nixos/nixpkgs/release-24.05"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; @@ -49,7 +49,7 @@ home-manager, nixos-hardware, nixpkgs-master, - nixpkgs-pr369712, + #nixpkgs-pr369712, nixpkgs-stable, nixpkgs, nvidia-patch, diff --git a/hosts/arrakis/default.nix b/hosts/arrakis/default.nix index a45f2b3..3387191 100644 --- a/hosts/arrakis/default.nix +++ b/hosts/arrakis/default.nix @@ -229,7 +229,6 @@ outputs.overlays.additions outputs.overlays.modifications outputs.overlays.master-packages - outputs.overlays.pr369712-packages outputs.overlays.stable-packages ]; }; diff --git a/hosts/common/core/default.nix b/hosts/common/core/default.nix index e6439a6..ed293a7 100644 --- a/hosts/common/core/default.nix +++ b/hosts/common/core/default.nix @@ -82,7 +82,7 @@ strace sysstat tcpdump - pr369712.tftp-hpa + master.tftp-hpa traceroute tree tshark diff --git a/hosts/common/optional/services/dhcp.nix b/hosts/common/optional/services/dhcp.nix index 700d4ce..cc21ef9 100644 --- a/hosts/common/optional/services/dhcp.nix +++ b/hosts/common/optional/services/dhcp.nix @@ -9,7 +9,7 @@ systemPackages = with pkgs; [ ipxe - pr369712.tftp-hpa + master.tftp-hpa master.wol ]; }; @@ -123,7 +123,7 @@ Restart = "always"; RestartSec = 5; Type = "exec"; - ExecStart = "${pkgs.pr369712.tftp-hpa}/bin/in.tftpd -l -a 192.168.1.1:69 -P /run/tftpd.pid /etc/tftp"; + ExecStart = "${pkgs.master.tftp-hpa}/bin/in.tftpd -l -a 192.168.1.1:69 -P /run/tftpd.pid /etc/tftp"; TimeoutStopSec = 20; PIDFile = "/run/tftpd.pid"; }; diff --git a/hosts/darkstar/default.nix b/hosts/darkstar/default.nix index fcae6ba..b53a7d7 100644 --- a/hosts/darkstar/default.nix +++ b/hosts/darkstar/default.nix @@ -89,7 +89,6 @@ outputs.overlays.additions outputs.overlays.modifications outputs.overlays.master-packages - outputs.overlays.pr369712-packages outputs.overlays.stable-packages ]; }; diff --git a/overlays/default.nix b/overlays/default.nix index ff0e836..01287a5 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -39,12 +39,12 @@ }; }; - pr369712-packages = final: _prev: { - pr369712 = import inputs.nixpkgs-pr369712 { - inherit (final) system; - config.allowUnfree = true; - }; - }; + #pr369712-packages = final: _prev: { + # pr369712 = import inputs.nixpkgs-pr369712 { + # inherit (final) system; + # config.allowUnfree = true; + # }; + #}; # When applied, the stable nixpkgs set (declared in the flake inputs) will # be accessible through 'pkgs.stable' |