From patchwork Mon Mar 4 19:15:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 1328 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 B338716D11; Mon, 4 Mar 2019 20:09:48 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 3B9F716D0E for ; Mon, 4 Mar 2019 20:09:48 +0000 (GMT) Received: from localhost ([127.0.0.1]:60279 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0tuF-0002gQ-Bc for patchwork@mira.cbaines.net; Mon, 04 Mar 2019 15:09:47 -0500 Received: from eggs.gnu.org ([209.51.188.92]:34150) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0t4P-0007Ix-BE for guix-patches@gnu.org; Mon, 04 Mar 2019 14:16:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h0t4M-0006u6-4g for guix-patches@gnu.org; Mon, 04 Mar 2019 14:16:13 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:46653) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h0t4E-0006mj-Cm for guix-patches@gnu.org; Mon, 04 Mar 2019 14:16:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1h0t4E-0005zK-72 for guix-patches@gnu.org; Mon, 04 Mar 2019 14:16:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#34751] [PATCH 1/2] gnu: Add editorconfig-core-c. References: <20190304191322.7360-1-efraim@flashner.co.il> In-Reply-To: <20190304191322.7360-1-efraim@flashner.co.il> Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 04 Mar 2019 19:16:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 34751 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 34751@debbugs.gnu.org Received: via spool by 34751-submit@debbugs.gnu.org id=B34751.155172691522955 (code B ref 34751); Mon, 04 Mar 2019 19:16:02 +0000 Received: (at 34751) by debbugs.gnu.org; 4 Mar 2019 19:15:15 +0000 Received: from localhost ([127.0.0.1]:60194 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1h0t3S-0005y9-Rl for submit@debbugs.gnu.org; Mon, 04 Mar 2019 14:15:15 -0500 Received: from flashner.co.il ([178.62.234.194]:45198) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1h0t3Q-0005xq-Tm for 34751@debbugs.gnu.org; Mon, 04 Mar 2019 14:15:13 -0500 Received: from localhost (unknown [31.210.177.221]) by flashner.co.il (Postfix) with ESMTPSA id 3683A40220; Mon, 4 Mar 2019 19:15:07 +0000 (UTC) From: Efraim Flashner Date: Mon, 4 Mar 2019 21:15:03 +0200 Message-Id: <20190304191504.7485-1-efraim@flashner.co.il> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 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: 209.51.188.43 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/text-editors.scm (editorconfig-core-c): New variable. --- gnu/packages/text-editors.scm | 47 +++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 0c60d202a3..b1afd63b32 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2017 Nils Gillmann ;;; Copyright © 2014 Taylan Ulrich Bayırlı/Kammer ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice +;;; Copyright © 2019 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -28,6 +29,7 @@ #:use-module (guix git-download) #:use-module (guix utils) #:use-module (guix build-system gnu) + #:use-module (guix build-system cmake) #:use-module (guix build-system glib-or-gtk) #:use-module ((guix licenses) #:prefix license:) #:use-module (gnu packages) @@ -41,6 +43,7 @@ #:use-module (gnu packages libreoffice) #:use-module (gnu packages lua) #:use-module (gnu packages ncurses) + #:use-module (gnu packages pcre) #:use-module (gnu packages pkg-config) #:use-module (gnu packages qt) #:use-module (gnu packages regex) @@ -343,3 +346,47 @@ team.") "@code{ghostwriter} provides a relaxing, distraction-free writing environment with Markdown markup.") (license license:gpl3+))) ;icons/* under CC-BY-SA3 + +(define-public editorconfig-core-c + (package + (name "editorconfig-core-c") + (version "0.12.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/editorconfig/editorconfig-core-c.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0jkc69r4jwn4rih6h6cqvgljjc3ff49cxj8286mi515aczr48cm1")))) + (build-system cmake-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'insert-tests + (lambda* (#:key inputs #:allow-other-keys) + (let ((tests (assoc-ref inputs "tests"))) + (copy-recursively tests "tests")) + #t))))) + (native-inputs + `(("tests" ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/editorconfig/editorconfig-core-test") + (commit "6ea1d8ece62cac9cf72c79dce4879b046abe1fe7"))) ; matches version + (file-name (git-file-name "editorconfig-core-test" version)) + (sha256 + (base32 + "1sf6910idnd4bgzbj8w8f9ldsbkaqa0lh6syymwy3hfqda63acj7")))))) + (inputs + `(("pcre2" ,pcre2))) + (home-page "https://editorconfig.org/") + (synopsis "EditorConfig core library written in C") + (description "EditorConfig makes it easy to maintain the correct coding +style when switching between different text editors and between different +projects. The EditorConfig project maintains a file format and plugins for +various text editors which allow this file format to be read and used by those +editors.") + (license license:bsd-2))) From patchwork Mon Mar 4 19:15:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 1331 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 9468D16D11; Mon, 4 Mar 2019 20:11:26 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 39DDA16D0E for ; Mon, 4 Mar 2019 20:11:26 +0000 (GMT) Received: from localhost ([127.0.0.1]:60352 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0tvp-0004Ax-Mz for patchwork@mira.cbaines.net; Mon, 04 Mar 2019 15:11:25 -0500 Received: from eggs.gnu.org ([209.51.188.92]:34151) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0t4P-0007J0-A8 for guix-patches@gnu.org; Mon, 04 Mar 2019 14:16:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h0t4M-0006u0-4k for guix-patches@gnu.org; Mon, 04 Mar 2019 14:16:13 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:46654) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h0t4E-0006nd-So for guix-patches@gnu.org; Mon, 04 Mar 2019 14:16:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1h0t4E-0005zY-O4 for guix-patches@gnu.org; Mon, 04 Mar 2019 14:16:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#34751] [PATCH 2/2] gnu: Add editorconfig-vim. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 04 Mar 2019 19:16:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 34751 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 34751@debbugs.gnu.org Received: via spool by 34751-submit@debbugs.gnu.org id=B34751.155172691722969 (code B ref 34751); Mon, 04 Mar 2019 19:16:02 +0000 Received: (at 34751) by debbugs.gnu.org; 4 Mar 2019 19:15:17 +0000 Received: from localhost ([127.0.0.1]:60197 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1h0t3V-0005yP-Bg for submit@debbugs.gnu.org; Mon, 04 Mar 2019 14:15:17 -0500 Received: from flashner.co.il ([178.62.234.194]:45202) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1h0t3T-0005xv-Fs for 34751@debbugs.gnu.org; Mon, 04 Mar 2019 14:15:15 -0500 Received: from localhost (unknown [31.210.177.221]) by flashner.co.il (Postfix) with ESMTPSA id CF5C840304; Mon, 4 Mar 2019 19:15:09 +0000 (UTC) From: Efraim Flashner Date: Mon, 4 Mar 2019 21:15:04 +0200 Message-Id: <20190304191504.7485-2-efraim@flashner.co.il> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190304191504.7485-1-efraim@flashner.co.il> References: <20190304191504.7485-1-efraim@flashner.co.il> MIME-Version: 1.0 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: 209.51.188.43 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 (editorconfig-vim): New variable. --- gnu/packages/vim.scm | 54 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 5e1e9b852c..d55b89d2f0 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -55,6 +55,7 @@ #:use-module (gnu packages serialization) #:use-module (gnu packages shells) #:use-module (gnu packages tcl) + #:use-module (gnu packages text-editors) #:use-module (gnu packages terminals) #:use-module (gnu packages xdisorg) #:use-module (gnu packages xorg)) @@ -642,6 +643,59 @@ are detected, the user is notified.") (home-page "https://github.com/vim-syntastic/syntastic") (license license:wtfpl2))) +(define-public editorconfig-vim + (package + (name "editorconfig-vim") + (version "0.3.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/editorconfig/editorconfig-vim.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0vssfl1wjq0mv0p30c3dszwrh4yy90vwxmmdgqaxf5rykik7bdfd")) + (modules '((guix build utils))) + (snippet + '(begin + (delete-file-recursively "plugin/editorconfig-core-py") #t)))) + (build-system gnu-build-system) + (arguments + '(#:tests? #f ; tests require ruby and plugin-test repository + #:phases + (modify-phases %standard-phases + (delete 'configure) + (delete 'build) + (add-after 'unpack 'patch-editorconfig-path + (lambda* (#:key inputs #:allow-other-keys) + (let ((editorconfig (assoc-ref inputs "editorconfig-core"))) + (substitute* "plugin/editorconfig.vim" + (("/opt") editorconfig)) + #t))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (vimfiles (string-append out "/share/vim/vimfiles")) + (doc (string-append vimfiles "/doc")) + (plugin (string-append vimfiles "/plugin")) + (autoload (string-append vimfiles "/autoload"))) + (copy-recursively "doc" doc) + (copy-recursively "autoload" autoload) + (copy-recursively "plugin" plugin) + #t)))))) + (inputs + `(("editorconfig-core" ,editorconfig-core-c))) + (home-page "https://editorconfig.org/") + (synopsis "EditorConfig plugin for Vim") + (description "EditorConfig makes it easy to maintain the correct coding +style when switching between different text editors and between different +projects. The EditorConfig project maintains a file format and plugins for +various text editors which allow this file format to be read and used by those +editors.") + (license license:bsd-2))) + (define-public neovim-syntastic (package (inherit vim-syntastic)