diff --git a/.github/workflows/generate_site_and_deploy.yaml b/.github/workflows/generate_site_and_deploy.yaml index 74f0547d..a95bf242 100644 --- a/.github/workflows/generate_site_and_deploy.yaml +++ b/.github/workflows/generate_site_and_deploy.yaml @@ -29,7 +29,7 @@ jobs: runs-on: ubuntu-latest env: # Keep same version with `make deps` - HUGO_VERSION: 0.122.0 + HUGO_VERSION: 0.124.1 steps: - name: Install Hugo CLI run: | diff --git a/flake.lock b/flake.lock index 0ba47c35..cc0520e1 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,21 @@ { "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" @@ -20,22 +36,23 @@ }, "nixpkgs": { "locked": { - "lastModified": 1707863367, - "narHash": "sha256-LdBbCSSP7VHaHA4KXcPGKqkvsowT2+7W4jlEHJj6rPg=", + "lastModified": 1711668574, + "narHash": "sha256-u1dfs0ASQIEr1icTVrsKwg2xToIpn7ZXxW3RHfHxshg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "35ff7e87ee05199a8003f438ec11a174bcbd98ea", + "rev": "219951b495fc2eac67b1456824cc1ec1fd2ee659", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixos-23.11", "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 fe4dbf69..8862b2a3 100644 --- a/flake.nix +++ b/flake.nix @@ -1,14 +1,16 @@ { inputs = { # How to update the revision: `nix flake update --commit-lock-file` - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11"; + edge-nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; flake-utils.url = "github:numtide/flake-utils"; }; - outputs = { self, nixpkgs, flake-utils }: + outputs = { self, nixpkgs, edge-nixpkgs, flake-utils }: flake-utils.lib.eachDefaultSystem (system: let pkgs = nixpkgs.legacyPackages.${system}; + edge-pkgs = edge-nixpkgs.legacyPackages.${system}; in { devShells.default = with pkgs; @@ -17,19 +19,20 @@ # https://github.com/NixOS/nix/issues/730#issuecomment-162323824 bashInteractive - hugo - go_1_22 gnumake coreutils peco - typos - dprint yamlfmt + typos imagemagick actionlint nil nixpkgs-fmt vim + + edge-pkgs.hugo + edge-pkgs.go_1_22 + edge-pkgs.dprint ]; }; });