Cache rolled back into default Re-enabled hexchen source caching

This commit is contained in:
kat witch 2021-08-18 02:41:01 +01:00
parent 83fb02ddc6
commit 072cc571f9
No known key found for this signature in database
GPG key ID: 1B477797DCA5EC72
2 changed files with 10 additions and 13 deletions

View file

@ -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;
}

View file

@ -6,7 +6,16 @@ let
# We want our overlaid lib. # We want our overlaid lib.
inherit (pkgs) lib; inherit (pkgs) lib;
# This is used for caching niv sources in CI. # 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. # This is used for the base path for nodeImport.
root = ./.; root = ./.;