From patchwork Tue May 17 23:16:47 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: 39460 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 EDAB727BBEA; Wed, 18 May 2022 00:18:15 +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 58EB927BBE9 for ; Wed, 18 May 2022 00:18:15 +0100 (BST) Received: from localhost ([::1]:45798 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nr6SE-0003LF-FM for patchwork@mira.cbaines.net; Tue, 17 May 2022 19:18:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55128) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nr6S3-0003H6-6v for guix-patches@gnu.org; Tue, 17 May 2022 19:18:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36243) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nr6S2-000791-Un for guix-patches@gnu.org; Tue, 17 May 2022 19:18:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nr6S2-0000Yp-R4 for guix-patches@gnu.org; Tue, 17 May 2022 19:18:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55045] [PATCH v2 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: Tue, 17 May 2022 23:18:02 +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.16528294552098 (code B ref 55045); Tue, 17 May 2022 23:18:02 +0000 Received: (at 55045) by debbugs.gnu.org; 17 May 2022 23:17:35 +0000 Received: from localhost ([127.0.0.1]:58370 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nr6Ra-0000Xg-Gq for submit@debbugs.gnu.org; Tue, 17 May 2022 19:17:34 -0400 Received: from mail-oa1-f51.google.com ([209.85.160.51]:33832) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nr6RN-0000Wr-Gt for 55045@debbugs.gnu.org; Tue, 17 May 2022 19:17:21 -0400 Received: by mail-oa1-f51.google.com with SMTP id 586e51a60fabf-f189b07f57so592502fac.1 for <55045@debbugs.gnu.org>; Tue, 17 May 2022 16:17:21 -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=RBxLmKmfAMj7GBIwidfBX7HjpSKd1SjlezzYUJMZ9AM=; b=ATVzMbETFkSpBrR97JCLXvayadfjR30vS0GQNEVZybwPYy+ZnGrQOT9JTPexEo+Rsw O20VDZm8K4GKfkfbopOXrJ3pgUVoaaRZ0hn6TqXZoTLkTUUCxB/XTWdhZYBJrLWVS0Rh ocUsUw/sK5zyhwLbLKffemw/1VuOXaboWRJtnBHL0ZVRw44qCqolGr+9T6IdYY7hwMX7 bE6oBlljFckT010448lDaK6k6J/Nq94r2dwhJh91qnIvtGifURKMO7Le3Behr1bbyaqJ 3OJlJwUWah7jP+7V+vNHUsfvLrNfxizAuYRg0jhDA+kdtSDqEYqllk5ZJ7n5dplICWv0 Fjkg== 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=RBxLmKmfAMj7GBIwidfBX7HjpSKd1SjlezzYUJMZ9AM=; b=KzVfX/ylMV3nMpARYa1X03sc/WaHlC0WXosgBFQn0epf7xqlK4IFshUp4mcS7On4fN BLxaZBNP3cwI6YZJUrtXKPonNmkFvGSw1j87kDngUExAo4/Rw5apbVAEJRqJEhxZYUaq QbkXjOB3eVuCE9EWhNZb3BfEuBPVu/SnONOBISTMzqj3jlwn1LP4kxzzX0SRrx2Luwl9 l48C+JVmIWeLiFrpg/6mqH7WxpiBEiefCV5AFuNW1GO8lpPel7vYC9oWeC+iu4UuGKHJ LmVQGew1vIOLGWPhXwPgretzD+nhoQI/ox/wgLxRXowapgioh7e3b4/QFRnqx+1rr4yQ HvWw== X-Gm-Message-State: AOAM532yZpKjStY/sFVBYDHu2eMf8WHbAnE350T779BHcEj7i7e7RqCf 2P/mOJ4DNf0UKSuwz3NDj1ck863zxyoPHvfy X-Google-Smtp-Source: ABdhPJxv6ruYd46iowdhmvM7q8DeR3bAZciRgWbu2V+SAkilDr23XCOae+IzAuCNy4ULP8IoLoNi7A== X-Received: by 2002:a05:6870:b025:b0:e6:283a:9553 with SMTP id y37-20020a056870b02500b000e6283a9553mr14001613oae.62.1652829435416; Tue, 17 May 2022 16:17:15 -0700 (PDT) Received: from localhost.localdomain ([2804:1b3:c200:fc7:399f:1d5:1b26:e154]) by smtp.gmail.com with ESMTPSA id r3-20020a4a83c3000000b0035eb4e5a6c2sm340976oog.24.2022.05.17.16.17.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 May 2022 16:17:14 -0700 (PDT) From: Luis Henrique Gomes Higino Date: Tue, 17 May 2022 20:16:47 -0300 Message-Id: <20220517231647.18336-4-luishenriquegh2701@gmail.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220517231647.18336-1-luishenriquegh2701@gmail.com> References: <20220517231647.18336-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 | 153 ++++++++++++++++++++++--------------------- 1 file changed, 78 insertions(+), 75 deletions(-) diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 21a22570ad..0dfaa45813 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -659,84 +659,86 @@ (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 _ + (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 +746,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))))