From 94491ad9fc1f784d44f4cff567aeffba6fd98d7a Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Thu, 1 Dec 2022 16:52:14 +0000 Subject: [PATCH 1/7] openjdk11: disable JavaFX by default Since openjfk11 depends on python2 (EOL). --- pkgs/development/compilers/openjdk/11.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/openjdk/11.nix b/pkgs/development/compilers/openjdk/11.nix index 820469ab8f15..95abb373272c 100644 --- a/pkgs/development/compilers/openjdk/11.nix +++ b/pkgs/development/compilers/openjdk/11.nix @@ -4,7 +4,8 @@ , libXcursor, libXrandr, fontconfig, openjdk11-bootstrap , setJavaClassPath , headless ? false -, enableJavaFX ? openjfx.meta.available, openjfx +# disabled by default since openjfx11 depends on python2 (EOL) +, enableJavaFX ? false, openjfx , enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf }: From 76f20f79c69c2e3717791298395f7ad9a271d8f7 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Thu, 1 Dec 2022 16:52:53 +0000 Subject: [PATCH 2/7] openjdk12: disable JavaFX by default Since openjfk11 depends on python2 (EOL). --- pkgs/development/compilers/openjdk/12.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/openjdk/12.nix b/pkgs/development/compilers/openjdk/12.nix index a8de9fe43ffc..60100a5ecc16 100644 --- a/pkgs/development/compilers/openjdk/12.nix +++ b/pkgs/development/compilers/openjdk/12.nix @@ -4,7 +4,8 @@ , libXcursor, libXrandr, fontconfig, openjdk11, fetchpatch , setJavaClassPath , headless ? false -, enableJavaFX ? openjfx.meta.available, openjfx +# disabled by default since openjfx11 depends on python2 (EOL) +, enableJavaFX ? false, openjfx , enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf }: From f24ea1f792444f5a312647fef6f95b5e509c0d9f Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Thu, 1 Dec 2022 16:53:08 +0000 Subject: [PATCH 3/7] openjdk13: disable JavaFX by default Since openjfk11 depends on python2 (EOL). --- pkgs/development/compilers/openjdk/13.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/openjdk/13.nix b/pkgs/development/compilers/openjdk/13.nix index 5b7e87b0ef3a..68a0a9fa7007 100644 --- a/pkgs/development/compilers/openjdk/13.nix +++ b/pkgs/development/compilers/openjdk/13.nix @@ -4,7 +4,8 @@ , libXcursor, libXrandr, fontconfig, openjdk13-bootstrap, fetchpatch , setJavaClassPath , headless ? false -, enableJavaFX ? openjfx.meta.available, openjfx +# disabled by default since openjfx11 depends on python2 (EOL) +, enableJavaFX ? false, openjfx , enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf }: From d57353e122a4b4c6ec3d09932195e41f21380554 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Thu, 1 Dec 2022 16:53:25 +0000 Subject: [PATCH 4/7] openjdk14: disable JavaFX by default Since openjfk11 depends on python2 (EOL). --- pkgs/development/compilers/openjdk/14.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/openjdk/14.nix b/pkgs/development/compilers/openjdk/14.nix index 1381b0995a76..37c3a6a3de3a 100644 --- a/pkgs/development/compilers/openjdk/14.nix +++ b/pkgs/development/compilers/openjdk/14.nix @@ -4,7 +4,8 @@ , libXcursor, libXrandr, fontconfig, openjdk14-bootstrap , setJavaClassPath , headless ? false -, enableJavaFX ? openjfx.meta.available, openjfx +# disabled by default since openjfx11 depends on python2 (EOL) +, enableJavaFX ? false, openjfx , enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf }: From c9ba8b002f10b3995a41684f1ade3663d8d8c2f4 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Thu, 1 Dec 2022 20:52:59 +0000 Subject: [PATCH 5/7] bisq-desktop: enableJavaFX in openjdk11 input --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dd2356a81471..0bd01cc0e648 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2783,7 +2783,9 @@ with pkgs; bcachefs-tools = callPackage ../tools/filesystems/bcachefs-tools { }; - bisq-desktop = callPackage ../applications/blockchains/bisq-desktop { }; + bisq-desktop = callPackage ../applications/blockchains/bisq-desktop { + openjdk11 = openjdk11.override { enableJavaFX = true; }; + }; bic = callPackage ../development/interpreters/bic { }; From 4f72a0257b976b9772d66a16d785166439f8eb07 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Thu, 1 Dec 2022 21:04:11 +0000 Subject: [PATCH 6/7] charles4: pass `--user-agent` to `curlOptsList` --- pkgs/applications/networking/charles/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/charles/default.nix b/pkgs/applications/networking/charles/default.nix index 66ec0a7c7b47..f7749946f42e 100644 --- a/pkgs/applications/networking/charles/default.nix +++ b/pkgs/applications/networking/charles/default.nix @@ -34,6 +34,7 @@ let src = fetchurl { url = "https://www.charlesproxy.com/assets/release/${version}/charles-proxy-${version}${platform}.tar.gz"; + curlOptsList = [ "--user-agent" "Mozilla/5.0" ]; # HTTP 104 otherwise inherit sha256; }; nativeBuildInputs = [ makeWrapper ]; From 7d7e8155f1a824a52e89e0b2d5a5c33691d49df7 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Thu, 1 Dec 2022 21:27:53 +0000 Subject: [PATCH 7/7] conduktor: update sha256 --- pkgs/applications/misc/conduktor/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/conduktor/default.nix b/pkgs/applications/misc/conduktor/default.nix index 32d9e527dd49..6eb0e832bc95 100644 --- a/pkgs/applications/misc/conduktor/default.nix +++ b/pkgs/applications/misc/conduktor/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/conduktor/builds/releases/download/v${version}/Conduktor-linux-${version}.zip"; - sha256 = "1kr5yh9piqbl6njsnxgh6jzf3vifw8ja5x4qm4znmzi3r49sw0gx"; + sha256 = "sha256-9y/7jni5zIITUWd75AxsfG/b5vCYotmeMeC9aYM2WEs="; }; nativeBuildInputs = [ makeWrapper copyDesktopItems ];