From mboxrd@z Thu Jan 1 00:00:00 1970 From: Cyril Roelandt Subject: =?UTF-8?q?=5BPATCH=20v2=5D=20gnu=3A=20Add=20OCaml=2E=20licenses=3A=20Add=20QPL=2E?= Date: Wed, 23 Jan 2013 21:16:22 +0100 Message-ID: <1358972182-3306-1-git-send-email-tipecaml@gmail.com> References: <87mww28f2x.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Return-path: Received: from eggs.gnu.org ([208.118.235.92]:47861) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ty6uL-0000xD-99 for bug-guix@gnu.org; Wed, 23 Jan 2013 15:26:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ty6uF-0007U4-Q4 for bug-guix@gnu.org; Wed, 23 Jan 2013 15:26:53 -0500 Received: from mail-wg0-f50.google.com ([74.125.82.50]:53508) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ty6uF-0007TJ-H7 for bug-guix@gnu.org; Wed, 23 Jan 2013 15:26:47 -0500 Received: by mail-wg0-f50.google.com with SMTP id es5so1371952wgb.17 for ; Wed, 23 Jan 2013 12:26:46 -0800 (PST) In-Reply-To: <87mww28f2x.fsf@gnu.org> List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org Sender: bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org To: bug-guix@gnu.org * gnu/packages/ocaml.scm: New file. * Makefile.am (MODULES): Add it. * guix/licenses.scm: New variable. --- On 01/21/2013 09:18 PM, Ludovic Courtès wrote: > Alternately, you could move the ‘check’ phase after the install phase, > like this (untested): Thanks, that worked. Here is a second version of the patch, which seems to work. WBR, Cyril Roelandt. Makefile.am | 1 + gnu/packages/ocaml.scm | 79 ++++++++++++++++++++++++++++++++++++++++++++++++ guix/licenses.scm | 6 ++++ 3 files changed, 86 insertions(+) create mode 100644 gnu/packages/ocaml.scm diff --git a/Makefile.am b/Makefile.am index 54e80cc..f80f166 100644 --- a/Makefile.am +++ b/Makefile.am @@ -108,6 +108,7 @@ MODULES = \ gnu/packages/ncurses.scm \ gnu/packages/netpbm.scm \ gnu/packages/nettle.scm \ + gnu/packages/ocaml.scm \ gnu/packages/openssl.scm \ gnu/packages/oggvorbis.scm \ gnu/packages/perl.scm \ diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm new file mode 100644 index 0000000..71974e2 --- /dev/null +++ b/gnu/packages/ocaml.scm @@ -0,0 +1,79 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2013 Cyril Roelandt +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages ocaml) + #:use-module (guix licenses) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix build-system gnu) + #:use-module (gnu packages) + #:use-module (gnu packages perl)) + +(define-public ocaml + (package + (name "ocaml") + (version "4.00.1") + (source (origin + (method url-fetch) + (uri (string-append + "http://caml.inria.fr/pub/distrib/ocaml-4.00/ocaml-" + version ".tar.gz")) + (sha256 + (base32 + "0yp86napnvbi2jgxr6bk1235bmjdclgzrzgq4mhwv87l7dymr3dl")))) + (build-system gnu-build-system) + (arguments + `(#:modules ((guix build gnu-build-system) + (guix build utils) + (srfi srfi-1)) + #:phases (alist-replace + 'configure + (lambda* (#:key outputs #:allow-other-keys) + ;; OCaml uses "-prefix " rather than the usual + ;; "--prefix=". + (let ((out (assoc-ref outputs "out"))) + (zero? (system* "./configure" "-prefix" out)))) + (alist-replace + 'build + (lambda* (#:key outputs #:allow-other-keys) + ;; "make" does not do anything, we must use + ;; "make world.opt". + (zero? (system* "make" "world.opt"))) + (alist-replace + 'check-after-install + (lambda* (#:key outputs #:allow-other-keys) + ;; There does not seem to be a "check" or "test" target. + (zero? (system "cd testsuite && make all"))) + (let ((check (assq-ref %standard-phases 'check))) + ;; OCaml assumes that "make install" is run before + ;; launching the tests. + (alist-cons-after + 'install 'check-after-install + check + (alist-delete 'check %standard-phases)))))))) + (inputs + `(("perl", perl) + )) + (home-page "http://www.ocaml.org/") + (synopsis "The OCaml programming language") + (description + "OCaml is a general purpose industrial-strength programming language with +an emphasis on expressiveness and safety. Developed for more than 20 years at +Inria it benefits from one of the most advanced type systems and supports +functional, imperative and object-oriented styles of programming.") + (license '(qpl gpl2)))) diff --git a/guix/licenses.scm b/guix/licenses.scm index 93af865..c636cc5 100644 --- a/guix/licenses.scm +++ b/guix/licenses.scm @@ -36,6 +36,7 @@ mpl2.0 openldap2.8 openssl psfl public-domain + qpl vim x11 zlib)) @@ -213,6 +214,11 @@ which may be a file:// URI pointing the package's tree." "http://directory.fsf.org/wiki/License:PublicDomain" "https://www.gnu.org/licenses/license-list#PublicDomain")) +(define qpl + (license "QPL" + "http://directory.fsf.org/wiki/License:QPLv1.0" + "http://www.gnu.org/licenses/license-list.html#QPL")) + (define vim (license "Vim" "http://directory.fsf.org/wiki/License:Vim7.2" -- 1.7.10.4