From 48d1364929a0f3baa91f16f1fb94a619e8a696b5 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Thu, 4 Jul 2024 15:47:45 -0700 Subject: [PATCH] Remove buildFreebsd from excluded-attrnames-at-any-depth --- pkgs/os-specific/bsd/freebsd/package-set.nix | 4 +++- pkgs/top-level/release-attrpaths-superset.nix | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/bsd/freebsd/package-set.nix b/pkgs/os-specific/bsd/freebsd/package-set.nix index e9f45ed64c709dc..b222bc362f40b0d 100644 --- a/pkgs/os-specific/bsd/freebsd/package-set.nix +++ b/pkgs/os-specific/bsd/freebsd/package-set.nix @@ -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"; diff --git a/pkgs/top-level/release-attrpaths-superset.nix b/pkgs/top-level/release-attrpaths-superset.nix index 7a2b04169f4ddd2..913cf0e6d7bf696 100644 --- a/pkgs/top-level/release-attrpaths-superset.nix +++ b/pkgs/top-level/release-attrpaths-superset.nix @@ -75,7 +75,6 @@ let newScope = true; scope = true; pkgs = true; - buildFreebsd = true; callPackage = true; mkDerivation = true; overrideDerivation = true;