aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXinglu Chen <public@yoctocell.xyz>2021-06-19 17:50:35 +0200
committerJulien Lepiller <julien@lepiller.eu>2021-06-20 02:13:24 +0200
commit97d3a9f781ac4e436cad4a7c1a59de8f48baec0c (patch)
treea89c912b13f6fee7723374675a0785ac50b1d043
parent376b16e9a180ddef1aca795a3acf2512561976ef (diff)
downloadguix-97d3a9f781ac4e436cad4a7c1a59de8f48baec0c.tar.gz
guix-97d3a9f781ac4e436cad4a7c1a59de8f48baec0c.zip
gnu: ocaml4.07-expect: Switch to default OCaml compiler.
* gnu/packages/ocaml.scm (ocaml4.07-expect): Rename to ‘ocaml-expect’. [arguments]: Use default OCaml compiler. [native-inputs]: Use ‘ocaml-*’ packages instead of ‘ocaml4.07-*’. [propagated-inputs]: Likewise. [description]: Make it a full sentence. Signed-off-by: Julien Lepiller <julien@lepiller.eu>
-rw-r--r--gnu/packages/ocaml.scm23
1 files changed, 11 insertions, 12 deletions
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index a6637c83ff..549009eb09 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -3148,9 +3148,9 @@ matching and substitution, similar to the functionality offered by the Perl
language.")
(license license:lgpl2.1+))); with the OCaml link exception
-(define-public ocaml4.07-expect
+(define-public ocaml-expect
(package
- (name "ocaml4.07-expect")
+ (name "ocaml-expect")
(version "0.0.6")
(source (origin
(method url-fetch)
@@ -3159,21 +3159,20 @@ language.")
(base32
"098qvg9d4yrqzr5ax291y3whrpax0m3sx4gi6is0mblc96r9yqk0"))))
(arguments
- `(#:tests? #f
- #:ocaml ,ocaml-4.07
- #:findlib ,ocaml4.07-findlib))
+ `(#:tests? #f))
(build-system ocaml-build-system)
(native-inputs
- `(("ocamlbuild" ,(package-with-ocaml4.07 ocamlbuild))
- ("ocaml-num" ,(package-with-ocaml4.07 ocaml-num))
- ("ocaml-pcre" ,ocaml4.07-pcre)
- ("ounit" ,(package-with-ocaml4.07 ocaml-ounit))))
+ `(("ocamlbuild" ,ocamlbuild)
+ ("ocaml-num" ,ocaml-num)
+ ("ocaml-pcre" ,ocaml-pcre)
+ ("ounit" ,ocaml-ounit)))
(propagated-inputs
- `(("batteries" ,(package-with-ocaml4.07 ocaml-batteries))))
+ `(("batteries" ,ocaml-batteries)))
(home-page "https://forge.ocamlcore.org/projects/ocaml-expect/")
(synopsis "Simple implementation of expect")
- (description "Help building unitary testing of interactive program. You
-can match the question using a regular expression or a timeout.")
+ (description "This package provides utilities for building unitary testing
+of interactive program. You can match the question using a regular expression
+or a timeout.")
(license license:lgpl2.1+))) ; with the OCaml static compilation exception
(define-public ocaml-stdlib-shims