summary refs log tree commit diff
path: root/nixos/release-small.nix
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2020-02-20 04:01:13 +0000
committerAlyssa Ross <hi@alyssa.is>2020-02-20 04:02:05 +0000
commit515d3cfa24df96c9e134ac5b87c2396f81354551 (patch)
tree5e67ec19079d3b44ada0c0ac88ccd411ac22070f /nixos/release-small.nix
parent372bd003cd2d95a181ccd069322d2229f72acd8a (diff)
parent7bdc103ac8424e08f02f6e9344979d0a821caa62 (diff)
downloadnixpkgs-515d3cfa24df96c9e134ac5b87c2396f81354551.tar
nixpkgs-515d3cfa24df96c9e134ac5b87c2396f81354551.tar.gz
nixpkgs-515d3cfa24df96c9e134ac5b87c2396f81354551.tar.bz2
nixpkgs-515d3cfa24df96c9e134ac5b87c2396f81354551.tar.lz
nixpkgs-515d3cfa24df96c9e134ac5b87c2396f81354551.tar.xz
nixpkgs-515d3cfa24df96c9e134ac5b87c2396f81354551.tar.zst
nixpkgs-515d3cfa24df96c9e134ac5b87c2396f81354551.zip
Merge remote-tracking branch 'nixpkgs/master' into master
Diffstat (limited to 'nixos/release-small.nix')
-rw-r--r--nixos/release-small.nix38
1 files changed, 31 insertions, 7 deletions
diff --git a/nixos/release-small.nix b/nixos/release-small.nix
index 74c16e990f3..7b86a91357e 100644
--- a/nixos/release-small.nix
+++ b/nixos/release-small.nix
@@ -82,18 +82,42 @@ in rec {
       vim;
   };
 
-  tested = lib.hydraJob (pkgs.releaseTools.aggregate {
+  tested = pkgs.releaseTools.aggregate {
     name = "nixos-${nixos.channel.version}";
     meta = {
       description = "Release-critical builds for the NixOS channel";
       maintainers = [ lib.maintainers.eelco ];
     };
     constituents =
-      let all = x: map (system: x.${system}) supportedSystems; in
-      [ nixpkgs.tarball
-        (all nixpkgs.jdk)
-      ]
-      ++ lib.collect lib.isDerivation nixos;
-  });
+      [ "nixos.channel"
+        "nixos.dummy.x86_64-linux"
+        "nixos.iso_minimal.x86_64-linux"
+        "nixos.manual.x86_64-linux"
+        "nixos.tests.boot.biosCdrom.x86_64-linux"
+        "nixos.tests.containers-imperative.x86_64-linux"
+        "nixos.tests.containers-ip.x86_64-linux"
+        "nixos.tests.firewall.x86_64-linux"
+        "nixos.tests.installer.lvm.x86_64-linux"
+        "nixos.tests.installer.separateBoot.x86_64-linux"
+        "nixos.tests.installer.simple.x86_64-linux"
+        "nixos.tests.ipv6.x86_64-linux"
+        "nixos.tests.login.x86_64-linux"
+        "nixos.tests.misc.x86_64-linux"
+        "nixos.tests.nat.firewall-conntrack.x86_64-linux"
+        "nixos.tests.nat.firewall.x86_64-linux"
+        "nixos.tests.nat.standalone.x86_64-linux"
+        "nixos.tests.nfs3.simple.x86_64-linux"
+        "nixos.tests.openssh.x86_64-linux"
+        "nixos.tests.php-pcre.x86_64-linux"
+        "nixos.tests.predictable-interface-names.predictable.x86_64-linux"
+        "nixos.tests.predictable-interface-names.predictableNetworkd.x86_64-linux"
+        "nixos.tests.predictable-interface-names.unpredictable.x86_64-linux"
+        "nixos.tests.predictable-interface-names.unpredictableNetworkd.x86_64-linux"
+        "nixos.tests.proxy.x86_64-linux"
+        "nixos.tests.simple.x86_64-linux"
+        "nixpkgs.jdk.x86_64-linux"
+        "nixpkgs.tarball"
+      ];
+  };
 
 }