X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=libs.nix;h=48787af10ef1295ed621092950635e9607aee678;hb=c58dcd70150d63e01dfe01adbb38244598e6a881;hp=630b139c2c60238ab81e6d6042e00c5be92f7101;hpb=fdf6f74d3221e3dad853898f296149baea0aa476;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/libs.nix b/libs.nix
index 630b139..48787af 100644
--- a/libs.nix
+++ b/libs.nix
@@ -2,16 +2,16 @@
 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;
@@ -36,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" }:
@@ -75,4 +79,4 @@ rec {
     }
   '';
 
-}
+} // (if builtins.pathExists ./lib/private then import ./lib/private else {})