nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 16:33:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

python,pythonPackages: make aliases

Browse Source 
Since aliases are disallowed in nixpkgs, this makes usage of Python 2
which is EOL more explicit.
This commit is contained in:
Robert Schütz 2022-01-11 23:40:02 +00:00
parent 9356c3472c
commit d5cceedbd1
85 changed files with 221 additions and 223 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/blockchains/chia-plotter/default.nix
View File

@ -4,7 +4,7 @@
, libsodium , libsodium
, cmake , cmake
, substituteAll , substituteAll
, pythonPackages , python3Packages
}: }:
stdenv.mkDerivation { stdenv.mkDerivation {
@ -23,7 +23,7 @@ stdenv.mkDerivation {
# prevent CMake from trying to get libraries on the Internet # prevent CMake from trying to get libraries on the Internet
(substituteAll { (substituteAll {
src = ./dont_fetch_dependencies.patch; src = ./dont_fetch_dependencies.patch;
pybind11_src = pythonPackages.pybind11.src; pybind11_src = python3Packages.pybind11.src;
relic_src = fetchFromGitHub { relic_src = fetchFromGitHub {
owner = "relic-toolkit"; owner = "relic-toolkit";
repo = "relic"; repo = "relic";

4
pkgs/applications/editors/tiled/default.nix
View File

@ -1,5 +1,5 @@
{ lib, mkDerivation, fetchFromGitHub, pkg-config, qmake { lib, mkDerivation, fetchFromGitHub, pkg-config, qmake
, python, qtbase, qttools }: , python2, qtbase, qttools }:
mkDerivation rec { mkDerivation rec {
pname = "tiled"; pname = "tiled";
@ -13,7 +13,7 @@ mkDerivation rec {
}; };
nativeBuildInputs = [ pkg-config qmake ]; nativeBuildInputs = [ pkg-config qmake ];
buildInputs = [ python qtbase qttools ]; buildInputs = [ python2 qtbase qttools ];
meta = with lib; { meta = with lib; {
description = "Free, easy to use and flexible tile map editor"; description = "Free, easy to use and flexible tile map editor";

4
pkgs/applications/editors/wxhexeditor/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, wxGTK, autoconf, automake, libtool, python, gettext }: { lib, stdenv, fetchFromGitHub, fetchpatch, wxGTK, autoconf, automake, libtool, python2, gettext }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "wxHexEditor"; pname = "wxHexEditor";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "08xnhaif8syv1fa0k6lc3jm7yg2k50b02lyds8w0jyzh4xi5crqj"; sha256 = "08xnhaif8syv1fa0k6lc3jm7yg2k50b02lyds8w0jyzh4xi5crqj";
}; };
buildInputs = [ wxGTK autoconf automake libtool python gettext ]; buildInputs = [ wxGTK autoconf automake libtool python2 gettext ];
preConfigure = "patchShebangs ."; preConfigure = "patchShebangs .";

6
pkgs/applications/graphics/screencloud/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, cmake, qt4, quazip, qt-mobility, qxt, pythonPackages }: { lib, stdenv, fetchFromGitHub, cmake, qt4, quazip, qt-mobility, qxt, python2Packages }:
with lib; with lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ qt4 quazip qt-mobility qxt pythonPackages.python pythonPackages.pycrypto ]; buildInputs = [ qt4 quazip qt-mobility qxt python2Packages.python python2Packages.pycrypto ];
patchPhase = '' patchPhase = ''
# Required to make the configure script work. Normally, screencloud's # Required to make the configure script work. Normally, screencloud's
@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
postInstall = '' postInstall = ''
patchShebangs $prefix/opt/screencloud/screencloud.sh patchShebangs $prefix/opt/screencloud/screencloud.sh
substituteInPlace "$prefix/opt/screencloud/screencloud.sh" --replace "/opt" "$prefix/opt" substituteInPlace "$prefix/opt/screencloud/screencloud.sh" --replace "/opt" "$prefix/opt"
sed -i "2 i\export PYTHONPATH=$(toPythonPath ${pythonPackages.pycrypto}):\$PYTHONPATH" "$prefix/opt/screencloud/screencloud.sh" sed -i "2 i\export PYTHONPATH=$(toPythonPath ${python2Packages.pycrypto}):\$PYTHONPATH" "$prefix/opt/screencloud/screencloud.sh"
mkdir $prefix/bin mkdir $prefix/bin
mkdir $prefix/lib mkdir $prefix/lib
ln -s $prefix/opt/screencloud/screencloud.sh $prefix/bin/screencloud ln -s $prefix/opt/screencloud/screencloud.sh $prefix/bin/screencloud

6
pkgs/applications/misc/ocropus/default.nix
View File

@ -1,4 +1,4 @@
{ lib, fetchFromGitHub, fetchurl, pythonPackages, curl }: { lib, fetchFromGitHub, fetchurl, python2Packages, curl }:
let let
getmodel = name: sha256: { getmodel = name: sha256: {
@ -17,7 +17,7 @@ let
]; ];
in in
pythonPackages.buildPythonApplication rec { python2Packages.buildPythonApplication rec {
pname = "ocropus"; pname = "ocropus";
version = "1.3.3"; version = "1.3.3";
@ -28,7 +28,7 @@ pythonPackages.buildPythonApplication rec {
owner = "tmbdev"; owner = "tmbdev";
}; };
propagatedBuildInputs = with pythonPackages; [ curl numpy scipy pillow propagatedBuildInputs = with python2Packages; [ curl numpy scipy pillow
matplotlib beautifulsoup4 pygtk lxml ]; matplotlib beautifulsoup4 pygtk lxml ];
enableParallelBuilding = true; enableParallelBuilding = true;

8
pkgs/applications/misc/pdfdiff/default.nix
View File

@ -1,6 +1,6 @@
{ lib, pythonPackages, fetchurl, xpdf }: { lib, python2Packages, fetchurl, xpdf }:
let let
py = pythonPackages; py = python2Packages;
in in
py.buildPythonApplication rec { py.buildPythonApplication rec {
name = "pdfdiff-${version}"; name = "pdfdiff-${version}";
@ -11,7 +11,7 @@ py.buildPythonApplication rec {
sha256 = "0zxwjjbklz87wkbhkmsvhc7xmv5php7m2a9vm6ydhmhlxsybf836"; sha256 = "0zxwjjbklz87wkbhkmsvhc7xmv5php7m2a9vm6ydhmhlxsybf836";
}; };
buildInputs = [ pythonPackages.wrapPython ]; buildInputs = [ python2Packages.wrapPython ];
dontConfigure = true; dontConfigure = true;
dontBuild = true; dontBuild = true;
@ -29,7 +29,7 @@ py.buildPythonApplication rec {
cp pdfdiff.py $out/bin/pdfdiff cp pdfdiff.py $out/bin/pdfdiff
chmod +x $out/bin/pdfdiff chmod +x $out/bin/pdfdiff
substituteInPlace $out/bin/pdfdiff --replace "#!/usr/bin/python" "#!${pythonPackages.python.interpreter}" substituteInPlace $out/bin/pdfdiff --replace "#!/usr/bin/python" "#!${python2Packages.python.interpreter}"
''; '';
meta = with lib; { meta = with lib; {

8
pkgs/applications/misc/phwmon/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitLab, pythonPackages }: { lib, stdenv, fetchFromGitLab, python2Packages }:
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "phwmon"; pname = "phwmon";
@ -11,11 +11,11 @@ stdenv.mkDerivation {
sha256 = "1hqmsq66y8bqkpvszw84jyk8haxq3cjnz105hlkmp7786vfmkisq"; sha256 = "1hqmsq66y8bqkpvszw84jyk8haxq3cjnz105hlkmp7786vfmkisq";
}; };
nativeBuildInputs = [ pythonPackages.wrapPython ]; nativeBuildInputs = [ python2Packages.wrapPython ];
buildInputs = [ pythonPackages.pygtk pythonPackages.psutil ]; buildInputs = [ python2Packages.pygtk python2Packages.psutil ];
pythonPath = [ pythonPackages.pygtk pythonPackages.psutil ]; pythonPath = [ python2Packages.pygtk python2Packages.psutil ];
patchPhase = '' patchPhase = ''
substituteInPlace install.sh --replace "/usr/local" "$out" substituteInPlace install.sh --replace "/usr/local" "$out"

4
pkgs/applications/misc/survex/default.nix
View File

@ -9,7 +9,7 @@
, proj_7 , proj_7
, perl532 , perl532
, unscii , unscii
, python , python2
, libGL , libGL
, libGLU , libGLU
, xlibsWrapper , xlibsWrapper
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
pname = "survex"; pname = "survex";
version = "1.2.44"; version = "1.2.44";
nativeBuildInputs = [ docbook5 docbook2x autoreconfHook pkg-config perlenv python ]; nativeBuildInputs = [ docbook5 docbook2x autoreconfHook pkg-config perlenv python2 ];
buildInputs = [ buildInputs = [
libGL libGLU ffmpeg proj_7 libGL libGLU ffmpeg proj_7

6
pkgs/applications/misc/weather/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pythonPackages, installShellFiles }: { lib, stdenv, fetchurl, python2Packages, installShellFiles }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "2.4.2"; version = "2.4.2";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
installShellFiles installShellFiles
pythonPackages.wrapPython python2Packages.wrapPython
]; ];
dontConfigure = true; dontConfigure = true;
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
# Upstream doesn't provide a setup.py or alike, so we follow: # Upstream doesn't provide a setup.py or alike, so we follow:
# http://fungi.yuggoth.org/weather/doc/install.rst#id3 # http://fungi.yuggoth.org/weather/doc/install.rst#id3
installPhase = '' installPhase = ''
site_packages=$out/${pythonPackages.python.sitePackages} site_packages=$out/${python2Packages.python.sitePackages}
install -Dt $out/bin -m 755 weather install -Dt $out/bin -m 755 weather
install -Dt $site_packages weather.py install -Dt $site_packages weather.py
install -Dt $out/share/weather-util \ install -Dt $out/share/weather-util \

4
pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pidgin, intltool, python } : { lib, stdenv, fetchurl, pidgin, intltool, python2 } :
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "purple-plugin-pack"; pname = "purple-plugin-pack";
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "0g5hmy7fwgjq59j52h9yps28jsjjrfkd4r18gyx6hfd3g3kzbg1b"; sha256 = "0g5hmy7fwgjq59j52h9yps28jsjjrfkd4r18gyx6hfd3g3kzbg1b";
}; };
buildInputs = [ pidgin intltool python ]; buildInputs = [ pidgin intltool python2 ];
meta = with lib; { meta = with lib; {
homepage = "https://bitbucket.org/rekkanoryo/purple-plugin-pack"; homepage = "https://bitbucket.org/rekkanoryo/purple-plugin-pack";

8
pkgs/applications/networking/instant-messengers/torchat/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, python, unzip, wxPython, wrapPython, tor }: { lib, stdenv, fetchFromGitHub, python2, unzip, tor }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "torchat"; pname = "torchat";
@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ unzip ]; nativeBuildInputs = [ unzip ];
buildInputs = [ python wxPython wrapPython ]; buildInputs = with python2.pkgs; [ python wxPython wrapPython ];
pythonPath = [ wxPython ]; pythonPath = with python2.pkgs; [ wxPython ];
preConfigure = "cd torchat/src; rm portable.txt"; preConfigure = "cd torchat/src; rm portable.txt";
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
mkdir -p $out/lib/torchat mkdir -p $out/lib/torchat
cp -rf * $out/lib/torchat cp -rf * $out/lib/torchat
makeWrapper ${python}/bin/python $out/bin/torchat \ makeWrapper ${python2}/bin/python $out/bin/torchat \
--set PYTHONPATH $out/lib/torchat:$program_PYTHONPATH \ --set PYTHONPATH $out/lib/torchat:$program_PYTHONPATH \
--run "cd $out/lib/torchat" \ --run "cd $out/lib/torchat" \
--add-flags "-O $out/lib/torchat/torchat.py" --add-flags "-O $out/lib/torchat/torchat.py"

5
pkgs/applications/networking/p2p/twister/default.nix
View File

@ -13,7 +13,10 @@ let
}; };
}; };
boostPython = boost.override { enablePython = true; }; boostPython = boost.override {
enablePython = true;
python = python2;
};
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "twister"; pname = "twister";

3
pkgs/applications/radio/soapysdr/default.nix
View File

@ -2,7 +2,8 @@
, fetchFromGitHub, cmake , fetchFromGitHub, cmake
, libusb-compat-0_1, pkg-config , libusb-compat-0_1, pkg-config
, usePython ? false , usePython ? false
, python, ncurses, swig2 , python ? null
, ncurses, swig2
, extraPackages ? [] , extraPackages ? []
} : } :

