Skip to content

Commit 1fd7cd8

Browse files
authored
Merge pull request #329075 from StillToad/manuskript-fix
manuskript: fix broken Python dependencies, add me as maintainer
2 parents 681e984 + 9859c23 commit 1fd7cd8

File tree

3 files changed

+21
-13
lines changed

3 files changed

+21
-13
lines changed

maintainers/maintainer-list.nix

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19484,6 +19484,12 @@
1948419484
githubId = 48666;
1948519485
name = "Matthew \"strager\" Glazar";
1948619486
};
19487+
strawbee = {
19488+
email = "[email protected]";
19489+
github = "StillToad";
19490+
githubId = 57422776;
19491+
name = "strawbee";
19492+
};
1948719493
strikerlulu = {
1948819494
email = "[email protected]";
1948919495
github = "strikerlulu";

pkgs/applications/editors/manuskript/default.nix

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ python3Packages.buildPythonApplication rec {
2424
patchPhase = ''
2525
substituteInPlace manuskript/ui/welcome.py \
2626
--replace sample-projects $out/share/${pname}/sample-projects
27-
'';
27+
'';
2828

2929
buildPhase = "";
3030

@@ -44,19 +44,19 @@ python3Packages.buildPythonApplication rec {
4444
description = "Open-source tool for writers";
4545
homepage = "https://www.theologeek.ch/manuskript";
4646
longDescription = ''
47-
Manuskript is a tool for those writer who like to organize and
48-
plan everything before writing. The snowflake method can help you
49-
grow your idea into a book, by leading you step by step and asking
50-
you questions to go deeper. While writing, keep track of notes
51-
about every characters, plot, event, place in your story.
52-
53-
Develop complex characters and keep track of all useful infos.
54-
Create intricate plots, linked to your characters, and use them to
55-
outline your story. Organize your ideas about the world your
56-
characters live in.
47+
Manuskript is a tool for those writer who like to organize and
48+
plan everything before writing. The snowflake method can help you
49+
grow your idea into a book, by leading you step by step and asking
50+
you questions to go deeper. While writing, keep track of notes
51+
about every characters, plot, event, place in your story.
52+
53+
Develop complex characters and keep track of all useful infos.
54+
Create intricate plots, linked to your characters, and use them to
55+
outline your story. Organize your ideas about the world your
56+
characters live in.
5757
'';
5858
license = lib.licenses.gpl3;
59-
maintainers = [ ];
59+
maintainers = with lib.maintainers; [ strawbee ];
6060
platforms = lib.platforms.unix;
6161
mainProgram = "manuskript";
6262
};

pkgs/top-level/all-packages.nix

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30889,7 +30889,9 @@ with pkgs;
3088930889
}
3089030890
);
3089130891

30892-
manuskript = libsForQt5.callPackage ../applications/editors/manuskript { };
30892+
manuskript = libsForQt5.callPackage ../applications/editors/manuskript {
30893+
python3Packages = python311Packages;
30894+
};
3089330895

3089430896
metacubexd = callPackage ../by-name/me/metacubexd/package.nix {
3089530897
pnpm = callPackage ../development/tools/pnpm/generic.nix {

0 commit comments

Comments
 (0)