diff options
author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2021-07-29 10:49:00 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-29 10:49:00 +0200 |
commit | 8dcfe523f716282c48311989fe028a4baa9ce7e2 (patch) | |
tree | ebcae19fe70620e61af885d60ec561635da23af7 /pkgs/development | |
parent | 38887017165dd4fd3b521b19756af1606bc179e2 (diff) | |
parent | 238fa78d880b3d5de4865c92bd2a7167e46ebc78 (diff) |
Merge pull request #131719 from FRidh/python2-to-3
Python: further migrate packages from 2 to 3
Diffstat (limited to 'pkgs/development')
22 files changed, 47 insertions, 40 deletions
diff --git a/pkgs/development/compilers/clasp/default.nix b/pkgs/development/compilers/clasp/default.nix index 3aa7063f5513a..0113a9aebc086 100644 --- a/pkgs/development/compilers/clasp/default.nix +++ b/pkgs/development/compilers/clasp/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, fetchFromGitLab , llvmPackages , cmake, boehmgc, gmp, zlib, ncurses, boost, libelf -, python, git, sbcl +, python3, git, sbcl , wafHook }: let @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ cmake python git sbcl wafHook ] ++ + nativeBuildInputs = [ cmake python3 git sbcl wafHook ] ++ (with llvmPackages; [ llvm clang ]); buildInputs = with llvmPackages; diff --git a/pkgs/development/compilers/dtc/default.nix b/pkgs/development/compilers/dtc/default.nix index 0050dd44b9a92..f145b0397f5c1 100644 --- a/pkgs/development/compilers/dtc/default.nix +++ b/pkgs/development/compilers/dtc/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchgit, flex, bison, pkg-config, which -, pythonSupport ? false, python, swig, libyaml +, pythonSupport ? false, python ? null, swig, libyaml }: stdenv.mkDerivation rec { diff --git a/pkgs/development/compilers/llvm/rocm/clang.nix b/pkgs/development/compilers/llvm/rocm/clang.nix index 45c0bfda19228..d6bfd07d444eb 100644 --- a/pkgs/development/compilers/llvm/rocm/clang.nix +++ b/pkgs/development/compilers/llvm/rocm/clang.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchFromGitHub , cmake -, python +, python3 , llvm , clang-tools-extra_src ? null , lld @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { pname = "clang"; - nativeBuildInputs = [ cmake python ]; + nativeBuildInputs = [ cmake python3 ]; buildInputs = [ llvm ]; diff --git a/pkgs/development/compilers/openjdk/openjfx/11.nix b/pkgs/development/compilers/openjdk/openjfx/11.nix index 228dbf9b14e92..1d741fd8be2dd 100644 --- a/pkgs/development/compilers/openjdk/openjfx/11.nix +++ b/pkgs/development/compilers/openjdk/openjfx/11.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, writeText, gradleGen, pkg-config, perl, cmake -, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib, ffmpeg, python, ruby +, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib, ffmpeg, python2, ruby , openjdk11-bootstrap }: let @@ -20,7 +20,7 @@ let }; buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg ]; - nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python ruby ]; + nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python2 ruby ]; dontUseCmakeConfigure = true; diff --git a/pkgs/development/compilers/osl/default.nix b/pkgs/development/compilers/osl/default.nix index 1006764481310..eeaba75c0de4a 100644 --- a/pkgs/development/compilers/osl/default.nix +++ b/pkgs/development/compilers/osl/default.nix @@ -1,6 +1,6 @@ { clangStdenv, lib, fetchFromGitHub, cmake, zlib, openexr, openimageio, llvm, boost165, flex, bison, partio, pugixml, -util-linux, python +util-linux, python3 }: let boost_static = boost165.override { enableStatic = true; }; @@ -26,7 +26,7 @@ in clangStdenv.mkDerivation rec { zlib openexr openimageio llvm partio pugixml util-linux # needed just for hexdump - python # CMake doesn't check this? + python3 # CMake doesn't check this? ]; # TODO: How important is partio? CMake doesn't seem to find it meta = with lib; { diff --git a/pkgs/development/compilers/seexpr/default.nix b/pkgs/development/compilers/seexpr/default.nix index 7fc1fc7b1b6dc..5dfa08c457278 100644 --- a/pkgs/development/compilers/seexpr/default.nix +++ b/pkgs/development/compilers/seexpr/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, libpng, zlib, qt4, -bison, flex, libGLU, pythonPackages +bison, flex, libGLU, python2Packages }: stdenv.mkDerivation { @@ -13,7 +13,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ libGLU libpng zlib qt4 pythonPackages.pyqt4 bison flex ]; + buildInputs = [ libGLU libpng zlib qt4 python2Packages.pyqt4 bison flex ]; meta = with lib; { description = "Embeddable expression evaluation engine from Disney Animation"; homepage = "https://www.disneyanimation.com/technology/seexpr.html"; diff --git a/pkgs/development/em-modules/generic/default.nix b/pkgs/development/em-modules/generic/default.nix index a260beb510443..8bfbf6ec30992 100644 --- a/pkgs/development/em-modules/generic/default.nix +++ b/pkgs/development/em-modules/generic/default.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, emscripten, python }: +{ pkgs, lib, emscripten, python2 }: { buildInputs ? [], nativeBuildInputs ? [] @@ -12,8 +12,8 @@ pkgs.stdenv.mkDerivation ( pname = "emscripten-${lib.getName args}"; version = lib.getVersion args; - buildInputs = [ emscripten python ] ++ buildInputs; - nativeBuildInputs = [ emscripten python ] ++ nativeBuildInputs; + buildInputs = [ emscripten python2 ] ++ buildInputs; + nativeBuildInputs = [ emscripten python2 ] ++ nativeBuildInputs; # fake conftest results with emscripten's python magic EMCONFIGURE_JS=2; diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index f4943b2518718..c8fbe340ac9e8 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -85,6 +85,7 @@ with pkgs; (lib.extends (lib.composeExtensions aliases extensions) pythonPackagesFun)) { overrides = packageOverrides; + python = self; }; in rec { isPy27 = pythonVersion == "2.7"; diff --git a/pkgs/development/libraries/audio/lvtk/default.nix b/pkgs/development/libraries/audio/lvtk/default.nix index cecae743da05d..0ded707b3a103 100644 --- a/pkgs/development/libraries/audio/lvtk/default.nix +++ b/pkgs/development/libraries/audio/lvtk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, boost, gtkmm2, lv2, pkg-config, python, wafHook }: +{ lib, stdenv, fetchurl, boost, gtkmm2, lv2, pkg-config, python2, wafHook }: stdenv.mkDerivation rec { pname = "lvtk"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "03nbj2cqcklqwh50zj2gwm07crh5iwqbpxbpzwbg5hvgl4k4rnjd"; }; - nativeBuildInputs = [ pkg-config python wafHook ]; + nativeBuildInputs = [ pkg-config python2 wafHook ]; buildInputs = [ boost gtkmm2 lv2 ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index 6158eb8751173..1f9bbe5ffcad0 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, icu, expat, zlib, bzip2, python, fixDarwinDylibNames, libiconv +{ lib, stdenv, icu, expat, zlib, bzip2, python ? null, fixDarwinDylibNames, libiconv , fetchpatch , which , buildPackages diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix index 86d80a529d59f..af4a5a38f7eb2 100644 --- a/pkgs/development/libraries/gdcm/default.nix +++ b/pkgs/development/libraries/gdcm/default.nix @@ -7,7 +7,7 @@ , ApplicationServices , Cocoa , enablePython ? false -, python +, python ? null , swig }: diff --git a/pkgs/development/libraries/libsystemtap/default.nix b/pkgs/development/libraries/libsystemtap/default.nix index 1ce7ef58c886c..17ac533732f9f 100644 --- a/pkgs/development/libraries/libsystemtap/default.nix +++ b/pkgs/development/libraries/libsystemtap/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchgit, gettext, python, elfutils}: +{lib, stdenv, fetchgit, gettext, python2, elfutils}: stdenv.mkDerivation { pname = "libsystemtap"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { dontBuild = true; - nativeBuildInputs = [ gettext python elfutils ]; + nativeBuildInputs = [ gettext python2 elfutils ]; installPhase = '' mkdir -p $out/include diff --git a/pkgs/development/libraries/mapnik/default.nix b/pkgs/development/libraries/mapnik/default.nix index 46f2751938ee2..c2556a428a15f 100644 --- a/pkgs/development/libraries/mapnik/default.nix +++ b/pkgs/development/libraries/mapnik/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchzip , boost, cairo, freetype, gdal, harfbuzz, icu, libjpeg, libpng, libtiff -, libwebp, libxml2, proj, python, sqlite, zlib +, libwebp, libxml2, proj, python3, python ? python3, sqlite, zlib # supply a postgresql package to enable the PostGIS input plugin , postgresql ? null @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { # a distinct dev output makes python-mapnik fail outputs = [ "out" ]; - nativeBuildInputs = [ python ]; + nativeBuildInputs = [ python3 ]; buildInputs = [ boost cairo freetype gdal harfbuzz icu libjpeg libpng libtiff diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix index 8bd2bc80362c0..a4f0289cd58e4 100644 --- a/pkgs/development/libraries/mlt/default.nix +++ b/pkgs/development/libraries/mlt/default.nix @@ -3,7 +3,7 @@ , libvorbis, libxml2, movit, pkg-config, sox, fftw, opencv4, SDL2 , gtk2, genericUpdater, common-updater-scripts, libebur128 , jack2, ladspa-sdk, swig, which, ncurses -, enablePython ? false, python +, enablePython ? false, python3 }: stdenv.mkDerivation rec { @@ -24,7 +24,9 @@ stdenv.mkDerivation rec { ] ++ lib.optional enablePython ncurses; nativeBuildInputs = [ pkg-config makeWrapper which ] - ++ lib.optionals enablePython [ python swig ]; + ++ lib.optionals enablePython [ python3 swig ]; + + strictDeps = true; # Mostly taken from: # http://www.kdenlive.org/user-manual/downloading-and-installing-kdenlive/installing-source/installing-mlt-rendering-engine diff --git a/pkgs/development/libraries/physics/fastnlo_toolkit/default.nix b/pkgs/development/libraries/physics/fastnlo_toolkit/default.nix index d6cbe7cc4dd02..e4a731d31721c 100644 --- a/pkgs/development/libraries/physics/fastnlo_toolkit/default.nix +++ b/pkgs/development/libraries/physics/fastnlo_toolkit/default.nix @@ -6,7 +6,7 @@ , gfortran , lhapdf , ncurses -, python +, python ? null , swig , yoda , zlib diff --git a/pkgs/development/libraries/science/biology/mirtk/default.nix b/pkgs/development/libraries/science/biology/mirtk/default.nix index 0d23489696f1e..d2615b391ffc5 100644 --- a/pkgs/development/libraries/science/biology/mirtk/default.nix +++ b/pkgs/development/libraries/science/biology/mirtk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, gtest, fetchFromGitHub, cmake, boost, eigen, python, vtk, zlib, tbb }: +{ lib, stdenv, gtest, fetchFromGitHub, cmake, boost, eigen, python3, vtk, zlib, tbb }: stdenv.mkDerivation rec { version = "2.0.0"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ cmake gtest ]; - buildInputs = [ boost eigen python vtk zlib tbb ]; + buildInputs = [ boost eigen python3 vtk zlib tbb ]; meta = with lib; { homepage = "https://github.com/BioMedIA/MIRTK"; diff --git a/pkgs/development/libraries/subunit/default.nix b/pkgs/development/libraries/subunit/default.nix index cb824decc6ca4..9cc61d2000866 100644 --- a/pkgs/development/libraries/subunit/default.nix +++ b/pkgs/development/libraries/subunit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, check, cppunit, perl, pythonPackages }: +{ lib, stdenv, fetchurl, pkg-config, check, cppunit, perl, python3Packages }: # NOTE: for subunit python library see pkgs/top-level/python-packages.nix @@ -12,9 +12,9 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ check cppunit perl pythonPackages.wrapPython ]; + buildInputs = [ check cppunit perl python3Packages.wrapPython ]; - propagatedBuildInputs = with pythonPackages; [ testtools testscenarios ]; + propagatedBuildInputs = with python3Packages; [ testtools testscenarios ]; postFixup = "wrapPythonPrograms"; diff --git a/pkgs/development/python-modules/subunit/default.nix b/pkgs/development/python-modules/subunit/default.nix index f462268918774..c59626fc85c3f 100644 --- a/pkgs/development/python-modules/subunit/default.nix +++ b/pkgs/development/python-modules/subunit/default.nix @@ -27,7 +27,7 @@ buildPythonPackage { --ignore=python/subunit/tests/test_{output_filter,test_protocol{,2}}.py ''; - patchPhase = '' + postPatch = '' sed -i 's/version=VERSION/version="${subunit.version}"/' setup.py ''; } diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index bc70f30f9596b..8111f6e53cdfa 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -17,7 +17,7 @@ # This seperates "what to build" (the exact gem versions) from "how to build" # (to make gems behave if necessary). -{ lib, fetchurl, writeScript, ruby, libkrb5, libxml2, libxslt, python, stdenv, which +{ lib, fetchurl, writeScript, ruby, libkrb5, libxml2, libxslt, python2, stdenv, which , libiconv, postgresql, v8, clang, sqlite, zlib, imagemagick, lasem , pkg-config , ncurses, xapian, gpgme, util-linux, tzdata, icu, libffi , cmake, libssh2, openssl, libmysqlclient, git, perl, pcre, gecode_3, curl @@ -328,7 +328,7 @@ in # otherwise the gem will fail to link to the libv8 binary. # see: https://github.com/cowboyd/libv8/pull/161 libv8 = attrs: { - buildInputs = [ which v8 python ]; + buildInputs = [ which v8 python2 ]; buildFlags = [ "--with-system-v8=true" ]; dontBuild = false; postPatch = '' diff --git a/pkgs/development/tools/libsigrok/default.nix b/pkgs/development/tools/libsigrok/default.nix index 7f32b0bd71620..7b9ebd57391a5 100644 --- a/pkgs/development/tools/libsigrok/default.nix +++ b/pkgs/development/tools/libsigrok/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, libzip, glib, libusb1, libftdi1, check -, libserialport, librevisa, doxygen, glibmm, python +, libserialport, librevisa, doxygen, glibmm , version ? "0.5.1", sha256 ? "171b553dir5gn6w4f7n37waqk62nq2kf1jykx4ifjacdz5xdw3z4" }: @@ -19,9 +19,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ libzip glib libusb1 libftdi1 check libserialport - librevisa doxygen glibmm python + librevisa doxygen glibmm ]; + strictDeps = true; + postInstall = '' mkdir -p "$out/share/sigrok-firmware/" tar --strip-components=1 -xvf "${firmware}" -C "$out/share/sigrok-firmware/" diff --git a/pkgs/development/tools/misc/coccinelle/default.nix b/pkgs/development/tools/misc/coccinelle/default.nix index 8534f1e2d85ae..2d9aa55ed0507 100644 --- a/pkgs/development/tools/misc/coccinelle/default.nix +++ b/pkgs/development/tools/misc/coccinelle/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, python, ncurses, ocamlPackages, pkg-config }: +{ fetchurl, lib, stdenv, python3, ncurses, ocamlPackages, pkg-config }: stdenv.mkDerivation rec { pname = "coccinelle"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = with ocamlPackages; [ ocaml findlib menhir ocaml_pcre parmap stdcompat - python ncurses pkg-config + python3 ncurses pkg-config ]; doCheck = false; diff --git a/pkgs/development/tools/parsing/hammer/default.nix b/pkgs/development/tools/parsing/hammer/default.nix index 0a9dfdec0163f..402f83bea16b8 100644 --- a/pkgs/development/tools/parsing/hammer/default.nix +++ b/pkgs/development/tools/parsing/hammer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, glib, pkg-config, python, scons }: +{ lib, stdenv, fetchgit, glib, pkg-config, scons }: stdenv.mkDerivation { pname = "hammer"; @@ -10,8 +10,10 @@ stdenv.mkDerivation { rev = "47f34b81e4de834fd3537dd71928c4f3cdb7f533"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ glib python scons ]; + nativeBuildInputs = [ pkg-config scons ]; + buildInputs = [ glib ]; + + strictDeps = true; meta = with lib; { description = "A bit-oriented parser combinator library"; |