From 2b5b8493a7cf754845ac5103e7ad6143fda25f22 Mon Sep 17 00:00:00 2001
From: Tadeo Kondrak <me@tadeo.ca>
Date: Thu, 4 Jul 2019 04:08:43 -0600
Subject: [PATCH 1/2] astor: 0.7.1 -> 0.8.0

---
 pkgs/development/python-modules/astor/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/astor/default.nix b/pkgs/development/python-modules/astor/default.nix
index 687808461feb..903b892f3222 100644
--- a/pkgs/development/python-modules/astor/default.nix
+++ b/pkgs/development/python-modules/astor/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "astor";
-  version = "0.7.1";
+  version = "0.8.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "95c30d87a6c2cf89aa628b87398466840f0ad8652f88eb173125a6df8533fb8d";
+    sha256 = "0qkq5bf13fqcwablg0nk7rx83izxdizysd42n26j5wbingcfx9ip";
   };
 
   # disable tests broken with python3.6: https://github.com/berkerpeksag/astor/issues/89

From a1801ff4dece7d1a19bcaefd3f83887e6593a521 Mon Sep 17 00:00:00 2001
From: Tadeo Kondrak <me@tadeo.ca>
Date: Thu, 4 Jul 2019 04:09:28 -0600
Subject: [PATCH 2/2] hy: 0.16.0 -> 0.17.0

---
 pkgs/development/interpreters/hy/default.nix | 31 +++++++-------------
 1 file changed, 11 insertions(+), 20 deletions(-)

diff --git a/pkgs/development/interpreters/hy/default.nix b/pkgs/development/interpreters/hy/default.nix
index 12631cee38ae..a6acd603c815 100644
--- a/pkgs/development/interpreters/hy/default.nix
+++ b/pkgs/development/interpreters/hy/default.nix
@@ -1,23 +1,14 @@
-{ stdenv, fetchurl, fetchpatch, pythonPackages }:
+{ stdenv, fetchurl, pythonPackages }:
 
 pythonPackages.buildPythonApplication rec {
-  name = "hy-${version}";
-  version = "0.16.0";
+  pname = "hy";
+  version = "0.17.0";
 
-  src = fetchurl {
-    url = "mirror://pypi/h/hy/${name}.tar.gz";
-    sha256 = "00lq38ppikrpyw38fn5iy9iwrsamsv22507cp146dsjbzkwjpzrd";
+  src = pythonPackages.fetchPypi {
+    inherit pname version;
+    sha256 = "1gdbqsirsdxj320wnp7my5awzs1kfs6m4fqmkzbd1zd47qzj0zfi";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "bytecode-error-handling.patch";
-      url = "https://github.com/hylang/hy/commit/57326785b97b7b0a89f6258fe3d04dccdc06cfc0.patch";
-      sha256 = "1lxxs7mxbh0kaaa25b1pbqs9d8asyjnlf2n86qg8hzsv32jfcq92";
-      excludes = [ "AUTHORS" "NEWS.rst" ];
-    })
-  ];
-
   propagatedBuildInputs = with pythonPackages; [
     appdirs
     astor
@@ -27,11 +18,11 @@ pythonPackages.buildPythonApplication rec {
     rply
   ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A LISP dialect embedded in Python";
-    homepage = http://hylang.org/;
-    license = stdenv.lib.licenses.mit;
-    maintainers = [ stdenv.lib.maintainers.nixy ];
-    platforms = stdenv.lib.platforms.all;
+    homepage = "http://hylang.org/";
+    license = licenses.mit;
+    maintainers = with maintainers; [ nixy ];
+    platforms = platforms.all;
   };
 }