rpl: update to 4467bd4 (#140161)

* rpl: update to 1.10
Changes upstream as discussed in https://github.com/kcoyner/rpl/issues/7
- manpage missing because of a missing python package.

authored by milahu and committed by GitHub a4df6db5 ae791610

+54 -10
+26 -7
pkgs/tools/text/rpl/default.nix
··· 1 - { lib, fetchFromGitHub, pythonPackages }: 1 + { lib, fetchFromGitHub, python3Packages }: 2 + 3 + let 4 + rev = "4467bd46a7a798f738247a7f090c1505176bd597"; 5 + sha256 = "0yf3pc3fws4nnh4nd8d3jpglmsyi69d17qqgpcnkpqca5l4cd25w"; 6 + in 2 7 3 - pythonPackages.buildPythonApplication rec { 8 + python3Packages.buildPythonApplication rec { 4 9 pname = "rpl"; 5 - version = "1.5.7"; 10 + version = "1.10"; 6 11 7 12 # Tests not included in pip package. 8 13 doCheck = false; 9 14 15 + 10 16 src = fetchFromGitHub { 11 - owner = "kcoyner"; 17 + owner = "rrthomas"; 12 18 repo = "rpl"; 13 - rev = "v${version}"; 14 - sha256 = "1xhpgcmq91ivy9ijfyz5ilg51m7fz8ar2077r7gq246j8gbf8ggr"; 19 + inherit rev sha256; 15 20 }; 16 21 22 + patches = [ 23 + ./remove-argparse-manpage.diff # quickfix for ImportError: No module named build_manpages.build_manpages 24 + ]; 25 + 26 + buildInputs = [ 27 + #python3Packages.argparse-manpage # TODO 28 + python3Packages.chardet 29 + ]; 30 + 31 + installPhase = '' 32 + mkdir -p $out/bin 33 + mv rpl $out/bin 34 + ''; 35 + 17 36 meta = with lib; { 18 37 description = "Replace strings in files"; 19 - homepage = "https://github.com/kcoyner/rpl"; 38 + homepage = "https://github.com/rrthomas/rpl"; 20 39 license = licenses.gpl2; 21 40 maintainers = with maintainers; [ teto ]; 22 41 };
+27
pkgs/tools/text/rpl/remove-argparse-manpage.diff
··· 1 + diff --git a/setup.cfg b/setup.cfg 2 + index 12e9198..38e5376 100644 3 + --- a/setup.cfg 4 + +++ b/setup.cfg 5 + @@ -15,7 +15,6 @@ classifiers = 6 + [options] 7 + scripts = rpl 8 + python_requires = >=3 9 + -setup_requires = argparse-manpage 10 + install_requires = chardet 11 + 12 + [options.extras_require] 13 + diff --git a/setup.py b/setup.py 14 + index 96cade6..879fc44 100644 15 + --- a/setup.py 16 + +++ b/setup.py 17 + @@ -1,9 +1,8 @@ 18 + -from build_manpages.build_manpages import get_install_cmd 19 + from setuptools import setup 20 + from setuptools.command.install import install 21 + 22 + setup( 23 + cmdclass={ 24 + - 'install': get_install_cmd(install), 25 + + 'install': install, 26 + } 27 + )
+1 -3
pkgs/top-level/all-packages.nix
··· 32109 32109 inherit glib gtk3 gobject-introspection wrapGAppsHook; 32110 32110 }; 32111 32111 32112 - rpl = callPackage ../tools/text/rpl { 32113 - pythonPackages = python3Packages; 32114 - }; 32112 + rpl = callPackage ../tools/text/rpl { }; 32115 32113 32116 32114 ricty = callPackage ../data/fonts/ricty { }; 32117 32115