Merge branch 'devel' into 'main'

Devel

See merge request glicid-public/guix-glicid!194
This commit is contained in:
Jean-François GUILLAUME 2023-02-03 10:00:56 +00:00
commit 8cfa590654
2 changed files with 13 additions and 12 deletions

View file

@ -8,14 +8,14 @@
(package (package
(inherit gnu:timescaledb) (inherit gnu:timescaledb)
(name "timescaledb") (name "timescaledb")
(version "2.9.1") (version "2.9.2")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/timescale/timescaledb") (url "https://github.com/timescale/timescaledb")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (base32 "1gxmq6hglz4simmsp5ypa2dav3nhvf8bsdp4raq0fr4673255xby")) (sha256 (base32 "0siijqypx53lkb19y6zz7bx1bnbhk40b5ky5l74ckhv80nlffzfy"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin

View file

@ -216,16 +216,17 @@
)) ))
(define-public glicid-specific-hdf5 ; no more useful
(package ;(define-public glicid-specific-hdf5
(inherit hdf5-1.12) ; (package
(name "glicid-specific-hdf5") ; (inherit hdf5-1.12)
;; (arguments ; (name "glicid-specific-hdf5")
;; `(#:tests? #f) ; ;; (arguments
;; ) ; ;; `(#:tests? #f)
(native-inputs `(("gcc" ,gcc-11) ; ;; )
("gfortran" ,gfortran-11) ; (native-inputs `(("gcc" ,gcc-11)
,@(package-native-inputs hdf5-1.12))))) ; ("gfortran" ,gfortran-11)
; ,@(package-native-inputs hdf5-1.12)))))
(define-public glicid-motif (define-public glicid-motif
(package (package