mirror of
https://github.com/gensokyo-zone/infrastructure.git
synced 2026-02-09 12:29:19 -08:00
Cache rolled back into default Re-enabled hexchen source caching
This commit is contained in:
parent
83fb02ddc6
commit
072cc571f9
2 changed files with 10 additions and 13 deletions
12
cache.nix
12
cache.nix
|
|
@ -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;
|
|
||||||
}
|
|
||||||
11
default.nix
11
default.nix
|
|
@ -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 = ./.;
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue