From d531e723977ed1c510b224bd908d3614cb34a213 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Sun, 3 May 2020 17:23:10 +0200 Subject: nix-direnv: init at 1.0.0 --- pkgs/tools/misc/nix-direnv/default.nix | 33 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/tools/misc/nix-direnv/default.nix diff --git a/pkgs/tools/misc/nix-direnv/default.nix b/pkgs/tools/misc/nix-direnv/default.nix new file mode 100644 index 000000000000..2d1337955009 --- /dev/null +++ b/pkgs/tools/misc/nix-direnv/default.nix @@ -0,0 +1,33 @@ +{ lib, stdenv, fetchFromGitHub, gnugrep, nix }: + +stdenv.mkDerivation rec { + pname = "nix-direnv"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "nix-community"; + repo = "nix-direnv"; + rev = "${version}"; + sha256 = "1lwmg6mn3lf7s0345v53zadxn9v0x8z6pcbj90v5dx3pgrq41gs8"; + }; + + # Substitute instead of wrapping because the resulting file is + # getting sourced, not executed: + postPatch = '' + substituteInPlace direnvrc \ + --replace "grep" "${gnugrep}/bin/grep" \ + --replace "nix-shell" "${nix}/bin/nix-shell" \ + --replace "nix-instantiate" "${nix}/bin/nix-instantiate" + ''; + + installPhase = '' + install -m500 -D direnvrc $out/share/nix-direnv/direnvrc + ''; + + meta = with stdenv.lib; { + description = "A fast, persistent use_nix implementation for direnv"; + homepage = "https://github.com/nix-community/nix-direnv"; + license = licenses.mit; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b7dda53484ea..7a2043b4cf5c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2058,6 +2058,8 @@ in nfstrace = callPackage ../tools/networking/nfstrace { }; + nix-direnv = callPackage ../tools/misc/nix-direnv { }; + nixpkgs-pytools = with python3.pkgs; toPythonApplication nixpkgs-pytools; noteshrink = callPackage ../tools/misc/noteshrink { }; -- cgit 1.4.1 From 9d405dd370246059cf774c2af86438c2e6324240 Mon Sep 17 00:00:00 2001 From: Jörg Thalheim Date: Mon, 11 May 2020 06:49:23 +0100 Subject: nix-direnv: add preInstall/postInstall hooks --- pkgs/tools/misc/nix-direnv/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/misc/nix-direnv/default.nix b/pkgs/tools/misc/nix-direnv/default.nix index 2d1337955009..299550aa0cbf 100644 --- a/pkgs/tools/misc/nix-direnv/default.nix +++ b/pkgs/tools/misc/nix-direnv/default.nix @@ -21,7 +21,9 @@ stdenv.mkDerivation rec { ''; installPhase = '' + runHook preInstall install -m500 -D direnvrc $out/share/nix-direnv/direnvrc + runHook postInstall ''; meta = with stdenv.lib; { -- cgit 1.4.1 From 886f9fc37e967826eefd6f9054fac1acc77088dd Mon Sep 17 00:00:00 2001 From: Jörg Thalheim Date: Mon, 11 May 2020 06:49:37 +0100 Subject: nix-direnv: add myself as maintainer --- pkgs/tools/misc/nix-direnv/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/misc/nix-direnv/default.nix b/pkgs/tools/misc/nix-direnv/default.nix index 299550aa0cbf..cff7df1801f7 100644 --- a/pkgs/tools/misc/nix-direnv/default.nix +++ b/pkgs/tools/misc/nix-direnv/default.nix @@ -31,5 +31,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/nix-community/nix-direnv"; license = licenses.mit; platforms = platforms.unix; + maintainers = with maintainers; [ mic92 ]; }; } -- cgit 1.4.1