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 /flake.nix | |
| 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 'flake.nix')
| -rw-r--r-- | flake.nix | 33 |
1 files changed, 10 insertions, 23 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 { |