From 2e44d576fd5789ca945799e622992ca8afedabce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 29 Oct 2017 11:05:52 +0100
Subject: [PATCH] pythonPackages.demjson: 1.6 -> 2.2.4

* fetchurl -> fetchPypi
* Tests work now.
* jsonlint is installed for us by package buildsys.
* Disable for python3.6 (build/test error).
---
 pkgs/top-level/python-packages.nix | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c7192b0a415..4cafeab8d40 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4853,20 +4853,16 @@ in {
 
 
   demjson = buildPythonPackage rec {
-    name = "demjson-1.6";
+    pname = "demjson";
+    version = "2.2.4";
+    name = "${pname}-${version}";
+    disabled = isPy36;
 
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/d/demjson/${name}.tar.gz";
-      sha256 = "0abf7wqqq7rk1sycy47ayn5p93yy7gjq50cb2z69wmik1qqrr60x";
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "0ygbddpnvp5lby6mr5kz60la3hkvwwzv3wwb3z0w9ngxl0w21pii";
     };
 
-    doCheck = false; # there are no tests
-
-    preFixup = ''
-      mkdir -p "$out/bin"
-      cp jsonlint "$out/bin/"
-    '';
-
     meta = {
       description = "Encoder/decoder and lint/validator for JSON (JavaScript Object Notation)";
       homepage = http://deron.meranda.us/python/demjson/;