summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakob Kirsch <jakob.kirsch@web.de>2025-06-02 14:35:49 +0200
committerAndreas Enge <andreas@enge.fr>2025-06-02 14:37:35 +0200
commitfcee60c803c0117f95452bd42c025ee59767896c (patch)
treeb8191211237a933d66b53f8488ecde0f6d7ea617
parentc04bb04a393d6c7f8ef1b12ab4c8487919b419a6 (diff)
gnu: avogadrolibs: Update to 1.100.0.
* gnu/packages/chemistry.scm (avogadrolibs): Update to 1.100.0. [inputs]: Add qtsvg-5, avogadro-molecules, avogadro-crystals, avogadro-fragments. [arguments]<#:configure-flags>: Drop a flag. <#:phases>{'symlink}: New phase. Change-Id: I67e3c15db14e97394e6ef27a756c2b9dd951ad79 Signed-off-by: Andreas Enge <andreas@enge.fr>
-rw-r--r--gnu/packages/chemistry.scm69
1 files changed, 56 insertions, 13 deletions
diff --git a/gnu/packages/chemistry.scm b/gnu/packages/chemistry.scm
index db74a572aa..e42accfd47 100644
--- a/gnu/packages/chemistry.scm
+++ b/gnu/packages/chemistry.scm
@@ -73,7 +73,7 @@
(define-public avogadrolibs
(package
(name "avogadrolibs")
- (version "1.93.0")
+ (version "1.100.0")
(source
(origin
(method git-fetch)
@@ -81,7 +81,7 @@
(url "https://github.com/OpenChemistry/avogadrolibs")
(commit version)))
(sha256
- (base32 "1xivga626n5acnmwmym8svl0pdri8hkp59czf04ri2zflnviyh39"))
+ (base32 "1l9bp3ba8yx9mk2in5v375jzi1w4y7l1xl37xqv869810drgjffc"))
(file-name (git-file-name name version))))
(build-system cmake-build-system)
(native-inputs
@@ -91,18 +91,61 @@
pkg-config
pybind11))
(inputs
- (list glew
- libarchive
- libmsym
- molequeue
- python
- spglib
- qtbase-5))
+ `(("glew" ,glew)
+ ("libarchive" ,libarchive)
+ ("libmsym" ,libmsym)
+ ("molequeue" ,molequeue)
+ ("python" ,python)
+ ("spglib" ,spglib)
+ ("qtbase-5" ,qtbase-5)
+ ("qtsvg-5" ,qtsvg-5)
+ ("avogadro-molecules"
+ ,(origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/openchemistry/molecules")
+ (commit "8a37883")))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "00mfx0bwmqazbiklrvaijjd5n4wa5lp3z73291ihm78q0v9dzhl4"))))
+ ("avogadro-crystals"
+ ,(origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/openchemistry/crystals")
+ (commit "28404bd")))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0kcz99q5nfl2v2qmm9cqnbb2c2qqzw79vsnv557i7x64bxsxrw1m"))))
+ ("avogadro-fragments"
+ ,(origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/openchemistry/fragments")
+ (commit "c4943b5")))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "17l6qmkc25wb0nvic708l25fxiy89b3vfs0x5d40qcnn27bid32n"))))))
(arguments
- '(#:configure-flags (list "-DENABLE_TESTING=ON"
- (string-append "-DSPGLIB_INCLUDE_DIR="
- (assoc-ref %build-inputs "spglib")
- "/include"))))
+ (list
+ #:configure-flags #~(list "-DENABLE_TESTING=ON")
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'symlink
+ (lambda _
+ (begin
+ (symlink (assoc-ref %build-inputs "avogadro-molecules")
+ "../molecules")
+ (symlink (assoc-ref %build-inputs "avogadro-crystals")
+ "../crystals")
+ (symlink (assoc-ref %build-inputs "avogadro-fragments")
+ "../fragments")))))))
(home-page "https://www.openchemistry.org/projects/avogadro2/")
(synopsis "Libraries for chemistry, bioinformatics, and related areas")
(description