diff options
author | tdro <tdro@noreply.example.com> | 2023-02-21 09:05:12 -0500 |
---|---|---|
committer | tdro <tdro@noreply.example.com> | 2023-02-21 09:05:12 -0500 |
commit | 33f0c1b37088c1876175790a81fd7be500eed0c9 (patch) | |
tree | 58f3ba09e25c65d40e797723967e9f3a13798637 /shell.nix | |
parent | 4b126a3c66c756806fa81713a210524629a72378 (diff) | |
download | canory-33f0c1b37088c1876175790a81fd7be500eed0c9.tar.gz canory-33f0c1b37088c1876175790a81fd7be500eed0c9.tar.bz2 canory-33f0c1b37088c1876175790a81fd7be500eed0c9.zip |
shell: Update hugo to version 0.110.0
Write custom shell here and set system architecture
Diffstat (limited to 'shell.nix')
-rw-r--r-- | shell.nix | 71 |
1 files changed, 34 insertions, 37 deletions
@@ -5,37 +5,27 @@ let pkgs = import (builtins.fetchTarball { url = "https://releases.nixos.org/nixos/22.11/nixos-22.11.466.596a8e828c5/nixexprs.tar.xz"; sha256 = "1367bad5zz0mfm4czb6p0s0ni38f0x1ffh02z76rx4nranipqbgg"; - }) { }; + }) { system = "x86_64-linux"; }; validatornu = pkgs.callPackage (pkgs.fetchurl { url = "https://raw.githubusercontent.com/tdro/dotfiles/032efcf7f4b1c7304ce5f3f64f64c175ba59eb6d/.config/nixpkgs/packages/validatornu/default.nix"; sha256 = "1ify40x9547z04hcibk76m45d02xg3dlvwc57n8vxcbax82yb9pj"; }) { }; - mkShellPure = pkgs.callPackage (pkgs.fetchurl { - url = "https://raw.githubusercontent.com/tdro/dotfiles/b710281b132056105709c03dda1899a6afc68a93/.config/nixpkgs/helpers/mkShellPure.nix"; - sha256 = "1ciwifsx2hrp0ymm077zfb5q8ravrk545bda1q249y2spw9np4ms"; - }) { }; - - hugo = pkgs.callPackage ({ lib, buildGoModule, fetchgit, installShellFiles }: + hugo = pkgs.callPackage ({ lib, buildGoModule, fetchgit }: buildGoModule rec { pname = "hugo"; - version = "0.108.0"; - + version = "0.110.0"; src = fetchgit { rev = "v${version}"; url = "https://github.com/gohugoio/hugo.git"; - sha256 = "sha256-MbpBGqu7IwQCf9DjSfIDi25ZGJYTI6xxSk9wPWxychw="; + sha256 = "sha256-7B0C8191lUGsv81+0eKDrBm+5hLlFjID3RTuajSg/RM="; }; - doCheck = false; proxyVendor = true; - vendorSha256 = "sha256-ECA7xy7h3nkslW6bjjZWy3IxvF3Y1TTlGq8Os6R9UvA="; - + vendorSha256 = "sha256-GtywXjtAF5Q4jUz2clfseUJVqiU+eSguG/ZoKy2TzuA="; tags = [ "extended" ]; subPackages = [ "." ]; - nativeBuildInputs = [ installShellFiles ]; - meta = { license = lib.licenses.asl20; homepage = "https://gohugo.io"; @@ -43,28 +33,35 @@ let }; }) { }; -in mkShellPure { + shell = pkgs.writeShellApplication { + inherit name; + text = '' + /usr/bin/env --ignore-environment /bin/sh -c ${ + pkgs.writeScript name '' + export PS1='\h (${name}) \W \$ ' + export PATH=${pkgs.lib.strings.makeBinPath [ + hugo + validatornu + pkgs.busybox + pkgs.caddy + pkgs.check-jsonschema + pkgs.deno + pkgs.entr + pkgs.git + pkgs.gnumake + pkgs.jing + pkgs.libxml2 + pkgs.libxslt + pkgs.subversion + pkgs.yj + ]} + /bin/sh + '' + }; + ''; + }; +in pkgs.mkShell { inherit hugo; - - packages = [ - hugo - validatornu - pkgs.busybox - pkgs.check-jsonschema - pkgs.deno - pkgs.entr - pkgs.git - pkgs.gnumake - pkgs.jing - pkgs.libxml2 - pkgs.libxslt - pkgs.caddy - pkgs.subversion - pkgs.yj - ]; - - shellHook = '' - export PS1='\h (${name}) \W \$ ' - ''; + shellHook = "exec ${shell}/bin/${shell.name}"; } |