pkgs/tools: stdenv.lib -> lib
This commit is contained in:
@@ -14,8 +14,8 @@
|
||||
, gettext
|
||||
}:
|
||||
let
|
||||
inherit (stdenv.lib.versions) majorMinor splitVersion;
|
||||
majorMinorPatch = v: builtins.concatStringsSep "." (stdenv.lib.take 3 (splitVersion v));
|
||||
inherit (lib.versions) majorMinor splitVersion;
|
||||
majorMinorPatch = v: builtins.concatStringsSep "." (lib.take 3 (splitVersion v));
|
||||
in
|
||||
pythonPackages.buildPythonApplication rec {
|
||||
pname = "duplicity";
|
||||
@@ -33,7 +33,7 @@ pythonPackages.buildPythonApplication rec {
|
||||
# Our Python infrastructure runs test in installCheckPhase so we need
|
||||
# to make the testing code stop assuming it is run from the source directory.
|
||||
./use-installed-scripts-in-test.patch
|
||||
] ++ stdenv.lib.optionals stdenv.isLinux [
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
./linux-disable-timezone-test.patch
|
||||
];
|
||||
|
||||
@@ -63,7 +63,7 @@ pythonPackages.buildPythonApplication rec {
|
||||
pycrypto
|
||||
pydrive
|
||||
future
|
||||
] ++ stdenv.lib.optionals (!isPy3k) [
|
||||
] ++ lib.optionals (!isPy3k) [
|
||||
enum
|
||||
];
|
||||
|
||||
@@ -72,7 +72,7 @@ pythonPackages.buildPythonApplication rec {
|
||||
gnutar # Add 'tar' to PATH.
|
||||
librsync # Add 'rdiff' to PATH.
|
||||
par2cmdline # Add 'par2' to PATH.
|
||||
] ++ stdenv.lib.optionals stdenv.isLinux [
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
util-linux # Add 'setsid' to PATH.
|
||||
] ++ (with pythonPackages; [
|
||||
lockfile
|
||||
@@ -84,7 +84,7 @@ pythonPackages.buildPythonApplication rec {
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/duplicity \
|
||||
--prefix PATH : "${stdenv.lib.makeBinPath [ gnupg ncftp rsync ]}"
|
||||
--prefix PATH : "${lib.makeBinPath [ gnupg ncftp rsync ]}"
|
||||
'';
|
||||
|
||||
preCheck = ''
|
||||
@@ -100,7 +100,7 @@ pythonPackages.buildPythonApplication rec {
|
||||
|
||||
# Don't run developer-only checks (pep8, etc.).
|
||||
export RUN_CODE_TESTS=0
|
||||
'' + stdenv.lib.optionalString stdenv.isDarwin ''
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
# Work around the following error when running tests:
|
||||
# > Max open files of 256 is too low, should be >= 1024.
|
||||
# > Use 'ulimit -n 1024' or higher to correct.
|
||||
|
||||
Reference in New Issue
Block a user