[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#30096] [PATCH 6/6] gnu: ocaml-findlib: Update to 1.7.3.
From: |
Peter Kreye |
Subject: |
[bug#30096] [PATCH 6/6] gnu: ocaml-findlib: Update to 1.7.3. |
Date: |
Sat, 13 Jan 2018 05:27:36 -0600 |
User-agent: |
mu4e 0.9.18; emacs 25.3.1 |
* gnu/packages/ocaml.scm (ocaml-findlib): Update to 1.7.3.
* gnu/packages/ocaml.scm (ocaml-findlib-1.7.3): Removed.
---
gnu/packages/ocaml.scm | 45 ++++++++++++++-------------------------------
1 file changed, 14 insertions(+), 31 deletions(-)
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 34458be28..3d2d5c337 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -850,20 +850,19 @@ to the other.")
(define-public ocaml-findlib
(package
(name "ocaml-findlib")
- (version "1.6.1")
+ (version "1.7.3")
(source (origin
(method url-fetch)
(uri (string-append "http://download.camlcity.org/download/"
"findlib" "-" version ".tar.gz"))
(sha256
(base32
- "02abg1lsnwvjg3igdyb8qjgr5kv1nbwl4gaf8mdinzfii5p82721"))
- (patches (search-patches "ocaml-findlib-make-install.patch"))))
+ "12xx8si1qv3xz90qsrpazjjk4lc1989fzm97rsmc4diwla7n15ni"))))
(build-system gnu-build-system)
(native-inputs
`(("camlp4" ,camlp4)
("m4" ,m4)
- ("ocaml" ,ocaml)))
+ ("ocaml" ,ocaml)))
(arguments
`(#:tests? #f ; no test suite
#:parallel-build? #f
@@ -880,6 +879,12 @@ to the other.")
"-mandir" (string-append out "/share/man")
"-sitelib" (string-append out "/lib/ocaml/site-lib")
"-with-toolbox"))))
+ (replace 'install
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out")))
+ (zero? (system* "make" "install"
+ (string-append "OCAML_CORE_STDLIB="
+ out
"/lib/ocaml/site-lib"))))))
(add-after 'install 'remove-camlp4
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
@@ -900,28 +905,6 @@ compilation and linkage, there are new frontends of the
various OCaml
compilers that can directly deal with packages.")
(license license:x11)))
-(define-public ocaml-findlib-1.7.3
- (package
- (inherit ocaml-findlib)
- (version "1.7.3")
- (source (origin
- (method url-fetch)
- (uri (string-append "http://download.camlcity.org/download/"
- "findlib" "-" version ".tar.gz"))
- (sha256
- (base32
- "12xx8si1qv3xz90qsrpazjjk4lc1989fzm97rsmc4diwla7n15ni"))))
- (arguments
- (substitute-keyword-arguments (package-arguments ocaml-findlib)
- ((#:phases phases)
- `(modify-phases ,phases
- (replace 'install
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
- (zero? (system* "make" "install"
- (string-append "OCAML_CORE_STDLIB="
- out
"/lib/ocaml/site-lib"))))))))))))
-
(define-public ocaml4.01-findlib
(package
(inherit ocaml-findlib)
@@ -3728,7 +3711,7 @@ instead of bindings to a C library.")
("cppo" ,ocaml-cppo)
("jbuilder" ,ocaml-jbuilder)))
(propagated-inputs
- `(("findlib" ,ocaml-findlib-1.7.3)
+ `(("findlib" ,ocaml-findlib)
("lambda-term" ,ocaml-lambda-term)
("lwt" ,ocaml-lwt)
("react" ,ocaml-react)
@@ -3768,7 +3751,7 @@ sensitive completion, colors, and more.")
"/lib/ocaml/site-lib")))
(zero? (system* "ocaml" "-I" libdir "pkg/pkg.ml" "build"))))))))
(inputs
- `(("findlib" ,ocaml-findlib-1.7.3)
+ `(("findlib" ,ocaml-findlib)
("topkg" ,ocaml-topkg)
("opam", opam)))
(synopsis "Various signed and unsigned integer types for OCaml")
@@ -3801,7 +3784,7 @@ long and size_t whose sizes depend on the host platform.")
("libffi" ,libffi)
("ounit" ,ocaml-ounit)
("integers" ,ocaml-integers)
- ("findlib" ,ocaml-findlib-1.7.3)
+ ("findlib" ,ocaml-findlib)
("lwt" ,ocaml-lwt)
("topkg" ,ocaml-topkg)
("opam", opam)))
@@ -3841,7 +3824,7 @@ without writing or generating any C!")
"/lib/ocaml/site-lib")))
(zero? (system* "ocaml" "-I" libdir "pkg/pkg.ml" "build"))))))))
(inputs
- `(("findlib" ,ocaml-findlib-1.7.3)
+ `(("findlib" ,ocaml-findlib)
("topkg" ,ocaml-topkg)
("opam", opam)))
(propagated-inputs
@@ -3881,7 +3864,7 @@ OCaml projects that contain C stubs.")
`(("opam" ,opam)
("pkg-config" ,pkg-config)))
(inputs
- `(("findlib" ,ocaml-findlib-1.7.3)
+ `(("findlib" ,ocaml-findlib)
("topkg" ,ocaml-topkg)
("result" ,ocaml-result)
("sdl2" ,sdl2)
--
2.14.2
- [bug#30096] [PATCH 2/6] gnu: Add ocaml-integers., (continued)
[bug#30096] [PATCH 3/6] gnu: Add ocaml-ctypes., Peter Kreye, 2018/01/13
[bug#30096] [PATCH 4/6] gnu: Add ocaml-ocb-stubblr., Peter Kreye, 2018/01/13
[bug#30096] [PATCH 5/6] gnu: Add ocaml-tsdl., Peter Kreye, 2018/01/13
[bug#30096] [PATCH 6/6] gnu: ocaml-findlib: Update to 1.7.3.,
Peter Kreye <=