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