diff --git a/cache.nix b/cache.nix deleted file mode 100644 index 22a2cc49..00000000 --- a/cache.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ lib, sources }: - -with lib; let - getSources = sources: removeAttrs sources [ "__functor" ]; #"dorkfiles" ]; - source2drv = value: if isDerivation value.outPath then value.outPath else value; - sources2drvs = sources: mapAttrs (_: source2drv) (getSources sources); -in recurseIntoAttrs rec { - local = sources2drvs sources; - #hexchen = sources2drvs (import sources.hexchen {}).sources; - all = attrValues local; #++ attrValues hexchen; - allStr = toString all; - } diff --git a/default.nix b/default.nix index 97f67bfe..12b0ba9e 100644 --- a/default.nix +++ b/default.nix @@ -6,7 +6,16 @@ let # We want our overlaid lib. inherit (pkgs) lib; # This is used for caching niv sources in CI. - sourceCache = import ./cache.nix { inherit sources lib; }; + sourceCache = with lib; let + getSources = sources: removeAttrs sources [ "__functor" "dorkfiles" ]; + source2drv = value: if isDerivation value.outPath then value.outPath else value; + sources2drvs = sources: mapAttrs (_: source2drv) (getSources sources); + in recurseIntoAttrs rec { + local = sources2drvs sources; + hexchen = sources2drvs (import sources.hexchen {}).sources; + all = attrValues local ++ attrValues hexchen; + allStr = toString all; + }; # This is used for the base path for nodeImport. root = ./.;