From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id sAxyA5x9H2JH5QAAgWs5BA (envelope-from ) for ; Wed, 02 Mar 2022 15:22:20 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id cAX9AJx9H2IDEwAA9RJhRA (envelope-from ) for ; Wed, 02 Mar 2022 15:22:20 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 837213D377 for ; Wed, 2 Mar 2022 15:22:19 +0100 (CET) Received: from localhost ([::1]:60498 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nPPru-0006at-Ch for larch@yhetil.org; Wed, 02 Mar 2022 09:22:18 -0500 Received: from eggs.gnu.org ([209.51.188.92]:34280) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nPOtk-0001tf-5B for guix-patches@gnu.org; Wed, 02 Mar 2022 08:20:08 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:45478) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nPOtg-0000ck-Gx for guix-patches@gnu.org; Wed, 02 Mar 2022 08:20:07 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nPOtg-0002Rr-Ce for guix-patches@gnu.org; Wed, 02 Mar 2022 08:20:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#54221] [PATCH 4/4] gnu: neovim: Update package style. Resent-From: SeerLite Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 02 Mar 2022 13:20:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54221 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54221@debbugs.gnu.org Cc: SeerLite Received: via spool by 54221-submit@debbugs.gnu.org id=B54221.16462271959352 (code B ref 54221); Wed, 02 Mar 2022 13:20:04 +0000 Received: (at 54221) by debbugs.gnu.org; 2 Mar 2022 13:19:55 +0000 Received: from localhost ([127.0.0.1]:39366 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nPOtW-0002Qm-KP for submit@debbugs.gnu.org; Wed, 02 Mar 2022 08:19:54 -0500 Received: from mx.nixnet.email ([94.16.121.167]:56650) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nPOtU-0002QX-UP for 54221@debbugs.gnu.org; Wed, 02 Mar 2022 08:19:53 -0500 Received: from [127.0.0.1] (localhost [127.0.0.1]) by mx.nixnet.email (Postfix) with ESMTPSA id 7F53B2020E7; Wed, 2 Mar 2022 08:19:49 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nixnet.email; s=202002021149; t=1646227190; h=from:from:reply-to:subject:subject:to:to:cc:cc; bh=W5MRP2bthoyalRBsVZ+YH/MoHgrawKTxZzY493OV+lg=; b=MxMuTvHkzDEyXW0kPM+O2XTzn4hKYXA8Uoq3oIMc053jQNZY0Ps+n1EyK6X7vvnMSYdDPR coeEMzCyC4TDhsOmupXf3Gj4+v5H5ViT/xjEBLTUT7HvEWfp1k/Za6THc7PdzwEHZupu6P 2yfPF5HuKIdGT6UX27ggUdeiewvmF8A= Date: Wed, 2 Mar 2022 10:17:35 -0300 Message-Id: <0ee8ec7a501cf53dc1b70b0ba21f72c0f3dc2d58.1646227054.git.seerlite@nixnet.email> X-Mailer: git-send-email 2.34.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" Reply-to: SeerLite X-ACL-Warn: , SeerLite via Guix-patches From: SeerLite via Guix-patches via X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1646230939; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=W5MRP2bthoyalRBsVZ+YH/MoHgrawKTxZzY493OV+lg=; b=DwheVp9fCIQsqgHOdipUoADMvfYUUroo7oxX9+Cz75YXqDjiPiUW5PoWl6R5QkNT42Gztf eKbDKTI48AjReMjSQ3KQyoRsBNgkLVE+Xs1z1rN4UrBHIvB4o3GXuA7kZIKOT66oRtb2q0 5zM8u7tTISMiuH/KyewaDZRL7HAw4cR6NwkIeHkH6M1ftLk6/AL4sMg2YlKPrY3ElllBk3 d53qvF2uZk79ZL8OzsJk5o566bOSQpxM62PniULI/AApd7U624olIzxpjXX8etujVltAI9 Deiivh6wDnRSfFLiq732AYlY5KC9+ajnQd58fLsJNknWGQdN+dGBXN70Xe09pw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1646230939; a=rsa-sha256; cv=none; b=UBK2Pryi4pmY8Nf20alk9byqh9o/HdEYnOtMD73iDJM8CS4g5FRKYOOWUGEmbcUsglAHe9 GyUQEzBeOwiBO9WwaUmzIO9nn1a5izKlOhS+EQPh2jc5KMQGKKB+2jIeBsP0n2flQENR7Z Md3E3ztuxUzQ/hfL3uB0majzd6YJQi5bv4xMuXFkftJvsZh3WbB5faA3cEagNAcpEyR6F4 dYeyJm4t9sCW0Zij+X1Ai0hgX/qRLHURmL2OgxjlaJEu6mUt7tAALHerFavNOqsrLk71yk HXH38O+a8PFylyhJVSOMODyHL51b9KhZfcswHlx3vMHDiaSy2Z7U5TtZfLdhwg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=nixnet.email header.s=202002021149 header.b=MxMuTvHk; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -3.68 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=nixnet.email header.s=202002021149 header.b=MxMuTvHk; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 837213D377 X-Spam-Score: -3.68 X-Migadu-Scanner: scn0.migadu.com X-TUID: U1y/sZIKT5vD * gnu/packages/vim.scm (neovim)[inputs]: Remove labels. [native-inputs]: Remove "guix.vim" gexp and remove labels. [arguments]: Convert to list of gexps, inline the "guix.vim" gexp, adjust lua input names and remove trailing #t's. --- gnu/packages/vim.scm | 114 +++++++++++++++++++++---------------------- 1 file changed, 55 insertions(+), 59 deletions(-) diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index d5d8b412f7..5e6439ed00 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -676,70 +676,66 @@ (define-public neovim (base32 "11zyj6jvkwas3n6w1ckj3pk6jf81z1g7ngg4smmwm7c27y2a6f2m")))) (build-system cmake-build-system) (arguments - `(#:modules ((srfi srfi-26) + (list + #:modules `((srfi srfi-26) (guix build cmake-build-system) (guix build utils)) - #:configure-flags '("-DPREFER_LUA:BOOL=YES") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'set-lua-paths - (lambda* (#:key inputs #:allow-other-keys) - (let* ((lua-version "5.1") - (lua-cpath-spec - (lambda (prefix) - (let ((path (string-append prefix "/lib/lua/" lua-version))) - (string-append path "/?.so;" path "/?/?.so")))) - (lua-path-spec - (lambda (prefix) - (let ((path (string-append prefix "/share/lua/" lua-version))) - (string-append path "/?.lua;" path "/?/?.lua")))) - (lua-inputs (map (cute assoc-ref inputs <>) - '("lua" - "lua-luv" - "lua-lpeg" - "lua-bitop" - "lua-libmpack")))) - (setenv "LUA_PATH" - (string-join (map lua-path-spec lua-inputs) ";")) - (setenv "LUA_CPATH" - (string-join (map lua-cpath-spec lua-inputs) ";")) - #t))) - (add-after 'unpack 'prevent-embedding-gcc-store-path - (lambda _ - ;; nvim remembers its build options, including the compiler with - ;; its complete path. This adds gcc to the closure of nvim, which - ;; doubles its size. We remove the refirence here. - (substitute* "cmake/GetCompileFlags.cmake" - (("\\$\\{CMAKE_C_COMPILER\\}") "/gnu/store/.../bin/gcc")) - #t)) - (add-after 'install 'install-guix.vim - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((nvimdir (string-append (assoc-ref outputs "out") "/share/nvim"))) - (mkdir-p nvimdir) - (copy-file (assoc-ref inputs "guix.vim") - (string-append nvimdir "/sysinit.vim")))))))) + #:configure-flags #~(list "-DPREFER_LUA:BOOL=YES") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'set-lua-paths + (lambda* (#:key inputs #:allow-other-keys) + (let* ((lua-version "5.1") + (lua-cpath-spec + (lambda (prefix) + (let ((path (string-append prefix "/lib/lua/" lua-version))) + (string-append path "/?.so;" path "/?/?.so")))) + (lua-path-spec + (lambda (prefix) + (let ((path (string-append prefix "/share/lua/" lua-version))) + (string-append path "/?.lua;" path "/?/?.lua")))) + (lua-inputs (map (cute assoc-ref inputs <>) + '("lua" + "lua5.1-luv" + "lua5.1-lpeg" + "lua5.1-bitop" + "lua5.1-libmpack")))) + (setenv "LUA_PATH" + (string-join (map lua-path-spec lua-inputs) ";")) + (setenv "LUA_CPATH" + (string-join (map lua-cpath-spec lua-inputs) ";"))))) + (add-after 'unpack 'prevent-embedding-gcc-store-path + (lambda _ + ;; nvim remembers its build options, including the compiler with + ;; its complete path. This adds gcc to the closure of nvim, which + ;; doubles its size. We remove the refirence here. + (substitute* "cmake/GetCompileFlags.cmake" + (("\\$\\{CMAKE_C_COMPILER\\}") "/gnu/store/.../bin/gcc")))) + (add-after 'install 'install-guix.vim + (lambda _ + (let ((vimdir (string-append #$output "/share/nvim")) + (vimrc #$(local-file (search-auxiliary-file "guix.vim")))) + (mkdir-p vimdir) + (copy-file vimrc (string-append vimdir "/sysinit.vim")))))))) (native-search-paths - (list (search-path-specification - (variable "GUIX_VIMRUNTIME") - (separator ",") - (files (list "share/vim/vimfiles"))))) + (list (search-path-specification + (variable "GUIX_VIMRUNTIME") + (separator ",") + (files (list "share/vim/vimfiles"))))) (inputs - `(("libuv" ,libuv) - ("msgpack" ,msgpack) - ("libtermkey" ,libtermkey) - ("libvterm" ,libvterm) - ("unibilium" ,unibilium) - ("jemalloc" ,jemalloc) - ("lua" ,lua-5.1) - ("lua-luv" ,lua5.1-luv) - ("lua-lpeg" ,lua5.1-lpeg) - ("lua-bitop" ,lua5.1-bitop) - ("lua-libmpack" ,lua5.1-libmpack))) + (list libuv + msgpack + libtermkey + libvterm + unibilium + jemalloc + lua-5.1 + lua5.1-luv + lua5.1-lpeg + lua5.1-bitop + lua5.1-libmpack)) (native-inputs - `(("pkg-config" ,pkg-config) - ("gettext" ,gettext-minimal) - ("gperf" ,gperf) - ("guix.vim" ,(search-auxiliary-file "guix.vim")))) + (list pkg-config gettext-minimal gperf)) (home-page "https://neovim.io") (synopsis "Fork of vim focused on extensibility and agility") (description "Neovim is a project that seeks to aggressively -- 2.34.0