From e8c7ffdfe80b83f54e1bee2120ed7ac8e9d308f4 Mon Sep 17 00:00:00 2001 From: tdro Date: Sat, 24 Feb 2024 18:33:47 -0500 Subject: shell: Park at hugo version 0.122.0 Increase shell build ergonomics --- content/default/messages/quickstart.md | 2 +- shell.nix | 10 ++++++---- themes/default/layouts/shortcodes/version.html | 6 +++--- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/content/default/messages/quickstart.md b/content/default/messages/quickstart.md index 14903be..99e33d3 100644 --- a/content/default/messages/quickstart.md +++ b/content/default/messages/quickstart.md @@ -11,7 +11,7 @@ GIT CLONE. {{% version clone=true %}} -EXECUTE HUGO TWICE. HUGO VERSION >= {{% version hugo=true %}} +EXECUTE HUGO TWICE. HUGO VERSION >= {{% version hugo=true %}} AND < 0.123.0 ```shell cd canory diff --git a/shell.nix b/shell.nix index f7c9419..d56214d 100644 --- a/shell.nix +++ b/shell.nix @@ -2,23 +2,25 @@ let name = "nix-shell.canory"; + system = builtins.currentSystem; + pkgs = import (builtins.fetchTarball { url = "https://releases.nixos.org/nixos/unstable/nixos-23.11pre516114.d680ded26da5/nixexprs.tar.xz"; sha256 = "13cnlhpp3v7jay4jxyyy2d4kxw4ngpz3m00rhj3vlhvf7jl7hr48"; - }) { system = "x86_64-linux"; }; + }) { inherit system; }; hugo = pkgs.callPackage ({ lib, buildGoModule, fetchgit }: buildGoModule rec { pname = "hugo"; - version = "0.121.1"; + version = "0.122.0"; src = fetchgit { rev = "v${version}"; url = "https://github.com/gohugoio/hugo.git"; - sha256 = "sha256-XNOp0k2t5Tv4HKKz3ZqL/sAdiYedOACaZ/1T7t7/Q1A="; + sha256 = "sha256-pnsQo+nSuIlQ6KKTP1z/BZ74zEu9HjYP66hGStPc0pc="; }; doCheck = false; proxyVendor = true; - vendorSha256 = "sha256-J/me67pC+YWjGIQP6q1c+vsSXFxXoLZV7AyDv3+606k="; + vendorSha256 = "sha256-aYy0TOfNIqx44UBXJhewvxi+oSAWjmi/32WvI3HJ3MM="; tags = [ "extended" ]; subPackages = [ "." ]; meta = { diff --git a/themes/default/layouts/shortcodes/version.html b/themes/default/layouts/shortcodes/version.html index 98cac8a..2e3eda8 100644 --- a/themes/default/layouts/shortcodes/version.html +++ b/themes/default/layouts/shortcodes/version.html @@ -1,4 +1,4 @@ -{{- $theme := "0.11.12" -}} +{{- $version := "0.11.12" -}} {{- $generator := "0.110.0" -}} {{- $number := default false (.Get "number" | default (.Get 0)) -}} @@ -6,7 +6,7 @@ {{- $hugo := default false (.Get "hugo" | default (.Get 2)) -}} {{- if $number -}} - {{ $theme }} + {{ $version }} {{- end -}} {{- if $hugo -}} @@ -15,6 +15,6 @@ {{- if $clone -}} ```shell -git clone --branch {{ $theme }} https://www.thedroneely.com/git/thedroneely/canory +git clone --branch {{ $version }} https://www.thedroneely.com/git/thedroneely/canory ``` {{- end -}} -- cgit v1.2.3