git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #117593 from FRidh/python2alias

Python: be explicit on whether it is python2 or python3 that is used

commit94fa194b9fb77ab953805e83ba80b5837499b96f authorFrederik Rietdijk <freddyrietdijk@fridh.nl> dateSat 3 Apr 2021, 18:01 (6 years ago) parent83fdc0c6a5049c
62 files changed+222−339
pkgs/applications/audio/gtklick/default.nix+3−3 pkgs/applications/audio/ingen/default.nix+10−13 pkgs/applications/audio/jalv/default.nix+2−2 pkgs/applications/audio/lastfmsubmitd/default.nix+2−2 pkgs/applications/editors/jetbrains/default.nix+1−2 pkgs/applications/kde/kcachegrind.nix+2−2 pkgs/applications/kde/kdebugsettings.nix+2−2 pkgs/applications/kde/minuet.nix+2−2 pkgs/applications/misc/klayout/default.nix+3−3 pkgs/applications/science/logic/lean2/default.nix+2−2 pkgs/applications/science/logic/poly/default.nix+4−2 pkgs/applications/science/math/ginac/default.nix+4−2 pkgs/applications/science/math/gurobi/default.nix+4−2 pkgs/applications/version-management/git-and-tools/git-bz/default.nix+4−4 pkgs/applications/version-management/git-crecord/default.nix+3−3 pkgs/applications/version-management/gitstats/default.nix+6−2 pkgs/desktops/plasma-5/discover.nix+2−2 pkgs/development/compilers/intel-graphics-compiler/default.nix+5−3 pkgs/development/libraries/audio/raul/default.nix+5−3 pkgs/development/libraries/audio/suil/default.nix+5−3 pkgs/development/libraries/gdal/2.4.nix+2−2 pkgs/development/libraries/gdal/gdal-1_11.nix−67 pkgs/development/libraries/gdal/python.patch−17 pkgs/development/libraries/grib-api/default.nix+1−1 pkgs/development/libraries/hpx/default.nix+4−2 pkgs/development/libraries/kde-frameworks/kapidox.nix+2−2 pkgs/development/libraries/kmsxx/default.nix+3−2 pkgs/development/libraries/libcint/default.nix+4−2 pkgs/development/libraries/libclc/default.nix+5−4 pkgs/development/libraries/libinjection/default.nix+4−2 pkgs/development/libraries/liblinphone/default.nix+2 pkgs/development/libraries/libplist/default.nix+1−1 pkgs/development/libraries/libredwg/default.nix+1−1 pkgs/development/libraries/mbedtls/default.nix+4−2 pkgs/development/libraries/mediastreamer/default.nix+2 pkgs/development/tools/analysis/kcov/default.nix+5−3 pkgs/development/tools/build-managers/gup/default.nix+4−2 pkgs/development/tools/grabserial/default.nix+6−3 pkgs/development/tools/hexio/default.nix+4−3 pkgs/development/tools/misc/gede/default.nix+4−2 pkgs/development/tools/misc/global/default.nix+7−5 pkgs/development/tools/misc/jscoverage/default.nix+4−3 pkgs/development/tools/misc/kconfig-frontends/default.nix+5−7 pkgs/games/gemrb/default.nix+2−2 pkgs/games/gnubg/default.nix+5−3 pkgs/misc/gnuk/generic.nix+2−2 pkgs/os-specific/linux/libnl/default.nix+2−2 pkgs/servers/irker/default.nix+4−2 pkgs/servers/kippo/default.nix−100 pkgs/shells/ksh/default.nix+4−2 pkgs/tools/archivers/innoextract/default.nix+7−2 pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix+1−1 pkgs/tools/misc/i3minator/default.nix+3−3 pkgs/tools/networking/httpstat/default.nix+2−2 pkgs/tools/networking/libreswan/default.nix+13−5 pkgs/tools/security/gen-oath-safe/default.nix+2−2 pkgs/tools/security/hash-slinger/default.nix+3−3 pkgs/tools/system/honcho/default.nix+4−5 pkgs/tools/text/icdiff/default.nix+16−2 pkgs/top-level/aliases.nix+1 pkgs/top-level/all-packages.nix+5−9 pkgs/top-level/gnuradio-packages.nix+1
pkgs/applications/audio/gtklick/default.nix+3−3
@@ -1,6 +1,6 @@
1−{ lib, fetchurl, pythonPackages, gettext, klick}:
1+{ lib, fetchurl, python2Packages, gettext, klick}:
22
3−pythonPackages.buildPythonApplication rec {
3+python2Packages.buildPythonApplication rec {
44 pname = "gtklick";
55 version = "0.6.4";
66
@@ -9,7 +9,7 @@ pythonPackages.buildPythonApplication rec {
99 sha256 = "7799d884126ccc818678aed79d58057f8cf3528e9f1be771c3fa5b694d9d0137";
1010 };
1111
12− pythonPath = with pythonPackages; [
12+ pythonPath = with python2Packages; [
1313 pyliblo
1414 pyGtkGlade
1515 ];
pkgs/applications/audio/ingen/default.nix+10−13
@@ -1,5 +1,5 @@
11{ lib, stdenv, fetchgit, boost, ganv, glibmm, gtkmm2, libjack2, lilv
2−, lv2, makeWrapper, pkg-config, python, raul, rdflib, serd, sord, sratom
2+, lv2, makeWrapper, pkg-config, python3, raul, serd, sord, sratom
33, wafHook
44, suil
55}:
@@ -16,24 +16,21 @@ stdenv.mkDerivation rec {
1616 deepClone = true;
1717 };
1818
19− nativeBuildInputs = [ pkg-config wafHook ];
19+ nativeBuildInputs = [ pkg-config wafHook python3 python3.pkgs.wrapPython ];
2020 buildInputs = [
21− boost ganv glibmm gtkmm2 libjack2 lilv lv2 makeWrapper
22− python raul serd sord sratom suil
21+ boost ganv glibmm gtkmm2 libjack2 lilv lv2
22+ python3 raul serd sord sratom suil
2323 ];
2424
25− preConfigure = ''
26− sed -e "s@{PYTHONDIR}/'@out/'@" -i wscript
27− '';
25+ strictDeps = true;
2826
29− propagatedBuildInputs = [ rdflib ];
27+ pythonPath = [
28+ python3
29+ python3.pkgs.rdflib
30+ ];
3031
3132 postInstall = ''
32− for program in ingenams ingenish
33− do
34− wrapProgram $out/bin/$program \
35− --prefix PYTHONPATH : $out/${python.sitePackages}:$PYTHONPATH
36− done
33+ wrapPythonProgramsIn "$out/bin" "$out $pythonPath"
3734 '';
3835
3936 meta = with lib; {
pkgs/applications/audio/jalv/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, gtk2, libjack2, lilv, lv2, pkg-config, python
1+{ lib, stdenv, fetchurl, gtk2, libjack2, lilv, lv2, pkg-config, python3
22, serd, sord , sratom, suil, wafHook }:
33
44stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212
1313 nativeBuildInputs = [ pkg-config wafHook ];
1414 buildInputs = [
15− gtk2 libjack2 lilv lv2 python serd sord sratom suil
15+ gtk2 libjack2 lilv lv2 python3 serd sord sratom suil
1616 ];
1717
1818 meta = with lib; {
pkgs/applications/audio/lastfmsubmitd/default.nix+2−2
@@ -1,6 +1,6 @@
1−{ lib, fetchurl, pythonPackages }:
1+{ lib, fetchurl, python2Packages }:
22
3−pythonPackages.buildPythonApplication rec {
3+python2Packages.buildPythonApplication rec {
44 pname = "lastfmsubmitd";
55 version = "1.0.6";
66
pkgs/applications/editors/jetbrains/default.nix+1−2
@@ -1,5 +1,4 @@
11{ lib, stdenv, callPackage, fetchurl
2−, python
32, jdk, cmake, libxml2, zlib, python3, ncurses5
43, dotnet-sdk_3
54, vmopts ? null
@@ -199,7 +198,7 @@ let
199198 platforms = platforms.linux;
200199 };
201200 }).override {
202− propagatedUserEnvPkgs = [ python ];
201+ propagatedUserEnvPkgs = [ python3 ];
203202 };
204203
205204 buildRider = { name, version, src, license, description, wmClass, ... }:
pkgs/applications/kde/kcachegrind.nix+2−2
@@ -1,7 +1,7 @@
11{
22 mkDerivation, lib,
33 extra-cmake-modules, kdoctools,
4− karchive, ki18n, kio, perl, python, php, qttools
4+ karchive, ki18n, kio, perl, python3, php, qttools
55 , kdbusaddons
66}:
77
@@ -12,5 +12,5 @@ mkDerivation {
1212 maintainers = with lib.maintainers; [ orivej ];
1313 };
1414 nativeBuildInputs = [ extra-cmake-modules kdoctools ];
15− buildInputs = [ karchive ki18n kio perl python php qttools kdbusaddons ];
15+ buildInputs = [ karchive ki18n kio perl python3 php qttools kdbusaddons ];
1616}
pkgs/applications/kde/kdebugsettings.nix+2−2
@@ -3,7 +3,7 @@
33 extra-cmake-modules, kdoctools,
44 gettext,
55 kcoreaddons, kconfig, kdbusaddons, kwidgetsaddons, kitemviews, kcompletion,
6− qtbase, python
6+ qtbase, python3
77}:
88
99mkDerivation {
@@ -15,7 +15,7 @@ mkDerivation {
1515 };
1616 nativeBuildInputs = [ extra-cmake-modules kdoctools ];
1717 buildInputs = [
18− gettext kcoreaddons kconfig kdbusaddons kwidgetsaddons kitemviews kcompletion python
18+ gettext kcoreaddons kconfig kdbusaddons kwidgetsaddons kitemviews kcompletion python3
1919 ];
2020 propagatedUserEnvPkgs = [ ];
2121}
pkgs/applications/kde/minuet.nix+2−2
@@ -1,5 +1,5 @@
11{ mkDerivation, qtbase
2−, lib, extra-cmake-modules, gettext, python
2+, lib, extra-cmake-modules, gettext, python3
33, drumstick, fluidsynth
44, kcoreaddons, kcrash, kdoctools
55, qtquickcontrols2, qtsvg, qttools, qtdeclarative
@@ -13,7 +13,7 @@ mkDerivation {
1313 broken = lib.versionOlder qtbase.version "5.14";
1414 };
1515
16− nativeBuildInputs = [ extra-cmake-modules gettext kdoctools python qtdeclarative ];
16+ nativeBuildInputs = [ extra-cmake-modules gettext kdoctools python3 qtdeclarative ];
1717
1818 propagatedBuildInputs = [
1919 drumstick fluidsynth
pkgs/applications/misc/klayout/default.nix+3−3
@@ -1,5 +1,5 @@
11{ lib, mkDerivation, fetchFromGitHub, fetchpatch
2−, python, ruby, qtbase, qtmultimedia, qttools, qtxmlpatterns
2+, python3, ruby, qtbase, qtmultimedia, qttools, qtxmlpatterns
33, which, perl, makeWrapper
44}:
55
@@ -21,11 +21,11 @@ mkDerivation rec {
2121
2222 nativeBuildInputs = [
2323 which
24+ python3
25+ ruby
2426 ];
2527
2628 buildInputs = [
27− python
28− ruby
2929 qtbase
3030 qtmultimedia
3131 qttools
pkgs/applications/science/logic/lean2/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, cmake, gmp, mpfr, python
1+{ lib, stdenv, fetchFromGitHub, cmake, gmp, mpfr, python2
22, gperftools, ninja, makeWrapper }:
33
44stdenv.mkDerivation {
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
1313 };
1414
1515 nativeBuildInputs = [ cmake makeWrapper ninja ];
16− buildInputs = [ gmp mpfr python gperftools ];
16+ buildInputs = [ gmp mpfr python2 gperftools ];
1717
1818 preConfigure = ''
1919 patchShebangs bin/leantags
pkgs/applications/science/logic/poly/default.nix+4−2
@@ -1,4 +1,4 @@
1−{lib, stdenv, fetchFromGitHub, gmp, cmake, python}:
1+{lib, stdenv, fetchFromGitHub, gmp, cmake, python3}:
22
33stdenv.mkDerivation rec {
44 pname = "libpoly";
@@ -14,7 +14,9 @@ stdenv.mkDerivation rec {
1414
1515 nativeBuildInputs = [ cmake ];
1616
17− buildInputs = [ gmp python ];
17+ buildInputs = [ gmp python3 ];
18+
19+ strictDeps = true;
1820
1921 meta = with lib; {
2022 homepage = "https://github.com/SRI-CSL/libpoly";
pkgs/applications/science/math/ginac/default.nix+4−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, cln, pkg-config, readline, gmp, python }:
1+{ lib, stdenv, fetchurl, cln, pkg-config, readline, gmp, python3 }:
22
33stdenv.mkDerivation rec {
44 name = "ginac-1.8.0";
@@ -12,7 +12,9 @@ stdenv.mkDerivation rec {
1212
1313 buildInputs = [ readline ] ++ lib.optional stdenv.isDarwin gmp;
1414
15− nativeBuildInputs = [ pkg-config python ];
15+ nativeBuildInputs = [ pkg-config python3 ];
16+
17+ strictDeps = true;
1618
1719 preConfigure = "patchShebangs ginsh";
1820
pkgs/applications/science/math/gurobi/default.nix+4−2
@@ -1,4 +1,4 @@
1−{ stdenv, lib, fetchurl, autoPatchelfHook, python }:
1+{ stdenv, lib, fetchurl, autoPatchelfHook, python2 }:
22
33let
44 majorVersion = "8.1";
@@ -14,7 +14,9 @@ in stdenv.mkDerivation rec {
1414 sourceRoot = "gurobi${builtins.replaceStrings ["."] [""] version}/linux64";
1515
1616 nativeBuildInputs = [ autoPatchelfHook ];
17− buildInputs = [ (python.withPackages (ps: [ ps.gurobipy ])) ];
17+ buildInputs = [ (python2.withPackages (ps: [ ps.gurobipy ])) ];
18+
19+ strictDeps = true;
1820
1921 buildPhase = ''
2022 cd src/build
pkgs/applications/version-management/git-and-tools/git-bz/default.nix+4−4
@@ -1,6 +1,6 @@
11{ lib, stdenv, fetchgit
22, asciidoc, docbook_xml_dtd_45, docbook_xsl, libxslt, makeWrapper, xmlto
3−, pythonPackages }:
3+, python2Packages }:
44
55stdenv.mkDerivation {
66 pname = "git-bz";
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
1616 asciidoc docbook_xml_dtd_45 docbook_xsl libxslt makeWrapper xmlto
1717 ];
1818 buildInputs = []
19− ++ (with pythonPackages; [ python pysqlite ]);
19+ ++ (with python2Packages; [ python pysqlite ]);
2020
2121 postPatch = ''
2222 patchShebangs configure
@@ -27,8 +27,8 @@ stdenv.mkDerivation {
2727
2828 postInstall = ''
2929 wrapProgram $out/bin/git-bz \
30− --prefix PYTHONPATH : "$(toPythonPath "${pythonPackages.pycrypto}")" \
31− --prefix PYTHONPATH : "$(toPythonPath "${pythonPackages.pysqlite}")"
30+ --prefix PYTHONPATH : "$(toPythonPath "${python2Packages.pycrypto}")" \
31+ --prefix PYTHONPATH : "$(toPythonPath "${python2Packages.pysqlite}")"
3232 '';
3333
3434 meta = with lib; {
pkgs/applications/version-management/git-crecord/default.nix+3−3
@@ -1,6 +1,6 @@
1−{ lib, fetchFromGitHub, pythonPackages }:
1+{ lib, fetchFromGitHub, python2Packages }:
22
3−pythonPackages.buildPythonApplication rec {
3+python2Packages.buildPythonApplication rec {
44 pname = "git-crecord";
55 version = "20161216.0";
66
@@ -11,7 +11,7 @@ pythonPackages.buildPythonApplication rec {
1111 sha256 = "0v3y90zi43myyi4k7q3892dcrbyi9dn2q6xgk12nw9db9zil269i";
1212 };
1313
14− propagatedBuildInputs = with pythonPackages; [ docutils ];
14+ propagatedBuildInputs = with python2Packages; [ docutils ];
1515
1616 meta = {
1717 homepage = "https://github.com/andrewshadura/git-crecord";
pkgs/applications/version-management/gitstats/default.nix+6−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchzip, perl, python, gnuplot, coreutils, gnugrep }:
1+{ lib, stdenv, fetchzip, perl, python2, gnuplot, coreutils, gnugrep }:
22
33stdenv.mkDerivation rec {
44 pname = "gitstats";
@@ -11,7 +11,11 @@ stdenv.mkDerivation rec {
1111 name = "${pname}-${version}" + "-src";
1212 };
1313
14− buildInputs = [ perl python ];
14+ nativeBuildInputs = [ perl ];
15+
16+ buildInputs = [ python2 ];
17+
18+ strictDeps = true;
1519
1620 postPatch = ''
1721 sed -e "s|gnuplot_cmd = .*|gnuplot_cmd = '${gnuplot}/bin/gnuplot'|" \
pkgs/desktops/plasma-5/discover.nix+2−2
@@ -3,7 +3,7 @@
33, extra-cmake-modules
44, gettext
55, kdoctools
6−, python
6+, python3
77, appstream-qt
88, discount
99, flatpak
@@ -34,7 +34,7 @@
3434mkDerivation {
3535 name = "discover";
3636 meta.broken = lib.versionOlder qtbase.version "5.15.0";
37− nativeBuildInputs = [ extra-cmake-modules gettext kdoctools python ];
37+ nativeBuildInputs = [ extra-cmake-modules gettext kdoctools python3 ];
3838 buildInputs = [
3939 # discount is needed for libmarkdown
4040 appstream-qt
pkgs/development/compilers/intel-graphics-compiler/default.nix+5−3
@@ -7,7 +7,7 @@
77, flex
88, llvmPackages_8
99, opencl-clang
10−, python
10+, python3
1111, spirv-llvm-translator
1212
1313, buildWithPatches ? true
@@ -33,9 +33,11 @@ stdenv.mkDerivation rec {
3333 sha256 = "1jp3c67ppl1x4pazr5nzy52615cpx0kyckaridhc0fsmrkgilyxq";
3434 };
3535
36− nativeBuildInputs = [ clang cmake bison flex llvm python ];
36+ nativeBuildInputs = [ clang cmake bison flex python3 ];
3737
38− buildInputs = [ clang opencl-clang spirv-llvm-translator ];
38+ buildInputs = [ clang opencl-clang spirv-llvm-translator llvm ];
39+
40+ strictDeps = true;
3941
4042 # checkInputs = [ lit pythonPackages.nose ];
4143
pkgs/development/libraries/audio/raul/default.nix+5−3
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchgit, boost, gtk2, pkg-config, python, wafHook }:
1+{ lib, stdenv, fetchgit, boost, gtk2, pkg-config, python3, wafHook }:
22
33stdenv.mkDerivation rec {
44 pname = "raul";
@@ -12,8 +12,10 @@ stdenv.mkDerivation rec {
1212 sha256 = "1z37jb6ghc13b8nv8a8hcg669gl8vh4ni9djvfgga9vcz8rmcg8l";
1313 };
1414
15− nativeBuildInputs = [ pkg-config wafHook ];
16− buildInputs = [ boost gtk2 python ];
15+ nativeBuildInputs = [ pkg-config wafHook python3 ];
16+ buildInputs = [ boost gtk2 ];
17+
18+ strictDeps = true;
1719
1820 meta = with lib; {
1921 description = "A C++ utility library primarily aimed at audio/musical applications";
pkgs/development/libraries/audio/suil/default.nix+5−3
@@ -1,4 +1,4 @@
1−{ stdenv, lib, fetchurl, gtk2, lv2, pkg-config, python, serd, sord, sratom
1+{ stdenv, lib, fetchurl, gtk2, lv2, pkg-config, python3, serd, sord, sratom
22, wafHook
33, withQt4 ? true, qt4 ? null
44, withQt5 ? false, qt5 ? null }:
@@ -17,13 +17,15 @@ stdenv.mkDerivation rec {
1717 sha256 = "0z4v01pjw4wh65x38w6icn28wdwxz13ayl8hvn4p1g9kmamp1z06";
1818 };
1919
20− nativeBuildInputs = [ pkg-config wafHook ];
21− buildInputs = [ gtk2 lv2 python serd sord sratom ]
20+ nativeBuildInputs = [ pkg-config wafHook python3 ];
21+ buildInputs = [ gtk2 lv2 serd sord sratom ]
2222 ++ (lib.optionals withQt4 [ qt4 ])
2323 ++ (lib.optionals withQt5 (with qt5; [ qtbase qttools ]));
2424
2525 dontWrapQtApps = true;
2626
27+ strictDeps = true;
28+
2729 meta = with lib; {
2830 homepage = "http://drobilla.net/software/suil";
2931 description = "A lightweight C library for loading and wrapping LV2 plugin UIs";
pkgs/development/libraries/gdal/2.4.nix+2−2
@@ -1,5 +1,5 @@
11{ lib, stdenv, fetchurl, unzip, libjpeg, libtiff, zlib
2−, postgresql, libmysqlclient, libgeotiff, pythonPackages, proj, geos, openssl
2+, postgresql, libmysqlclient, libgeotiff, python2Packages, proj, geos, openssl
33, libpng, sqlite, libspatialite, poppler, hdf4, qhull, giflib, expat
44, libiconv, libxml2
55, netcdfSupport ? true, netcdf, hdf5, curl
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
1919 nativeBuildInputs = [ unzip ];
2020 buildInputs = [ libjpeg libtiff libgeotiff libpng proj openssl sqlite
2121 libspatialite poppler hdf4 qhull giflib expat libxml2 proj ]
22− ++ (with pythonPackages; [ python numpy wrapPython ])
22+ ++ (with python2Packages; [ python numpy wrapPython ])
2323 ++ lib.optional stdenv.isDarwin libiconv
2424 ++ lib.optionals netcdfSupport [ netcdf hdf5 curl ];
2525
pkgs/development/libraries/gdal/gdal-1_11.nixdeleted−67
@@ -1,67 +0,0 @@
1−{ lib, stdenv, fetchurl, unzip, libjpeg, libtiff, zlib
2−, postgresql, mysql57, libgeotiff, python, pythonPackages, proj, geos, openssl
3−, libpng }:
4−
5−stdenv.mkDerivation rec {
6− pname = "gdal";
7− version = "1.11.5";
8−
9− src = fetchurl {
10− url = "https://download.osgeo.org/gdal/${version}/${pname}-${version}.tar.xz";
11− sha256 = "0hphxzvy23v3vqxx1y22hhhg4cypihrb8555y12nb4mrhzlw7zfl";
12− };
13−
14− nativeBuildInputs = [ unzip ];
15− buildInputs = [ libjpeg libtiff libgeotiff libpng python pythonPackages.numpy proj openssl ];
16−
17− patches = [
18− # This ensures that the python package is installed into gdal's prefix,
19− # rather than trying to install into python's prefix.
20− ./python.patch
21− ];
22−
23− hardeningDisable = [ "format" "fortify" ];
24−
25− # Don't use optimization for gcc >= 4.3. That's said to be causing segfaults.
26− # Unset CC and CXX as they confuse libtool.
27− preConfigure = "export CFLAGS=-O0 CXXFLAGS=-O0; unset CC CXX";
28−
29− configureFlags = [
30− "--with-jpeg=${libjpeg.dev}"
31− "--with-libtiff=${libtiff.dev}" # optional (without largetiff support)
32− "--with-libpng=${libpng.dev}" # optional
33− "--with-libz=${zlib.dev}" # optional
34−
35− "--with-pg=${postgresql}/bin/pg_config"
36− "--with-mysql=${mysql57.connector-c}/bin/mysql_config"
37− "--with-geotiff=${libgeotiff.dev}"
38− "--with-python" # optional
39− "--with-static-proj4=${proj}" # optional
40− "--with-geos=${geos}/bin/geos-config"# optional
41− ];
42−
43− # Allow use of old proj_api.h
44− NIX_CFLAGS_COMPILE = "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1";
45−
46− # Prevent this:
47− #
48− # Checking .pth file support in /nix/store/xkrmb8xnvqxzjwsdmasqmsdh1a5y2y99-gdal-1.11.2/lib/python2.7/site-packages/
49− # /nix/store/pbi1lgank10fy0xpjckbdpgacqw34dsz-python-2.7.9/bin/python -E -c pass
50− # TEST FAILED: /nix/store/xkrmb8xnvqxzjwsdmasqmsdh1a5y2y99-gdal-1.11.2/lib/python2.7/site-packages/ does NOT support .pth files
51− # error: bad install directory or PYTHONPATH
52− preBuild = ''
53− pythonInstallDir=$out/lib/${python.libPrefix}/site-packages
54− mkdir -p $pythonInstallDir
55− export PYTHONPATH=''${PYTHONPATH:+''${PYTHONPATH}:}$pythonInstallDir
56− '';
57−
58− enableParallelBuilding = true;
59−
60− meta = {
61− description = "Translator library for raster geospatial data formats";
62− homepage = "https://www.gdal.org/";
63− license = lib.licenses.mit;
64− maintainers = [ lib.maintainers.marcweber ];
65− platforms = with lib.platforms; linux ++ darwin;
66− };
67−}
pkgs/development/libraries/gdal/python.patchdeleted−17
@@ -1,17 +0,0 @@
1−diff --git a/swig/python/GNUmakefile.old b/swig/python/GNUmakefile
2−index b4d5e90..2160b83 100644
3−--- a/swig/python/GNUmakefile
4−+++ b/swig/python/GNUmakefile
5−@@ -67,11 +67,7 @@ egg:
6−
7− install:
8−
9−-ifeq ($(PY_HAVE_SETUPTOOLS),1)
10−- $(PYTHON) setup.py install
11−-else
12− $(PYTHON) setup.py install --prefix=$(DESTDIR)$(prefix)
13−-endif
14−
15− for f in $(SCRIPTS) ; do $(INSTALL) ./scripts/$$f $(DESTDIR)$(INST_BIN) ; done
16−
17−
pkgs/development/libraries/grib-api/default.nix+1−1
@@ -1,6 +1,6 @@
11{ fetchurl, fetchpatch, lib, stdenv,
22 cmake, netcdf, gfortran, libpng, openjpeg,
3− enablePython ? false, pythonPackages }:
3+ enablePython ? false, pythonPackages ? null }:
44
55stdenv.mkDerivation rec {
66 pname = "grib-api";
pkgs/development/libraries/hpx/default.nix+4−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, boost, cmake, hwloc, gperftools, pkg-config, python }:
1+{ lib, stdenv, fetchFromGitHub, boost, cmake, hwloc, gperftools, pkg-config, python3 }:
22
33stdenv.mkDerivation rec {
44 pname = "hpx";
@@ -12,7 +12,9 @@ stdenv.mkDerivation rec {
1212 };
1313
1414 buildInputs = [ boost hwloc gperftools ];
15− nativeBuildInputs = [ cmake pkg-config python ];
15+ nativeBuildInputs = [ cmake pkg-config python3 ];
16+
17+ strictDeps = true;
1618
1719 meta = {
1820 description = "C++ standard library for concurrency and parallelism";
pkgs/development/libraries/kde-frameworks/kapidox.nix+2−2
@@ -1,9 +1,9 @@
1−{ mkDerivation, lib, extra-cmake-modules, python }:
1+{ mkDerivation, lib, extra-cmake-modules, python3 }:
22
33mkDerivation {
44 name = "kapidox";
55 meta = { maintainers = [ lib.maintainers.ttuegel ]; };
6− nativeBuildInputs = [ extra-cmake-modules python ];
6+ nativeBuildInputs = [ extra-cmake-modules python3 python3.pkgs.setuptools ];
77 postFixup = ''
88 moveToOutput bin $bin
99 '';
pkgs/development/libraries/kmsxx/default.nix+3−2
@@ -1,5 +1,5 @@
11{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libdrm
2−, withPython ? false, python }:
2+, withPython ? false, python ? null }:
33
44stdenv.mkDerivation {
55 pname = "kmsxx";
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
1616 cmakeFlags = lib.optional (!withPython) "-DKMSXX_ENABLE_PYTHON=OFF";
1717
1818 nativeBuildInputs = [ cmake pkg-config ];
19− buildInputs = [ libdrm python ];
19+ buildInputs = [ libdrm ] ++ lib.optionals withPython [ python ];
2020
2121 meta = with lib; {
2222 description = "C++11 library, utilities and python bindings for Linux kernel mode setting";
@@ -24,5 +24,6 @@ stdenv.mkDerivation {
2424 license = licenses.mpl20;
2525 maintainers = with maintainers; [ gnidorah ];
2626 platforms = platforms.linux;
27+ broken = true; # marked broken 2021-03-26
2728 };
2829}
pkgs/development/libraries/libcint/default.nix+4−2
@@ -4,7 +4,7 @@
44, cmake
55, blas
66 # Check Inputs
7−, python
7+, python3
88}:
99
1010stdenv.mkDerivation rec {
@@ -26,8 +26,10 @@ stdenv.mkDerivation rec {
2626 "-DCMAKE_INSTALL_PREFIX=" # ends up double-adding /nix/store/... prefix, this avoids issue
2727 ];
2828
29+ strictDeps = true;
30+
2931 doCheck = true;
30− checkInputs = [ python.pkgs.numpy ];
32+ checkInputs = [ python3.pkgs.numpy ];
3133
3234 meta = with lib; {
3335 description = "General GTO integrals for quantum chemistry";
pkgs/development/libraries/libclc/default.nix+5−4
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, python, llvmPackages }:
1+{ lib, stdenv, fetchFromGitHub, python3, llvmPackages }:
22
33let
44 llvm = llvmPackages.llvm;
@@ -16,8 +16,9 @@ stdenv.mkDerivation {
1616 sha256 = "03l9frx3iw3qdsb9rrscgzdwm6872gv6mkssvn027ndf9y321xk7";
1717 };
1818
19− nativeBuildInputs = [ python ];
20− buildInputs = [ llvm clang clang-unwrapped ];
19+ nativeBuildInputs = [ python3 llvm ];
20+
21+ strictDeps = true;
2122
2223 postPatch = ''
2324 sed -i 's,llvm_clang =.*,llvm_clang = "${clang-unwrapped}/bin/clang",' configure.py
@@ -25,7 +26,7 @@ stdenv.mkDerivation {
2526 '';
2627
2728 configurePhase = ''
28− ${python.interpreter} ./configure.py --prefix=$out
29+ ${python3.interpreter} ./configure.py --prefix=$out
2930 '';
3031
3132 enableParallelBuilding = true;
pkgs/development/libraries/libinjection/default.nix+4−2
@@ -1,5 +1,5 @@
11{ lib, stdenv, fetchFromGitHub
2−, python
2+, python2
33}:
44
55stdenv.mkDerivation rec {
@@ -13,7 +13,9 @@ stdenv.mkDerivation rec {
1313 sha256 = "0chsgam5dqr9vjfhdcp8cgk7la6nf3lq44zs6z6si98cq743550g";
1414 };
1515
16− nativeBuildInputs = [ python ];
16+ nativeBuildInputs = [ python2 ];
17+
18+ strictDeps = true;
1719
1820 patchPhase = ''
1921 patchShebangs src
pkgs/development/libraries/liblinphone/default.nix+2
@@ -111,6 +111,8 @@ stdenv.mkDerivation rec {
111111 pkg-config
112112 ];
113113
114+ strictDeps = true;
115+
114116 # Some grammar files needed to be copied too from some dependencies. I suppose
115117 # if one define a dependency in such a way that its share directory is found,
116118 # then this copying would be unnecessary. Instead of actually copying these
pkgs/development/libraries/libplist/default.nix+1−1
@@ -1,4 +1,4 @@
1−{ lib, stdenv, autoreconfHook, fetchFromGitHub, pkg-config, enablePython ? false, python, glib }:
1+{ lib, stdenv, autoreconfHook, fetchFromGitHub, pkg-config, enablePython ? false, python ? null, glib }:
22
33stdenv.mkDerivation rec {
44 pname = "libplist";
pkgs/development/libraries/libredwg/default.nix+1−1
@@ -1,5 +1,5 @@
11{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, texinfo, pcre2
2−, enablePython ? false, python, swig, libxml2, ncurses
2+, enablePython ? false, python ? null, swig, libxml2, ncurses
33}:
44let
55 isPython3 = enablePython && python.pythonAtLeast "3";
pkgs/development/libraries/mbedtls/default.nix+4−2
@@ -4,7 +4,7 @@
44, cmake
55, ninja
66, perl # Project uses Perl for scripting and testing
7−, python
7+, python3
88
99, enableThreading ? true # Threading can be disabled to increase security https://tls.mbed.org/kb/development/thread-safety-and-multi-threading
1010}:
@@ -20,7 +20,9 @@ stdenv.mkDerivation rec {
2020 sha256 = "0mz7n373b8d287crwi6kq2hb8ryyi228j38h25744lqai23qj5cf";
2121 };
2222
23− nativeBuildInputs = [ cmake ninja perl python ];
23+ nativeBuildInputs = [ cmake ninja perl python3 ];
24+
25+ strictDeps = true;
2426
2527 postConfigure = lib.optionals enableThreading ''
2628 perl scripts/config.pl set MBEDTLS_THREADING_C # Threading abstraction layer
pkgs/development/libraries/mediastreamer/default.nix+2
@@ -87,6 +87,8 @@ stdenv.mkDerivation rec {
8787 srtp
8888 ];
8989
90+ strictDeps = true;
91+
9092 # Do not build static libraries
9193 cmakeFlags = [ "-DENABLE_STATIC=NO" ];
9294
pkgs/development/tools/analysis/kcov/default.nix+5−3
@@ -1,4 +1,4 @@
1−{lib, stdenv, fetchFromGitHub, cmake, pkg-config, zlib, curl, elfutils, python, libiberty, libopcodes}:
1+{lib, stdenv, fetchFromGitHub, cmake, pkg-config, zlib, curl, elfutils, python3, libiberty, libopcodes}:
22
33stdenv.mkDerivation rec {
44 pname = "kcov";
@@ -12,9 +12,11 @@ stdenv.mkDerivation rec {
1212 };
1313
1414 preConfigure = "patchShebangs src/bin-to-c-source.py";
15− nativeBuildInputs = [ cmake pkg-config ];
15+ nativeBuildInputs = [ cmake pkg-config python3 ];
1616
17− buildInputs = [ zlib curl elfutils python libiberty libopcodes ];
17+ buildInputs = [ curl zlib elfutils libiberty libopcodes ];
18+
19+ strictDeps = true;
1820
1921 meta = with lib; {
2022 description = "Code coverage tester for compiled programs, Python scripts and shell scripts";
pkgs/development/tools/build-managers/gup/default.nix+4−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, nix-update-source, lib, python
1+{ stdenv, fetchFromGitHub, nix-update-source, lib, python3
22, which, runtimeShell, pychecker ? null }:
33stdenv.mkDerivation rec {
44 version = "0.7.0";
@@ -9,7 +9,9 @@ stdenv.mkDerivation rec {
99 sha256 = "1pwnmlq2pgkkln9sgz4wlb9dqlqw83bkf105qljnlvggc21zm3pv";
1010 };
1111 pname = "gup";
12− buildInputs = lib.remove null [ python which pychecker ];
12+ nativeBuildInputs = [ python3 which pychecker ];
13+ buildInputs = [ python3 ];
14+ strictDeps = true;
1315 SKIP_PYCHECKER = pychecker == null;
1416 buildPhase = "make python";
1517 installPhase = ''
pkgs/development/tools/grabserial/default.nix+6−3
@@ -1,6 +1,6 @@
1−{ lib, fetchFromGitHub, pythonPackages }:
1+{ lib, fetchFromGitHub, python3Packages }:
22
3−pythonPackages.buildPythonApplication rec {
3+python3Packages.buildPythonApplication rec {
44 pname = "grabserial";
55 version = "2.0.2";
66
@@ -11,7 +11,10 @@ pythonPackages.buildPythonApplication rec {
1111 sha256 = "0ryk4w8q6zfmia71nwnk5b7xaxw0sf45dw9q50xp7k76i3k5f9f3";
1212 };
1313
14− propagatedBuildInputs = [ pythonPackages.pyserial ];
14+ propagatedBuildInputs = [ python3Packages.pyserial ];
15+
16+ # no usable tests
17+ doCheck = false;
1518
1619 meta = with lib; {
1720 description = "Python based serial dump and timing program";
pkgs/development/tools/hexio/default.nix+4−3
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, python, pcsclite, pth }:
1+{ lib, stdenv, fetchFromGitHub, pcsclite, pth, python2 }:
22
33stdenv.mkDerivation rec {
44 pname = "hexio";
@@ -11,8 +11,9 @@ stdenv.mkDerivation rec {
1111 repo = "hexio";
1212 };
1313
14− propagatedBuildInputs = [ python ];
15− buildInputs = [ pcsclite pth ];
14+ strictDeps = true;
15+
16+ buildInputs = [ pcsclite pth python2 ];
1617
1718 patchPhase = ''
1819 substituteInPlace Makefile \
pkgs/development/tools/misc/gede/default.nix+4−2
@@ -1,4 +1,4 @@
1−{ mkDerivation, lib, fetchurl, makeWrapper, python, qmake, ctags, gdb }:
1+{ mkDerivation, lib, fetchurl, makeWrapper, python3, qmake, ctags, gdb }:
22
33mkDerivation rec {
44 pname = "gede";
@@ -9,10 +9,12 @@ mkDerivation rec {
99 sha256 = "0hbsy2ymzgl8xd9mnh43gxdfncy7g6czxfvfyh7zp3ij8yiwf8x3";
1010 };
1111
12− nativeBuildInputs = [ qmake makeWrapper python ];
12+ nativeBuildInputs = [ qmake makeWrapper python3 ];
1313
1414 buildInputs = [ ctags ];
1515
16+ strictDeps = true;
17+
1618 dontUseQmakeConfigure = true;
1719
1820 buildPhase = ":";
pkgs/development/tools/misc/global/default.nix+7−5
@@ -1,8 +1,10 @@
11{ fetchurl, lib, stdenv, libtool, makeWrapper
2−, coreutils, ctags, ncurses, pythonPackages, sqlite, universal-ctags
2+, coreutils, ctags, ncurses, python3Packages, sqlite, universal-ctags
33}:
44
5−stdenv.mkDerivation rec {
5+let
6+ pygments = python3Packages.pygments;
7+in stdenv.mkDerivation rec {
68 pname = "global";
79 version = "6.6.5";
810
@@ -15,7 +17,7 @@ stdenv.mkDerivation rec {
1517
1618 buildInputs = [ ncurses ];
1719
18− propagatedBuildInputs = [ pythonPackages.pygments ];
20+ propagatedBuildInputs = [ pygments ];
1921
2022 configureFlags = [
2123 "--with-ltdl-include=${libtool}/include"
@@ -34,9 +36,9 @@ stdenv.mkDerivation rec {
3436 cp -v *.el "$out/share/emacs/site-lisp"
3537
3638 wrapProgram $out/bin/gtags \
37− --prefix PYTHONPATH : "$(toPythonPath ${pythonPackages.pygments})"
39+ --prefix PYTHONPATH : "$(toPythonPath ${pygments})"
3840 wrapProgram $out/bin/global \
39− --prefix PYTHONPATH : "$(toPythonPath ${pythonPackages.pygments})"
41+ --prefix PYTHONPATH : "$(toPythonPath ${pygments})"
4042 '';
4143
4244 meta = with lib; {
pkgs/development/tools/misc/jscoverage/default.nix+4−3
@@ -1,4 +1,4 @@
1−{ autoconf, fetchurl, makedepend, perl, python, lib, stdenv, unzip, zip }:
1+{ autoconf, fetchurl, makedepend, perl, python3, lib, stdenv, unzip, zip }:
22
33stdenv.mkDerivation rec {
44 name = "jscoverage-0.5.1";
@@ -12,8 +12,9 @@ stdenv.mkDerivation rec {
1212 ./jsfalse_to_null.patch
1313 ];
1414
15− nativeBuildInputs = [ unzip ];
16− buildInputs = [ autoconf makedepend perl python zip ];
15+ nativeBuildInputs = [ unzip perl python3 zip ];
16+
17+ strictDeps = true;
1718
1819 # It works without MOZ_FIX_LINK_PATHS, circumventing an impurity
1920 # issue. Maybe we could kick js/ (spidermonkey) completely and
pkgs/development/tools/misc/kconfig-frontends/default.nix+5−7
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, pkg-config, bison, flex, gperf, ncurses, pythonPackages }:
1+{ lib, stdenv, fetchurl, pkg-config, bison, flex, gperf, ncurses, python3, bash }:
22
33stdenv.mkDerivation rec {
44 basename = "kconfig-frontends";
@@ -10,17 +10,15 @@ stdenv.mkDerivation rec {
1010 url = "http://ymorin.is-a-geek.org/download/${basename}/${name}.tar.xz";
1111 };
1212
13− nativeBuildInputs = [ pkg-config ];
14− buildInputs = [ bison flex gperf ncurses pythonPackages.python pythonPackages.wrapPython ];
13+ nativeBuildInputs = [ bison flex gperf pkg-config ];
14+ buildInputs = [ bash ncurses python3 ];
15+
16+ strictDeps = true;
1517
1618 configureFlags = [
1719 "--enable-frontends=conf,mconf,nconf"
1820 ];
1921
20− postInstall = ''
21− wrapPythonPrograms
22− '';
23−
2422 NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=format-security";
2523
2624 meta = with lib; {
pkgs/games/gemrb/default.nix+2−2
@@ -1,5 +1,5 @@
11{ lib, stdenv, fetchFromGitHub, cmake
2−, freetype, SDL2, SDL2_mixer, openal, zlib, libpng, python, libvorbis
2+, freetype, SDL2, SDL2_mixer, openal, zlib, libpng, python2, libvorbis
33, libiconv }:
44
55stdenv.mkDerivation rec {
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515
1616 # TODO: make libpng, libvorbis, sdl_mixer, freetype, vlc, glew (and other gl
1717 # reqs) optional
18− buildInputs = [ freetype python openal SDL2 SDL2_mixer zlib libpng libvorbis libiconv ];
18+ buildInputs = [ freetype python2 openal SDL2 SDL2_mixer zlib libpng libvorbis libiconv ];
1919
2020 nativeBuildInputs = [ cmake ];
2121
pkgs/games/gnubg/default.nix+5−3
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, pkg-config, glib, python, gtk2, readline }:
1+{ lib, stdenv, fetchurl, pkg-config, glib, python3, gtk2, readline }:
22
33let version = "1.06.002"; in
44stdenv.mkDerivation {
@@ -9,8 +9,10 @@ stdenv.mkDerivation {
99 sha256 = "11xwhcli1h12k6rnhhyq4jphzrhfik7i8ah3k32pqw803460n6yf";
1010 };
1111
12− nativeBuildInputs = [ pkg-config ];
13− buildInputs = [ python glib gtk2 readline ];
12+ nativeBuildInputs = [ pkg-config python3 glib ];
13+ buildInputs = [ gtk2 readline ];
14+
15+ strictDeps = true;
1416
1517 configureFlags = [ "--with-gtk" "--with--board3d" ];
1618
pkgs/misc/gnuk/generic.nix+2−2
@@ -1,5 +1,5 @@
11{ lib, stdenv, gcc-arm-embedded, binutils-arm-embedded, makeWrapper
2−, python, pythonPackages
2+, python2Packages
33
44# Extra options
55, device ? "fsij", vid ? "234b", pid ? "0000"
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
1515 inherit src;
1616
1717 nativeBuildInputs = [ gcc-arm-embedded binutils-arm-embedded makeWrapper ];
18− buildInputs = [ python ] ++ (with pythonPackages; [ pyusb colorama ]);
18+ buildInputs = with python2Packages; [ python pyusb colorama ];
1919
2020 configurePhase = ''
2121 cd src
pkgs/os-specific/linux/libnl/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, file, lib, fetchFromGitHub, autoreconfHook, bison, flex, pkg-config
2−, pythonSupport ? false, swig ? null, python}:
2+, pythonSupport ? false, swig ? null, python ? null}:
33
44stdenv.mkDerivation rec {
55 pname = "libnl";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
2121
2222 postBuild = lib.optionalString (pythonSupport) ''
2323 cd python
24− ${python}/bin/python setup.py install --prefix=../pythonlib
24+ ${python.interpreter} setup.py install --prefix=../pythonlib
2525 cd -
2626 '';
2727
pkgs/servers/irker/default.nix+4−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitLab, python, pkg-config
1+{ lib, stdenv, fetchFromGitLab, python3, pkg-config
22, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_412 }:
33
44stdenv.mkDerivation {
@@ -15,12 +15,14 @@ stdenv.mkDerivation {
1515 nativeBuildInputs = [ pkg-config xmlto docbook2x docbook_xsl docbook_xml_dtd_412 ];
1616
1717 buildInputs = [
18− python
18+ python3
1919 # Needed for proxy support I believe, which I haven't tested.
2020 # Probably needs to be propagated and some wrapPython magic
2121 # python.pkgs.pysocks
2222 ];
2323
24+ strictDeps = true;
25+
2426 postPatch = ''
2527 substituteInPlace Makefile \
2628 --replace '-o 0 -g 0' ""
pkgs/servers/kippo/default.nixdeleted−100
@@ -1,100 +0,0 @@
1−# This is the installation portion of kippo.
2−# This is somewhat jumbled together. There is no "easy_install" for kippo,
3−# and there isn't a way to regenerate the twistd plugin cache.
4−#
5−# Use the services.kippo options to properly configure if on NixOS.
6−# On other platforms there is a problem with hardcoded paths.
7−# Your best bet is to change kippo source to customise
8−# or manually copy the proper filesystems.
9−# At a minimum the following are required in /var/lib/kippo:
10−# honeyfs/
11−# fs.pickle
12−# data/
13−# txtcmds/
14−#
15−# There is also benefit in preparing /var/log/kippo
16−# tty/
17−# dl/
18−#
19−# Most of these files need read/write permissions.
20−#
21−# Read only files: kippo.tac and kippo.cfg
22−#
23−# Execution may look like this:
24−# twistd -y kippo.tac --syslog --pidfile=kippo.pid
25−#
26−# Use this package at your own risk.
27−
28−{lib, stdenv, fetchurl, pythonPackages }:
29−
30−let
31−
32− twisted_13 = pythonPackages.buildPythonPackage rec {
33− # NOTE: When updating please check if new versions still cause issues
34− # to packages like carbon (http://stackoverflow.com/questions/19894708/cant-start-carbon-12-04-python-error-importerror-cannot-import-name-daem)
35− disabled = pythonPackages.isPy3k;
36−
37− name = "Twisted-13.2.0";
38− src = fetchurl {
39− url = "mirror://pypi/T/Twisted/${name}.tar.bz2";
40− sha256 = "1wrcqv5lvgwk2aq83qb2s2ng2vx14hbjjk2gc30cg6h1iiipal89";
41− };
42−
43− propagatedBuildInputs = with pythonPackages; [ zope_interface ];
44−
45− # Generate Twisted's plug-in cache. Twited users must do it as well. See
46− # http://twistedmatrix.com/documents/current/core/howto/plugin.html#auto3
47− # and http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=477103 for
48− # details.
49− postInstall = "$out/bin/twistd --help > /dev/null";
50−
51− meta = with lib; {
52− homepage = "https://twistedmatrix.com/";
53− description = "Twisted, an event-driven networking engine written in Python";
54− longDescription = ''
55− Twisted is an event-driven networking engine written in Python
56− and licensed under the MIT license.
57− '';
58− license = licenses.mit;
59− };
60− };
61−
62−in stdenv.mkDerivation rec {
63− pname = "kippo";
64− version = "0.8";
65− src = fetchurl {
66− url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/kippo/${pname}-${version}.tar.gz";
67− sha256 = "0rd2mk36d02qd24z8s4xyy64fy54rzpar4379iq4dcjwg7l7f63d";
68− };
69− buildInputs = with pythonPackages; [ pycrypto pyasn1 twisted_13 ];
70− installPhase = ''
71− substituteInPlace ./kippo.tac --replace "kippo.cfg" "$out/src/kippo.cfg"
72− substituteInPlace ./kippo.cfg --replace "log_path = log" "log_path = /var/log/kippo" \
73− --replace "download_path = dl" "download_path = /var/log/kippo/dl" \
74− --replace "contents_path = honeyfs" "filesystem_file = /var/lib/kippo/honeyfs" \
75− --replace "filesystem_file = fs.pickle" "filesystem_file = /var/lib/kippo/fs.pickle" \
76− --replace "data_path = data" "data_path = /var/lib/kippo/data" \
77− --replace "txtcmds_path = txtcmds" "txtcmds_path = /var/lib/kippo/txtcmds" \
78− --replace "public_key = public.key" "public_key = /var/lib/kippo/keys/public.key" \
79− --replace "private_key = private.key" "private_key = /var/lib/kippo/keys/private.key"
80− mkdir -p $out/bin
81− mkdir -p $out/src
82− mv ./* $out/src
83− mv $out/src/utils/* $out/bin
84− '';
85−
86− passthru.twisted = twisted_13;
87−
88− meta = with lib; {
89− homepage = "https://github.com/desaster/kippo";
90− description = "SSH Honeypot";
91− longDescription = ''
92− Default port is 2222. Recommend using something like this for port redirection to default SSH port:
93− networking.firewall.extraCommands = '''
94− iptables -t nat -A PREROUTING -i IN_IFACE -p tcp --dport 22 -j REDIRECT --to-port 2222''' '';
95− license = licenses.bsd3;
96− platforms = platforms.linux;
97− maintainers = with maintainers; [ tomberek ];
98− broken = true; # 2018-09-12, failed on hydra since 2017-12-11
99− };
100−}
pkgs/shells/ksh/default.nix+4−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, meson, ninja, fetchFromGitHub, which, python, fetchpatch
1+{ lib, stdenv, meson, ninja, fetchFromGitHub, which, python3, fetchpatch
22, libiconv }:
33
44stdenv.mkDerivation rec {
@@ -19,10 +19,12 @@ stdenv.mkDerivation rec {
1919 })
2020 ];
2121
22− nativeBuildInputs = [ meson ninja which python ];
22+ nativeBuildInputs = [ meson ninja which python3 ];
2323
2424 buildInputs = [ libiconv ];
2525
26+ strictDeps = true;
27+
2628 meta = with lib; {
2729 description = "KornShell Command And Programming Language";
2830 longDescription = ''
pkgs/tools/archivers/innoextract/default.nix+7−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, cmake, makeWrapper, python
1+{ lib, stdenv, fetchurl, cmake, makeWrapper
22, boost, lzma
33, withGog ? false, unar ? null }:
44
@@ -10,10 +10,15 @@ stdenv.mkDerivation rec {
1010 sha256 = "09l1z1nbl6ijqqwszdwch9mqr54qb7df0wp2sd77v17dq6gsci33";
1111 };
1212
13− buildInputs = [ python lzma boost ];
13+ buildInputs = [ lzma boost ];
14+
15+ # Python is reported as missing during the build, however
16+ # including Python does not change the output.
1417
1518 nativeBuildInputs = [ cmake makeWrapper ];
1619
20+ strictDeps = true;
21+
1722 # we need unar to for multi-archive extraction
1823 postFixup = lib.optionalString withGog ''
1924 wrapProgram $out/bin/innoextract \
pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix+1−1
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, which, ninja, python, pkg-config, protobuf
1+{ lib, stdenv, fetchFromGitHub, which, ninja, pkg-config, protobuf
22, ibus, gtk2, zinnia, qt5, libxcb, tegaki-zinnia-japanese, python3Packages }:
33
44let
pkgs/tools/misc/i3minator/default.nix+3−3
@@ -1,6 +1,6 @@
1−{ lib, fetchFromGitHub, pythonPackages, glibcLocales }:
1+{ lib, fetchFromGitHub, python3Packages, glibcLocales }:
22
3−pythonPackages.buildPythonApplication rec {
3+python3Packages.buildPythonApplication rec {
44 pname = "i3minator";
55 version = "0.0.4";
66
@@ -13,7 +13,7 @@ pythonPackages.buildPythonApplication rec {
1313
1414 LC_ALL = "en_US.UTF-8";
1515 buildInputs = [ glibcLocales ];
16− propagatedBuildInputs = [ pythonPackages.pyyaml pythonPackages.i3-py ];
16+ propagatedBuildInputs = [ python3Packages.pyyaml python3Packages.i3-py ];
1717
1818 # No tests
1919 doCheck = false;
pkgs/tools/networking/httpstat/default.nix+2−2
@@ -1,6 +1,6 @@
1−{ lib, fetchFromGitHub, curl, pythonPackages, glibcLocales }:
1+{ lib, fetchFromGitHub, curl, python3Packages, glibcLocales }:
22
3−pythonPackages.buildPythonApplication rec {
3+python3Packages.buildPythonApplication rec {
44 pname = "httpstat";
55 version = "1.3.1";
66 src = fetchFromGitHub {
pkgs/tools/networking/libreswan/default.nix+13−5
@@ -1,12 +1,12 @@
11{ lib, stdenv, fetchurl, makeWrapper,
22 pkg-config, systemd, gmp, unbound, bison, flex, pam, libevent, libcap_ng, curl, nspr,
3− bash, iproute, iptables, procps, coreutils, gnused, gawk, nss, which, python,
3+ bash, iproute, iptables, procps, coreutils, gnused, gawk, nss, which, python3,
44 docs ? false, xmlto, libselinux, ldns
55 }:
66
77let
88 binPath = lib.makeBinPath [
9− bash iproute iptables procps coreutils gnused gawk nss.tools which python
9+ bash iproute iptables procps coreutils gnused gawk nss.tools which python3
1010 ];
1111in
1212
@@ -22,6 +22,8 @@ stdenv.mkDerivation rec {
2222 sha256 = "0bj3g6qwd3ir3gk6hdl9npy3k44shf56vcgjahn30qpmx3z5fsr3";
2323 };
2424
25+ strictDeps = true;
26+
2527 # These flags were added to compile v3.18. Try to lift them when updating.
2628 NIX_CFLAGS_COMPILE = toString [ "-Wno-error=redundant-decls" "-Wno-error=format-nonliteral"
2729 # these flags were added to build with gcc7
@@ -35,9 +37,15 @@ stdenv.mkDerivation rec {
3537 "-DNSS_PKCS11_2_0_COMPAT=1"
3638 ];
3739
38− nativeBuildInputs = [ makeWrapper pkg-config ];
39− buildInputs = [ bash iproute iptables systemd coreutils gnused gawk gmp unbound bison flex pam libevent
40− libcap_ng curl nspr nss python ldns ]
40+ nativeBuildInputs = [
41+ bison
42+ flex
43+ makeWrapper
44+ pkg-config
45+ ];
46+
47+ buildInputs = [ bash iproute iptables systemd coreutils gnused gawk gmp unbound pam libevent
48+ libcap_ng curl nspr nss python3 ldns ]
4149 ++ lib.optional docs xmlto
4250 ++ lib.optional stdenv.isLinux libselinux;
4351
pkgs/tools/security/gen-oath-safe/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ coreutils, fetchFromGitHub, file, libcaca, makeWrapper, python, openssl, qrencode, lib, stdenv, yubikey-manager }:
1+{ coreutils, fetchFromGitHub, file, libcaca, makeWrapper, python3, openssl, qrencode, lib, stdenv, yubikey-manager }:
22
33stdenv.mkDerivation rec {
44 pname = "gen-oath-safe";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
2121 file
2222 libcaca.bin
2323 openssl.bin
24− python
24+ python3
2525 qrencode
2626 yubikey-manager
2727 ];
pkgs/tools/security/hash-slinger/default.nix+3−3
@@ -1,7 +1,7 @@
1−{ lib, stdenv, fetchFromGitHub, pythonPackages, unbound, libreswan }:
1+{ lib, stdenv, fetchFromGitHub, python2Packages, unbound, libreswan }:
22
33let
4− inherit (pythonPackages) python;
4+ pythonPackages = python2Packages;
55in stdenv.mkDerivation rec {
66 pname = "hash-slinger";
77 version = "2.7";
@@ -31,7 +31,7 @@ in stdenv.mkDerivation rec {
3131 '';
3232
3333 installPhase = ''
34− mkdir -p $out/bin $out/man $out/${python.sitePackages}/
34+ mkdir -p $out/bin $out/man $out/${pythonPackages.python.sitePackages}/
3535 make install
3636 wrapPythonPrograms
3737 '';
pkgs/tools/system/honcho/default.nix+4−5
@@ -1,15 +1,14 @@
1−{ lib, fetchFromGitHub, pythonPackages }:
1+{ lib, fetchFromGitHub, python3Packages }:
22
33let
4− inherit (pythonPackages) python;
4+ inherit (python3Packages) python;
55 pname = "honcho";
66
77in
88
9−pythonPackages.buildPythonApplication rec {
9+python3Packages.buildPythonApplication rec {
1010 name = "${pname}-${version}";
1111 version = "1.0.1";
12− namePrefix = "";
1312
1413 src = fetchFromGitHub {
1514 owner = "nickstenning";
@@ -18,7 +17,7 @@ pythonPackages.buildPythonApplication rec {
1817 sha256 = "11bd87474qpif20xdcn0ra1idj5k16ka51i658wfpxwc6nzsn92b";
1918 };
2019
21− checkInputs = with pythonPackages; [ jinja2 pytest mock coverage ];
20+ checkInputs = with python3Packages; [ jinja2 pytest mock coverage ];
2221
2322 buildPhase = ''
2423 ${python.interpreter} setup.py build
pkgs/tools/text/icdiff/default.nix+16−2
@@ -1,6 +1,6 @@
1−{ lib, fetchFromGitHub, pythonPackages }:
1+{ lib, fetchFromGitHub, python3Packages, bash, git, less }:
22
3−pythonPackages.buildPythonApplication rec {
3+python3Packages.buildPythonApplication rec {
44 pname = "icdiff";
55 version = "1.9.5";
66
@@ -11,6 +11,20 @@ pythonPackages.buildPythonApplication rec {
1111 sha256 = "080v8h09pv8qwplin4kwfm0kmqjwdqjfxbpcdrv16sv4hwfwl5qd";
1212 };
1313
14+ checkInputs = [
15+ bash
16+ git
17+ less
18+ ];
19+
20+ # error: could not lock config file /homeless-shelter/.gitconfig: No such file or directory
21+ doCheck = false;
22+
23+ checkPhase = ''
24+ patchShebangs test.sh
25+ ./test.sh ${python3Packages.python.interpreter}
26+ '';
27+
1428 meta = with lib; {
1529 homepage = "https://www.jefftk.com/icdiff";
1630 description = "Side-by-side highlighted command line diffs";
pkgs/top-level/aliases.nix+1
@@ -225,6 +225,7 @@ mapAliases ({
225225 fwupdate = throw "fwupdate was merged into fwupd"; # added 2020-05-19
226226 g4py = python3Packages.geant4; # added 2020-06-06
227227 gccApple = throw "gccApple is no longer supported"; # added 2018-04-25
228+ gdal_1_11 = throw "gdal_1_11 was removed. Use gdal instead."; # added 2021-04-03
228229 gdb-multitarget = gdb; # added 2017-11-13
229230 gdk_pixbuf = gdk-pixbuf; # added 2019-05-22
230231 gettextWithExpat = gettext; # 2016-02-19
pkgs/top-level/all-packages.nix+5−9
@@ -5945,8 +5945,6 @@ in
59455945
59465946 kdbg = libsForQt5.callPackage ../development/tools/misc/kdbg { };
59475947
5948− kippo = callPackage ../servers/kippo { };
5949−
59505948 kristall = libsForQt5.callPackage ../applications/networking/browsers/kristall { };
59515949
59525950 lagrange = callPackage ../applications/networking/browsers/lagrange {
@@ -14266,8 +14264,6 @@ in
1426614264 autoreconfHook = buildPackages.autoreconfHook269;
1426714265 };
1426814266
14269− gdal_1_11 = callPackage ../development/libraries/gdal/gdal-1_11.nix { };
14270−
1427114267 gdal_2 = callPackage ../development/libraries/gdal/2.4.nix { };
1427214268
1427314269 gdcm = callPackage ../development/libraries/gdcm { };
@@ -15362,7 +15358,9 @@ in
1536215358
1536315359 libgxps = callPackage ../development/libraries/libgxps { };
1536415360
15365− libiio = callPackage ../development/libraries/libiio { };
15361+ libiio = callPackage ../development/libraries/libiio {
15362+ python = python3;
15363+ };
1536615364
1536715365 libinjection = callPackage ../development/libraries/libinjection { };
1536815366
@@ -22783,7 +22781,7 @@ in
2278322781
2278422782 gthumb = callPackage ../applications/graphics/gthumb { };
2278522783
22786− gtimelog = pythonPackages.gtimelog;
22784+ gtimelog = with python3Packages; toPythonApplication gtimelog;
2278722785
2278822786 inherit (gnome3) gucharmap;
2278922787
@@ -27454,9 +27452,7 @@ in
2745427452
2745527453 icbm3d = callPackage ../games/icbm3d { };
2745627454
27457− ingen = callPackage ../applications/audio/ingen {
27458− inherit (pythonPackages) rdflib;
27459− };
27455+ ingen = callPackage ../applications/audio/ingen { };
2746027456
2746127457 ideogram = callPackage ../applications/graphics/ideogram { };
2746227458
pkgs/top-level/gnuradio-packages.nix+1
@@ -31,6 +31,7 @@ in {
3131 ### Packages
3232
3333 inherit gnuradio;
34+ inherit (gnuradio) python;
3435
3536 osmosdr = callPackage ../development/gnuradio-modules/osmosdr/default.nix { };
3637