mirror of
https://git.savannah.gnu.org/git/guix.git
synced 2026-07-07 10:14:06 +02:00
Compare commits
7 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 9fdef4d61a | |||
| 5180552e98 | |||
| f2feb9b9df | |||
| c9f4cb161d | |||
| 63a6145828 | |||
| f8bfd4aa45 | |||
| 9f48b55252 |
+36
-51
@@ -132,10 +132,10 @@
|
||||
"/lib/ocaml/site-lib"))
|
||||
#:phases (modify-phases %standard-phases (delete 'configure))))
|
||||
|
||||
(define-public ocaml-4.09
|
||||
(define-public ocaml-4.11
|
||||
(package
|
||||
(name "ocaml")
|
||||
(version "4.09.0")
|
||||
(version "4.11.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
@@ -144,7 +144,7 @@
|
||||
"/ocaml-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1v3z5ar326f3hzvpfljg4xj8b9lmbrl53fn57yih1bkbx3gr3yzj"))))
|
||||
"04b13yfismkqh21ag641q9dl0i602khgh4427g1a7pb77c4skr7z"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-search-paths
|
||||
(list (search-path-specification
|
||||
@@ -165,31 +165,18 @@
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'patch-/bin/sh-references
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(let* ((sh (string-append (assoc-ref inputs "bash")
|
||||
"/bin/sh"))
|
||||
(quoted-sh (string-append "\"" sh "\"")))
|
||||
(with-fluids ((%default-port-encoding #f))
|
||||
(for-each
|
||||
(lambda (file)
|
||||
(substitute* file
|
||||
(("\"/bin/sh\"")
|
||||
(begin
|
||||
(format (current-error-port) "\
|
||||
patch-/bin/sh-references: ~a: changing `\"/bin/sh\"' to `~a'~%"
|
||||
file quoted-sh)
|
||||
quoted-sh))))
|
||||
(find-files "." "\\.ml$"))
|
||||
#t))))
|
||||
(replace 'build
|
||||
(lambda _
|
||||
(invoke "make" "-j" (number->string (parallel-job-count))
|
||||
"world.opt")))
|
||||
(invoke "make" "-j"
|
||||
(number->string (parallel-job-count))
|
||||
"world.opt")
|
||||
#t))
|
||||
;; FIXME: Test phases are not run.
|
||||
;; "-find-test-dirs: command not found"
|
||||
(replace 'check
|
||||
(lambda _
|
||||
(with-directory-excursion "testsuite"
|
||||
(invoke "make" "all")))))))
|
||||
(invoke "make" "tests")
|
||||
#t)))))
|
||||
(home-page "https://ocaml.org/")
|
||||
(synopsis "The OCaml programming language")
|
||||
(description
|
||||
@@ -197,14 +184,11 @@ patch-/bin/sh-references: ~a: changing `\"/bin/sh\"' to `~a'~%"
|
||||
an emphasis on expressiveness and safety. Developed for more than 20 years at
|
||||
Inria it benefits from one of the most advanced type systems and supports
|
||||
functional, imperative and object-oriented styles of programming.")
|
||||
;; The compiler is distributed under qpl1.0 with a change to choice of
|
||||
;; law: the license is governed by the laws of France. The library is
|
||||
;; distributed under lgpl2.0.
|
||||
(license (list license:qpl license:lgpl2.0))))
|
||||
(license license:lgpl2.1)))
|
||||
|
||||
(define-public ocaml-4.07
|
||||
(package
|
||||
(inherit ocaml-4.09)
|
||||
(inherit ocaml-4.11)
|
||||
(version "4.07.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
@@ -229,7 +213,7 @@ functional, imperative and object-oriented styles of programming.")
|
||||
"--prefix" out
|
||||
"--mandir" mandir))))))))))
|
||||
|
||||
(define-public ocaml ocaml-4.09)
|
||||
(define-public ocaml ocaml-4.11)
|
||||
|
||||
(define-public ocamlbuild
|
||||
(package
|
||||
@@ -257,13 +241,13 @@ functional, imperative and object-oriented styles of programming.")
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'configure))
|
||||
; some failures because of changes in OCaml's error message formating
|
||||
;; some failures because of changes in OCaml's error message formating
|
||||
#:tests? #f))
|
||||
(home-page "https://github.com/ocaml/ocamlbuild")
|
||||
(synopsis "OCaml build tool")
|
||||
(description "OCamlbuild is a generic build tool, that has built-in rules
|
||||
for building OCaml library and programs.")
|
||||
(license license:lgpl2.1+)))
|
||||
(license license:lgpl2.0)))
|
||||
|
||||
(define-public ocaml-extlib
|
||||
(package
|
||||
@@ -282,7 +266,7 @@ for building OCaml library and programs.")
|
||||
(modify-phases %standard-phases
|
||||
(delete 'configure))))
|
||||
(native-inputs
|
||||
`(("ocaml-cppo" ,ocaml-cppo)))
|
||||
`(("ocaml-cppo" ,ocaml-cppo)))
|
||||
(home-page "https://github.com/ygrek/ocaml-extlib")
|
||||
(synopsis "Complete and small extension for OCaml standard library")
|
||||
(description "This library adds new functions to OCaml standard library
|
||||
@@ -992,29 +976,30 @@ compilers that can directly deal with packages.")
|
||||
`(("m4" ,m4)
|
||||
("ocaml" ,ocaml-4.07)))))
|
||||
|
||||
;; note that some tests may hang for no obvious reason.
|
||||
(define-public ocaml-ounit
|
||||
(define-public ocaml-ounit2
|
||||
(package
|
||||
(name "ocaml-ounit")
|
||||
(version "2.0.8")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (ocaml-forge-uri "ounit" version 1749))
|
||||
(sha256
|
||||
(base32
|
||||
"03ifp9hjcxg4m5j190iy373jcn4039d3vy10kmd8p4lfciwzwc1f"))))
|
||||
(build-system ocaml-build-system)
|
||||
(name "ocaml-ounit2")
|
||||
(version "2.2.3")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/gildor478/ounit")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"12bsyk5g64rsa94khyl32pjj3fvc58av4vxqrjb3jy14cqyh95y1"))))
|
||||
(build-system dune-build-system)
|
||||
(native-inputs
|
||||
`(("libxml2" ,libxml2) ; for xmllint
|
||||
`(("libxml2" ,libxml2)
|
||||
("ocamlbuild" ,ocamlbuild)))
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'check)))) ; tests are run during build
|
||||
(home-page "http://ounit.forge.ocamlcore.org")
|
||||
`(#:package "ounit"))
|
||||
(home-page "https://github.com/gildor478/ounit")
|
||||
(synopsis "Unit testing framework for OCaml")
|
||||
(description "Unit testing framework for OCaml. It is similar to JUnit and
|
||||
other XUnit testing frameworks.")
|
||||
(description "Unit testing framework for OCaml.
|
||||
It is similar to JUnit and other XUnit testing frameworks.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public camlzip
|
||||
|
||||
Reference in New Issue
Block a user