From d6d5bcd7ad26e61b1d909d8905eab090f34a4411 Mon Sep 17 00:00:00 2001
From: tdro <tdro@noreply.example.com>
Date: Tue, 21 Jun 2022 19:15:23 -0400
Subject: shell.nix: Update to Go 1.18, Hugo 0.101.0

Bring derivation directly into shell, and try version
0.101.0 of hugo.
---
 shell.nix | 46 +++++++++++++++++++++++++++++++++++++---------
 1 file changed, 37 insertions(+), 9 deletions(-)

(limited to 'shell.nix')

diff --git a/shell.nix b/shell.nix
index 0a7990a..8af39b1 100644
--- a/shell.nix
+++ b/shell.nix
@@ -3,25 +3,53 @@ let
   name = "nix-shell.canory";
 
   pkgs = import (builtins.fetchTarball {
-    url = "https://releases.nixos.org/nixos/21.11/nixos-21.11.336020.2128d0aa28e/nixexprs.tar.xz";
-    sha256 = "0w8plbxms0di6gnh0k2yhj0pgxzxas7g5x0m01zjzixf16i2bapj";
+    url = "https://releases.nixos.org/nixos/22.05/nixos-22.05.998.d17a56d90ec/nixexprs.tar.xz";
+    sha256 = "084dzb7fmchfhhflrgprjjv7qz3j7vxw3d01f82q8p4g1x7hzn36";
   }) { };
 
-  hugo = pkgs.callPackage (builtins.fetchurl {
-    url = "https://raw.githubusercontent.com/tdro/dotfiles/73b1c675285e67c623f2c4514602500c6f2cfab7/.config/nixpkgs/packages/hugo/default.nix";
-    sha256 = "07jk987zh7kxynjj21038j0qnd996bl949x1wm3g1iggjz0shgb4";
-  }) { };
-
-  validatornu = pkgs.callPackage (builtins.fetchurl {
+  validatornu = pkgs.callPackage (pkgs.fetchurl {
     url = "https://raw.githubusercontent.com/tdro/dotfiles/032efcf7f4b1c7304ce5f3f64f64c175ba59eb6d/.config/nixpkgs/packages/validatornu/default.nix";
     sha256 = "1ify40x9547z04hcibk76m45d02xg3dlvwc57n8vxcbax82yb9pj";
   }) { };
 
-  mkShellPure = pkgs.callPackage (builtins.fetchurl {
+  mkShellPure = pkgs.callPackage (pkgs.fetchurl {
     url = "https://raw.githubusercontent.com/tdro/dotfiles/b710281b132056105709c03dda1899a6afc68a93/.config/nixpkgs/helpers/mkShellPure.nix";
     sha256 = "1ciwifsx2hrp0ymm077zfb5q8ravrk545bda1q249y2spw9np4ms";
   }) { };
 
+  hugo = pkgs.callPackage ({ lib, buildGo118Module, fetchgit, installShellFiles }:
+
+    buildGo118Module rec {
+      pname = "hugo";
+      version = "0.101.0";
+
+      src = fetchgit {
+        rev = "v${version}";
+        url = "https://github.com/gohugoio/hugo.git";
+        sha256 = "sha256-Fodcefp8xdSV2tt6ZYaKdcLqVe2upEngQr6M+wV5wnw=";
+      };
+
+      doCheck = false;
+      proxyVendor = true;
+      vendorSha256 = "sha256-rReqDOhBKZO1qa3C4jmewGgmhLvvOYyxwWqsdm+6DzM=";
+
+      tags = [ "extended" ];
+      subPackages = [ "." ];
+      nativeBuildInputs = [ installShellFiles ];
+
+      postInstall = ''
+        $out/bin/hugo gen man
+        installManPage man/*
+      '';
+
+      meta = {
+        license = lib.licenses.asl20;
+        homepage = "https://gohugo.io";
+        description = "A fast and modern static website engine";
+        maintainers = with lib.maintainers; [ schneefux Br1ght0ne Frostman ];
+      };
+    }) { };
+
 in mkShellPure {
   packages = [
     hugo
-- 
cgit v1.2.3