Merge pull request #75668 from jtojnar/py2-cleanup

Another batch of Python 2 removals
This commit is contained in:
Jan Tojnar
2019-12-19 01:24:00 +01:00
committed by GitHub
27 changed files with 180 additions and 112 deletions
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, file, curl, pkgconfig, python, openssl, cmake, zlib
{ stdenv, file, curl, pkgconfig, python3, openssl, cmake, zlib
, makeWrapper, libiconv, cacert, rustPlatform, rustc, libgit2
, CoreFoundation, Security
}:
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage {
dontUpdateAutotoolsGnuConfigScripts = true;
nativeBuildInputs = [ pkgconfig cmake makeWrapper ];
buildInputs = [ cacert file curl python openssl zlib libgit2 ]
buildInputs = [ cacert file curl python3 openssl zlib libgit2 ]
++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation Security libiconv ];
LIBGIT2_SYS_USE_PKG_CONFIG = 1;
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, removeReferencesTo, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget
, fetchurl, file, python2
, fetchurl, file, python3
, llvm_9, darwin, git, cmake, rust, rustPlatform
, pkgconfig, openssl
, which, libffi
@@ -121,7 +121,7 @@ in stdenv.mkDerivation rec {
dontUseCmakeConfigure = true;
nativeBuildInputs = [
file python2 rustPlatform.rust.rustc git cmake
file python3 rustPlatform.rust.rustc git cmake
which libffi removeReferencesTo pkgconfig
];