From patchwork Fri Dec 16 13:25:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 45357 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id E20E927BBEB; Fri, 16 Dec 2022 13:27:08 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2998F27BBE9 for ; Fri, 16 Dec 2022 13:27:08 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p6Aiz-0005kD-1b; Fri, 16 Dec 2022 08:26:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p6Aiw-0005iT-Rl for guix-patches@gnu.org; Fri, 16 Dec 2022 08:26:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p6Aiw-000784-Ch for guix-patches@gnu.org; Fri, 16 Dec 2022 08:26:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p6Aiw-00033L-7r for guix-patches@gnu.org; Fri, 16 Dec 2022 08:26:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60120] [PATCH 01/28] gnu: Add ocaml-5.0. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 16 Dec 2022 13:26:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60120 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60120@debbugs.gnu.org Cc: pukkamustard Received: via spool by 60120-submit@debbugs.gnu.org id=B60120.167119714011547 (code B ref 60120); Fri, 16 Dec 2022 13:26:02 +0000 Received: (at 60120) by debbugs.gnu.org; 16 Dec 2022 13:25:40 +0000 Received: from localhost ([127.0.0.1]:49255 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6Aia-00030B-BW for submit@debbugs.gnu.org; Fri, 16 Dec 2022 08:25:40 -0500 Received: from mout02.posteo.de ([185.67.36.66]:56895) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6AiY-0002zz-Bp for 60120@debbugs.gnu.org; Fri, 16 Dec 2022 08:25:39 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 49B33240104 for <60120@debbugs.gnu.org>; Fri, 16 Dec 2022 14:25:32 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1671197132; bh=JE7pmf//4dSar+IiNFkbuvDwYqVfCGC2Xzfl9h0Wt4s=; h=From:To:Cc:Subject:Date:From; b=kxNzsKbpuWwNHbztbfpW6/rSYlx8h0bJzoPqhrAbem1tGgGtAXPBySmkWgIP4vkHo PmcErPP5zjnev25jJdmtvDvqtS57F0WaUY/+4tGZ3yRTJT3RD7ivbq/d4sxbUrfzVL k7e6PuqQaDvSyR8bQWRH5qtjw9WwXY5mqL3XbtiBHOijDwMiAxBz6eZoYgivvZlXkb i/uieG91FHEFlAQcwrfgn77Uhj96bPWIwluzSRcUcen8oT77p1lTzlpvN+saf0q0Ii wi1+GVsAwiOz95kLpdd3zHIwEBOe4oH87Sp4cmgRZEykBqFzN16O0RLZhsseTfhpsu MCz9tLn7BypuQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4NYVGM53vjz6tm4; Fri, 16 Dec 2022 14:25:31 +0100 (CET) From: pukkamustard Date: Fri, 16 Dec 2022 13:25:00 +0000 Message-Id: <20221216132527.2539-1-pukkamustard@posteo.net> In-Reply-To: <20221216132224.2229-1-pukkamustard@posteo.net> References: <20221216132224.2229-1-pukkamustard@posteo.net> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ocaml.scm (ocaml-5.0): New variable. --- gnu/packages/ocaml.scm | 60 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index e0bedf74f9..ae8b0c8ee1 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -185,6 +185,66 @@ (define-public camlboot This package produces a native @command{ocamlc} and a bytecode @command{ocamllex}.") (license license:expat)))) +(define-public ocaml-5.0 + (package + (name "ocaml") + (version "5.0.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ocaml/ocaml") + (commit version))) + (sha256 + (base32 + "1p0p8wldrnbr61wfy3x4122017g4k5gjvfwlg3mvlqn8r2fxn2m5")))) + (build-system gnu-build-system) + (native-search-paths + (list (search-path-specification + (variable "OCAMLPATH") + (files (list "lib/ocaml" "lib/ocaml/site-lib"))) + (search-path-specification + (variable "CAML_LD_LIBRARY_PATH") + (files (list "lib/ocaml/site-lib/stubslibs" + "lib/ocaml/site-lib/stublibs"))))) + (native-inputs + (list perl pkg-config)) + (inputs + (list libx11 libiberty ;needed for objdump support + zlib)) ;also needed for objdump support + (arguments + `(#:configure-flags '("--enable-ocamltest") + #:test-target "tests" + #:make-flags '("world.opt") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-/bin/sh-references + (lambda* (#:key inputs #:allow-other-keys) + (let* ((sh (search-input-file inputs "/bin/sh")) + (quoted-sh (string-append "\"" sh "\""))) + (with-fluids ((%default-port-encoding #f)) + (for-each + (lambda (file) + (substitute* file + (("\"/bin/sh\"") + (begin + (format (current-error-port) "\ +patch-/bin/sh-references: ~a: changing `\"/bin/sh\"' to `~a'~%" + file quoted-sh) + quoted-sh)))) + (find-files "." "\\.ml$"))))))))) + (home-page "https://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.") + ;; The compiler is distributed under qpl1.0 with a change to choice of + ;; law: the license is governed by the laws of France. The library is + ;; distributed under lgpl2.0. + (license (list license:qpl license:lgpl2.0)))) + + (define-public ocaml-4.14 (package (name "ocaml")