From 8deb9a06798b426169aba7a7342affe787ab5dd5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 25 Jan 2024 05:45:33 +0000 Subject: [PATCH 1/2] marvin: 23.12.0 -> 23.17.0 --- pkgs/applications/science/chemistry/marvin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/chemistry/marvin/default.nix b/pkgs/applications/science/chemistry/marvin/default.nix index 5f08bebd47fc..c8f1306c43f6 100644 --- a/pkgs/applications/science/chemistry/marvin/default.nix +++ b/pkgs/applications/science/chemistry/marvin/default.nix @@ -4,12 +4,12 @@ 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 ]; From 5c4784cd2f2a54288108019bb8f7466d7ca3171f Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 25 Jan 2024 08:59:41 +0100 Subject: [PATCH 2/2] marvin: pin openjdk17 --- pkgs/applications/science/chemistry/marvin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/chemistry/marvin/default.nix b/pkgs/applications/science/chemistry/marvin/default.nix index c8f1306c43f6..090c252bb82c 100644 --- a/pkgs/applications/science/chemistry/marvin/default.nix +++ b/pkgs/applications/science/chemistry/marvin/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, dpkg, makeWrapper, coreutils, gawk, gnugrep, gnused, jre }: +{ lib, stdenv, fetchurl, dpkg, makeWrapper, coreutils, gawk, gnugrep, gnused, openjdk17 }: with lib; @@ -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