diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-11-30 00:34:23 +0200 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-11-30 00:34:23 +0200 |
| commit | 8a4d6516ee6d6f526543fba01b2b6814fadf6c4e (patch) | |
| tree | 0996f477a4a0badf9a1b6cf0aa7c9aa4da3256b9 /pkgs/tools/misc | |
| parent | 56366b5e668d4d5086cbadbb04c5dbc01a798581 (diff) | |
| parent | 2587611ed5916e8fad810a4a2038e12ed85337c0 (diff) | |
| download | nixlib-8a4d6516ee6d6f526543fba01b2b6814fadf6c4e.tar nixlib-8a4d6516ee6d6f526543fba01b2b6814fadf6c4e.tar.gz nixlib-8a4d6516ee6d6f526543fba01b2b6814fadf6c4e.tar.bz2 nixlib-8a4d6516ee6d6f526543fba01b2b6814fadf6c4e.tar.lz nixlib-8a4d6516ee6d6f526543fba01b2b6814fadf6c4e.tar.xz nixlib-8a4d6516ee6d6f526543fba01b2b6814fadf6c4e.tar.zst nixlib-8a4d6516ee6d6f526543fba01b2b6814fadf6c4e.zip | |
Merge remote-tracking branch 'upstream/staging' into master
Diffstat (limited to 'pkgs/tools/misc')
| -rw-r--r-- | pkgs/tools/misc/kargo/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/tools/misc/libcpuid/default.nix | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/tools/misc/kargo/default.nix b/pkgs/tools/misc/kargo/default.nix index ddc030bcf8da..734d8fb78e23 100644 --- a/pkgs/tools/misc/kargo/default.nix +++ b/pkgs/tools/misc/kargo/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, pythonPackages }: +{ stdenv, fetchurl, python2Packages }: -pythonPackages.buildPythonApplication rec { +python2Packages.buildPythonApplication rec { version = "0.4.6"; name = "kargo-${version}"; @@ -11,7 +11,7 @@ pythonPackages.buildPythonApplication rec { doCheck = false; - propagatedBuildInputs = with pythonPackages; [ + propagatedBuildInputs = with python2Packages; [ ansible2 boto cffi diff --git a/pkgs/tools/misc/libcpuid/default.nix b/pkgs/tools/misc/libcpuid/default.nix index 8f258a38f7fc..e26533d46429 100644 --- a/pkgs/tools/misc/libcpuid/default.nix +++ b/pkgs/tools/misc/libcpuid/default.nix @@ -3,7 +3,7 @@ , libtool , automake , autoconf -, python +, python2 # Needed for tests }: stdenv.mkDerivation rec { name = "libcpuid-${version}"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { postInstall = '' pushd Install - LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$(pwd)/lib ${python.interpreter} ../tests/run_tests.py ./bin/cpuid_tool ../tests/ + LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$(pwd)/lib ${python2.interpreter} ../tests/run_tests.py ./bin/cpuid_tool ../tests/ popd function fixRunPath { |