From a774bc36805e3701161f64a51c1917de76468ead Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 6 Jan 2025 19:02:00 +0200 Subject: [PATCH 1/3] swt: 4.33 -> 4.34 Unfortunately it seems https://github.com/eclipse-platform/eclipse.platform.swt/pull/1482 is still not part of this release. --- pkgs/by-name/sw/swt/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/sw/swt/package.nix b/pkgs/by-name/sw/swt/package.nix index b06eaa9ab08c..8c43aea736f0 100644 --- a/pkgs/by-name/sw/swt/package.nix +++ b/pkgs/by-name/sw/swt/package.nix @@ -11,16 +11,16 @@ stdenv.mkDerivation (finalAttrs: { pname = "swt"; - version = "4.33"; - fullVersion = "${finalAttrs.version}-202409030240"; + version = "4.34"; + fullVersion = "${finalAttrs.version}-202411201800"; hardeningDisable = [ "format" ]; passthru.srcMetadataByPlatform = { x86_64-linux.platform = "gtk-linux-x86_64"; - x86_64-linux.hash = "sha256-0OUr+jpwTx5/eoA6Uo2E9/SBAtf+IMMiSVRhOfaWFhE="; + x86_64-linux.hash = "sha256-lKAB2aCI3dZdt3pE7uSvSfxc8vc3oMSTCx5R+71Aqdk="; x86_64-darwin.platform = "cocoa-macosx-x86_64"; - x86_64-darwin.hash = "sha256-n948C/YPF55WPYvub3re/wARLP1Wk+XhJiIuI0YQH5c="; + x86_64-darwin.hash = "sha256-Uns3fMoetbZAIrL/N0eVd42/3uygXakDdxpaxf5SWDI="; }; passthru.srcMetadata = finalAttrs.passthru.srcMetadataByPlatform.${stdenv.hostPlatform.system} or null; From cb5d943e5ff630cc2d03bc8c81d768aaf781e41e Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 6 Jan 2025 19:41:09 +0200 Subject: [PATCH 2/3] swt: fix link to upstream GTK4 tracking issue --- pkgs/by-name/sw/swt/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sw/swt/package.nix b/pkgs/by-name/sw/swt/package.nix index 8c43aea736f0..75b6c994da35 100644 --- a/pkgs/by-name/sw/swt/package.nix +++ b/pkgs/by-name/sw/swt/package.nix @@ -63,8 +63,8 @@ stdenv.mkDerivation (finalAttrs: { AWT_LIB_PATH = "${jdk}/lib/openjdk/lib"; # Used by the makefile which is responsible for the shared objects only OUTPUT_DIR = "${placeholder "out"}/lib"; - # GTK4 is not supported yet. Waiting for: - # https://github.com/eclipse-platform/eclipse.platform.swt/pull/1482 + # GTK4 is not supported yet. See: + # https://github.com/eclipse-platform/eclipse.platform.swt/issues/652 makeFlags = "gtk3"; preBuild = '' cd library From 07d943c46f4a7c9d7b91bf2faf6aff8d576afa48 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Tue, 7 Jan 2025 13:04:19 +0200 Subject: [PATCH 3/3] swt_jdk8: remove --- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index ec91cde37c60..eb0c0728d352 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1282,6 +1282,7 @@ mapAliases { swig4 = swig; # Added 2024-09-12 swigWithJava = throw "swigWithJava has been removed as the main swig package has supported Java since 2009"; # Added 2024-09-12 swtpm-tpm2 = throw "'swtpm-tpm2' has been renamed to/replaced by 'swtpm'"; # Converted to throw 2024-10-17 + swt_jdk8 = throw "'swt_jdk8' has been removed due to being unused and broken for a long time"; # Added 2025-01-07 Sylk = sylk; # Added 2024-06-12 symbiyosys = sby; # Added 2024-08-18 sync = taler-sync; # Added 2024-09-04 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b0e2a02f70d7..7f427d8591a7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11062,10 +11062,6 @@ with pkgs; saxon_11-he saxon_12-he; - swt_jdk8 = callPackage ../by-name/sw/swt/package.nix { - jdk = jdk8; - }; - ### DEVELOPMENT / LIBRARIES / JAVASCRIPT ### DEVELOPMENT / BOWER MODULES (JAVASCRIPT)