X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=libs.nix;h=48787af10ef1295ed621092950635e9607aee678;hb=d823e010d653a6bf33ff232da5f90103be7515b8;hp=0b5e0c1ab8bdbd41331412d768e2b466fd91ed3c;hpb=7636abc6bfcdca34d4b90a144365235012275339;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/libs.nix b/libs.nix
index 0b5e0c1..48787af 100644
--- a/libs.nix
+++ b/libs.nix
@@ -1,14 +1,17 @@
-let nixpkgs_unstable = import (builtins.fetchTarball {
-  # FIXME: upgrade to nixpkgs 19 when stable and stick to stable
-  # versions
-  name = "nixos-unstable-2018-12-08";
-  url = https://github.com/nixos/nixpkgs/archive/61c3169a0e17d789c566d5b241bfe309ce4a6275.tar.gz;
-  sha256 = "0qbycg7wkb71v20rchlkafrjfpbk2fnlvvbh3ai9pyfisci5wxvq";
-}) {};
-in
-  with nixpkgs_unstable;
+{ pkgs }:
+with pkgs;
 rec {
-  inherit nixpkgs_unstable;
+  yarn2nixPackage = let
+    src = builtins.fetchGit {
+      url = "git://github.com/moretea/yarn2nix.git";
+      ref = "master";
+      rev = "780e33a07fd821e09ab5b05223ddb4ca15ac663f";
+    };
+  in
+    (callPackage src {}) // { inherit src; };
+
+  nodeEnv = import ./lib/node-env.nix;
+
   fetchedGithub = path:
     let
       json = lib.importJSON path;
@@ -33,7 +36,11 @@ rec {
     in rec {
       version = json.tag;
       name = "${json.meta.name}-${version}";
-      src = fetchgitPrivate json.git;
+      src = builtins.fetchGit {
+        url = json.git.url;
+        ref = "master";
+        rev = json.git.rev;
+      };
     };
 
   wrap = { paths ? [], vars ? {}, file ? null, script ? null, name ? "wrap" }:
@@ -54,5 +61,22 @@ rec {
         makeWrapper "$f" "$out" ${toString args}
       '';
 
-  yarn2nixPackage = callPackage (fetchedGithub ./fetched/yarn2nix.json).src {};
-}
+  # This adds header colors to the builds, but it rebuilds the whole
+  # world from scratch, so only use it to debug!
+  # add it as postHook in derivations
+  immaePostHook = ''
+    header() {
+      echo -ne "\033[1;36m"
+      echo -n "$1"
+      echo -e "\033[0m"
+    }
+
+    echoCmd() {
+      printf "\033[1;34m%s:\033[0m" "$1"
+      shift
+      printf ' %q' "$@"
+      echo
+    }
+  '';
+
+} // (if builtins.pathExists ./lib/private then import ./lib/private else {})