From 7139b502d10f1f378360e46d77abf31b4010f1ab Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Fri, 30 May 2025 01:08:20 +0200
Subject: [PATCH 01/16] freecad: unpin python311

---
 pkgs/by-name/fr/freecad/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/fr/freecad/package.nix b/pkgs/by-name/fr/freecad/package.nix
index 844285ba5bbc..42227a525e01 100644
--- a/pkgs/by-name/fr/freecad/package.nix
+++ b/pkgs/by-name/fr/freecad/package.nix
@@ -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

From d9360309637b550e9d264982348a4b3c0cf948f5 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Fri, 30 May 2025 01:08:21 +0200
Subject: [PATCH 02/16] frescobaldi: unpin python311

---
 pkgs/by-name/fr/frescobaldi/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/fr/frescobaldi/package.nix b/pkgs/by-name/fr/frescobaldi/package.nix
index d9a63a5fe2fc..3de32e28a752 100644
--- a/pkgs/by-name/fr/frescobaldi/package.nix
+++ b/pkgs/by-name/fr/frescobaldi/package.nix
@@ -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 = ''

From b6dd19a100b1f8989f160a9365980e32bfbf8ac0 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Fri, 30 May 2025 01:08:21 +0200
Subject: [PATCH 03/16] gpodder: unpin python311

---
 pkgs/by-name/gp/gpodder/package.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/gp/gpodder/package.nix b/pkgs/by-name/gp/gpodder/package.nix
index 738983a6322f..d1a3649e4981 100644
--- a/pkgs/by-name/gp/gpodder/package.nix
+++ b/pkgs/by-name/gp/gpodder/package.nix
@@ -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

From bec1f651b9374f55366c79d48d5736ba0033d35b Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Fri, 30 May 2025 01:08:21 +0200
Subject: [PATCH 04/16] pysolfc: unpin python311

---
 pkgs/by-name/py/pysolfc/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/py/pysolfc/package.nix b/pkgs/by-name/py/pysolfc/package.nix
index 1c8d0b852663..6ba799867a66 100644
--- a/pkgs/by-name/py/pysolfc/package.nix
+++ b/pkgs/by-name/py/pysolfc/package.nix
@@ -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

From 6fb8189cbc1264ef629cc606519afb33da84b490 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Fri, 30 May 2025 01:08:22 +0200
Subject: [PATCH 05/16] renderdoc: unpin python311

---
 pkgs/by-name/re/renderdoc/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/re/renderdoc/package.nix b/pkgs/by-name/re/renderdoc/package.nix
index dba59f5d201a..2755dc5a94ac 100644
--- a/pkgs/by-name/re/renderdoc/package.nix
+++ b/pkgs/by-name/re/renderdoc/package.nix
@@ -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
   ];

From 26576db882c4fd5c5558744a8ec7617018aeea5e Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Fri, 30 May 2025 01:08:22 +0200
Subject: [PATCH 06/16] toolong: unpin python311

---
 pkgs/by-name/to/toolong/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/to/toolong/package.nix b/pkgs/by-name/to/toolong/package.nix
index 43001174c7e8..43124204e9bf 100644
--- a/pkgs/by-name/to/toolong/package.nix
+++ b/pkgs/by-name/to/toolong/package.nix
@@ -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

From 94ea5940baeb3818b132d1dd920d4e91d68fd9c9 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Fri, 30 May 2025 01:31:05 +0200
Subject: [PATCH 07/16] dooit-extras: unpin python311

---
 pkgs/by-name/do/dooit-extras/package.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/by-name/do/dooit-extras/package.nix b/pkgs/by-name/do/dooit-extras/package.nix
index ec68b74ba121..2d84146d45a6 100644
--- a/pkgs/by-name/do/dooit-extras/package.nix
+++ b/pkgs/by-name/do/dooit-extras/package.nix
@@ -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.0";

From b191a71325d0073fd27e0e5562956a5c3c311ecb Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Fri, 30 May 2025 01:31:05 +0200
Subject: [PATCH 08/16] dooit: unpin python311

---
 pkgs/by-name/do/dooit/package.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/by-name/do/dooit/package.nix b/pkgs/by-name/do/dooit/package.nix
