1
0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2026-07-11 16:04:07 +02:00

Compare commits

...

7 Commits

Author SHA1 Message Date
Brett Gilio 9fdef4d61a gnu: ocaml-4.11: Add comment about check phase.
* gnu/packages/ocaml.scm (ocaml-4.11): The check phase is currently
skipping all tests with an error. Add a comment to fix this.
2020-08-30 19:13:25 -05:00
Brett Gilio 5180552e98 gnu: ocaml-ounit: Update to 2.2.3 and rename.
* gnu/packages/ocaml.scm (ocaml-ounit): Update to 2.2.3 and rename.

[definition]: Rename to ocaml-ounit2.
[source]: Replace url-fetch with git-fetch.
[native-inputs]: Remove comment.
[build-system]: Change to dune-build-system.
[arguments]: Remove deletion of check phase, and specify package field.
[description]: Respace to align with column-width.
2020-08-30 18:36:08 -05:00
Brett Gilio f2feb9b9df gnu: ocaml-extlib: Adjust indentation.
* gnu/packages/ocaml.scm (ocaml-extlib): Adjust indentation.
2020-08-30 18:15:30 -05:00
Brett Gilio c9f4cb161d gnu: ocamlbuild: Revise license.
* gnu/packages/ocaml.scm (ocamlbuild)[license]: License is actually LGPL2.0.
2020-08-30 18:11:44 -05:00
Brett Gilio 63a6145828 gnu: ocaml-4.07: Inherit from ocaml-4.11
* gnu/packages/ocaml.scm (ocaml-4.07): Update inheritance to reflect latest
OCaml.
2020-08-30 18:10:57 -05:00
Brett Gilio f8bfd4aa45 gnu: ocaml: Use ocaml-4.11.
* gnu/packages/ocaml.scm (ocaml): Update reference package to ocaml-4.11.
2020-08-30 18:03:05 -05:00
Brett Gilio 9f48b55252 gnu: ocaml-4.09: Update to 4.11.0.
* gnu/packages/ocaml.scm (ocaml-4.09): Update to 4.11.0.

