public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #51229 from marsam/feature/fedpkg-cleanup

Browse Source 
fedpkg: remove unneeded patch
This commit is contained in:
worldofpeace
2018-12-04 21:15:32 -05:00
committed by GitHub
parent 3aa9091162 2256273c6b
commit 572b514582
6 changed files with 53 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/python-modules/fedpkg-buildfix.diff
View File

@@ -1,14 +0,0 @@
--- a/setup.py 2014-02-04 16:12:37.021993713 +0100
+++ b/setup.py 2014-02-04 16:11:42.653995607 +0100
@@ -13,8 +13,8 @@
package_dir = {'': 'src'},
packages = ['fedpkg'],
scripts = ['src/bin/fedpkg'],
- data_files = [('/etc/bash_completion.d', ['src/fedpkg.bash']),
- ('/etc/rpkg', ['src/fedpkg.conf']),
- ('/usr/libexec/', ['src/fedpkg-fixbranches.py']),
+ data_files = [('etc/bash_completion.d', ['src/fedpkg.bash']),
+ ('etc/rpkg', ['src/fedpkg.conf']),
+ ('libexec/', ['src/fedpkg-fixbranches.py']),
]
)

26
pkgs/development/python-modules/fedpkg/default.nix
View File

@@ -1,26 +0,0 @@
{ stdenv, buildPythonPackage, isPy3k, fetchurl, rpkg, offtrac, urlgrabber }:
buildPythonPackage rec {
pname = "fedpkg";
version = "1.29";
name = "${pname}-${version}";
disabled = isPy3k;
src = fetchurl {
url = "https://releases.pagure.org/fedpkg/${name}.tar.bz2";
sha256 = "1cpy5p1rp7w52ighz3ynvhyw04z86y8phq3n8563lj6ayr8pw631";
};
#patches = [ ../development/python-modules/fedpkg-buildfix.diff ];
propagatedBuildInputs = [ rpkg offtrac urlgrabber ];
doCheck = false; # requires fedora_cert which isn't used anymore
meta = with stdenv.lib; {
description = "Subclass of the rpkg project for dealing with rpm packaging";
homepage = https://pagure.io/fedpkg;
license = licenses.gpl2;
maintainers = with maintainers; [ ];
};
}