From 352f65b72b690ae26077129b4f142ad34f7b591c Mon Sep 17 00:00:00 2001
From: Jean-Pierre PRUNARET <jean-pierre+git@prunetwork.fr>
Date: Sun, 30 Oct 2016 01:11:30 +0200
Subject: [PATCH] backport template-server

---
 blog-gallery.nix            | 29 ++++++++++++-----------------
 blog-r6d.nix                |  8 ++++----
 gogs-jpierre03-homepage.nix |  7 +++----
 gogs-openlayer.nix          |  5 ++---
 4 files changed, 21 insertions(+), 28 deletions(-)

diff --git a/blog-gallery.nix b/blog-gallery.nix
index fc70f50..a2a0284 100644
--- a/blog-gallery.nix
+++ b/blog-gallery.nix
@@ -1,24 +1,19 @@
 with import <nixpkgs> {};
 
-let
-  versionName = "2016-10-22-v1";
-in
-
 stdenv.mkDerivation rec {
+  version = "MASTER";
   name = "blog-gallery-${version}";
 
-  #version = "MASTER";
-  #  src = fetchTarball {
-    #  url = "https://gogs.prunetwork.fr/jpierre03/gallery/archive/master.tar.gz";
-    #};
+  #src = fetchTarball {
+  #  url = "https://gogs.prunetwork.fr/jpierre03/gallery/archive/master.tar.gz";
+  #};
 
-    version = versionName;
-    src = fetchurl {
-      url = "https://gogs.prunetwork.fr/jpierre03/gallery/archive/${version}.tar.gz";
-      sha256 = "0i44mp1w2p8v3yssa4c8xz59ga74dcxq96lkznyxr8np6hwdiyx1";
-    };
+  src = fetchgit {
+    url = "https://gogs.prunetwork.fr/jpierre03/gallery.git";
+    sha256 = "0ccdjlp5ljskvirp0djd3icxigpw7fbml43906k0vb68ln9k2qbp";
+  };
 
-    buildInputs = [ jekyll ];
-    buildPhase = "jekyll build";
-    installPhase = "cp -R _site \$out";
-  }
+  buildInputs = [ jekyll ];
+  buildPhase = "jekyll build";
+  installPhase = "cp -R _site \$out";
+}
diff --git a/blog-r6d.nix b/blog-r6d.nix
index 64708ec..49b6821 100644
--- a/blog-r6d.nix
+++ b/blog-r6d.nix
@@ -4,12 +4,12 @@
 with import <nixpkgs> {};
 
 stdenv.mkDerivation rec {
+  version = "2016-07-22";
   name = "r6d-blog-${version}";
 
-  version = "2016-07-22";
-  src = fetchurl {
-    url = "https://github.com/r6d/r6d.github.io/archive/${version}.tar.gz";
-    sha256 = "09363h7drw69n717v6zmbaqv2ijdws1dbxqm0l6zn5f9cvmdp9rw";
+  src = fetchgit {
+    url = "https://github.com/r6d/r6d.github.io.git";
+    sha256 = "1pk8f4j6lbvljrb8k1j21j8k2mh9szqwysdgljh6p5i87sfk0l9b";
   };
 
   buildInputs = [ jekyll ];
diff --git a/gogs-jpierre03-homepage.nix b/gogs-jpierre03-homepage.nix
index c5cd49e..73f6797 100644
--- a/gogs-jpierre03-homepage.nix
+++ b/gogs-jpierre03-homepage.nix
@@ -8,10 +8,9 @@ stdenv.mkDerivation rec {
   name = "gogs-jpierre03-homepage-${version}";
 
   # liste des fonction de récup : fetch*  https://github.com/NixOS/nixpkgs/tree/master/pkgs/build-support
-  src = fetchTarball {
-
-    url = "http://gogs.prunetwork.fr/jpierre03/homepage/archive/${version}.tar.gz";
-
+  src = fetchurl {
+    url = "https://gogs.prunetwork.fr/jpierre03/homepage/archive/${version}.tar.gz";
+    sha256 = "08h6jg7pmxp3wh5dbhds6ky0i85li8c2slfa3h7fcpdyk4pvqm8r";
   };
 
   installPhase = "cp -R . \$out";
diff --git a/gogs-openlayer.nix b/gogs-openlayer.nix
index 1aab017..3f80c29 100644
--- a/gogs-openlayer.nix
+++ b/gogs-openlayer.nix
@@ -8,10 +8,9 @@ stdenv.mkDerivation rec {
   name = "openlayer-simplemap-blog-${version}";
 
   # liste des fonction de récup : fetch*  https://github.com/NixOS/nixpkgs/tree/master/pkgs/build-support
-  src = fetchTarball {
-
+  src = fetchurl {
     url = "https://gogs.prunetwork.fr/jpierre03/openlayer-simplemap/archive/${version}.tar.gz";
-
+    sha256 = "0z7b2rc2xrwrkgsdf8nc9azbqhvf062xf6ad8clrmgn1lax9zki4";
   };
 
   installPhase = "cp -R . \$out";