diff options
| author | Daniël de Kok <me@danieldk.eu> | 2020-06-18 06:58:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-18 06:58:21 +0200 |
| commit | f3867b2a0d53ab28fcd9069a0f9bdfbc9e6a28fe (patch) | |
| tree | 569d8efb109dd56da1a0c47ab075092d89fce753 | |
| parent | d07451fb5cbc69da1ba0991b0760236ca315849e (diff) | |
| parent | 275a913971097f3b784a81706baaa4bf39e74bc7 (diff) | |
| download | nixlib-f3867b2a0d53ab28fcd9069a0f9bdfbc9e6a28fe.tar nixlib-f3867b2a0d53ab28fcd9069a0f9bdfbc9e6a28fe.tar.gz nixlib-f3867b2a0d53ab28fcd9069a0f9bdfbc9e6a28fe.tar.bz2 nixlib-f3867b2a0d53ab28fcd9069a0f9bdfbc9e6a28fe.tar.lz nixlib-f3867b2a0d53ab28fcd9069a0f9bdfbc9e6a28fe.tar.xz nixlib-f3867b2a0d53ab28fcd9069a0f9bdfbc9e6a28fe.tar.zst nixlib-f3867b2a0d53ab28fcd9069a0f9bdfbc9e6a28fe.zip | |
Merge pull request #89492 from asbachb/update-netbeans
netbeans: 11.3 -> 12.0
| -rw-r--r-- | nixos/doc/manual/release-notes/rl-2009.xml | 5 | ||||
| -rw-r--r-- | pkgs/applications/editors/netbeans/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
3 files changed, 10 insertions, 3 deletions
diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index 900b1103f2b1..9bbbecc05692 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -637,6 +637,11 @@ systemd.services.nginx.serviceConfig.ReadWritePaths = [ "/var/www" ]; }</programlisting> </para> </listitem> + <listitem> + <para> + <package>netbeans</package> was upgraded to 12.0 and now defaults to OpenJDK 11. This might cause problems if your projects depend on packages that were removed in Java 11. + </para> + </listitem> </itemizedlist> </section> </section> diff --git a/pkgs/applications/editors/netbeans/default.nix b/pkgs/applications/editors/netbeans/default.nix index b2a13e3db7cd..ecc3c058f702 100644 --- a/pkgs/applications/editors/netbeans/default.nix +++ b/pkgs/applications/editors/netbeans/default.nix @@ -3,7 +3,7 @@ }: let - version = "11.3"; + version = "12.0"; desktopItem = makeDesktopItem { name = "netbeans"; exec = "netbeans"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { inherit version; src = fetchurl { url = "mirror://apache/netbeans/netbeans/${version}/netbeans-${version}-bin.zip"; - sha512 = "ae828836138b5a4156d58df24dd4053be58018cb6b5beb179cb0f4cd8b5db72d2a7356a434d01157aacb78d228732950cf4e3a0b6c725da8e053b6ccd91075d6"; + sha512 = "91030c9628a08acd85f1a58a7f71eec2e57dc85841c1c475cc6311335b5d8cdc10c1198274b9668b7f61a28d04b07661247dc1c3e36b8e29214aec3748e499e4"; }; buildCommand = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 31c01fda93e7..24520d139e77 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21337,7 +21337,9 @@ in navit = libsForQt5.callPackage ../applications/misc/navit { }; - netbeans = callPackage ../applications/editors/netbeans { }; + netbeans = callPackage ../applications/editors/netbeans { + jdk = jdk11; + }; ncdu = callPackage ../tools/misc/ncdu { }; |