From 7a1aa50908f8a509e9559142a55fe53ea74ddf6c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 14 Sep 2015 17:16:16 +0200 Subject: [PATCH] Rename OpenJDK expressions It's silly to have OpenJDK 7 in default.nix when it's not in fact the default. --- pkgs/development/compilers/openjdk/{default.nix => 7.nix} | 0 pkgs/development/compilers/openjdk/{openjdk8.nix => 8.nix} | 0 pkgs/top-level/all-packages.nix | 4 ++-- 3 files changed, 2 insertions(+), 2 deletions(-) rename pkgs/development/compilers/openjdk/{default.nix => 7.nix} (100%) rename pkgs/development/compilers/openjdk/{openjdk8.nix => 8.nix} (100%) diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/7.nix similarity index 100% rename from pkgs/development/compilers/openjdk/default.nix rename to pkgs/development/compilers/openjdk/7.nix diff --git a/pkgs/development/compilers/openjdk/openjdk8.nix b/pkgs/development/compilers/openjdk/8.nix similarity index 100% rename from pkgs/development/compilers/openjdk/openjdk8.nix rename to pkgs/development/compilers/openjdk/8.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6951b924ff7..f1d80727ed6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4137,13 +4137,13 @@ let openjdk-darwin = callPackage ../development/compilers/openjdk-darwin { }; - openjdk7 = callPackage ../development/compilers/openjdk { + openjdk7 = callPackage ../development/compilers/openjdk/7.nix { bootjdk = callPackage ../development/compilers/openjdk/bootstrap.nix { version = "7"; }; }; openjdk7_jdk = openjdk7 // { outputs = [ "out" ]; }; openjdk7_jre = openjdk7.jre // { outputs = [ "jre" ]; }; - openjdk8 = callPackage ../development/compilers/openjdk/openjdk8.nix { + openjdk8 = callPackage ../development/compilers/openjdk/8.nix { bootjdk = callPackage ../development/compilers/openjdk/bootstrap.nix { version = "8"; }; }; openjdk8_jdk = openjdk8 // { outputs = [ "out" ]; };