94205f5f21
This reverts commit 469f22d717e53c48d13a66ca862942e8098accc5, reversing changes made to 0078bc5d8f87512104902eab00c8a44bef286067. Conflicts: nixos/modules/installer/tools/nixos-generate-config.pl nixos/modules/system/boot/loader/grub/install-grub.pl nixos/release.nix nixos/tests/installer.nix I tried to keep apparently-safe code in conflicts.
74 lines
2.1 KiB
Nix
74 lines
2.1 KiB
Nix
{ nixpkgs ? { outPath = ./..; revCount = 56789; shortRev = "gfedcba"; }
|
|
, stableBranch ? false
|
|
, supportedSystems ? [ "x86_64-linux" "i686-linux" ]
|
|
}:
|
|
|
|
let
|
|
|
|
nixpkgsSrc = nixpkgs; # urgh
|
|
|
|
pkgs = import ./.. {};
|
|
|
|
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 stableBranch;
|
|
nixpkgs = nixpkgsSrc;
|
|
});
|
|
|
|
nixpkgs = builtins.removeAttrs (removeMaintainers (import ../pkgs/top-level/release.nix {
|
|
inherit supportedSystems;
|
|
nixpkgs = nixpkgsSrc;
|
|
})) [ "unstable" ];
|
|
|
|
tested = pkgs.releaseTools.aggregate {
|
|
name = "nixos-${nixos.channel.version}";
|
|
meta = {
|
|
description = "Release-critical builds for the NixOS unstable channel";
|
|
maintainers = [ pkgs.lib.maintainers.eelco pkgs.lib.maintainers.shlevy ];
|
|
};
|
|
constituents =
|
|
let all = x: [ x.x86_64-linux x.i686-linux ]; in
|
|
[ nixos.channel
|
|
(all nixos.manual)
|
|
|
|
(all nixos.iso_minimal)
|
|
(all nixos.iso_graphical)
|
|
(all nixos.ova)
|
|
|
|
#(all nixos.tests.efi-installer.simple)
|
|
#(all nixos.tests.containers)
|
|
(all nixos.tests.firefox)
|
|
(all nixos.tests.firewall)
|
|
(all nixos.tests.gnome3)
|
|
#(all nixos.tests.installer.efi)
|
|
(all nixos.tests.installer.grub1)
|
|
(all nixos.tests.installer.lvm)
|
|
(all nixos.tests.installer.separateBoot)
|
|
(all nixos.tests.installer.simple)
|
|
(all nixos.tests.ipv6)
|
|
(all nixos.tests.kde4)
|
|
(all nixos.tests.login)
|
|
(all nixos.tests.misc)
|
|
(all nixos.tests.nat)
|
|
(all nixos.tests.nfs3)
|
|
(all nixos.tests.openssh)
|
|
(all nixos.tests.printing)
|
|
(all nixos.tests.proxy)
|
|
(all nixos.tests.simple)
|
|
(all nixos.tests.udisks2)
|
|
(all nixos.tests.xfce)
|
|
|
|
nixpkgs.tarball
|
|
(all nixpkgs.emacs)
|
|
];
|
|
};
|
|
|
|
}
|