diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-01-25 12:01:19 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-25 12:01:19 +0000 |
| commit | 8c2ba7797a3965c48947f07d46039934b9a85a73 (patch) | |
| tree | 53dab92f5fa32045fff8951b82348e5132071291 /pkgs/applications/science/chemistry | |
| parent | 1f37e33af51568e615afc93e5d4047bc52b92358 (diff) | |
| parent | 6d11e88fed7c5c1e375f2293f3e842ff895d9ffd (diff) | |
| download | nixlib-8c2ba7797a3965c48947f07d46039934b9a85a73.tar nixlib-8c2ba7797a3965c48947f07d46039934b9a85a73.tar.gz nixlib-8c2ba7797a3965c48947f07d46039934b9a85a73.tar.bz2 nixlib-8c2ba7797a3965c48947f07d46039934b9a85a73.tar.lz nixlib-8c2ba7797a3965c48947f07d46039934b9a85a73.tar.xz nixlib-8c2ba7797a3965c48947f07d46039934b9a85a73.tar.zst nixlib-8c2ba7797a3965c48947f07d46039934b9a85a73.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/science/chemistry')
| -rw-r--r-- | pkgs/applications/science/chemistry/marvin/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/science/chemistry/marvin/default.nix b/pkgs/applications/science/chemistry/marvin/default.nix index 5f08bebd47fc..090c252bb82c 100644 --- a/pkgs/applications/science/chemistry/marvin/default.nix +++ b/pkgs/applications/science/chemistry/marvin/default.nix @@ -1,15 +1,15 @@ -{ lib, stdenv, fetchurl, dpkg, makeWrapper, coreutils, gawk, gnugrep, gnused, jre }: +{ lib, stdenv, fetchurl, dpkg, makeWrapper, coreutils, gawk, gnugrep, gnused, openjdk17 }: with lib; stdenv.mkDerivation rec { pname = "marvin"; - version = "23.12.0"; + version = "23.17.0"; src = fetchurl { name = "marvin-${version}.deb"; url = "http://dl.chemaxon.com/marvin/${version}/marvin_linux_${versions.majorMinor version}.deb"; - hash = "sha256-5ycOteXcdgZaeDl3WQ95H2lD0OnnobCbmnVlfYwVdeI="; + hash = "sha256-zE/9EaOsNJwzE4Doasm9N8QG4t7wDOxqpV/Nhc4p7Ws="; }; nativeBuildInputs = [ dpkg makeWrapper ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { installPhase = '' wrapBin() { makeWrapper $1 $out/bin/$(basename $1) \ - --set INSTALL4J_JAVA_HOME "${jre}" \ + --set INSTALL4J_JAVA_HOME "${openjdk17}" \ --prefix PATH : ${makeBinPath [ coreutils gawk gnugrep gnused ]} } cp -r opt $out |