From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58437) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eaLhH-0002SJ-DT for guix-patches@gnu.org; Sat, 13 Jan 2018 08:18:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eaLhC-0000sl-Cl for guix-patches@gnu.org; Sat, 13 Jan 2018 08:18:07 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:46575) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eaLhC-0000sh-9j for guix-patches@gnu.org; Sat, 13 Jan 2018 08:18:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1eaLhC-0004ic-4z for guix-patches@gnu.org; Sat, 13 Jan 2018 08:18:02 -0500 Subject: [bug#30096] [PATCH 5/6] gnu: Add ocaml-tsdl. Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:58330) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eaLg8-0002Gf-QQ for guix-patches@gnu.org; Sat, 13 Jan 2018 08:16:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eaLg3-0008TA-Sn for guix-patches@gnu.org; Sat, 13 Jan 2018 08:16:56 -0500 Received: from lepiller.eu ([89.234.186.109]:41010) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eaLg3-0008Sh-IZ for guix-patches@gnu.org; Sat, 13 Jan 2018 08:16:51 -0500 Received: from localhost (static-176-182-42-79.ncc.abo.bbox.fr [176.182.42.79]) by lepiller.eu (OpenSMTPD) with ESMTPSA id c55ed756 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for ; Sat, 13 Jan 2018 13:16:59 +0000 (UTC) Date: Sat, 13 Jan 2018 14:16:43 +0100 From: Julien Lepiller Message-ID: <20180113141635.1a2b740e@lepiller.eu> In-Reply-To: <87d12euhhu.fsf@gmail.com> References: <87lgh2uigo.fsf@gmail.com> <87d12euhhu.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 30096@debbugs.gnu.org Le Sat, 13 Jan 2018 05:26:37 -0600, Peter Kreye a =C3=A9crit : > * gnu/packages/ocaml.scm (ocaml-tsdl): New variable. > --- > gnu/packages/ocaml.scm | 44 > +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 43 > insertions(+), 1 deletion(-) >=20 > diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm > index a60922c02..34458be28 100644 > --- a/gnu/packages/ocaml.scm > +++ b/gnu/packages/ocaml.scm > @@ -52,6 +52,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) > @@ -3842,14 +3843,55 @@ without writing or generating any C!") > (inputs > `(("findlib" ,ocaml-findlib-1.7.3) > ("topkg" ,ocaml-topkg) > - ("astring" ,ocaml-astring) > ("opam", opam))) > + (propagated-inputs > + `(("astring" ,ocaml-astring))) This needs to be in the commit message. > (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))) > =20 > +(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 > + `(#:phases > + (modify-phases %standard-phases > + (delete 'configure) > + (replace 'build > + (lambda* (#:key outputs #:allow-other-keys) > + (let ((libdir (string-append (assoc-ref %build-inputs > "findlib") > + "/lib/ocaml/site-lib"))) > + > + (zero? (system* "ocaml" "-I" libdir "pkg/pkg.ml" > "build" "--tests" "false"))))) Don't replace the 'build phase and delete 'check: you just need #:build-flags (list "build") and #:tests? #f. I don't think you need to disable test building. Why not run tests? > + (delete 'check)))) > + (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.") The description has a line that's too long > + (license license:isc))) > + > (define-public coq-flocq > (package > (name "coq-flocq")