From 164e9bb6eb2107af4522fc041ea9d975aa18863c Mon Sep 17 00:00:00 2001 From: Daylin Morgan Date: Fri, 3 May 2024 12:39:28 -0500 Subject: [PATCH] switch to nixVersions? --- flake.lock | 12 ++++++------ modules/nix.nix | 9 ++++----- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/flake.lock b/flake.lock index c3856d4..29b7c4c 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1714485953, - "narHash": "sha256-v6KYvjSdSPI0okx772Yuq7Pj23ng6kBzTI6uUD+M57Y=", + "lastModified": 1714602995, + "narHash": "sha256-nX91QLYrdUYiVsJ+I6FTD+HLYJXHyoRYiZr6Lho+/6k=", "owner": "daylinmorgan", "repo": "f1multiviewer-flake", - "rev": "0e2225d43eef6e28295554236d0ab079389f8485", + "rev": "b30f5eb20edc9cf260b8b1731454b6a479b91d33", "type": "github" }, "original": { @@ -489,11 +489,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1714314149, - "narHash": "sha256-yNAevSKF4krRWacmLUsLK7D7PlfuY3zF0lYnGYNi9vQ=", + "lastModified": 1714656196, + "narHash": "sha256-kjQkA98lMcsom6Gbhw8SYzmwrSo+2nruiTcTZp5jK7o=", "owner": "nixos", "repo": "nixpkgs", - "rev": "cf8cc1201be8bc71b7cbbbdaf349b22f4f99c7ae", + "rev": "94035b482d181af0a0f8f77823a790b256b7c3cc", "type": "github" }, "original": { diff --git a/modules/nix.nix b/modules/nix.nix index 6fbba68..47e1cd1 100644 --- a/modules/nix.nix +++ b/modules/nix.nix @@ -9,7 +9,7 @@ ]; nixpkgs.config.allowUnfree = true; - nix.package = pkgs.nixUnstable; + nix.package = pkgs.nixVersions.latest; nix.extraOptions = '' experimental-features = nix-command flakes ''; @@ -21,10 +21,9 @@ options = "--delete-older-than 7d"; }; - environment.systemPackages = with pkgs; [ - nixd - nixfmt-rfc-style - + environment.systemPackages = [ + pkgs.nixd + pkgs.nixfmt-rfc-style self.packages.${pkgs.system}.default inputs.pinix.packages.${pkgs.system}.default ];