lix-project/flake-compat
16
0
Fork 0
Code Issues 13 Pull requests Packages Projects Releases Wiki Activity

Handle non-flake inputs

Browse source
This commit is contained in:
Eelco Dolstra 2020-03-14 14:48:23 +01:00
parent 59f787c31c
commit 123f9a83cb
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
default.nix
View file

@ -12,7 +12,7 @@ let
lockFile = builtins.fromJSON (builtins.readFile (src + "/flake.lock")); lockFile = builtins.fromJSON (builtins.readFile (src + "/flake.lock"));
fetchTree = fetchTree =
{ info, inputs, original, locked }: { info, locked, ... }:
if locked.type == "github" then if locked.type == "github" then
{ outPath = fetchTarball "https://api.github.com/repos/${locked.owner}/${locked.repo}/tarball/${locked.rev}"; { outPath = fetchTarball "https://api.github.com/repos/${locked.owner}/${locked.repo}/tarball/${locked.rev}";
rev = locked.rev; rev = locked.rev;
@ -28,7 +28,10 @@ let
let let
flake = import (flakeSrc + "/flake.nix"); flake = import (flakeSrc + "/flake.nix");
inputs = builtins.mapAttrs (n: v: callFlake (fetchTree v) v.inputs) locks; inputs = builtins.mapAttrs (n: v:
if v.flake or true
then callFlake (fetchTree v) v.inputs
else fetchTree v) locks;
outputs = flakeSrc // (flake.outputs (inputs // {self = outputs;})); outputs = flakeSrc // (flake.outputs (inputs // {self = outputs;}));
in in