From c26ba30c69d2f9dfe415576d78b5c3e99c4a6ed5 Mon Sep 17 00:00:00 2001 From: strawbee Date: Mon, 22 Jul 2024 10:10:35 -0700 Subject: [PATCH 1/3] maintainers: add strawbee --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 490cd20e6d16..3bdd1f06086b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -19471,6 +19471,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"; From 4ac9e605fa712087ff1975c110379e7ff8b0c9eb Mon Sep 17 00:00:00 2001 From: strawbee Date: Sun, 21 Jul 2024 22:29:39 -0700 Subject: [PATCH 2/3] manuskript: override python version --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a5a285502f32..c7b1adcb5f82 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30891,7 +30891,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 { From 9859c235846a8dec293df62b805f7bbb0cfdbf87 Mon Sep 17 00:00:00 2001 From: strawbee Date: Mon, 22 Jul 2024 10:11:54 -0700 Subject: [PATCH 3/3] manuskript: add strawbee as maintainer --- .../editors/manuskript/default.nix | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/editors/manuskript/default.nix b/pkgs/applications/editors/manuskript/default.nix index f598c686998d..8fa589c13b5d 100644 --- a/pkgs/applications/editors/manuskript/default.nix +++ b/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"; };