Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0587d518db1b
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1996ff7d4273
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jan 1, 2021

  1. direnv: 2.25.1 -> 2.27.0 (#108125)

    @zimbatm
    zimbatm authored Jan 1, 2021

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    1996ff7 View commit details
Showing with 5 additions and 12 deletions.
  1. +5 −12 pkgs/tools/misc/direnv/default.nix
17 changes: 5 additions & 12 deletions pkgs/tools/misc/direnv/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 ];