1
1
mirror of https://github.com/nmattia/niv.git synced 2024-09-18 19:07:19 +03:00

Fix functionArgs issue on recent nixpkgs

This commit is contained in:
Nicolas Mattia 2019-09-23 13:42:58 +02:00
parent 7ba93e771f
commit a014fb3630

View File

@ -47,6 +47,10 @@ with rec
# annoyingly this means we have to specify them
fetchzip = { url, sha256 }@attrs: pkgs.fetchzip attrs;
# A wrapper around pkgs.fetchurl that has inspectable arguments,
# annoyingly this means we have to specify them
fetchurl = { url, sha256 }@attrs: pkgs.fetchurl attrs;
hasNixpkgsPath = (builtins.tryEval <nixpkgs>).success;
hasThisAsNixpkgsPath =
(builtins.tryEval <nixpkgs>).success && <nixpkgs> == ./.;
@ -71,7 +75,7 @@ with rec
in builtins.getAttr fetcherName {
"tarball" = fetchzip;
"builtin-tarball" = builtins_fetchTarball;
"file" = pkgs.fetchurl;
"file" = fetchurl;
"builtin-url" = builtins_fetchurl;
};
};