diff options
author | Marius Bakke <mbakke@fastmail.com> | 2019-02-09 21:11:00 +0100 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2019-02-09 21:11:00 +0100 |
commit | ebbb7286b91e21cb26153e3d0a3ea8017cf16224 (patch) | |
tree | c41eccbe937b0541109cc3b2d45c372ebf826755 /gnu/packages/chemistry.scm | |
parent | d41f63942b5df85223f5fae110253bc30869653b (diff) | |
parent | aefa29123feaf4202010675eae0a563b3ee90cf1 (diff) | |
download | guix-patches-ebbb7286b91e21cb26153e3d0a3ea8017cf16224.tar guix-patches-ebbb7286b91e21cb26153e3d0a3ea8017cf16224.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/chemistry.scm')
-rw-r--r-- | gnu/packages/chemistry.scm | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/gnu/packages/chemistry.scm b/gnu/packages/chemistry.scm index a493af16f5..b6345b9d27 100644 --- a/gnu/packages/chemistry.scm +++ b/gnu/packages/chemistry.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2018 Konrad Hinsen <konrad.hinsen@fastmail.net> ;;; Copyright © 2018 Kei Kebreau <kkebreau@posteo.net> ;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -23,6 +24,7 @@ #:use-module (guix utils) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (gnu packages) #:use-module (gnu packages algebra) #:use-module (gnu packages boost) @@ -44,18 +46,19 @@ (package (name "avogadro") (version "1.2.0") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/cryos/avogadro/archive/" - version ".tar.gz")) - (sha256 - (base32 - "02v4h6hi1m7ilv0apdf74a8l1cm6dxnxyqp0rdaidrp3i9pf6lv4")) - (file-name (string-append name "-" version ".tar.gz")) - (patches - (search-patches "avogadro-eigen3-update.patch" - "avogadro-python-eigen-lib.patch" - "avogadro-boost148.patch")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/cryos/avogadro.git") + (commit version))) + (sha256 + (base32 "0258py3lkba85qhs5ynancinyym61vlp0zaq9yrfs3hhnhpzv9n2")) + (file-name (git-file-name name version)) + (patches + (search-patches "avogadro-eigen3-update.patch" + "avogadro-python-eigen-lib.patch" + "avogadro-boost148.patch")))) (build-system cmake-build-system) (arguments `(#:tests? #f |