Use filesets to improve caching

This commit is contained in:
Alex David 2026-01-28 13:06:37 -08:00
commit a06fc7d27f
2 changed files with 25 additions and 4 deletions

View file

@ -8,7 +8,10 @@
pkgs = import nixpkgs { system = "x86_64-linux"; }; pkgs = import nixpkgs { system = "x86_64-linux"; };
lib = pkgs.lib; lib = pkgs.lib;
haskellPackages = pkgs.haskell.packages.ghc912; haskellPackages = pkgs.haskell.packages.ghc912;
cabal2nix = haskellPackages.callCabal2nix "jail-nix-tests" ./. { }; cabal2nix = haskellPackages.callCabal2nix "jail-nix-tests" (lib.fileset.toSource {
root = ./.;
fileset = ./jail-nix-tests.cabal;
}) { };
testDependencies = [ testDependencies = [
(haskellPackages.ghc.withPackages (p: cabal2nix.buildInputs)) (haskellPackages.ghc.withPackages (p: cabal2nix.buildInputs))
pkgs.cabal-install pkgs.cabal-install
@ -43,7 +46,18 @@
${ ${
lib.pipe lib.pipe
{ {
jail-nix = ../.; jail-nix =
with lib.fileset;
toSource {
root = ../.;
fileset = difference ../. (unions [
../.build.yml
../LICENSE
../README.md
../tests
../website
]);
};
nixpkgs = nixpkgs; nixpkgs = nixpkgs;
} }
[ [

View file

@ -19,11 +19,18 @@
}; };
}; };
docsFileSet =
with lib.fileset;
toSource {
root = ../.;
fileset = ../lib;
};
formatCombinatorDoc = formatCombinatorDoc =
name: combinatorObj: name: combinatorObj:
let let
attrPos = builtins.unsafeGetAttrPos "impl" combinatorObj; attrPos = builtins.unsafeGetAttrPos "impl" combinatorObj;
file = lib.removePrefix (toString ./..) attrPos.file; file = lib.removePrefix (toString docsFileSet) attrPos.file;
in in
'' ''
### ${name} ### ${name}
@ -37,7 +44,7 @@
combinatorDocs = combinatorDocs =
let let
allCombinators = allCombinators =
(import ../lib/combinators.nix pkgs (throw "Docs must not depend on jail arg")).docs; (import (docsFileSet + /lib/combinators.nix) pkgs (throw "Docs must not depend on jail arg")).docs;
formatSection = formatSection =
filter: filter: