summary refs log tree commit diff
path: root/pkgs/development/misc
diff options
context:
space:
mode:
authorTravis A. Everett <travis.a.everett@gmail.com>2021-01-11 18:50:37 -0600
committerTravis A. Everett <travis.a.everett@gmail.com>2021-01-11 18:58:56 -0600
commitd7fa631412f452888ae0a9cdc281d1023655e4db (patch)
tree6df93ba72160413fe7b8792b832793507e5bd5fd /pkgs/development/misc
parenta588b71b37e3a78d4f29df82877df2c3f3e5f34d (diff)
downloadnixpkgs-d7fa631412f452888ae0a9cdc281d1023655e4db.tar
nixpkgs-d7fa631412f452888ae0a9cdc281d1023655e4db.tar.gz
nixpkgs-d7fa631412f452888ae0a9cdc281d1023655e4db.tar.bz2
nixpkgs-d7fa631412f452888ae0a9cdc281d1023655e4db.tar.lz
nixpkgs-d7fa631412f452888ae0a9cdc281d1023655e4db.tar.xz
nixpkgs-d7fa631412f452888ae0a9cdc281d1023655e4db.tar.zst
nixpkgs-d7fa631412f452888ae0a9cdc281d1023655e4db.zip
resholve: don't propagate, 0.4.0 -> 0.4.1
Diffstat (limited to 'pkgs/development/misc')
-rw-r--r--pkgs/development/misc/resholve/resholve.nix14
1 files changed, 10 insertions, 4 deletions
diff --git a/pkgs/development/misc/resholve/resholve.nix b/pkgs/development/misc/resholve/resholve.nix
index 06561e05dd9..a03c604e330 100644
--- a/pkgs/development/misc/resholve/resholve.nix
+++ b/pkgs/development/misc/resholve/resholve.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , callPackage
 , python27Packages
 , installShellFiles
@@ -11,12 +11,12 @@
 , doCheck ? true
 }:
 let
-  version = "0.4.0";
+  version = "0.4.1";
   rSrc = fetchFromGitHub {
     owner = "abathur";
     repo = "resholve";
     rev = "v${version}";
-    hash = "sha256-wfxcX3wMZqoi5bWjXYRa21UDDJmTDfE+21p4mL2IJog=";
+    hash = "sha256-VK7r+kdtWvS9d4B90Hq7fhLfWT/B/Y9zppvOX9tPt5g=";
   };
   deps = callPackage ./deps.nix {
     /*
@@ -55,7 +55,7 @@ python27Packages.buildPythonApplication {
 
   inherit doCheck;
   checkInputs = [ bats ];
-  RESHOLVE_PATH = "${stdenv.lib.makeBinPath [ file findutils gettext ]}";
+  RESHOLVE_PATH = "${lib.makeBinPath [ file findutils gettext ]}";
 
   checkPhase = ''
     # explicit interpreter for test suite
@@ -64,6 +64,12 @@ python27Packages.buildPythonApplication {
     ./test.sh
   '';
 
+  # Do not propagate Python; may be obsoleted by nixos/nixpkgs#102613
+  # for context on why, see abathur/resholve#20
+  postFixup = ''
+    rm $out/nix-support/propagated-build-inputs
+  '';
+
   meta = with lib; {
     description = "Resolve external shell-script dependencies";
     homepage = "https://github.com/abathur/resholve";