From c30788f2d516f4151b7312e475ca0887385cc749 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 4 Jul 2019 13:49:03 +0200 Subject: [PATCH] python-bugzilla: fix broken package name This package has downloaded an incorrect source tarball for the longest time. --- .../checkPhase-fix-cookie-compare.patch | 30 ------------------- .../python-modules/bugzilla/default.nix | 7 ++--- 2 files changed, 3 insertions(+), 34 deletions(-) delete mode 100644 pkgs/development/python-modules/bugzilla/checkPhase-fix-cookie-compare.patch diff --git a/pkgs/development/python-modules/bugzilla/checkPhase-fix-cookie-compare.patch b/pkgs/development/python-modules/bugzilla/checkPhase-fix-cookie-compare.patch deleted file mode 100644 index 63c0fdc3c502..000000000000 --- a/pkgs/development/python-modules/bugzilla/checkPhase-fix-cookie-compare.patch +++ /dev/null @@ -1,30 +0,0 @@ -From e7ed770363e8769727a915b2390c0ce1ab2ce964 Mon Sep 17 00:00:00 2001 -From: Michal Hlavinka -Date: Wed, 18 Jun 2014 20:07:24 -0400 -Subject: tests: Fix cookie comparison on rawhide - -Cookie comments changed, so just strip them out - -(crobinso: Add commit message, make change more readable) - -diff --git a/tests/misc.py b/tests/misc.py -index 4b4f99d..12da806 100644 ---- a/tests/misc.py -+++ b/tests/misc.py -@@ -83,7 +83,12 @@ class MiscAPI(unittest.TestCase): - - # Mozilla should be converted inplace to LWP - bugzilla.Bugzilla3(url=None, cookiefile=cookiesnew) -- self.assertEquals(open(cookiesmoz).read(), open(cookiesnew).read()) -+ -+ def strip_comments(content): -+ return [l for l in content.split("\n") if not l.startswith("#")] -+ self.assertEquals( -+ strip_comments(open(cookiesmoz).read()), -+ strip_comments(open(cookiesnew).read())) - - # Make sure bad cookies raise an error - try: --- -cgit v0.10.2 - diff --git a/pkgs/development/python-modules/bugzilla/default.nix b/pkgs/development/python-modules/bugzilla/default.nix index 66aad6d0350a..52d42b7a263d 100644 --- a/pkgs/development/python-modules/bugzilla/default.nix +++ b/pkgs/development/python-modules/bugzilla/default.nix @@ -6,12 +6,11 @@ buildPythonPackage rec { version = "2.2.0"; src = fetchPypi { - inherit pname version; - sha256 = "0ikx21nm7cch4lz9agv5h1hx6zvg2alkpfdrl01khqgilhsicdhi"; + pname = "python-${pname}"; + inherit version; + sha256 = "0x3jjb1g5bgjdj0jf0jmcg80hn5x2isf49frwvf2ykdl3fxd5gxc"; }; - patches = [ ./checkPhase-fix-cookie-compare.patch ]; - buildInputs = [ pep8 coverage logilab_common ]; propagatedBuildInputs = [ requests ];