ménage + réorganisation release

blog-lothy-recette-MASTER.nix

@@ -0,0 +1,28 @@
+# https://www.mpscholten.de/nixos/2016/07/07/private-github-repositories-and-nixos.html
+# https://nixos.org/wiki/FAQ#How_do_I_know_the_sha256_to_use_with_fetchgit.3F
+
+with import <nixpkgs> {};
+
+stdenv.mkDerivation rec {
+  version = "master";
+  name = "blog-gallery-${version}";
+
+  src = fetchgit {
+    # fetchurl
+    #url = "https://gogs.prunetwork.fr/lothy/recette-cuisine/archive/${version}.tar.gz";
+    url = "https://gogs.prunetwork.fr/lothy/recette-cuisine.git";
+    sha256 = "0cfp4g385vf78py7vffg8ckvqqm8bcxy2ifqgk1syzms9j3cnhjr";
+  };
+
+  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;
+  };
+}

blog-lothy-recette-TAG.nix

@@ -4,11 +4,12 @@
 with import <nixpkgs> {};
 
 stdenv.mkDerivation rec {
-  version = "master";
+  version = "2017-01-20";
   name = "blog-gallery-${version}";
 
-  src = fetchurl {
+  src = fetchgit {
-    url = "https://gogs.prunetwork.fr/lothy/recette-cuisine/archive/${version}.tar.gz";
+    url = "https://gogs.prunetwork.fr/lothy/recette-cuisine.git";
+    rev = "a987f465e818c7b32bcbc20f3d76f754f4645333";
     sha256 = "0cfp4g385vf78py7vffg8ckvqqm8bcxy2ifqgk1syzms9j3cnhjr";
   };
 

github-r6d-MASTER.nix

@@ -0,0 +1,23 @@
+# https://www.mpscholten.de/nixos/2016/07/07/private-github-repositories-and-nixos.html
+# https://nixos.org/wiki/FAQ#How_do_I_know_the_sha256_to_use_with_fetchgit.3F
+
+with import <nixpkgs> {};
+
+stdenv.mkDerivation rec {
+  version = "master";
+  name = "r6d-blog-${version}";
+
+  src = fetchgit {
+    url = "https://github.com/r6d/r6d.github.io.git";
+    sha256 = "";
+  };
+
+  buildInputs = [ jekyll ];
+  buildPhase = "jekyll build";
+  installPhase = "cp -R _site \$out";
+
+  meta = with stdenv.lib; {
+    maintainers = [ "Jean-Pierre PRUNARET <jean-pierre+git@prunetwork.fr>" ];
+    platforms = platforms.linux;
+  };
+}

github-teleragno-www-MASTER.nix

@@ -4,11 +4,11 @@
 with import <nixpkgs> {};
 
 stdenv.mkDerivation rec {
-  version = "master";
+  version = "MASTER";
   name = "github-teleragno-www-${version}";
 
   src = fetchurl {
-    url = "https://github.com/teleragno/teleragno.github.io/archive/${version}.tar.gz";
+    url = "https://github.com/teleragno/teleragno.github.io.git";
     sha256 = "1lmbvqz9d2yjs5xwbx0h7pzq8sxw182fzcv6hsfma4dk970lkk88";
   };
 

gogs-jpierre03-gallery-MASTER.nix

@@ -1,11 +1,11 @@
 with import <nixpkgs> {};
 
 stdenv.mkDerivation rec {
-  version = "master";
+  version = "MASTER";
   name = "blog-gallery-${version}";
 
-  src = fetchurl {
+  src = fetchgit {
-    url = "https://gogs.prunetwork.fr/jpierre03/gallery/archive/${version}.tar.gz";
+    url = "https://gogs.prunetwork.fr/jpierre03/gallery.git";
     sha256 = "1cynmrz2npabm42hv5m52wa85wfpdxljmkjv4k57ilq8xmr6xxgv";
   };
 

gogs-jpierre03-gallery-TAG.nix

@@ -0,0 +1,23 @@
+with import <nixpkgs> {};
+
+stdenv.mkDerivation rec {
+  version = "2016-10-22-v1";
+  name = "blog-gallery-${version}";
+
+  src = fetchurl {
+    url = "https://gogs.prunetwork.fr/jpierre03/gallery/archive/${version}.tar.gz";
+    sha256 = "1cynmrz2npabm42hv5m52wa85wfpdxljmkjv4k57ilq8xmr6xxgv";
+  };
+
+  buildInputs = [ jekyll ];
+  buildPhase = "jekyll build";
+  installPhase = "cp -R _site \$out";
+
+  meta = with stdenv.lib; {
+    description = "Site web de photo";
+    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;
+  };
+}

gogs-jpierre03-homepage-MASTER.nix

@@ -0,0 +1,25 @@
+# https://www.mpscholten.de/nixos/2016/07/07/private-github-repositories-and-nixos.html
+# https://nixos.org/wiki/FAQ#How_do_I_know_the_sha256_to_use_with_fetchgit.3F
+
+with import <nixpkgs> {};
+
+stdenv.mkDerivation rec {
+  version="MASTER";
+  name = "gogs-jpierre03-homepage-${version}";
+
+  # liste des fonction de récup : fetch*  https://github.com/NixOS/nixpkgs/tree/master/pkgs/build-support
+  src = fetchgit {
+    url = "https://gogs.prunetwork.fr/jpierre03/homepage.git";
+    sha256 = "08h6jg7pmxp3wh5dbhds6ky0i85li8c2slfa3h7fcpdyk4pvqm8r";
+  };
+
+  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;
+  };
+}

gogs-openlayer-MASTER.nix

@@ -0,0 +1,22 @@
+# https://www.mpscholten.de/nixos/2016/07/07/private-github-repositories-and-nixos.html
+# https://nixos.org/wiki/FAQ#How_do_I_know_the_sha256_to_use_with_fetchgit.3F
+
+with import <nixpkgs> {};
+
+stdenv.mkDerivation rec {
+  version="MASTER";
+  name = "openlayer-simplemap-blog-${version}";
+
+  # liste des fonction de récup : fetch*  https://github.com/NixOS/nixpkgs/tree/master/pkgs/build-support
+  src = fetchgit {
+    url = "https://gogs.prunetwork.fr/jpierre03/openlayer-simplemap.git";
+    sha256 = "0z7b2rc2xrwrkgsdf8nc9azbqhvf062xf6ad8clrmgn1lax9zki4";
+  };
+
+  installPhase = "cp -R . \$out";
+
+  meta = with stdenv.lib; {
+    maintainers = [ "Jean-Pierre PRUNARET <jean-pierre+git@prunetwork.fr>" ];
+    platforms = platforms.linux;
+  };
+}

midipix.nix

@@ -2,7 +2,7 @@ with import <nixpkgs> {};
 
 
 stdenv.mkDerivation rec {
-  name = "foo-${version}";
+  name = "slibtool-${version}";
   version = "2016-07-13";
   src = fetchgit {
     url = "git://midipix.org/slibtool";

random.nix

@@ -6,19 +6,15 @@ with import <nixpkgs> {};
 stdenv.mkDerivation rec {
   version = "master";
   name = "random-${version}";
-  #builder = ./builder.sh;
 
-  src = fetchurl {
+  src = fetchgit {
-    url = "https://gogs.prunetwork.fr/jpierre03/random/archive/${version}.tar.gz";
+    url = "https://gogs.prunetwork.fr/jpierre03/random.git";
-    sha256 = "07n3j4iia93nxh3fkaslynqxyyl41v8whaz756zx6xw3hhqn5rja";
+    sha256 = "1izkzy852rjzlk3d9ndp3bklxc45gkwvpw0376x39flq1km0kyak";
   };
 
   buildInputs = [ gcc ];
-  #buildPhase = "jekyll build";
+  buildPhase = "make build";
-  #installPhase = "cp -R _site \$out";
   installPhase = "make install OUT=\$out";
-  #installPhase = "mkdir \$out && cp random \$out";
-  #installPhase = "install -D $out random";
 
   meta = with stdenv.lib; {
     description = "Program thas exit with 0 or 1 randomly";

release.nix

@@ -5,17 +5,26 @@
 with (import <nixpkgs/pkgs/top-level/release-lib.nix> { inherit supportedSystems; });
 
 {
-  jpierre03.gallery.MASTER = import ./gogs-jpierre03-gallery-MASTER.nix;
+  jpierre03.blog_r6d.master                 = import ./github-r6d-MASTER.nix;
-  jpierre03.blog_r6d.tag = import ./github-r6d.nix;
+  jpierre03.blog_r6d.tag                    = import ./github-r6d-TAG.nix;
-  jpierre03.blog_lothy_recette  = import ./blog-lothy-recette.nix; 
+  jpierre03.gallery.master                  = import ./gogs-jpierre03-gallery-MASTER.nix;
-  jpierre03.blog_sandbox  = import ./blog-sandbox.nix;
+  jpierre03.gallery.tag                     = import ./gogs-jpierre03-gallery-TAG.nix;
-  jpierre03.gogs_jpierre03_homepage = import ./gogs-jpierre03-homepage.nix;
+  jpierre03.gogs_jpierre03_homepage.master  = import ./gogs-jpierre03-homepage-MASTER.nix;
-  jpierre03.gogs_openlayer = import ./gogs-openlayer.nix;
+  jpierre03.gogs_jpierre03_homepage.tag     = import ./gogs-jpierre03-homepage-TAG.nix;
+  jpierre03.blog_lothy_recette.master       = import ./blog-lothy-recette-MASTER.nix;
+  jpierre03.blog_lothy_recette.tag          = import ./blog-lothy-recette-TAG.nix;
+  jpierre03.gogs_openlayer.master           = import ./gogs-openlayer-MASTER.nix;
+  jpierre03.gogs_openlayer.tag              = import ./gogs-openlayer-TAG.nix;
+
+  ###################
+  jpierre03.blog_sandbox = import ./blog-sandbox.nix;
+  #jpierre03.blog_sandbox.tag = import ./blog-sandbox.nix;
+
   jpierre03.random = import ./random.nix;
 
   #jpierre03.osm2pgsql = import ./osm2pgsql.nix;
 
-  teleragno.www.tag = import ./github-teleragno-www.nix;
+  teleragno.www.tag = import ./github-teleragno-www-TAG.nix;
   teleragno.www.MASTER = import ./github-teleragno-www-MASTER.nix;
 
   midpix.slibtool = import ./midipix.nix;