From patchwork Thu Jul 28 04:08:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: John Kehayias X-Patchwork-Id: 41023 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 EF6D827BBEA; Thu, 28 Jul 2022 05:09:20 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable 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 1DD4827BBE9 for ; Thu, 28 Jul 2022 05:09:20 +0100 (BST) Received: from localhost ([::1]:41998 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oGupr-0001JN-8p for patchwork@mira.cbaines.net; Thu, 28 Jul 2022 00:09:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56450) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oGupa-0001JC-Ki for guix-patches@gnu.org; Thu, 28 Jul 2022 00:09:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39316) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oGupa-0001hi-BI for guix-patches@gnu.org; Thu, 28 Jul 2022 00:09:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oGupa-0005ZG-54 for guix-patches@gnu.org; Thu, 28 Jul 2022 00:09:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56806] [PATCH 1/9] gnu: Add ocaml-luv. References: <9PX8REXHYFolHkT-TXF_SZcRFDEe1-1KwK9riBoz1tnsKV2raznmLO3YTlzbpdyJ9dBOqnpcaUomHmLfOWjytFrkLEvIW_upqCAA_-byN50=@protonmail.com> In-Reply-To: <9PX8REXHYFolHkT-TXF_SZcRFDEe1-1KwK9riBoz1tnsKV2raznmLO3YTlzbpdyJ9dBOqnpcaUomHmLfOWjytFrkLEvIW_upqCAA_-byN50=@protonmail.com> Resent-From: John Kehayias Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 28 Jul 2022 04:09:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56806 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "56806@debbugs.gnu.org" <56806@debbugs.gnu.org> Received: via spool by 56806-submit@debbugs.gnu.org id=B56806.165898133521384 (code B ref 56806); Thu, 28 Jul 2022 04:09:02 +0000 Received: (at 56806) by debbugs.gnu.org; 28 Jul 2022 04:08:55 +0000 Received: from localhost ([127.0.0.1]:57298 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oGupS-0005Yp-NB for submit@debbugs.gnu.org; Thu, 28 Jul 2022 00:08:55 -0400 Received: from mail-40131.protonmail.ch ([185.70.40.131]:63871) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oGupQ-0005YZ-2t for 56806@debbugs.gnu.org; Thu, 28 Jul 2022 00:08:52 -0400 Date: Thu, 28 Jul 2022 04:08:39 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1658981325; x=1659240525; bh=mMNxz6NV5EJxc9he9JrPF2AxuTbsoAEY0P/yB+xUxw0=; h=Date:To:From:Reply-To:Subject:Message-ID:Feedback-ID:From:To:Cc: Date:Subject:Reply-To:Feedback-ID:Message-ID; b=fH1vgoAVbaGRWoxWI+hfMX6jSVFQoid8BTziyQxvjQKBep6UNzyZE00eCiKG/TN8T 9oap3L7/3xhOl1TgbY5I91MSLyWaJWQFET2tzMEpn0G605NR2N7VkREcczfmrhu0XB niqpQ11ok4cp/4BhduGkfSC38HKRomEwm/HtAzAehPwLYYmjGl9qADg/PXfA2xwNTO koBal108vKuQuG/5qnVoeImv4Dy6GOhInFMeWk9Axat3DLS2zjcB1u0ZwbxqQG9zwP HT+41/pwIC1Hde5ewr1tAbQeaTKv13/ML+Gf3hWel338+5lqA2ceOAG57v5WD2XNOx q8p0sop75uXgw== Message-ID: Feedback-ID: 7805494:user:proton 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" Reply-to: John Kehayias X-ACL-Warn: , John Kehayias via Guix-patches X-Patchwork-Original-From: John Kehayias via Guix-patches via From: John Kehayias X-getmail-retrieved-from-mailbox: Patches Empty Message From d96390019a22b1b01b5845f971e46523a42848e5 Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Wed, 27 Jul 2022 23:31:26 -0400 Subject: [PATCH 1/9] gnu: Add ocaml-luv. * gnu/packages/ocaml.scm (ocaml-luv): New variable. --- gnu/packages/ocaml.scm | 43 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index ff24861eb0..895b99320e 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -25,6 +25,7 @@ ;;; Copyright © 2021 Maxime Devos ;;; Copyright © 2021 Sarah Morgensen ;;; Copyright © 2022 Maxim Cournoyer +;;; Copyright © 2022 John Kehayias ;;; ;;; This file is part of GNU Guix. ;;; @@ -2624,6 +2625,48 @@ (define-public ocaml-lwt locks or other synchronization primitives.") (license license:lgpl2.1))) +(define-public ocaml-luv + (package + (name "ocaml-luv") + (version "0.5.11") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/aantron/luv/releases/download/" + version "/luv-" version ".tar.gz")) + (sha256 + (base32 + "0hrsi8n2l31bcwgj847df4chjgqb9lmwkaky8fvvi15k25rz9v6c")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Remove bundled configure and libuv. + (delete-file-recursively "src/c/vendor") + #t)))) + (build-system dune-build-system) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (add-before 'build 'use-system-libuv + (lambda _ + (setenv "LUV_USE_SYSTEM_LIBUV" "yes"))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "dune" "runtest" "--no-buffer" "--force"))))))) + (inputs (list libuv)) + (propagated-inputs (list ocaml-ctypes ocaml-result ocaml-odoc)) + (native-inputs (list ocaml-base ocaml-alcotest)) + (home-page "https://github.com/aantron/luv") + (synopsis "Binding to libuv: cross-platform asynchronous I/O") + (description + "Luv is a binding to libuv, the cross-platform C library that does +asynchronous I/O in Node.js and runs its main loop. Besides asynchronous I/O, +libuv also supports multiprocessing and multithreading. Multiple event loops +can be run in different threads. libuv also exposes a lot of other +functionality, amounting to a full OS API, and an alternative to the standard +module Unix.") + (license license:expat))) + (define-public ocaml-lwt-react (package (inherit ocaml-lwt) -- 2.37.1 From patchwork Thu Jul 28 04:09:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Kehayias X-Patchwork-Id: 41024 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 0EC6927BBEB; Thu, 28 Jul 2022 05:10:36 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable 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 B801C27BBE9 for ; Thu, 28 Jul 2022 05:10:35 +0100 (BST) Received: from localhost ([::1]:42232 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oGur4-0001VM-TU for patchwork@mira.cbaines.net; Thu, 28 Jul 2022 00:10:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56574) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oGuqZ-0001V5-5h for guix-patches@gnu.org; Thu, 28 Jul 2022 00:10:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39325) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oGuqY-0001tT-SY for guix-patches@gnu.org; Thu, 28 Jul 2022 00:10:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oGuqY-0005bQ-Nz for guix-patches@gnu.org; Thu, 28 Jul 2022 00:10:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56806] [PATCH 2/9] gnu: Add ocaml-ptmap. References: <9PX8REXHYFolHkT-TXF_SZcRFDEe1-1KwK9riBoz1tnsKV2raznmLO3YTlzbpdyJ9dBOqnpcaUomHmLfOWjytFrkLEvIW_upqCAA_-byN50=@protonmail.com> In-Reply-To: <9PX8REXHYFolHkT-TXF_SZcRFDEe1-1KwK9riBoz1tnsKV2raznmLO3YTlzbpdyJ9dBOqnpcaUomHmLfOWjytFrkLEvIW_upqCAA_-byN50=@protonmail.com> Resent-From: John Kehayias Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 28 Jul 2022 04:10:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56806 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "56806@debbugs.gnu.org" <56806@debbugs.gnu.org> Received: via spool by 56806-submit@debbugs.gnu.org id=B56806.165898135921458 (code B ref 56806); Thu, 28 Jul 2022 04:10:02 +0000 Received: (at 56806) by debbugs.gnu.org; 28 Jul 2022 04:09:19 +0000 Received: from localhost ([127.0.0.1]:57303 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oGupr-0005a1-2i for submit@debbugs.gnu.org; Thu, 28 Jul 2022 00:09:19 -0400 Received: from mail-4316.protonmail.ch ([185.70.43.16]:23519) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oGupo-0005Zm-FD for 56806@debbugs.gnu.org; Thu, 28 Jul 2022 00:09:17 -0400 Date: Thu, 28 Jul 2022 04:09:08 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1658981349; x=1659240549; bh=85XzxoppmpSN6knriJAx4tQOkD9r6o8ItEWnFBYutOY=; h=Date:To:From:Reply-To:Subject:Message-ID:Feedback-ID:From:To:Cc: Date:Subject:Reply-To:Feedback-ID:Message-ID; b=J6SIZFNa/PVHxHt9RWJQwP+r1C2i+pMhgZNbMSyZuO0C2EyJ405mrmKJyIsAevzu+ fG+DAgw8/A/sLm4Yh1F1wXfWMN6+ePLkeBwl/7V/uZ49ghr+Xv1cSEYa7XiLl7vTPn YRztqdXARATLKQl7jxXiX0T/xQA35yMpz2TBDkLkl9TAPqu0DX8kuvTkoWUZ0jhLmu piYM/BlIh0Y+BL8Y/xNF3GRMA60ImBs50AThjptv83zdPmXbqryknFKucZr2PR1we1 e9QAMGf/wyHIZ7T7DaDXMT4+KUNlr4/IaeXM6sqIiMdKNogmC21CWO4Bzk3hD7DPYB sEWgCZB0Jk58g== Message-ID: Feedback-ID: 7805494:user:proton 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" Reply-to: John Kehayias X-ACL-Warn: , John Kehayias via Guix-patches X-Patchwork-Original-From: John Kehayias via Guix-patches via From: John Kehayias X-getmail-retrieved-from-mailbox: Patches Empty Message From 8f67088861460984d5ed1147c58d66d0658528be Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Wed, 27 Jul 2022 23:31:45 -0400 Subject: [PATCH 2/9] gnu: Add ocaml-ptmap. * gnu/packages/ocaml.scm (ocaml-ptmap): New variable. --- gnu/packages/ocaml.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 895b99320e..da7086ab2b 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4407,6 +4407,34 @@ (define-public ocaml4.07-utop ("ocaml-zed" ,ocaml-zed))) (properties '())))) +(define-public ocaml-ptmap + (package + (name "ocaml-ptmap") + (version "2.0.5") + (source (origin + (method url-fetch) + (uri + (string-append "https://github.com/backtracking/ptmap/releases/download/" + version "/ptmap-" version ".tbz")) + (sha256 + (base32 + "1apk61fc1y1g7x3m3c91fnskvxp6i0vk5nxwvipj56k7x2pzilgb")))) + (build-system dune-build-system) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "dune" "runtest"))))))) + (propagated-inputs (list ocaml-stdlib-shims ocaml-seq)) + (home-page "https://github.com/backtracking/ptmap") + (synopsis "Maps of integers implemented as Patricia trees") + (description + "An implementation inspired by Okasaki & Gill's paper 'Fast Mergeable +Integer Maps.'") + (license license:lgpl2.1))) ; with linking exception + (define-public ocaml-integers (package (name "ocaml-integers") -- 2.37.1 From patchwork Thu Jul 28 04:09:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Kehayias X-Patchwork-Id: 41025 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 757CD27BBE9; Thu, 28 Jul 2022 05:10:36 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable 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 0001E27BBEA for ; Thu, 28 Jul 2022 05:10:35 +0100 (BST) Received: from localhost ([::1]:42238 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oGur5-0001VX-6m for patchwork@mira.cbaines.net; Thu, 28 Jul 2022 00:10:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56576) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oGuqZ-0001VE-PS for guix-patches@gnu.org; Thu, 28 Jul 2022 00:10:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39326) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oGuqZ-0001x2-GM for guix-patches@gnu.org; Thu, 28 Jul 2022 00:10:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oGuqZ-0005ba-9s for guix-patches@gnu.org; Thu, 28 Jul 2022 00:10:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56806] [PATCH 3/9] gnu: Add ocaml-sha. References: <9PX8REXHYFolHkT-TXF_SZcRFDEe1-1KwK9riBoz1tnsKV2raznmLO3YTlzbpdyJ9dBOqnpcaUomHmLfOWjytFrkLEvIW_upqCAA_-byN50=@protonmail.com> In-Reply-To: <9PX8REXHYFolHkT-TXF_SZcRFDEe1-1KwK9riBoz1tnsKV2raznmLO3YTlzbpdyJ9dBOqnpcaUomHmLfOWjytFrkLEvIW_upqCAA_-byN50=@protonmail.com> Resent-From: John Kehayias Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 28 Jul 2022 04:10:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56806 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "56806@debbugs.gnu.org" <56806@debbugs.gnu.org> Received: via spool by 56806-submit@debbugs.gnu.org id=B56806.165898139121512 (code B ref 56806); Thu, 28 Jul 2022 04:10:03 +0000 Received: (at 56806) by debbugs.gnu.org; 28 Jul 2022 04:09:51 +0000 Received: from localhost ([127.0.0.1]:57307 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oGuqN-0005at-ER for submit@debbugs.gnu.org; Thu, 28 Jul 2022 00:09:51 -0400 Received: from mail-4322.protonmail.ch ([185.70.43.22]:46711) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oGuqL-0005ae-Dp for 56806@debbugs.gnu.org; Thu, 28 Jul 2022 00:09:50 -0400 Date: Thu, 28 Jul 2022 04:09:34 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1658981383; x=1659240583; bh=99JXH3kilz5z+1wDD+PRDW6lCXW5YWYjyJjmvp7x+XE=; h=Date:To:From:Reply-To:Subject:Message-ID:Feedback-ID:From:To:Cc: Date:Subject:Reply-To:Feedback-ID:Message-ID; b=K8+65PBvxZFwCyOFRV35QY1z428aJPTEeklhe65W0P/2KmW9LzNfVy4/AY+GlKCm4 KnBmdxIQ/OXOW4aB8FcThxwVE3Xgou7uBg4ZiMXrL1te1qCcNXxeEFfgElSaCt23/S V/yDW7WueWiwsIHNmdgEFbInTtoBGGnWCFM6J1SMMsBophSslrVscB2MUsHPJ3xXtF 2+5hg8C+d3hbfSaCrdNRya0XYeJ+M7zz/wE8sn5sfqIyjGcijkoY5mC8+k1DsVVpW2 kMIv/wWt9jBThH96vfEERjjhZpINiZBDOueaLKaYkaeDLQQP17EUDN48NE7clRGjyN X0EMC0u0bgP+g== Message-ID: Feedback-ID: 7805494:user:proton 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" Reply-to: John Kehayias X-ACL-Warn: , John Kehayias via Guix-patches X-Patchwork-Original-From: John Kehayias via Guix-patches via From: John Kehayias X-getmail-retrieved-from-mailbox: Patches Empty Message From 268e976b4410be89e8e655704732e42a74f6a654 Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Wed, 27 Jul 2022 23:31:57 -0400 Subject: [PATCH 3/9] gnu: Add ocaml-sha. * gnu/packages/ocaml.scm (ocaml-sha): New variable. --- gnu/packages/ocaml.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index da7086ab2b..8620d2bde3 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5930,6 +5930,28 @@ (define-public ocaml-octavius (description "Octavius is a library to parse the `ocamldoc` comment syntax.") (license license:isc))) +(define-public ocaml-sha + (package + (name "ocaml-sha") + (version "1.15.2") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/djs55/ocaml-sha/releases/download/" + version "/sha-" version ".tbz")) + (sha256 + (base32 + "1dzzhchknnbrpp5s81iqbvmqp4s0l75yrq8snj70ch3wkarmgg9z")))) + (build-system dune-build-system) + (propagated-inputs (list ocaml-stdlib-shims ocaml-odoc)) + (native-inputs (list ocaml-ounit2)) + (home-page "https://github.com/djs55/ocaml-sha") + (synopsis "OCaml binding to the SHA cryptographic functions") + (description + "This is the binding for SHA interface code in OCaml, offering the same +interface as the MD5 digest included in the OCaml standard library. It +currently provides SHA1, SHA256 and SHA512 hash functions.") + (license license:isc))) + (define-public ocaml-ppx-hash (package (name "ocaml-ppx-hash") -- 2.37.1 From patchwork Thu Jul 28 04:10:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Kehayias X-Patchwork-Id: 41026 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 9717A27BBEB; Thu, 28 Jul 2022 05:11:32 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable 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 13B4B27BBE9 for ; Thu, 28 Jul 2022 05:11:32 +0100 (BST) Received: from localhost ([::1]:42728 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oGurz-0001y3-80 for patchwork@mira.cbaines.net; Thu, 28 Jul 2022 00:11:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56752) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oGurW-0001xb-9V for guix-patches@gnu.org; Thu, 28 Jul 2022 00:11:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39340) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oGurW-00023w-1J for guix-patches@gnu.org; Thu, 28 Jul 2022 00:11:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oGurV-0005eN-Tk for guix-patches@gnu.org; Thu, 28 Jul 2022 00:11:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56806] [PATCH 4/9] gnu: Add ocaml-xml-light. References: <9PX8REXHYFolHkT-TXF_SZcRFDEe1-1KwK9riBoz1tnsKV2raznmLO3YTlzbpdyJ9dBOqnpcaUomHmLfOWjytFrkLEvIW_upqCAA_-byN50=@protonmail.com> In-Reply-To: <9PX8REXHYFolHkT-TXF_SZcRFDEe1-1KwK9riBoz1tnsKV2raznmLO3YTlzbpdyJ9dBOqnpcaUomHmLfOWjytFrkLEvIW_upqCAA_-byN50=@protonmail.com> Resent-From: John Kehayias Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 28 Jul 2022 04:11:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56806 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "56806@debbugs.gnu.org" <56806@debbugs.gnu.org> Received: via spool by 56806-submit@debbugs.gnu.org id=B56806.165898141521602 (code B ref 56806); Thu, 28 Jul 2022 04:11:01 +0000 Received: (at 56806) by debbugs.gnu.org; 28 Jul 2022 04:10:15 +0000 Received: from localhost ([127.0.0.1]:57314 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oGuqk-0005cK-PD for submit@debbugs.gnu.org; Thu, 28 Jul 2022 00:10:15 -0400 Received: from mail-4322.protonmail.ch ([185.70.43.22]:46551) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oGuqi-0005c0-S4 for 56806@debbugs.gnu.org; Thu, 28 Jul 2022 00:10:13 -0400 Date: Thu, 28 Jul 2022 04:10:01 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1658981407; x=1659240607; bh=l7U+QD8715tl1DGV3S2EPjftczdeWOYkjNaS2x+/gZo=; h=Date:To:From:Reply-To:Subject:Message-ID:Feedback-ID:From:To:Cc: Date:Subject:Reply-To:Feedback-ID:Message-ID; b=PWeIIXQeP0K00jDTstq6Bm2rvqONv4W87r/xaQlXU+y+jmPb5Ur7Lf/y1I/IyoM1e ApmE2b9fkhCPaB/r7Cb6YEP2ONhFQSILsbPeIhPFaFYxL2gSHAvhawluLw5SG4aF1I +fhLyEMbFuBw1UMiirHTUC5CRZw9EVsg0itUswL9mUg8Z1SZKSH+Q7mYhyODAae4VN 2jsBKSVkGQ+PfhD0pfQCZS335kfK64t/ZYrcVN3bIoA6SvnwwnMn5cZFlsYPqsvUcs xtp1rLx3KY6CEQaL60XxZSnIIQjOzGJUst1muDLEkLNiLp4xJdU9RJkVpSNfgdiNwq d2VOSC7RrVXnw== Message-ID: <4uEkvxdO9wKNr_NlJqIucgyi7X8nk4MjGUnza5ANlBqa8CQ1-41OsubmA3x5gvtTY9mYfq-O7347Ny_PuU57vbrlfeZSbgc65ZOsegiDB9E=@protonmail.com> Feedback-ID: 7805494:user:proton 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" Reply-to: John Kehayias X-ACL-Warn: , John Kehayias via Guix-patches X-Patchwork-Original-From: John Kehayias via Guix-patches via From: John Kehayias X-getmail-retrieved-from-mailbox: Patches Empty Message From 2733ca5c0a423155a9db5f6dfbda678463f39647 Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Wed, 27 Jul 2022 23:32:04 -0400 Subject: [PATCH 4/9] gnu: Add ocaml-xml-light. * gnu/packages/ocaml.scm (ocaml-xml-light): New variable. --- gnu/packages/ocaml.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 8620d2bde3..3df81e498b 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2812,6 +2812,45 @@ (define-public ocaml-bos run command line programs.") (license license:isc))) +(define-public ocaml-xml-light + (package + (name "ocaml-xml-light") + (version "2.4") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ncannasse/xml-light") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "089ywjz84y4p5iln94y54vh03b5fm2zrl2dld1398dyrby96dp6s")))) + (build-system ocaml-build-system) + (arguments + (list #:tests? #f ; There are no tests. + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'prefix + (lambda _ + (substitute* "Makefile" + (("`\\$\\(OCAMLC\\) -where`") + (string-append #$output "/lib/ocaml/site-lib/xml-light"))))) + (delete 'configure) ; no configure + (add-before 'install 'mkdir + (lambda _ + (mkdir-p (string-append #$output "/lib/ocaml/site-lib/xml-light")))) + (replace 'install + (lambda _ + (invoke "make" "install_ocamlfind")))))) + (home-page "https://github.com/ncannasse/xml-light") + (synopsis "Xml-Light is a minimal XML parser & printer for OCaml") + (description + "Xml-Light provides functions to parse an XML document into an OCaml data +structure, work with it, and print it back to an XML document. It also +supports DTD parsing and checking, and is entirely written in OCaml, hence it +does not require additional C libraries.") + (license license:lgpl2.1+))) ; with linking exception + (define-public ocaml-xmlm (package (name "ocaml-xmlm") -- 2.37.1 From patchwork Thu Jul 28 04:10:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Kehayias X-Patchwork-Id: 41027 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 0EC3E27BBE9; Thu, 28 Jul 2022 05:11:33 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable 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 6CCCD27BBEA for ; Thu, 28 Jul 2022 05:11:32 +0100 (BST) Received: from localhost ([::1]:42742 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oGurz-0001zP-Jn for patchwork@mira.cbaines.net; Thu, 28 Jul 2022 00:11:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56756) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oGurW-0001xm-Nj for guix-patches@gnu.org; Thu, 28 Jul 2022 00:11:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39341) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oGurW-000244-FZ for guix-patches@gnu.org; Thu, 28 Jul 2022 00:11:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oGurW-0005eU-BR for guix-patches@gnu.org; Thu, 28 Jul 2022 00:11:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56806] [PATCH 5/9] gnu: Add mikktspace. References: <9PX8REXHYFolHkT-TXF_SZcRFDEe1-1KwK9riBoz1tnsKV2raznmLO3YTlzbpdyJ9dBOqnpcaUomHmLfOWjytFrkLEvIW_upqCAA_-byN50=@protonmail.com> In-Reply-To: <9PX8REXHYFolHkT-TXF_SZcRFDEe1-1KwK9riBoz1tnsKV2raznmLO3YTlzbpdyJ9dBOqnpcaUomHmLfOWjytFrkLEvIW_upqCAA_-byN50=@protonmail.com> Resent-From: John Kehayias Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 28 Jul 2022 04:11:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56806 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "56806@debbugs.gnu.org" <56806@debbugs.gnu.org> Received: via spool by 56806-submit@debbugs.gnu.org id=B56806.165898143221658 (code B ref 56806); Thu, 28 Jul 2022 04:11:02 +0000 Received: (at 56806) by debbugs.gnu.org; 28 Jul 2022 04:10:32 +0000 Received: from localhost ([127.0.0.1]:57318 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oGur2-0005dG-74 for submit@debbugs.gnu.org; Thu, 28 Jul 2022 00:10:32 -0400 Received: from mail-4316.protonmail.ch ([185.70.43.16]:11649) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oGuqz-0005cx-Nt for 56806@debbugs.gnu.org; Thu, 28 Jul 2022 00:10:30 -0400 Date: Thu, 28 Jul 2022 04:10:20 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1658981423; x=1659240623; bh=9c8e5BzSam3/8JaK3B/0XOM7THtuDduqEW2RuqIFl0I=; h=Date:To:From:Reply-To:Subject:Message-ID:Feedback-ID:From:To:Cc: Date:Subject:Reply-To:Feedback-ID:Message-ID; b=gWMYWrBH/TMzdck1Z/y/hRkya/9G3SwEIIbt36JMdamAHWED7RIC3I4SnOYsIEOfK NGgcQeC7645GCjBtGWZrFJN1b7gtbSgkQ3xflevoTL3BNPP56BrR53vNU5qzn3nHxJ /htA+7rMIYxmXqxWGoQPDqAzUpCAyKFvLjiRNg7i+kLpBoyFp3BDitJp9JPKStNcSO nHGmeG/4H3UTl8I0P9BG+J+QKmKOQgdsdZ6QLy7Zn8PpXB4qX7imQLq0/d/liexM+P pxZH4pWh+AaJeKT9mor/lx3PtJej3h8yox+3acl/IXEJF73gY8PwqiFVa3MLOQ9+dG GtJUhz6dTdsvw== Message-ID: <-SOYDPbYrBg0NM1yceWAD9ce-EZEBGIZPvbH8NlKBtyfPWxXrOR2t9AO65XwSEGnjBfMLMkOt6yX-X0iQOcQY9E__nBU-Ajzc4Lwi4aqw0E=@protonmail.com> Feedback-ID: 7805494:user:proton 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" Reply-to: John Kehayias X-ACL-Warn: , John Kehayias via Guix-patches X-Patchwork-Original-From: John Kehayias via Guix-patches via From: John Kehayias X-getmail-retrieved-from-mailbox: Patches Empty Message From 441a3faaa94688ff01313644d7ee0bd83cf067e9 Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Wed, 27 Jul 2022 23:32:42 -0400 Subject: [PATCH 5/9] gnu: Add mikktspace. * gnu/packages/graphics.scm (mikktspace): New variable. --- gnu/packages/graphics.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index c193be1efb..1acec5ea76 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -584,6 +584,45 @@ (define-public assimp more.") (license license:bsd-3))) +(define-public mikktspace + ;; The latest commit is used as there is no release. + (let ((commit "3e895b49d05ea07e4c2133156cfa94369e19e409") + (revision "0")) + (package + (name "mikktspace") + (version (git-version "0.0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mmikk/MikkTSpace") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1rjh9zflx51hdhnfadal87v4hhkrbprkv692hjkg9wkxx0ch39zi")))) + (build-system gnu-build-system) + (arguments + (list #:tests? #f + #:phases + #~(modify-phases %standard-phases + (delete 'configure) + (replace 'build + (lambda* (#:key make-flags parallel-build? #:allow-other-keys) + (invoke #$(cc-for-target) "mikktspace.c" "-O2" "-g" "-fPIC" + "-shared" "-o" "libmikktspace.so"))) + (replace 'install + (lambda _ + (install-file "mikktspace.h" + (string-append #$output "/include")) + (install-file "libmikktspace.so" + (string-append #$output "/lib"))))))) + (home-page "http://www.mikktspace.com/") + (synopsis "Library for a common standard for tangent spaces") + (description + "This package provides a common standard tangent space library used in +baking tools to produce normal maps.") + (license license:zlib)))) + (define-public openshadinglanguage (package (name "openshadinglanguage") -- 2.37.1 From patchwork Thu Jul 28 04:10:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: John Kehayias X-Patchwork-Id: 41028 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 498B427BBEA; Thu, 28 Jul 2022 05:11:45 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable 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 9FD2727BBE9 for ; Thu, 28 Jul 2022 05:11:44 +0100 (BST) Received: from localhost ([::1]:43196 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oGusB-0002Kv-RI for patchwork@mira.cbaines.net; Thu, 28 Jul 2022 00:11:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56758) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oGurX-0001xw-4h for guix-patches@gnu.org; Thu, 28 Jul 2022 00:11:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39342) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oGurW-00024B-RO for guix-patches@gnu.org; Thu, 28 Jul 2022 00:11:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oGurW-0005eb-NV for guix-patches@gnu.org; Thu, 28 Jul 2022 00:11:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56806] [PATCH 6/9] gnu: Add minimp3. References: <9PX8REXHYFolHkT-TXF_SZcRFDEe1-1KwK9riBoz1tnsKV2raznmLO3YTlzbpdyJ9dBOqnpcaUomHmLfOWjytFrkLEvIW_upqCAA_-byN50=@protonmail.com> In-Reply-To: <9PX8REXHYFolHkT-TXF_SZcRFDEe1-1KwK9riBoz1tnsKV2raznmLO3YTlzbpdyJ9dBOqnpcaUomHmLfOWjytFrkLEvIW_upqCAA_-byN50=@protonmail.com> Resent-From: John Kehayias Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 28 Jul 2022 04:11:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56806 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "56806@debbugs.gnu.org" <56806@debbugs.gnu.org> Received: via spool by 56806-submit@debbugs.gnu.org id=B56806.165898145221699 (code B ref 56806); Thu, 28 Jul 2022 04:11:02 +0000 Received: (at 56806) by debbugs.gnu.org; 28 Jul 2022 04:10:52 +0000 Received: from localhost ([127.0.0.1]:57322 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oGurL-0005du-IX for submit@debbugs.gnu.org; Thu, 28 Jul 2022 00:10:51 -0400 Received: from mail-40131.protonmail.ch ([185.70.40.131]:59377) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oGurJ-0005de-Q2 for 56806@debbugs.gnu.org; Thu, 28 Jul 2022 00:10:50 -0400 Date: Thu, 28 Jul 2022 04:10:38 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1658981444; x=1659240644; bh=uAurtmRgIWaC87ab+OkLnMlEggY0GOo7QmHeu6jgSZU=; h=Date:To:From:Reply-To:Subject:Message-ID:Feedback-ID:From:To:Cc: Date:Subject:Reply-To:Feedback-ID:Message-ID; b=dhlf/vRJhY12ryI8a8CA1xWtw8PTJLwy+5Kujvf7h+PzIJgafJLGGJUSj7LMRSvHq ODXjjhYIboeUpYSNTx12Ie6TXB2rtzrJkT741uA5xBRFsRjYbM9OBomah2xxllmfNC izRDw9ZqIox9ld8g9WWMN5H22P+r+LeTu0IlBI576F6nNzwGK0k/fBYPKIHrMpNkZY 0V1xXJ3ZhUNCDNAQdYW8Olw+X5iFGfEfLi+S7S2Xi86Ba8e5nzrpHjehzcXZpvL5La Bp5vyX8fPlBFoFxI+LSmQpTEUHruts0+qNC34Och71fdLt22U5nMdzv7sxdryvsSTn JOCrvPbZ3uF9g== Message-ID: Feedback-ID: 7805494:user:proton 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" Reply-to: John Kehayias X-ACL-Warn: , John Kehayias via Guix-patches X-Patchwork-Original-From: John Kehayias via Guix-patches via From: John Kehayias X-getmail-retrieved-from-mailbox: Patches Empty Message From 5b653ede7baa7afdf2a6ea226fbf4b130af61d0b Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Wed, 27 Jul 2022 23:32:54 -0400 Subject: [PATCH 6/9] gnu: Add minimp3. * gnu/packages/mp3.scm (minimp3): New variable. --- gnu/packages/mp3.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/mp3.scm b/gnu/packages/mp3.scm index 4a8bdad711..275468d343 100644 --- a/gnu/packages/mp3.scm +++ b/gnu/packages/mp3.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2020 Michael Rohleder ;;; Copyright © 2021 Simon Streit ;;; Copyright © 2021 Guillaume Le Vaillant +;;; Copyright © 2022 John Kehayias ;;; ;;; This file is part of GNU Guix. ;;; @@ -54,6 +55,7 @@ (define-module (gnu packages mp3) #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix utils) + #:use-module (guix build-system copy) #:use-module (guix build-system gnu) #:use-module (guix build-system python) #:use-module (guix build-system cmake)) @@ -247,6 +249,35 @@ (define-public taglib ;; Dual-licensed: user may choose between LGPLv2.1 or MPLv1.1. (license (list license:lgpl2.1 license:mpl1.1)))) +(define-public minimp3 + ;; The latest commit is used as there is no release. + (let ((commit "afb604c06bc8beb145fecd42c0ceb5bda8795144") + (revision "0")) + (package + (name "minimp3") + (version (git-version "0.0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/lieff/minimp3") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0brgrbij8swhp7lac21xnnrr5l0371lkr5vz6h9x0dbz1qq2xhsj")))) + ;; TODO: minimp3 has many more files for at least tests with scripts to + ;; run them, although it is unclear how to easily package them. + (build-system copy-build-system) + (arguments + '(#:install-plan + '(("minimp3.h" "include/") + ("minimp3_ex.h" "include/")))) + (home-page "https://github.com/lieff/minimp3") + (synopsis "Minimalistic MP3 decoder header library") + (description + "Minimp3 is a header-only MP3 decoder library.") + (license license:cc0)))) + (define-public mp3info (package (name "mp3info") -- 2.37.1 From patchwork Thu Jul 28 04:10:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: John Kehayias X-Patchwork-Id: 41030 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 BC6B727BBEA; Thu, 28 Jul 2022 05:12:54 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable 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 8502127BBE9 for ; Thu, 28 Jul 2022 05:12:53 +0100 (BST) Received: from localhost ([::1]:43454 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oGutI-0002WP-N7 for patchwork@mira.cbaines.net; Thu, 28 Jul 2022 00:12:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56902) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oGusV-0002Vy-1U for guix-patches@gnu.org; Thu, 28 Jul 2022 00:12:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39355) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oGusU-0002BL-2s for guix-patches@gnu.org; Thu, 28 Jul 2022 00:12:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oGusT-0005gw-UN for guix-patches@gnu.org; Thu, 28 Jul 2022 00:12:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56806] [PATCH 7/9] gnu: Add neko. References: <9PX8REXHYFolHkT-TXF_SZcRFDEe1-1KwK9riBoz1tnsKV2raznmLO3YTlzbpdyJ9dBOqnpcaUomHmLfOWjytFrkLEvIW_upqCAA_-byN50=@protonmail.com> In-Reply-To: <9PX8REXHYFolHkT-TXF_SZcRFDEe1-1KwK9riBoz1tnsKV2raznmLO3YTlzbpdyJ9dBOqnpcaUomHmLfOWjytFrkLEvIW_upqCAA_-byN50=@protonmail.com> Resent-From: John Kehayias Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 28 Jul 2022 04:12:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56806 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "56806@debbugs.gnu.org" <56806@debbugs.gnu.org> Received: via spool by 56806-submit@debbugs.gnu.org id=B56806.165898147121775 (code B ref 56806); Thu, 28 Jul 2022 04:12:01 +0000 Received: (at 56806) by debbugs.gnu.org; 28 Jul 2022 04:11:11 +0000 Received: from localhost ([127.0.0.1]:57329 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oGurf-0005f9-0Q for submit@debbugs.gnu.org; Thu, 28 Jul 2022 00:11:11 -0400 Received: from mail-40134.protonmail.ch ([185.70.40.134]:34778) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oGurc-0005eh-De for 56806@debbugs.gnu.org; Thu, 28 Jul 2022 00:11:09 -0400 Date: Thu, 28 Jul 2022 04:10:58 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1658981462; x=1659240662; bh=3D2Wo+YdTJnejlcrP1Amn6nBHtlRqCxdh9ORGlbsOtY=; h=Date:To:From:Reply-To:Subject:Message-ID:Feedback-ID:From:To:Cc: Date:Subject:Reply-To:Feedback-ID:Message-ID; b=xXlRSKP1OVuLzuQoD3J+3q/snN9Yzf9djC9T7/ngaFcY660RgIkVBOPug6TKJVdmb B178cYArTAD9vsplvJZ9kBbn/xyH/btzmF+g2zMs6hX0TOcFvPuigCSATCqFv6EhQA HQYglJbro0oZb0/RfHj/m9rynuhSPpdBx9O9DvNK01bnsRJcO2YN0fTZGt3loRym6Y BqWIT5obH5OG9ppMToumY0cVuVKZ3c/09qplpL5uz8cAmDXYkgxgmAZzjz2J7hDHs1 a7e65siWnM7YlHdzjLc9HhaIL5eeZ6d64Y6zmDhto4kmjB77aBaAxRUuJvDpqOEWQd DkCEV3krjnlNA== Message-ID: Feedback-ID: 7805494:user:proton 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" Reply-to: John Kehayias X-ACL-Warn: , John Kehayias via Guix-patches X-Patchwork-Original-From: John Kehayias via Guix-patches via From: John Kehayias X-getmail-retrieved-from-mailbox: Patches Empty Message From 1d5b7fc835c4bb4953597eee1c96c5ecf366f48c Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Wed, 27 Jul 2022 23:34:42 -0400 Subject: [PATCH 7/9] gnu: Add neko. * gnu/packages/haxe.scm: New module. (neko): New variable. * gnu/local.mk (GNU_SYSTEM_MODULES): Add new module. --- gnu/local.mk | 2 + gnu/packages/haxe.scm | 107 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 109 insertions(+) create mode 100644 gnu/packages/haxe.scm diff --git a/gnu/local.mk b/gnu/local.mk index 0c4edf6e56..c837b2520a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -50,6 +50,7 @@ # Copyright © 2022 Daniel Meißner # Copyright © 2022 Remco van 't Veer # Copyright © 2022 Artyom V. Poptsov +# Copyright © 2022 John Kehayias # # This file is part of GNU Guix. # @@ -301,6 +302,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/haskell-crypto.scm \ %D%/packages/haskell-web.scm \ %D%/packages/haskell-xyz.scm \ + %D%/packages/haxe.scm \ %D%/packages/heads.scm \ %D%/packages/hexedit.scm \ %D%/packages/hugs.scm \ diff --git a/gnu/packages/haxe.scm b/gnu/packages/haxe.scm new file mode 100644 index 0000000000..6d8d9caca1 --- /dev/null +++ b/gnu/packages/haxe.scm @@ -0,0 +1,107 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2022 John Kehayias +;;; +;;; 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 haxe) + #:use-module (gnu packages) + #:use-module (gnu packages apr) + #:use-module (gnu packages audio) + #:use-module (gnu packages bdw-gc) + #:use-module (gnu packages compression) + #:use-module (gnu packages databases) + #:use-module (gnu packages gl) + #:use-module (gnu packages graphics) + #:use-module (gnu packages gtk) + #:use-module (gnu packages image) + #:use-module (gnu packages libevent) + #:use-module (gnu packages mp3) + #:use-module (gnu packages ocaml) + #:use-module (gnu packages pcre) + #:use-module (gnu packages perl) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages sdl) + #:use-module (gnu packages sqlite) + #:use-module (gnu packages tls) + #:use-module (gnu packages version-control) + #:use-module (gnu packages web) + #:use-module (gnu packages xiph) + #:use-module (guix build-system cmake) + #:use-module (guix build-system gnu) + #:use-module (guix build-system dune) + #:use-module (guix download) + #:use-module (guix gexp) + #:use-module (guix git-download) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages) + #:use-module (guix utils)) + +(define-public neko + (package + (name "neko") + (version "2.3.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/HaxeFoundation/neko") + (commit (string-append + "v" + (string-map (lambda (x) (if (char=? x #\.) #\- x)) version))))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1xgw646pghsjjbzd8qlaq17vq96swlrazpivrvyrhdj36vb3sci3")))) + (build-system cmake-build-system) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'prefix + (lambda _ + (substitute* "CMakeLists.txt" + (("\\\\\\$ORIGIN") + (string-append #$output "/lib")))))))) + (inputs (list apr + apr-util + gtk+-2 + httpd + libgc + mbedtls-apache + mysql + openssl + pcre + sqlite + zlib)) + (native-inputs (list git pkg-config)) ; git for source_archive and applying patch + (home-page "https://nekovm.org/") + (synopsis "High-level dynamically typed programming language and virtual +machine") + (description + "The Neko programming language is a high-level dynamically typed +programming language. It can be used as an embedded scripting language. It +has been designed to provide a common runtime for several different languages. +You can easily extend the language with C libraries. You can also write +generators from your own language to Neko and then use the Neko Runtime to +compile, run, and access existing libraries. + +Neko has a compiler and a virtual machine. The Virtual Machine is both very +lightweight and well optimized, so it can run very quickly. The VM can be +easily embedded into any application and your libraries can be accessed using +the C foreign function interface. + +You can use the compiler as standalone command line executable separate from +the VM, or as a Neko library to perform compile-and-run funtions for +interactive languages.") + (license license:expat))) -- 2.37.1 From patchwork Thu Jul 28 04:11:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Kehayias X-Patchwork-Id: 41029 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 9023327BBEB; Thu, 28 Jul 2022 05:12:54 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable 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 920E527BBEA for ; Thu, 28 Jul 2022 05:12:53 +0100 (BST) Received: from localhost ([::1]:43466 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oGutI-0002Wx-PE for patchwork@mira.cbaines.net; Thu, 28 Jul 2022 00:12:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56904) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oGusV-0002Vz-1X for guix-patches@gnu.org; Thu, 28 Jul 2022 00:12:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39356) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oGusU-0002BM-DK for guix-patches@gnu.org; Thu, 28 Jul 2022 00:12:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oGusU-0005h4-9W for guix-patches@gnu.org; Thu, 28 Jul 2022 00:12:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56806] [PATCH 8/9] gnu: Add haxe. References: <9PX8REXHYFolHkT-TXF_SZcRFDEe1-1KwK9riBoz1tnsKV2raznmLO3YTlzbpdyJ9dBOqnpcaUomHmLfOWjytFrkLEvIW_upqCAA_-byN50=@protonmail.com> In-Reply-To: <9PX8REXHYFolHkT-TXF_SZcRFDEe1-1KwK9riBoz1tnsKV2raznmLO3YTlzbpdyJ9dBOqnpcaUomHmLfOWjytFrkLEvIW_upqCAA_-byN50=@protonmail.com> Resent-From: John Kehayias Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 28 Jul 2022 04:12:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56806 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "56806@debbugs.gnu.org" <56806@debbugs.gnu.org> Received: via spool by 56806-submit@debbugs.gnu.org id=B56806.165898149621823 (code B ref 56806); Thu, 28 Jul 2022 04:12:02 +0000 Received: (at 56806) by debbugs.gnu.org; 28 Jul 2022 04:11:36 +0000 Received: from localhost ([127.0.0.1]:57333 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oGus3-0005fv-Jw for submit@debbugs.gnu.org; Thu, 28 Jul 2022 00:11:36 -0400 Received: from mail-4316.protonmail.ch ([185.70.43.16]:42641) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oGus1-0005ff-J8 for 56806@debbugs.gnu.org; Thu, 28 Jul 2022 00:11:34 -0400 Date: Thu, 28 Jul 2022 04:11:23 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1658981487; x=1659240687; bh=No8bdNJVg0Vhaxszk+7P9wBnHYX8XWLBMxtGhZD4UuQ=; h=Date:To:From:Reply-To:Subject:Message-ID:Feedback-ID:From:To:Cc: Date:Subject:Reply-To:Feedback-ID:Message-ID; b=kk4e7pVURu6G4HnWRwMQ08oKhsqtvQDXqklK4Tir3PVS6MMhCJGZh6hnr8f3OG4s2 dz2c5mEt/MAih6ovwu5ORBpZIHtXhIVRRaYecG+i2hzL/0VNNVlisaWv5MCbtYVciL pm+xcwJZ848RlZcrprxha1Asf6EtmliEKSAe3gih8jjDQGmTEkeMtfLYZsbNTlpns/ PcIKKB2ZZi1fJQYY4HwDj08dFuhHWkMwq4Yu3bepY/oPy1Mjs/ilcsqHEnznIRoKk0 iNiJbm83TlJaYyIQG17qzaP+zJSqcqleC4gpsbOURny8ts9cRdrLMlBNWqBGbuzOCr jzets4CWMCwRQ== Message-ID: Feedback-ID: 7805494:user:proton 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" Reply-to: John Kehayias X-ACL-Warn: , John Kehayias via Guix-patches X-Patchwork-Original-From: John Kehayias via Guix-patches via From: John Kehayias X-getmail-retrieved-from-mailbox: Patches Empty Message From 0f26e1d05ffa9c108e026cc68dfeef25ec76a239 Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Wed, 27 Jul 2022 23:43:32 -0400 Subject: [PATCH 8/9] gnu: Add haxe. * gnu/packages/haxe.scm (haxelib-src): New variable. (haxe): New variable. --- gnu/packages/haxe.scm | 84 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/gnu/packages/haxe.scm b/gnu/packages/haxe.scm index 6d8d9caca1..95de4c5e4b 100644 --- a/gnu/packages/haxe.scm +++ b/gnu/packages/haxe.scm @@ -105,3 +105,87 @@ (define-public neko the VM, or as a Neko library to perform compile-and-run funtions for interactive languages.") (license license:expat))) + +(define haxelib-src + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/HaxeFoundation/haxelib") + ;; This should match the haxelib submodule in haxe. + (commit "4b27f91d8a4ff279d9903091680fee2c93a0d574") + ;; This repo includes some Haxe libs as well. + (recursive? #t))) + (sha256 + (base32 + "0mwrm6gxgclwziiprfiswmjbz6z3dnvdwl8gq3gaym18pvx4p3ny")))) + +(define-public haxe + (package + (name "haxe") + (version "4.2.5") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/HaxeFoundation/haxe") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0pl8vpyb7gl2yqjg85yc4zxq9c3ipvw4yrrpliaxs25ynrj3l51n")))) + (build-system dune-build-system) + (arguments + (list #:phases + #~(modify-phases %standard-phases + ;; Needs the haxelib sources for haxelib client + (add-after 'unpack 'copy-haxelib-src + (lambda _ + (copy-recursively #$haxelib-src + "extra/haxelib_src"))) + ;; Change the default directory for the haxelib package + ;; manager to be something writeable for a user. + (add-after 'copy-haxelib-src 'change-default-dir + (lambda _ + (substitute* "extra/haxelib_src/src/haxelib/client/Main.hx" + (("'/usr/lib/haxe/\\$REPNAME'") + "Path.addTrailingSlash( getHomePath() ) + '.haxe/$REPNAME'")))) + (add-after 'unpack 'prefix + (lambda _ + (substitute* "Makefile" + (("/usr/local") + (string-append #$output))))) + ;; Haxe uses a straight forward make, dune runtest, and make + ;; install process. + (replace 'build + (lambda* (#:key make-flags parallel-build? #:allow-other-keys) + (invoke "make" "-j" (if parallel-build? + (number->string (parallel-job-count)) + "1")))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "dune" "runtest")))) + (replace 'install + (lambda _ + (invoke "make" "install")))))) + (inputs (list libuv + mbedtls-apache + neko + ocaml-extlib + ocaml-luv + ocaml-ptmap + ocaml-sedlex + ocaml-sha + ocaml-xml-light + pcre + zlib)) + (native-inputs (list ocaml-findlib camlp5)) + (home-page "https://haxe.org/") + (synopsis "Multi-target universal programming language") + (description + "Haxe is a toolkit based on a modern, high level, static-typed +programming language, a cross-compiler, a complete cross-platform standard +library and ways to access each platform's native capabilities. This package +includes the compiler and library manager.") + (license (list license:gpl2+ ; the compiler itself + license:expat)))) ; the standard library + -- 2.37.1 From patchwork Thu Jul 28 04:11:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Kehayias X-Patchwork-Id: 41031 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 E10C927BBEA; Thu, 28 Jul 2022 05:13:03 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable 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 2B83527BBE9 for ; Thu, 28 Jul 2022 05:13:03 +0100 (BST) Received: from localhost ([::1]:43908 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oGutS-0002qv-BW for patchwork@mira.cbaines.net; Thu, 28 Jul 2022 00:13:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56906) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oGusV-0002W0-3z for guix-patches@gnu.org; Thu, 28 Jul 2022 00:12:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39357) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oGusU-0002BV-Rf for guix-patches@gnu.org; Thu, 28 Jul 2022 00:12:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oGusU-0005hD-N6 for guix-patches@gnu.org; Thu, 28 Jul 2022 00:12:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56806] [PATCH 9/9] gnu: Add hashlink. References: <9PX8REXHYFolHkT-TXF_SZcRFDEe1-1KwK9riBoz1tnsKV2raznmLO3YTlzbpdyJ9dBOqnpcaUomHmLfOWjytFrkLEvIW_upqCAA_-byN50=@protonmail.com> In-Reply-To: <9PX8REXHYFolHkT-TXF_SZcRFDEe1-1KwK9riBoz1tnsKV2raznmLO3YTlzbpdyJ9dBOqnpcaUomHmLfOWjytFrkLEvIW_upqCAA_-byN50=@protonmail.com> Resent-From: John Kehayias Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 28 Jul 2022 04:12:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56806 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "56806@debbugs.gnu.org" <56806@debbugs.gnu.org> Received: via spool by 56806-submit@debbugs.gnu.org id=B56806.165898151021857 (code B ref 56806); Thu, 28 Jul 2022 04:12:02 +0000 Received: (at 56806) by debbugs.gnu.org; 28 Jul 2022 04:11:50 +0000 Received: from localhost ([127.0.0.1]:57337 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oGusI-0005gT-50 for submit@debbugs.gnu.org; Thu, 28 Jul 2022 00:11:50 -0400 Received: from mail-4316.protonmail.ch ([185.70.43.16]:19791) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oGusF-0005gD-S6 for 56806@debbugs.gnu.org; Thu, 28 Jul 2022 00:11:48 -0400 Date: Thu, 28 Jul 2022 04:11:39 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1658981502; x=1659240702; bh=uBU6DW7BQPfCZ2ZOiFNEKr2NRgfT4o5EF73wrqjwU8Q=; h=Date:To:From:Reply-To:Subject:Message-ID:Feedback-ID:From:To:Cc: Date:Subject:Reply-To:Feedback-ID:Message-ID; b=qmFqI8L8eFPiNNC5fW+itgrEGResEvTTrFJouWUlgHpBjmvSSUoZS1na7SUHtntCN x/ErRX/j6G2zsFXatuT42GrhSorW19Ku1h+aBKZNt2v+fdPjbniam+Gs1Kye+ZEnJg eHeyt1o9YOMa8UtlMyiyTDlY0ygJXSHyoOjPZSLCcQ/JtwrJfFyObZnhdFyaCUzGZB +jL6g0S0wGnL5Urdb9DjFeyZDzajvMugD5xDn6Iqflgxvas45lbAYKCl6lhHzo+qbN eRi7xfYZkVeBVYZgMLumqB/NK3ke63unxAZfGYrj1QTWBybReqmBF4mX5QH3AIODrd AbNVRidnodyKg== Message-ID: <7qTaPCHNgqby8ax2a2rAvMFc7fTMsapBKAUMfeSwop-hCRs--vhp8SbCwOwXXpTmSwcf3n_98XDb1fmuzIsqBVfn3pMw-oGvwt3Tl3w_ghU=@protonmail.com> Feedback-ID: 7805494:user:proton 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" Reply-to: John Kehayias X-ACL-Warn: , John Kehayias via Guix-patches X-Patchwork-Original-From: John Kehayias via Guix-patches via From: John Kehayias X-getmail-retrieved-from-mailbox: Patches Empty Message From fa69682cc2051d5058322228cc45e6e5a3ecfc55 Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Wed, 27 Jul 2022 23:45:22 -0400 Subject: [PATCH 9/9] gnu: Add hashlink. * gnu/packages/haxe.scm (hashlink): New variable. --- gnu/packages/haxe.scm | 93 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) diff --git a/gnu/packages/haxe.scm b/gnu/packages/haxe.scm index 95de4c5e4b..6876dbdc6f 100644 --- a/gnu/packages/haxe.scm +++ b/gnu/packages/haxe.scm @@ -189,3 +189,96 @@ (define-public haxe (license (list license:gpl2+ ; the compiler itself license:expat)))) ; the standard library +(define-public hashlink + (package + (name "hashlink") + (version "1.12") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/HaxeFoundation/hashlink") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0i5f1mxpgjcdirx60kxrw0r0y15qh3j16a6fj8mzkq3k7j2hc982")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Remove bundled libraries (mainly used for Windows build). + (delete-file-recursively "include") + #t)))) + (build-system gnu-build-system) + (arguments + ;; Looks like there are tests with CMake, but there is confusion if this + ;; is a supported way to build on Linux. See, e.g. + ;; https://github.com/HaxeFoundation/hashlink/issues/397. Also, the + ;; CMake build requires running the library manager haxelib in the build + ;; process for the tests, likely requiring network access. + ;; TODO: Use cmake-build-system instead and enable tests? + (list #:tests? #f + #:make-flags + ;; The built hdll libraries need help finding libhl.so. + #~(list (string-append "LIBFLAGS=-Wl,-rpath=" #$output "/lib")) + #:phases + #~(modify-phases %standard-phases + ;; Don't try to build the (removed) bundled libraries pcre, + ;; minimp3, and mikktspace. Provide the approriate paths and + ;; linking options. + (add-after 'unpack 'use-system-libs + (lambda _ + (substitute* "Makefile" + (("\\$\\{PCRE\\}") "") + (("-lpthread") "-lpthread -lpcre16") + (("include/minimp3") + (string-append #$(this-package-input "minimp3") "/include")) + (("include/mikktspace ") + (string-append #$(this-package-input "mikktspace") "/include ")) + (("include/mikktspace/mikktspace.o") "") + (("-lpng") "-lpng -lmikktspace")))) + (replace 'configure + (lambda* _ + (setenv "CC" #$(cc-for-target)) + (setenv "PREFIX" #$output))) + (replace 'build + (lambda* (#:key make-flags parallel-build? #:allow-other-keys) + (apply invoke "make" "-j" (if parallel-build? + (number->string (parallel-job-count)) + "1") + make-flags)))))) + (inputs (list glu + haxe + libjpeg-turbo + libpng + libuv + libvorbis + mbedtls-apache + mikktspace + minimp3 + openal + pcre + sdl2 + sqlite + zlib)) + (native-inputs (list pkg-config)) + (home-page "https://hashlink.haxe.org/") + (synopsis "Virtual machine for the Haxe language") + (description + "HashLink (HL) is a virtual machine for the Haxe language. It can run +bytecode produced by the Haxe compiler, or converted to C by HL. The HashLink runtime +includes the following features: +@itemize +@item Fully compatible with the Haxe specification +@item Support file I/O, regular expressions, network, etc. +@item Unicode strings by default +@item Mark-and-not-sweep Garbage Collector +@item x86 and x86-64 HL/C compilation +@item x86 and x86-64 HL/JIT compilation +@end itemize + +While the standard HL runtime provides support for Haxe standard library, +HashLink also provides several libraries that can optionally be used to build +HL-specific applications. This includes the FMT library for compression and +image support and SDL for mouse, keyboard, and game controller support, +OpenGL, and more.") + (license license:expat))) -- 2.37.1