From 6ac5588872e2d6b9312877df49446d6d77a5485a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Nov 2024 23:34:47 +0100
Subject: [PATCH 1/2] python312Packages.pyinstaller: reformat

---
 .../python-modules/pyinstaller/default.nix    | 39 +++++++++++--------
 1 file changed, 22 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/python-modules/pyinstaller/default.nix b/pkgs/development/python-modules/pyinstaller/default.nix
index 943a48d843a0..36ce797b959f 100644
--- a/pkgs/development/python-modules/pyinstaller/default.nix
+++ b/pkgs/development/python-modules/pyinstaller/default.nix
@@ -1,19 +1,19 @@
 {
-  lib
-, buildPythonPackage
-, fetchPypi
-, setuptools
-, zlib
-, altgraph
-, packaging
-, pyinstaller-hooks-contrib
-, testers
-, pyinstaller
-, glibc
-, binutils
-, macholib
-, installShellFiles
-, stdenv
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  setuptools,
+  zlib,
+  altgraph,
+  packaging,
+  pyinstaller-hooks-contrib,
+  testers,
+  pyinstaller,
+  glibc,
+  binutils,
+  macholib,
+  installShellFiles,
+  stdenv,
 }:
 
 buildPythonPackage rec {
@@ -26,7 +26,6 @@ buildPythonPackage rec {
     hash = "sha256-FDhA+AVv97kQv48W9s2SzBCmwmgLt20KJdVY1UPSEnA=";
   };
 
-
   build-system = [ setuptools ];
 
   nativeBuildInputs = [ installShellFiles ];
@@ -41,7 +40,13 @@ buildPythonPackage rec {
   ];
 
   makeWrapperArgs = lib.optionals stdenv.hostPlatform.isLinux [
-    "--prefix" "PATH" ":"  (lib.makeBinPath [ glibc binutils ])
+    "--prefix"
+    "PATH"
+    ":"
+    (lib.makeBinPath [
+      glibc
+      binutils
+    ])
   ];
 
   postInstall = ''

From 16aaf3b433f4b0ada61cb667507f94be171e7719 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Nov 2024 23:41:54 +0100
Subject: [PATCH 2/2] python312Packages.pyinstaller: 6.10.0 -> 6.11.0

https://pyinstaller.org/en/v6.11.0/CHANGES.html
---
 .../python-modules/pyinstaller/default.nix    | 29 ++++++++++---------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/python-modules/pyinstaller/default.nix b/pkgs/development/python-modules/pyinstaller/default.nix
index 36ce797b959f..b76b5bc2440a 100644
--- a/pkgs/development/python-modules/pyinstaller/default.nix
+++ b/pkgs/development/python-modules/pyinstaller/default.nix
@@ -1,35 +1,40 @@
 {
   lib,
+  stdenv,
   buildPythonPackage,
   fetchPypi,
+
+  # build-system
   setuptools,
+
+  # native dependencies
   zlib,
+
+  # dependencies
   altgraph,
+  macholib,
   packaging,
   pyinstaller-hooks-contrib,
-  testers,
-  pyinstaller,
-  glibc,
+
+  # tests
   binutils,
-  macholib,
-  installShellFiles,
-  stdenv,
+  glibc,
+  pyinstaller,
+  testers,
 }:
 
 buildPythonPackage rec {
   pname = "pyinstaller";
-  version = "6.10.0";
+  version = "6.11.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-FDhA+AVv97kQv48W9s2SzBCmwmgLt20KJdVY1UPSEnA=";
+    hash = "sha256-y01DOj2zDZ0Xz18s97tN+Ap4jUk8HWfdgi3FeR2YZK8=";
   };
 
   build-system = [ setuptools ];
 
-  nativeBuildInputs = [ installShellFiles ];
-
   buildInputs = [ zlib.dev ];
 
   dependencies = [
@@ -49,10 +54,6 @@ buildPythonPackage rec {
     ])
   ];
 
-  postInstall = ''
-    installManPage doc/pyinstaller.1 doc/pyi-makespec.1
-  '';
-
   pythonImportsCheck = [ "PyInstaller" ];
 
   passthru.tests.version = testers.testVersion {