ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-15 11:25:22 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: trilinos-serial-xyce: Fetch source from git.

Browse source 
Fixes <https://issues.guix.gnu.org/46480>.

* gnu/packages/engineering.scm (trilinos-serial-xyce)[source]: Fetch from git.
[phases]: Delete trailing #t.
[native-inputs, inputs]: Use new style.

Reported-by: Danny Milosavljevic <dannym@scratchpost.org>
This commit is contained in:
Maxim Cournoyer 2022-07-13 00:32:23 -04:00
parent c8f32406e8
commit b729be989f
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
gnu/packages/engineering.scm
View file

@ -34,6 +34,7 @@
;;; Copyright © 2022 Konstantinos Agiannis <agiannis.kon@gmail.com> ;;; Copyright © 2022 Konstantinos Agiannis <agiannis.kon@gmail.com>
;;; Copyright © 2022 Greg Hogan <code@greghogan.com> ;;; Copyright © 2022 Greg Hogan <code@greghogan.com>
;;; Copyright © 2022 Artyom V. Poptsov <poptsov.artyom@gmail.com> ;;; Copyright © 2022 Artyom V. Poptsov <poptsov.artyom@gmail.com>
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -1864,12 +1865,20 @@ (define trilinos-serial-xyce
(name "trilinos-serial-xyce") (name "trilinos-serial-xyce")
(version "12.12.1") (version "12.12.1")
(source (source
(origin (method url-fetch) (origin
(uri (string-append "https://trilinos.org/oldsite/download/files/trilinos-" (method git-fetch)
version "-Source.tar.gz")) (uri (git-reference
(sha256 (url "https://github.com/trilinos/Trilinos")
(base32 (commit (string-append "trilinos-release-"
"1zgrcksrcbmyy79mbdv0j4j4sh0chpigxk8vcrrwgaxyxwxxhrvw")))) (string-map (lambda (chr)
(case chr
((#\.) #\-)
(else chr)))
version)))))
(file-name (git-file-name name version))
(sha256
(base32
"1smz3wlpfyjn0czmpl8bj4hw33p1zi9nnfygpsx7jl1523nypa1n"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:out-of-source? #t `(#:out-of-source? #t
@ -1881,8 +1890,7 @@ (define trilinos-serial-xyce
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(delete-file-recursively (delete-file-recursively
(string-append (assoc-ref outputs "out") (string-append (assoc-ref outputs "out")
"/lib/cmake/tribits")) "/lib/cmake/tribits")))))
#t)))
#:configure-flags #:configure-flags
(list "-DCMAKE_CXX_FLAGS=-O3 -fPIC" (list "-DCMAKE_CXX_FLAGS=-O3 -fPIC"
"-DCMAKE_C_FLAGS=-O3 -fPIC" "-DCMAKE_C_FLAGS=-O3 -fPIC"
@ -1910,13 +1918,8 @@ (define trilinos-serial-xyce
"-DTPL_ENABLE_UMFPACK=ON" "-DTPL_ENABLE_UMFPACK=ON"
"-DTPL_ENABLE_BLAS=ON" "-DTPL_ENABLE_BLAS=ON"
"-DTPL_ENABLE_LAPACK=ON"))) "-DTPL_ENABLE_LAPACK=ON")))
(native-inputs (native-inputs (list gfortran swig))
`(("fortran" ,gfortran) (inputs (list boost lapack suitesparse))
("swig" ,swig)))
(inputs
`(("boost" ,boost)
("lapack" ,lapack)
("suitesparse" ,suitesparse)))
(home-page "https://trilinos.org") (home-page "https://trilinos.org")
(synopsis "Engineering and scientific problems algorithms") (synopsis "Engineering and scientific problems algorithms")
(description (description