mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-06-09 19:13:26 +03:00
treewide: remove python = python3
This commit is contained in:
awwpotato
parent
f7ff8c60f4
commit
03432cd218
24 changed files with 120 additions and 154 deletions
|
|
@ -12,7 +12,7 @@
|
|||
gitSupport ? false,
|
||||
git,
|
||||
docutilsSupport ? false,
|
||||
python,
|
||||
python3,
|
||||
docutils,
|
||||
monotoneSupport ? false,
|
||||
monotone,
|
||||
|
|
@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
|
|||
CryptSSLeay
|
||||
])
|
||||
++ lib.optionals docutilsSupport [
|
||||
(python.withPackages (pp: with pp; [ pygments ]))
|
||||
(python3.withPackages (pp: with pp; [ pygments ]))
|
||||
docutils
|
||||
]
|
||||
++ lib.optionals gitSupport [ git ]
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
python,
|
||||
python3,
|
||||
makeWrapper,
|
||||
eigen_3_4_0,
|
||||
fftw,
|
||||
|
|
@ -20,7 +20,7 @@
|
|||
withGui ? true,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation {
|
||||
pname = "mrtrix";
|
||||
version = "3.0.4-unstable-2025-04-09";
|
||||
|
||||
|
|
@ -35,14 +35,14 @@ stdenv.mkDerivation rec {
|
|||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
less
|
||||
python
|
||||
python3
|
||||
] ++ lib.optional withGui qt5.wrapQtAppsHook;
|
||||
|
||||
buildInputs =
|
||||
[
|
||||
ants
|
||||
eigen_3_4_0
|
||||
python
|
||||
python3
|
||||
fftw
|
||||
libtiff
|
||||
libpng
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
pkgs,
|
||||
lib,
|
||||
glibcLocales,
|
||||
python,
|
||||
python3,
|
||||
fetchpatch,
|
||||
fetchFromGitHub,
|
||||
# Usage: bumblebee-status.override { plugins = p: [p.arandr p.bluetooth2]; };
|
||||
|
|
@ -13,13 +13,13 @@ let
|
|||
|
||||
# { <name> = { name = "..."; propagatedBuildInputs = [ ... ]; buildInputs = [ ... ]; } }
|
||||
allPlugins = lib.mapAttrs (name: value: value // { inherit name; }) (
|
||||
import ./plugins.nix { inherit pkgs python; }
|
||||
import ./plugins.nix { inherit pkgs python3; }
|
||||
);
|
||||
|
||||
# [ { name = "..."; propagatedBuildInputs = [ ... ]; buildInputs = [ ... ]; } ]
|
||||
selectedPlugins = plugins allPlugins;
|
||||
in
|
||||
python.pkgs.buildPythonPackage {
|
||||
python3.pkgs.buildPythonPackage {
|
||||
pname = "bumblebee-status";
|
||||
inherit version;
|
||||
|
||||
|
|
@ -42,7 +42,7 @@ python.pkgs.buildPythonPackage {
|
|||
buildInputs = lib.concatMap (p: p.buildInputs or [ ]) selectedPlugins;
|
||||
propagatedBuildInputs = lib.concatMap (p: p.propagatedBuildInputs or [ ]) selectedPlugins;
|
||||
|
||||
checkInputs = with python.pkgs; [
|
||||
checkInputs = with python3.pkgs; [
|
||||
freezegun
|
||||
netifaces
|
||||
psutil
|
||||
|
|
@ -60,7 +60,7 @@ python.pkgs.buildPythonPackage {
|
|||
# FIXME: We skip the `dunst` module tests, some of which fail with
|
||||
# `RuntimeError: killall -s SIGUSR2 dunst not found`.
|
||||
# This is not solved by adding `pkgs.killall` to `checkInputs`.
|
||||
${python.interpreter} -m pytest -k 'not test_dunst.py'
|
||||
${python3.interpreter} -m pytest -k 'not test_dunst.py'
|
||||
|
||||
runHook postCheck
|
||||
'';
|
||||
|
|
@ -70,7 +70,7 @@ python.pkgs.buildPythonPackage {
|
|||
find $out -name "__pycache__" -type d | xargs rm -rv
|
||||
|
||||
# Make themes available for bumblebee-status to detect them
|
||||
cp -r ./themes $out/${python.sitePackages}
|
||||
cp -r ./themes $out/${python3.sitePackages}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
fetchFromGitHub,
|
||||
cmake,
|
||||
ninja,
|
||||
python,
|
||||
python3,
|
||||
withGodef ? true,
|
||||
godef,
|
||||
withGopls ? true,
|
||||
|
|
@ -22,7 +22,7 @@
|
|||
stdenv.mkDerivation {
|
||||
pname = "ycmd";
|
||||
version = "unstable-2023-11-06";
|
||||
disabled = !python.isPy3k;
|
||||
disabled = !python3.isPy3k;
|
||||
|
||||
# required for third_party directory creation
|
||||
src = fetchFromGitHub {
|
||||
|
|
@ -38,7 +38,7 @@ stdenv.mkDerivation {
|
|||
ninja
|
||||
] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
|
||||
buildInputs =
|
||||
with python.pkgs;
|
||||
with python3.pkgs;
|
||||
with llvmPackages;
|
||||
[
|
||||
abseil-cpp
|
||||
|
|
@ -54,7 +54,7 @@ stdenv.mkDerivation {
|
|||
|
||||
buildPhase = ''
|
||||
export EXTRA_CMAKE_ARGS="-DPATH_TO_LLVM_ROOT=${llvmPackages.libllvm} -DUSE_SYSTEM_ABSEIL=true"
|
||||
${python.pythonOnBuildForHost.interpreter} build.py --system-libclang --clang-completer --ninja
|
||||
${python3.pythonOnBuildForHost.interpreter} build.py --system-libclang --clang-completer --ninja
|
||||
'';
|
||||
|
||||
dontConfigure = true;
|
||||
|
|
@ -75,7 +75,7 @@ stdenv.mkDerivation {
|
|||
find third_party -type d -name "test" -exec rm -rf {} +
|
||||
|
||||
chmod +x ycmd/__main__.py
|
||||
sed -i "1i #!${python.interpreter}\
|
||||
sed -i "1i #!${python3.interpreter}\
|
||||
" ycmd/__main__.py
|
||||
|
||||
mkdir -p $out/lib/ycmd
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
libpng,
|
||||
boost,
|
||||
guile,
|
||||
python,
|
||||
python3,
|
||||
qtbase,
|
||||
}:
|
||||
|
||||
|
|
@ -32,7 +32,7 @@ stdenv.mkDerivation {
|
|||
cmake
|
||||
ninja
|
||||
pkg-config
|
||||
python.pkgs.pythonImportsCheckHook
|
||||
python3.pkgs.pythonImportsCheckHook
|
||||
];
|
||||
buildInputs = [
|
||||
eigen_3_4_0
|
||||
|
|
@ -40,7 +40,7 @@ stdenv.mkDerivation {
|
|||
libpng
|
||||
boost
|
||||
guile
|
||||
python
|
||||
python3
|
||||
qtbase
|
||||
];
|
||||
|
||||
|
|
@ -59,11 +59,11 @@ stdenv.mkDerivation {
|
|||
|
||||
substituteInPlace libfive/bind/python/CMakeLists.txt \
|
||||
--replace ' ''${PYTHON_SITE_PACKAGES_DIR}' \
|
||||
" $out/${python.sitePackages}" \
|
||||
" $out/${python3.sitePackages}" \
|
||||
|
||||
substituteInPlace libfive/bind/python/libfive/ffi.py \
|
||||
--replace "os.path.join('libfive', folder)" \
|
||||
"os.path.join('$out/${python.sitePackages}/libfive', folder)" \
|
||||
"os.path.join('$out/${python3.sitePackages}/libfive', folder)" \
|
||||
|
||||
export XDG_CACHE_HOME=$(mktemp -d)/.cache
|
||||
'';
|
||||
|
|
@ -91,14 +91,14 @@ stdenv.mkDerivation {
|
|||
ln -s "$out/bin/Studio" "$out/bin/libfive-studio"
|
||||
|
||||
# Create links since libfive looks for the library in a specific path.
|
||||
mkdir -p "$out/${python.sitePackages}/libfive/src"
|
||||
ln -s "$out"/lib/libfive.* "$out/${python.sitePackages}/libfive/src/"
|
||||
mkdir -p "$out/${python.sitePackages}/libfive/stdlib"
|
||||
ln -s "$out"/lib/libfive-stdlib.* "$out/${python.sitePackages}/libfive/stdlib/"
|
||||
mkdir -p "$out/${python3.sitePackages}/libfive/src"
|
||||
ln -s "$out"/lib/libfive.* "$out/${python3.sitePackages}/libfive/src/"
|
||||
mkdir -p "$out/${python3.sitePackages}/libfive/stdlib"
|
||||
ln -s "$out"/lib/libfive-stdlib.* "$out/${python3.sitePackages}/libfive/stdlib/"
|
||||
|
||||
# Create links so Studio can find the bindings.
|
||||
mkdir -p "$out/libfive/bind"
|
||||
ln -s "$out/${python.sitePackages}" "$out/libfive/bind/python"
|
||||
ln -s "$out/${python3.sitePackages}" "$out/libfive/bind/python"
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
bison,
|
||||
libxml2,
|
||||
pythonSupport ? stdenv.hostPlatform.hasSharedLibraries,
|
||||
python,
|
||||
python3,
|
||||
libusb1,
|
||||
avahiSupport ? true,
|
||||
avahi,
|
||||
|
|
@ -46,9 +46,9 @@ stdenv.mkDerivation rec {
|
|||
]
|
||||
++ lib.optionals pythonSupport (
|
||||
[
|
||||
python
|
||||
python3
|
||||
]
|
||||
++ lib.optional python.isPy3k python.pkgs.setuptools
|
||||
++ lib.optional python3.isPy3k python3.pkgs.setuptools
|
||||
);
|
||||
|
||||
buildInputs =
|
||||
|
|
@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
|
|||
"-DOSX_FRAMEWORK=off"
|
||||
]
|
||||
++ lib.optionals pythonSupport [
|
||||
"-DPython_EXECUTABLE=${python.pythonOnBuildForHost.interpreter}"
|
||||
"-DPython_EXECUTABLE=${python3.pythonOnBuildForHost.interpreter}"
|
||||
"-DPYTHON_BINDINGS=on"
|
||||
]
|
||||
++ lib.optionals (!avahiSupport) [
|
||||
|
|
@ -87,7 +87,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
postInstall = lib.optionalString pythonSupport ''
|
||||
# Move Python bindings into a separate output.
|
||||
moveToOutput ${python.sitePackages} "$python"
|
||||
moveToOutput ${python3.sitePackages} "$python"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
enablePAM ? stdenv.hostPlatform.isLinux,
|
||||
pam,
|
||||
enablePython ? false,
|
||||
python,
|
||||
python3,
|
||||
}:
|
||||
|
||||
# python binding generates a shared library which are unavailable with musl build
|
||||
|
|
@ -67,14 +67,14 @@ stdenv.mkDerivation rec {
|
|||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
perl
|
||||
] ++ lib.optionals enablePython [ (python.withPackages (ps: with ps; [ setuptools ])) ];
|
||||
] ++ lib.optionals enablePython [ (python3.withPackages (ps: with ps; [ setuptools ])) ];
|
||||
buildInputs = [ cracklib ] ++ lib.optionals enablePAM [ pam ];
|
||||
|
||||
configureFlags =
|
||||
if enablePython then
|
||||
[
|
||||
"--enable-python-bindings=yes"
|
||||
"--with-pythonsitedir=\"${python.sitePackages}\""
|
||||
"--with-pythonsitedir=\"${python3.sitePackages}\""
|
||||
]
|
||||
else
|
||||
# change to `--enable-python-bindings=no` in the future
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
libxml2,
|
||||
findXMLCatalogs,
|
||||
gettext,
|
||||
python,
|
||||
python3,
|
||||
ncurses,
|
||||
libgcrypt,
|
||||
cryptoSupport ? false,
|
||||
|
|
@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
]
|
||||
++ lib.optionals pythonSupport [
|
||||
libxml2.py
|
||||
python
|
||||
python3
|
||||
ncurses
|
||||
]
|
||||
++ lib.optionals cryptoSupport [
|
||||
|
|
@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
configureFlags = [
|
||||
(lib.withFeature pythonSupport "python")
|
||||
(lib.optionalString pythonSupport "PYTHON=${python.pythonOnBuildForHost.interpreter}")
|
||||
(lib.optionalString pythonSupport "PYTHON=${python3.pythonOnBuildForHost.interpreter}")
|
||||
(lib.withFeature cryptoSupport "crypto")
|
||||
];
|
||||
|
||||
|
|
@ -76,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
+ lib.optionalString pythonSupport ''
|
||||
mkdir -p $py/nix-support
|
||||
echo ${libxml2.py} >> $py/nix-support/propagated-build-inputs
|
||||
moveToOutput ${python.sitePackages} "$py"
|
||||
moveToOutput ${python3.sitePackages} "$py"
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
python,
|
||||
python3,
|
||||
cmake,
|
||||
ninja,
|
||||
}:
|
||||
|
||||
let
|
||||
pyEnv = python.withPackages (ps: [
|
||||
pyEnv = python3.withPackages (ps: [
|
||||
ps.setuptools
|
||||
ps.tomli
|
||||
ps.pip
|
||||
|
|
@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
# Not in propagatedBuildInputs because only the $py output needs it; $out is
|
||||
# just the library itself (e.g. C/C++ headers).
|
||||
buildInputs = with python.pkgs; [
|
||||
buildInputs = with python3.pkgs; [
|
||||
python
|
||||
build
|
||||
pathspec
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
zlib,
|
||||
libxml2,
|
||||
eigen,
|
||||
python,
|
||||
python3,
|
||||
cairo,
|
||||
pcre,
|
||||
pkg-config,
|
||||
|
|
@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
|
|||
zlib
|
||||
libxml2
|
||||
eigen
|
||||
python
|
||||
python3
|
||||
cairo
|
||||
pcre
|
||||
swig
|
||||
|
|
@ -57,14 +57,14 @@ stdenv.mkDerivation rec {
|
|||
cmakeFlagsArray+=(
|
||||
"-DRUN_SWIG=ON"
|
||||
"-DPYTHON_BINDINGS=ON"
|
||||
"-DPYTHON_INSTDIR=$out/${python.sitePackages}"
|
||||
"-DPYTHON_INSTDIR=$out/${python3.sitePackages}"
|
||||
)
|
||||
'';
|
||||
|
||||
# Setuptools only accepts PEP 440 version strings. The "unstable" identifier
|
||||
# can not be used. Instead we pretend to be the 3.2 beta release.
|
||||
postFixup = ''
|
||||
cat << EOF > $out/${python.sitePackages}/setup.py
|
||||
cat << EOF > $out/${python3.sitePackages}/setup.py
|
||||
from setuptools import setup
|
||||
|
||||
setup(
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
stdenv,
|
||||
fetchurl,
|
||||
bash,
|
||||
python,
|
||||
python3,
|
||||
makeWrapper,
|
||||
}:
|
||||
|
||||
|
|
@ -27,14 +27,14 @@ stdenv.mkDerivation rec {
|
|||
bash
|
||||
makeWrapper
|
||||
]
|
||||
++ lib.optionals (python != null && lib.versionAtLeast python.version "3.10") [
|
||||
python.pkgs.cython
|
||||
++ lib.optionals (python3 != null && lib.versionAtLeast python3.version "3.10") [
|
||||
python3.pkgs.cython
|
||||
];
|
||||
buildInputs = [ python ];
|
||||
buildInputs = [ python3 ];
|
||||
|
||||
configureFlags = lib.optionals (python == null) [ "--disable-python" ];
|
||||
configureFlags = lib.optionals (python3 == null) [ "--disable-python" ];
|
||||
|
||||
preBuild = lib.optionalString (python != null && lib.versionAtLeast python.version "3.10") ''
|
||||
preBuild = lib.optionalString (python3 != null && lib.versionAtLeast python3.version "3.10") ''
|
||||
rm wrappers/python/lhapdf.cpp
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
stdenv,
|
||||
fetchFromGitLab,
|
||||
python,
|
||||
python3,
|
||||
libxml2,
|
||||
sqlite,
|
||||
|
||||
|
|
@ -48,7 +48,7 @@
|
|||
}:
|
||||
|
||||
let
|
||||
pythonEnv = python.withPackages (
|
||||
pythonEnv = python3.withPackages (
|
||||
ps:
|
||||
lib.optional withManual ps.sphinx
|
||||
++ lib.optionals pythonSupport (
|
||||
|
|
@ -137,7 +137,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
# Make generated python bindings discoverable in customized python environment
|
||||
passthru = {
|
||||
pythonModule = python;
|
||||
pythonModule = python3;
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
stdenv,
|
||||
cmake,
|
||||
fetchurl,
|
||||
python,
|
||||
python3,
|
||||
blas,
|
||||
lapack,
|
||||
gfortran,
|
||||
|
|
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs =
|
||||
[
|
||||
python
|
||||
python3
|
||||
]
|
||||
++
|
||||
lib.optionals (lapackSupport)
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
# build libsigrok plus its Python bindings. Unfortunately it does not appear
|
||||
# to be possible to build them separately, at least not easily.
|
||||
toPythonModule (
|
||||
(libsigrok.override { inherit python; }).overrideAttrs (orig: {
|
||||
(libsigrok.override { python3 = python; }).overrideAttrs (orig: {
|
||||
pname = "${python.libPrefix}-sigrok";
|
||||
|
||||
patches = orig.patches or [ ] ++ [
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
libserialport,
|
||||
doxygen,
|
||||
glibmm,
|
||||
python,
|
||||
python3,
|
||||
hidapi,
|
||||
libieee1284,
|
||||
bluez,
|
||||
|
|
@ -35,7 +35,7 @@ stdenv.mkDerivation {
|
|||
autoreconfHook
|
||||
doxygen
|
||||
pkg-config
|
||||
python
|
||||
python3
|
||||
];
|
||||
buildInputs =
|
||||
[
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
{
|
||||
python,
|
||||
python3Packages,
|
||||
fetchurl,
|
||||
anki,
|
||||
}:
|
||||
|
||||
python.pkgs.buildPythonApplication rec {
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "mnemosyne";
|
||||
version = "2.10.1";
|
||||
|
||||
|
|
@ -13,11 +13,11 @@ python.pkgs.buildPythonApplication rec {
|
|||
sha256 = "sha256-zI79iuRXb5S0Y87KfdG+HKc0XVNQOAcBR7Zt/OdaBP4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python.pkgs; [ pyqtwebengine.wrapQtAppsHook ];
|
||||
nativeBuildInputs = with python3Packages; [ pyqtwebengine.wrapQtAppsHook ];
|
||||
|
||||
buildInputs = [ anki ];
|
||||
|
||||
propagatedBuildInputs = with python.pkgs; [
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
cheroot
|
||||
cherrypy
|
||||
googletrans
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
lib,
|
||||
fetchurl,
|
||||
makeWrapper,
|
||||
python,
|
||||
python3,
|
||||
openssl,
|
||||
jq,
|
||||
callPackage,
|
||||
|
|
@ -21,7 +21,7 @@
|
|||
}:
|
||||
|
||||
let
|
||||
pythonEnv = python.withPackages (
|
||||
pythonEnv = python3.withPackages (
|
||||
p:
|
||||
with p;
|
||||
[
|
||||
|
|
@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl (sources stdenv.hostPlatform.system);
|
||||
|
||||
buildInputs = [ python ];
|
||||
buildInputs = [ python3 ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
jq
|
||||
|
|
@ -85,7 +85,7 @@ stdenv.mkDerivation rec {
|
|||
wrapProgram "$programPath" \
|
||||
--set CLOUDSDK_PYTHON "${pythonEnv}/bin/python" \
|
||||
--set CLOUDSDK_PYTHON_ARGS "-S -W ignore" \
|
||||
--prefix PYTHONPATH : "${pythonEnv}/${python.sitePackages}" \
|
||||
--prefix PYTHONPATH : "${pythonEnv}/${python3.sitePackages}" \
|
||||
--prefix PATH : "${openssl.bin}/bin"
|
||||
|
||||
mkdir -p $out/bin
|
||||
|
|
|
|||
|
|
@ -2,10 +2,10 @@
|
|||
lib,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
python,
|
||||
python3Packages,
|
||||
}:
|
||||
|
||||
python.pkgs.buildPythonApplication rec {
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "brotab";
|
||||
version = "1.4.2";
|
||||
format = "setuptools";
|
||||
|
|
@ -26,7 +26,7 @@ python.pkgs.buildPythonApplication rec {
|
|||
})
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python.pkgs; [
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
flask
|
||||
psutil
|
||||
requests
|
||||
|
|
@ -42,7 +42,7 @@ python.pkgs.buildPythonApplication rec {
|
|||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
nativeCheckInputs = with python.pkgs; [
|
||||
nativeCheckInputs = with python3Packages; [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
libpwquality,
|
||||
parted,
|
||||
polkit-qt,
|
||||
python,
|
||||
python3,
|
||||
qtbase,
|
||||
qtquickcontrols,
|
||||
qtsvg,
|
||||
|
|
@ -73,7 +73,7 @@ mkDerivation rec {
|
|||
libpwquality
|
||||
parted
|
||||
polkit-qt
|
||||
python
|
||||
python3
|
||||
qtbase
|
||||
qtquickcontrols
|
||||
qtsvg
|
||||
|
|
@ -83,8 +83,8 @@ mkDerivation rec {
|
|||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DPYTHON_LIBRARY=${python}/lib/lib${python.libPrefix}.so"
|
||||
"-DPYTHON_INCLUDE_DIR=${python}/include/${python.libPrefix}"
|
||||
"-DPYTHON_LIBRARY=${python3}/lib/lib${python3.libPrefix}.so"
|
||||
"-DPYTHON_INCLUDE_DIR=${python3}/include/${python3.libPrefix}"
|
||||
"-DCMAKE_VERBOSE_MAKEFILE=True"
|
||||
"-DWITH_PYTHONQT:BOOL=ON"
|
||||
];
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
expat,
|
||||
fetchFromGitHub,
|
||||
libxml2,
|
||||
python,
|
||||
python3,
|
||||
sphinx,
|
||||
stdenv,
|
||||
zlib,
|
||||
|
|
@ -35,14 +35,14 @@ stdenv.mkDerivation rec {
|
|||
|
||||
postPatch = ''
|
||||
substituteInPlace libcomps/src/python/src/CMakeLists.txt \
|
||||
--replace "@PYTHON_INSTALL_DIR@" "$out/${python.sitePackages}"
|
||||
--replace "@PYTHON_INSTALL_DIR@" "$out/${python3.sitePackages}"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
check
|
||||
cmake
|
||||
doxygen
|
||||
python
|
||||
python3
|
||||
sphinx
|
||||
];
|
||||
|
||||
|
|
@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
postFixup = ''
|
||||
ls $out/lib
|
||||
moveToOutput "lib/${python.libPrefix}" "$py"
|
||||
moveToOutput "lib/${python3.libPrefix}" "$py"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
rpm,
|
||||
zchunk,
|
||||
cppunit,
|
||||
python,
|
||||
python3,
|
||||
swig,
|
||||
pcre2,
|
||||
sphinx,
|
||||
|
|
@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
|
|||
libyaml
|
||||
libmodulemd
|
||||
zchunk
|
||||
python
|
||||
python3
|
||||
swig
|
||||
sphinx
|
||||
pcre2.dev
|
||||
|
|
@ -80,21 +80,21 @@ stdenv.mkDerivation rec {
|
|||
substituteInPlace libdnf/libdnf.pc.in \
|
||||
--replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@
|
||||
substituteInPlace cmake/modules/FindPythonInstDir.cmake \
|
||||
--replace "@PYTHON_INSTALL_DIR@" "$out/${python.sitePackages}"
|
||||
--replace "@PYTHON_INSTALL_DIR@" "$out/${python3.sitePackages}"
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
"-DWITH_GTKDOC=OFF"
|
||||
"-DWITH_HTML=OFF"
|
||||
"-DPYTHON_DESIRED=${lib.head (lib.splitString [ "." ] python.version)}"
|
||||
"-DPYTHON_DESIRED=${lib.head (lib.splitString [ "." ] python3.version)}"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
rm -r $out/${python.sitePackages}/hawkey/test
|
||||
rm -r $out/${python3.sitePackages}/hawkey/test
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
moveToOutput "lib/${python.libPrefix}" "$py"
|
||||
moveToOutput "lib/${python3.libPrefix}" "$py"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
python,
|
||||
python3,
|
||||
pkg-config,
|
||||
libxml2,
|
||||
glib,
|
||||
|
|
@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
buildInputs = [
|
||||
python
|
||||
python3
|
||||
libxml2
|
||||
glib
|
||||
openssl
|
||||
|
|
@ -59,10 +59,10 @@ stdenv.mkDerivation rec {
|
|||
libxml2
|
||||
];
|
||||
|
||||
cmakeFlags = [ "-DPYTHON_DESIRED=${lib.substring 0 1 python.pythonVersion}" ];
|
||||
cmakeFlags = [ "-DPYTHON_DESIRED=${lib.substring 0 1 python3.pythonVersion}" ];
|
||||
|
||||
postFixup = ''
|
||||
moveToOutput "lib/${python.libPrefix}" "$py"
|
||||
moveToOutput "lib/${python3.libPrefix}" "$py"
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
|
|
|||
|
|
@ -2021,7 +2021,6 @@ with pkgs;
|
|||
});
|
||||
|
||||
calamares = libsForQt5.callPackage ../tools/misc/calamares {
|
||||
python = python3;
|
||||
boost = boost.override {
|
||||
enablePython = true;
|
||||
python = python3;
|
||||
|
|
@ -2312,9 +2311,7 @@ with pkgs;
|
|||
|
||||
lexicon = with python3Packages; toPythonApplication dns-lexicon;
|
||||
|
||||
lief = callPackage ../development/libraries/lief {
|
||||
python = python3;
|
||||
};
|
||||
lief = callPackage ../development/libraries/lief { };
|
||||
|
||||
# Less secure variant of lowdown for use inside Nix builds.
|
||||
lowdown-unsandboxed = lowdown.override {
|
||||
|
|
@ -3191,11 +3188,8 @@ with pkgs;
|
|||
isStereo = true;
|
||||
};
|
||||
|
||||
google-cloud-sdk = callPackage ../tools/admin/google-cloud-sdk {
|
||||
python = python3;
|
||||
};
|
||||
google-cloud-sdk = callPackage ../tools/admin/google-cloud-sdk { };
|
||||
google-cloud-sdk-gce = google-cloud-sdk.override {
|
||||
python = python3;
|
||||
with-gce = true;
|
||||
};
|
||||
|
||||
|
|
@ -7282,9 +7276,7 @@ with pkgs;
|
|||
else
|
||||
gcc.cc;
|
||||
|
||||
libsigrok = callPackage ../development/tools/libsigrok {
|
||||
python = python3;
|
||||
};
|
||||
libsigrok = callPackage ../development/tools/libsigrok { };
|
||||
|
||||
distcc = callPackage ../development/tools/misc/distcc {
|
||||
libiberty_static = libiberty.override { staticBuild = true; };
|
||||
|
|
@ -7802,10 +7794,6 @@ with pkgs;
|
|||
|
||||
xxdiff-tip = xxdiff;
|
||||
|
||||
ycmd = callPackage ../by-name/yc/ycmd/package.nix {
|
||||
python = python3;
|
||||
};
|
||||
|
||||
yourkit-java = callPackage ../by-name/yo/yourkit-java/package.nix {
|
||||
jre = jdk21;
|
||||
};
|
||||
|
|
@ -8701,7 +8689,7 @@ with pkgs;
|
|||
|
||||
libchipcard = callPackage ../development/libraries/aqbanking/libchipcard.nix { };
|
||||
|
||||
libcomps = callPackage ../tools/package-management/libcomps { python = python3; };
|
||||
libcomps = callPackage ../tools/package-management/libcomps { };
|
||||
|
||||
libcxxrt = callPackage ../development/libraries/libcxxrt {
|
||||
stdenv =
|
||||
|
|
@ -8725,7 +8713,7 @@ with pkgs;
|
|||
withXorg = false;
|
||||
};
|
||||
|
||||
libdnf = callPackage ../tools/package-management/libdnf { python = python3; };
|
||||
libdnf = callPackage ../tools/package-management/libdnf { };
|
||||
|
||||
libdvdnav = callPackage ../development/libraries/libdvdnav { };
|
||||
libdvdnav_4_2_1 = callPackage ../development/libraries/libdvdnav/4.2.1.nix {
|
||||
|
|
@ -8750,17 +8738,13 @@ with pkgs;
|
|||
callPackage ../development/libraries/libgnome-games-support/2.0.nix
|
||||
{ };
|
||||
|
||||
libiio = callPackage ../development/libraries/libiio {
|
||||
python = python3;
|
||||
};
|
||||
libiio = callPackage ../development/libraries/libiio { };
|
||||
|
||||
libextractor = callPackage ../development/libraries/libextractor {
|
||||
libmpeg2 = mpeg2dec;
|
||||
};
|
||||
|
||||
libfive = libsForQt5.callPackage ../development/libraries/libfive {
|
||||
python = python3;
|
||||
};
|
||||
libfive = libsForQt5.callPackage ../development/libraries/libfive { };
|
||||
|
||||
# Use Apple’s fork of libffi by default, which provides APIs and trampoline functionality that is not yet
|
||||
# merged upstream. This is needed by some packages (such as cffi).
|
||||
|
|
@ -8797,9 +8781,7 @@ with pkgs;
|
|||
|
||||
libremines = qt6.callPackage ../games/libremines { };
|
||||
|
||||
librepo = callPackage ../tools/package-management/librepo {
|
||||
python = python3;
|
||||
};
|
||||
librepo = callPackage ../tools/package-management/librepo { };
|
||||
|
||||
libretranslate = with python3.pkgs; toPythonApplication libretranslate;
|
||||
|
||||
|
|
@ -8923,9 +8905,7 @@ with pkgs;
|
|||
protobuf = protobuf_21;
|
||||
};
|
||||
|
||||
libpwquality = callPackage ../development/libraries/libpwquality {
|
||||
python = python3;
|
||||
};
|
||||
libpwquality = callPackage ../development/libraries/libpwquality { };
|
||||
|
||||
libsigcxx = callPackage ../development/libraries/libsigcxx { };
|
||||
|
||||
|
|
@ -9038,9 +9018,7 @@ with pkgs;
|
|||
libxmlxx = callPackage ../development/libraries/libxmlxx { };
|
||||
libxmlxx3 = callPackage ../development/libraries/libxmlxx/v3.nix { };
|
||||
|
||||
libxslt = callPackage ../development/libraries/libxslt {
|
||||
python = python3;
|
||||
};
|
||||
libxslt = callPackage ../development/libraries/libxslt { };
|
||||
|
||||
libwpe = callPackage ../development/libraries/libwpe { };
|
||||
|
||||
|
|
@ -9232,9 +9210,7 @@ with pkgs;
|
|||
|
||||
openbabel2 = callPackage ../development/libraries/openbabel/2.nix { };
|
||||
|
||||
openbabel3 = callPackage ../development/libraries/openbabel {
|
||||
python = python3;
|
||||
};
|
||||
openbabel3 = callPackage ../development/libraries/openbabel { };
|
||||
|
||||
opencascade-occt_7_6 = opencascade-occt.overrideAttrs rec {
|
||||
pname = "opencascade-occt";
|
||||
|
|
@ -9739,9 +9715,7 @@ with pkgs;
|
|||
|
||||
structuresynth = libsForQt5.callPackage ../development/libraries/structuresynth { };
|
||||
|
||||
sundials = callPackage ../development/libraries/sundials {
|
||||
python = python3;
|
||||
};
|
||||
sundials = callPackage ../development/libraries/sundials { };
|
||||
|
||||
svxlink = libsForQt5.callPackage ../applications/radio/svxlink { };
|
||||
|
||||
|
|
@ -12107,13 +12081,9 @@ with pkgs;
|
|||
|
||||
cdparanoia = cdparanoiaIII;
|
||||
|
||||
brotab = callPackage ../tools/misc/brotab {
|
||||
python = python3;
|
||||
};
|
||||
brotab = callPackage ../tools/misc/brotab { };
|
||||
|
||||
bumblebee-status = callPackage ../applications/window-managers/i3/bumblebee-status {
|
||||
python = python3;
|
||||
};
|
||||
bumblebee-status = callPackage ../applications/window-managers/i3/bumblebee-status { };
|
||||
|
||||
chromium = callPackage ../applications/networking/browsers/chromium (config.chromium or { });
|
||||
|
||||
|
|
@ -12893,7 +12863,6 @@ with pkgs;
|
|||
};
|
||||
|
||||
ikiwiki = callPackage ../applications/misc/ikiwiki {
|
||||
python = python3;
|
||||
inherit
|
||||
(perlPackages.override {
|
||||
pkgs = pkgs // {
|
||||
|
|
@ -15201,9 +15170,7 @@ with pkgs;
|
|||
luanti-client = luanti.override { buildServer = false; };
|
||||
luanti-server = luanti.override { buildClient = false; };
|
||||
|
||||
mnemosyne = callPackage ../games/mnemosyne {
|
||||
python = python3;
|
||||
};
|
||||
mnemosyne = callPackage ../games/mnemosyne { };
|
||||
|
||||
mrrescue = callPackage ../games/mrrescue { love = love_0_10; };
|
||||
|
||||
|
|
@ -15676,7 +15643,7 @@ with pkgs;
|
|||
useRx3d = true;
|
||||
};
|
||||
|
||||
mrtrix = callPackage ../applications/science/biology/mrtrix { python = python3; };
|
||||
mrtrix = callPackage ../applications/science/biology/mrtrix { };
|
||||
|
||||
minc_tools = callPackage ../applications/science/biology/minc-tools {
|
||||
inherit (perlPackages) perl TextFormat;
|
||||
|
|
@ -15862,7 +15829,7 @@ with pkgs;
|
|||
stdenv = gccStdenv;
|
||||
lhapdf = lhapdf.override {
|
||||
stdenv = gccStdenv;
|
||||
python = null;
|
||||
python3 = null;
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -16186,7 +16153,7 @@ with pkgs;
|
|||
inherit (ocaml-ng.ocamlPackages_4_14) ocaml;
|
||||
};
|
||||
|
||||
ns-3 = callPackage ../development/libraries/science/networking/ns-3 { python = python3; };
|
||||
ns-3 = callPackage ../development/libraries/science/networking/ns-3 { };
|
||||
|
||||
spyder = with python3.pkgs; toPythonApplication spyder;
|
||||
|
||||
|
|
@ -16202,9 +16169,7 @@ with pkgs;
|
|||
python = null;
|
||||
};
|
||||
|
||||
lhapdf = callPackage ../development/libraries/physics/lhapdf {
|
||||
python = python3;
|
||||
};
|
||||
lhapdf = callPackage ../development/libraries/physics/lhapdf { };
|
||||
|
||||
pythia = callPackage ../development/libraries/physics/pythia {
|
||||
hepmc = hepmc2;
|
||||
|
|
|
|||
|
|
@ -7717,7 +7717,7 @@ self: super: with self; {
|
|||
|
||||
lexilang = callPackage ../development/python-modules/lexilang { };
|
||||
|
||||
lhapdf = toPythonModule (pkgs.lhapdf.override { inherit python; });
|
||||
lhapdf = toPythonModule (pkgs.lhapdf.override { python3 = python; });
|
||||
|
||||
lib4package = callPackage ../development/python-modules/lib4package { };
|
||||
|
||||
|
|
@ -7753,7 +7753,7 @@ self: super: with self; {
|
|||
};
|
||||
})
|
||||
)
|
||||
(p: p.override { inherit python; })
|
||||
(p: p.override { python3 = python; })
|
||||
(p: p.py)
|
||||
];
|
||||
|
||||
|
|
@ -7769,7 +7769,7 @@ self: super: with self; {
|
|||
};
|
||||
})
|
||||
)
|
||||
(p: p.override { inherit python; })
|
||||
(p: p.override { python3 = python; })
|
||||
(p: p.py)
|
||||
];
|
||||
|
||||
|
|
@ -7782,7 +7782,7 @@ self: super: with self; {
|
|||
}
|
||||
);
|
||||
|
||||
libfive = toPythonModule (pkgs.libfive.override { inherit python; });
|
||||
libfive = toPythonModule (pkgs.libfive.override { python3 = python; });
|
||||
|
||||
libgpiod = callPackage ../development/python-modules/libgpiod { inherit (pkgs) libgpiod; };
|
||||
|
||||
|
|
@ -7792,7 +7792,7 @@ self: super: with self; {
|
|||
(toPythonModule (
|
||||
pkgs.libiio.override {
|
||||
pythonSupport = true;
|
||||
inherit python;
|
||||
python3 = python;
|
||||
}
|
||||
)).python;
|
||||
|
||||
|
|
@ -7856,7 +7856,7 @@ self: super: with self; {
|
|||
p:
|
||||
p.override {
|
||||
enablePython = true;
|
||||
inherit python;
|
||||
python3 = python;
|
||||
}
|
||||
)
|
||||
(p: p.py)
|
||||
|
|
@ -7885,7 +7885,7 @@ self: super: with self; {
|
|||
};
|
||||
})
|
||||
)
|
||||
(p: p.override { inherit python; })
|
||||
(p: p.override { python3 = python; })
|
||||
(p: p.py)
|
||||
];
|
||||
|
||||
|
|
@ -7963,7 +7963,8 @@ self: super: with self; {
|
|||
(toPythonModule (
|
||||
pkgs.libxslt.override {
|
||||
pythonSupport = true;
|
||||
inherit (self) python libxml2;
|
||||
python3 = python;
|
||||
inherit (self) libxml2;
|
||||
}
|
||||
)).py;
|
||||
|
||||
|
|
@ -7973,7 +7974,7 @@ self: super: with self; {
|
|||
|
||||
lida = callPackage ../development/python-modules/lida { };
|
||||
|
||||
lief = (toPythonModule (pkgs.lief.override { inherit python; })).py;
|
||||
lief = (toPythonModule (pkgs.lief.override { python3 = python; })).py;
|
||||
|
||||
life360 = callPackage ../development/python-modules/life360 { };
|
||||
|
||||
|
|
@ -10309,7 +10310,7 @@ self: super: with self; {
|
|||
openapi3 = callPackage ../development/python-modules/openapi3 { };
|
||||
|
||||
openbabel-bindings = callPackage ../development/python-modules/openbabel-bindings {
|
||||
openbabel = callPackage ../development/libraries/openbabel { inherit (self) python; };
|
||||
openbabel = pkgs.openbabel.override { python3 = python; };
|
||||
};
|
||||
|
||||
opencamlib = callPackage ../development/python-modules/opencamlib { };
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue