Merge pull request #329075 from StillToad/manuskript-fix

manuskript: fix broken Python dependencies, add me as maintainer

maintainers/maintainer-list.nix

@@ -19484,6 +19484,12 @@
     githubId = 48666;
     name = "Matthew \"strager\" Glazar";
   };
+  strawbee = {
+    email = "henigingames@gmail.com";
+    github = "StillToad";
+    githubId = 57422776;
+    name = "strawbee";
+  };
   strikerlulu = {
     email = "strikerlulu7@gmail.com";
     github = "strikerlulu";

pkgs/applications/editors/manuskript/default.nix

@@ -24,7 +24,7 @@ python3Packages.buildPythonApplication rec {
   patchPhase = ''
     substituteInPlace manuskript/ui/welcome.py \
       --replace sample-projects $out/share/${pname}/sample-projects
-   '';
+  '';
 
   buildPhase = "";
 
@@ -44,19 +44,19 @@ python3Packages.buildPythonApplication rec {
     description = "Open-source tool for writers";
     homepage = "https://www.theologeek.ch/manuskript";
     longDescription = ''
-    Manuskript is a tool for those writer who like to organize and
-    plan everything before writing.  The snowflake method can help you
-    grow your idea into a book, by leading you step by step and asking
-    you questions to go deeper. While writing, keep track of notes
-    about every characters, plot, event, place in your story.
+      Manuskript is a tool for those writer who like to organize and
+      plan everything before writing.  The snowflake method can help you
+      grow your idea into a book, by leading you step by step and asking
+      you questions to go deeper. While writing, keep track of notes
+      about every characters, plot, event, place in your story.
 
-    Develop complex characters and keep track of all useful infos.
-    Create intricate plots, linked to your characters, and use them to
-    outline your story. Organize your ideas about the world your
-    characters live in.
+      Develop complex characters and keep track of all useful infos.
+      Create intricate plots, linked to your characters, and use them to
+      outline your story. Organize your ideas about the world your
+      characters live in.
     '';
     license = lib.licenses.gpl3;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ strawbee ];
     platforms = lib.platforms.unix;
     mainProgram = "manuskript";
   };

pkgs/top-level/all-packages.nix

@@ -30889,7 +30889,9 @@ with pkgs;
     }
   );
 
-  manuskript = libsForQt5.callPackage ../applications/editors/manuskript { };
+  manuskript = libsForQt5.callPackage ../applications/editors/manuskript {
+    python3Packages = python311Packages;
+  };
 
   metacubexd = callPackage ../by-name/me/metacubexd/package.nix {
     pnpm = callPackage ../development/tools/pnpm/generic.nix {