diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-09-14 17:16:16 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-09-14 18:28:48 +0200 |
| commit | 7a1aa50908f8a509e9559142a55fe53ea74ddf6c (patch) | |
| tree | 07e375a92c2740aeb42ffc5737ef5919616b9c29 /pkgs | |
| parent | f16eea1867418a8f375b8124a812928092827277 (diff) | |
| download | nixlib-7a1aa50908f8a509e9559142a55fe53ea74ddf6c.tar nixlib-7a1aa50908f8a509e9559142a55fe53ea74ddf6c.tar.gz nixlib-7a1aa50908f8a509e9559142a55fe53ea74ddf6c.tar.bz2 nixlib-7a1aa50908f8a509e9559142a55fe53ea74ddf6c.tar.lz nixlib-7a1aa50908f8a509e9559142a55fe53ea74ddf6c.tar.xz nixlib-7a1aa50908f8a509e9559142a55fe53ea74ddf6c.tar.zst nixlib-7a1aa50908f8a509e9559142a55fe53ea74ddf6c.zip | |
Rename OpenJDK expressions
It's silly to have OpenJDK 7 in default.nix when it's not in fact the default.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/compilers/openjdk/7.nix (renamed from pkgs/development/compilers/openjdk/default.nix) | 0 | ||||
| -rw-r--r-- | pkgs/development/compilers/openjdk/8.nix (renamed from pkgs/development/compilers/openjdk/openjdk8.nix) | 0 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
3 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/7.nix index 19dec917bf82..19dec917bf82 100644 --- a/pkgs/development/compilers/openjdk/default.nix +++ b/pkgs/development/compilers/openjdk/7.nix diff --git a/pkgs/development/compilers/openjdk/openjdk8.nix b/pkgs/development/compilers/openjdk/8.nix index 8afa770cdb27..8afa770cdb27 100644 --- a/pkgs/development/compilers/openjdk/openjdk8.nix +++ b/pkgs/development/compilers/openjdk/8.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6951b924ff74..f1d80727ed6c 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" ]; }; |