From ce65b163be6747656cfae55499c7d54f4adffec6 Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Wed, 18 Dec 2019 08:39:22 -0500
Subject: [PATCH] Nevow 0.14.5 was released so we no longer need this stuff

---
 nix/nevow.nix   | 15 ++++++---------
 nix/nevow.patch | 28 ----------------------------
 2 files changed, 6 insertions(+), 37 deletions(-)
 delete mode 100644 nix/nevow.patch

diff --git a/nix/nevow.nix b/nix/nevow.nix
index c8b1652d8..202a59722 100644
--- a/nix/nevow.nix
+++ b/nix/nevow.nix
@@ -1,22 +1,19 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, isPy3k, twisted }:
+{ stdenv, buildPythonPackage, fetchPypi, isPy3k, twisted }:
 
 buildPythonPackage rec {
   pname = "Nevow";
-  version = "0.14.4.dev";
+  version = "0.14.5";
   name = "${pname}-${version}";
   disabled = isPy3k;
 
-  src = fetchFromGitHub {
-    owner = "twisted";
-    repo = "nevow";
-    rev = "aff713a6884a0ebf2214af5cfa3c1ea2d7d70669";
-    sha256 = "0wmfin9igj46dazyfkphk7jxqalvxisn2hjz79maqg4nbl0x3rcv";
+  src = fetchPypi {
+    inherit pname;
+    inherit version;
+    sha256 = "1wr3fai01h1bcp4qpia6indg4qmxvywwv3q1iibm669mln2vmdmg";
   };
 
   propagatedBuildInputs = [ twisted ];
 
-  patches = [ ./nevow.patch ];
-
   checkInputs = [ twisted ];
 
   checkPhase = ''
diff --git a/nix/nevow.patch b/nix/nevow.patch
deleted file mode 100644
index 766f54669..000000000
--- a/nix/nevow.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/nevow/__init__.py b/nevow/__init__.py
-index 45ac0a7..ebfb517 100644
---- a/nevow/__init__.py
-+++ b/nevow/__init__.py
-@@ -65,7 +65,8 @@ def _versions():
-     return __version__, __version_info__, version
- 
- 
--__version__, __version_info__, version = _versions()
-+from twisted.python.versions import Version
-+__version__, __version_info__, version = "0.14.4.dev1", (0, 14, 4), Version("nevow", 0, 14, 4, dev=1)
- 
- import sys
- from twisted.python.components import registerAdapter
-diff --git a/setup.py b/setup.py
-index b28f09a..dd97408 100644
---- a/setup.py
-+++ b/setup.py
-@@ -21,8 +21,7 @@ for (dirpath, dirnames, filenames) in os.walk("doc"):
- if __name__ == '__main__':
-     setup(
-         name='Nevow',
--        version=versioneer.get_version(),
--        cmdclass=versioneer.get_cmdclass(),
-+        version="0.14.4.dev1",
-         packages=find_packages(),
-         py_modules=["twisted.plugins.nevow_widget"],
-         include_package_data=True,