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

fedpkg: remove unneeded patch

pkgs/development/python-modules/fedpkg-buildfix.diff

@@ -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']),
-                  ]
- )

pkgs/development/python-modules/fedpkg/default.nix

@@ -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; [ ];
-  };
-}

pkgs/development/tools/fedpkg/default.nix

@@ -0,0 +1,35 @@
+{ stdenv, buildPythonApplication, buildPythonPackage, isPy3k, fetchurl, rpkg, offtrac, urlgrabber, pyopenssl, python_fedora }:
+
+let
+  fedora_cert = buildPythonPackage rec {
+    name = "fedora-cert";
+    version = "0.6.0.2";
+    format = "other";
+
+    src = fetchurl {
+      url = "https://releases.pagure.org/fedora-packager/fedora-packager-${version}.tar.bz2";
+      sha256 = "02f22072wx1zg3rhyfw6gbxryzcbh66s92nb98mb9kdhxixv6p0z";
+    };
+    propagatedBuildInputs = [ python_fedora pyopenssl ];
+    doCheck = false;
+  };
+in buildPythonApplication rec {
+  pname = "fedpkg";
+  version = "1.29";
+
+  disabled = isPy3k;
+
+  src = fetchurl {
+    url = "https://releases.pagure.org/fedpkg/${pname}-${version}.tar.bz2";
+    sha256 = "1cpy5p1rp7w52ighz3ynvhyw04z86y8phq3n8563lj6ayr8pw631";
+  };
+  patches = [ ./fix-paths.patch ];
+  propagatedBuildInputs = [ rpkg offtrac urlgrabber fedora_cert ];
+
+  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; [ ];
+  };
+}

pkgs/development/tools/fedpkg/fix-paths.patch

@@ -0,0 +1,16 @@
+--- orig/setup.py
++++ new/setup.py
+@@ -27,10 +27,10 @@
+         'bin/fedpkg',
+         'bin/fedpkg-stage',
+     ],
+-    data_files=[(bash_completion_dir(), ['conf/bash-completion/fedpkg.bash']),
+-                ('/etc/rpkg', ['conf/etc/rpkg/fedpkg.conf',
++    data_files=[('share/bash-completion/completions', ['conf/bash-completion/fedpkg.bash']),
++                ('etc/rpkg', ['conf/etc/rpkg/fedpkg.conf',
+                                'conf/etc/rpkg/fedpkg-stage.conf']),
+-                ('/usr/share/zsh/site-functions', ['conf/zsh-completion/_fedpkg']),
++                ('share/zsh/site-functions', ['conf/zsh-completion/_fedpkg']),
+                 ],
+ 
+     tests_require=['nose', 'mock'],

pkgs/top-level/all-packages.nix

@@ -8552,6 +8552,8 @@ in
 
   jdepend = callPackage ../development/tools/analysis/jdepend { };
 
+  fedpkg = pythonPackages.callPackage ../development/tools/fedpkg { };
+
   flex_2_5_35 = callPackage ../development/tools/parsing/flex/2.5.35.nix { };
   flex = callPackage ../development/tools/parsing/flex { };
 

pkgs/top-level/python-packages.nix

@@ -1655,8 +1655,6 @@ in {
     then callPackage ../development/python-modules/faulthandler {}
     else throw "faulthandler is built into ${python.executable}";
 
-  fedpkg = callPackage ../development/python-modules/fedpkg { };
-
   flit = callPackage ../development/python-modules/flit { };
 
   flowlogs_reader = callPackage ../development/python-modules/flowlogs_reader { };