From 2eba34d96094d10f53465a6f4350d346b030ed0d Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Fri, 12 Jan 2018 11:29:13 +0100
Subject: [PATCH 1/3] sigal: Move to applications/misc

---
 pkgs/applications/misc/sigal/default.nix | 33 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  4 +++
 pkgs/top-level/python-packages.nix       | 23 -----------------
 3 files changed, 37 insertions(+), 23 deletions(-)
 create mode 100644 pkgs/applications/misc/sigal/default.nix

diff --git a/pkgs/applications/misc/sigal/default.nix b/pkgs/applications/misc/sigal/default.nix
new file mode 100644
index 000000000000..d66ca8586ec4
--- /dev/null
+++ b/pkgs/applications/misc/sigal/default.nix
@@ -0,0 +1,33 @@
+{ lib, buildPythonApplication, fetchurl, pythonPackages }:
+
+buildPythonApplication rec {
+  version = "1.0.1";
+  name    = "sigal-${version}";
+
+  src = fetchurl {
+    url = "mirror://pypi/s/sigal/${name}.tar.gz";
+    sha256 = "198g2r8bii6a0p44mlk1wg07jjv95xpfvnqhhxxziqpizc776b34";
+  };
+
+  buildInputs = with pythonPackages; [ pytest ];
+  propagatedBuildInputs = with pythonPackages; [
+    jinja2
+    markdown
+    pillow
+    pilkit
+    clint
+    click
+    blinker
+  ];
+
+  # No tests included
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Yet another simple static gallery generator";
+    homepage    = http://sigal.saimon.org/en/latest/index.html;
+    license     = licenses.mit;
+    maintainers = with maintainers; [ domenkozar matthiasbeyer ];
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6a632a0fe6ab..f23bc44c6a73 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4519,6 +4519,10 @@ with pkgs;
 
   siege = callPackage ../tools/networking/siege {};
 
+  sigal = callPackage ../applications/misc/sigal {
+    inherit (pythonPackages) buildPythonApplication;
+  };
+
   sigil = libsForQt56.callPackage ../applications/editors/sigil { };
 
   signal-desktop = callPackage ../applications/networking/instant-messengers/signal-desktop { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 855b340071a4..fec2e3fd4932 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16273,29 +16273,6 @@ in {
     };
   };
 
-  sigal = buildPythonPackage rec {
-    name = "sigal-1.0.1";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/s/sigal/${name}.tar.gz";
-      sha256 = "198g2r8bii6a0p44mlk1wg07jjv95xpfvnqhhxxziqpizc776b34";
-    };
-
-    buildInputs = with self; [ pytest ];
-    propagatedBuildInputs = with self; [ jinja2 markdown pillow pilkit clint click blinker ];
-
-    # No tests included
-    doCheck = false;
-
-
-    meta = {
-      description = "Yet another simple static gallery generator";
-      homepage = http://sigal.saimon.org/en/latest/index.html;
-      license = licenses.mit;
-      maintainers = with maintainers; [ domenkozar ];
-    };
-  };
-
   slob = buildPythonPackage rec {
     name = "slob-unstable-2016-11-03";
 

From 0a339f5a55e5dde637dc3f01d1f4d9c7da186c9b Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Fri, 12 Jan 2018 11:31:09 +0100
Subject: [PATCH 2/3] sigal: Use fetchPypi instead of fetchurl

---
 pkgs/applications/misc/sigal/default.nix | 8 ++++----
 pkgs/top-level/all-packages.nix          | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/misc/sigal/default.nix b/pkgs/applications/misc/sigal/default.nix
index d66ca8586ec4..e08ccbb025fd 100644
--- a/pkgs/applications/misc/sigal/default.nix
+++ b/pkgs/applications/misc/sigal/default.nix
@@ -1,11 +1,11 @@
-{ lib, buildPythonApplication, fetchurl, pythonPackages }:
+{ lib, buildPythonApplication, fetchPypi, pythonPackages }:
 
 buildPythonApplication rec {
   version = "1.0.1";
-  name    = "sigal-${version}";
+  pname   = "sigal";
 
-  src = fetchurl {
-    url = "mirror://pypi/s/sigal/${name}.tar.gz";
+  src = fetchPypi {
+    inherit version pname;
     sha256 = "198g2r8bii6a0p44mlk1wg07jjv95xpfvnqhhxxziqpizc776b34";
   };
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f23bc44c6a73..426af532a988 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4520,7 +4520,7 @@ with pkgs;
   siege = callPackage ../tools/networking/siege {};
 
   sigal = callPackage ../applications/misc/sigal {
-    inherit (pythonPackages) buildPythonApplication;
+    inherit (pythonPackages) buildPythonApplication fetchPypi;
   };
 
   sigil = libsForQt56.callPackage ../applications/editors/sigil { };

From b9bade971d2f2a6ae7791ad11b230b8a674b944c Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Fri, 12 Jan 2018 11:32:29 +0100
Subject: [PATCH 3/3] sigal: 1.0.1 -> 1.3.0

---
 pkgs/applications/misc/sigal/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/sigal/default.nix b/pkgs/applications/misc/sigal/default.nix
index e08ccbb025fd..ae2bab64187d 100644
--- a/pkgs/applications/misc/sigal/default.nix
+++ b/pkgs/applications/misc/sigal/default.nix
@@ -1,12 +1,12 @@
 { lib, buildPythonApplication, fetchPypi, pythonPackages }:
 
 buildPythonApplication rec {
-  version = "1.0.1";
+  version = "1.3.0";
   pname   = "sigal";
 
   src = fetchPypi {
     inherit version pname;
-    sha256 = "198g2r8bii6a0p44mlk1wg07jjv95xpfvnqhhxxziqpizc776b34";
+    sha256 = "0ycyrap4rc0yrjagi5c5fs5gpw9whvkli656syfpj99dq1q9q1d0";
   };
 
   buildInputs = with pythonPackages; [ pytest ];