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: 0734f95e2566
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 87008c81b48d
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 12, 2021

  1. resholve: don't propagate, 0.4.0 -> 0.4.1

    @abathur
    abathur committed Jan 12, 2021

    Verified

    This commit was signed with the committer’s verified signature.
    renovate-bot Mend Renovate
    GPG key ID: 81C63AE1C224182B
    Verified
    Learn about vigilant mode
    Copy the full SHA
    d7fa631 View commit details

Commits on Jan 17, 2021

  1. Merge pull request #109063 from abathur/fix/resholve-do-not-propagate 

    resholve: don't propagate, 0.4.0 -> 0.4.1
    @SuperSandro2000
    SuperSandro2000 authored Jan 17, 2021
    Copy the full SHA
    87008c8 View commit details
Showing with 10 additions and 4 deletions.
  1. +10 −4 pkgs/development/misc/resholve/resholve.nix
14 changes: 10 additions & 4 deletions pkgs/development/misc/resholve/resholve.nix
View file
Original file line number Diff line number Diff line change
@@ -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";