Skip to content

Commit

Permalink
Merge pull request #324696 from philiptaron/__attrsFailEvaluation/exc…
Browse files Browse the repository at this point in the history
…luded-attrnames-at-any-depth

Remove test-pkgs, buildPackages, and buildFreebsd from excluded-attrnames-at-any-depth
  • Loading branch information
infinisil authored Jul 27, 2024
2 parents 809f20b + 48d1364 commit ae53779
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
4 changes: 3 additions & 1 deletion pkgs/os-specific/bsd/freebsd/package-set.nix
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@ lib.packagesFromDirectoryRecursive {
patches = ./patches + "/${self.versionData.revision}";

# Keep the crawled portion of Nixpkgs finite.
buildFreebsd = lib.dontRecurseIntoAttrs buildFreebsd;
buildFreebsd = lib.dontRecurseIntoAttrs buildFreebsd // {
__attrsFailEvaluation = true;
};

ports = fetchzip {
url = "https://cgit.freebsd.org/ports/snapshot/ports-dde3b2b456c3a4bdd217d0bf3684231cc3724a0a.tar.gz";
Expand Down
5 changes: 0 additions & 5 deletions pkgs/top-level/release-attrpaths-superset.nix
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,6 @@ let
newScope = true;
scope = true;
pkgs = true;
test-pkgs = true;

buildPackages = true;
buildFreebsd = true;

callPackage = true;
mkDerivation = true;
overrideDerivation = true;
Expand Down

0 comments on commit ae53779

Please sign in to comment.