treewide: unpin python311 (#412204)

authored by

Peder Bergebakken Sundt and committed by
GitHub
a02f4e55 b210ec66

+40 -53
+1 -4
pkgs/by-name/do/dooit-extras/package.nix
··· 1 1 { 2 2 lib, 3 3 fetchFromGitHub, 4 - python311, 4 + python3, 5 5 dooit, 6 6 nix-update-script, 7 7 }: 8 - let 9 - python3 = python311; 10 - in 11 8 python3.pkgs.buildPythonPackage rec { 12 9 pname = "dooit-extras"; 13 10 version = "0.2.1";
+1 -4
pkgs/by-name/do/dooit/package.nix
··· 2 2 lib, 3 3 fetchFromGitHub, 4 4 dooit, 5 - python311, 5 + python3, 6 6 testers, 7 7 nix-update-script, 8 8 extraPackages ? [ ], 9 9 }: 10 - let 11 - python3 = python311; 12 - in 13 10 python3.pkgs.buildPythonApplication rec { 14 11 pname = "dooit"; 15 12 version = "3.2.2";
+2 -2
pkgs/by-name/fr/freecad/package.nix
··· 23 23 opencascade-occt_7_6, 24 24 opencascade-occt, 25 25 pkg-config, 26 - python311Packages, 26 + python3Packages, 27 27 spaceNavSupport ? stdenv.hostPlatform.isLinux, 28 28 ifcSupport ? false, 29 29 stdenv, ··· 40 40 nix-update-script, 41 41 }: 42 42 let 43 - inherit (python311Packages) 43 + inherit (python3Packages) 44 44 boost 45 45 gitpython 46 46 ifcopenshell
+4 -4
pkgs/by-name/fr/frescobaldi/package.nix
··· 2 2 lib, 3 3 stdenv, 4 4 fetchFromGitHub, 5 - python311Packages, 5 + python3Packages, 6 6 lilypond, 7 7 }: 8 8 9 - python311Packages.buildPythonApplication rec { 9 + python3Packages.buildPythonApplication rec { 10 10 pname = "frescobaldi"; 11 11 version = "3.3.0"; 12 12 ··· 17 17 sha256 = "sha256-Q6ruthNcpjLlYydUetkuTECiCIzu055bw40O8BPGq/A="; 18 18 }; 19 19 20 - propagatedBuildInputs = with python311Packages; [ 20 + propagatedBuildInputs = with python3Packages; [ 21 21 qpageview 22 22 lilypond 23 23 pygame ··· 28 28 pyqtwebengine 29 29 ]; 30 30 31 - nativeBuildInputs = [ python311Packages.pyqtwebengine.wrapQtAppsHook ]; 31 + nativeBuildInputs = [ python3Packages.pyqtwebengine.wrapQtAppsHook ]; 32 32 33 33 # Needed because source is fetched from git 34 34 preBuild = ''
+5 -4
pkgs/by-name/gp/gpodder/package.nix
··· 6 6 gobject-introspection, 7 7 gtk3, 8 8 intltool, 9 - python311Packages, 9 + python3Packages, 10 10 wrapGAppsHook3, 11 11 xdg-utils, 12 12 }: 13 13 14 - python311Packages.buildPythonApplication rec { 14 + python3Packages.buildPythonApplication rec { 15 15 pname = "gpodder"; 16 16 version = "3.11.4"; 17 17 format = "other"; ··· 35 35 intltool 36 36 wrapGAppsHook3 37 37 gobject-introspection 38 + python3Packages.distutils 38 39 ]; 39 40 40 41 buildInputs = [ ··· 42 43 adwaita-icon-theme 43 44 ]; 44 45 45 - nativeCheckInputs = with python311Packages; [ 46 + nativeCheckInputs = with python3Packages; [ 46 47 minimock 47 48 pytest 48 49 pytest-httpserver ··· 51 52 52 53 doCheck = true; 53 54 54 - propagatedBuildInputs = with python311Packages; [ 55 + propagatedBuildInputs = with python3Packages; [ 55 56 feedparser 56 57 dbus-python 57 58 mygpoclient
+3 -2
pkgs/by-name/py/py3c/package.nix
··· 2 2 lib, 3 3 stdenv, 4 4 fetchFromGitHub, 5 - python311, 5 + python3, 6 6 }: 7 7 8 8 stdenv.mkDerivation rec { ··· 30 30 doCheck = true; 31 31 32 32 nativeCheckInputs = [ 33 - python311 33 + python3 34 + python3.pkgs.distutils 34 35 ]; 35 36 36 37 checkTarget = "test-python";
+3 -3
pkgs/by-name/py/pysolfc/package.nix
··· 2 2 lib, 3 3 stdenv, 4 4 fetchzip, 5 - python311Packages, 5 + python3Packages, 6 6 desktop-file-utils, 7 7 freecell-solver, 8 8 black-hole-solver, ··· 10 10 gitUpdater, 11 11 }: 12 12 13 - python311Packages.buildPythonApplication rec { 13 + python3Packages.buildPythonApplication rec { 14 14 pname = "pysolfc"; 15 15 version = "3.2.0"; 16 16 ··· 51 51 ''; 52 52 }; 53 53 54 - propagatedBuildInputs = with python311Packages; [ 54 + propagatedBuildInputs = with python3Packages; [ 55 55 tkinter 56 56 six 57 57 random2
+5 -5
pkgs/by-name/re/renderdoc/package.nix
··· 13 13 nix-update-script, 14 14 pcre, 15 15 pkg-config, 16 - python311Packages, 16 + python3Packages, 17 17 qt5, 18 18 stdenv, 19 19 vulkan-loader, ··· 51 51 [ 52 52 libXdmcp 53 53 libpthreadstubs 54 - python311Packages.pyside2 55 - python311Packages.pyside2-tools 56 - python311Packages.shiboken2 54 + python3Packages.pyside2 55 + python3Packages.pyside2-tools 56 + python3Packages.shiboken2 57 57 qt5.qtbase 58 58 qt5.qtsvg 59 59 vulkan-loader ··· 71 71 makeWrapper 72 72 pcre 73 73 pkg-config 74 - python311Packages.python 74 + python3Packages.python 75 75 qt5.qtx11extras 76 76 qt5.wrapQtAppsHook 77 77 ];
+1 -4
pkgs/by-name/sm/smassh/package.nix
··· 2 2 lib, 3 3 fetchFromGitHub, 4 4 smassh, 5 - python311, 5 + python3, 6 6 testers, 7 7 }: 8 8 9 - let 10 - python3 = python311; 11 - in 12 9 python3.pkgs.buildPythonApplication rec { 13 10 pname = "smassh"; 14 11 version = "3.1.6";
+3 -4
pkgs/by-name/th/thelounge/package.nix
··· 6 6 nodejs, 7 7 yarn, 8 8 fixup-yarn-lock, 9 - python311, 9 + python3, 10 10 npmHooks, 11 11 cctools, 12 12 sqlite, ··· 39 39 hash = "sha256-csVrgsEy9HjSBXxtgNG0hcBrR9COlcadhMQrw6BWPc4="; 40 40 }; 41 41 42 - # Distutils was deprecated in 3.10, and removed in 3.12. This build needs it. An alternative could be adding 43 - # setuptools, but testing with that and 3.12 still fails. 44 42 nativeBuildInputs = [ 45 43 nodejs 46 44 yarn 47 45 fixup-yarn-lock 48 - python311 46 + python3 47 + python3.pkgs.distutils 49 48 npmHooks.npmInstallHook 50 49 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools ]; 51 50 buildInputs = [ sqlite ];
+4 -4
pkgs/by-name/to/toolong/package.nix
··· 1 1 { 2 2 lib, 3 - python311Packages, 3 + python3Packages, 4 4 fetchFromGitHub, 5 5 testers, 6 6 toolong, 7 7 }: 8 8 9 - python311Packages.buildPythonApplication { 9 + python3Packages.buildPythonApplication { 10 10 pname = "toolong"; 11 11 version = "1.4.0"; 12 12 pyproject = true; ··· 18 18 hash = "sha256-HrmU7HxWKYrbV25Y5CHLw7/7tX8Y5mTsTL1aXGGTSIo="; 19 19 }; 20 20 21 - build-system = [ python311Packages.poetry-core ]; 22 - dependencies = with python311Packages; [ 21 + build-system = [ python3Packages.poetry-core ]; 22 + dependencies = with python3Packages; [ 23 23 click 24 24 textual 25 25 typing-extensions
+4 -5
pkgs/by-name/vo/volk_2/package.nix
··· 3 3 lib, 4 4 fetchFromGitHub, 5 5 cmake, 6 - python311, 6 + python3, 7 7 enableModTool ? true, 8 8 removeReferencesTo, 9 9 fetchpatch, ··· 49 49 50 50 nativeBuildInputs = [ 51 51 cmake 52 - # This version of the project wasn't updated to use Python 3.12 which 53 - # doesn't include the deprecated distutils module. 54 - python311 55 - python311.pkgs.mako 52 + python3 53 + python3.pkgs.mako 54 + python3.pkgs.distutils 56 55 removeReferencesTo 57 56 ]; 58 57
+4 -8
pkgs/top-level/all-packages.nix
··· 2249 2249 stdenv = gcc14Stdenv; 2250 2250 }; 2251 2251 2252 - hyprshade = python311Packages.callPackage ../applications/window-managers/hyprwm/hyprshade { }; 2252 + hyprshade = python3Packages.callPackage ../applications/window-managers/hyprwm/hyprshade { }; 2253 2253 2254 2254 hyprlandPlugins = recurseIntoAttrs ( 2255 2255 callPackage ../applications/window-managers/hyprwm/hyprland-plugins { } ··· 12617 12617 } 12618 12618 ); 12619 12619 12620 - manuskript = libsForQt5.callPackage ../applications/editors/manuskript { 12621 - python3Packages = python311Packages; 12622 - }; 12620 + manuskript = libsForQt5.callPackage ../applications/editors/manuskript { }; 12623 12621 12624 12622 minari = python3Packages.toPythonApplication python3Packages.minari; 12625 12623 ··· 15262 15260 15263 15261 steam-run-free = steam-fhsenv-without-steam.run; 15264 15262 15265 - steamback = python311.pkgs.callPackage ../tools/games/steamback { }; 15263 + steamback = python3.pkgs.callPackage ../tools/games/steamback { }; 15266 15264 15267 15265 protontricks = python3Packages.callPackage ../tools/package-management/protontricks { 15268 15266 steam-run = steam-run-free; ··· 15542 15540 15543 15541 deepdiff = with python3Packages; toPythonApplication deepdiff; 15544 15542 15545 - deepsecrets = callPackage ../tools/security/deepsecrets { 15546 - python3 = python311; 15547 - }; 15543 + deepsecrets = callPackage ../tools/security/deepsecrets { }; 15548 15544 15549 15545 deep-translator = with python3Packages; toPythonApplication deep-translator; 15550 15546