From 4c577755a173f3d6af4be4cc418acf271aa25677 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 16 Nov 2025 16:12:02 +0200 Subject: [PATCH 1/7] swt: Use R- prefix in fullVersion --- 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 309ddba5a0e6..a2eda1c351bb 100644 --- a/pkgs/by-name/sw/swt/package.nix +++ b/pkgs/by-name/sw/swt/package.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "swt"; version = "4.34"; - fullVersion = "${finalAttrs.version}-202411201800"; + fullVersion = "R-${finalAttrs.version}-202411201800"; hardeningDisable = [ "format" ]; @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { in assert srcMetadata != null; fetchzip { - url = "https://archive.eclipse.org/eclipse/downloads/drops4/R-${finalAttrs.fullVersion}/swt-${finalAttrs.version}-${srcMetadata.platform}.zip"; + url = "https://archive.eclipse.org/eclipse/downloads/drops4/${finalAttrs.fullVersion}/swt-${finalAttrs.version}-${srcMetadata.platform}.zip"; inherit (srcMetadata) hash; stripRoot = false; postFetch = From b439ca11cd6db24abfecff35131e834f7ede9ea3 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 17 Nov 2025 14:26:04 +0200 Subject: [PATCH 2/7] swt: make it easier to override version --- pkgs/by-name/sw/swt/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sw/swt/package.nix b/pkgs/by-name/sw/swt/package.nix index a2eda1c351bb..490ba11aebd4 100644 --- a/pkgs/by-name/sw/swt/package.nix +++ b/pkgs/by-name/sw/swt/package.nix @@ -11,8 +11,10 @@ stdenv.mkDerivation (finalAttrs: { pname = "swt"; - version = "4.34"; - fullVersion = "R-${finalAttrs.version}-202411201800"; + # NOTE: In case you wish to override, don't override version, override + # `fullVersion`. + version = builtins.elemAt (lib.splitString "-" finalAttrs.fullVersion) 1; + fullVersion = "R-4.34-202411201800"; hardeningDisable = [ "format" ]; From fb000cfcb304fecebb3df8b932f28e76ab4a8a14 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 16 Nov 2025 16:12:45 +0200 Subject: [PATCH 3/7] swt: Use a better src.url schema --- pkgs/by-name/sw/swt/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/sw/swt/package.nix b/pkgs/by-name/sw/swt/package.nix index 490ba11aebd4..89aedb5562b4 100644 --- a/pkgs/by-name/sw/swt/package.nix +++ b/pkgs/by-name/sw/swt/package.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { in assert srcMetadata != null; fetchzip { - url = "https://archive.eclipse.org/eclipse/downloads/drops4/${finalAttrs.fullVersion}/swt-${finalAttrs.version}-${srcMetadata.platform}.zip"; + url = "https://download.eclipse.org/eclipse/downloads/drops4/${finalAttrs.fullVersion}/swt-${finalAttrs.version}-${srcMetadata.platform}.zip"; inherit (srcMetadata) hash; stripRoot = false; postFetch = From 5692827b91935006a413e6862298897e5b7eae6e Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Tue, 4 Nov 2025 11:35:57 +0200 Subject: [PATCH 4/7] tuxguitar: add meta.mainProgram Co-Authored-By: Mio --- pkgs/by-name/tu/tuxguitar/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/tu/tuxguitar/package.nix b/pkgs/by-name/tu/tuxguitar/package.nix index f5ea260fe73d..295f9087c631 100644 --- a/pkgs/by-name/tu/tuxguitar/package.nix +++ b/pkgs/by-name/tu/tuxguitar/package.nix @@ -78,5 +78,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.lgpl2; maintainers = with lib.maintainers; [ ardumont ]; platforms = [ "x86_64-linux" ]; + mainProgram = "tuxguitar"; }; }) From b89ec13fda8b2c867cbfaba54ae37cebbb51a6a4 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Tue, 4 Nov 2025 11:42:20 +0200 Subject: [PATCH 5/7] tuxguitar: update license Based upon GitHub license file: https://raw.githubusercontent.com/helge17/tuxguitar/1.6.6/LICENSE Co-Authored-By: Mio --- pkgs/by-name/tu/tuxguitar/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/tu/tuxguitar/package.nix b/pkgs/by-name/tu/tuxguitar/package.nix index 295f9087c631..6fcf73980277 100644 --- a/pkgs/by-name/tu/tuxguitar/package.nix +++ b/pkgs/by-name/tu/tuxguitar/package.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: { ''; homepage = "https://github.com/helge17/tuxguitar"; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; - license = lib.licenses.lgpl2; + license = lib.licenses.lgpl21Plus; maintainers = with lib.maintainers; [ ardumont ]; platforms = [ "x86_64-linux" ]; mainProgram = "tuxguitar"; From 04dd5c9aedf1033666c06be3e65b0270e698c5dc Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 19 Nov 2025 10:50:28 +0200 Subject: [PATCH 6/7] swt: mark as broken on x86_64-darwin https://github.com/NixOS/nixpkgs/pull/462254#issuecomment-3548376678 --- pkgs/by-name/sw/swt/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/sw/swt/package.nix b/pkgs/by-name/sw/swt/package.nix index 89aedb5562b4..e1b3e1ae9a77 100644 --- a/pkgs/by-name/sw/swt/package.nix +++ b/pkgs/by-name/sw/swt/package.nix @@ -145,5 +145,7 @@ stdenv.mkDerivation (finalAttrs: { ]; maintainers = [ ]; platforms = lib.attrNames finalAttrs.passthru.srcMetadataByPlatform; + # Fails with: `java.nio.file.NoSuchFileException: ../swt.jar` + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64; }; }) From 7be3e730fdbdc9e186553c46637c5c40e846ae69 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Tue, 13 Jan 2026 11:29:48 +0200 Subject: [PATCH 7/7] swt: add binaryNativeCode for Darwin Fixup to c26fd684d13e. --- pkgs/by-name/sw/swt/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/sw/swt/package.nix b/pkgs/by-name/sw/swt/package.nix index e1b3e1ae9a77..ba3f00e5e95a 100644 --- a/pkgs/by-name/sw/swt/package.nix +++ b/pkgs/by-name/sw/swt/package.nix @@ -144,6 +144,10 @@ stdenv.mkDerivation (finalAttrs: { mpl20 ]; maintainers = [ ]; + # The darwin src zip file holds simply a prebuilt swt.jar file + sourceProvenance = lib.optionals stdenv.hostPlatform.isDarwin [ + lib.sourceTypes.binaryNativeCode + ]; platforms = lib.attrNames finalAttrs.passthru.srcMetadataByPlatform; # Fails with: `java.nio.file.NoSuchFileException: ../swt.jar` broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64;