X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=libs.nix;h=2ddfcbb59d48598cf8a82c0c8a42b3d45a0015b0;hb=5145061e9b679ea1e5d2709d22d0ee53467fed15;hp=a9e1e78f01d4f74bd9e177299ea5a3b1d5ed322d;hpb=596e62a678366c83ea8204316c45e91e1d90b0d8;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/libs.nix b/libs.nix
index a9e1e78..2ddfcbb 100644
--- a/libs.nix
+++ b/libs.nix
@@ -1,6 +1,17 @@
-{ nixpkgs }:
-with nixpkgs;
+{ pkgs }:
+with pkgs;
 rec {
+  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;
@@ -46,5 +57,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 {})