git.iko.soy/typeable/nixpkgs
on master help sign in
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.

commita4df6db57dd68f7d5dad5dd56aadae57327048d2 authormilahu <milahu@gmail.com> dateSun 3 Oct 2021, 00:37 (5 years ago) parentae79161
3 files changed+54−10
pkgs/tools/text/rpl/default.nix+26−7 pkgs/tools/text/rpl/remove-argparse-manpage.diff+27 pkgs/top-level/all-packages.nix+1−3
pkgs/tools/text/rpl/default.nix+26−7
@@ -1,22 +1,41 @@
1−{ lib, fetchFromGitHub, pythonPackages }:
1+{ lib, fetchFromGitHub, python3Packages }:
22
3−pythonPackages.buildPythonApplication rec {
3+let
4+ rev = "4467bd46a7a798f738247a7f090c1505176bd597";
5+ sha256 = "0yf3pc3fws4nnh4nd8d3jpglmsyi69d17qqgpcnkpqca5l4cd25w";
6+in
7+
8+python3Packages.buildPythonApplication rec {
49 pname = "rpl";
5− version = "1.5.7";
10+ version = "1.10";
611
712 # Tests not included in pip package.
813 doCheck = false;
914
15+
1016 src = fetchFromGitHub {
11− owner = "kcoyner";
17+ owner = "rrthomas";
1218 repo = "rpl";
13− rev = "v${version}";
14− sha256 = "1xhpgcmq91ivy9ijfyz5ilg51m7fz8ar2077r7gq246j8gbf8ggr";
19+ inherit rev sha256;
1520 };
1621
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+
1736 meta = with lib; {
1837 description = "Replace strings in files";
19− homepage = "https://github.com/kcoyner/rpl";
38+ homepage = "https://github.com/rrthomas/rpl";
2039 license = licenses.gpl2;
2140 maintainers = with maintainers; [ teto ];
2241 };
pkgs/tools/text/rpl/remove-argparse-manpage.diffnew file+27
@@ -0,0 +1,27 @@
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+ )
pkgs/top-level/all-packages.nix+1−3
@@ -32109,9 +32109,7 @@ with pkgs;
3210932109 inherit glib gtk3 gobject-introspection wrapGAppsHook;
3211032110 };
3211132111
32112− rpl = callPackage ../tools/text/rpl {
32113− pythonPackages = python3Packages;
32114− };
32112+ rpl = callPackage ../tools/text/rpl { };
3211532113
3211632114 ricty = callPackage ../data/fonts/ricty { };
3211732115