From 94acc0882ef1213ea486a1ee72a2894f4dbaff3b Mon Sep 17 00:00:00 2001 From: Jean-Pierre PRUNARET Date: Thu, 19 Jan 2017 23:28:49 +0100 Subject: [PATCH] =?UTF-8?q?m=C3=A9nage=20+=20r=C3=A9organisation=20release?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- blog-lothy-recette-MASTER.nix | 28 +++++++++++++++++++ ...-recette.nix => blog-lothy-recette-TAG.nix | 7 +++-- github-r6d-MASTER.nix | 23 +++++++++++++++ github-r6d.nix => github-r6d-TAG.nix | 0 github-teleragno-www-MASTER.nix | 4 +-- ...no-www.nix => github-teleragno-www-TAG.nix | 0 gogs-jpierre03-gallery-MASTER.nix | 6 ++-- gogs-jpierre03-gallery-TAG.nix | 23 +++++++++++++++ gogs-jpierre03-homepage-MASTER.nix | 25 +++++++++++++++++ ...age.nix => gogs-jpierre03-homepage-TAG.nix | 0 gogs-openlayer-MASTER.nix | 22 +++++++++++++++ gogs-openlayer.nix => gogs-openlayer-TAG.nix | 0 midipix.nix | 2 +- random.nix | 12 +++----- release.nix | 23 ++++++++++----- 15 files changed, 151 insertions(+), 24 deletions(-) create mode 100644 blog-lothy-recette-MASTER.nix rename blog-lothy-recette.nix => blog-lothy-recette-TAG.nix (81%) create mode 100644 github-r6d-MASTER.nix rename github-r6d.nix => github-r6d-TAG.nix (100%) rename github-teleragno-www.nix => github-teleragno-www-TAG.nix (100%) create mode 100644 gogs-jpierre03-gallery-TAG.nix create mode 100644 gogs-jpierre03-homepage-MASTER.nix rename gogs-jpierre03-homepage.nix => gogs-jpierre03-homepage-TAG.nix (100%) create mode 100644 gogs-openlayer-MASTER.nix rename gogs-openlayer.nix => gogs-openlayer-TAG.nix (100%) diff --git a/blog-lothy-recette-MASTER.nix b/blog-lothy-recette-MASTER.nix new file mode 100644 index 0000000..f57cbfa --- /dev/null +++ b/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 {}; + +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 " ]; + platforms = platforms.linux; + }; +} diff --git a/blog-lothy-recette.nix b/blog-lothy-recette-TAG.nix similarity index 81% rename from blog-lothy-recette.nix rename to blog-lothy-recette-TAG.nix index f3a3f41..61c266b 100644 --- a/blog-lothy-recette.nix +++ b/blog-lothy-recette-TAG.nix @@ -4,11 +4,12 @@ with import {}; stdenv.mkDerivation rec { - version = "master"; + version = "2017-01-20"; name = "blog-gallery-${version}"; - src = fetchurl { - url = "https://gogs.prunetwork.fr/lothy/recette-cuisine/archive/${version}.tar.gz"; + src = fetchgit { + url = "https://gogs.prunetwork.fr/lothy/recette-cuisine.git"; + rev = "a987f465e818c7b32bcbc20f3d76f754f4645333"; sha256 = "0cfp4g385vf78py7vffg8ckvqqm8bcxy2ifqgk1syzms9j3cnhjr"; }; diff --git a/github-r6d-MASTER.nix b/github-r6d-MASTER.nix new file mode 100644 index 0000000..8b35e86 --- /dev/null +++ b/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 {}; + +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 " ]; + platforms = platforms.linux; + }; +} diff --git a/github-r6d.nix b/github-r6d-TAG.nix similarity index 100% rename from github-r6d.nix rename to github-r6d-TAG.nix diff --git a/github-teleragno-www-MASTER.nix b/github-teleragno-www-MASTER.nix index ec683a8..1f69a45 100644 --- a/github-teleragno-www-MASTER.nix +++ b/github-teleragno-www-MASTER.nix @@ -4,11 +4,11 @@ with import {}; 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"; }; diff --git a/github-teleragno-www.nix b/github-teleragno-www-TAG.nix similarity index 100% rename from github-teleragno-www.nix rename to github-teleragno-www-TAG.nix diff --git a/gogs-jpierre03-gallery-MASTER.nix b/gogs-jpierre03-gallery-MASTER.nix index 7247521..b52f3cf 100644 --- a/gogs-jpierre03-gallery-MASTER.nix +++ b/gogs-jpierre03-gallery-MASTER.nix @@ -1,11 +1,11 @@ with import {}; stdenv.mkDerivation rec { - version = "master"; + version = "MASTER"; name = "blog-gallery-${version}"; - src = fetchurl { - url = "https://gogs.prunetwork.fr/jpierre03/gallery/archive/${version}.tar.gz"; + src = fetchgit { + url = "https://gogs.prunetwork.fr/jpierre03/gallery.git"; sha256 = "1cynmrz2npabm42hv5m52wa85wfpdxljmkjv4k57ilq8xmr6xxgv"; }; diff --git a/gogs-jpierre03-gallery-TAG.nix b/gogs-jpierre03-gallery-TAG.nix new file mode 100644 index 0000000..d62853c --- /dev/null +++ b/gogs-jpierre03-gallery-TAG.nix @@ -0,0 +1,23 @@ +with import {}; + +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 " ]; + platforms = platforms.linux; + }; +} diff --git a/gogs-jpierre03-homepage-MASTER.nix b/gogs-jpierre03-homepage-MASTER.nix new file mode 100644 index 0000000..33a9875 --- /dev/null +++ b/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 {}; + +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 " ]; + platforms = platforms.linux; + }; +} diff --git a/gogs-jpierre03-homepage.nix b/gogs-jpierre03-homepage-TAG.nix similarity index 100% rename from gogs-jpierre03-homepage.nix rename to gogs-jpierre03-homepage-TAG.nix diff --git a/gogs-openlayer-MASTER.nix b/gogs-openlayer-MASTER.nix new file mode 100644 index 0000000..8115a50 --- /dev/null +++ b/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 {}; + +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 " ]; + platforms = platforms.linux; + }; +} diff --git a/gogs-openlayer.nix b/gogs-openlayer-TAG.nix similarity index 100% rename from gogs-openlayer.nix rename to gogs-openlayer-TAG.nix diff --git a/midipix.nix b/midipix.nix index e586c0c..2054ca9 100644 --- a/midipix.nix +++ b/midipix.nix @@ -2,7 +2,7 @@ with import {}; stdenv.mkDerivation rec { - name = "foo-${version}"; + name = "slibtool-${version}"; version = "2016-07-13"; src = fetchgit { url = "git://midipix.org/slibtool"; diff --git a/random.nix b/random.nix index 69f5a62..6155fee 100644 --- a/random.nix +++ b/random.nix @@ -6,19 +6,15 @@ with import {}; stdenv.mkDerivation rec { version = "master"; name = "random-${version}"; - #builder = ./builder.sh; - src = fetchurl { - url = "https://gogs.prunetwork.fr/jpierre03/random/archive/${version}.tar.gz"; - sha256 = "07n3j4iia93nxh3fkaslynqxyyl41v8whaz756zx6xw3hhqn5rja"; + src = fetchgit { + url = "https://gogs.prunetwork.fr/jpierre03/random.git"; + sha256 = "1izkzy852rjzlk3d9ndp3bklxc45gkwvpw0376x39flq1km0kyak"; }; buildInputs = [ gcc ]; - #buildPhase = "jekyll build"; - #installPhase = "cp -R _site \$out"; + buildPhase = "make build"; 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"; diff --git a/release.nix b/release.nix index b982a70..c0a3b28 100644 --- a/release.nix +++ b/release.nix @@ -5,17 +5,26 @@ with (import { inherit supportedSystems; }); { - jpierre03.gallery.MASTER = import ./gogs-jpierre03-gallery-MASTER.nix; - jpierre03.blog_r6d.tag = import ./github-r6d.nix; - jpierre03.blog_lothy_recette = import ./blog-lothy-recette.nix; - jpierre03.blog_sandbox = import ./blog-sandbox.nix; - jpierre03.gogs_jpierre03_homepage = import ./gogs-jpierre03-homepage.nix; - jpierre03.gogs_openlayer = import ./gogs-openlayer.nix; + jpierre03.blog_r6d.master = import ./github-r6d-MASTER.nix; + jpierre03.blog_r6d.tag = import ./github-r6d-TAG.nix; + jpierre03.gallery.master = import ./gogs-jpierre03-gallery-MASTER.nix; + jpierre03.gallery.tag = import ./gogs-jpierre03-gallery-TAG.nix; + jpierre03.gogs_jpierre03_homepage.master = import ./gogs-jpierre03-homepage-MASTER.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;