From 4437752e3976722ba0e998c3e28c4cdc49ae31e5 Mon Sep 17 00:00:00 2001 From: Benjamin Asbach Date: Tue, 24 Nov 2020 21:16:04 +0100 Subject: [PATCH 1/2] netbeans: 12.1 -> 12.2 --- pkgs/applications/editors/netbeans/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/netbeans/default.nix b/pkgs/applications/editors/netbeans/default.nix index 718b1b8dcb61..a83bea7ed8d7 100644 --- a/pkgs/applications/editors/netbeans/default.nix +++ b/pkgs/applications/editors/netbeans/default.nix @@ -3,7 +3,7 @@ }: let - version = "12.1"; + version = "12.2"; 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 = "ad4bb5b191c784ed144b0b4831a8b95e0707c362917833c279d3f6fad11d7b3fb1f004f30121a941b694fc2ce323974b15072aa31cb5449111bc5d33d0d77103"; + sha512 = "b25cda9830e8fe1d05687b08cc5fa9bcac7e8e6d12776998a4da7e483b3be0d04493345e56be7e6198fa8f86428d57d4459bfa7372c2e3f918f4a1101d0a31a7"; }; buildCommand = '' From a9616e521f6dadad15cc07747595679848ab2495 Mon Sep 17 00:00:00 2001 From: Benjamin Asbach Date: Tue, 8 Dec 2020 01:08:27 +0100 Subject: [PATCH 2/2] netbeans: remove windows binaries before copying package to output --- pkgs/applications/editors/netbeans/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/editors/netbeans/default.nix b/pkgs/applications/editors/netbeans/default.nix index a83bea7ed8d7..eb4698c69d6f 100644 --- a/pkgs/applications/editors/netbeans/default.nix +++ b/pkgs/applications/editors/netbeans/default.nix @@ -27,6 +27,8 @@ stdenv.mkDerivation { unzip $src patchShebangs . + rm netbeans/bin/*.exe + # Copy to installation directory and create a wrapper capable of starting # it. mkdir -pv $out/bin