From patchwork Wed Apr 20 17:52:41 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: 38713 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 665A127BBEA; Wed, 20 Apr 2022 18:54:18 +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 C486A27BBE9 for ; Wed, 20 Apr 2022 18:54:17 +0100 (BST) Received: from localhost ([::1]:45564 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nhEWu-0007J2-Ul for patchwork@mira.cbaines.net; Wed, 20 Apr 2022 13:54:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49822) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nhEWh-0007Gq-OY for guix-patches@gnu.org; Wed, 20 Apr 2022 13:54:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53509) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nhEWh-0007Sw-Fr for guix-patches@gnu.org; Wed, 20 Apr 2022 13:54:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nhEWh-00073Q-Fg for guix-patches@gnu.org; Wed, 20 Apr 2022 13:54:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55045] [PATCH 4/4] gnu: neovim: replace sexps with gexps. Resent-From: Luis Henrique Gomes Higino Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 20 Apr 2022 17:54:03 +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.165047720927040 (code B ref 55045); Wed, 20 Apr 2022 17:54:03 +0000 Received: (at 55045) by debbugs.gnu.org; 20 Apr 2022 17:53:29 +0000 Received: from localhost ([127.0.0.1]:47401 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nhEW8-000724-EJ for submit@debbugs.gnu.org; Wed, 20 Apr 2022 13:53:29 -0400 Received: from mail-oi1-f173.google.com ([209.85.167.173]:39890) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nhEW6-00071Y-Kk for 55045@debbugs.gnu.org; Wed, 20 Apr 2022 13:53:27 -0400 Received: by mail-oi1-f173.google.com with SMTP id z2so2909115oic.6 for <55045@debbugs.gnu.org>; Wed, 20 Apr 2022 10:53:26 -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=qgwBCASOLdQFWbcv9YjpWJ+JsqrHIvNuACf+Lasl33w=; b=PQRS79mtHDTQRA24r3f7Fob71g2tjb06ewJ4cLlbAgzJUvTyx19q17YU1PMPuHTkCZ n8SQM6D8CfRxVhoGz54avV2NlrMeOXP16X7sd+oe0CcGJmhHTe+LJNBZppFvDmiAQrXu A6NFhlZXdHQkSuc1DdJM73YKtLA+eTKhKqa8qG6W2hCcVwVnV4SH9NEXAjCF2YMBNGAu FN+3lkWX+khe4TFmnmSAk4PGbEPmXvyq/DrAYnuxo9cBBEij0PnAVtYCIdh+ICnIR9U3 ldhe0FF/7pYTyzP9XRgzWxx8IpVRjPu0jfMgbnE0nlcWfvPUbUMadxHBUTCGzwSuvaYh b+fg== 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=qgwBCASOLdQFWbcv9YjpWJ+JsqrHIvNuACf+Lasl33w=; b=yDjFPOeOMfVPfYGTMrJ+/zQQNAamV/KF5rlihetnyE+U8vcMG3HiJNUkra0Bx7M4kB EJZZ/pBV7IPCDqa/MjqEvSY5PQuAxkPB1jBIxTjljAKuuwVla0lEL2s0BihuKhwDmX3A nnhlwbSYDdVZJdhLw291NHWE1VrmJ3N79tjRstlUWiyhUdWqlk4i/+HLRB0/lker77+r TWG/i/vS5O7biRZ3r5+PYG3xUXSVvhHdhMCKdgSi95n0XwW0c7nageGF2DCO6S1WWZnG hOlAodvm8iIdX+cQW0qUMApeCjAmuMXa5WMVPX+sInlvOjoX6sv+z1yTWggy2MngD9TD JI8A== X-Gm-Message-State: AOAM532JNeqiaM3rC/OcCAhhHNkMJuBEDY82uaQ27Ocp3L+x9PEmRuQN /lFlsQTRbBbCDW65dVFHcdyMQ6WBZWU= X-Google-Smtp-Source: ABdhPJysGIO5s7YsWBCAh+JmnGMVjOIhIx8ONmd8djSHroTeGahXzQf53UGCkBh7K+KI4KBSF2DFFQ== X-Received: by 2002:aca:f188:0:b0:2fa:6d3f:c316 with SMTP id p130-20020acaf188000000b002fa6d3fc316mr2246771oih.86.1650477200820; Wed, 20 Apr 2022 10:53:20 -0700 (PDT) Received: from localhost.localdomain ([2804:7f2:2787:e10d:8125:629f:8cfe:dda8]) by smtp.gmail.com with ESMTPSA id f24-20020a9d5e98000000b006055789d903sm1935519otl.16.2022.04.20.10.53.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Apr 2022 10:53:20 -0700 (PDT) From: Luis Henrique Gomes Higino Date: Wed, 20 Apr 2022 14:52:41 -0300 Message-Id: <90d9b054aa3eb057828ccdfee15a224fe6d0992e.1650477097.git.luishenriquegh2701@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: References: 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): replace sexps with gexps. Also run `guix style neovim`. --- 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 d04ee49775..8ded61e097 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -669,84 +669,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) - ("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 + 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 @@ -754,7 +756,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))))