diff options
author | Vladimír Čunát <v@cunat.cz> | 2022-12-16 11:09:31 +0100 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2022-12-16 11:09:31 +0100 |
commit | e6cd929c5e28efb8bdbaf10abb360725a8e2374d (patch) | |
tree | 745e59ddaab726c1d2708bb70b7310185c0cefcb /pkgs/applications/science | |
parent | 629bca02bfb85a312f4c48ec6c0a3e3b781a0a74 (diff) | |
parent | d1f3bbdf616d13de54aef4572bcd1f1843db36aa (diff) |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/applications/science')
4 files changed, 22 insertions, 17 deletions
diff --git a/pkgs/applications/science/electronics/dataexplorer/default.nix b/pkgs/applications/science/electronics/dataexplorer/default.nix index 5745a43df26c6..9d06f614870aa 100644 --- a/pkgs/applications/science/electronics/dataexplorer/default.nix +++ b/pkgs/applications/science/electronics/dataexplorer/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "dataexplorer"; - version = "3.6.2"; + version = "3.7.3"; src = fetchurl { url = "mirror://savannah/dataexplorer/dataexplorer-${version}-src.tar.gz"; - sha256 = "sha256-2e8qeoJh7z/RIowMtAd8PGcMPck5H8iHqel6bW7EQ0E="; + sha256 = "sha256-cqvlPV4i9m0x3hbruC5y2APsyjfI5y9RT8XVzsDaT/Q="; }; nativeBuildInputs = [ ant makeWrapper ]; @@ -38,11 +38,11 @@ stdenv.mkDerivation rec { # So we create our own wrapper, using similar cmdline args as upstream. mkdir -p $out/bin makeWrapper ${jre}/bin/java $out/bin/DataExplorer \ - --add-flags "-Dfile.encoding=UTF-8 -Xms64m -Xmx3092m -jar $out/share/DataExplorer/DataExplorer.jar" \ + --add-flags "-Xms64m -Xmx3092m -jar $out/share/DataExplorer/DataExplorer.jar" \ --set SWT_GTK3 0 makeWrapper ${jre}/bin/java $out/bin/DevicePropertiesEditor \ - --add-flags "-Dfile.encoding=UTF-8 -Xms32m -Xmx512m -classpath $out/share/DataExplorer/DataExplorer.jar gde.ui.dialog.edit.DevicePropertiesEditor" \ + --add-flags "-Xms32m -Xmx512m -classpath $out/share/DataExplorer/DataExplorer.jar gde.ui.dialog.edit.DevicePropertiesEditor" \ --set SWT_GTK3 0 \ --set LIBOVERLAY_SCROLLBAR 0 @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { homepage = "https://www.nongnu.org/dataexplorer/index.html"; license = licenses.gpl3Plus; maintainers = with maintainers; [ panicgh ]; - platforms = jdk.meta.platforms; + platforms = [ "x86_64-linux" ]; sourceProvenance = with sourceTypes; [ fromSource binaryNativeCode # contains RXTXcomm (JNI library with *.so files) diff --git a/pkgs/applications/science/misc/boinc/default.nix b/pkgs/applications/science/misc/boinc/default.nix index 641e5a8997b5c..8dc19a57be54f 100644 --- a/pkgs/applications/science/misc/boinc/default.nix +++ b/pkgs/applications/science/misc/boinc/default.nix @@ -24,21 +24,16 @@ , libxcb }: -let - majorVersion = "7.20"; - minorVersion = "2"; -in - stdenv.mkDerivation rec { - version = "${majorVersion}.${minorVersion}"; pname = "boinc"; + version = "7.20.5"; src = fetchFromGitHub { name = "${pname}-${version}-src"; owner = "BOINC"; repo = "boinc"; - rev = "client_release/${majorVersion}/${version}"; - sha256 = "sha256-vMb5Vq/6I6lniG396wd7+FfslsByedMRPIpiItp1d1s="; + rev = "client_release/${lib.versions.majorMinor version}/${version}"; + hash = "sha256-KqD986Q7npKTnh0DdNgMHro+1M/UQHiNsXaRl9WjONw="; }; nativeBuildInputs = [ libtool automake autoconf m4 pkg-config ]; diff --git a/pkgs/applications/science/physics/crystfel/default.nix b/pkgs/applications/science/physics/crystfel/default.nix index 81c1fdd6b0549..74cc677963e3d 100644 --- a/pkgs/applications/science/physics/crystfel/default.nix +++ b/pkgs/applications/science/physics/crystfel/default.nix @@ -54,7 +54,7 @@ let # We hard-code this by providing a little patch and then passing the absolute path to syminfo.lib as a # preprocessor flag. preBuild = '' - makeFlagsArray+=(CFLAGS='-DNIX_PROVIDED_SYMOP_FILE=\"$out/share/syminfo.lib\"') + makeFlagsArray+=(CFLAGS='-DNIX_PROVIDED_SYMOP_FILE=\"${placeholder "out"}/share/syminfo.lib\"') export NIX_LDFLAGS="-L${gfortran.cc}/lib64 -L${gfortran.cc}/lib $NIX_LDFLAGS"; ''; makeFlags = [ "CFLAGS='-DNIX_PROVIDED_SYMOP_FILE=\"${placeholder "out"}/share/syminfo.lib\"" ]; diff --git a/pkgs/applications/science/physics/crystfel/libccp4-use-hardcoded-syminfo-lib.patch b/pkgs/applications/science/physics/crystfel/libccp4-use-hardcoded-syminfo-lib.patch index 9c5e1365492b8..1806d9b2b9dad 100644 --- a/pkgs/applications/science/physics/crystfel/libccp4-use-hardcoded-syminfo-lib.patch +++ b/pkgs/applications/science/physics/crystfel/libccp4-use-hardcoded-syminfo-lib.patch @@ -1,11 +1,12 @@ diff --git a/ccp4/csymlib.c b/ccp4/csymlib.c -index 76bc70b..7a0c5dc 100644 +index 76bc70b..3616121 100644 --- a/ccp4/csymlib.c +++ b/ccp4/csymlib.c -@@ -137,24 +137,7 @@ CCP4SPG *ccp4spg_load_spacegroup(const int numspg, const int ccp4numspg, +@@ -136,25 +136,7 @@ CCP4SPG *ccp4spg_load_spacegroup(const int numspg, const int ccp4numspg, + } } - /* Open the symop file: */ +- /* Open the symop file: */ - if (!(symopfile = getenv("SYMINFO"))) { - if (debug) - printf("Environment variable SYMINFO not set ... guessing location of symmetry file. \n"); @@ -28,3 +29,12 @@ index 76bc70b..7a0c5dc 100644 filein = fopen(symopfile,"r"); if (!filein) { +@@ -162,8 +144,6 @@ CCP4SPG *ccp4spg_load_spacegroup(const int numspg, const int ccp4numspg, + return NULL; + } + +- if (!(getenv("SYMINFO"))) free(symopfile); +- + parser = ccp4_parse_start(20); + if (parser == NULL) + ccp4_signal(CSYM_ERRNO(CSYMERR_ParserFail),"ccp4spg_load_spacegroup",NULL); |