6
pkgs/applications/science/biology/poretools/default.nix
View File

@ -1,6 +1,6 @@
{ lib, pythonPackages, fetchFromGitHub }: { lib, python2Packages, fetchFromGitHub }:
pythonPackages.buildPythonPackage rec { python2Packages.buildPythonPackage rec {
pname = "poretools"; pname = "poretools";
version = "unstable-2016-07-10"; version = "unstable-2016-07-10";
@ -11,7 +11,7 @@ pythonPackages.buildPythonPackage rec {
sha256 = "0bglj833wxpp3cq430p1d3xp085ls221js2y90w7ir2x5ay8l7am"; sha256 = "0bglj833wxpp3cq430p1d3xp085ls221js2y90w7ir2x5ay8l7am";
}; };
propagatedBuildInputs = [pythonPackages.h5py pythonPackages.matplotlib pythonPackages.seaborn pythonPackages.pandas]; propagatedBuildInputs = [python2Packages.h5py python2Packages.matplotlib python2Packages.seaborn python2Packages.pandas];
meta = { meta = {
description = "a toolkit for working with nanopore sequencing data from Oxford Nanopore"; description = "a toolkit for working with nanopore sequencing data from Oxford Nanopore";

8
pkgs/applications/science/machine-learning/shogun/default.nix
View File

@ -6,7 +6,7 @@
# build # build
, cmake , cmake
, ctags , ctags
, pythonPackages , python2Packages
, swig , swig
# math # math
, eigen , eigen
@ -36,7 +36,7 @@
, withSvmLight ? false , withSvmLight ? false
}: }:
assert pythonSupport -> pythonPackages != null; assert pythonSupport -> python2Packages != null;
assert opencvSupport -> opencv != null; assert opencvSupport -> opencv != null;
assert (!blas.isILP64) && (!lapack.isILP64); assert (!blas.isILP64) && (!lapack.isILP64);
@ -101,7 +101,7 @@ stdenv.mkDerivation rec {
] ++ lib.optional (!withSvmLight) ./svmlight-scrubber.patch; ] ++ lib.optional (!withSvmLight) ./svmlight-scrubber.patch;
nativeBuildInputs = [ cmake swig ctags ] nativeBuildInputs = [ cmake swig ctags ]
++ (with pythonPackages; [ python jinja2 ply ]); ++ (with python2Packages; [ python jinja2 ply ]);
buildInputs = [ buildInputs = [
eigen eigen
@ -121,7 +121,7 @@ stdenv.mkDerivation rec {
nlopt nlopt
lp_solve lp_solve
colpack colpack
] ++ lib.optionals pythonSupport (with pythonPackages; [ python numpy ]) ] ++ lib.optionals pythonSupport (with python2Packages; [ python numpy ])
++ lib.optional opencvSupport opencv; ++ lib.optional opencvSupport opencv;
cmakeFlags = let cmakeFlags = let

24
pkgs/applications/science/misc/sasview/default.nix
View File

@ -1,25 +1,25 @@
{ lib, fetchFromGitHub, gcc, python }: { lib, fetchFromGitHub, gcc, python2 }:
let let
xhtml2pdf = import ./xhtml2pdf.nix { xhtml2pdf = import ./xhtml2pdf.nix {
inherit lib; inherit lib;
fetchPypi = python.pkgs.fetchPypi; fetchPypi = python2.pkgs.fetchPypi;
buildPythonPackage = python.pkgs.buildPythonPackage; buildPythonPackage = python2.pkgs.buildPythonPackage;
html5lib = python.pkgs.html5lib; html5lib = python2.pkgs.html5lib;
httplib2 = python.pkgs.httplib2; httplib2 = python2.pkgs.httplib2;
nose = python.pkgs.nose; nose = python2.pkgs.nose;
pillow = python.pkgs.pillow; pillow = python2.pkgs.pillow;
pypdf2 = python.pkgs.pypdf2; pypdf2 = python2.pkgs.pypdf2;
reportlab = python.pkgs.reportlab; reportlab = python2.pkgs.reportlab;
}; };
in in
python.pkgs.buildPythonApplication rec { python2.pkgs.buildPythonApplication rec {
pname = "sasview"; pname = "sasview";
version = "4.2.0"; version = "4.2.0";
checkInputs = with python.pkgs; [ checkInputs = with python2.pkgs; [
pytest pytest
unittest-xml-reporting unittest-xml-reporting
]; ];
@ -35,7 +35,7 @@ python.pkgs.buildPythonApplication rec {
HOME=$(mktemp -d) py.test HOME=$(mktemp -d) py.test
''; '';
propagatedBuildInputs = with python.pkgs; [ propagatedBuildInputs = with python2.pkgs; [
bumps bumps
gcc gcc
h5py h5py

4
pkgs/applications/science/misc/tulip/default.nix
View File

@ -1,5 +1,5 @@
{ fetchurl, lib, stdenv, libxml2, freetype, libGLU, libGL, glew, qt4 { fetchurl, lib, stdenv, libxml2, freetype, libGLU, libGL, glew, qt4
, cmake, makeWrapper, libjpeg, python }: , cmake, makeWrapper, libjpeg, python2 }:
let version = "5.2.1"; in let version = "5.2.1"; in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "0bqmqy6sri87a8xv5xf7ffaq5zin4hiaa13g0l64b84i7yckfwky"; sha256 = "0bqmqy6sri87a8xv5xf7ffaq5zin4hiaa13g0l64b84i7yckfwky";
}; };
buildInputs = [ libxml2 freetype glew libGLU libGL qt4 libjpeg python ]; buildInputs = [ libxml2 freetype glew libGLU libGL qt4 libjpeg python2 ];
nativeBuildInputs = [ cmake makeWrapper ]; nativeBuildInputs = [ cmake makeWrapper ];

4
pkgs/applications/version-management/rapidsvn/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, wxGTK, subversion, apr, aprutil, python }: { lib, stdenv, fetchurl, wxGTK, subversion, apr, aprutil, python2 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "rapidsvn"; pname = "rapidsvn";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1bmcqjc12k5w0z40k7fkk8iysqv4fw33i80gvcmbakby3d4d4i4p"; sha256 = "1bmcqjc12k5w0z40k7fkk8iysqv4fw33i80gvcmbakby3d4d4i4p";
}; };
buildInputs = [ wxGTK subversion apr aprutil python ]; buildInputs = [ wxGTK subversion apr aprutil python2 ];
configureFlags = [ "--with-svn-include=${subversion.dev}/include" configureFlags = [ "--with-svn-include=${subversion.dev}/include"
"--with-svn-lib=${subversion.out}/lib" ]; "--with-svn-lib=${subversion.out}/lib" ];

4
pkgs/applications/version-management/src/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, python, rcs, git, makeWrapper }: { lib, stdenv, fetchurl, python2, rcs, git, makeWrapper }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "src"; pname = "src";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
buildInputs = [ python rcs git ]; buildInputs = [ python2 rcs git ];
preConfigure = '' preConfigure = ''
patchShebangs . patchShebangs .

4
pkgs/applications/version-management/srcml/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, cmake, libxml2, libxslt, boost, libarchive, python, antlr2, { lib, stdenv, fetchurl, cmake, libxml2, libxslt, boost, libarchive, python2, antlr2,
curl curl
}: }:
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
]; ];
nativeBuildInputs = [ cmake antlr2 ]; nativeBuildInputs = [ cmake antlr2 ];
buildInputs = [ libxml2 libxslt boost libarchive python curl ]; buildInputs = [ libxml2 libxslt boost libarchive python2 curl ];
meta = { meta = {
description = "Infrastructure for exploration, analysis, and manipulation of source code"; description = "Infrastructure for exploration, analysis, and manipulation of source code";

4
pkgs/applications/window-managers/wmii-hg/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, unzip, pkg-config, libixp_hg, txt2tags, dash, python, which { lib, stdenv, fetchurl, unzip, pkg-config, libixp_hg, txt2tags, dash, python2, which
, libX11 , libXrender, libXext, libXinerama, libXrandr, libXft }: , libX11 , libXrender, libXext, libXinerama, libXrandr, libXft }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
''; '';
nativeBuildInputs = [ pkg-config unzip ]; nativeBuildInputs = [ pkg-config unzip ];
buildInputs = [ libixp_hg txt2tags dash python which buildInputs = [ libixp_hg txt2tags dash python2 which
libX11 libXrender libXext libXinerama libXrandr libXft ]; libX11 libXrender libXext libXinerama libXrandr libXft ];
# For some reason including mercurial in buildInputs did not help # For some reason including mercurial in buildInputs did not help

6
pkgs/development/compilers/hip/default.nix
View File

@ -16,7 +16,7 @@
, makeWrapper , makeWrapper
, numactl , numactl
, perl , perl
, python , python2
, rocclr , rocclr
, rocm-comgr , rocm-comgr
, rocm-device-libs , rocm-device-libs
@ -56,7 +56,7 @@ let
substituteInPlace bin/hip_embed_pch.sh \ substituteInPlace bin/hip_embed_pch.sh \
--replace '$LLVM_DIR/bin/' "" --replace '$LLVM_DIR/bin/' ""
sed 's,#!/usr/bin/python,#!${python}/bin/python,' -i hip_prof_gen.py sed 's,#!/usr/bin/python,#!${python2}/bin/python,' -i hip_prof_gen.py
sed -e 's,$ROCM_AGENT_ENUM = "''${ROCM_PATH}/bin/rocm_agent_enumerator";,$ROCM_AGENT_ENUM = "${rocminfo}/bin/rocm_agent_enumerator";,' \ sed -e 's,$ROCM_AGENT_ENUM = "''${ROCM_PATH}/bin/rocm_agent_enumerator";,$ROCM_AGENT_ENUM = "${rocminfo}/bin/rocm_agent_enumerator";,' \
-e 's,^\($DEVICE_LIB_PATH=\).*$,\1"${rocm-device-libs}/amdgcn/bitcode";,' \ -e 's,^\($DEVICE_LIB_PATH=\).*$,\1"${rocm-device-libs}/amdgcn/bitcode";,' \
@ -111,7 +111,7 @@ stdenv.mkDerivation rec {
sha256 = "WvOuQu/EN81Kwcoc3ZtGlhb996edQJ3OWFsmPuqeNXE="; sha256 = "WvOuQu/EN81Kwcoc3ZtGlhb996edQJ3OWFsmPuqeNXE=";
}; };
nativeBuildInputs = [ cmake python makeWrapper perl ]; nativeBuildInputs = [ cmake python2 makeWrapper perl ];
buildInputs = [ libxml2 numactl libglvnd libX11 ]; buildInputs = [ libxml2 numactl libglvnd libX11 ];
propagatedBuildInputs = [ propagatedBuildInputs = [
clang clang

4
pkgs/development/interpreters/acl2/default.nix
View File

@ -1,6 +1,6 @@
{ lib, stdenv, callPackage, fetchFromGitHub, runCommandLocal, makeWrapper, substituteAll { lib, stdenv, callPackage, fetchFromGitHub, runCommandLocal, makeWrapper, substituteAll
, sbcl, bash, which, perl, hostname , sbcl, bash, which, perl, hostname
, openssl, glucose, minisat, abc-verifier, z3, python , openssl, glucose, minisat, abc-verifier, z3, python2
, certifyBooks ? true , certifyBooks ? true
} @ args: } @ args:
@ -48,7 +48,7 @@ in stdenv.mkDerivation rec {
which perl hostname makeWrapper which perl hostname makeWrapper
# Some of the books require one or more of these external tools: # Some of the books require one or more of these external tools:
openssl.out glucose minisat abc-verifier libipasir openssl.out glucose minisat abc-verifier libipasir
z3 (python.withPackages (ps: [ ps.z3 ])) z3 (python2.withPackages (ps: [ ps.z3 ]))
]; ];
# NOTE: Parallel building can be memory-intensive depending on the number of # NOTE: Parallel building can be memory-intensive depending on the number of

4
pkgs/development/interpreters/clojurescript/lumo/default.nix
View File

@ -8,7 +8,7 @@
, unzip , unzip
, nodePackages , nodePackages
, xcbuild , xcbuild
, python , python2
, openssl , openssl
, pkgs , pkgs
, fetchgit , fetchgit
@ -154,7 +154,7 @@ stdenv.mkDerivation {
nodejs nodejs
clojure clojure
jre jre
python python2
openssl openssl
gnutar gnutar
nodePackages."lumo-build-deps-../interpreters/clojurescript/lumo" nodePackages."lumo-build-deps-../interpreters/clojurescript/lumo"

4
pkgs/development/interpreters/wasmtime/default.nix
View File

@ -1,4 +1,4 @@
{ rustPlatform, fetchFromGitHub, lib, python, cmake, llvmPackages, clang, stdenv, darwin }: { rustPlatform, fetchFromGitHub, lib, python2, cmake, llvmPackages, clang, stdenv, darwin }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "wasmtime"; pname = "wasmtime";
@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "1wlig9gls7s1k1swxwhl82vfga30bady8286livxc4y2zp0vb18w"; cargoSha256 = "1wlig9gls7s1k1swxwhl82vfga30bady8286livxc4y2zp0vb18w";
nativeBuildInputs = [ python cmake clang ]; nativeBuildInputs = [ python2 cmake clang ];
buildInputs = [ llvmPackages.libclang ] ++ buildInputs = [ llvmPackages.libclang ] ++
lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";

4
pkgs/development/libraries/blitz/default.nix
View File

@ -4,7 +4,7 @@
, pkg-config , pkg-config
, gfortran , gfortran
, texinfo , texinfo
, python , python2
, boost , boost
# Select SIMD alignment width (in bytes) for vectorization. # Select SIMD alignment width (in bytes) for vectorization.
, simdWidth ? 1 , simdWidth ? 1
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
sha256 = "0nq84vwvvbq7m0my6h835ijfw53bxdp42qjc6kjhk436888qy9rh"; sha256 = "0nq84vwvvbq7m0my6h835ijfw53bxdp42qjc6kjhk436888qy9rh";
}; };
nativeBuildInputs = [ pkg-config python texinfo ]; nativeBuildInputs = [ pkg-config python2 texinfo ];
buildInputs = [ gfortran texinfo boost ]; buildInputs = [ gfortran texinfo boost ];
configureFlags = configureFlags =

