From b3dcc6a6565d7dee24827130a71f1ce3ca83c959 Mon Sep 17 00:00:00 2001 From: tdro Date: Fri, 9 Dec 2022 00:29:45 -0500 Subject: .config/nixpkgs: Jump unstable to version 23.05 Add sfeed and update hugo globally --- .config/nixpkgs/config.nix | 9 +++++---- .config/nixpkgs/packages/hugo/default.nix | 12 +++--------- 2 files changed, 8 insertions(+), 13 deletions(-) (limited to '.config/nixpkgs') diff --git a/.config/nixpkgs/config.nix b/.config/nixpkgs/config.nix index 703b41f..9728319 100644 --- a/.config/nixpkgs/config.nix +++ b/.config/nixpkgs/config.nix @@ -7,8 +7,8 @@ let sha256 = "0w8plbxms0di6gnh0k2yhj0pgxzxas7g5x0m01zjzixf16i2bapj"; }) {}; unstable = import (builtins.fetchTarball { - url = "https://releases.nixos.org/nixos/unstable/nixos-22.11pre386147.e0a42267f73/nixexprs.tar.xz"; - sha256 = "0y6q1j17lmhxh1pqi2jj6xr21pnmachra48336nnbcpnxizswjgg"; }) { }; + url = "https://releases.nixos.org/nixos/unstable/nixos-23.05pre431956.14ddeaebcbe/nixexprs.tar.xz"; + sha256 = "0ilpmvj84gdahz43z141qqninrzywmzz7hylzvnxbw8j6wxjznwv"; }) { }; in @@ -64,8 +64,8 @@ in Terminal = pkgs.buildEnv { name = "terminal"; paths = [ + (unstable.callPackage ./packages/hugo/default.nix {}) (callPackage ./packages/chromexup/default.nix {}) - (callPackage ./packages/hugo/default.nix {}) (callPackage ./packages/pdf2htmlex/default.nix {}) (callPackage ./packages/rxvt-unicode/default.nix {}) (callPackage ./packages/systemd2nix/default.nix {}) @@ -105,8 +105,8 @@ in gifsicle git groff - hexyl hexedit + hexyl highlight ideviceinstaller imagemagick @@ -138,6 +138,7 @@ in rclone ripgrep sbcl + sfeed silver-searcher sshfs subversion diff --git a/.config/nixpkgs/packages/hugo/default.nix b/.config/nixpkgs/packages/hugo/default.nix index 446d396..1787bf2 100644 --- a/.config/nixpkgs/packages/hugo/default.nix +++ b/.config/nixpkgs/packages/hugo/default.nix @@ -2,31 +2,25 @@ buildGoModule rec { pname = "hugo"; - version = "0.94.2"; + version = "0.108.0"; src = fetchgit { rev = "v${version}"; url = "https://github.com/gohugoio/hugo.git"; - sha256 = "1pdahyw0addlyl1nq6igbnrvwbkqriy7w1nwhkiz0apj2gi70l3w"; + sha256 = "sha256-MbpBGqu7IwQCf9DjSfIDi25ZGJYTI6xxSk9wPWxychw="; }; doCheck = false; proxyVendor = true; - vendorSha256 = "1jnmnm43w109jv3rhfchnqsq0k0lv59frddjns0axpac7vd5zjpb"; + vendorSha256 = "sha256-ECA7xy7h3nkslW6bjjZWy3IxvF3Y1TTlGq8Os6R9UvA="; 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 ]; }; } -- cgit v1.2.3