diff --git a/release-combined.nix b/release-combined.nix index dbd56b18524..5efd8f36fa8 100644 --- a/release-combined.nix +++ b/release-combined.nix @@ -3,21 +3,28 @@ , officialRelease ? false }: -let nixpkgs' = nixpkgs; pkgs = import {}; in # urgh +let + nixpkgs' = nixpkgs; # urgh -rec { + pkgs = import {}; - nixos = import ./release.nix { + removeMaintainers = set: if builtins.isAttrs set + then if (set.type or "") == "derivation" + then set // { meta = builtins.removeAttrs (set.meta or {}) [ "maintainers" ]; } + else pkgs.lib.mapAttrs (n: v: removeMaintainers v) set + else set; +in rec { + nixos = removeMaintainers (import ./release.nix { inherit nixosSrc officialRelease; nixpkgs = nixpkgs'; - }; + }); - nixpkgs = import { + nixpkgs = removeMaintainers (import { inherit officialRelease; nixpkgs = nixpkgs'; # Only do Linux builds. supportedSystems = [ "x86_64-linux" "i686-linux" ]; - }; + }); tested = pkgs.releaseTools.aggregate { name = "nixos-${nixos.tarball.version}";