* gnu/packages/ocaml.scm (ocaml-4.02, camlp4-4.02, ocaml4.02-menhir)
(ocaml4.02-lablgtk, ocaml4.02-findlib, ocaml4.02-ounit)
(ocaml4.02-camlzip, ocaml4.02-ocamlmod, ocaml4.02-zarith)
(ocaml4.02-qcheck, ocaml4.02-qtest, ocaml4.02-stringext)
(ocaml4.02-bisect, ocaml4.02-bitstring, ocaml4.02-result)
(ocaml4.02-topkg, ocaml4.02-rresult, ocaml4.02-sqlite3, ocaml4.02-csv)
(ocaml4.02-mtime, ocaml4.02-cmdliner, ocaml4.02-fmt, ocaml4.02-astring)
(ocaml4.02-alcotest, ocaml4.02-ppx-tools, ocaml4.02-react, ocaml4.02-ssl)
(ocaml4.02-lwt, ocaml4.02-lwt-log, ocaml4.02-logs, ocaml4.02-fpath)
(ocaml4.02-bos, ocaml4.02-xmlm, ocaml4.02-ulex, ocaml4.02-uchar)
(ocaml4.02-uutf, ocaml4.02-jsonm, ocaml4.02-ocurl, ocaml4.02-base64)
(ocaml4.02-omake, ocaml4.02-batteries, ocaml4.02-pcre, ocaml4.02-oasis)
(ocaml4.02-js-build-tools, ocaml4.02-bin-prot, ocaml4.02-fieldslib)
(ocaml4.02-ppx-core, ocaml4.02-ppx-optcomp, ocaml4.02-ppx-driver)
(ocaml4.02-cppo, ocaml4.02-ppx-deriving, ocaml4.02-ppx-type-conv)
(ocaml4.02-ppx-inline-test, ocaml4.02-ppx-bench, ocaml4.02-ppx-compare)
(ocaml4.02-sexplib, ocaml4.02-typerep, ocaml4.02-variantslib)
(ocaml4.02-ppx-sexp-conv, ocaml4.02-ppx-variants-conv)
(ocaml4.02-ppx-here, ocaml4.02-ppx-assert, ocaml4.02-ppx-enumerate)
(ocaml4.02-ppx-let, ocaml4.02-ppx-typerep-conv, ocaml4.02-ppx-sexp-value)
(ocaml4.02-ppx-pipebang, ocaml4.02-ppx-bin-prot, ocaml4.02-ppx-fail)
(ocaml4.02-ppx-custom-printf, ocaml4.02-ppx-sexp-message)
(ocaml4.02-ppx-fields-conv, ocaml4.02-seq, ocaml4.02-re)
(ocaml4.02-ppx-expect, ocaml4.02-ppx-jane, ocaml4.02-core-kernel)
(ocaml4.02-async-kernel, ocaml4.02-async-rpc-kernel, ocaml4.02-core)
(ocaml4.02-async-unix, ocaml4.02-async-extra, ocaml4.02-async)
(ocaml4.02-ocplib-endian, ocaml4.02-easy-format, optcomp)
(ocaml4.02-piqilib, ocaml4.02-uuidm, ocaml4.02-graph, ocaml4.02-piqi)
(ocaml4.02-camomile, ocaml4.02-zed, ocaml4.02-lambda-term): Remove variables.
* guix/build-system/ocaml.scm (default-ocaml4.02)
(default-ocaml4.02-findlib, package-with-ocaml4.02)
(strip-ocaml4.02-variant): Remove variables.
---
gnu/packages/ocaml.scm | 1410 +----------------------------------
guix/build-system/ocaml.scm | 22 -
2 files changed, 20 insertions(+), 1412 deletions(-)
Toggle diff (490 lines)
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index b750dbe9f4..51435b2155 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -129,10 +129,10 @@
"/lib/ocaml/site-lib"))
#:phases (modify-phases %standard-phases (delete 'configure))))
-(define-public ocaml-4.02
+(define-public ocaml-4.07
(package
(name "ocaml")
- (version "4.02.3")
+ (version "4.07.1")
(source (origin
(method url-fetch)
(uri (string-append
@@ -141,12 +141,7 @@
"/ocaml-" version ".tar.xz"))
(sha256
(base32
- "1qwwvy8nzd87hk8rd9sm667nppakiapnx4ypdwcrlnav2dz6kil3"))
- (patches
- (search-patches
- "ocaml-CVE-2015-8869.patch"
- "ocaml-Add-a-.file-directive.patch"
- "ocaml-enable-ocamldoc-reproducibility.patch"))))
+ "1f07hgj5k45cylj1q3k5mk8yi02cwzx849b1fwnwia8xlcfqpr6z"))))
(build-system gnu-build-system)
(native-search-paths
(list (search-path-specification
@@ -204,25 +199,7 @@ patch-/bin/sh-references: ~a: changing `\"/bin/sh\"' to `~a'~%"
(add-after 'install 'check
(lambda _
(with-directory-excursion "testsuite"
- (invoke "make" "all"))))
- (add-before 'check 'prepare-socket-test
- (lambda _
- (format (current-error-port)
- "Spawning local test web server on port 8080~%")
- (when (zero? (primitive-fork))
- (run-server (lambda (request request-body)
- (values '((content-type . (text/plain)))
- "Hello!"))
- 'http '(#:port 8080)))
- (let ((file "testsuite/tests/lib-threads/testsocket.ml"))
- (format (current-error-port)
- "Patching ~a to use localhost port 8080~%"
- file)
- (substitute* file
- (("caml.inria.fr") "localhost")
- (("80") "8080")
- (("HTTP1.0") "HTTP/1.0"))
- #t))))))
+ (invoke "make" "all")))))))
(home-page "https://ocaml.org/")
(synopsis "The OCaml programming language")
(description
@@ -235,30 +212,6 @@ functional, imperative and object-oriented styles of programming.")
;; distributed under lgpl2.0.
(license (list license:qpl license:lgpl2.0))))
-(define-public ocaml-4.07
- (package
- (inherit ocaml-4.02)
- (version "4.07.1")
- (source (origin
- (method url-fetch)
- (uri (string-append
- "http://caml.inria.fr/pub/distrib/ocaml-"
- (version-major+minor version)
- "/ocaml-" version ".tar.xz"))
- (sha256
- (base32
- "1f07hgj5k45cylj1q3k5mk8yi02cwzx849b1fwnwia8xlcfqpr6z"))))
- (arguments
- (substitute-keyword-arguments (package-arguments ocaml-4.02)
- ((#:phases phases)
- `(modify-phases ,phases
- (delete 'prepare-socket-test)
- (replace 'check
- (lambda _
- (with-directory-excursion "testsuite"
- (invoke "make" "all"))
- #t))))))))
-
(define-public ocaml ocaml-4.07)
(define-public ocamlbuild
@@ -560,23 +513,25 @@ Git-friendly development workflow.")
;; The 'LICENSE' file waives some requirements compared to LGPLv3.
(license license:lgpl3)))
-(define-public camlp4-4.02
+(define-public camlp4-4.07
(package
(name "camlp4")
- (version "4.02+6")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/ocaml/camlp4.git")
- (commit version)))
- (file-name (git-file-name name version))
- (sha256
- (base32 "06yl4q0qazl7g25b0axd1gdkfd4qpqzs1gr5fkvmkrcbz113h1hj"))))
+ (version "4.07+1")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/ocaml/camlp4.git")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0cxl4hkqcvspvkx4f2k83217rh6051fll9i2yz7cw6m3bq57mdvl"))))
(build-system gnu-build-system)
- (native-inputs `(("ocaml" ,ocaml-4.02)
- ("which" ,which)))
- (inputs `(("ocaml" ,ocaml-4.02)))
+ (native-inputs
+ `(("ocaml" ,ocaml-4.07)
+ ("ocamlbuild" ,ocamlbuild)
+ ("which" ,which)))
+ (inputs `(("ocaml" ,ocaml-4.07)))
(arguments
'(#:tests? #f ;no documented test target
;; a race-condition will lead byte and native targets to mkdir _build
@@ -617,28 +572,6 @@ syntax of OCaml.")
;; against the library to be released under any terms.
(license license:lgpl2.0)))
-(define-public camlp4-4.07
- (package
- (inherit camlp4-4.02)
- (name "camlp4")
- (version "4.07+1")
- (source (origin
- (method url-fetch)
- (uri (string-append "https://github.com/ocaml/camlp4/archive/"
- version ".tar.gz"))
- (sha256
- (base32
- "143hhxv1i6aq413z0i1pynrjcfl2g5gnh5r3863v6h9z0riqknzc"))
- (file-name (string-append name "-" version ".tar.gz"))))
- (properties
- `((ocaml4.02-variant . ,(delay camlp4-4.02))))
- (native-inputs
- `(("ocaml" ,ocaml-4.07)
- ("ocamlbuild" ,ocamlbuild)
- ("which" ,which)))
- (inputs
- `(("ocaml" ,ocaml-4.07)))))
-
(define-public camlp4 camlp4-4.07)
(define-public camlp5
@@ -839,8 +772,6 @@ Emacs.")
(let ((out (assoc-ref outputs "out")))
(setenv "PREFIX" out))
#t)))))
- (properties
- `((ocaml4.02-variant . ,(delay ocaml4.02-menhir))))
(home-page "http://gallium.inria.fr/~fpottier/menhir")
(synopsis "Parser generator")
(description "Menhir is a parser generator. It turns high-level grammar
@@ -852,13 +783,6 @@ Knuth’s LR(1) parser construction technique.")
;; are QPL licensed.
(license (list license:gpl2+ license:qpl))))
-(define-public ocaml4.02-menhir
- (package
- (inherit ocaml-menhir)
- (name "ocaml4.02-menhir")
- (inputs `(("ocaml" ,ocaml-4.02)))
- (native-inputs '())))
-
(define-public ocaml-bigarray-compat
(package
(name "ocaml-bigarray-compat")
@@ -892,8 +816,6 @@ Knuth’s LR(1) parser construction technique.")
(base32
"1y38fdvswy6hmppm65qvgdk4pb3ghhnvz7n4ialf46340r1s5p2d"))))
(build-system gnu-build-system)
- (properties
- `((ocaml4.02-variant . ,(delay ocaml4.02-lablgtk))))
(native-inputs
`(("camlp4" ,camlp4)
("ocaml" ,ocaml)
@@ -944,23 +866,6 @@ libglade (and it an generate OCaml code from .glade files),
libpanel, librsvg and quartz.")
(license license:lgpl2.1)))
-(define-public ocaml4.02-lablgtk
- (package
- (inherit lablgtk)
- (name "ocaml4.02-lablgtk")
- (version "2.18.5")
- (source (origin
- (method url-fetch)
- (uri (ocaml-forge-uri name version 1627))
- (sha256
- (base32
- "0cyj6sfdvzx8hw7553lhgwc0krlgvlza0ph3dk9gsxy047dm3wib"))))
- (native-inputs
- `(("camlp4" ,camlp4-4.02)
- ("ocaml" ,ocaml-4.02)
- ("findlib" ,ocaml4.02-findlib)
- ("pkg-config" ,pkg-config)))))
-
(define-public unison
(package
(name "unison")
@@ -1103,15 +1008,6 @@ compilation and linkage, there are new frontends of the various OCaml
compilers that can directly deal with packages.")
(license license:x11)))
-(define-public ocaml4.02-findlib
- (package
- (inherit ocaml-findlib)
- (name "ocaml4.02-findlib")
- (native-inputs
- `(("camlp4" ,camlp4-4.02)
- ("m4" ,m4)
- ("ocaml" ,ocaml-4.02)))))
-
;; note that some tests may hang for no obvious reason.
(define-public ocaml-ounit
(package
@@ -1137,9 +1033,6 @@ compilers that can directly deal with packages.")
other XUnit testing frameworks.")
(license license:expat)))
-(define-public ocaml4.02-ounit
- (package-with-ocaml4.02 ocaml-ounit))
-
(define-public camlzip
(package
(name "camlzip")
@@ -1182,9 +1075,6 @@ JAR format. It provides functions for reading from and writing to compressed
files in these formats.")
(license license:lgpl2.1+)))
-(define-public ocaml4.02-camlzip
- (package-with-ocaml4.02 camlzip))
-
(define-public ocamlmod
(package
(name "ocamlmod")
@@ -1209,9 +1099,6 @@ files in these formats.")
(description "Generate modules from OCaml source files.")
(license license:lgpl2.1+))) ; with an exception
-(define-public ocaml4.02-ocamlmod
- (package-with-ocaml4.02 ocamlmod))
-
(define-public ocaml-zarith
(package
(name "ocaml-zarith")
@@ -1241,9 +1128,6 @@ over big integers. Small integers are represented as Caml unboxed integers,
for speed and space economy.")
(license license:lgpl2.1+))) ; with an exception
-(define-public ocaml4.02-zarith
- (package-with-ocaml4.02 ocaml-zarith))
-
(define-public ocaml-frontc
(package
(name "ocaml-frontc")
@@ -1314,9 +1198,6 @@ generated instances of the type. It provides combinators for generating
instances and printing them.")
(license license:lgpl3+)))
-(define-public ocaml4.02-qcheck
- (package-with-ocaml4.02 ocaml-qcheck))
-
(define-public ocaml-qtest
(package
(name "ocaml-qtest")
@@ -1350,9 +1231,6 @@ qcheck library. The possibilities range from trivial tests -- extremely simple
to use -- to sophisticated random generation of test cases.")
(license license:lgpl3+)))
-(define-public ocaml4.02-qtest
- (package-with-ocaml4.02 ocaml-qtest))
-
(define-public ocaml-stringext
(package
(name "ocaml-stringext")
@@ -1378,9 +1256,6 @@ full_split, cut, rcut, etc..")
;; where it says `mit'.
(license license:expat)))
-(define-public ocaml4.02-stringext
- (package-with-ocaml4.02 ocaml-stringext))
-
(define-public ocaml-bisect
(package
(name "ocaml-bisect")
@@ -1426,21 +1301,8 @@ a camlp4-based tool that allows to instrument your application before running
tests. After application execution, it is possible to generate a report in HTML
format that is the replica of the application source code annotated with code
coverage information.")
- (properties
- `((ocaml4.02-variant . ,(delay ocaml4.02-bisect))))
(license license:gpl3+)))
-(define-public ocaml4.02-bisect
- (let ((base (package-with-ocaml4.02 (strip-ocaml4.02-variant ocaml-bisect))))
- (package
- (inherit base)
- (native-inputs
- `(("camlp4" ,camlp4-4.02)
- ("libxml2" ,libxml2)
- ("which" ,which)))
- (propagated-inputs
- `(("camlp4" ,camlp4-4.02))))))
-
(define-public dune
(package
(name "dune")
@@ -1547,8 +1409,6 @@ ocaml-migrate-parsetree")
(arguments
`(#:tests? #f; Tests fail to build
#:jbuild? #t))
- (properties
- `((ocaml4.02-variant . ,(delay ocaml4.02-bitstring))))
(home-page "https://github.com/xguerin/bitstring")
(synopsis "Bitstrings and bitstring matching for OCaml")
(description "Adds Erlang-style bitstrings and matching over bitstrings as
@@ -1558,68 +1418,6 @@ as primitives to the language, making it exceptionally simple to use and very
powerful.")
(license license:isc)))
-(define-public ocaml4.02-bitstring
- (let ((base (package-with-ocaml4.02 (strip-ocaml4.02-variant ocaml-bitstring))))
- (package
- (inherit base)
- (version "2.1.1")
- (source (origin
- (method url-fetch)
- (uri (string-append "https://github.com/xguerin/bitstring"
- "/archive/v" version ".tar.gz"))
- (file-name (string-append "ocaml-bitstring-" version ".tar.gz"))
- (sha256
- (base32
- "0vy8ibrxccii1jbsk5q6yh1kxjigqvi7lhhcmizvd5gfhf7mfyc8"))
- (patches (search-patches "ocaml-bitstring-fix-configure.patch"))))
- (build-system ocaml-build-system)
- (arguments
- `(#:ocaml ,ocaml-4.02
- #:findlib ,ocaml4.02-findlib
- #:configure-flags
- (list "CAMLP4OF=camlp4of" "--enable-coverage")
- #:make-flags
- (list (string-append "BISECTLIB="
- (assoc-ref %build-inputs "bisect")
- "/lib/ocaml/site-lib")
- (string-append "OCAMLCFLAGS=-g -I "
- (assoc-ref %build-inputs "camlp4")
- "/lib/ocaml/site-lib/camlp4 -I "
- "$(BISECTLIB)/bisect")
- (string-append "OCAMLOPTFLAGS=-g -I "
- (assoc-ref %build-inputs "camlp4")
- "/lib/ocaml/site-lib/camlp4 -I "
- "$(BISECTLIB)/bisect"))
- #:phases
- (modify-phases %standard-phases
- (add-after 'install 'link-lib
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (stubs (string-append out
- "/lib/ocaml/site-lib/stubslibs"))
- (lib (string-append out
- "/lib/ocaml/site-lib/bitstring")))
- (mkdir-p stubs)
- (symlink (string-append lib "/dllbitstring.so")
- (string-append stubs "/dllbitstring.so")))
- #t))
- (add-before 'configure 'fix-configure
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "Makefile.in"
- (("@abs_top_builddir@")
- (string-append "@abs_top_builddir@:" (getenv "LIBRARY_PATH"))))
- (substitute* "configure"
- (("-/bin/sh") (string-append "-" (assoc-ref inputs "bash")
- "/bin/sh"))))))))
- (native-inputs
- `(("camlp4" ,camlp4-4.02)
- ("time" ,time)
- ("autoconf" ,autoconf)
- ("automake" ,automake)
- ("bisect" ,ocaml4.02-bisect)))
- (propagated-inputs
- `(("camlp4" ,camlp4-4.02))))))
-
(define-public ocaml-result
(package
(name "ocaml-result")
@@ -1645,9 +1443,6 @@ staying compatible with older version of OCaml should use the Result module
defined in this library.")
(license license:bsd-3)))
-(define-public ocaml4.02-result
- (package-with-ocaml4.02 ocaml-result))
-
(define-public ocaml-topkg
(package
(name "ocaml-topkg")
@@ -1679,9 +1474,6 @@ configuration and to specify information about the package's distribution,
creation and publication procedures.")
(license license:isc)))
-(define-public ocaml4.02-topkg
- (package-with-ocaml4.02 ocaml-topkg))
-
(define-public ocaml-rresult
(package
(name "ocaml-rresult")
@@ -1713,9 +1505,6 @@ to operate on the result type available from OCaml 4.03 in the standard
library.")
(license license:isc)))
-(define-public ocaml4.02-rresult
- (package-with-ocaml4.02 ocaml-rresult))
-
(define-public ocaml-sqlite3
(package
(name "ocaml-sqlite3")
@@ -1746,9 +1535,6 @@ coexistence with the old (version 2) SQLite and its OCaml wrapper
@code{ocaml-sqlite}.")
(license license:expat)))
-(define-public ocaml4.02-sqlite3
- (package-with-ocaml4.02 ocaml-sqlite3))
-
(define-public ocaml-csv
(package
(name "ocaml-csv")
@@ -1775,9 +1561,6 @@ read and write files in this format as well as some convenience functions to
manipulate such data.")
(license (package-license camlp4))))
-(define-public ocaml4.02-csv
- (package-with-ocaml4.02 ocaml-csv))
-
(define-public ocaml-mtime
(package
(name "ocaml-mtime")
@@ -1808,9 +1591,6 @@ manipulate such data.")
spans without being subject to operating system calendar time adjustments.")
(license license:isc)))
-(define-public ocaml4.02-mtime
- (package-with-ocaml4.02 ocaml-mtime))
-
(define-public ocaml-cmdliner
(package
(name "ocaml-cmdliner")
@@ -1834,8 +1614,6 @@ spans without being subject to operating system calendar time adjustments.")
#:phases
(modify-phases %standard-phases
(delete 'configure))))
- (properties
- `((ocaml4.02-variant . ,(delay ocaml4.02-cmdliner))))
(home-page "http://erratique.ch/software/cmdliner")
(synopsis "Declarative definition of command line interfaces for OCaml")
(description "Cmdliner is a module for the declarative definition of command
@@ -1846,19 +1624,6 @@ generation. It supports programs with single or multiple commands and respects
most of the POSIX and GNU conventions.")
(license license:bsd-3)))
-(define-public ocaml4.02-cmdliner
- (let ((base (package-with-ocaml4.02 (strip-ocaml4.02-variant ocaml-cmdliner))))
- (package
- (inherit base)
- (version "1.0.2")
- (source (origin
- (method url-fetch)
- (uri (string-append "http://erratique.ch/software/cmdliner/releases/"
- "cmdliner-" version ".tbz"))
- (sha256
- (base32
- "18jqphjiifljlh9jg8zpl6310p3iwyaqphdkmf89acyaix0s4kj1")))))))
-
(define-public ocaml-fmt
(package
(name "ocaml-fmt")
@@ -1891,9 +1656,6 @@ most of the POSIX and GNU conventions."
