gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: unpin python311 (#412204)

Browse Source
This commit is contained in:
Peder Bergebakken Sundt
2025-06-06 01:47:15 +02:00
committed by GitHub
parent b210ec6682 2a2b9ed586
commit a02f4e55e4
13 changed files with 40 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/by-name/do/dooit-extras/package.nix
+1 -4
View File
@@ -1,13 +1,10 @@
{
lib,
fetchFromGitHub,
python311,
python3,
dooit,
nix-update-script,
}:
let
python3 = python311;
in
python3.pkgs.buildPythonPackage rec {
pname = "dooit-extras";
version = "0.2.1";
pkgs/by-name/do/dooit/package.nix
+1 -4
View File
@@ -2,14 +2,11 @@
lib,
fetchFromGitHub,
dooit,
python311,
python3,
testers,
nix-update-script,
extraPackages ? [ ],
}:
let
python3 = python311;
in
python3.pkgs.buildPythonApplication rec {
pname = "dooit";
version = "3.2.2";
pkgs/by-name/fr/freecad/package.nix
+2 -2
View File
@@ -23,7 +23,7 @@
opencascade-occt_7_6,
opencascade-occt,
pkg-config,
python311Packages,
python3Packages,
spaceNavSupport ? stdenv.hostPlatform.isLinux,
ifcSupport ? false,
stdenv,
@@ -40,7 +40,7 @@
nix-update-script,
}:
let
inherit (python311Packages)
inherit (python3Packages)
boost
gitpython
ifcopenshell
pkgs/by-name/fr/frescobaldi/package.nix
+4 -4
View File
@@ -2,11 +2,11 @@
lib,
stdenv,
fetchFromGitHub,
python311Packages,
python3Packages,
lilypond,
}:
python311Packages.buildPythonApplication rec {
python3Packages.buildPythonApplication rec {
pname = "frescobaldi";
version = "3.3.0";
@@ -17,7 +17,7 @@ python311Packages.buildPythonApplication rec {
sha256 = "sha256-Q6ruthNcpjLlYydUetkuTECiCIzu055bw40O8BPGq/A=";
};
propagatedBuildInputs = with python311Packages; [
propagatedBuildInputs = with python3Packages; [
qpageview
lilypond
pygame
@@ -28,7 +28,7 @@ python311Packages.buildPythonApplication rec {
pyqtwebengine
];
nativeBuildInputs = [ python311Packages.pyqtwebengine.wrapQtAppsHook ];
nativeBuildInputs = [ python3Packages.pyqtwebengine.wrapQtAppsHook ];
# Needed because source is fetched from git
preBuild = ''
pkgs/by-name/gp/gpodder/package.nix
+5 -4
View File
@@ -6,12 +6,12 @@
gobject-introspection,
gtk3,
intltool,
python311Packages,
python3Packages,
wrapGAppsHook3,
xdg-utils,
}:
python311Packages.buildPythonApplication rec {
python3Packages.buildPythonApplication rec {
pname = "gpodder";
version = "3.11.4";
format = "other";
@@ -35,6 +35,7 @@ python311Packages.buildPythonApplication rec {
intltool
wrapGAppsHook3
gobject-introspection
python3Packages.distutils
];
buildInputs = [
@@ -42,7 +43,7 @@ python311Packages.buildPythonApplication rec {
adwaita-icon-theme
];
nativeCheckInputs = with python311Packages; [
nativeCheckInputs = with python3Packages; [
minimock
pytest
pytest-httpserver
@@ -51,7 +52,7 @@ python311Packages.buildPythonApplication rec {
doCheck = true;
propagatedBuildInputs = with python311Packages; [
propagatedBuildInputs = with python3Packages; [
feedparser
dbus-python
mygpoclient
pkgs/by-name/py/py3c/package.nix
+3 -2
View File
@@ -2,7 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
python311,
python3,
}:
stdenv.mkDerivation rec {
@@ -30,7 +30,8 @@ stdenv.mkDerivation rec {
doCheck = true;
nativeCheckInputs = [
python311
python3
python3.pkgs.distutils
];
checkTarget = "test-python";
pkgs/by-name/py/pysolfc/package.nix
+3 -3
View File
@@ -2,7 +2,7 @@
lib,
stdenv,
fetchzip,
python311Packages,
python3Packages,
desktop-file-utils,
freecell-solver,
black-hole-solver,
@@ -10,7 +10,7 @@
gitUpdater,
}:
python311Packages.buildPythonApplication rec {
python3Packages.buildPythonApplication rec {
pname = "pysolfc";
version = "3.2.0";
@@ -51,7 +51,7 @@ python311Packages.buildPythonApplication rec {
'';
};
propagatedBuildInputs = with python311Packages; [
propagatedBuildInputs = with python3Packages; [
tkinter
six
random2
pkgs/by-name/re/renderdoc/package.nix
+5 -5
View File
@@ -13,7 +13,7 @@
nix-update-script,
pcre,
pkg-config,
python311Packages,
python3Packages,
qt5,
stdenv,
vulkan-loader,
@@ -51,9 +51,9 @@ stdenv.mkDerivation (finalAttrs: {
[
libXdmcp
libpthreadstubs
python311Packages.pyside2
python311Packages.pyside2-tools
python311Packages.shiboken2
python3Packages.pyside2
python3Packages.pyside2-tools
python3Packages.shiboken2
qt5.qtbase
qt5.qtsvg
vulkan-loader
@@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: {
makeWrapper
pcre
pkg-config
python311Packages.python
python3Packages.python
qt5.qtx11extras
qt5.wrapQtAppsHook
];
pkgs/by-name/sm/smassh/package.nix
+1 -4
View File
@@ -2,13 +2,10 @@
lib,
fetchFromGitHub,
smassh,
python311,
python3,
testers,
}:
let
python3 = python311;
in
python3.pkgs.buildPythonApplication rec {
pname = "smassh";
version = "3.1.6";
pkgs/by-name/th/thelounge/package.nix
+3 -4
View File
@@ -6,7 +6,7 @@
nodejs,
yarn,
fixup-yarn-lock,
python311,
python3,
npmHooks,
cctools,
sqlite,
@@ -39,13 +39,12 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-csVrgsEy9HjSBXxtgNG0hcBrR9COlcadhMQrw6BWPc4=";
};
# Distutils was deprecated in 3.10, and removed in 3.12. This build needs it. An alternative could be adding
# setuptools, but testing with that and 3.12 still fails.
nativeBuildInputs = [
nodejs
yarn
fixup-yarn-lock
python311
python3
python3.pkgs.distutils
npmHooks.npmInstallHook
] ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools ];
buildInputs = [ sqlite ];
pkgs/by-name/to/toolong/package.nix
+4 -4
View File
@@ -1,12 +1,12 @@
{
lib,
python311Packages,
python3Packages,
fetchFromGitHub,
testers,
toolong,
}:
python311Packages.buildPythonApplication {
python3Packages.buildPythonApplication {
pname = "toolong";
version = "1.4.0";
pyproject = true;
@@ -18,8 +18,8 @@ python311Packages.buildPythonApplication {
hash = "sha256-HrmU7HxWKYrbV25Y5CHLw7/7tX8Y5mTsTL1aXGGTSIo=";
};
build-system = [ python311Packages.poetry-core ];
dependencies = with python311Packages; [
build-system = [ python3Packages.poetry-core ];
dependencies = with python3Packages; [
click
textual
typing-extensions
pkgs/by-name/vo/volk_2/package.nix
+4 -5
View File
@@ -3,7 +3,7 @@
lib,
fetchFromGitHub,
cmake,
python311,
python3,
enableModTool ? true,
removeReferencesTo,
fetchpatch,
@@ -49,10 +49,9 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [
cmake
# This version of the project wasn't updated to use Python 3.12 which
# doesn't include the deprecated distutils module.
python311
python311.pkgs.mako
python3
python3.pkgs.mako
python3.pkgs.distutils
removeReferencesTo
];
pkgs/top-level/all-packages.nix
+4 -8
View File
@@ -2249,7 +2249,7 @@ with pkgs;
stdenv = gcc14Stdenv;
};
hyprshade = python311Packages.callPackage ../applications/window-managers/hyprwm/hyprshade { };
hyprshade = python3Packages.callPackage ../applications/window-managers/hyprwm/hyprshade { };
hyprlandPlugins = recurseIntoAttrs (
callPackage ../applications/window-managers/hyprwm/hyprland-plugins { }
@@ -12617,9 +12617,7 @@ with pkgs;
}
);
manuskript = libsForQt5.callPackage ../applications/editors/manuskript {
python3Packages = python311Packages;
};
manuskript = libsForQt5.callPackage ../applications/editors/manuskript { };
minari = python3Packages.toPythonApplication python3Packages.minari;
@@ -15262,7 +15260,7 @@ with pkgs;
steam-run-free = steam-fhsenv-without-steam.run;
steamback = python311.pkgs.callPackage ../tools/games/steamback { };
steamback = python3.pkgs.callPackage ../tools/games/steamback { };
protontricks = python3Packages.callPackage ../tools/package-management/protontricks {
steam-run = steam-run-free;
@@ -15542,9 +15540,7 @@ with pkgs;
deepdiff = with python3Packages; toPythonApplication deepdiff;
deepsecrets = callPackage ../tools/security/deepsecrets {
python3 = python311;
};
deepsecrets = callPackage ../tools/security/deepsecrets { };
deep-translator = with python3Packages; toPythonApplication deep-translator;