[definition]: Rename to match current OCaml version.
[arguments]: Remove patch-/bin/sh-references phase.
[arguments]: Run "make tests" in check phase.
[arguments]: Have all phases return #t
2020-08-30 18:00:54 -05:00
+36 -51
View File
@@ -132,10 +132,10 @@
"/lib/ocaml/site-lib")) "/lib/ocaml/site-lib"))
#:phases (modify-phases %standard-phases (delete 'configure)))) #:phases (modify-phases %standard-phases (delete 'configure))))
(define-public ocaml-4.09 (define-public ocaml-4.11
(package (package
(name "ocaml") (name "ocaml")
(version "4.09.0") (version "4.11.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@@ -144,7 +144,7 @@
"/ocaml-" version ".tar.xz")) "/ocaml-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1v3z5ar326f3hzvpfljg4xj8b9lmbrl53fn57yih1bkbx3gr3yzj")))) "04b13yfismkqh21ag641q9dl0i602khgh4427g1a7pb77c4skr7z"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-search-paths (native-search-paths
(list (search-path-specification (list (search-path-specification
@@ -165,31 +165,18 @@
(arguments (arguments
`(#:phases `(#:phases
(modify-phases %standard-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 (replace 'build
(lambda _ (lambda _
(invoke "make" "-j" (number->string (parallel-job-count)) (invoke "make" "-j"
"world.opt"))) (number->string (parallel-job-count))
"world.opt")
#t))
;; FIXME: Test phases are not run.
;; "-find-test-dirs: command not found"
(replace 'check (replace 'check
(lambda _ (lambda _
(with-directory-excursion "testsuite" (invoke "make" "tests")
(invoke "make" "all"))))))) #t)))))
(home-page "https://ocaml.org/") (home-page "https://ocaml.org/")
(synopsis "The OCaml programming language") (synopsis "The OCaml programming language")
(description (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 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 Inria it benefits from one of the most advanced type systems and supports
functional, imperative and object-oriented styles of programming.") functional, imperative and object-oriented styles of programming.")
;; The compiler is distributed under qpl1.0 with a change to choice of (license license:lgpl2.1)))
;; law: the license is governed by the laws of France. The library is
;; distributed under lgpl2.0.
(license (list license:qpl license:lgpl2.0))))
(define-public ocaml-4.07 (define-public ocaml-4.07
(package (package
(inherit ocaml-4.09) (inherit ocaml-4.11)
(version "4.07.1") (version "4.07.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
@@ -229,7 +213,7 @@ functional, imperative and object-oriented styles of programming.")
"--prefix" out "--prefix" out
"--mandir" mandir)))))))))) "--mandir" mandir))))))))))
(define-public ocaml ocaml-4.09) (define-public ocaml ocaml-4.11)
(define-public ocamlbuild (define-public ocamlbuild
(package (package
@@ -257,13 +241,13 @@ functional, imperative and object-oriented styles of programming.")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(delete 'configure)) (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)) #:tests? #f))
(home-page "https://github.com/ocaml/ocamlbuild") (home-page "https://github.com/ocaml/ocamlbuild")
(synopsis "OCaml build tool") (synopsis "OCaml build tool")
(description "OCamlbuild is a generic build tool, that has built-in rules (description "OCamlbuild is a generic build tool, that has built-in rules
for building OCaml library and programs.") for building OCaml library and programs.")
(license license:lgpl2.1+))) (license license:lgpl2.0)))
(define-public ocaml-extlib (define-public ocaml-extlib
(package (package
@@ -282,7 +266,7 @@ for building OCaml library and programs.")
(modify-phases %standard-phases (modify-phases %standard-phases
(delete 'configure)))) (delete 'configure))))
(native-inputs (native-inputs
`(("ocaml-cppo" ,ocaml-cppo))) `(("ocaml-cppo" ,ocaml-cppo)))
(home-page "https://github.com/ygrek/ocaml-extlib") (home-page "https://github.com/ygrek/ocaml-extlib")
(synopsis "Complete and small extension for OCaml standard library") (synopsis "Complete and small extension for OCaml standard library")
(description "This library adds new functions to 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) `(("m4" ,m4)
("ocaml" ,ocaml-4.07))))) ("ocaml" ,ocaml-4.07)))))
;; note that some tests may hang for no obvious reason. (define-public ocaml-ounit2
(define-public ocaml-ounit
(package (package
(name "ocaml-ounit") (name "ocaml-ounit2")
(version "2.0.8") (version "2.2.3")
(source (origin (source
(method url-fetch) (origin
(uri (ocaml-forge-uri "ounit" version 1749)) (method git-fetch)
(sha256 (uri (git-reference
(base32 (url "https://github.com/gildor478/ounit")
"03ifp9hjcxg4m5j190iy373jcn4039d3vy10kmd8p4lfciwzwc1f")))) (commit (string-append "v" version))))
(build-system ocaml-build-system) (file-name (git-file-name name version))
(sha256
(base32
"12bsyk5g64rsa94khyl32pjj3fvc58av4vxqrjb3jy14cqyh95y1"))))
(build-system dune-build-system)
(native-inputs (native-inputs
`(("libxml2" ,libxml2) ; for xmllint `(("libxml2" ,libxml2)
("ocamlbuild" ,ocamlbuild))) ("ocamlbuild" ,ocamlbuild)))
(arguments (arguments
`(#:phases `(#:package "ounit"))
(modify-phases %standard-phases (home-page "https://github.com/gildor478/ounit")
(delete 'check)))) ; tests are run during build
(home-page "http://ounit.forge.ocamlcore.org")
(synopsis "Unit testing framework for OCaml") (synopsis "Unit testing framework for OCaml")
(description "Unit testing framework for OCaml. It is similar to JUnit and (description "Unit testing framework for OCaml.
other XUnit testing frameworks.") It is similar to JUnit and other XUnit testing frameworks.")
(license license:expat))) (license license:expat)))
(define-public camlzip (define-public camlzip