diff options
| author | Mark Nipper <nipsy@bitgnome.net> | 2024-12-11 22:48:38 -0800 |
|---|---|---|
| committer | Mark Nipper <nipsy@bitgnome.net> | 2024-12-11 22:48:38 -0800 |
| commit | 25829652b496bb4c1bfaa282c57b234316418a6d (patch) | |
| tree | 1c6682234022bc7a690602a3afee14546fa5a653 | |
| parent | f223a2d4db73bde986289fc356f1e02ddcba8580 (diff) | |
| download | nix-25829652b496bb4c1bfaa282c57b234316418a6d.tar nix-25829652b496bb4c1bfaa282c57b234316418a6d.tar.gz nix-25829652b496bb4c1bfaa282c57b234316418a6d.tar.bz2 nix-25829652b496bb4c1bfaa282c57b234316418a6d.tar.lz nix-25829652b496bb4c1bfaa282c57b234316418a6d.tar.xz nix-25829652b496bb4c1bfaa282c57b234316418a6d.tar.zst nix-25829652b496bb4c1bfaa282c57b234316418a6d.zip | |
Switch to ZFS 2.2.7 @darkstar
| -rw-r--r-- | flake.nix | 4 | ||||
| -rw-r--r-- | hosts/darkstar/default.nix | 4 | ||||
| -rw-r--r-- | overlays/default.nix | 12 |
3 files changed, 10 insertions, 10 deletions
@@ -21,7 +21,7 @@ nixos-hardware.url = "github:nixos/nixos-hardware"; # per https://nixos-and-flakes.thiscute.world/nixos-with-flakes/downgrade-or-upgrade-packages - nixpkgs-67e692392.url = "github:nixos/nixpkgs/67e69239226f37168d1adb8d29bd61150756a03e"; + #nixpkgs-67e692392.url = "github:nixos/nixpkgs/67e69239226f37168d1adb8d29bd61150756a03e"; nixpkgs-master.url = "github:nixos/nixpkgs"; #nixpkgs-pr363651.url = "github:SuperSandro2000/nixpkgs/openstack-socks"; nixpkgs-stable.url = "github:nixos/nixpkgs/release-24.05"; @@ -39,7 +39,7 @@ }; - outputs = { disko, home-manager-stable, home-manager, nixos-hardware, nixpkgs-67e692392, nixpkgs-master, nixpkgs-stable, nixpkgs, nvidia-patch, self, sops-nix, ... } @ inputs: let + outputs = { disko, home-manager-stable, home-manager, nixos-hardware, nixpkgs-master, nixpkgs-stable, nixpkgs, nvidia-patch, self, sops-nix, ... } @ inputs: let inherit (self) outputs; systems = [ #"aarch64-linux" diff --git a/hosts/darkstar/default.nix b/hosts/darkstar/default.nix index 324a2c8..494db0b 100644 --- a/hosts/darkstar/default.nix +++ b/hosts/darkstar/default.nix @@ -4,7 +4,7 @@ kernel.sysctl = { "net.ipv4.ip_forward" = true; }; - kernelPackages = pkgs."67e692392".linuxPackages_6_10; + kernelPackages = pkgs.master.linuxPackages_6_12; loader = { efi = { canTouchEfiVariables = true; @@ -19,6 +19,7 @@ timeout = 3; }; supportedFilesystems = [ "zfs" ]; + zfs.package = pkgs.master.zfs; }; #environment.systemPackages = with pkgs; [ @@ -87,7 +88,6 @@ overlays = [ outputs.overlays.additions outputs.overlays.modifications - outputs.overlays."67e692392-packages" outputs.overlays.master-packages outputs.overlays.stable-packages ]; diff --git a/overlays/default.nix b/overlays/default.nix index f243c62..e6b5988 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -22,12 +22,12 @@ # }); }; - "67e692392-packages" = final: _prev: { - "67e692392" = import inputs.nixpkgs-67e692392 { - inherit (final) system; - config.allowUnfree = true; - }; - }; + #"67e692392-packages" = final: _prev: { + # "67e692392" = import inputs.nixpkgs-67e692392 { + # inherit (final) system; + # config.allowUnfree = true; + # }; + #}; # When applied, the master nixpkgs set (declared in the flake inputs) will # be accessible through 'pkgs.master' |