diff options
| author | Mark Nipper <nipsy@bitgnome.net> | 2026-01-03 11:02:10 -0800 |
|---|---|---|
| committer | Mark Nipper <nipsy@bitgnome.net> | 2026-01-03 11:02:10 -0800 |
| commit | 7b3571e45b317eb90d237c8b6ff265bad3be0148 (patch) | |
| tree | 8417abdb0cfac04bc41ebadcd92cd1e3a030e280 | |
| parent | e54e303f08d8a9f6b00ecc67b2ff19ba0be1e4fd (diff) | |
| download | nix-7b3571e45b317eb90d237c8b6ff265bad3be0148.tar nix-7b3571e45b317eb90d237c8b6ff265bad3be0148.tar.gz nix-7b3571e45b317eb90d237c8b6ff265bad3be0148.tar.bz2 nix-7b3571e45b317eb90d237c8b6ff265bad3be0148.tar.lz nix-7b3571e45b317eb90d237c8b6ff265bad3be0148.tar.xz nix-7b3571e45b317eb90d237c8b6ff265bad3be0148.tar.zst nix-7b3571e45b317eb90d237c8b6ff265bad3be0148.zip | |
Revert PR 476197 changes and bump netcat-openbsd to master branch
Diffstat (limited to '')
| -rw-r--r-- | flake.nix | 33 | ||||
| -rw-r--r-- | hosts/caladan/default.nix | 2 | ||||
| -rw-r--r-- | hosts/common/core/default.nix | 2 | ||||
| -rw-r--r-- | overlays/default.nix | 14 |
4 files changed, 19 insertions, 32 deletions
@@ -28,7 +28,7 @@ #nixpkgs-67e692392.url = "github:nixos/nixpkgs/67e69239226f37168d1adb8d29bd61150756a03e"; #nixpkgs-wine9_22.url = "github:nixos/nixpkgs/dea5930f0ed8c29d3758d5ade9898b4e99d80b74"; nixpkgs-master.url = "github:nixos/nixpkgs"; - nixpkgs-pr476197.url = "github:Moraxyc/nixpkgs/fix-netcat-openbsd-gcc15"; + #nixpkgs-pr476197.url = "github:Moraxyc/nixpkgs/fix-netcat-openbsd-gcc15"; nixpkgs-stable.url = "github:nixos/nixpkgs/release-24.05"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; @@ -50,7 +50,7 @@ home-manager, nixos-hardware, nixpkgs-master, - nixpkgs-pr476197, + #nixpkgs-pr476197, nixpkgs-stable, #nixpkgs-wine9_22, nixpkgs, @@ -80,14 +80,6 @@ # ghostty.packages.x86_64-linux.default # ]; #} - #({ config, pkgs, ... }: - # let - # overlay-dict-pr367392 = final: prev: { - # dict = nixpkgs-pr367392.legacyPackages."x86_64-linux".dict; - # }; - # in { - # nixpkgs.overlays = [ overlay-dict-pr367392 ]; - #}) disko.nixosModules.disko ./hosts/arrakis home-manager.nixosModules.home-manager { @@ -102,19 +94,14 @@ caladan = nixpkgs.lib.nixosSystem { specialArgs = { inherit inputs outputs; }; modules = [ - #{ - # environment.systemPackages = [ - # ghostty.packages.x86_64-linux.default - # ]; - #} - ({ config, pkgs, ... }: - let - overlay-netcat-openbsd-pr476197 = final: prev: { - netcat-openbsd = nixpkgs-pr476197.legacyPackages."x86_64-linux".netcat-openbsd; - }; - in { - nixpkgs.overlays = [ overlay-netcat-openbsd-pr476197 ]; - }) + #({ config, pkgs, ... }: + # let + # overlay-netcat-openbsd-pr476197 = final: prev: { + # netcat-openbsd = nixpkgs-pr476197.legacyPackages."x86_64-linux".netcat-openbsd; + # }; + # in { + # nixpkgs.overlays = [ overlay-netcat-openbsd-pr476197 ]; + #}) disko.nixosModules.disko ./hosts/caladan home-manager.nixosModules.home-manager { diff --git a/hosts/caladan/default.nix b/hosts/caladan/default.nix index 949db8d..01d9261 100644 --- a/hosts/caladan/default.nix +++ b/hosts/caladan/default.nix @@ -133,7 +133,7 @@ outputs.overlays.additions outputs.overlays.modifications outputs.overlays.master-packages - outputs.overlays.pr476197-packages + #outputs.overlays.pr476197-packages outputs.overlays.stable-packages #outputs.overlays.wine9_22-packages ]; diff --git a/hosts/common/core/default.nix b/hosts/common/core/default.nix index eeaf526..1acc9b9 100644 --- a/hosts/common/core/default.nix +++ b/hosts/common/core/default.nix @@ -53,7 +53,7 @@ pkgs.moreutils pkgs.nano pkgs.ncurses - pkgs.netcat-openbsd + pkgs.master.netcat-openbsd pkgs.nettools pkgs.nix-index pkgs.nmap diff --git a/overlays/default.nix b/overlays/default.nix index 1f97c9d..7b49088 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -6,7 +6,7 @@ # outputs.overlays.modifications # outputs.overlays."67e692392-packages" # outputs.overlays.master-packages -# outputs.overlays.pr369712-packages +# outputs.overlays.pr476197-packages # outputs.overlays.stable-packages # outputs.overlays.wine9_22-packages # ] @@ -65,12 +65,12 @@ }; }; - pr476197-packages = final: _prev: { - pr476197 = import inputs.nixpkgs-pr476197 { - inherit (final) system; - config.allowUnfree = true; - }; - }; + #pr476197-packages = final: _prev: { + # pr476197 = import inputs.nixpkgs-pr476197 { + # inherit (final) system; + # config.allowUnfree = true; + # }; + #}; # When applied, the stable nixpkgs set (declared in the flake inputs) will # be accessible through 'pkgs.stable' |