git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #51229 from marsam/feature/fedpkg-cleanup

fedpkg: remove unneeded patch

commit572b514582f9f034d21f456c2ddc695173ffe8ec authorworldofpeace <worldofpeace@users.noreply.github.com> dateTue 4 Dec 2018, 21:15 (8 years ago) parent3aa90912256273
6 files changed+53−42
pkgs/development/python-modules/fedpkg-buildfix.diff−14 pkgs/development/python-modules/fedpkg/default.nix−26 pkgs/development/tools/fedpkg/default.nix+35 pkgs/development/tools/fedpkg/fix-paths.patch+16 pkgs/top-level/all-packages.nix+2 pkgs/top-level/python-packages.nix−2
pkgs/development/python-modules/fedpkg-buildfix.diffdeleted−14
@@ -1,14 +0,0 @@
1−--- a/setup.py 2014-02-04 16:12:37.021993713 +0100
2−+++ b/setup.py 2014-02-04 16:11:42.653995607 +0100
3−@@ -13,8 +13,8 @@
4− package_dir = {'': 'src'},
5− packages = ['fedpkg'],
6− scripts = ['src/bin/fedpkg'],
7−- data_files = [('/etc/bash_completion.d', ['src/fedpkg.bash']),
8−- ('/etc/rpkg', ['src/fedpkg.conf']),
9−- ('/usr/libexec/', ['src/fedpkg-fixbranches.py']),
10−+ data_files = [('etc/bash_completion.d', ['src/fedpkg.bash']),
11−+ ('etc/rpkg', ['src/fedpkg.conf']),
12−+ ('libexec/', ['src/fedpkg-fixbranches.py']),
13− ]
14− )
pkgs/development/python-modules/fedpkg/default.nixdeleted−26
@@ -1,26 +0,0 @@
1−{ stdenv, buildPythonPackage, isPy3k, fetchurl, rpkg, offtrac, urlgrabber }:
2−
3−buildPythonPackage rec {
4− pname = "fedpkg";
5− version = "1.29";
6− name = "${pname}-${version}";
7−
8− disabled = isPy3k;
9−
10− src = fetchurl {
11− url = "https://releases.pagure.org/fedpkg/${name}.tar.bz2";
12− sha256 = "1cpy5p1rp7w52ighz3ynvhyw04z86y8phq3n8563lj6ayr8pw631";
13− };
14−
15− #patches = [ ../development/python-modules/fedpkg-buildfix.diff ];
16− propagatedBuildInputs = [ rpkg offtrac urlgrabber ];
17−
18− doCheck = false; # requires fedora_cert which isn't used anymore
19−
20− meta = with stdenv.lib; {
21− description = "Subclass of the rpkg project for dealing with rpm packaging";
22− homepage = https://pagure.io/fedpkg;
23− license = licenses.gpl2;
24− maintainers = with maintainers; [ ];
25− };
26−}
pkgs/development/tools/fedpkg/default.nixnew file+35
@@ -0,0 +1,35 @@
1+{ stdenv, buildPythonApplication, buildPythonPackage, isPy3k, fetchurl, rpkg, offtrac, urlgrabber, pyopenssl, python_fedora }:
2+
3+let
4+ fedora_cert = buildPythonPackage rec {
5+ name = "fedora-cert";
6+ version = "0.6.0.2";
7+ format = "other";
8+
9+ src = fetchurl {
10+ url = "https://releases.pagure.org/fedora-packager/fedora-packager-${version}.tar.bz2";
11+ sha256 = "02f22072wx1zg3rhyfw6gbxryzcbh66s92nb98mb9kdhxixv6p0z";
12+ };
13+ propagatedBuildInputs = [ python_fedora pyopenssl ];
14+ doCheck = false;
15+ };
16+in buildPythonApplication rec {
17+ pname = "fedpkg";
18+ version = "1.29";
19+
20+ disabled = isPy3k;
21+
22+ src = fetchurl {
23+ url = "https://releases.pagure.org/fedpkg/${pname}-${version}.tar.bz2";
24+ sha256 = "1cpy5p1rp7w52ighz3ynvhyw04z86y8phq3n8563lj6ayr8pw631";
25+ };
26+ patches = [ ./fix-paths.patch ];
27+ propagatedBuildInputs = [ rpkg offtrac urlgrabber fedora_cert ];
28+
29+ meta = with stdenv.lib; {
30+ description = "Subclass of the rpkg project for dealing with rpm packaging";
31+ homepage = https://pagure.io/fedpkg;
32+ license = licenses.gpl2;
33+ maintainers = with maintainers; [ ];
34+ };
35+}
pkgs/development/tools/fedpkg/fix-paths.patchnew file+16
@@ -0,0 +1,16 @@
1+--- orig/setup.py
2++++ new/setup.py
3+@@ -27,10 +27,10 @@
4+ 'bin/fedpkg',
5+ 'bin/fedpkg-stage',
6+ ],
7+- data_files=[(bash_completion_dir(), ['conf/bash-completion/fedpkg.bash']),
8+- ('/etc/rpkg', ['conf/etc/rpkg/fedpkg.conf',
9++ data_files=[('share/bash-completion/completions', ['conf/bash-completion/fedpkg.bash']),
10++ ('etc/rpkg', ['conf/etc/rpkg/fedpkg.conf',
11+ 'conf/etc/rpkg/fedpkg-stage.conf']),
12+- ('/usr/share/zsh/site-functions', ['conf/zsh-completion/_fedpkg']),
13++ ('share/zsh/site-functions', ['conf/zsh-completion/_fedpkg']),
14+ ],
15+
16+ tests_require=['nose', 'mock'],
pkgs/top-level/all-packages.nix+2
@@ -8552,6 +8552,8 @@ in
85528552
85538553 jdepend = callPackage ../development/tools/analysis/jdepend { };
85548554
8555+ fedpkg = pythonPackages.callPackage ../development/tools/fedpkg { };
8556+
85558557 flex_2_5_35 = callPackage ../development/tools/parsing/flex/2.5.35.nix { };
85568558 flex = callPackage ../development/tools/parsing/flex { };
85578559
pkgs/top-level/python-packages.nix−2
@@ -1655,8 +1655,6 @@ in {
16551655 then callPackage ../development/python-modules/faulthandler {}
16561656 else throw "faulthandler is built into ${python.executable}";
16571657
1658− fedpkg = callPackage ../development/python-modules/fedpkg { };
1659−
16601658 flit = callPackage ../development/python-modules/flit { };
16611659
16621660 flowlogs_reader = callPackage ../development/python-modules/flowlogs_reader { };