summary refs log tree commit diff
path: root/pkgs/tools/misc/direnv
diff options
context:
space:
mode:
authorJonas Chevalier <zimbatm@zimbatm.com>2021-01-01 16:39:41 +0000
committerGitHub <noreply@github.com>2021-01-01 08:39:41 -0800
commit1996ff7d42735bd9f55f7315ffd293a814d37c3a (patch)
tree0a377337f47fe5b74da029df72a26fd773fe6c64 /pkgs/tools/misc/direnv
parent0587d518db1b4c88eab4c09c902317a4dd9b2a7f (diff)
downloadnixpkgs-1996ff7d42735bd9f55f7315ffd293a814d37c3a.tar
nixpkgs-1996ff7d42735bd9f55f7315ffd293a814d37c3a.tar.gz
nixpkgs-1996ff7d42735bd9f55f7315ffd293a814d37c3a.tar.bz2
nixpkgs-1996ff7d42735bd9f55f7315ffd293a814d37c3a.tar.lz
nixpkgs-1996ff7d42735bd9f55f7315ffd293a814d37c3a.tar.xz
nixpkgs-1996ff7d42735bd9f55f7315ffd293a814d37c3a.tar.zst
nixpkgs-1996ff7d42735bd9f55f7315ffd293a814d37c3a.zip
direnv: 2.25.1 -> 2.27.0 (#108125)
Diffstat (limited to 'pkgs/tools/misc/direnv')
-rw-r--r--pkgs/tools/misc/direnv/default.nix17
1 files changed, 5 insertions, 12 deletions
diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix
index 185b97d7273..d76f50eeae0 100644
--- a/pkgs/tools/misc/direnv/default.nix
+++ b/pkgs/tools/misc/direnv/default.nix
@@ -2,36 +2,29 @@
 
 buildGoModule rec {
   pname = "direnv";
-  version = "2.25.1";
-
-  vendorSha256 = null;
+  version = "2.27.0";
 
   src = fetchFromGitHub {
     owner = "direnv";
     repo = "direnv";
     rev = "v${version}";
-    sha256 = "0bwr7zdzjm5p6bjyzafc2n57y83f0pv2bmj99rhi8f94hhfydlsf";
+    sha256 = "05vvn59xd2q4yjizh5fprjib5xqq58by80d5avsm8nb1qxf383b1";
   };
 
+  vendorSha256 = "084x7d7sshcsyim76d6pl6127nlqacgwwnm965srl9y5w5nqzba6";
+
   # we have no bash at the moment for windows
   BASH_PATH =
     stdenv.lib.optionalString (!stdenv.hostPlatform.isWindows)
     "${bash}/bin/bash";
 
-  # fix hardcoded GOFLAGS in makefile. remove once https://github.com/direnv/direnv/issues/718 is closed.
-  postPatch = ''
-    substituteInPlace GNUmakefile --replace "export GOFLAGS=-mod=vendor" ""
-  '';
-
   # replace the build phase to use the GNUMakefile instead
   buildPhase = ''
     make BASH_PATH=$BASH_PATH
   '';
 
   installPhase = ''
-    make install DESTDIR=$out
-    mkdir -p $out/share/fish/vendor_conf.d
-    echo "eval ($out/bin/direnv hook fish)" > $out/share/fish/vendor_conf.d/direnv.fish
+    make install PREFIX=$out
   '';
 
   checkInputs = [ fish zsh ];