me/guix
Archived
1
0
Fork 0
Code Activity

gnu: Add ocaml-sqlite3.

Browse source 
* gnu/packages/ocaml.scm (ocaml-sqlite3): New variable.
(ocaml4.07-sqlite3): Inherit from ocaml-sqlite3.
* gnu/packages/bioinformatics.scm (pplacer): Also use package-with-ocaml4.07
with ocaml-sqlite3.
This commit is contained in:
Julien Lepiller 2021-07-05 16:25:24 +02:00
parent 45940f59aa
commit ef79d6c5d6
No known key found for this signature in database
GPG key ID: 53D457B2D636EE82
2 changed files with 27 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gnu/packages/bioinformatics.scm
View file

@ -13002,7 +13002,7 @@ let before_space s =
("ocaml-batteries" ,(package-with-ocaml4.07 ocaml-batteries)) ("ocaml-batteries" ,(package-with-ocaml4.07 ocaml-batteries))
("ocaml-camlzip" ,(package-with-ocaml4.07 camlzip)) ("ocaml-camlzip" ,(package-with-ocaml4.07 camlzip))
("ocaml-csv" ,(package-with-ocaml4.07 ocaml-csv)) ("ocaml-csv" ,(package-with-ocaml4.07 ocaml-csv))
("ocaml-sqlite3" ,ocaml4.07-sqlite3) ("ocaml-sqlite3" ,(package-with-ocaml4.07 ocaml-sqlite3))
("ocaml-xmlm" ,(package-with-ocaml4.07 ocaml-xmlm)) ("ocaml-xmlm" ,(package-with-ocaml4.07 ocaml-xmlm))
("ocaml-mcl" ,(package-with-ocaml4.07 ocaml-mcl)) ("ocaml-mcl" ,(package-with-ocaml4.07 ocaml-mcl))
("ocaml-gsl" ,ocaml4.07-gsl-1))) ("ocaml-gsl" ,ocaml4.07-gsl-1)))

39
gnu/packages/ocaml.scm
View file

@ -1959,10 +1959,10 @@ to operate on the result type available from OCaml 4.03 in the standard
library.") library.")
(license license:isc))) (license license:isc)))
(define-public ocaml4.07-sqlite3 (define-public ocaml-sqlite3
(package (package
(name "ocaml4.07-sqlite3") (name "ocaml-sqlite3")
(version "4.4.1") (version "5.0.2")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -1972,18 +1972,16 @@ library.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1536agm5fgcqysszhpd3kmw7lkc5n5ni7gmlyglrbvmnmrwf3av2")))) "15mmq7ak5facpfawfrc6hjz211gli7jab52iqdsihfvh790xm55f"))))
(build-system dune-build-system) (build-system dune-build-system)
(arguments (properties `((ocaml4.07-variant . ,(delay ocaml4.07-sqlite3))))
`(#:ocaml ,ocaml-4.07 (propagated-inputs
#:findlib ,ocaml4.07-findlib `(("dune-configurator" ,dune-configurator)
#:dune ,ocaml4.07-dune)) ("ocaml-odoc" ,ocaml-odoc)))
(native-inputs (native-inputs
`(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) `(("ocaml-ppx-inline-test" ,ocaml-ppx-inline-test)
("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) ("pkg-config" ,pkg-config)
("pkg-config" ,pkg-config))) ("sqlite" ,sqlite)))
(inputs
`(("sqlite" ,sqlite)))
(home-page "https://mmottl.github.io/sqlite3-ocaml") (home-page "https://mmottl.github.io/sqlite3-ocaml")
(synopsis "SQLite3 Bindings for OCaml") (synopsis "SQLite3 Bindings for OCaml")
(description (description
@ -1995,6 +1993,21 @@ coexistence with the old (version 2) SQLite and its OCaml wrapper
@code{ocaml-sqlite}.") @code{ocaml-sqlite}.")
(license license:expat))) (license license:expat)))
(define-public ocaml4.07-sqlite3
(package-with-ocaml4.07
(package
(inherit ocaml-sqlite3)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-before 'build 'chmod
(lambda _
(for-each (lambda (file) (chmod file #o644)) (find-files "." ".*"))
#t)))))
(propagated-inputs
`(("ocaml-odoc" ,ocaml-odoc)))
(properties '()))))
(define-public ocaml-csv (define-public ocaml-csv
(package (package
(name "ocaml-csv") (name "ocaml-csv")