From 2b4d2a4d0a100b67397eeb76f55e1cc20be4ae75 Mon Sep 17 00:00:00 2001 From: Peter Kreye Date: Sat, 13 Jan 2018 05:14:18 -0600 Subject: gnu: ocaml-findlib-1.7.3: Fix install. * gnu/packages/ocaml.scm (ocaml-findlib-1.7.3): install topfind to lib/ocaml/site-lib Signed-off-by: Julien Lepiller --- gnu/packages/ocaml.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/ocaml.scm') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index eab84c6981..6648f5ba40 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2016, 2017 Julien Lepiller ;;; Copyright © 2017 Ben Woodcroft ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018 Peter Kreye ;;; ;;; This file is part of GNU Guix. ;;; @@ -918,7 +919,7 @@ compilers that can directly deal with packages.") (let ((out (assoc-ref outputs "out"))) (zero? (system* "make" "install" (string-append "OCAML_CORE_STDLIB=" - out)))))))))))) + out "/lib/ocaml/site-lib")))))))))))) (define-public ocaml4.01-findlib (package -- cgit v1.2.3 From edac535493e42ca836fb5c432297cb4882f0e07b Mon Sep 17 00:00:00 2001 From: Peter Kreye Date: Sat, 13 Jan 2018 05:14:55 -0600 Subject: gnu: Add ocaml-integers. * gnu/packages/ocaml.scm (ocaml-integes): New variable. Signed-off-by: Julien Lepiller --- gnu/packages/ocaml.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu/packages/ocaml.scm') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 6648f5ba40..1d5144e875 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3740,6 +3740,37 @@ terminal or in Emacs. It supports line editing, history, real-time and context sensitive completion, colors, and more.") (license license:bsd-3))) +(define-public ocaml-integers + (package + (name "ocaml-integers") + (version "0.2.2") + (home-page "https://github.com/ocamllabs/ocaml-integers") + (source (origin + (method url-fetch) + (uri (string-append home-page + "/releases/download/v0.2.2/integers-" + version ".tbz")) + (file-name (string-append name "-" version ".tbz")) + (sha256 + (base32 + "08b1ljw88ny3l0mdq6xmffjk8anfc77igryva5jz1p6f4f746ywk")))) + (build-system ocaml-build-system) + (arguments + `(#:tests? #f; no tests + #:build-flags (list "build") + #:phases + (modify-phases %standard-phases + (delete 'configure)))) + (inputs + `(("findlib" ,ocaml-findlib-1.7.3) + ("topkg" ,ocaml-topkg) + ("opam", opam))) + (synopsis "Various signed and unsigned integer types for OCaml") + (description "The ocaml-integers library provides a number of 8-, 16-, 32- +and 64-bit signed and unsigned integer types, together with aliases such as +long and size_t whose sizes depend on the host platform.") + (license license:expat))) + (define-public coq-flocq (package (name "coq-flocq") -- cgit v1.2.3 From 69d08bb131c507550643d33e63526c00ed8c0e43 Mon Sep 17 00:00:00 2001 From: Peter Kreye Date: Sat, 13 Jan 2018 05:24:18 -0600 Subject: gnu: Add ocaml-ctypes. * gnu/packages/ocaml.scm (ocaml-ctypes): New variable. Signed-off-by: Julien Lepiller --- gnu/packages/ocaml.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) (limited to 'gnu/packages/ocaml.scm') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 1d5144e875..021dabf835 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -43,6 +43,7 @@ #:use-module (gnu packages gnome) #:use-module (gnu packages gtk) #:use-module (gnu packages libevent) + #:use-module (gnu packages libffi) #:use-module (gnu packages llvm) #:use-module (gnu packages m4) #:use-module (gnu packages multiprecision) @@ -3771,6 +3772,45 @@ and 64-bit signed and unsigned integer types, together with aliases such as long and size_t whose sizes depend on the host platform.") (license license:expat))) +(define-public ocaml-ctypes + (package + (name "ocaml-ctypes") + (version "0.13.1") + (home-page "https://github.com/ocamllabs/ocaml-ctypes") + (source (origin + (method url-fetch) + (uri (string-append home-page "/archive/" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "17w0pr5k0zjcjns4y9n36rjpfl35zhvp3h8ggqs9lz12qhshdk2m")))) + (build-system ocaml-build-system) + (arguments + `(#:findlib ,ocaml-findlib-1.7.3 + #:make-flags + (list (string-append "INSTALL_HEADERS = $(wildcard $($(PROJECT).dir)/*.h)")) + #:phases + (modify-phases %standard-phases + (delete 'configure)))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("libffi" ,libffi) + ("ounit" ,ocaml-ounit) + ("integers" ,ocaml-integers) + ("lwt" ,ocaml-lwt) + ("topkg" ,ocaml-topkg) + ("opam", opam))) + (synopsis "Library for binding to C libraries using pure OCaml") + (description "Ctypes is a library for binding to C libraries using pure +OCaml. The primary aim is to make writing C extensions as straightforward as +possible. The core of ctypes is a set of combinators for describing the +structure of C types -- numeric types, arrays, pointers, structs, unions and +functions. You can use these combinators to describe the types of the +functions that you want to call, then bind directly to those functions -- all +without writing or generating any C!") + (license license:expat))) + (define-public coq-flocq (package (name "coq-flocq") -- cgit v1.2.3 From c98c82370462f8c06c420175dcc47fc1a64cf68d Mon Sep 17 00:00:00 2001 From: Peter Kreye Date: Sat, 13 Jan 2018 05:25:52 -0600 Subject: gnu: Add ocaml-ocb-stubblr. * gnu/packages/ocaml.scm (ocaml-ocb-stubblr): New variable. Signed-off-by: Julien Lepiller --- gnu/packages/ocaml.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu/packages/ocaml.scm') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 021dabf835..1ecd9ab540 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3811,6 +3811,38 @@ functions that you want to call, then bind directly to those functions -- all without writing or generating any C!") (license license:expat))) +(define-public ocaml-ocb-stubblr + (package + (name "ocaml-ocb-stubblr") + (version "0.1.1") + (home-page "https://github.com/pqwy/ocb-stubblr") + (source (origin + (method url-fetch) + (uri (string-append + home-page "/releases/download/v0.1.1/ocb-stubblr-" + version ".tbz")) + (file-name (string-append name "-" version ".tbz")) + (sha256 + (base32 + "167b7x1j21mkviq8dbaa0nmk4rps2ilvzwx02igsc2706784z72f")))) + (build-system ocaml-build-system) + (arguments + `(#:findlib ,ocaml-findlib-1.7.3 + #:build-flags (list "build" "--tests" "true") + #:phases + (modify-phases %standard-phases + (delete 'configure)))) + (inputs + `(("topkg" ,ocaml-topkg) + ("opam", opam))) + (native-inputs + `(("astring" ,ocaml-astring))) + (synopsis "OCamlbuild plugin for C stubs") + (description "Ocb-stubblr is about ten lines of code that you need to +repeat over, over, over and over again if you are using ocamlbuild to build +OCaml projects that contain C stubs.") + (license license:isc))) + (define-public coq-flocq (package (name "coq-flocq") -- cgit v1.2.3 From a9e9fd15068ee7901c905a1a9bff14ecf50f2ad0 Mon Sep 17 00:00:00 2001 From: Peter Kreye Date: Sat, 13 Jan 2018 05:26:37 -0600 Subject: gnu: Add ocaml-tsdl. * gnu/packages/ocaml.scm (ocaml-tsdl): New variable. Signed-off-by: Julien Lepiller --- gnu/packages/ocaml.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'gnu/packages/ocaml.scm') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 1ecd9ab540..64031dfbbb 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -53,6 +53,7 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages protobuf) #:use-module (gnu packages python) + #:use-module (gnu packages sdl) #:use-module (gnu packages tex) #:use-module (gnu packages texinfo) #:use-module (gnu packages time) @@ -3843,6 +3844,41 @@ repeat over, over, over and over again if you are using ocamlbuild to build OCaml projects that contain C stubs.") (license license:isc))) +(define-public ocaml-tsdl + (package + (name "ocaml-tsdl") + (version "0.9.1") + (home-page "http://erratique.ch/software/tsdl") + (source (origin + (method url-fetch) + (uri (string-append home-page "/releases/tsdl-" + version ".tbz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "08bb97fhvz829fb0sgjn2p20mp7b04v98zy2qxpk2w390a6c4b34")))) + (build-system ocaml-build-system) + (arguments + `(#:build-flags '("build") + #:tests? #f; tests require a display device + #:phases + (modify-phases %standard-phases + (delete 'configure)))) + (native-inputs + `(("opam" ,opam) + ("pkg-config" ,pkg-config))) + (inputs + `(("findlib" ,ocaml-findlib-1.7.3) + ("topkg" ,ocaml-topkg) + ("result" ,ocaml-result) + ("sdl2" ,sdl2) + ("integers" ,ocaml-integers) + ("ctypes" ,ocaml-ctypes))) + (synopsis "Thin bindings to SDL for OCaml") + (description "Tsdl is an OCaml library providing thin bindings to the +cross-platform SDL C library.") + (license license:isc))) + (define-public coq-flocq (package (name "coq-flocq") -- cgit v1.2.3 From bff6739d5ea513417bb491a61aa276c4fb7ddd43 Mon Sep 17 00:00:00 2001 From: Peter Kreye Date: Sat, 13 Jan 2018 05:27:36 -0600 Subject: gnu: ocaml-findlib: Update to 1.7.3. * 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 --- gnu/packages/ocaml.scm | 47 +++++++++++++---------------------------------- 1 file changed, 13 insertions(+), 34 deletions(-) (limited to 'gnu/packages/ocaml.scm') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 64031dfbbb..2b62c1cdf4 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -851,15 +851,14 @@ 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) @@ -881,6 +880,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"))) @@ -901,28 +906,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) @@ -3729,7 +3712,7 @@ instead of bindings to a C library.") ("cppo" ,ocaml-cppo) ("jbuilder" ,ocaml-jbuilder))) (propagated-inputs - `(("findlib" ,ocaml-findlib-1.7.3) + `(("ocaml-findlib" ,ocaml-findlib) ("lambda-term" ,ocaml-lambda-term) ("lwt" ,ocaml-lwt) ("react" ,ocaml-react) @@ -3764,8 +3747,7 @@ sensitive completion, colors, and more.") (modify-phases %standard-phases (delete 'configure)))) (inputs - `(("findlib" ,ocaml-findlib-1.7.3) - ("topkg" ,ocaml-topkg) + `(("topkg" ,ocaml-topkg) ("opam", opam))) (synopsis "Various signed and unsigned integer types for OCaml") (description "The ocaml-integers library provides a number of 8-, 16-, 32- @@ -3787,8 +3769,7 @@ long and size_t whose sizes depend on the host platform.") "17w0pr5k0zjcjns4y9n36rjpfl35zhvp3h8ggqs9lz12qhshdk2m")))) (build-system ocaml-build-system) (arguments - `(#:findlib ,ocaml-findlib-1.7.3 - #:make-flags + `(#:make-flags (list (string-append "INSTALL_HEADERS = $(wildcard $($(PROJECT).dir)/*.h)")) #:phases (modify-phases %standard-phases @@ -3828,8 +3809,7 @@ without writing or generating any C!") "167b7x1j21mkviq8dbaa0nmk4rps2ilvzwx02igsc2706784z72f")))) (build-system ocaml-build-system) (arguments - `(#:findlib ,ocaml-findlib-1.7.3 - #:build-flags (list "build" "--tests" "true") + `(#:build-flags (list "build" "--tests" "true") #:phases (modify-phases %standard-phases (delete 'configure)))) @@ -3868,8 +3848,7 @@ OCaml projects that contain C stubs.") `(("opam" ,opam) ("pkg-config" ,pkg-config))) (inputs - `(("findlib" ,ocaml-findlib-1.7.3) - ("topkg" ,ocaml-topkg) + `(("topkg" ,ocaml-topkg) ("result" ,ocaml-result) ("sdl2" ,sdl2) ("integers" ,ocaml-integers) -- cgit v1.2.3