Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a1d4a77ca710
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 68cf3df2a662
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Nov 1, 2018

  1. oraclejdk: remove version 10

    @taku0 @fpletz
    taku0 authored and fpletz committed Nov 1, 2018
    Copy the full SHA
    15692e6 View commit details

  2. Merge pull request #47375 from taku0/remove_oraclejdk_10 

    oraclejdk: remove version 10
    @fpletz
    fpletz authored Nov 1, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    68cf3df View commit details
Showing with 0 additions and 165 deletions.
  1. +0 −156 pkgs/development/compilers/oraclejdk/jdk10-linux.nix
  2. +0 −9 pkgs/top-level/all-packages.nix
156 changes: 0 additions & 156 deletions pkgs/development/compilers/oraclejdk/jdk10-linux.nix
View file

This file was deleted.

9 changes: 0 additions & 9 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -7029,18 +7029,12 @@ with pkgs;

oraclejdk8psu = pkgs.oraclejdk8psu_distro true false;

oraclejdk10 = pkgs.oraclejdk10distro "JDK" false;

oraclejre = lowPrio (pkgs.jdkdistro false false);

oraclejre8 = lowPrio (pkgs.oraclejdk8distro false false);

oraclejre8psu = lowPrio (pkgs.oraclejdk8psu_distro false false);

oraclejre10 = lowPrio (pkgs.oraclejdk10distro "JRE" false);

oracleserverjre10 = lowPrio (pkgs.oraclejdk10distro "ServerJRE" false);

jrePlugin = jre8Plugin;

jre8Plugin = lowPrio (pkgs.oraclejdk8distro false true);
@@ -7055,9 +7049,6 @@ with pkgs;
(if pluginSupport then appendToName "with-plugin" else x: x)
(callPackage ../development/compilers/oraclejdk/jdk8psu-linux.nix { inherit installjdk pluginSupport; });

oraclejdk10distro = packageType: _:
(callPackage ../development/compilers/oraclejdk/jdk10-linux.nix { inherit packageType; });

javacard-devkit = pkgsi686Linux.callPackage ../development/compilers/javacard-devkit { };

jikes = callPackage ../development/compilers/jikes { };