diff --git a/flake.lock b/flake.lock index cc0520e1..0e545fa8 100644 --- a/flake.lock +++ b/flake.lock @@ -1,21 +1,5 @@ { "nodes": { - "edge-nixpkgs": { - "locked": { - "lastModified": 1712122226, - "narHash": "sha256-pmgwKs8Thu1WETMqCrWUm0CkN1nmCKX3b51+EXsAZyY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "08b9151ed40350725eb40b1fe96b0b86304a654b", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "flake-utils": { "inputs": { "systems": "systems" @@ -36,23 +20,22 @@ }, "nixpkgs": { "locked": { - "lastModified": 1711668574, - "narHash": "sha256-u1dfs0ASQIEr1icTVrsKwg2xToIpn7ZXxW3RHfHxshg=", + "lastModified": 1719956923, + "narHash": "sha256-nNJHJ9kfPdzYsCOlHOnbiiyKjZUW5sWbwx3cakg3/C4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "219951b495fc2eac67b1456824cc1ec1fd2ee659", + "rev": "706eef542dec88cc0ed25b9075d3037564b2d164", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.11", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } }, "root": { "inputs": { - "edge-nixpkgs": "edge-nixpkgs", "flake-utils": "flake-utils", "nixpkgs": "nixpkgs" } diff --git a/flake.nix b/flake.nix index 6d161061..7a64b139 100644 --- a/flake.nix +++ b/flake.nix @@ -1,16 +1,14 @@ { inputs = { # How to update the revision: `nix flake update --commit-lock-file` - nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11"; - edge-nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; flake-utils.url = "github:numtide/flake-utils"; }; - outputs = { self, nixpkgs, edge-nixpkgs, flake-utils }: + outputs = { self, nixpkgs, flake-utils }: flake-utils.lib.eachDefaultSystem (system: let pkgs = nixpkgs.legacyPackages.${system}; - edge-pkgs = edge-nixpkgs.legacyPackages.${system}; in { devShells.default = with pkgs; @@ -30,10 +28,10 @@ nixpkgs-fmt vim - edge-pkgs.dprint + dprint - edge-pkgs.hugo - edge-pkgs.go_1_22 + hugo + go_1_22 dart-sass ]; }; @@ -45,8 +43,8 @@ { name = "hugo-with-dependencies"; runtimeInputs = [ - edge-pkgs.hugo - edge-pkgs.go_1_22 + hugo + go_1_22 dart-sass ]; text = ''