From e897f6b071acad68b04510f1af689b3a726aa5a7 Mon Sep 17 00:00:00 2001
From: Nicolas Benes <nbenes.gh@xandea.de>
Date: Sat, 20 Jul 2024 01:56:04 +0200
Subject: [PATCH] dataexplorer: 3.8.5 -> 3.9.0, move to by-name
---
.../da/dataexplorer/package.nix} | 13 +++++++------
pkgs/top-level/all-packages.nix | 5 -----
2 files changed, 7 insertions(+), 11 deletions(-)
rename pkgs/{applications/science/electronics/dataexplorer/default.nix => by-name/da/dataexplorer/package.nix} (89%)
diff --git a/pkgs/applications/science/electronics/dataexplorer/default.nix b/pkgs/by-name/da/dataexplorer/package.nix
similarity index 89%
rename from pkgs/applications/science/electronics/dataexplorer/default.nix
rename to pkgs/by-name/da/dataexplorer/package.nix
index 224d804ee1f6..4ee2b0a0e81a 100644
--- a/pkgs/applications/science/electronics/dataexplorer/default.nix
+++ b/pkgs/by-name/da/dataexplorer/package.nix
@@ -2,23 +2,24 @@
, stdenv
, fetchurl
, ant
-, jdk
+# executable fails to start for jdk > 17
+, jdk17
, makeWrapper
, strip-nondeterminism
}:
stdenv.mkDerivation (finalAttrs: {
pname = "dataexplorer";
- version = "3.8.5";
+ version = "3.9.0";
src = fetchurl {
url = "mirror://savannah/dataexplorer/dataexplorer-${finalAttrs.version}-src.tar.gz";
- hash = "sha256-b68xIZNbzHdPyZwLngcnjcoBtI6AeTdrblz/qx/HbGQ=";
+ hash = "sha256-MQAnLCkcs3r8/2j4zYaMC/JM8nBCEvqHKk8lv+7b9KE=";
};
nativeBuildInputs = [
ant
- jdk
+ jdk17
makeWrapper
strip-nondeterminism
];
@@ -44,11 +45,11 @@ stdenv.mkDerivation (finalAttrs: {
# but it hardcodes bash shebang and does not pin the java path.
# So we create our own wrapper, using similar cmdline args as upstream.
mkdir -p $out/bin
- makeWrapper ${jdk}/bin/java $out/bin/DataExplorer \
+ makeWrapper ${jdk17}/bin/java $out/bin/DataExplorer \
--add-flags "-Xms64m -Xmx3092m -jar $out/share/DataExplorer/DataExplorer.jar" \
--set SWT_GTK3 0
- makeWrapper ${jdk}/bin/java $out/bin/DevicePropertiesEditor \
+ makeWrapper ${jdk17}/bin/java $out/bin/DevicePropertiesEditor \
--add-flags "-Xms32m -Xmx512m -classpath $out/share/DataExplorer/DataExplorer.jar gde.ui.dialog.edit.DevicePropertiesEditor" \
--set SWT_GTK3 0 \
--set LIBOVERLAY_SCROLLBAR 0
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b2018bdc1ec2..5b88cbbb61ef 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -38163,11 +38163,6 @@ with pkgs;
csxcad = callPackage ../applications/science/electronics/csxcad { };
- dataexplorer = callPackage ../applications/science/electronics/dataexplorer {
- # executable fails at startup for jdk > 17
- jdk = jdk17;
- };
-
degate = libsForQt5.callPackage ../applications/science/electronics/degate { };
diylc = callPackage ../applications/science/electronics/diylc { };