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

gnu: coq: Update to 8.13.2.

Browse source 
* gnu/packages/coq.scm (coq): Update to 8.13.2.
(coq-ide-server, coq-ide): New packages.
(coq-gappa): Update to 1.4.6.
(coq-bignums): Update to 8.13.0.
(coq-interval): Update to 1.3.0.
(coq-equations): Update to 1.2.4.
This commit is contained in:
Julien Lepiller 2021-07-05 21:32:33 +02:00
parent 3c44aa2b74
commit e38b4d5ceb
No known key found for this signature in database
GPG key ID: 53D457B2D636EE82
1 changed files with 62 additions and 85 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

147
gnu/packages/coq.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018 Julien Lepiller <julien@lepiller.eu> ;;; Copyright © 2018-2021 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Dan Frumin <dfrumin@cs.ru.nl> ;;; Copyright © 2019 Dan Frumin <dfrumin@cs.ru.nl>
;;; Copyright © 2020 Brett Gilio <brettg@gnu.org> ;;; Copyright © 2020 Brett Gilio <brettg@gnu.org>
@ -38,6 +38,7 @@ (define-module (gnu packages coq)
#:use-module (gnu packages python) #:use-module (gnu packages python)
#:use-module (gnu packages rsync) #:use-module (gnu packages rsync)
#:use-module (gnu packages texinfo) #:use-module (gnu packages texinfo)
#:use-module (guix build-system dune)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system ocaml) #:use-module (guix build-system ocaml)
#:use-module (guix download) #:use-module (guix download)
@ -50,7 +51,7 @@ (define-module (gnu packages coq)
(define-public coq (define-public coq
(package (package
(name "coq") (name "coq")
(version "8.11.2") (version "8.13.2")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -60,78 +61,24 @@ (define-public coq
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1gia82dkmzqspw2w3s4gjyh39ghbmw4i41i4hyzc91g7mza17nbz")))) "15r0cm3p9dlsxbg0lf05njjp1xi1y74vxvq6drxjykax67x95l8a"))))
(native-search-paths (native-search-paths
(list (search-path-specification (list (search-path-specification
(variable "COQPATH") (variable "COQPATH")
(files (list "lib/coq/user-contrib"))))) (files (list "lib/coq/user-contrib")))
(build-system ocaml-build-system) (search-path-specification
(outputs '("out" "ide")) (variable "COQLIB")
(files (list "lib/ocaml/site-lib/coq"))
(separator #f))))
(build-system dune-build-system)
(inputs (inputs
`(("lablgtk" ,lablgtk3) `(("gmp" ,gmp)
("python" ,python-2) ("ocaml-zarith" ,ocaml-zarith)))
("camlp5" ,camlp5)
("ocaml-num" ,ocaml-num)))
(native-inputs (native-inputs
`(("ocaml-ounit" ,ocaml-ounit) `(("which" ,which)))
("rsync" ,rsync)
("which" ,which)))
(arguments (arguments
`(#:phases `(#:package "coq"
(modify-phases %standard-phases #:test-target "test-suite"))
(add-after 'unpack 'make-git-checkout-writable
(lambda _
(for-each make-file-writable (find-files "."))
#t))
(replace 'configure
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(mandir (string-append out "/share/man"))
(browser "icecat -remote \"OpenURL(%s,new-tab)\""))
(invoke "./configure"
"-prefix" out
"-mandir" mandir
"-browser" browser
"-coqide" "opt"))))
(replace 'build
(lambda _
(invoke "make"
"-j" (number->string (parallel-job-count))
"world")))
(delete 'check)
(add-after 'install 'remove-duplicate
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin"))
(coqtop (string-append bin "/coqtop"))
(coqidetop (string-append bin "/coqidetop"))
(coqtop.opt (string-append coqtop ".opt"))
(coqidetop.opt (string-append coqidetop ".opt")))
;; These files are exact copies without `.opt` extension.
;; Removing these saves 35 MiB in the resulting package.
;; Unfortunately, completely deleting them breaks coqide.
(delete-file coqtop.opt)
(delete-file coqidetop.opt)
(symlink coqtop coqtop.opt)
(symlink coqidetop coqidetop.opt))
#t))
(add-after 'install 'install-ide
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))
(ide (assoc-ref outputs "ide")))
(mkdir-p (string-append ide "/bin"))
(rename-file (string-append out "/bin/coqide")
(string-append ide "/bin/coqide")))
#t))
(add-after 'install 'check
(lambda _
(with-directory-excursion "test-suite"
;; These two tests fail.
;; Fails because the output is not formatted as expected.
(delete-file-recursively "coq-makefile/timing")
;; Fails because we didn't build coqtop.byte.
(delete-file "misc/printers.sh")
(invoke "make")))))))
(home-page "https://coq.inria.fr") (home-page "https://coq.inria.fr")
(synopsis "Proof assistant for higher-order logic") (synopsis "Proof assistant for higher-order logic")
(description (description
@ -142,6 +89,31 @@ (define-public coq
;; Some of the documentation is distributed under opl1.0+. ;; Some of the documentation is distributed under opl1.0+.
(license (list license:lgpl2.1 license:opl1.0+)))) (license (list license:lgpl2.1 license:opl1.0+))))
(define-public coq-ide-server
(package
(inherit coq)
(name "coq-ide-server")
(arguments
`(#:tests? #f
#:package "coqide-server"))
(inputs
`(("coq" ,coq)
("gmp" ,gmp)
("ocaml-zarith" ,ocaml-zarith)))))
(define-public coq-ide
(package
(inherit coq)
(name "coq-ide")
(arguments
`(#:tests? #f
#:package "coqide"))
(propagated-inputs
`(("coq" ,coq)
("coq-ide-server" ,coq-ide-server)))
(inputs
`(("lablgtk3" ,lablgtk3)))))
(define-public proof-general (define-public proof-general
;; The latest release is from 2016 and there has been more than 450 commits ;; The latest release is from 2016 and there has been more than 450 commits
;; since then. ;; since then.
@ -274,7 +246,7 @@ (define-public coq-flocq
(define-public coq-gappa (define-public coq-gappa
(package (package
(name "coq-gappa") (name "coq-gappa")
(version "1.4.4") (version "1.4.6")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -284,7 +256,7 @@ (define-public coq-gappa
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0f3g3wjkvfkm961l4jpckhsqd43jnvm7f5qqk78qc32zh1fg339n")))) "0492i0ksrz6dnc1d57jzsbmdlb9fp9hrh9ib5v8j0yqxpyi0x8f4"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("autoconf" ,autoconf) `(("autoconf" ,autoconf)
@ -298,13 +270,14 @@ (define-public coq-gappa
(inputs (inputs
`(("gmp" ,gmp) `(("gmp" ,gmp)
("mpfr" ,mpfr) ("mpfr" ,mpfr)
("ocaml-zarith" ,ocaml-zarith)
("boost" ,boost))) ("boost" ,boost)))
(propagated-inputs (propagated-inputs
`(("coq-flocq" ,coq-flocq))) `(("coq-flocq" ,coq-flocq)))
(arguments (arguments
`(#:configure-flags `(#:configure-flags
(list (string-append "--libdir=" (assoc-ref %outputs "out") (list (string-append "COQUSERCONTRIB=" (assoc-ref %outputs "out")
"/lib/coq/user-contrib/Gappa")) "/lib/coq/user-contrib"))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'configure 'fix-remake (add-before 'configure 'fix-remake
@ -334,7 +307,7 @@ (define-public coq-gappa
(define-public coq-mathcomp (define-public coq-mathcomp
(package (package
(name "coq-mathcomp") (name "coq-mathcomp")
(version "1.11.0") (version "1.12.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -343,7 +316,7 @@ (define-public coq-mathcomp
(commit (string-append "mathcomp-" version)))) (commit (string-append "mathcomp-" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1axywpa1jcpnidd86irpd1gdbbg2sfbwc652675xisq5wnmfmf6f")))) (base32 "12cgrmzlcjnp9kv9zxsk34fgf0qfa35jdb23cbf13kmg8dyfi3h5"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("ocaml" ,ocaml) `(("ocaml" ,ocaml)
@ -429,7 +402,7 @@ (define-public coq-coquelicot
(define-public coq-bignums (define-public coq-bignums
(package (package
(name "coq-bignums") (name "coq-bignums")
(version "8.11.0") (version "8.13.0")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -438,13 +411,14 @@ (define-public coq-bignums
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1xcd7c7qlvs0narfba6px34zq0mz8rffnhxw0kzhhg6i4iw115dp")))) "1n66i7hd9222b2ks606mak7m4f0dgy02xgygjskmmav6h7g2sx7y"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("ocaml" ,ocaml) `(("ocaml" ,ocaml)
("coq" ,coq))) ("coq" ,coq)))
(inputs (inputs
`(("camlp5" ,camlp5))) `(("camlp5" ,camlp5)
("ocaml-zarith" ,ocaml-zarith)))
(arguments (arguments
`(#:tests? #f ; No test target. `(#:tests? #f ; No test target.
#:make-flags #:make-flags
@ -462,7 +436,7 @@ (define-public coq-bignums
(define-public coq-interval (define-public coq-interval
(package (package
(name "coq-interval") (name "coq-interval")
(version "4.0.0") (version "4.3.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -472,7 +446,7 @@ (define-public coq-interval
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"01iz6qmnsm6b9s1vmdjs79vjx9xgwzn5rwyjp6bvs8hg3zlmhpip")))) "1jqvd17czhliscf40idhnxgrha620039ilrdyfahn71dg2jmzqnm"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("autoconf" ,autoconf) `(("autoconf" ,autoconf)
@ -484,11 +458,12 @@ (define-public coq-interval
`(("flocq" ,coq-flocq) `(("flocq" ,coq-flocq)
("bignums" ,coq-bignums) ("bignums" ,coq-bignums)
("coquelicot" ,coq-coquelicot) ("coquelicot" ,coq-coquelicot)
("mathcomp" ,coq-mathcomp))) ("mathcomp" ,coq-mathcomp)
("ocaml-zarith" ,ocaml-zarith)))
(arguments (arguments
`(#:configure-flags `(#:configure-flags
(list (string-append "--libdir=" (assoc-ref %outputs "out") (list (string-append "COQUSERCONTRIB=" (assoc-ref %outputs "out")
"/lib/coq/user-contrib/Gappa")) "/lib/coq/user-contrib"))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'configure 'fix-remake (add-before 'configure 'fix-remake
@ -558,21 +533,23 @@ (define-public coq-autosubst
(define-public coq-equations (define-public coq-equations
(package (package
(name "coq-equations") (name "coq-equations")
(version "1.2.3") (version "1.2.4")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/mattam82/Coq-Equations") (url "https://github.com/mattam82/Coq-Equations")
(commit (string-append "v" version "-8.11")))) (commit (string-append "v" version "-8.13"))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1srxz1rws8jsh7402g2x2vcqgjbbsr64dxxj5d2zs48pmhb20csf")))) "0i014lshsdflzw6h0qxra9d2f0q82vffxv2f29awbb9ad0p4rq4q"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("ocaml" ,ocaml) `(("ocaml" ,ocaml)
("coq" ,coq) ("coq" ,coq)
("camlp5" ,camlp5))) ("camlp5" ,camlp5)))
(inputs
`(("ocaml-zarith" ,ocaml-zarith)))
(arguments (arguments
`(#:test-target "test-suite" `(#:test-target "test-suite"
#:phases #:phases