diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2020-11-27 15:09:19 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-11-27 15:09:19 +0100 |
commit | b2a3891e12777fa5e16bc93bc95c0d5ba256ebaf (patch) | |
tree | 220c385a8657d85bb6b305819a1842a3b1f4079c /pkgs/development/python-modules/git-annex-adapter/default.nix | |
parent | 977848375167f4671a03ccc0dbf5896f4cf0d3fe (diff) | |
parent | be36f6f0a0ffbeef228a021f5a343f5ce7a183de (diff) | |
download | nixpkgs-b2a3891e12777fa5e16bc93bc95c0d5ba256ebaf.tar nixpkgs-b2a3891e12777fa5e16bc93bc95c0d5ba256ebaf.tar.gz nixpkgs-b2a3891e12777fa5e16bc93bc95c0d5ba256ebaf.tar.bz2 nixpkgs-b2a3891e12777fa5e16bc93bc95c0d5ba256ebaf.tar.lz nixpkgs-b2a3891e12777fa5e16bc93bc95c0d5ba256ebaf.tar.xz nixpkgs-b2a3891e12777fa5e16bc93bc95c0d5ba256ebaf.tar.zst nixpkgs-b2a3891e12777fa5e16bc93bc95c0d5ba256ebaf.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/python-modules/git-annex-adapter/default.nix')
-rw-r--r-- | pkgs/development/python-modules/git-annex-adapter/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/python-modules/git-annex-adapter/default.nix b/pkgs/development/python-modules/git-annex-adapter/default.nix index 318bafb98ef..e5d9910024a 100644 --- a/pkgs/development/python-modules/git-annex-adapter/default.nix +++ b/pkgs/development/python-modules/git-annex-adapter/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, substituteAll -, python, utillinux, pygit2, gitMinimal, git-annex, cacert +, python, util-linux, pygit2, gitMinimal, git-annex, cacert }: buildPythonPackage rec { @@ -25,7 +25,7 @@ buildPythonPackage rec { checkInputs = [ gitMinimal - utillinux # `rev` is needed in tests/test_process.py + util-linux # `rev` is needed in tests/test_process.py ]; propagatedBuildInputs = [ pygit2 cacert ]; |