4
pkgs/development/libraries/ntrack/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, qt4, pkg-config, libnl, python }: { lib, stdenv, fetchurl, qt4, pkg-config, libnl, python2 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "ntrack"; pname = "ntrack";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
buildInputs = [ libnl qt4 ]; buildInputs = [ libnl qt4 ];
nativeBuildInputs = [ pkg-config python ]; nativeBuildInputs = [ pkg-config python2 ];
# error: ISO C does not support '__FUNCTION__' predefined identifier [-Werror=pedantic] # error: ISO C does not support '__FUNCTION__' predefined identifier [-Werror=pedantic]
NIX_CFLAGS_COMPILE = "-Wno-error"; NIX_CFLAGS_COMPILE = "-Wno-error";

4
pkgs/development/libraries/openbabel/2.nix
View File

@ -1,4 +1,4 @@
{stdenv, lib, fetchFromGitHub, fetchpatch, cmake, zlib, libxml2, eigen, python, cairo, pcre, pkg-config }: {stdenv, lib, fetchFromGitHub, fetchpatch, cmake, zlib, libxml2, eigen, python2, cairo, pcre, pkg-config }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "openbabel"; pname = "openbabel";
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
}) })
]; ];
buildInputs = [ zlib libxml2 eigen python cairo pcre ]; buildInputs = [ zlib libxml2 eigen python2 cairo pcre ];
nativeBuildInputs = [ cmake pkg-config ]; nativeBuildInputs = [ cmake pkg-config ];

6
pkgs/development/libraries/opencv/default.nix
View File

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, unzip { lib, stdenv, fetchFromGitHub, cmake, pkg-config, unzip
, zlib , zlib
, enablePython ? false, pythonPackages , enablePython ? false, python2Packages
, enableGtk2 ? false, gtk2 , enableGtk2 ? false, gtk2
, enableJPEG ? true, libjpeg , enableJPEG ? true, libjpeg
, enablePNG ? true, libpng , enablePNG ? true, libpng
@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
buildInputs = buildInputs =
[ zlib ] [ zlib ]
++ lib.optional enablePython pythonPackages.python ++ lib.optional enablePython python2Packages.python
++ lib.optional enableGtk2 gtk2 ++ lib.optional enableGtk2 gtk2
++ lib.optional enableJPEG libjpeg ++ lib.optional enableJPEG libjpeg
++ lib.optional enablePNG libpng ++ lib.optional enablePNG libpng
@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
++ lib.optionals stdenv.isDarwin [ Cocoa QTKit ] ++ lib.optionals stdenv.isDarwin [ Cocoa QTKit ]
; ;
propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy; propagatedBuildInputs = lib.optional enablePython python2Packages.numpy;
nativeBuildInputs = [ cmake pkg-config unzip ]; nativeBuildInputs = [ cmake pkg-config unzip ];

4
pkgs/development/libraries/pcmsolver/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, cmake, perl, gfortran, python { lib, stdenv, fetchFromGitHub, cmake, perl, gfortran, python2
, boost, eigen, zlib , boost, eigen, zlib
} : } :
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
cmake cmake
gfortran gfortran
perl perl
python python2
]; ];
buildInputs = [ buildInputs = [

2
pkgs/development/libraries/physics/fastjet/default.nix
View File

@ -1,7 +1,7 @@
{ lib { lib
, stdenv , stdenv
, fetchurl , fetchurl
, python , python ? null
, withPython ? false , withPython ? false
}: }:

4
pkgs/development/libraries/ptex/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, zlib, python, cmake, pkg-config }: { lib, stdenv, fetchFromGitHub, zlib, python2, cmake, pkg-config }:
stdenv.mkDerivation rec stdenv.mkDerivation rec
{ {
@ -15,7 +15,7 @@ stdenv.mkDerivation rec
outputs = [ "bin" "dev" "out" "lib" ]; outputs = [ "bin" "dev" "out" "lib" ];
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ zlib python pkg-config ]; buildInputs = [ zlib python2 pkg-config ];
# Can be removed in the next release # Can be removed in the next release
# https://github.com/wdas/ptex/pull/42 # https://github.com/wdas/ptex/pull/42

4
pkgs/development/libraries/rabbitmq-java-client/default.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, lib, stdenv, ant, jdk, jre, python, makeWrapper }: { fetchurl, lib, stdenv, ant, jdk, jre, python2, makeWrapper }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "rabbitmq-java-client"; pname = "rabbitmq-java-client";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
buildInputs = [ ant jdk python ]; buildInputs = [ ant jdk python2 ];
buildPhase = "ant dist"; buildPhase = "ant dist";

6
pkgs/development/libraries/snack/default.nix
View File

@ -1,6 +1,6 @@
# alsa-lib vorbis-tools python can be made optional # alsa-lib vorbis-tools python2 can be made optional
{ lib, stdenv, fetchurl, python, tcl, tk, vorbis-tools, pkg-config, xlibsWrapper }: { lib, stdenv, fetchurl, python2, tcl, tk, vorbis-tools, pkg-config, xlibsWrapper }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "snack"; pname = "snack";
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
postUnpack = ''sourceRoot="$sourceRoot/unix"''; postUnpack = ''sourceRoot="$sourceRoot/unix"'';
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ python tcl tk vorbis-tools xlibsWrapper ]; buildInputs = [ python2 tcl tk vorbis-tools xlibsWrapper ];
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];

