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

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