X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FConfig%2FNix.git;a=blobdiff_plain;f=libs.nix;h=2ddfcbb59d48598cf8a82c0c8a42b3d45a0015b0;hp=981039ec2d1b354e43da3fca3d6f9ce349f44f9b;hb=5145061e9b679ea1e5d2709d22d0ee53467fed15;hpb=167b81657d696e91545cedde172e7859643bba06

diff --git a/libs.nix b/libs.nix
index 981039e..2ddfcbb 100644
--- a/libs.nix
+++ b/libs.nix
@@ -1,17 +1,17 @@
-{ nixpkgs }:
-with nixpkgs;
+{ pkgs }:
+with pkgs;
 rec {
   yarn2nixPackage = let
-    src = fetchFromGitHub {
-      owner = "moretea";
-      repo = "yarn2nix";
+    src = builtins.fetchGit {
+      url = "git://github.com/moretea/yarn2nix.git";
+      ref = "master";
       rev = "780e33a07fd821e09ab5b05223ddb4ca15ac663f";
-      sha256 = "1f83cr9qgk95g3571ps644rvgfzv2i4i7532q8pg405s4q5ada3h";
-      fetchSubmodules = true;
     };
   in
     (callPackage src {}) // { inherit src; };
 
+  nodeEnv = import ./lib/node-env.nix;
+
   fetchedGithub = path:
     let
       json = lib.importJSON path;
@@ -57,4 +57,22 @@ rec {
         makeWrapper "$f" "$out" ${toString args}
       '';
 
-}
+  # 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 {})