4
pkgs/development/libraries/swiften/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv { stdenv
, lib , lib
, python , python2
, libidn , libidn
, lua , lua
, miniupnpc , miniupnpc
@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
python python2
libidn libidn
lua lua
miniupnpc miniupnpc

4
pkgs/development/ocaml-modules/llvm/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, python, cmake, libllvm, ocaml, findlib, ctypes }: { stdenv, lib, python2, cmake, libllvm, ocaml, findlib, ctypes }:
let version = lib.getVersion libllvm; in let version = lib.getVersion libllvm; in
@ -9,7 +9,7 @@ stdenv.mkDerivation {
inherit (libllvm) src; inherit (libllvm) src;
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ python ocaml findlib ctypes ]; buildInputs = [ python2 ocaml findlib ctypes ];
propagatedBuildInputs = [ libllvm ]; propagatedBuildInputs = [ libllvm ];
cmakeFlags = [ cmakeFlags = [

4
pkgs/development/ocaml-modules/pycaml/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, ocaml, findlib, ncurses, python, ocaml_make }: { lib, stdenv, fetchurl, ocaml, findlib, ncurses, python2, ocaml_make }:
# This is the original pycaml version with patches from debian. # This is the original pycaml version with patches from debian.
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
sourceRoot = "pycaml"; sourceRoot = "pycaml";
patches = [ "../debian/patches/*.patch" ]; patches = [ "../debian/patches/*.patch" ];
buildInputs = [ ncurses ocaml findlib python ocaml_make ]; buildInputs = [ ncurses ocaml findlib python2 ocaml_make ];
createFindlibDestdir = true; createFindlibDestdir = true;
# the Makefile is not shipped with an install target, hence we do it ourselves. # the Makefile is not shipped with an install target, hence we do it ourselves.

4
pkgs/development/tools/analysis/oclgrind/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, cmake, llvmPackages, readline, python }: { lib, stdenv, fetchFromGitHub, cmake, llvmPackages, readline, python2 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "oclgrind"; pname = "oclgrind";
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ llvmPackages.llvm llvmPackages.clang-unwrapped readline python ]; buildInputs = [ llvmPackages.llvm llvmPackages.clang-unwrapped readline python2 ];
cmakeFlags = [ cmakeFlags = [
"-DCLANG_ROOT=${llvmPackages.clang-unwrapped}" "-DCLANG_ROOT=${llvmPackages.clang-unwrapped}"

4
pkgs/development/tools/analysis/qcachegrind/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, qmake, qtbase, perl, python, php, kcachegrind, wrapQtAppsHook }: { lib, stdenv, qmake, qtbase, perl, python2, php, kcachegrind, wrapQtAppsHook }:
let let
name = lib.replaceStrings ["kcachegrind"] ["qcachegrind"] kcachegrind.name; name = lib.replaceStrings ["kcachegrind"] ["qcachegrind"] kcachegrind.name;
@ -8,7 +8,7 @@ in stdenv.mkDerivation {
src = kcachegrind.src; src = kcachegrind.src;
buildInputs = [ qtbase perl python php ]; buildInputs = [ qtbase perl python2 php ];
nativeBuildInputs = [ qmake wrapQtAppsHook ]; nativeBuildInputs = [ qmake wrapQtAppsHook ];

16
pkgs/development/tools/database/pyrseas/default.nix
View File

@ -1,7 +1,7 @@
{ lib, pythonPackages, fetchFromGitHub }: { lib, python2Packages, fetchFromGitHub }:
let let
pgdbconn = pythonPackages.buildPythonPackage rec { pgdbconn = python2Packages.buildPythonPackage rec {
pname = "pgdbconn"; pname = "pgdbconn";
version = "0.8.0"; version = "0.8.0";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -13,13 +13,13 @@ let
# The tests are impure (they try to access a PostgreSQL server) # The tests are impure (they try to access a PostgreSQL server)
doCheck = false; doCheck = false;
propagatedBuildInputs = [ propagatedBuildInputs = [
pythonPackages.psycopg2 python2Packages.psycopg2
pythonPackages.pytest python2Packages.pytest
]; ];
}; };
in in
pythonPackages.buildPythonApplication { python2Packages.buildPythonApplication {
pname = "pyrseas"; pname = "pyrseas";
version = "0.8.0"; version = "0.8.0";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -31,9 +31,9 @@ pythonPackages.buildPythonApplication {
# The tests are impure (they try to access a PostgreSQL server) # The tests are impure (they try to access a PostgreSQL server)
doCheck = false; doCheck = false;
propagatedBuildInputs = [ propagatedBuildInputs = [
pythonPackages.psycopg2 python2Packages.psycopg2
pythonPackages.pytest python2Packages.pytest
pythonPackages.pyyaml python2Packages.pyyaml
pgdbconn pgdbconn
]; ];
meta = { meta = {

4
pkgs/development/tools/misc/uncrustify/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, cmake, python }: { lib, stdenv, fetchFromGitHub, cmake, python2 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${product}-${version}"; name = "${product}-${version}";
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "sha256-ZVC5tsn2m1uB7EPNJFPLWLZpLSk4WrFOgJvy1KFYqBY="; sha256 = "sha256-ZVC5tsn2m1uB7EPNJFPLWLZpLSk4WrFOgJvy1KFYqBY=";
}; };
nativeBuildInputs = [ cmake python ]; nativeBuildInputs = [ cmake python2 ];
meta = with lib; { meta = with lib; {
description = "Source code beautifier for C, C++, C#, ObjectiveC, D, Java, Pawn and VALA"; description = "Source code beautifier for C, C++, C#, ObjectiveC, D, Java, Pawn and VALA";

4
pkgs/development/tools/phantomjs2/default.nix
View File

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch { lib, stdenv, fetchFromGitHub, fetchpatch
, bison, flex, fontconfig, freetype, gperf, icu, openssl, libjpeg , bison, flex, fontconfig, freetype, gperf, icu, openssl, libjpeg
, libpng, perl, python, ruby, sqlite, qtwebkit, qmake, qtbase , libpng, perl, python2, ruby, sqlite, qtwebkit, qmake, qtbase
, darwin, writeScriptBin, cups, makeWrapper , darwin, writeScriptBin, cups, makeWrapper
}: }:
@ -28,7 +28,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ qmake ]; nativeBuildInputs = [ qmake ];
buildInputs = [ buildInputs = [
bison flex fontconfig freetype gperf icu openssl bison flex fontconfig freetype gperf icu openssl
libjpeg libpng perl python ruby sqlite qtwebkit qtbase libjpeg libpng perl python2 ruby sqlite qtwebkit qtbase
makeWrapper makeWrapper
] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
AGL ApplicationServices AppKit Cocoa OpenGL AGL ApplicationServices AppKit Cocoa OpenGL

4
pkgs/development/tools/udis86/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, python }: { lib, stdenv, fetchFromGitHub, autoreconfHook, python2 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "udis86"; pname = "udis86";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "0c60zwimim6jrm4saw36s38w5sg5v8n9mr58pkqmjrlf7q9g6am1"; sha256 = "0c60zwimim6jrm4saw36s38w5sg5v8n9mr58pkqmjrlf7q9g6am1";
}; };
nativeBuildInputs = [ autoreconfHook python ]; nativeBuildInputs = [ autoreconfHook python2 ];
configureFlags = [ configureFlags = [
"--enable-shared" "--enable-shared"

6
pkgs/development/tools/winpdb/default.nix
View File

@ -1,6 +1,6 @@
{ lib, fetchurl, pythonPackages, makeDesktopItem }: { lib, fetchurl, python2Packages, makeDesktopItem }:
pythonPackages.buildPythonApplication rec { python2Packages.buildPythonApplication rec {
pname = "winpdb"; pname = "winpdb";
version = "1.4.8"; version = "1.4.8";
namePrefix = ""; namePrefix = "";
@ -10,7 +10,7 @@ pythonPackages.buildPythonApplication rec {
sha256 = "0vkpd24r40j928vc04c721innv0168sbllg97v4zw10adm24d8fs"; sha256 = "0vkpd24r40j928vc04c721innv0168sbllg97v4zw10adm24d8fs";
}; };
propagatedBuildInputs = [ pythonPackages.wxPython ]; propagatedBuildInputs = [ python2Packages.wxPython ];
desktopItem = makeDesktopItem { desktopItem = makeDesktopItem {
name = "winpdb"; name = "winpdb";

6
pkgs/games/openra/common.nix
View File

@ -2,7 +2,7 @@
and out-of-tree mod packages (mod.nix). and out-of-tree mod packages (mod.nix).
*/ */
{ lib, makeSetupHook, curl, unzip, dos2unix, pkg-config, makeWrapper { lib, makeSetupHook, curl, unzip, dos2unix, pkg-config, makeWrapper
, lua, mono, dotnetPackages, python , lua, mono, dotnetPackages, python2
, libGL, freetype, openal, SDL2 , libGL, freetype, openal, SDL2
, zenity , zenity
}: }:
@ -10,7 +10,7 @@
with lib; with lib;
let let
path = makeBinPath ([ mono python ] ++ optional (zenity != null) zenity); path = makeBinPath ([ mono python2 ] ++ optional (zenity != null) zenity);
rpath = makeLibraryPath [ lua freetype openal SDL2 ]; rpath = makeLibraryPath [ lua freetype openal SDL2 ];
mkdirp = makeSetupHook { } ./mkdirp.sh; mkdirp = makeSetupHook { } ./mkdirp.sh;
@ -66,7 +66,7 @@ in {
makeWrapper makeWrapper
mkdirp mkdirp
mono mono
python python2
]; ];
makeFlags = [ "prefix=$(out)" ]; makeFlags = [ "prefix=$(out)" ];

4
pkgs/games/tennix/default.nix
View File

@ -1,4 +1,4 @@
{lib, stdenv, fetchurl, SDL, SDL_mixer, SDL_image, SDL_ttf, SDL_net, python } : {lib, stdenv, fetchurl, SDL, SDL_mixer, SDL_image, SDL_ttf, SDL_net, python2 } :
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "tennix"; pname = "tennix";
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "0np5kw1y7i0z0dsqx4r2nvmq86qj8hv3mmgavm3hxraqnds5z8cm"; sha256 = "0np5kw1y7i0z0dsqx4r2nvmq86qj8hv3mmgavm3hxraqnds5z8cm";
}; };
buildInputs = [ python SDL SDL_mixer SDL_image SDL_ttf SDL_net ]; buildInputs = [ python2 SDL SDL_mixer SDL_image SDL_ttf SDL_net ];
patches = [ ./fix_FTBFS.patch ]; patches = [ ./fix_FTBFS.patch ];

4
pkgs/misc/emulators/retrofe/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchhg, cmake, glib, gst_all_1, makeWrapper, pkg-config { lib, stdenv, fetchhg, cmake, glib, gst_all_1, makeWrapper, pkg-config
, python, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, sqlite, zlib, runtimeShell , python2, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, sqlite, zlib, runtimeShell
}: }:
stdenv.mkDerivation { stdenv.mkDerivation {
@ -12,7 +12,7 @@ stdenv.mkDerivation {
sha256 = "0cvsg07ff0fdqh5zgiv2fs7s6c98hn150kpxmpw5fn6jilaszwkm"; sha256 = "0cvsg07ff0fdqh5zgiv2fs7s6c98hn150kpxmpw5fn6jilaszwkm";
}; };
nativeBuildInputs = [ cmake makeWrapper pkg-config python ]; nativeBuildInputs = [ cmake makeWrapper pkg-config python2 ];
buildInputs = [ buildInputs = [
glib gst_all_1.gstreamer SDL2 SDL2_image SDL2_mixer SDL2_ttf sqlite zlib glib gst_all_1.gstreamer SDL2 SDL2_image SDL2_mixer SDL2_ttf sqlite zlib

4
pkgs/misc/emulators/wxmupen64plus/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, python, wxGTK29, mupen64plus, SDL, libX11, libGLU, libGL { lib, stdenv, fetchurl, python2, wxGTK29, mupen64plus, SDL, libX11, libGLU, libGL
, wafHook }: , wafHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ wafHook ]; nativeBuildInputs = [ wafHook ];
buildInputs = [ python wxGTK29 SDL libX11 libGLU libGL ]; buildInputs = [ python2 wxGTK29 SDL libX11 libGLU libGL ];
preConfigure = '' preConfigure = ''
tar xf ${mupen64plus.src} tar xf ${mupen64plus.src}

4
pkgs/misc/screensavers/xtrlock-pam/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchgit, python, pkg-config, xlibsWrapper, pam }: { lib, stdenv, fetchgit, python2, pkg-config, xlibsWrapper, pam }:
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "xtrlock-pam"; pname = "xtrlock-pam";
@ -11,7 +11,7 @@ stdenv.mkDerivation {
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ python xlibsWrapper pam ]; buildInputs = [ python2 xlibsWrapper pam ];
configurePhase = '' configurePhase = ''
substituteInPlace .config/options.py --replace /usr/include/security/pam_appl.h ${pam}/include/security/pam_appl.h substituteInPlace .config/options.py --replace /usr/include/security/pam_appl.h ${pam}/include/security/pam_appl.h

8
pkgs/misc/vim-plugins/overrides.nix
View File

@ -10,7 +10,7 @@
, substituteAll , substituteAll
# Language dependencies # Language dependencies
, python , python2
, python3 , python3
, rustPlatform , rustPlatform
@ -184,7 +184,7 @@ self: super: {
}); });
ctrlp-cmatcher = super.ctrlp-cmatcher.overrideAttrs (old: { ctrlp-cmatcher = super.ctrlp-cmatcher.overrideAttrs (old: {
buildInputs = [ python ]; buildInputs = [ python2 ];
buildPhase = '' buildPhase = ''
patchShebangs . patchShebangs .
./install.sh ./install.sh
@ -862,7 +862,7 @@ self: super: {
vim-isort = super.vim-isort.overrideAttrs (old: { vim-isort = super.vim-isort.overrideAttrs (old: {
postPatch = '' postPatch = ''
substituteInPlace ftplugin/python_vimisort.vim \ substituteInPlace ftplugin/python_vimisort.vim \
--replace 'import vim' 'import vim; import sys; sys.path.append("${python.pkgs.isort}/${python.sitePackages}")' --replace 'import vim' 'import vim; import sys; sys.path.append("${python2.pkgs.isort}/${python2.sitePackages}")'
''; '';
}); });
@ -916,7 +916,7 @@ self: super: {
}); });
vim-wakatime = super.vim-wakatime.overrideAttrs (old: { vim-wakatime = super.vim-wakatime.overrideAttrs (old: {
buildInputs = [ python ]; buildInputs = [ python2 ];
}); });
vim-xdebug = super.vim-xdebug.overrideAttrs (old: { vim-xdebug = super.vim-xdebug.overrideAttrs (old: {

4
pkgs/os-specific/linux/pam_usb/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, makeWrapper, dbus, libxml2, pam, pkg-config, pmount, pythonPackages, writeScript, runtimeShell }: { lib, stdenv, fetchurl, makeWrapper, dbus, libxml2, pam, pkg-config, pmount, python2Packages, writeScript, runtimeShell }:
let let
@ -29,7 +29,7 @@ let
pmountBin = useSetUID pmount "/bin/pmount"; pmountBin = useSetUID pmount "/bin/pmount";
pumountBin = useSetUID pmount "/bin/pumount"; pumountBin = useSetUID pmount "/bin/pumount";
inherit (pythonPackages) python dbus-python; inherit (python2Packages) python dbus-python;
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {

4
pkgs/os-specific/linux/pflask/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, python, wafHook }: { lib, stdenv, fetchFromGitHub, python2, wafHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "pflask"; pname = "pflask";
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ wafHook ]; nativeBuildInputs = [ wafHook ];
buildInputs = [ python ]; buildInputs = [ python2 ];
meta = { meta = {
description = "Lightweight process containers for Linux"; description = "Lightweight process containers for Linux";

4
pkgs/os-specific/linux/smem/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, python }: { lib, stdenv, fetchurl, python2 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "smem"; pname = "smem";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "19ibv1byxf2b68186ysrgrhy5shkc5mc69abark1h18yigp3j34m"; sha256 = "19ibv1byxf2b68186ysrgrhy5shkc5mc69abark1h18yigp3j34m";
}; };
buildInputs = [ python ]; buildInputs = [ python2 ];
makeFlags = [ "smemcap" ]; makeFlags = [ "smemcap" ];

6
pkgs/os-specific/linux/speedometer/default.nix
View File

@ -1,6 +1,6 @@
{ lib, fetchurl, pythonPackages }: { lib, fetchurl, python2Packages }:
pythonPackages.buildPythonApplication rec { python2Packages.buildPythonApplication rec {
pname = "speedometer"; pname = "speedometer";
version = "2.8"; version = "2.8";
@ -9,7 +9,7 @@ pythonPackages.buildPythonApplication rec {
sha256 = "060bikv3gwr203jbdmvawsfhc0yq0bg1m42dk8czx1nqvwvgv6fm"; sha256 = "060bikv3gwr203jbdmvawsfhc0yq0bg1m42dk8czx1nqvwvgv6fm";
}; };
propagatedBuildInputs = [ pythonPackages.urwid ]; propagatedBuildInputs = [ python2Packages.urwid ];
postPatch = '' postPatch = ''
sed -i "/'entry_points': {/d" setup.py sed -i "/'entry_points': {/d" setup.py

4
pkgs/os-specific/linux/x86info/default.nix
View File

@ -1,4 +1,4 @@
{lib, stdenv, fetchurl, pciutils, python}: {lib, stdenv, fetchurl, pciutils, python2}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.30"; version = "1.30";
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
sed -i 's/-Werror -Wall//' Makefile sed -i 's/-Werror -Wall//' Makefile
''; '';
buildInputs = [ pciutils python ]; buildInputs = [ pciutils python2 ];
installPhase = '' installPhase = ''
mkdir -p $out/bin mkdir -p $out/bin

4
pkgs/servers/amqp/rabbitmq-server/default.nix
View File

@ -3,7 +3,7 @@
, fetchurl , fetchurl
, erlang , erlang
, elixir , elixir
, python , python2
, libxml2 , libxml2
, libxslt , libxslt
, xmlto , xmlto
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ unzip xmlto docbook_xml_dtd_45 docbook_xsl zip rsync ]; nativeBuildInputs = [ unzip xmlto docbook_xml_dtd_45 docbook_xsl zip rsync ];
buildInputs = [ erlang elixir python libxml2 libxslt glibcLocales ] buildInputs = [ erlang elixir python2 libxml2 libxslt glibcLocales ]
++ lib.optionals stdenv.isDarwin [ AppKit Carbon Cocoa ]; ++ lib.optionals stdenv.isDarwin [ AppKit Carbon Cocoa ];
outputs = [ "out" "man" "doc" ]; outputs = [ "out" "man" "doc" ];

8
pkgs/servers/computing/storm/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, zip, unzip { stdenv, lib, fetchurl, zip, unzip
, jdk, python , jdk, python2
, confFile ? "" , confFile ? ""
, extraLibraryPaths ? [] , extraLibraryPaths ? []
, extraJars ? [] , extraJars ? []
@ -30,11 +30,11 @@ stdenv.mkDerivation rec {
fixupPhase = '' fixupPhase = ''
# Fix python reference # Fix python reference
sed -i \ sed -i \
-e '19iPYTHON=${python}/bin/python' \ -e '19iPYTHON=${python2}/bin/python' \
-e 's|#!/usr/bin/.*python|#!${python}/bin/python|' \ -e 's|#!/usr/bin/.*python|#!${python2}/bin/python|' \
$out/bin/storm $out/bin/storm
sed -i \ sed -i \
-e 's|#!/usr/bin/.*python|#!${python}/bin/python|' \ -e 's|#!/usr/bin/.*python|#!${python2}/bin/python|' \
-e "s|STORM_CONF_DIR = .*|STORM_CONF_DIR = os.getenv('STORM_CONF_DIR','$out/conf')|" \ -e "s|STORM_CONF_DIR = .*|STORM_CONF_DIR = os.getenv('STORM_CONF_DIR','$out/conf')|" \
-e 's|STORM_LOG4J2_CONF_DIR =.*|STORM_LOG4J2_CONF_DIR = os.path.join(STORM_CONF_DIR, "log4j2")|' \ -e 's|STORM_LOG4J2_CONF_DIR =.*|STORM_LOG4J2_CONF_DIR = os.path.join(STORM_CONF_DIR, "log4j2")|' \
$out/bin/storm.py $out/bin/storm.py

4
pkgs/servers/mapserver/default.nix
View File

@ -1,7 +1,7 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config { lib, stdenv, fetchFromGitHub, cmake, pkg-config
, cairo, curl, fcgi, freetype, fribidi, gdal, geos, giflib, harfbuzz , cairo, curl, fcgi, freetype, fribidi, gdal, geos, giflib, harfbuzz
, libjpeg, libpng, librsvg, libxml2, postgresql, proj, protobufc, zlib , libjpeg, libpng, librsvg, libxml2, postgresql, proj, protobufc, zlib
, withPython ? true, swig, python , withPython ? true, swig, python2
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
proj proj
protobufc protobufc
zlib zlib
] ++ lib.optional withPython python; ] ++ lib.optional withPython python2;
cmakeFlags = [ cmakeFlags = [
"-DWITH_KML=ON" "-DWITH_KML=ON"

4
pkgs/servers/sql/proxysql/default.nix
View File

@ -25,7 +25,7 @@
, pcre , pcre
, perl , perl
, prometheus-cpp , prometheus-cpp
, python , python2
, re2 , re2
, zlib , zlib
}: }:
@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
cmake cmake
libtool libtool
perl perl
python python2
]; ];
buildInputs = [ buildInputs = [

4
pkgs/servers/tvheadend/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper, pkg-config { lib, stdenv, fetchFromGitHub, cmake, makeWrapper, pkg-config
, avahi, dbus, gettext, git, gnutar, gzip, bzip2, ffmpeg_4, libiconv, openssl, python , avahi, dbus, gettext, git, gnutar, gzip, bzip2, ffmpeg_4, libiconv, openssl, python2
, v4l-utils, which, zlib }: , v4l-utils, which, zlib }:
let let
@ -29,7 +29,7 @@ in stdenv.mkDerivation {
}; };
buildInputs = [ buildInputs = [
avahi dbus gettext git gnutar gzip bzip2 ffmpeg_4 libiconv openssl python avahi dbus gettext git gnutar gzip bzip2 ffmpeg_4 libiconv openssl python2
which zlib which zlib
]; ];

4
pkgs/shells/zsh/zsh-git-prompt/default.nix
View File

@ -25,7 +25,7 @@
# installed. # installed.
# #
{ fetchFromGitHub { fetchFromGitHub
, python , python2
, git , git
, lib , lib
, haskellPackages , haskellPackages
@ -45,7 +45,7 @@ haskellPackages.callPackage
prePatch = '' prePatch = ''
substituteInPlace zshrc.sh \ substituteInPlace zshrc.sh \
--replace ':-"python"' ':-"haskell"' \ --replace ':-"python"' ':-"haskell"' \
--replace 'python ' '${python.interpreter} ' \ --replace 'python ' '${python2.interpreter} ' \
--replace 'git ' '${git}/bin/git ' --replace 'git ' '${git}/bin/git '
''; '';
preCompileBuildDriver = "cd src"; preCompileBuildDriver = "cd src";

4
pkgs/tools/filesystems/xtreemfs/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, boost, fuse, openssl, cmake, attr, jdk, ant, which, file, python { stdenv, boost, fuse, openssl, cmake, attr, jdk, ant, which, file, python2
, lib, valgrind, makeWrapper, fetchFromGitHub, fetchpatch }: , lib, valgrind, makeWrapper, fetchFromGitHub, fetchpatch }:
stdenv.mkDerivation { stdenv.mkDerivation {
@ -14,7 +14,7 @@ stdenv.mkDerivation {
version = "1.5.1.81"; version = "1.5.1.81";
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
buildInputs = [ which attr python ]; buildInputs = [ which attr python2 ];
patches = [ patches = [
(fetchpatch { (fetchpatch {

4
pkgs/tools/misc/grub/trusted.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, fetchgit, fetchpatch, autogen, flex, bison, python, autoconf, automake { lib, stdenv, fetchurl, fetchgit, fetchpatch, autogen, flex, bison, python2, autoconf, automake
, gettext, ncurses, libusb-compat-0_1, freetype, qemu, lvm2 , gettext, ncurses, libusb-compat-0_1, freetype, qemu, lvm2
, for_HP_laptop ? false , for_HP_laptop ? false
}: }:
@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
sha256 = "0yrfwx67gpg9gij5raq0cfbx3jj769lkg3diqgb7i9n86hgcdh4k"; sha256 = "0yrfwx67gpg9gij5raq0cfbx3jj769lkg3diqgb7i9n86hgcdh4k";
}; };
nativeBuildInputs = [ autogen flex bison python autoconf automake ]; nativeBuildInputs = [ autogen flex bison python2 autoconf automake ];
buildInputs = [ ncurses libusb-compat-0_1 freetype gettext lvm2 ] buildInputs = [ ncurses libusb-compat-0_1 freetype gettext lvm2 ]
++ optional doCheck qemu; ++ optional doCheck qemu;

4
pkgs/tools/misc/opentsdb/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, autoconf, automake, curl, fetchurl, fetchpatch, jdk8, makeWrapper, nettools { lib, stdenv, autoconf, automake, curl, fetchurl, fetchpatch, jdk8, makeWrapper, nettools
, python, git , python2, git
}: }:
let jdk = jdk8; jre = jdk8.jre; in let jdk = jdk8; jre = jdk8.jre; in
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
]; ];
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
buildInputs = [ autoconf automake curl jdk nettools python git ]; buildInputs = [ autoconf automake curl jdk nettools python2 git ];
preConfigure = '' preConfigure = ''
patchShebangs ./build-aux/ patchShebangs ./build-aux/

4
pkgs/tools/misc/rpm-ostree/default.nix
View File

@ -29,7 +29,7 @@
, bubblewrap , bubblewrap
, pcre , pcre
, check , check
, python , python2
, json_c , json_c
, zchunk , zchunk
, libmodulemd , libmodulemd
@ -82,7 +82,7 @@ stdenv.mkDerivation rec {
librepo librepo
pcre pcre
check check
python python2
# libdnf # vendored unstable branch # libdnf # vendored unstable branch
# required by vendored libdnf # required by vendored libdnf

4
pkgs/tools/misc/snapper/default.nix
View File

@ -1,7 +1,7 @@
{ lib, stdenv, fetchFromGitHub { lib, stdenv, fetchFromGitHub
, autoreconfHook, pkg-config, docbook_xsl, libxslt, docbook_xml_dtd_45 , autoreconfHook, pkg-config, docbook_xsl, libxslt, docbook_xml_dtd_45
, acl, attr, boost, btrfs-progs, dbus, diffutils, e2fsprogs, libxml2 , acl, attr, boost, btrfs-progs, dbus, diffutils, e2fsprogs, libxml2
, lvm2, pam, python, util-linux, json_c, nixosTests , lvm2, pam, python2, util-linux, json_c, nixosTests
, ncurses }: , ncurses }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
acl attr boost btrfs-progs dbus diffutils e2fsprogs libxml2 acl attr boost btrfs-progs dbus diffutils e2fsprogs libxml2
lvm2 pam python util-linux json_c ncurses lvm2 pam python2 util-linux json_c ncurses
]; ];
passthru.tests.snapper = nixosTests.snapper; passthru.tests.snapper = nixosTests.snapper;

4
pkgs/tools/networking/nss-pam-ldapd/default.nix
View File

@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl { lib, stdenv, fetchurl
, pkg-config, makeWrapper, autoreconfHook , pkg-config, makeWrapper, autoreconfHook
, openldap, python, pam , openldap, python2, pam
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ pkg-config makeWrapper autoreconfHook ]; nativeBuildInputs = [ pkg-config makeWrapper autoreconfHook ];
buildInputs = [ openldap pam python ]; buildInputs = [ openldap pam python2 ];
preConfigure = '' preConfigure = ''
substituteInPlace Makefile.in --replace "install-data-local: " "# install-data-local: " substituteInPlace Makefile.in --replace "install-data-local: " "# install-data-local: "

4
pkgs/tools/networking/philter/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, python }: { lib, stdenv, fetchurl, python2 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "philter"; pname = "philter";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
installPhase = '' installPhase = ''
mkdir -p "$out"/{bin,share/philter} mkdir -p "$out"/{bin,share/philter}
cp .philterrc "$out"/share/philter/philterrc cp .philterrc "$out"/share/philter/philterrc
sed -i 's@/usr/local/bin@${python}/bin@' src/philter.py sed -i 's@/usr/local/bin@${python2}/bin@' src/philter.py
cp src/philter.py "$out"/bin/philter cp src/philter.py "$out"/bin/philter
chmod +x "$out"/bin/philter chmod +x "$out"/bin/philter
''; '';

4
pkgs/tools/networking/pssh/default.nix
View File

@ -1,6 +1,6 @@
{ lib, fetchFromGitHub, pythonPackages, openssh, rsync }: { lib, fetchFromGitHub, python2Packages, openssh, rsync }:
pythonPackages.buildPythonApplication rec { python2Packages.buildPythonApplication rec {
pname = "pssh"; pname = "pssh";
version = "2.3.1"; version = "2.3.1";

6
pkgs/tools/networking/py-wmi-client/default.nix
View File

@ -1,6 +1,6 @@
{ lib, pythonPackages, fetchFromGitHub }: { lib, python2Packages, fetchFromGitHub }:
pythonPackages.buildPythonApplication rec { python2Packages.buildPythonApplication rec {
pname = "py-wmi-client"; pname = "py-wmi-client";
version = "unstable-20160601"; version = "unstable-20160601";
@ -11,7 +11,7 @@ pythonPackages.buildPythonApplication rec {
sha256 = "1kd12gi1knqv477f1shzqr0h349s5336vzp3fpfp3xl0b502ld8d"; sha256 = "1kd12gi1knqv477f1shzqr0h349s5336vzp3fpfp3xl0b502ld8d";
}; };
propagatedBuildInputs = with pythonPackages; [ impacket natsort pyasn1 pycrypto ]; propagatedBuildInputs = with python2Packages; [ impacket natsort pyasn1 pycrypto ];
# no tests # no tests
doCheck = false; doCheck = false;

4
pkgs/tools/networking/weighttp/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchgit, python, libev, wafHook }: { lib, stdenv, fetchgit, python2, libev, wafHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "weighttp"; pname = "weighttp";
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ wafHook ]; nativeBuildInputs = [ wafHook ];
buildInputs = [ python libev ]; buildInputs = [ python2 libev ];
meta = with lib; { meta = with lib; {
description = "Lightweight and simple webserver benchmarking tool"; description = "Lightweight and simple webserver benchmarking tool";

6
pkgs/tools/security/volatility/default.nix
View File

@ -1,6 +1,6 @@
{ lib, fetchFromGitHub, pythonPackages }: { lib, fetchFromGitHub, python2Packages }:
pythonPackages.buildPythonApplication rec { python2Packages.buildPythonApplication rec {
pname = "volatility"; pname = "volatility";
version = "2.6.1"; version = "2.6.1";
@ -13,7 +13,7 @@ pythonPackages.buildPythonApplication rec {
doCheck = false; doCheck = false;
propagatedBuildInputs = with pythonPackages; [ pycrypto distorm3 pillow ]; propagatedBuildInputs = with python2Packages; [ pycrypto distorm3 pillow ];
meta = with lib; { meta = with lib; {
homepage = "https://www.volatilityfoundation.org/"; homepage = "https://www.volatilityfoundation.org/";

4
pkgs/tools/system/collectd/plugins.nix
View File

@ -31,7 +31,7 @@
, perl , perl
, postgresql , postgresql
, protobufc , protobufc
, python , python2
, rabbitmq-c , rabbitmq-c
, rdkafka , rdkafka
, riemann_c_client , riemann_c_client
@ -102,7 +102,7 @@ let
pinba.buildInputs = [ protobufc ]; pinba.buildInputs = [ protobufc ];
ping.buildInputs = [ liboping ]; ping.buildInputs = [ liboping ];
postgresql.buildInputs = [ postgresql ]; postgresql.buildInputs = [ postgresql ];
python.buildInputs = [ python ]; python.buildInputs = [ python2 ];
redis.buildInputs = [ hiredis ]; redis.buildInputs = [ hiredis ];
rrdcached.buildInputs = [ rrdtool libxml2 ]; rrdcached.buildInputs = [ rrdtool libxml2 ];
rrdtool.buildInputs = [ rrdtool libxml2 ]; rrdtool.buildInputs = [ rrdtool libxml2 ];

4
pkgs/tools/system/ps_mem/default.nix
View File

@ -1,9 +1,9 @@
{ lib, pythonPackages, fetchFromGitHub }: { lib, python2Packages, fetchFromGitHub }:
let let
version = "3.13"; version = "3.13";
pname = "ps_mem"; pname = "ps_mem";
in pythonPackages.buildPythonApplication { in python2Packages.buildPythonApplication {
name = "${pname}-${version}"; name = "${pname}-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {

4
pkgs/tools/system/syslog-ng-incubator/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, glib, syslogng { lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, glib, syslogng
, eventlog, perl, python, bison, protobufc, libivykis, libcap, czmq , eventlog, perl, python2, bison, protobufc, libivykis, libcap, czmq
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config autoreconfHook bison ]; nativeBuildInputs = [ pkg-config autoreconfHook bison ];
buildInputs = [ buildInputs = [
glib syslogng eventlog perl python protobufc libivykis libcap czmq glib syslogng eventlog perl python2 protobufc libivykis libcap czmq
]; ];
configureFlags = [ configureFlags = [

4
pkgs/tools/system/syslog-ng/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, openssl, libcap, curl, which { lib, stdenv, fetchurl, openssl, libcap, curl, which
, eventlog, pkg-config, glib, python, systemd, perl , eventlog, pkg-config, glib, python2, systemd, perl
, riemann_c_client, protobufc, pcre, libnet , riemann_c_client, protobufc, pcre, libnet
, json_c, libuuid, libivykis, mongoc, rabbitmq-c , json_c, libuuid, libivykis, mongoc, rabbitmq-c
, libesmtp , libesmtp
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
eventlog eventlog
glib glib
perl perl
python python2
systemd systemd
riemann_c_client riemann_c_client
protobufc protobufc

4
pkgs/tools/text/opencc/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, cmake, python }: { lib, stdenv, fetchFromGitHub, cmake, python2 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "opencc"; pname = "opencc";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "sha256-q/y4tRov/BYCAiE4i7fT6ysTerxxOHMZUWT2Jlo/0rI="; sha256 = "sha256-q/y4tRov/BYCAiE4i7fT6ysTerxxOHMZUWT2Jlo/0rI=";
}; };
nativeBuildInputs = [ cmake python ]; nativeBuildInputs = [ cmake python2 ];
# let intermediate tools find intermediate library # let intermediate tools find intermediate library
preBuild = lib.optionalString stdenv.isLinux '' preBuild = lib.optionalString stdenv.isLinux ''

6
pkgs/tools/text/txt2tags/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, python }: { lib, stdenv, fetchurl, python2 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "2.6"; version = "2.6";
@ -7,13 +7,13 @@ stdenv.mkDerivation rec {
dontBuild = true; dontBuild = true;
# Python script, needs the interpreter # Python script, needs the interpreter
propagatedBuildInputs = [ python ]; propagatedBuildInputs = [ python2 ];
installPhase = '' installPhase = ''
mkdir -p "$out/bin" mkdir -p "$out/bin"
mkdir -p "$out/share/doc" mkdir -p "$out/share/doc"
mkdir -p "$out/share/man/man1/" mkdir -p "$out/share/man/man1/"
sed '1s|/usr/bin/env python|${python}/bin/python|' < txt2tags > "$out/bin/txt2tags" sed '1s|/usr/bin/env python|${python2}/bin/python|' < txt2tags > "$out/bin/txt2tags"
chmod +x "$out/bin/txt2tags" chmod +x "$out/bin/txt2tags"
gzip - < doc/manpage.man > "$out/share/man/man1/txt2tags.1.gz" gzip - < doc/manpage.man > "$out/share/man/man1/txt2tags.1.gz"
cp doc/userguide.pdf "$out/share/doc" cp doc/userguide.pdf "$out/share/doc"

8
pkgs/tools/typesetting/odpdown/default.nix
View File

@ -1,6 +1,6 @@
{ lib, fetchFromGitHub, pythonPackages, libreoffice }: { lib, fetchFromGitHub, python2Packages, libreoffice }:
pythonPackages.buildPythonApplication rec { python2Packages.buildPythonApplication rec {
pname = "odpdown"; pname = "odpdown";
version = "0.4.1"; version = "0.4.1";
@ -12,9 +12,9 @@ pythonPackages.buildPythonApplication rec {
sha256 = "r2qbgD9PAalbypt+vjp2YcYggUGPQMEG2FDxMtohqG4="; sha256 = "r2qbgD9PAalbypt+vjp2YcYggUGPQMEG2FDxMtohqG4=";
}; };
propagatedBuildInputs = with pythonPackages; [ libreoffice lpod lxml mistune pillow pygments ]; propagatedBuildInputs = with python2Packages; [ libreoffice lpod lxml mistune pillow pygments ];
checkInputs = with pythonPackages; [ checkInputs = with python2Packages; [
nose nose
]; ];

4
pkgs/tools/video/vnc2flv/default.nix
View File

@ -1,6 +1,6 @@
{ lib, fetchurl, pythonPackages }: { lib, fetchurl, python2Packages }:
pythonPackages.buildPythonApplication rec { python2Packages.buildPythonApplication rec {
pname = "vnc2flv"; pname = "vnc2flv";
version = "20100207"; version = "20100207";

4
pkgs/tools/virtualization/xe-guest-utilities/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, bzip2, lzo, zlib, xz, bash, python, gnutar, gnused, gnugrep, which }: { lib, stdenv, fetchurl, bzip2, lzo, zlib, xz, bash, python2, gnutar, gnused, gnugrep, which }:
stdenv.mkDerivation (rec { stdenv.mkDerivation (rec {
pname = "xe-guest-utilities"; pname = "xe-guest-utilities";
@ -14,7 +14,7 @@ stdenv.mkDerivation (rec {
url = "https://sources.archlinux.org/other/community/xe-guest-utilities/xe-guest-utilities_${version}-1120.tar.gz"; url = "https://sources.archlinux.org/other/community/xe-guest-utilities/xe-guest-utilities_${version}-1120.tar.gz";
sha256 = "f9593cd9588188f80253e736f48d8dd94c5b517abb18316085f86acffab48794"; sha256 = "f9593cd9588188f80253e736f48d8dd94c5b517abb18316085f86acffab48794";
}; };
buildInputs = [ bzip2 gnutar gnused python lzo zlib xz stdenv gnugrep which ]; buildInputs = [ bzip2 gnutar gnused python2 lzo zlib xz stdenv gnugrep which ];
patches = [ ./ip-address.patch ]; patches = [ ./ip-address.patch ];
postPatch = '' postPatch = ''
tar xf "$NIX_BUILD_TOP/$name/xenstore-sources.tar.bz2" tar xf "$NIX_BUILD_TOP/$name/xenstore-sources.tar.bz2"

3
pkgs/top-level/aliases.nix
View File

@ -817,8 +817,11 @@ mapAliases ({
pyrex095 = throw "pyrex has been removed from nixpkgs as the project is still stuck on python2."; # added 2022-01-12 pyrex095 = throw "pyrex has been removed from nixpkgs as the project is still stuck on python2."; # added 2022-01-12
pyrex096 = throw "pyrex has been removed from nixpkgs as the project is still stuck on python2."; # added 2022-01-12 pyrex096 = throw "pyrex has been removed from nixpkgs as the project is still stuck on python2."; # added 2022-01-12
pyrit = throw "pyrit has been removed from nixpkgs as the project is still stuck on python2."; # added 2022-01-01 pyrit = throw "pyrit has been removed from nixpkgs as the project is still stuck on python2."; # added 2022-01-01
python = python2; # added 2022-01-11
python2nix = throw "python2nix has been removed as it is outdated. Use e.g. nixpkgs-pytools instead."; # added 2021-03-08 python2nix = throw "python2nix has been removed as it is outdated. Use e.g. nixpkgs-pytools instead."; # added 2021-03-08
python-swiftclient = swiftclient; # added 2021-09-09 python-swiftclient = swiftclient; # added 2021-09-09
pythonFull = python2Full; # added 2022-01-11
pythonPackages = python.pkgs; # added 2022-01-11
quagga = throw "quagga is no longer maintained upstream"; # added 2021-04-22 quagga = throw "quagga is no longer maintained upstream"; # added 2021-04-22
qca-qt5 = libsForQt5.qca-qt5; # added 2015-12-19 qca-qt5 = libsForQt5.qca-qt5; # added 2015-12-19
qcsxcad = libsForQt5.qcsxcad; # added 2020-11-05 qcsxcad = libsForQt5.qcsxcad; # added 2020-11-05

23
pkgs/top-level/all-packages.nix
View File

@ -4660,7 +4660,7 @@ with pkgs;
diffutils = callPackage ../tools/text/diffutils { }; diffutils = callPackage ../tools/text/diffutils { };
dir2opus = callPackage ../tools/audio/dir2opus { dir2opus = callPackage ../tools/audio/dir2opus {
inherit (pythonPackages) mutagen python wrapPython; inherit (python2Packages) mutagen python wrapPython;
}; };
dirdiff = callPackage ../tools/text/dirdiff { dirdiff = callPackage ../tools/text/dirdiff {
@ -10696,7 +10696,7 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) OpenCL; inherit (darwin.apple_sdk.frameworks) OpenCL;
}; };
wakatime = pythonPackages.callPackage ../tools/misc/wakatime { }; wakatime = python2Packages.callPackage ../tools/misc/wakatime { };
weather = callPackage ../applications/misc/weather { }; weather = callPackage ../applications/misc/weather { };
@ -13652,7 +13652,6 @@ with pkgs;
# Python interpreters. All standard library modules are included except for tkinter, which is # Python interpreters. All standard library modules are included except for tkinter, which is
# available as `pythonPackages.tkinter` and can be used as any other Python package. # available as `pythonPackages.tkinter` and can be used as any other Python package.
# When switching these sets, please update docs at ../../doc/languages-frameworks/python.md # When switching these sets, please update docs at ../../doc/languages-frameworks/python.md
python = python2;
python2 = python27; python2 = python27;
python3 = python39; python3 = python39;
pypy = pypy2; pypy = pypy2;
@ -13661,11 +13660,6 @@ with pkgs;
# Python interpreter that is build with all modules, including tkinter. # Python interpreter that is build with all modules, including tkinter.
# These are for compatibility and should not be used inside Nixpkgs. # These are for compatibility and should not be used inside Nixpkgs.
pythonFull = python.override {
self = pythonFull;
pythonAttr = "pythonFull";
x11Support = true;
};
python2Full = python2.override { python2Full = python2.override {
self = python2Full; self = python2Full;
pythonAttr = "python2Full"; pythonAttr = "python2Full";
@ -13702,7 +13696,6 @@ with pkgs;
}; };
# pythonPackages further below, but assigned here because they need to be in sync # pythonPackages further below, but assigned here because they need to be in sync
pythonPackages = python.pkgs;
python2Packages = python2.pkgs; python2Packages = python2.pkgs;
python3Packages = python3.pkgs; python3Packages = python3.pkgs;
@ -21685,7 +21678,7 @@ with pkgs;
qpid-cpp = callPackage ../servers/amqp/qpid-cpp { qpid-cpp = callPackage ../servers/amqp/qpid-cpp {
boost = boost155; boost = boost155;
inherit (pythonPackages) buildPythonPackage qpid-python; inherit (python2Packages) buildPythonPackage qpid-python;
}; };
qremotecontrol-server = callPackage ../servers/misc/qremotecontrol-server { }; qremotecontrol-server = callPackage ../servers/misc/qremotecontrol-server { };
@ -29017,9 +29010,7 @@ with pkgs;
topydo = callPackage ../applications/misc/topydo {}; topydo = callPackage ../applications/misc/topydo {};
torchat = callPackage ../applications/networking/instant-messengers/torchat { torchat = callPackage ../applications/networking/instant-messengers/torchat { };
inherit (pythonPackages) wrapPython wxPython;
};
torrential = callPackage ../applications/networking/p2p/torrential { }; torrential = callPackage ../applications/networking/p2p/torrential { };
@ -31701,7 +31692,7 @@ with pkgs;
useMpi = true; useMpi = true;
}); });
neuron-full = neuron-mpi.override { inherit python; }; neuron-full = neuron-mpi.override { python = python2; };
mrbayes = callPackage ../applications/science/biology/mrbayes { }; mrbayes = callPackage ../applications/science/biology/mrbayes { };
@ -33204,7 +33195,7 @@ with pkgs;
nix-script = callPackage ../tools/nix/nix-script {}; nix-script = callPackage ../tools/nix/nix-script {};
nix-template-rpm = callPackage ../build-support/templaterpm { inherit (pythonPackages) python toposort; }; nix-template-rpm = callPackage ../build-support/templaterpm { inherit (python2Packages) python toposort; };
nix-top = callPackage ../tools/package-management/nix-top { }; nix-top = callPackage ../tools/package-management/nix-top { };
@ -33255,7 +33246,7 @@ with pkgs;
disnix = callPackage ../tools/package-management/disnix { }; disnix = callPackage ../tools/package-management/disnix { };
dysnomia = callPackage ../tools/package-management/disnix/dysnomia (config.disnix or { dysnomia = callPackage ../tools/package-management/disnix/dysnomia (config.disnix or {
inherit (pythonPackages) supervisor; inherit (python2Packages) supervisor;
}); });
dydisnix = callPackage ../tools/package-management/disnix/dydisnix { }; dydisnix = callPackage ../tools/package-management/disnix/dydisnix { };

4
pkgs/top-level/python-packages.nix
View File

@ -2746,14 +2746,14 @@ in {
fastjet = toPythonModule (pkgs.fastjet.override { fastjet = toPythonModule (pkgs.fastjet.override {
withPython = true; withPython = true;
inherit python; inherit (self) python;
}); });
fastjsonschema = callPackage ../development/python-modules/fastjsonschema { }; fastjsonschema = callPackage ../development/python-modules/fastjsonschema { };
fastnlo_toolkit = toPythonModule (pkgs.fastnlo_toolkit.override { fastnlo_toolkit = toPythonModule (pkgs.fastnlo_toolkit.override {
withPython = true; withPython = true;
inherit python; inherit (self) python;
}); });
fastnumbers = callPackage ../development/python-modules/fastnumbers { }; fastnumbers = callPackage ../development/python-modules/fastnumbers { };

6
pkgs/top-level/release.nix
View File

@ -54,7 +54,7 @@ let
jobs.openssl.x86_64-darwin jobs.openssl.x86_64-darwin
jobs.pandoc.x86_64-darwin jobs.pandoc.x86_64-darwin
jobs.postgresql.x86_64-darwin jobs.postgresql.x86_64-darwin
jobs.python.x86_64-darwin jobs.python2.x86_64-darwin
jobs.python3.x86_64-darwin jobs.python3.x86_64-darwin
jobs.ruby.x86_64-darwin jobs.ruby.x86_64-darwin
jobs.rustc.x86_64-darwin jobs.rustc.x86_64-darwin
@ -99,7 +99,7 @@ let
jobs.go.x86_64-linux jobs.go.x86_64-linux
jobs.linux.x86_64-linux jobs.linux.x86_64-linux
jobs.pandoc.x86_64-linux jobs.pandoc.x86_64-linux
jobs.python.x86_64-linux jobs.python2.x86_64-linux
jobs.python3.x86_64-linux jobs.python3.x86_64-linux
# Needed by contributors to test PRs (by inclusion of the PR template) # Needed by contributors to test PRs (by inclusion of the PR template)
jobs.nixpkgs-review.x86_64-linux jobs.nixpkgs-review.x86_64-linux
@ -134,7 +134,7 @@ let
jobs.stdenv.x86_64-darwin jobs.stdenv.x86_64-darwin
jobs.cargo.x86_64-darwin jobs.cargo.x86_64-darwin
jobs.go.x86_64-darwin jobs.go.x86_64-darwin
jobs.python.x86_64-darwin jobs.python2.x86_64-darwin
jobs.python3.x86_64-darwin jobs.python3.x86_64-darwin
jobs.nixpkgs-review.x86_64-darwin jobs.nixpkgs-review.x86_64-darwin
jobs.nix-info.x86_64-darwin jobs.nix-info.x86_64-darwin