pyrox.dev / nixpkgs
lol
fork atom

retext: 7.2.3 -> 8.0.0

zendo 1e8a85f1 7a94322e

+60 -10
unified split
+31 -9
pkgs/applications/editors/retext/default.nix
··· 1 1 { lib 2 2 , python3 3 + , fetchzip 3 4 , fetchFromGitHub 4 5 , wrapQtAppsHook 6 + , qtbase 7 + , qttools 8 + , qtsvg 5 9 , buildEnv 6 10 , aspellDicts 7 11 # Use `lib.collect lib.isDerivation aspellDicts;` to make all dictionaries ··· 11 15 12 16 python3.pkgs.buildPythonApplication rec { 13 17 pname = "retext"; 14 - version = "7.2.3"; 18 + version = "8.0.0"; 15 19 format = "setuptools"; 16 20 17 21 src = fetchFromGitHub { 18 22 owner = "retext-project"; 19 - repo = "retext"; 23 + repo = pname; 20 24 rev = version; 21 - hash = "sha256-EwaJFODnkZGbqVw1oQrTrx2ME4vRttVW4CMPkWvMtHA="; 25 + hash = "sha256-22yqNwIehgTfeElqhN5Jzye7LbcAiseTeoMgenpmsL0="; 26 + }; 27 + 28 + toolbarIcons = fetchzip { 29 + url = "https://github.com/retext-project/retext/archive/icons.zip"; 30 + hash = "sha256-LQtSFCGWcKvXis9pFDmPqAMd1m6QieHQiz2yykeTdnI="; 22 31 }; 23 32 24 33 nativeBuildInputs = [ 25 34 wrapQtAppsHook 35 + qttools.dev 36 + ]; 37 + 38 + buildInputs = [ 39 + qtbase 40 + qtsvg 26 41 ]; 27 42 28 43 propagatedBuildInputs = with python3.pkgs; [ ··· 32 47 markups 33 48 pyenchant 34 49 pygments 35 - pyqt5 50 + pyqt6 51 + pyqt6-webengine 36 52 ]; 37 53 38 - postPatch = '' 39 - # Remove wheel check 40 - sed -i -e '31,36d' setup.py 54 + patches = [ ./remove-wheel-check.patch ]; 55 + 56 + preConfigure = '' 57 + lrelease ReText/locale/*.ts 41 58 ''; 59 + 60 + # prevent double wrapping 61 + dontWrapQtApps = true; 42 62 43 63 postInstall = '' 44 64 makeWrapperArgs+=("''${qtWrapperArgs[@]}") ··· 49 69 }}" 50 70 ) 51 71 72 + cp ${toolbarIcons}/* $out/${python3.pkgs.python.sitePackages}/ReText/icons 73 + 52 74 substituteInPlace $out/share/applications/me.mitya57.ReText.desktop \ 53 75 --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" 76 + --replace "Icon=ReText/icons/retext.svg" "Icon=retext" 55 77 ''; 56 78 57 79 doCheck = false; ··· 63 85 meta = with lib; { 64 86 description = "Editor for Markdown and reStructuredText"; 65 87 homepage = "https://github.com/retext-project/retext/"; 66 - license = licenses.gpl2Plus; 88 + license = licenses.gpl3Plus; 67 89 maintainers = with maintainers; [ klntsky ]; 68 90 platforms = platforms.unix; 69 91 };
+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
··· 10701 10701 10702 10702 reredirect = callPackage ../tools/misc/reredirect { }; 10703 10703 10704 - retext = libsForQt5.callPackage ../applications/editors/retext { }; 10704 + retext = qt6Packages.callPackage ../applications/editors/retext { }; 10705 10705 10706 10706 inherit (callPackage ../tools/security/rekor { }) 10707 10707 rekor-cli