pyrox.dev
Merge pull request #196122 from zendo/update-retext
+31
-9
pkgs/applications/editors/retext/default.nix
+31
-9
pkgs/applications/editors/retext/default.nix
···
1
{ lib
2
, python3
3
, fetchFromGitHub
4
, wrapQtAppsHook
5
, buildEnv
6
, aspellDicts
7
# Use `lib.collect lib.isDerivation aspellDicts;` to make all dictionaries
···
11
12
python3.pkgs.buildPythonApplication rec {
13
pname = "retext";
14
-
version = "7.2.3";
15
format = "setuptools";
16
17
src = fetchFromGitHub {
18
owner = "retext-project";
19
-
repo = "retext";
20
rev = version;
21
-
hash = "sha256-EwaJFODnkZGbqVw1oQrTrx2ME4vRttVW4CMPkWvMtHA=";
22
};
23
24
nativeBuildInputs = [
25
wrapQtAppsHook
26
];
27
28
propagatedBuildInputs = with python3.pkgs; [
···
32
markups
33
pyenchant
34
pygments
35
-
pyqt5
36
];
37
38
-
postPatch = ''
39
-
# Remove wheel check
40
-
sed -i -e '31,36d' setup.py
41
'';
42
43
postInstall = ''
44
makeWrapperArgs+=("''${qtWrapperArgs[@]}")
···
49
}}"
50
)
51
52
substituteInPlace $out/share/applications/me.mitya57.ReText.desktop \
53
--replace "Exec=ReText-${version}.data/scripts/retext %F" "Exec=$out/bin/retext %F" \
54
-
--replace "Icon=ReText-${version}.data/data/share/retext/icons/retext.svg" "Icon=$out/share/retext/icons/retext.svg"
55
'';
56
57
doCheck = false;
···
63
meta = with lib; {
64
description = "Editor for Markdown and reStructuredText";
65
homepage = "https://github.com/retext-project/retext/";
66
-
license = licenses.gpl2Plus;
67
maintainers = with maintainers; [ klntsky ];
68
platforms = platforms.unix;
69
};
···
1
{ lib
2
, python3
3
+
, fetchzip
4
, fetchFromGitHub
5
, wrapQtAppsHook
6
+
, qtbase
7
+
, qttools
8
+
, qtsvg
9
, buildEnv
10
, aspellDicts
11
# Use `lib.collect lib.isDerivation aspellDicts;` to make all dictionaries
···
15
16
python3.pkgs.buildPythonApplication rec {
17
pname = "retext";
18
+
version = "8.0.0";
19
format = "setuptools";
20
21
src = fetchFromGitHub {
22
owner = "retext-project";
23
+
repo = pname;
24
rev = version;
25
+
hash = "sha256-22yqNwIehgTfeElqhN5Jzye7LbcAiseTeoMgenpmsL0=";
26
+
};
27
+
28
+
toolbarIcons = fetchzip {
29
+
url = "https://github.com/retext-project/retext/archive/icons.zip";
30
+
hash = "sha256-LQtSFCGWcKvXis9pFDmPqAMd1m6QieHQiz2yykeTdnI=";
31
};
32
33
nativeBuildInputs = [
34
wrapQtAppsHook
35
+
qttools.dev
36
+
];
37
+
38
+
buildInputs = [
39
+
qtbase
40
+
qtsvg
41
];
42
43
propagatedBuildInputs = with python3.pkgs; [
···
47
markups
48
pyenchant
49
pygments
50
+
pyqt6
51
+
pyqt6-webengine
52
];
53
54
+
patches = [ ./remove-wheel-check.patch ];
55
+
56
+
preConfigure = ''
57
+
lrelease ReText/locale/*.ts
58
'';
59
+
60
+
# prevent double wrapping
61
+
dontWrapQtApps = true;
62
63
postInstall = ''
64
makeWrapperArgs+=("''${qtWrapperArgs[@]}")
···
69
}}"
70
)
71
72
+
cp ${toolbarIcons}/* $out/${python3.pkgs.python.sitePackages}/ReText/icons
73
+
74
substituteInPlace $out/share/applications/me.mitya57.ReText.desktop \
75
--replace "Exec=ReText-${version}.data/scripts/retext %F" "Exec=$out/bin/retext %F" \
76
+
--replace "Icon=ReText/icons/retext.svg" "Icon=retext"
77
'';
78
79
doCheck = false;
···
85
meta = with lib; {
86
description = "Editor for Markdown and reStructuredText";
87
homepage = "https://github.com/retext-project/retext/";
88
+
license = licenses.gpl3Plus;
89
maintainers = with maintainers; [ klntsky ];
90
platforms = platforms.unix;
91
};
+28
pkgs/applications/editors/retext/remove-wheel-check.patch
+28
pkgs/applications/editors/retext/remove-wheel-check.patch
···
···
1
+
From f07d08d3056c46f62674f65eabae0efa2b65d681 Mon Sep 17 00:00:00 2001
2
+
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
3
+
Date: Sat, 15 Oct 2022 16:53:27 +0200
4
+
Subject: [PATCH] disable wheel check
5
+
MIME-Version: 1.0
6
+
Content-Type: text/plain; charset=UTF-8
7
+
Content-Transfer-Encoding: 8bit
8
+
9
+
Signed-off-by: Jörg Thalheim <joerg@thalheim.io>
10
+
---
11
+
setup.py | 2 +-
12
+
1 file changed, 1 insertion(+), 1 deletion(-)
13
+
14
+
diff --git a/setup.py b/setup.py
15
+
index a9cae37..e0e1e5b 100755
16
+
--- a/setup.py
17
+
+++ b/setup.py
18
+
@@ -101,7 +101,7 @@ def run(self):
19
+
20
+
desktop_file_path = join(self.install_data, 'share', 'applications',
21
+
'me.mitya57.ReText.desktop')
22
+
- if self.root and self.root.endswith('/wheel'):
23
+
+ if False and self.root and self.root.endswith('/wheel'):
24
+
# Desktop files don't allow relative paths, and we don't know the
25
+
# absolute path when building a wheel.
26
+
log.info('removing the .desktop file from the wheel')
27
+
--
28
+
2.37.3
+1
-1
pkgs/top-level/all-packages.nix
+1
-1
pkgs/top-level/all-packages.nix