From 510ed22d749529f685318766737a4be75e6fe32c Mon Sep 17 00:00:00 2001 From: Phillip Seeber Date: Fri, 8 Oct 2021 14:25:52 +0200 Subject: [PATCH 1/4] avogadrolibs: 1.94.0 -> 1.95.1 --- .../libraries/science/chemistry/avogadrolibs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix b/pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix index 1130f5c44e70..b7f5f5f6d90e 100644 --- a/pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix +++ b/pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix @@ -21,13 +21,13 @@ let in stdenv.mkDerivation rec { pname = "avogadrolibs"; - version = "1.94.0"; + version = "1.95.1"; src = fetchFromGitHub { owner = "OpenChemistry"; repo = pname; rev = version; - sha256 = "6bChJhqrjOxeEWZBNToq3JExHPu7DUMsEHWBDe75zAo="; + sha256 = "0zzVg8xNqFwDrK8gRkDm3tRgBt7fD4K3Uy/ajUBc+eQ="; }; postUnpack = '' From 181689dfea3cbf41ec616e012b9ee5c172d3213f Mon Sep 17 00:00:00 2001 From: Phillip Seeber Date: Fri, 8 Oct 2021 14:26:19 +0200 Subject: [PATCH 2/4] avogadro2: 1.94.0 -> 1.95.1 --- pkgs/applications/science/chemistry/avogadro2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/chemistry/avogadro2/default.nix b/pkgs/applications/science/chemistry/avogadro2/default.nix index 437123faafd8..6cf599030f9c 100644 --- a/pkgs/applications/science/chemistry/avogadro2/default.nix +++ b/pkgs/applications/science/chemistry/avogadro2/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "avogadro2"; - version = "1.94.0"; + version = "1.95.1"; src = fetchFromGitHub { owner = "OpenChemistry"; repo = "avogadroapp"; rev = version; - sha256 = "6RaiX23YUMfTYAuSighcLGGlJtqeydNgi3PWGF77Jp8="; + sha256 = "9GnsxQsMuik6CPDmJbJPF0/+LXbZHf/JLevpSsMEoP0="; }; nativeBuildInputs = [ cmake wrapQtAppsHook ]; From 1ce86034714cbe493ea7be45e77d17706302d50d Mon Sep 17 00:00:00 2001 From: Phillip Seeber Date: Fri, 8 Oct 2021 14:26:42 +0200 Subject: [PATCH 3/4] libmsym: fixing homepage --- .../development/libraries/science/chemistry/libmsym/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/science/chemistry/libmsym/default.nix b/pkgs/development/libraries/science/chemistry/libmsym/default.nix index 8c605f3e07d4..fdcf7d00e3ba 100644 --- a/pkgs/development/libraries/science/chemistry/libmsym/default.nix +++ b/pkgs/development/libraries/science/chemistry/libmsym/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = " molecular point group symmetry lib"; - homepage = "https://github.com/rcsb/mmtf-cpp"; + homepage = "https://github.com/mcodev31/libmsym"; license = licenses.mit; platforms = platforms.linux; maintainers = [ maintainers.sheepforce ]; From aa02e7f8280f93199e2adb6d36a8fa5f3163bca0 Mon Sep 17 00:00:00 2001 From: Phillip Seeber Date: Fri, 8 Oct 2021 14:43:13 +0200 Subject: [PATCH 4/4] avogadro2: initialise a translation repo --- .../science/chemistry/avogadro2/default.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/science/chemistry/avogadro2/default.nix b/pkgs/applications/science/chemistry/avogadro2/default.nix index 6cf599030f9c..6931c8621c96 100644 --- a/pkgs/applications/science/chemistry/avogadro2/default.nix +++ b/pkgs/applications/science/chemistry/avogadro2/default.nix @@ -2,7 +2,15 @@ , openbabel, qttools, wrapQtAppsHook }: -stdenv.mkDerivation rec { +let + avogadroI18N = fetchFromGitHub { + owner = "OpenChemistry"; + repo = "avogadro-i18n"; + rev = "3b8a86cc37e988b043d1503d2f11068389b0aca3"; + sha256 = "9wLY7/EJyIZYnlUAMsViCwD5kGc1vCNbk8vUhb90LMQ="; + }; + +in stdenv.mkDerivation rec { pname = "avogadro2"; version = "1.95.1"; @@ -13,6 +21,10 @@ stdenv.mkDerivation rec { sha256 = "9GnsxQsMuik6CPDmJbJPF0/+LXbZHf/JLevpSsMEoP0="; }; + postUnpack = '' + cp -r ${avogadroI18N} avogadro-i18n + ''; + nativeBuildInputs = [ cmake wrapQtAppsHook ]; buildInputs = [