index 0b8925b6bd16..8efebc048196 100644
--- a/pkgs/by-name/do/dooit/package.nix
+++ b/pkgs/by-name/do/dooit/package.nix
@@ -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";

From ac08339ad2c68f27824e26f632af779c4e491b68 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Fri, 30 May 2025 01:31:05 +0200
Subject: [PATCH 09/16] py3c: unpin python311

---
 pkgs/by-name/py/py3c/package.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/py/py3c/package.nix b/pkgs/by-name/py/py3c/package.nix
index 8f42639a737c..7ddef7728128 100644
--- a/pkgs/by-name/py/py3c/package.nix
+++ b/pkgs/by-name/py/py3c/package.nix
@@ -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";

From 167c2e876af02219ab31ab441a7b1bfa6b50843b Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Fri, 30 May 2025 01:31:06 +0200
Subject: [PATCH 10/16] smassh: unpin python311

---
 pkgs/by-name/sm/smassh/package.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/by-name/sm/smassh/package.nix b/pkgs/by-name/sm/smassh/package.nix
index 89b42204c16f..4d2c1cecaa95 100644
--- a/pkgs/by-name/sm/smassh/package.nix
+++ b/pkgs/by-name/sm/smassh/package.nix
@@ -2,13 +2,10 @@
   lib,
   fetchFromGitHub,
   smassh,
-  python311,
+  python3,
   testers,
 }:
 
-let
-  python3 = python311;
-in
 python3.pkgs.buildPythonApplication rec {
   pname = "smassh";
   version = "3.1.6";

From 57bb5467500f96fb16fb1e3af3624d6e34480cd8 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Fri, 30 May 2025 01:31:06 +0200
Subject: [PATCH 11/16] thelounge: unpin python311

---
 pkgs/by-name/th/thelounge/package.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/th/thelounge/package.nix b/pkgs/by-name/th/thelounge/package.nix
index 2c0114da11c1..3e54f1d3c27e 100644
--- a/pkgs/by-name/th/thelounge/package.nix
+++ b/pkgs/by-name/th/thelounge/package.nix
@@ -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 ];

From 5a1f82be1bdccac0dc109170f541a281a5160612 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Fri, 30 May 2025 01:31:06 +0200
Subject: [PATCH 12/16] volk_2: unpin python311

---
 pkgs/by-name/vo/volk_2/package.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/vo/volk_2/package.nix b/pkgs/by-name/vo/volk_2/package.nix
index 57b849fcc28b..fa32bf920a60 100644
--- a/pkgs/by-name/vo/volk_2/package.nix
+++ b/pkgs/by-name/vo/volk_2/package.nix
@@ -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
   ];
 

From a84750bbb49e675b1b49278f49c95e66b6c2fd3f Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Fri, 30 May 2025 01:50:00 +0200
Subject: [PATCH 13/16] hyprshade: unpin python311

---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 68f275e9a295..6293d5512544 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2253,7 +2253,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 { }

From 3f133a589107302b0ac7798a5e2cecb519b05b53 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Fri, 30 May 2025 02:06:22 +0200
Subject: [PATCH 14/16] manuskript: unping python311

---
 pkgs/top-level/all-packages.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6293d5512544..c4a71c73c7ef 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12645,9 +12645,7 @@ with pkgs;
     }
   );
 
-  manuskript = libsForQt5.callPackage ../applications/editors/manuskript {
-    python3Packages = python311Packages;
-  };
+  manuskript = libsForQt5.callPackage ../applications/editors/manuskript { };
 
   minari = python3Packages.toPythonApplication python3Packages.minari;
 

From 75c00536edca19b51190fe18279660b4c5ec7bfa Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Fri, 30 May 2025 02:06:36 +0200
Subject: [PATCH 15/16] steamback: unpin python311

---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c4a71c73c7ef..0c76cd2d1985 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15297,7 +15297,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;

From 2a2b9ed586a74bf5aedb763dc721b2716ce3a006 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Fri, 30 May 2025 02:06:50 +0200
Subject: [PATCH 16/16] deepsecrets: unpin python311

---
 pkgs/top-level/all-packages.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0c76cd2d1985..c99127205a82 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15577,9 +15577,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;