From 4c0e44c34c84cd4d4764e9b48206b463d2fbef5a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 14 Jul 2015 16:01:46 +0200
Subject: [PATCH] Make OpenJDK release-critical

Currently there are no tests that depend on the JDK. Since we don't
want a release with a broken JDK, make it an explicit dependency of
the "tested" jobs.
---
 nixos/release-combined.nix | 1 +
 nixos/release-small.nix    | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index 2d2976ea5b7c..52a1dcf99325 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -90,6 +90,7 @@ in rec {
 
         nixpkgs.tarball
         (all nixpkgs.emacs)
+        (all nixpkgs.jdk)
       ];
   });
 
diff --git a/nixos/release-small.nix b/nixos/release-small.nix
index 11155c853696..8e53064f99d0 100644
--- a/nixos/release-small.nix
+++ b/nixos/release-small.nix
@@ -87,7 +87,10 @@ in rec {
     };
     constituents =
       let all = x: map (system: x.${system}) supportedSystems; in
-      [ nixpkgs.tarball ] ++ lib.collect lib.isDerivation nixos;
+      [ nixpkgs.tarball
+        (all nixpkgs.jdk)
+      ]
+      ++ lib.collect lib.isDerivation nixos;
   });
 
 }