diff options
author | Mx Kookie <kookie@spacekookie.de> | 2020-12-09 18:55:19 +0000 |
---|---|---|
committer | Mx Kookie <kookie@spacekookie.de> | 2020-12-09 18:55:19 +0000 |
commit | 80d90d9b204f7c17912740f9f414fe5d59f293ba (patch) | |
tree | 5f2065a06e724270610760d59d01c6888b375a46 /infra/libkookie/nixpkgs/pkgs/tools/misc/direnv/default.nix | |
parent | 3a31a84c7d3e589035ad08499206aac44a81f424 (diff) | |
parent | 83cbad92d73216bb0d9187c56cce0b91f9121d5a (diff) |
Merge commit '83cbad92d73216bb0d9187c56cce0b91f9121d5a' into main
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/tools/misc/direnv/default.nix')
-rw-r--r-- | infra/libkookie/nixpkgs/pkgs/tools/misc/direnv/default.nix | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/direnv/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/direnv/default.nix index e24d8611a433..050dcf2955f3 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/direnv/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/direnv/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "direnv"; - version = "2.23.0"; + version = "2.25.0"; vendorSha256 = null; @@ -10,7 +10,7 @@ buildGoModule rec { owner = "direnv"; repo = "direnv"; rev = "v${version}"; - sha256 = "0m42mg4z04880dwl3iyppq2nda9v883jaxl8221d0xcpkjfm8hjm"; + sha256 = "00bvznswmz08s2jqpz5xxmkqggd06h6g8cwk242aaih6qajxfpsn"; }; # we have no bash at the moment for windows @@ -18,6 +18,11 @@ buildGoModule rec { 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 |