bb44abe563
This properly supports the `supportedSystems` and `limitedSupportedSystems` arguments of `release-combined.nix`. Previously, evaluation would fail if `x86_64-linux` was not part either of those, since the tested job always referenced the `x86_64-linux` nixos tests (which won't exist in an aarch64-only eval). Since the hydra configuration for the jobset`trunk-combined` has both `aarch64-linux` and `x86_64-linux` as supported systems, this will make aarch64 be part of the tested job on that jobset.
139 lines
6.6 KiB
Nix
139 lines
6.6 KiB
Nix
# This jobset defines the main NixOS channels (such as nixos-unstable
|
||
# and nixos-14.04). The channel is updated every time the ‘tested’ job
|
||
# succeeds, and all other jobs have finished (they may fail).
|
||
|
||
{ nixpkgs ? { outPath = (import ../lib).cleanSource ./..; revCount = 56789; shortRev = "gfedcba"; }
|
||
, stableBranch ? false
|
||
, supportedSystems ? [ "x86_64-linux" ]
|
||
, limitedSupportedSystems ? [ "i686-linux" "aarch64-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;
|
||
|
||
allSupportedNixpkgs = builtins.removeAttrs (removeMaintainers (import ../pkgs/top-level/release.nix {
|
||
supportedSystems = supportedSystems ++ limitedSupportedSystems;
|
||
nixpkgs = nixpkgsSrc;
|
||
})) [ "unstable" ];
|
||
|
||
in rec {
|
||
|
||
nixos = removeMaintainers (import ./release.nix {
|
||
inherit stableBranch;
|
||
supportedSystems = supportedSystems ++ limitedSupportedSystems;
|
||
nixpkgs = nixpkgsSrc;
|
||
});
|
||
|
||
nixpkgs = builtins.removeAttrs (removeMaintainers (import ../pkgs/top-level/release.nix {
|
||
inherit supportedSystems;
|
||
nixpkgs = nixpkgsSrc;
|
||
})) [ "unstable" ];
|
||
|
||
tested =
|
||
let
|
||
onFullSupported = x: map (system: "${x}.${system}") supportedSystems;
|
||
onAllSupported = x: map (system: "${x}.${system}") (supportedSystems ++ limitedSupportedSystems);
|
||
onSystems = systems: x: map (system: "${x}.${system}")
|
||
(pkgs.lib.intersectLists systems (supportedSystems ++ limitedSupportedSystems));
|
||
in pkgs.releaseTools.aggregate {
|
||
name = "nixos-${nixos.channel.version}";
|
||
meta = {
|
||
description = "Release-critical builds for the NixOS channel";
|
||
maintainers = with pkgs.lib.maintainers; [ eelco fpletz ];
|
||
};
|
||
constituents = pkgs.lib.concatLists [
|
||
[ "nixos.channel" ]
|
||
(onFullSupported "nixos.dummy")
|
||
(onAllSupported "nixos.iso_minimal")
|
||
(onSystems ["x86_64-linux"] "nixos.iso_plasma5")
|
||
(onFullSupported "nixos.manual")
|
||
(onSystems ["x86_64-linux"] "nixos.ova")
|
||
(onSystems ["aarch64-linux"] "nixos.sd_image")
|
||
(onSystems ["x86_64-linux"] "nixos.tests.boot.biosCdrom")
|
||
(onSystems ["x86_64-linux"] "nixos.tests.boot.biosUsb")
|
||
(onFullSupported "nixos.tests.boot-stage1")
|
||
(onSystems ["x86_64-linux"] "nixos.tests.boot.uefiCdrom")
|
||
(onSystems ["x86_64-linux"] "nixos.tests.boot.uefiUsb")
|
||
(onSystems ["x86_64-linux"] "nixos.tests.chromium")
|
||
(onFullSupported "nixos.tests.containers-imperative")
|
||
(onFullSupported "nixos.tests.containers-ip")
|
||
(onSystems ["x86_64-linux"] "nixos.tests.docker")
|
||
(onFullSupported "nixos.tests.ecryptfs")
|
||
(onFullSupported "nixos.tests.env")
|
||
(onFullSupported "nixos.tests.firefox-esr")
|
||
(onFullSupported "nixos.tests.firefox")
|
||
(onFullSupported "nixos.tests.firewall")
|
||
(onFullSupported "nixos.tests.fontconfig-default-fonts")
|
||
(onFullSupported "nixos.tests.gnome3")
|
||
(onFullSupported "nixos.tests.gnome3-xorg")
|
||
(onFullSupported "nixos.tests.hibernate")
|
||
(onFullSupported "nixos.tests.i3wm")
|
||
(onSystems ["x86_64-linux"] "nixos.tests.installer.btrfsSimple")
|
||
(onSystems ["x86_64-linux"] "nixos.tests.installer.btrfsSubvolDefault")
|
||
(onSystems ["x86_64-linux"] "nixos.tests.installer.btrfsSubvols")
|
||
(onSystems ["x86_64-linux"] "nixos.tests.installer.luksroot")
|
||
(onSystems ["x86_64-linux"] "nixos.tests.installer.lvm")
|
||
(onSystems ["x86_64-linux"] "nixos.tests.installer.separateBootFat")
|
||
(onSystems ["x86_64-linux"] "nixos.tests.installer.separateBoot")
|
||
(onSystems ["x86_64-linux"] "nixos.tests.installer.simpleLabels")
|
||
(onSystems ["x86_64-linux"] "nixos.tests.installer.simpleProvided")
|
||
(onSystems ["x86_64-linux"] "nixos.tests.installer.simpleUefiSystemdBoot")
|
||
(onSystems ["x86_64-linux"] "nixos.tests.installer.simple")
|
||
(onSystems ["x86_64-linux"] "nixos.tests.installer.swraid")
|
||
(onFullSupported "nixos.tests.ipv6")
|
||
(onFullSupported "nixos.tests.keymap.azerty")
|
||
(onFullSupported "nixos.tests.keymap.colemak")
|
||
(onFullSupported "nixos.tests.keymap.dvorak")
|
||
(onFullSupported "nixos.tests.keymap.dvp")
|
||
(onFullSupported "nixos.tests.keymap.neo")
|
||
(onFullSupported "nixos.tests.keymap.qwertz")
|
||
(onFullSupported "nixos.tests.lightdm")
|
||
(onFullSupported "nixos.tests.login")
|
||
(onFullSupported "nixos.tests.misc")
|
||
(onFullSupported "nixos.tests.mutableUsers")
|
||
(onFullSupported "nixos.tests.nat.firewall-conntrack")
|
||
(onFullSupported "nixos.tests.nat.firewall")
|
||
(onFullSupported "nixos.tests.nat.standalone")
|
||
(onFullSupported "nixos.tests.networking.scripted.bond")
|
||
(onFullSupported "nixos.tests.networking.scripted.bridge")
|
||
(onFullSupported "nixos.tests.networking.scripted.dhcpOneIf")
|
||
(onFullSupported "nixos.tests.networking.scripted.dhcpSimple")
|
||
(onFullSupported "nixos.tests.networking.scripted.loopback")
|
||
(onFullSupported "nixos.tests.networking.scripted.macvlan")
|
||
(onFullSupported "nixos.tests.networking.scripted.sit")
|
||
(onFullSupported "nixos.tests.networking.scripted.static")
|
||
(onFullSupported "nixos.tests.networking.scripted.vlan")
|
||
(onFullSupported "nixos.tests.nfs3.simple")
|
||
(onFullSupported "nixos.tests.nfs4.simple")
|
||
(onFullSupported "nixos.tests.openssh")
|
||
(onFullSupported "nixos.tests.pantheon")
|
||
(onFullSupported "nixos.tests.php.fpm")
|
||
(onFullSupported "nixos.tests.php.pcre")
|
||
(onFullSupported "nixos.tests.plasma5")
|
||
(onFullSupported "nixos.tests.predictable-interface-names.predictableNetworkd")
|
||
(onFullSupported "nixos.tests.predictable-interface-names.predictable")
|
||
(onFullSupported "nixos.tests.predictable-interface-names.unpredictableNetworkd")
|
||
(onFullSupported "nixos.tests.predictable-interface-names.unpredictable")
|
||
(onFullSupported "nixos.tests.printing")
|
||
(onFullSupported "nixos.tests.proxy")
|
||
(onFullSupported "nixos.tests.sddm.default")
|
||
(onFullSupported "nixos.tests.simple")
|
||
(onFullSupported "nixos.tests.switchTest")
|
||
(onFullSupported "nixos.tests.udisks2")
|
||
(onFullSupported "nixos.tests.xfce")
|
||
(onSystems ["i686-linux"] "nixos.tests.zfs.installer")
|
||
(onFullSupported "nixpkgs.emacs")
|
||
(onFullSupported "nixpkgs.jdk")
|
||
["nixpkgs.tarball"]
|
||
];
|
||
};
|
||
}
|