From d7fa631412f452888ae0a9cdc281d1023655e4db Mon Sep 17 00:00:00 2001 From: "Travis A. Everett" Date: Mon, 11 Jan 2021 18:50:37 -0600 Subject: [PATCH] resholve: don't propagate, 0.4.0 -> 0.4.1 --- pkgs/development/misc/resholve/resholve.nix | 14 ++++++++++---- 1 file 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";