From patchwork Wed Oct 24 23:07:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: HiPhish X-Patchwork-Id: 24 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 C400916758; Thu, 25 Oct 2018 02:25:30 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI, T_DKIM_INVALID,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) by mira.cbaines.net (Postfix) with ESMTPS id 5807016756 for ; Thu, 25 Oct 2018 02:25:30 +0100 (BST) Received: from localhost ([::1]:51666 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gFUOv-0002yK-JG for patchwork@mira.cbaines.net; Wed, 24 Oct 2018 21:25:29 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37366) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gFSGw-0000cv-6F for guix-patches@gnu.org; Wed, 24 Oct 2018 19:09:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gFSGs-0006ZR-Vl for guix-patches@gnu.org; Wed, 24 Oct 2018 19:09:06 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:36725) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gFSGs-0006Z2-PS for guix-patches@gnu.org; Wed, 24 Oct 2018 19:09:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gFSGs-0000g3-IF for guix-patches@gnu.org; Wed, 24 Oct 2018 19:09:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#33142] [PATCH] Add two Lua 5.1 packages Resent-From: HiPhish Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 24 Oct 2018 23:09:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 33142 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 33142@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.15404224882533 (code B ref -1); Wed, 24 Oct 2018 23:09:02 +0000 Received: (at submit) by debbugs.gnu.org; 24 Oct 2018 23:08:08 +0000 Received: from localhost ([127.0.0.1]:40983 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gFSG0-0000en-Fy for submit@debbugs.gnu.org; Wed, 24 Oct 2018 19:08:08 -0400 Received: from eggs.gnu.org ([208.118.235.92]:55784) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gFSFz-0000eL-2I for submit@debbugs.gnu.org; Wed, 24 Oct 2018 19:08:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gFSFt-0004oh-3h for submit@debbugs.gnu.org; Wed, 24 Oct 2018 19:08:02 -0400 Received: from lists.gnu.org ([2001:4830:134:3::11]:57163) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gFSFs-0004oU-VU for submit@debbugs.gnu.org; Wed, 24 Oct 2018 19:08:01 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37159) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gFSFr-0008P1-Ty for guix-patches@gnu.org; Wed, 24 Oct 2018 19:08:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gFSFo-0004hE-Pa for guix-patches@gnu.org; Wed, 24 Oct 2018 19:07:59 -0400 Received: from mout02.posteo.de ([185.67.36.66]:39601) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gFSFo-0004c3-CG for guix-patches@gnu.org; Wed, 24 Oct 2018 19:07:56 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 118232400E5 for ; Thu, 25 Oct 2018 01:07:53 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.de; s=2017; t=1540422474; bh=BFp6r/C5NUg3LOr0M32SZDyu5iDCvaB+CH281NeENBo=; h=From:To:Subject:Date:From; b=bYZoArtMpIKFNkv187+VZQ0owx+pp2pZ28M7bGo3CpguauB3rDaxsTBnUS8pmwOjR IwXP/mudAPrg5CIVtWBvVmvNEuW/hi+nVVPFDEvfaxRYNJH7E6lo4ho9PnXtJkG1xu C+1D3Sl53taiY9bQpEHeP+1nRtJYRHC53u35OiSy/exqHUWW3ryXzb0Vf/ALburUy7 IwQni1ESddw3vrsZ3m2VKq6QNb14qtBXa9j8HaBiCBmcA3wutp2nGYkX757KgprFV5 72J0/33S/p6LFbk10LqJfLCd2OiYmEE1RHrBctF7vNY0lf/3aOXz4Im0vfrPy6+8A/ 3Q/6OeexWFMvQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 42gQs52Y0Bz9rxH for ; Thu, 25 Oct 2018 01:07:53 +0200 (CEST) From: HiPhish Date: Thu, 25 Oct 2018 01:07:52 +0200 Message-ID: <5444626.lOV4Wx5bFT@aleksandar-ixtreme-m5740> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-Mailman-Approved-At: Wed, 24 Oct 2018 21:25:24 -0400 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" X-getmail-retrieved-from-mailbox: Patches Hello, This is my first time contributing a patch, so hopefully I did everything right. The patch adds two packages for Lua 5.1; the new packages are based on the existing Lua 5.2 packages. The reason we need separate packages for Lua 5.1 and 5.2 is because Lua is not backwards compatible between releases: there is no guarantee that code working on 5.1 will work on 5.2 or vice-versa (even though it probably will, we don't want to rely on probably). These two packages will be needed by the Neovim package later. From c4cfd2080610a40518726745ed97affc90263b36 Mon Sep 17 00:00:00 2001 From: HiPhish Date: Wed, 24 Oct 2018 14:22:14 +0200 Subject: [PATCH] Add two Lua 5.1 packages * gnu/packages/lua.scm (lua5.1-lpeg): New package * gnu/packages/serialization.scm (lua5.1-libmpack): New package The packages lua-lpeg and lua-libmpack had no Lua 5.1 variants. These packages will be needed to build Neovim properly. --- gnu/packages/lua.scm | 3 +++ gnu/packages/serialization.scm | 20 ++++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm index be77ac4a6..2dc1452cc 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -408,6 +408,9 @@ Grammars (PEGs).") (define-public lua-lpeg (make-lua-lpeg "lua-lpeg" lua)) +(define-public lua5.1-lpeg + (make-lua-lpeg "lua5.1-lpeg" lua-5.1)) + (define-public lua5.2-lpeg (make-lua-lpeg "lua5.2-lpeg" lua-5.2)) diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm index 3064e385e..6b28463d5 100644 --- a/gnu/packages/serialization.scm +++ b/gnu/packages/serialization.scm @@ -225,6 +225,26 @@ that implements both the msgpack and msgpack-rpc specifications.") (home-page "https://github.com/libmpack/libmpack-lua") (synopsis "Lua bindings for the libmpack binary serialization library"))) +(define-public lua5.1-libmpack + (package (inherit lua-libmpack) + (name "lua5.1-libmpack") + (arguments + (substitute-keyword-arguments (package-arguments lua-libmpack) + ((#:make-flags flags) + `(let* ((lua-version ,(package-version lua-5.1)) + (lua-major+minor ,(version-major+minor (package-version lua-5.1)))) + (list "CC=gcc" + "USE_SYSTEM_LUA=yes" + (string-append "MPACK_LUA_VERSION=" lua-version) + (string-append "MPACK_LUA_VERSION_NOPATCH=" lua-major+minor) + (string-append "PREFIX=" + (assoc-ref %outputs "out")) + (string-append "LUA_CMOD_INSTALLDIR=" + (assoc-ref %outputs "out") + "/lib/lua/" lua-major+minor)))))) + (inputs + `(("lua" ,lua-5.1))))) + (define-public lua5.2-libmpack (package (inherit lua-libmpack) (name "lua5.2-libmpack") -- 2.17.1