From 0c960262d159d3a884dadc3d4e4b131557dad116 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 2 Feb 2020 12:05:13 +0100 Subject: [PATCH] oraclejdk8: document removals in the release notes --- nixos/doc/manual/release-notes/rl-2003.xml | 6 ++++++ pkgs/top-level/aliases.nix | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml index 96774055b830..74cfbfc782ab 100644 --- a/nixos/doc/manual/release-notes/rl-2003.xml +++ b/nixos/doc/manual/release-notes/rl-2003.xml @@ -571,6 +571,12 @@ auth required pam_succeed_if.so uid >= 1000 quiet now Redis. + + + The *psu versions of oraclejdk8 have been removed + as they aren't provided by upstream anymore. + + diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c543af2405c3..c75efae1abba 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -557,4 +557,11 @@ mapAliases ({ clang_39 = llvm_4; clang_35 = llvm_4; clang_4 = llvm_4; + + /* Cleanup before 20.09 */ + oraclejdk8psu = throw '' + The *psu versions of oraclejdk aren't provided by upstream anymore and were therefore removed! + ''; + oraclejre8psu = oraclejdk8psu; + oraclejdk8psu_distro = oraclejdk8psu; })