From fc6e770960b6e4161634df50f9093a2a8f1a6f22 Mon Sep 17 00:00:00 2001
From: Jean-Pierre PRUNARET <jean-pierre+git@prunetwork.fr>
Date: Tue, 3 Jan 2017 17:39:59 +0100
Subject: [PATCH] =?UTF-8?q?ajout=20metadata=20+=20changement=20getchgit=20?=
 =?UTF-8?q?-<=20fetchurl=20pour=20les=20"master"=20->=20bug=20a=20pr=C3=A9?=
 =?UTF-8?q?voir?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 blog-lothy-recette.nix          | 15 +++++++--------
 github-r6d.nix                  |  2 +-
 github-teleragno-www-MASTER.nix |  6 ++++--
 github-teleragno-www.nix        |  4 +++-
 gogs-jpierre03-homepage.nix     |  3 +++
 5 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/blog-lothy-recette.nix b/blog-lothy-recette.nix
index cf3cdf7..e30d097 100644
--- a/blog-lothy-recette.nix
+++ b/blog-lothy-recette.nix
@@ -4,23 +4,22 @@
 with import <nixpkgs> {};
 
 stdenv.mkDerivation rec {
-  version = "MASTER";
+  version = "master";
   name = "blog-gallery-${version}";
 
-  #src = fetchTarball {
-  #  url = "https://gogs.prunetwork.fr/lothy/recette-cuisine/archive/master.tar.gz";
-  #};
-
-  src = fetchgit {
-    url = "https://gogs.prunetwork.fr/lothy/recette-cuisine.git";
+  src = fetchurl {
+    url = "https://gogs.prunetwork.fr/lothy/recette-cuisine/archive/${version}.tar.gz";
     sha256 = "1kfjwx095hm80qzjvchnbikm3xc4j6vfzbnfc3yrrk2qc6lz0ghc";
   };
 
-  buildInputs = [ pkgs.jekyll ];
+  buildInputs = [ jekyll ];
   buildPhase = "jekyll build";
   installPhase = "cp -R _site \$out";
 
   meta = with stdenv.lib; {
+    description = "Site web de recette de cuisine";
+    homepage = https://gogs.prunetwork.fr/lothy/recette-cuisine;
+    license = licenses.cc-by-nc-sa-40;
     maintainers = [ "Jean-Pierre PRUNARET <jean-pierre+git@prunetwork.fr>" ];
     platforms = platforms.linux;
   };
diff --git a/github-r6d.nix b/github-r6d.nix
index a29f9b5..a978174 100644
--- a/github-r6d.nix
+++ b/github-r6d.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   version = "2016-07-22";
   name = "r6d-blog-${version}";
 
-  src = fetchgit {
+  src = fetchurl {
     url = "https://github.com/r6d/r6d.github.io.git";
     sha256 = "1pk8f4j6lbvljrb8k1j21j8k2mh9szqwysdgljh6p5i87sfk0l9b";
   };
diff --git a/github-teleragno-www-MASTER.nix b/github-teleragno-www-MASTER.nix
index a169c72..ec683a8 100644
--- a/github-teleragno-www-MASTER.nix
+++ b/github-teleragno-www-MASTER.nix
@@ -4,10 +4,9 @@
 with import <nixpkgs> {};
 
 stdenv.mkDerivation rec {
-  version="master";
+  version = "master";
   name = "github-teleragno-www-${version}";
 
-  # liste des fonction de récup : fetch*  https://github.com/NixOS/nixpkgs/tree/master/pkgs/build-support
   src = fetchurl {
     url = "https://github.com/teleragno/teleragno.github.io/archive/${version}.tar.gz";
     sha256 = "1lmbvqz9d2yjs5xwbx0h7pzq8sxw182fzcv6hsfma4dk970lkk88";
@@ -16,6 +15,9 @@ stdenv.mkDerivation rec {
   installPhase = "cp -R . \$out";
 
   meta = with stdenv.lib; {
+    description = "Site web de l'association Teleragno";
+    homepage = https://www.teleragno.fr;
+    license = licenses.cc-by-nc-sa-40;
     maintainers = [ "Jean-Pierre PRUNARET <jean-pierre+git@prunetwork.fr>" ];
     platforms = platforms.linux;
   };
diff --git a/github-teleragno-www.nix b/github-teleragno-www.nix
index 0b01e20..c22382b 100644
--- a/github-teleragno-www.nix
+++ b/github-teleragno-www.nix
@@ -7,7 +7,6 @@ stdenv.mkDerivation rec {
   version="2016-03-21";
   name = "github-teleragno-www-${version}";
 
-  # liste des fonction de récup : fetch*  https://github.com/NixOS/nixpkgs/tree/master/pkgs/build-support
   src = fetchurl {
     url = "https://github.com/teleragno/teleragno.github.io/archive/${version}.tar.gz";
     sha256 = "01v03f4fr3rynfrwqgpz5bxf5n1faz4px3hxvd0y73h74c76g5an";
@@ -16,6 +15,9 @@ stdenv.mkDerivation rec {
   installPhase = "cp -R . \$out";
 
   meta = with stdenv.lib; {
+    description = "Site web de l'association Teleragno";
+    homepage = https://gogs.prunetwork.fr/jpierre03/gallery;
+    license = licenses.cc-by-nc-sa-40;
     maintainers = [ "Jean-Pierre PRUNARET <jean-pierre+git@prunetwork.fr>" ];
     platforms = platforms.linux;
   };
diff --git a/gogs-jpierre03-homepage.nix b/gogs-jpierre03-homepage.nix
index 5b9dd4a..e23b53d 100644
--- a/gogs-jpierre03-homepage.nix
+++ b/gogs-jpierre03-homepage.nix
@@ -16,6 +16,9 @@ stdenv.mkDerivation rec {
   installPhase = "cp -R . \$out";
 
   meta = with stdenv.lib; {
+    description = "Page d'accueil";
+    homepage = https://gogs.prunetwork.fr/jpierre03/homepage;
+    license = licenses.cc-by-nc-sa-40;
     maintainers = [ "Jean-Pierre PRUNARET <jean-pierre+git@prunetwork.fr>" ];
     platforms = platforms.linux;
   };