From 41922081c46affe616a1d71978e72bcbaf55eb6a Mon Sep 17 00:00:00 2001
From: Jean-Pierre PRUNARET <jean-pierre+git@prunetwork.fr>
Date: Sat, 22 Oct 2016 17:19:31 +0200
Subject: [PATCH] nsp

---
 blog-gallery.nix | 26 ++++++++++++++----------
 release.nix      | 52 +++++++++++++++++++-----------------------------
 2 files changed, 36 insertions(+), 42 deletions(-)

diff --git a/blog-gallery.nix b/blog-gallery.nix
index b8b6e24..fc70f50 100644
--- a/blog-gallery.nix
+++ b/blog-gallery.nix
@@ -1,20 +1,24 @@
 with import <nixpkgs> {};
 
+let
+  versionName = "2016-10-22-v1";
+in
+
 stdenv.mkDerivation rec {
   name = "blog-gallery-${version}";
 
   #version = "MASTER";
   #  src = fetchTarball {
-  #  url = "https://gogs.prunetwork.fr/jpierre03/gallery/archive/master.tar.gz";
-  #};
+    #  url = "https://gogs.prunetwork.fr/jpierre03/gallery/archive/master.tar.gz";
+    #};
 
-  version = "2016-10-22-v1";
-  src = fetchurl {
-    url = "https://gogs.prunetwork.fr/jpierre03/gallery/archive/${version}.tar.gz";
-    sha256 = "0i44mp1w2p8v3yssa4c8xz59ga74dcxq96lkznyxr8np6hwdiyx1";
-  };
+    version = versionName;
+    src = fetchurl {
+      url = "https://gogs.prunetwork.fr/jpierre03/gallery/archive/${version}.tar.gz";
+      sha256 = "0i44mp1w2p8v3yssa4c8xz59ga74dcxq96lkznyxr8np6hwdiyx1";
+    };
 
-  buildInputs = [ jekyll ];
-  buildPhase = "jekyll build";
-  installPhase = "cp -R _site \$out";
-}
+    buildInputs = [ jekyll ];
+    buildPhase = "jekyll build";
+    installPhase = "cp -R _site \$out";
+  }
diff --git a/release.nix b/release.nix
index bb40440..6efc16d 100644
--- a/release.nix
+++ b/release.nix
@@ -1,33 +1,23 @@
-{ nixpkgs ? <nixpkgs>
-#, systems ? [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]
-, systems ? [ "x86_64-linux" ]
+{
+  supportedSystems ? ["i686-linux" "x86_64-linux"]
 }:
 
-let
-  pkgs = import nixpkgs {};
-
-  version = "2016-10-22-v1";
-
-  jobset = import ./blog-gallery.nix {
-    inherit pkgs;
-    system = builtins.currentSystem;
-  };
-in
-  rec {
-    inherit (jobset) tarball;
-
-    package = pkgs.lib.genAttrs systems (system:
-    (import ./blog-gallery.nix {
-      pkgs = import nixpkgs { inherit system; };
-      inherit system;
-    }).package
-    );
-
-    release = pkgs.releaseTools.aggregate {
-      name = "perso-${version}";
-      constituents = [
-        tarball
-      ]
-      ++ map (system: builtins.getAttr system package) systems;
-    };
-  }
+with import ./blog-gallery.nix;
+with (import <nixpkgs/pkgs/top-level/release-lib.nix> { inherit supportedSystems; });
+
+{
+
+  # Simply assign a derivation to an attribute to have it built.
+  hello_world_1 = pkgs_x86_64_linux.hello;
+
+  # 'hydraJob' strips all non-essential attributes.
+  hello_world_2 = pkgs.lib.hydraJob pkgs_x86_64_linux.hello;
+
+  blog_gallery;
+
+} // mapTestOn {
+
+  # Fancy shortcut to generate one attribute per supported platform.
+  hello = supportedSystems;
+
+}