summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--release-combined.nix23
1 files changed, 15 insertions, 8 deletions
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 <nixpkgs> {}; in # urgh
-
-rec {
-
-  nixos = import ./release.nix {
+let
+  nixpkgs' = nixpkgs; # urgh
+
+  pkgs = import <nixpkgs> {};
+
+  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/pkgs/top-level/release.nix> {
+  nixpkgs = removeMaintainers (import <nixpkgs/pkgs/top-level/release.nix> {
     inherit officialRelease;
     nixpkgs = nixpkgs';
     # Only do Linux builds.
     supportedSystems = [ "x86_64-linux" "i686-linux" ];
-  };
+  });
 
   tested = pkgs.releaseTools.aggregate {
     name = "nixos-${nixos.tarball.version}";