ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-25 22:08:16 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: ocaml-findlib: Update to 1.7.3.

Browse source 
* gnu/packages/ocaml.scm (ocaml-findlib): Update to 1.7.3.
* gnu/packages/ocaml.scm (ocaml-findlib-1.7.3): Removed.

Signed-off-by: Julien Lepiller <julien@lepiller.eu>
This commit is contained in:
Peter Kreye 2018-01-13 05:27:36 -06:00 committed by Julien Lepiller
parent a9e9fd1506
commit bff6739d5e
No known key found for this signature in database
GPG key ID: 43111F4520086A0C
1 changed files with 13 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
gnu/packages/ocaml.scm
View file

@ -851,15 +851,14 @@ (define-public unison
(define-public ocaml-findlib (define-public ocaml-findlib
(package (package
(name "ocaml-findlib") (name "ocaml-findlib")
(version "1.6.1") (version "1.7.3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://download.camlcity.org/download/" (uri (string-append "http://download.camlcity.org/download/"
"findlib" "-" version ".tar.gz")) "findlib" "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"02abg1lsnwvjg3igdyb8qjgr5kv1nbwl4gaf8mdinzfii5p82721")) "12xx8si1qv3xz90qsrpazjjk4lc1989fzm97rsmc4diwla7n15ni"))))
(patches (search-patches "ocaml-findlib-make-install.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("camlp4" ,camlp4) `(("camlp4" ,camlp4)
@ -881,6 +880,12 @@ (define-public ocaml-findlib
"-mandir" (string-append out "/share/man") "-mandir" (string-append out "/share/man")
"-sitelib" (string-append out "/lib/ocaml/site-lib") "-sitelib" (string-append out "/lib/ocaml/site-lib")
"-with-toolbox")))) "-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 (add-after 'install 'remove-camlp4
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
@ -901,28 +906,6 @@ (define-public ocaml-findlib
compilers that can directly deal with packages.") compilers that can directly deal with packages.")
(license license:x11))) (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 (define-public ocaml4.01-findlib
(package (package
(inherit ocaml-findlib) (inherit ocaml-findlib)
@ -3729,7 +3712,7 @@ (define-public ocaml-utop
("cppo" ,ocaml-cppo) ("cppo" ,ocaml-cppo)
("jbuilder" ,ocaml-jbuilder))) ("jbuilder" ,ocaml-jbuilder)))
(propagated-inputs (propagated-inputs
`(("findlib" ,ocaml-findlib-1.7.3) `(("ocaml-findlib" ,ocaml-findlib)
("lambda-term" ,ocaml-lambda-term) ("lambda-term" ,ocaml-lambda-term)
("lwt" ,ocaml-lwt) ("lwt" ,ocaml-lwt)
("react" ,ocaml-react) ("react" ,ocaml-react)
@ -3764,8 +3747,7 @@ (define-public ocaml-integers
(modify-phases %standard-phases (modify-phases %standard-phases
(delete 'configure)))) (delete 'configure))))
(inputs (inputs
`(("findlib" ,ocaml-findlib-1.7.3) `(("topkg" ,ocaml-topkg)
("topkg" ,ocaml-topkg)
("opam", opam))) ("opam", opam)))
(synopsis "Various signed and unsigned integer types for OCaml") (synopsis "Various signed and unsigned integer types for OCaml")
(description "The ocaml-integers library provides a number of 8-, 16-, 32- (description "The ocaml-integers library provides a number of 8-, 16-, 32-
@ -3787,8 +3769,7 @@ (define-public ocaml-ctypes
"17w0pr5k0zjcjns4y9n36rjpfl35zhvp3h8ggqs9lz12qhshdk2m")))) "17w0pr5k0zjcjns4y9n36rjpfl35zhvp3h8ggqs9lz12qhshdk2m"))))
(build-system ocaml-build-system) (build-system ocaml-build-system)
(arguments (arguments
`(#:findlib ,ocaml-findlib-1.7.3 `(#:make-flags
#:make-flags
(list (string-append "INSTALL_HEADERS = $(wildcard $($(PROJECT).dir)/*.h)")) (list (string-append "INSTALL_HEADERS = $(wildcard $($(PROJECT).dir)/*.h)"))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
@ -3828,8 +3809,7 @@ (define-public ocaml-ocb-stubblr
"167b7x1j21mkviq8dbaa0nmk4rps2ilvzwx02igsc2706784z72f")))) "167b7x1j21mkviq8dbaa0nmk4rps2ilvzwx02igsc2706784z72f"))))
(build-system ocaml-build-system) (build-system ocaml-build-system)
(arguments (arguments
`(#:findlib ,ocaml-findlib-1.7.3 `(#:build-flags (list "build" "--tests" "true")
#:build-flags (list "build" "--tests" "true")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(delete 'configure)))) (delete 'configure))))
@ -3868,8 +3848,7 @@ (define-public ocaml-tsdl
`(("opam" ,opam) `(("opam" ,opam)
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))
(inputs (inputs
`(("findlib" ,ocaml-findlib-1.7.3) `(("topkg" ,ocaml-topkg)
("topkg" ,ocaml-topkg)
("result" ,ocaml-result) ("result" ,ocaml-result)
("sdl2" ,sdl2) ("sdl2" ,sdl2)
("integers" ,ocaml-integers) ("integers" ,ocaml-integers)