From patchwork Wed May 18 13:32:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Henrique Gomes Higino X-Patchwork-Id: 39466 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 958B227BBE9; Wed, 18 May 2022 14:33:35 +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_ADSP_CUSTOM_MED, 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 BCCFB27BBEA for ; Wed, 18 May 2022 14:33:34 +0100 (BST) Received: from localhost ([::1]:50630 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nrJnx-0002W5-Ud for patchwork@mira.cbaines.net; Wed, 18 May 2022 09:33:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37346) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nrJnU-0001rR-E6 for guix-patches@gnu.org; Wed, 18 May 2022 09:33:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:37339) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nrJnU-0002ty-65 for guix-patches@gnu.org; Wed, 18 May 2022 09:33:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nrJnU-0006Xs-4C for guix-patches@gnu.org; Wed, 18 May 2022 09:33:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55045] [PATCH v3 4/4] gnu: neovim: Use new style. Resent-From: Luis Henrique Gomes Higino Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 18 May 2022 13:33:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55045 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55045@debbugs.gnu.org Cc: Luis Henrique Gomes Higino Received: via spool by 55045-submit@debbugs.gnu.org id=B55045.165288078125123 (code B ref 55045); Wed, 18 May 2022 13:33:04 +0000 Received: (at 55045) by debbugs.gnu.org; 18 May 2022 13:33:01 +0000 Received: from localhost ([127.0.0.1]:59465 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nrJnN-0006Wy-JB for submit@debbugs.gnu.org; Wed, 18 May 2022 09:33:01 -0400 Received: from mail-ot1-f49.google.com ([209.85.210.49]:45877) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nrJnL-0006WF-0P for 55045@debbugs.gnu.org; Wed, 18 May 2022 09:32:56 -0400 Received: by mail-ot1-f49.google.com with SMTP id s18-20020a056830149200b006063fef3e17so1312935otq.12 for <55045@debbugs.gnu.org>; Wed, 18 May 2022 06:32:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Qp66y2qbJJTelQmmAd7lAFjWYsFqKUoWjBKYJF7im/Q=; b=oloA2tTjG7RVL19c1/2/vHaEPjnsJuYyQKVYN1tKUVTZDMAXdYaLvof66TyuVtLY+g 8MIujQXTa/LdRKQpiueopMgUH+vRfiVbZWeyWZzD++sZlGdv3bRiNSWHRv8igPJE0D46 W1t4HUIxTvzs0OZgU24H4q4F5oLqH4tZvcoZQ0fKNi7976NMWYQKQkRlEo247jV1fbkk xm7ViBUR7KRav5gwm7BicsEdXxE9vx4DvP75q4EY7Ny8H42SsuCaH8RtWYUKWr97Q5l+ NM2fTrXGa/kAdX5hj2KI9X5fNg7Xz4Id/PJ78UCJl5EsFZQNoExy0plQUkXU/oBukw0K sooA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Qp66y2qbJJTelQmmAd7lAFjWYsFqKUoWjBKYJF7im/Q=; b=rOFJmZFwf3Kr8ZzCPU+nBYokE6kqD1lbaZ0Ua323Fij0CWNsHa/foUPmcr6M4iGJQd vXFpRMhsow0fwJL9koJ2qcOQPUAqLz03zToDYQVQRA8q3U0I2e7gkhdEjuUptuRB7a3e RoLlRgUOYvBpCSRyPwMs4xnevbOYcoCpOlPRbol6c3MAwvwU927MXNv8qzWG0yKg0Emk LYf4B2+lSUhaA2NGdUkYDEjRUe98tHvQRc7BC5xZ24dxPttpKva2SQUiMYkmdqLkb0ej bwtC/tu8QDBuBEq7nkTzi/h/Ie4lvLhHfVDUMQOqCPSpNWIaLzqm0gOT7DrgxNejfnYs sMSA== X-Gm-Message-State: AOAM5318ylNk7b4XnJxM3RJFcp+A4RbuidzBuY8Zq/Tf2XLkEFeInufp GjSEX0/s3GupbndAPJrX8bq55pQlu6VpGK1l X-Google-Smtp-Source: ABdhPJw3X2V6Xn8+RgySqFmDbluCaXR1fIj/6Bj3uichh3AHpeRYfrUcJwftIJ/xTCmx5tQlxlEdEw== X-Received: by 2002:a9d:73d9:0:b0:606:21c9:a283 with SMTP id m25-20020a9d73d9000000b0060621c9a283mr9934484otk.321.1652880769001; Wed, 18 May 2022 06:32:49 -0700 (PDT) Received: from localhost.localdomain ([179.180.243.123]) by smtp.gmail.com with ESMTPSA id b3-20020a4aac83000000b0035ec65ac944sm967600oon.16.2022.05.18.06.32.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 May 2022 06:32:48 -0700 (PDT) From: Luis Henrique Gomes Higino Date: Wed, 18 May 2022 10:32:25 -0300 Message-Id: <20220518133225.30983-4-luishenriquegh2701@gmail.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220518133225.30983-1-luishenriquegh2701@gmail.com> References: <20220518133225.30983-1-luishenriquegh2701@gmail.com> 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/vim.scm (neovim): Use new style. [source]: Rewrite using gexps. [arguments]: Rewrite using gexps. [inputs and native-inputs]: Remove input labels. [description]: Run `guix style`. --- gnu/packages/vim.scm | 156 ++++++++++++++++++++++--------------------- 1 file changed, 81 insertions(+), 75 deletions(-) diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 21a22570ad..caf9ea85b3 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -659,84 +659,89 @@ (define-public neovim (package (name "neovim") (version "0.7.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/neovim/neovim") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1m7xmry66pn27gvk7qj9di83xa1h7zjp4c6ygnf218pqhr08x06g")))) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/neovim/neovim") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1m7xmry66pn27gvk7qj9di83xa1h7zjp4c6ygnf218pqhr08x06g")))) (build-system cmake-build-system) (arguments - `(#:modules ((srfi srfi-26) - (guix build cmake-build-system) - (guix build utils)) - #:configure-flags - (list ,@(if (member (if (%current-target-system) - (gnu-triplet->nix-system (%current-target-system)) - (%current-system)) - (package-supported-systems luajit)) - '() - '("-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))))) - (inputs - `(("libuv" ,libuv-for-luv) - ("msgpack" ,msgpack) - ("libtermkey" ,libtermkey) - ("libvterm" ,libvterm) - ("unibilium" ,unibilium) - ("jemalloc" ,jemalloc) - ("lua" ,(if (member (if (%current-target-system) - (gnu-triplet->nix-system (%current-target-system)) - (%current-system)) - (package-supported-systems luajit)) - luajit - lua-5.1)) - ("lua-luv" ,lua5.1-luv) - ("lua-lpeg" ,lua5.1-lpeg) - ("lua-bitop" ,lua5.1-bitop) - ("lua-libmpack" ,lua5.1-libmpack) - ("tree-sitter" ,tree-sitter))) - (native-inputs - `(("pkg-config" ,pkg-config) - ("gettext" ,gettext-minimal) - ("gperf" ,gperf))) + (list #:modules + '((srfi srfi-26) (guix build cmake-build-system) + (guix build utils)) + #:configure-flags + #~(list #$@(if (member (if (%current-target-system) + (gnu-triplet->nix-system (%current-target-system)) + (%current-system)) + (package-supported-systems luajit)) + '() + '("-DPREFER_LUA:BOOL=YES"))) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'set-lua-paths + (lambda* _ + (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 (list (or #$(this-package-input "lua") + #$(this-package-input "luajit")) + #$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) ";")) + #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))))) + (inputs (list libuv-for-luv + msgpack + libtermkey + libvterm + unibilium + jemalloc + (if (member (if (%current-target-system) + (gnu-triplet->nix-system (%current-target-system)) + (%current-system)) + (package-supported-systems luajit)) + luajit + lua-5.1) + lua5.1-luv + lua5.1-lpeg + lua5.1-bitop + lua5.1-libmpack + tree-sitter)) + (native-inputs (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 + (description + "Neovim is a project that seeks to aggressively refactor Vim in order to: @itemize @@ -744,7 +749,8 @@ (define-public neovim @item Split the work between multiple developers @item Enable advanced external UIs without modifications to the core @item Improve extensibility with a new plugin architecture -@end itemize\n") +@end itemize +") ;; Neovim is licensed under the terms of the Apache 2.0 license, ;; except for parts that were contributed under the Vim license. (license (list license:asl2.0 license:vim))))