From 2f7f9b768625616ef3afb4eeca2576368d3b2680 Mon Sep 17 00:00:00 2001 From: "quentin@aristote.fr" Date: Sun, 9 Jun 2024 14:50:17 +0200 Subject: update nixos to 24.05 --- flake.lock | 50 ++++++++++++++++++++++---------------------------- flake.nix | 57 +++++++++++++++++++++++++++++++-------------------------- 2 files changed, 53 insertions(+), 54 deletions(-) diff --git a/flake.lock b/flake.lock index a4a13e8..48512fe 100644 --- a/flake.lock +++ b/flake.lock @@ -137,11 +137,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1701473968, - "narHash": "sha256-YcVE5emp1qQ8ieHUnxt1wCZCC3ZfAS+SRRWZ2TMda7E=", + "lastModified": 1714641030, + "narHash": "sha256-yzcRNDoyVP7+SCNX0wmuDju1NUCt8Dz9+lyUXEI0dbI=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5", + "rev": "e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e", "type": "github" }, "original": { @@ -415,11 +415,11 @@ "nur": "nur" }, "locked": { - "lastModified": 1714234394, - "narHash": "sha256-PgX/T0TMFaWGctWRyZ7uEnT3nPiNpzZTd3IF3uxbvxU=", + "lastModified": 1717864550, + "narHash": "sha256-J1TY7ikiD/a7TS32pyEymkBL4ig85KcncK+lZJkAhg8=", "owner": "qaristote", "repo": "my-nixpkgs", - "rev": "32d87db8e2ab85b6a08964d5490952a00c904edb", + "rev": "47fa8979557e642d81bb87089b2f667b7d4eada0", "type": "github" }, "original": { @@ -549,11 +549,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1702938738, - "narHash": "sha256-O7Vb0xC9s4Dmgxj8APEpuuMj7HsLgPbpy1UKvNVJp7o=", + "lastModified": 1714656196, + "narHash": "sha256-kjQkA98lMcsom6Gbhw8SYzmwrSo+2nruiTcTZp5jK7o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dd8e82f3b4017b8faa52c2b1897a38d53c3c26cb", + "rev": "94035b482d181af0a0f8f77823a790b256b7c3cc", "type": "github" }, "original": { @@ -563,20 +563,14 @@ }, "nixpkgs-lib": { "locked": { - "dir": "lib", - "lastModified": 1701253981, - "narHash": "sha256-ztaDIyZ7HrTAfEEUt9AtTDNoCYxUdSd6NrRHaYOIxtk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "e92039b55bcd58469325ded85d4f58dd5a4eaf58", - "type": "github" + "lastModified": 1714640452, + "narHash": "sha256-QBx10+k6JWz6u7VsohfSw8g8hjdBZEf8CFzXH1/1Z94=", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/50eb7ecf4cd0a5756d7275c8ba36790e5bd53e33.tar.gz" }, "original": { - "dir": "lib", - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/50eb7ecf4cd0a5756d7275c8ba36790e5bd53e33.tar.gz" } }, "nixpkgs-lib_2": { @@ -749,16 +743,16 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1714230522, - "narHash": "sha256-RODqrJQ9QqNnJe6floeUM5cbz4fh3BBqCEegA+4zm0M=", + "lastModified": 1717796960, + "narHash": "sha256-BKjQ9tQdsuoROrojHZb7KTAv95WprqCkNFvuzatfEo0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "485480127ad7df42fb0d82bc56efcdd33f37f350", + "rev": "8e0a5f16b7bf7f212be068dd302c49888c6ad68f", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.11-small", + "ref": "nixos-24.05-small", "repo": "nixpkgs", "type": "github" } @@ -855,11 +849,11 @@ }, "nur": { "locked": { - "lastModified": 1703076631, - "narHash": "sha256-4QnntZP+6xaCkKGvSg57mRN3RtCzdR2i67C7R3AXld8=", + "lastModified": 1714736743, + "narHash": "sha256-DPXEeLRIHazWyMYVXmhvJlfSAV0aF9nc9y6k4vthx8U=", "owner": "nix-community", "repo": "NUR", - "rev": "1367f14eadcb8a4fa6d15f773ff05f9dbd6065eb", + "rev": "5f91bfaba4e2a2a2fdcce3b711b76b9aed14cbde", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index c425870..5572eba 100644 --- a/flake.nix +++ b/flake.nix @@ -5,34 +5,39 @@ inputs.nixpkgs.follows = "/nixpkgs"; }; my-nixpkgs.url = "github:qaristote/my-nixpkgs"; - nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11-small"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05-small"; }; - outputs = - { self, nixpkgs, my-nixpkgs, personal-webpage, ... }: { - nixosConfigurations = let - system = "x86_64-linux"; - commonModules = [ - my-nixpkgs.nixosModules.personal - ({ ... }: { - nixpkgs.overlays = [ - (self: _: { personal = { inherit (personal-webpage.packages."${self.system}") webpage; };}) - # TODO the order shouldn't matter, yet this overlay doesn't work - # if it comes first - my-nixpkgs.overlays.personal - ]; - }) - ]; - in { - hermes = nixpkgs.lib.nixosSystem { - inherit system; - modules = commonModules - ++ [ ./config ./config/hardware-configuration.nix ]; - }; - hermes-test = nixpkgs.lib.nixosSystem { - inherit system; - modules = commonModules ++ [ ./tests/configuration.nix ]; - }; + outputs = { + nixpkgs, + my-nixpkgs, + personal-webpage, + ... + }: { + nixosConfigurations = let + system = "x86_64-linux"; + commonModules = [ + my-nixpkgs.nixosModules.personal + ({...}: { + nixpkgs.overlays = [ + (self: _: {personal = {inherit (personal-webpage.packages."${self.system}") webpage;};}) + # TODO the order shouldn't matter, yet this overlay doesn't work + # if it comes first + my-nixpkgs.overlays.personal + ]; + }) + ]; + in { + hermes = nixpkgs.lib.nixosSystem { + inherit system; + modules = + commonModules + ++ [./config ./config/hardware-configuration.nix]; + }; + hermes-test = nixpkgs.lib.nixosSystem { + inherit system; + modules = commonModules ++ [./tests/configuration.nix]; }; }; + }; } -- cgit v1.2.3