Skip to content

Commit bbd652b

Browse files
Expand coqPackages filter list
1 parent be26122 commit bbd652b

2 files changed

Lines changed: 5 additions & 3 deletions

File tree

nix/build-packages.nix

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,8 @@ in
8181
(attrName:
8282
let
8383
derv = lib.getAttrFromPath attrName pkgs;
84-
pkg = mkPackage attrName derv;
84+
# uncomment to figure out which exact package caused an eval error
85+
pkg = /* lib.trace "${lib.concatStringsSep "." attrName}" */ mkPackage attrName derv;
8586
# tryEval (deepSeq ...) makes sure we catch all potential throws in all attributes early on
8687
# NOTE: running deepSeq on any derivation results in an infinite recursion due to stdenv.passthru generating a warning
8788
pkgEvalResult = builtins.tryEval (builtins.deepSeq pkg pkg);

nix/list-packages.nix

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,9 @@ let
2727
|| name == "ghcHEAD"
2828
# ... or binary variants
2929
|| (lib.hasPrefix "ghc" name && lib.hasSuffix "Binary" name)
30-
# coqPackages_X_X re-exports all packages, including packages that do not eval that version
31-
|| (attrPrefix != [ ] && lib.hasPrefix "coqPackages" (lib.head attrPrefix) && name == "coqPackages")
30+
# coqPackages_X_X/rocqPackages_X_X re-exports all packages, including packages that do not eval for that version
31+
|| (attrPrefix != [ ] && lib.hasPrefix "coqPackages" (lib.head attrPrefix) && (name == "coqPackages" || name == "rocqPackages"))
32+
|| (attrPrefix != [ ] && lib.hasPrefix "rocqPackages" (lib.head attrPrefix) && name == "rocqPackages")
3233
# qt exposes sources under srcs
3334
|| name == "srcs"
3435
# broken since buildPython* supports "finalAttrs"-pattern

0 commit comments

Comments
 (0)