summary refs log tree commit diff
path: root/pkgs/shells
diff options
context:
space:
mode:
authorArtturi <Artturin@artturin.com>2021-10-19 02:04:43 +0300
committerGitHub <noreply@github.com>2021-10-19 02:04:43 +0300
commit0777166e161f24d3af15d5b1a75273859669e216 (patch)
tree825581edcec8cff16e1655ebe6a82d057ecf998a /pkgs/shells
parentc033ff53bbf6d02fe6d5863260a752892c2f6216 (diff)
parentb678b680a9f372e5b9f61615b044eb513a6f9fb0 (diff)
downloadnixpkgs-0777166e161f24d3af15d5b1a75273859669e216.tar
nixpkgs-0777166e161f24d3af15d5b1a75273859669e216.tar.gz
nixpkgs-0777166e161f24d3af15d5b1a75273859669e216.tar.bz2
nixpkgs-0777166e161f24d3af15d5b1a75273859669e216.tar.lz
nixpkgs-0777166e161f24d3af15d5b1a75273859669e216.tar.xz
nixpkgs-0777166e161f24d3af15d5b1a75273859669e216.tar.zst
nixpkgs-0777166e161f24d3af15d5b1a75273859669e216.zip
Merge pull request #142044 from legendofmiracles/hilbish
Diffstat (limited to 'pkgs/shells')
-rw-r--r--pkgs/shells/hilbish/default.nix14
1 files changed, 9 insertions, 5 deletions
diff --git a/pkgs/shells/hilbish/default.nix b/pkgs/shells/hilbish/default.nix
index be2bdf318f4..a4a54e45c63 100644
--- a/pkgs/shells/hilbish/default.nix
+++ b/pkgs/shells/hilbish/default.nix
@@ -2,25 +2,24 @@
 
 buildGoModule rec {
   pname = "hilbish";
-  version = "0.5.1";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "Rosettea";
     repo = "Hilbish";
     rev = "v${version}";
-    sha256 = "sha256-557Je9KeBpkZxVAxcjWAhybIJJYlzhtbnIyZh0rCRUc=";
+    sha256 = "sha256-ACHHHGT3VGnvZVi1UZb57+g/slcld5e3bh+DDhUVVpQ=";
     fetchSubmodules = true;
   };
 
-  vendorSha256 = "sha256-8l+Kb1ADMLwv0Hf/ikok8eUcEEST07rhk8BjHxJI0lc=";
+  vendorSha256 = "sha256-SVGPMFpQjVOWCfiPpEmqhp6MEO0wqeyAZVyeNmTuXl0=";
 
   buildInputs = [ readline ];
 
   ldflags = [ "-s" "-w" ];
 
   postPatch = ''
-    # in master vars.go is called vars_linux.go
-    substituteInPlace vars.go \
+    substituteInPlace vars_linux.go \
       --replace "/usr/share" "${placeholder "out"}/share/"
   '';
 
@@ -28,8 +27,13 @@ buildGoModule rec {
     mkdir -p "$out/share/hilbish"
 
     cp .hilbishrc.lua $out/share/hilbish/
+    cp -r docs -t $out/share/hilbish
     cp -r libs -t $out/share/hilbish/
     cp preload.lua $out/share/hilbish/
+
+    # segfaults and it's already been generated upstream
+    # we copy the docs over with the above cp command
+    rm $out/bin/docgen
   '';
 
   meta = with lib; {