X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FConfig%2FNix.git;a=blobdiff_plain;f=lib%2Fdefault.nix;h=7b392f1de44e14d10d4be8e73f693260fb8b3bbc;hp=86832d47fa868749d28b4076cf591e42b533bb12;hb=ce95026934c4ea8c647365f68eb195459fcdff08;hpb=0b3f9cb9fde5929f361e91f6ed5b43958665f3d5 diff --git a/lib/default.nix b/lib/default.nix index 86832d4..7b392f1 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -1,15 +1,7 @@ { 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; }; - + flakeCompat = import ./flake-compat.nix; nodeEnv = import ./node-env.nix; fetchedGithub = path: @@ -21,28 +13,4 @@ rec { name = "${pname}-${version}"; src = fetchFromGitHub json.github; }; - - fetchedGit = path: - let - json = lib.importJSON path; - in rec { - version = json.tag; - pname = json.meta.name; - name = "${pname}-${version}"; - src = fetchgit json.git; - }; - - fetchedGitPrivate = path: - let - json = lib.importJSON path; - in rec { - version = json.tag; - pname = json.meta.name; - name = "${pname}-${version}"; - src = builtins.fetchGit { - url = json.git.url; - ref = "master"; - rev = json.git.rev; - }; - }; } // (if builtins.pathExists ./private then callPackage ./private {} else {})