From debbugs-submit-bounces@debbugs.gnu.org Mon Nov 23 12:15:10 2020 Received: (at submit) by debbugs.gnu.org; 23 Nov 2020 17:15:10 +0000 Received: from localhost ([127.0.0.1]:50967 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1khFQk-0006gb-0w for submit@debbugs.gnu.org; Mon, 23 Nov 2020 12:15:10 -0500 Received: from lists.gnu.org ([209.51.188.17]:37028) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1khFQf-0006gQ-Q3 for submit@debbugs.gnu.org; Mon, 23 Nov 2020 12:15:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34322) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1khFQf-00023I-K7 for guix-patches@gnu.org; Mon, 23 Nov 2020 12:15:05 -0500 Received: from box.euandre.org ([46.101.160.115]:58629) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1khFQa-0005um-LV for guix-patches@gnu.org; Mon, 23 Nov 2020 12:15:05 -0500 Received: from authenticated-user (box.euandre.org [46.101.160.115]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by box.euandre.org (Postfix) with ESMTPSA id 119FDFC3D2; Mon, 23 Nov 2020 14:14:25 -0300 (-03) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=euandre.org; s=mail; t=1606151667; bh=4r0MzQG19g1XDK0G8Jy44mGKrmy3ukxSQcuAcEXGoFo=; h=From:To:Cc:Subject:Date:From; b=wLhRXGQt81S+u+sIMmYcsRurCbkmVsPgMPecq2i2T9gRSoiELqms1/UFoji5Gt9YE nSuzveuQF/qv3Ur2QAus28wMYgLhC1vcG1+vx3A5IjgbWZOopPe3RMopFnIq3USz6j xPlxhu8Vd++emTmjn1VQyWY1UJJ6kTtLglbTXkAczlP+QSc1JByvpyAaD57TBuvdKG khTNWrgnIvrFSYU2H7TuJ39MJ6EpFbR36jvy9W0PfjXX8z3Hez6RRp2sqGcE7dto4U pIQdAKiMJKkMUnBPBGBU5W9gBdCBcTZrlDg5ikqOT6y8oJtNqyHHPQ8k1w/sxdM5lz 7qJcerNSyz67g== From: EuAndreh To: guix-patches@gnu.org Subject: [PATCH] gnu: Add diff-so-fancy. Date: Mon, 23 Nov 2020 14:14:22 -0300 Message-Id: <20201123171422.10683-1-eu@euandre.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=46.101.160.115; envelope-from=eu@euandre.org; helo=box.euandre.org X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit Cc: EuAndreh X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) * gnu/packages/version-control.scm (diff-so-fancy): New variable. --- gnu/packages/version-control.scm | 40 ++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 1842528ff6..7d64b6440c 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -55,6 +55,7 @@ #:use-module (guix git-download) #:use-module (guix hg-download) #:use-module (guix build-system cmake) + #:use-module (guix build-system copy) #:use-module (guix build-system gnu) #:use-module (guix build-system go) #:use-module (guix build-system perl) @@ -2775,6 +2776,45 @@ for historians.") (home-page "https://www.gnu.org/software/gnu-arch/") (license license:gpl2))) ;version 2 only +(define-public diff-so-fancy + (package + (name "diff-so-fancy") + (version "1.3.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/so-fancy/diff-so-fancy") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0aavxahzha2mms4vdwysk79pa6wzswpfwgsq2hwaxnaf66maahfl")))) + (inputs + `(("perl" ,perl))) + (build-system copy-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'install 'symlink-executable + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (mkdir (string-append out "/bin")) + ;; diff-so-fancy looks for lib/ under the directory + ;; it is in + (symlink (string-append out "/diff-so-fancy") + (string-append out "/bin/diff-so-fancy")) + #t)))) + #:install-plan + '(("lib" "lib") + ("diff-so-fancy" "diff-so-fancy")))) + (home-page "https://github.com/so-fancy/diff-so-fancy") + (synopsis "Makes diffs more human friendly and readable") + (description + "@code{diff-so-fancy} strives to make your diffs human readable instead +of machine readable. This helps improve code quality and helps you spot +defects faster.") + (license license:expat))) + (define-public go-github-go-git (package (name "go-github-go-git") -- 2.29.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Nov 23 14:00:04 2020 Received: (at 44821) by debbugs.gnu.org; 23 Nov 2020 19:00:04 +0000 Received: from localhost ([127.0.0.1]:51167 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1khH4G-000349-4T for submit@debbugs.gnu.org; Mon, 23 Nov 2020 14:00:04 -0500 Received: from box.euandre.org ([46.101.160.115]:60355) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1khH4D-000335-2h for 44821@debbugs.gnu.org; Mon, 23 Nov 2020 14:00:02 -0500 Received: from authenticated-user (box.euandre.org [46.101.160.115]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by box.euandre.org (Postfix) with ESMTPSA id 9A37BFC3D2; Mon, 23 Nov 2020 15:59:53 -0300 (-03) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=euandre.org; s=mail; t=1606157994; bh=CpAxOac0Bx9LV/7GeyKqxC5WWendpvl0rdZLkQVJN2g=; h=From:To:Cc:Subject:Date:From; b=r2SwhN7pqmwOMr5IuDXX4kAFajQhYs/ZhcGGcLPs2CErzMSnOemEdkXqDj/e1tEyS UCTUN646WvSwFIw/C7cFDAfYHX/lGqi01K5TdisiwpFUJhnHsLQHJYK29tMpJ29T7H CH1cHm7tmDc4zb7bFmeYugFrSXh7CKFjm4TAHMNiCSSyT51/CcJnfRkkr3xWEuvQfF 5BKY3NfYgUFjDs7YxuQrBQpUeIpqpiqkEoCwbkICcgBy8huTqmeafV7xOzDqSohz7k +VHZlIaC6oBQZlr3xqnmAmehW2tnUwd1WvG6/T/mzWm+McAiFFpabhE7Q3G4Shbjig TmNnqZRQ20e+g== From: EuAndreh To: 44821@debbugs.gnu.org Subject: [PATCH v2] gnu: Add diff-so-fancy. Date: Mon, 23 Nov 2020 15:59:50 -0300 Message-Id: <20201123185950.20574-1-eu@euandre.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 44821 Cc: EuAndreh X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/version-control.scm (diff-so-fancy): New variable. --- Differs from previous patch by having ncurses as a propagated input. gnu/packages/version-control.scm | 42 ++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 1842528ff6..708f24437d 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -55,6 +55,7 @@ #:use-module (guix git-download) #:use-module (guix hg-download) #:use-module (guix build-system cmake) + #:use-module (guix build-system copy) #:use-module (guix build-system gnu) #:use-module (guix build-system go) #:use-module (guix build-system perl) @@ -2775,6 +2776,47 @@ for historians.") (home-page "https://www.gnu.org/software/gnu-arch/") (license license:gpl2))) ;version 2 only +(define-public diff-so-fancy + (package + (name "diff-so-fancy") + (version "1.3.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/so-fancy/diff-so-fancy") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0aavxahzha2mms4vdwysk79pa6wzswpfwgsq2hwaxnaf66maahfl")))) + (inputs + `(("perl" ,perl))) + (propagated-inputs + `(("ncurses" ,ncurses))) + (build-system copy-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'install 'symlink-executable + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (mkdir (string-append out "/bin")) + ;; diff-so-fancy looks for lib/ under the directory + ;; it is in + (symlink (string-append out "/diff-so-fancy") + (string-append out "/bin/diff-so-fancy")) + #t)))) + #:install-plan + '(("lib" "lib") + ("diff-so-fancy" "diff-so-fancy")))) + (home-page "https://github.com/so-fancy/diff-so-fancy") + (synopsis "Makes diffs more human friendly and readable") + (description + "@code{diff-so-fancy} strives to make your diffs human readable instead +of machine readable. This helps improve code quality and helps you spot +defects faster.") + (license license:expat))) + (define-public go-github-go-git (package (name "go-github-go-git") -- 2.29.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Nov 23 14:47:32 2020 Received: (at 44821) by debbugs.gnu.org; 23 Nov 2020 19:47:32 +0000 Received: from localhost ([127.0.0.1]:51253 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1khHo7-0004KG-RH for submit@debbugs.gnu.org; Mon, 23 Nov 2020 14:47:32 -0500 Received: from box.euandre.org ([46.101.160.115]:59807) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1khHo5-0004K1-EQ for 44821@debbugs.gnu.org; Mon, 23 Nov 2020 14:47:26 -0500 Received: from authenticated-user (box.euandre.org [46.101.160.115]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by box.euandre.org (Postfix) with ESMTPSA id E1F61FC3CF; Mon, 23 Nov 2020 16:47:18 -0300 (-03) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=euandre.org; s=mail; t=1606160839; bh=JfBN6Th7BPERdjq6VHVOXoyYi9t3H6TXFsbszMzH3N0=; h=From:To:Cc:Subject:Date:From; b=lPOdyQhk9oAyy+zGr4bJ3twn+mVuHYQXkXaqd5cbxOq4ZCoNFXpzW3C83EqYtVSBp zBp59Pm9nVYKlz28JhyXaYpqjgFPN6EwwaNzXjVBnif7D5hdPFp1qhT4H3QoXqEP3X JQXbV+nmNJP/l4jv2uS/Xu7bkx8Sx8tBHv2r2ua6yMv90HML85sjAOfCk0AGefY552 r0jtNV7wSskySq34GP/RB94mNslI/IDnG2rhsziu5TdH+l2B8rCWveLI6n77M8o05m 3LsRUdVABfWJRMd65vtN1ApSGmpjTKRSm3/4I5oES3v9NMuzcZwUtj3CbgTt3A500V AZIxEPEqCtxgw== From: EuAndreh To: 44821@debbugs.gnu.org Subject: [PATCH] gnu: Add diff-so-fancy. Date: Mon, 23 Nov 2020 16:47:16 -0300 Message-Id: <20201123194716.25465-1-eu@euandre.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 44821 Cc: EuAndreh X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/version-control.scm (diff-so-fancy): New variable. --- Now also update copyright notice. gnu/packages/version-control.scm | 44 +++++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 1842528ff6..900f233483 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -14,7 +14,7 @@ ;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2017 Vasile Dumitrascu ;;; Copyright © 2017 Clément Lassieur -;;; Copyright © 2017 André +;;; Copyright © 2017, 2020 EuAndreh ;;; Copyright © 2017, 2018, 2020 Marius Bakke ;;; Copyright © 2017 Stefan Reichör ;;; Copyright © 2017, 2020 Oleg Pykhalov @@ -55,6 +55,7 @@ #:use-module (guix git-download) #:use-module (guix hg-download) #:use-module (guix build-system cmake) + #:use-module (guix build-system copy) #:use-module (guix build-system gnu) #:use-module (guix build-system go) #:use-module (guix build-system perl) @@ -2775,6 +2776,47 @@ for historians.") (home-page "https://www.gnu.org/software/gnu-arch/") (license license:gpl2))) ;version 2 only +(define-public diff-so-fancy + (package + (name "diff-so-fancy") + (version "1.3.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/so-fancy/diff-so-fancy") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0aavxahzha2mms4vdwysk79pa6wzswpfwgsq2hwaxnaf66maahfl")))) + (inputs + `(("perl" ,perl))) + (propagated-inputs + `(("ncurses" ,ncurses))) + (build-system copy-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'install 'symlink-executable + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (mkdir (string-append out "/bin")) + ;; diff-so-fancy looks for lib/ under the directory + ;; it is in + (symlink (string-append out "/diff-so-fancy") + (string-append out "/bin/diff-so-fancy")) + #t)))) + #:install-plan + '(("lib" "lib") + ("diff-so-fancy" "diff-so-fancy")))) + (home-page "https://github.com/so-fancy/diff-so-fancy") + (synopsis "Makes diffs more human friendly and readable") + (description + "@code{diff-so-fancy} strives to make your diffs human readable instead +of machine readable. This helps improve code quality and helps you spot +defects faster.") + (license license:expat))) + (define-public go-github-go-git (package (name "go-github-go-git") -- 2.29.2 From debbugs-submit-bounces@debbugs.gnu.org Wed Nov 25 18:08:55 2020 Received: (at submit) by debbugs.gnu.org; 25 Nov 2020 23:08:55 +0000 Received: from localhost ([127.0.0.1]:37424 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ki3uA-0005xp-RO for submit@debbugs.gnu.org; Wed, 25 Nov 2020 18:08:55 -0500 Received: from lists.gnu.org ([209.51.188.17]:41326) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ki3u8-0005xh-UM for submit@debbugs.gnu.org; Wed, 25 Nov 2020 18:08:53 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56362) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ki3u8-00070Q-PK for guix-patches@gnu.org; Wed, 25 Nov 2020 18:08:52 -0500 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:40887) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ki3u7-00011C-A7 for guix-patches@gnu.org; Wed, 25 Nov 2020 18:08:52 -0500 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id B83A75C0100; Wed, 25 Nov 2020 18:08:50 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Wed, 25 Nov 2020 18:08:50 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-transfer-encoding:in-reply-to; s=mesmtp; bh=xbvYRYOo2sffVvb8HfcR8zTGRjOHNQaiDzj3PzBshFw=; b=py07vCmTQEVA l6+U+fGX789C3mJ66gRljEhDkL7bm2jUQTsuY/IzHt/A9MdWoYRtuEWHOieJHYXw GdtzOrnF75D12MqDi5wSy9kuO1RNN8LD+XsQ76klPvHpHZ01WlLxjlDxy/DOkKqd xdbiKyNC6NW07TpyKa4lm8ZhWnZwukQ= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:in-reply-to:message-id:mime-version:references :subject:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; bh=xbvYRYOo2sffVvb8HfcR8zTGRjOHNQaiDzj3PzBsh Fw=; b=G13dpWa3kHzzYOimzd/XMpiSLPvON3Mrb9pIW6JvmCOkskDxbuTxR9Ki/ JsJIieZICtQxn2yBrUANm7QqX6m22dYxUq8WWE+8sBai6IraYyt1D6I2tls0YxJB MAxHc2J4O2mDL0xEPYdtH5dQiN+c8UXJdMql0HlOuSTNNNCncdSK/i0Vf2KMwrh2 jtFakyHe7mF/EryRUYcQ3nzmnOrl1rhG9GMLNuE46nrtUfDJNhMIXgX6bNu3CiOC YW+KTrIi96Gf1YhYkYlf9RHSIMpd5XsNtjoEnoIpOeu50ZFu2EqzbE4mZJ2f8xic y2lp701J8DUwrELyEaeuD5qWQ7g1g== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedrudehuddgtdejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvffukfhfgggtugfgjgesthekredttddtjeenucfhrhhomhepnfgvohcu hfgrmhhulhgrrhhiuceolhgvohesfhgrmhhulhgrrhhirdhnrghmvgeqnecuggftrfgrth htvghrnhepgeejgeeghedtudfgffdutddvffefffejkeffffevffehgedvvdeutdffkeej jeejnecukfhppeejfedrudeguddruddvjedrudegieenucevlhhushhtvghrufhiiigvpe dtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehlvghosehfrghmuhhlrghrihdrnhgrmhgv X-ME-Proxy: Received: from localhost (c-73-141-127-146.hsd1.pa.comcast.net [73.141.127.146]) by mail.messagingengine.com (Postfix) with ESMTPA id 6A17F328005D; Wed, 25 Nov 2020 18:08:50 -0500 (EST) Date: Wed, 25 Nov 2020 18:08:48 -0500 From: Leo Famulari To: EuAndreh via Guix-patches via Subject: Re: [bug#44821] [PATCH v2] gnu: Add diff-so-fancy. Message-ID: <20201125230848.GC2093@jasmine.lan> References: <20201123171422.10683-1-eu@euandre.org> <20201123185950.20574-1-eu@euandre.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20201123185950.20574-1-eu@euandre.org> Received-SPF: pass client-ip=66.111.4.29; envelope-from=leo@famulari.name; helo=out5-smtp.messagingengine.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit Cc: 44821@debbugs.gnu.org, EuAndreh X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) On Mon, Nov 23, 2020 at 03:59:50PM -0300, EuAndreh via Guix-patches via wrote: > * gnu/packages/version-control.scm (diff-so-fancy): New variable. > --- > Differs from previous patch by having ncurses as a propagated input. It's impractical to propagate ncurses — ncurses is very widely used and this will cause "profile conflicts" if anyone tries to make a profile that refers to multiple versions of ncurses. Is there any way to make the built package refer explicitly to the ncurses store directory, so that it can be a regular input? From debbugs-submit-bounces@debbugs.gnu.org Thu Nov 26 10:20:31 2020 Received: (at 44821) by debbugs.gnu.org; 26 Nov 2020 15:20:31 +0000 Received: from localhost ([127.0.0.1]:42485 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kiJ4R-0001mk-HO for submit@debbugs.gnu.org; Thu, 26 Nov 2020 10:20:31 -0500 Received: from box.euandre.org ([46.101.160.115]:37571) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kiJ4Q-0001mV-AE for 44821@debbugs.gnu.org; Thu, 26 Nov 2020 10:20:30 -0500 Received: from authenticated-user (box.euandre.org [46.101.160.115]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by box.euandre.org (Postfix) with ESMTPSA id 4560AFC3ED; Thu, 26 Nov 2020 12:20:23 -0300 (-03) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=euandre.org; s=mail; t=1606404024; bh=DMwod0PRPOCitOVDuVE2unYci71QAkRJAulTyd3fk8I=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=cURrI/6IeI8j+h0juMWobBJ1h3VstzuSmo0LvQ3Ctnn21muC5eZWtsUuNraqJSIo9 xnpjEt/TbKmSEXVfUmC7O/DP6aRaAWk1IxQcH8xtdLDU5/Z+OelaqZIn02BidYeN2d NT9QpuXjw8fNbXtyTv16wXxzRjksn8w29Nu2zwqxxdb5tQrM35fVnnGwEHxogZt7uB ymZyA76XOfw/zZOYmoGSPrLJP+ho+gRWZXbtrSzudCGIneJA1QVN6nZmVEksuXuaxD T72KmvenfNciufegYAK6ddSwat/0YfSnXABUNFM/QfYbxltK7pAXDAMRpGlQWzfZTE EGo2OPWx4/bDA== From: EuAndreh To: Leo Famulari , 44821@debbugs.gnu.org Subject: Re: [bug#44821] [PATCH v2] gnu: Add diff-so-fancy. In-Reply-To: <20201125230848.GC2093@jasmine.lan> References: <20201123171422.10683-1-eu@euandre.org> <20201123185950.20574-1-eu@euandre.org> <20201125230848.GC2093@jasmine.lan> Date: Thu, 26 Nov 2020 12:20:17 -0300 Message-ID: <87y2iom9fy.fsf@euandre.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 44821 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Leo Famulari writes: > It's impractical to propagate ncurses =E2=80=94 ncurses is very widely us= ed and > this will cause "profile conflicts" if anyone tries to make a profile > that refers to multiple versions of ncurses. > > Is there any way to make the built package refer explicitly to the > ncurses store directory, so that it can be a regular input? I'm not sure. How could I accomplish that? I put ncurses as a propagates input because diff-so-fancy relies on it for the execution. Maybe a "(wrap-program ...)" could solve that? I think it would solve the problem you raised, right? From debbugs-submit-bounces@debbugs.gnu.org Thu Nov 26 14:00:52 2020 Received: (at 44821) by debbugs.gnu.org; 26 Nov 2020 19:00:52 +0000 Received: from localhost ([127.0.0.1]:42891 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kiMVg-00036v-4D for submit@debbugs.gnu.org; Thu, 26 Nov 2020 14:00:52 -0500 Received: from wout2-smtp.messagingengine.com ([64.147.123.25]:42103) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kiMVe-00036i-I2 for 44821@debbugs.gnu.org; Thu, 26 Nov 2020 14:00:50 -0500 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.west.internal (Postfix) with ESMTP id AD4A51A3B; Thu, 26 Nov 2020 14:00:44 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Thu, 26 Nov 2020 14:00:44 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-transfer-encoding:in-reply-to; s=mesmtp; bh=IPySMbnJzV6fOhZWaySChmr9E8eIAzOooMRYQoXuzCY=; b=iYENHaIqFepb eku4Fm/+Lp6TnPQ55LpZ02bpHejJzFd1K2xhyr6AMyy0QvpZ0Ny1kmy/GmrSNhfC vrQyHhxp9kNYJrys3FFx0QzosvFtBZ+balI/0knqEJ44LfhB4jdPelEWkPBcsfwh wZ+ron9IgqN+nq60DPB/y8c2RQvlWyA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:in-reply-to:message-id:mime-version:references :subject:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; bh=IPySMbnJzV6fOhZWaySChmr9E8eIAzOooMRYQoXuz CY=; b=moVPx7lkxm7OiL52ggGl9Fq19tRzdp/cCGj3bunVvWewHkD3ynPXyWzSj UH0/nnKzNEOFHOSlhZT9kXm0rG9x3S5bVLWebhwE/8QJIo3pMaHQEBxQkLo7/jI+ MRbgmSInK5H+JW5iTvxk0EEJWCA1QWknOHp+EPtk/I0D9VRxcxYkToI/k3Dwffgm zaERPywMAVPlEwy8bHGZu61gwep1K9UcAuZvIT+o5x8LDKPIeaexD66+9XAcCkIY Yyj+VCdOfSIiohK/6IOIELam5qRVacKlfO/T2Y/akeYf1QVGZF7cTB7D7tOCgLNp QgWZg7TsD/vyHrFY4bTeqH/Sc4g0g== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedrudehvddguddvtdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecunecujfgurhepfffhvffukfhfgggtugfgjgesth ekredttddtjeenucfhrhhomhepnfgvohcuhfgrmhhulhgrrhhiuceolhgvohesfhgrmhhu lhgrrhhirdhnrghmvgeqnecuggftrfgrthhtvghrnhepgeejgeeghedtudfgffdutddvff efffejkeffffevffehgedvvdeutdffkeejjeejnecukfhppeejfedrudeguddruddvjedr udegieenucevlhhushhtvghrufhiiigvpedunecurfgrrhgrmhepmhgrihhlfhhrohhmpe hlvghosehfrghmuhhlrghrihdrnhgrmhgv X-ME-Proxy: Received: from localhost (c-73-141-127-146.hsd1.pa.comcast.net [73.141.127.146]) by mail.messagingengine.com (Postfix) with ESMTPA id A2198328005E; Thu, 26 Nov 2020 14:00:43 -0500 (EST) Date: Thu, 26 Nov 2020 14:00:42 -0500 From: Leo Famulari To: EuAndreh Subject: Re: [bug#44821] [PATCH v2] gnu: Add diff-so-fancy. Message-ID: References: <20201123171422.10683-1-eu@euandre.org> <20201123185950.20574-1-eu@euandre.org> <20201125230848.GC2093@jasmine.lan> <87y2iom9fy.fsf@euandre.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <87y2iom9fy.fsf@euandre.org> X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 44821 Cc: 44821@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) On Thu, Nov 26, 2020 at 12:20:17PM -0300, EuAndreh wrote: > Leo Famulari writes: > > > It's impractical to propagate ncurses — ncurses is very widely used and > > this will cause "profile conflicts" if anyone tries to make a profile > > that refers to multiple versions of ncurses. > > > > Is there any way to make the built package refer explicitly to the > > ncurses store directory, so that it can be a regular input? > > I'm not sure. How could I accomplish that? > > I put ncurses as a propagates input because diff-so-fancy relies on it > for the execution. > > Maybe a "(wrap-program ...)" could solve that? I think it would solve > the problem you raised, right? Yes, perhaps, or you could substitute the calls to ncurses with the full store path of the ncurses executable. From debbugs-submit-bounces@debbugs.gnu.org Thu Nov 26 15:00:23 2020 Received: (at 44821) by debbugs.gnu.org; 26 Nov 2020 20:00:23 +0000 Received: from localhost ([127.0.0.1]:42966 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kiNRG-0004a8-Qn for submit@debbugs.gnu.org; Thu, 26 Nov 2020 15:00:23 -0500 Received: from box.euandre.org ([46.101.160.115]:52901) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kiNRE-0004Zr-0m for 44821@debbugs.gnu.org; Thu, 26 Nov 2020 15:00:21 -0500 Received: from authenticated-user (box.euandre.org [46.101.160.115]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by box.euandre.org (Postfix) with ESMTPSA id 51BCCFC3CF; Thu, 26 Nov 2020 17:00:12 -0300 (-03) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=euandre.org; s=mail; t=1606420813; bh=NoFAskSz8TrgKAIRn4p6uD0ZOhSnIaGRUQdgXFJIW3U=; h=From:To:Cc:Cc:Subject:In-Reply-To:References:Date:From; b=GnSY9X30gi2z3vhBljYkTydbAg3mn3x2cZFlt9m++gWU/3hWe3OxGmCYwexSZz0Xg 9U8xZ+2/zk+R6KTTUgbSRxwENBabXaYLHAxOVQDWEPqbiavzT6ZDulHZ7NLet44fNX rjlZz4K4o0CO7foxjbthHjVbk2Nmb4k0oethCjeyKl+dmemefPZpAef2+eBIFeZWkL iTQU4BGB0Q+PCZAQdysSNd1qXCJQkmdCKvSJMj1M43E7o5awEZZ5/8BO+MhTL3CO75 j9zAhn5bJriRFWULsqVjXZqXQofHvDOoAPwdDZx6s7hAOhBrNSGlnLfJhH0h+9uKZV uU4b118B3BzUA== From: EuAndreh To: Leo Famulari Subject: Re: [bug#44821] [PATCH v2] gnu: Add diff-so-fancy. In-Reply-To: References: <20201123171422.10683-1-eu@euandre.org> <20201123185950.20574-1-eu@euandre.org> <20201125230848.GC2093@jasmine.lan> <87y2iom9fy.fsf@euandre.org> Date: Thu, 26 Nov 2020 16:44:34 -0300 Message-ID: <87sg8vnbrx.fsf@euandre.org> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 44821 Cc: 44821@debbugs.gnu.org, X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Leo Famulari writes: > Yes, perhaps, or you could substitute the calls to ncurses with the full > store path of the ncurses executable. How would I do that? With a (substitute* ... (which "xdg-open"))? From debbugs-submit-bounces@debbugs.gnu.org Thu Dec 03 17:14:34 2020 Received: (at 44821) by debbugs.gnu.org; 3 Dec 2020 22:14:34 +0000 Received: from localhost ([127.0.0.1]:42025 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kkwrx-0008OO-Uf for submit@debbugs.gnu.org; Thu, 03 Dec 2020 17:14:34 -0500 Received: from eggs.gnu.org ([209.51.188.92]:47602) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kkwrv-0008O8-Nh for 44821@debbugs.gnu.org; Thu, 03 Dec 2020 17:14:32 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:52985) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kkwrq-0003mo-CN; Thu, 03 Dec 2020 17:14:26 -0500 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=52430 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1kkwro-0004YI-W7; Thu, 03 Dec 2020 17:14:25 -0500 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: EuAndreh Subject: Re: [bug#44821] [PATCH v2] gnu: Add diff-so-fancy. References: <20201123171422.10683-1-eu@euandre.org> <20201123185950.20574-1-eu@euandre.org> <20201125230848.GC2093@jasmine.lan> <87y2iom9fy.fsf@euandre.org> <87sg8vnbrx.fsf@euandre.org> Date: Thu, 03 Dec 2020 23:14:23 +0100 In-Reply-To: <87sg8vnbrx.fsf@euandre.org> (EuAndreh's message of "Thu, 26 Nov 2020 16:44:34 -0300") Message-ID: <875z5ibkqo.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 44821 Cc: 44821@debbugs.gnu.org, Leo Famulari X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi, EuAndreh skribis: > Leo Famulari writes: > >> Yes, perhaps, or you could substitute the calls to ncurses with the full >> store path of the ncurses executable. > > How would I do that? With a (substitute* ... (which "xdg-open"))? Yes, something like that. Note that =E2=80=98xdg-open=E2=80=99 does not co= me from the =E2=80=98ncurses=E2=80=99 package though. Let=E2=80=99s chat on IRC if anything=E2=80=99s unclear! Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Fri Dec 04 13:27:22 2020 Received: (at 44821) by debbugs.gnu.org; 4 Dec 2020 18:27:22 +0000 Received: from localhost ([127.0.0.1]:45762 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1klFne-0007HA-1w for submit@debbugs.gnu.org; Fri, 04 Dec 2020 13:27:22 -0500 Received: from box.euandre.org ([46.101.160.115]:37423) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1klFna-0007Gs-2U for 44821@debbugs.gnu.org; Fri, 04 Dec 2020 13:27:21 -0500 Received: from authenticated-user (box.euandre.org [46.101.160.115]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by box.euandre.org (Postfix) with ESMTPSA id BBDF4FC473; Fri, 4 Dec 2020 15:27:10 -0300 (-03) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=euandre.org; s=mail; t=1607106432; bh=ww92n6mrOjU9+woxi60eWohB2mc+IXsyXP1CoFq5EKo=; h=From:To:Cc:Cc:Subject:In-Reply-To:References:Date:From; b=CeXTi2/dqSgdzioHdogrAxNGnMcvisTAKz+itd27Nd583R/gdjZVppNNt2EEDDB2l F9lkPJAycfBfZUXsSt3OPrqa5t9Ko6FNZ9T530qNQ+oOViSgs39X6erm6e7wlQ7w4n 1DarclZ/Z9jrdm2iBx07ivtFL5v6+APB4rjB9UaMfF27Kh+Oyhi83ok5XZXWnWHsrd eVJedLCAjgt8DaihdyertE/XeONweDV14gbZfZb7B2fgaRFxzHr7lmw8rNBm5EPjvB EeUTFbdF7w0kwYxMog30LZBxO7No62Syxi9hqY5q8FGLOGDE9qwdEdcd6KggiSpPds aXsT+DgGEcPJQ== From: EuAndreh To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: [bug#44821] [PATCH v2] gnu: Add diff-so-fancy. In-Reply-To: <875z5ibkqo.fsf@gnu.org> References: <20201123171422.10683-1-eu@euandre.org> <20201123185950.20574-1-eu@euandre.org> <20201125230848.GC2093@jasmine.lan> <87y2iom9fy.fsf@euandre.org> <87sg8vnbrx.fsf@euandre.org> <875z5ibkqo.fsf@gnu.org> Date: Thu, 03 Dec 2020 20:16:06 -0300 Message-ID: <878saeo4zt.fsf@euandre.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.8 (/) X-Debbugs-Envelope-To: 44821 Cc: 44821@debbugs.gnu.org, , Leo Famulari X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.2 (/) Ludovic Court=C3=A8s writes: > Yes, something like that. Note that =E2=80=98xdg-open=E2=80=99 does not = come from the > =E2=80=98ncurses=E2=80=99 package though. > > Let=E2=80=99s chat on IRC if anything=E2=80=99s unclear! I got the gist, but just didn't stop to work on it yet. I will soon :) From debbugs-submit-bounces@debbugs.gnu.org Fri Dec 04 15:08:41 2020 Received: (at 44821) by debbugs.gnu.org; 4 Dec 2020 20:08:41 +0000 Received: from localhost ([127.0.0.1]:45947 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1klHNg-0003SQ-Qp for submit@debbugs.gnu.org; Fri, 04 Dec 2020 15:08:41 -0500 Received: from box.euandre.org ([46.101.160.115]:37879) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1klHNe-0003SB-8K for 44821@debbugs.gnu.org; Fri, 04 Dec 2020 15:08:39 -0500 Received: from authenticated-user (box.euandre.org [46.101.160.115]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by box.euandre.org (Postfix) with ESMTPSA id C5E55101F11; Fri, 4 Dec 2020 17:08:30 -0300 (-03) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=euandre.org; s=mail; t=1607112512; bh=VuxcTeGB+KdhUITef4WIDXsgMB0SwUVYE3acbfXb5cI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XBlyCZquJQzAaOCZEVIYE+c25lD8Tt+y8s5SQB9jAvrouCKSKO59FMxT4550Xwgd8 FqyC684YeclNfMyKpDfcZ4n+EqSmQCguJOz72bc8Mef+clFvCVhjofKb8cjz/3k2y8 J8dg5FCGAK1+cis5owu1H/qS+p1LrXwdzUWO+sPxSwHHNmUSNjJVlsgDztklo7mywK ww2oUYac9KKQvSpiRpowvZnkaQY+eLqLoN5QQyGAlxMuMdkYN3sXNBz3ivmA5O6A7t 2c/EhalgkZbP/CBJw2q5BK3ygX6Jux9HcZXA7FyAB0S3r9aAYOUxV5lEbgawZjsve7 RrJAUaEuDQ2Ww== From: EuAndreh To: eu@euandre.org Subject: [PATCH v3] gnu: Add diff-so-fancy. Date: Fri, 4 Dec 2020 17:08:27 -0300 Message-Id: <20201204200827.31337-1-eu@euandre.org> In-Reply-To: <871rg5o26c.fsf@euandre.org> References: <871rg5o26c.fsf@euandre.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 44821 Cc: 44821@debbugs.gnu.org, leo@famulari.name X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/version-control.scm (diff-so-fancy): New variable. --- Fixed the unnecessary propagated input as suggested. I've also removed the copyright update, as is was already done on another patch. gnu/packages/version-control.scm | 46 ++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index a8e6d2c4b9..e8b5adef27 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -55,6 +55,7 @@ #:use-module (guix git-download) #:use-module (guix hg-download) #:use-module (guix build-system cmake) + #:use-module (guix build-system copy) #:use-module (guix build-system gnu) #:use-module (guix build-system go) #:use-module (guix build-system perl) @@ -2811,6 +2812,51 @@ for historians.") (home-page "https://www.gnu.org/software/gnu-arch/") (license license:gpl2))) ;version 2 only +(define-public diff-so-fancy + (package + (name "diff-so-fancy") + (version "1.3.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/so-fancy/diff-so-fancy") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0aavxahzha2mms4vdwysk79pa6wzswpfwgsq2hwaxnaf66maahfl")))) + (inputs + `(("perl" ,perl) + ("ncurses" ,ncurses))) + (build-system copy-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'install 'symlink-executable + (lambda* (#:key outputs inputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (ncurses (assoc-ref inputs "ncurses")) + (perl (assoc-ref inputs "perl"))) + (mkdir (string-append out "/bin")) + ;; diff-so-fancy looks for lib/ under the directory + ;; it is in + (symlink (string-append out "/diff-so-fancy") + (string-append out "/bin/diff-so-fancy")) + (wrap-program (string-append out "/diff-so-fancy") + `("PATH" ":" prefix (,(string-append ncurses "/bin") + ,(string-append perl "/bin")))) + #t)))) + #:install-plan + '(("lib" "lib") + ("diff-so-fancy" "diff-so-fancy")))) + (home-page "https://github.com/so-fancy/diff-so-fancy") + (synopsis "Makes diffs more human friendly and readable") + (description + "@code{diff-so-fancy} strives to make your diffs human readable instead +of machine readable. This helps improve code quality and helps you spot +defects faster.") + (license license:expat))) + (define-public go-github-go-git (package (name "go-github-go-git") -- 2.29.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Dec 05 00:14:46 2020 Received: (at 44821) by debbugs.gnu.org; 5 Dec 2020 05:14:46 +0000 Received: from localhost ([127.0.0.1]:46396 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1klPuA-00084E-6x for submit@debbugs.gnu.org; Sat, 05 Dec 2020 00:14:46 -0500 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:48077) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1klPu7-000840-86 for 44821@debbugs.gnu.org; Sat, 05 Dec 2020 00:14:44 -0500 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id 10BCD5C009B; Sat, 5 Dec 2020 00:14:38 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute3.internal (MEProxy); Sat, 05 Dec 2020 00:14:38 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:in-reply-to; s=mesmtp; bh=91ZArgEF8WNJBE/MTkq3o2yJ dl6Ij9wkDh2hSGWG4fg=; b=IgHzeIHbA6rO1Wz7MQ/8sJOHMshXLK9DyFeBXtkE uI4xQp5CplgI3FbHcO9mZUJfZYZ6OXHsYj0lbyZ1Ekf62EbbxtjcDQ3W4N6Zn3z2 QRvNg8NxPqwKQYfe2gpGNPyNtDzLdDVsb8h3pGiqVGI5EGnbJwLJsB8bneKg7Wxh jMw= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=91ZArg EF8WNJBE/MTkq3o2yJdl6Ij9wkDh2hSGWG4fg=; b=h8AqjQH8BghZnwj8d/JrrR mLL2xPBnSVS1HBP5bcBkE45oPh2Jqhh7E8ZWqnEkvzpA0+p1psp1eobjfLF5gQMu iTkVF2cKqf2hsYWVPTQ959GsgP+5B6E3+5L4yBA2HMW8hXe6bbvMlk+konjtvjlM 4XwIcCv1PqEgT72Jg2DVPCK3Au6MLbW29Tpe/CfufFABrjW9AW2CP/c/h8hpne9o 61rIzgL4sGFOzv8qGrruHDQ0pWXBDC8rJ8RLO3yIdpxreC3ALCzKaTMHDgdMDW/k jenGsCGpCiZvVwlVwIfRBWPNp49G0B+q/O8qAzQ70DRlbitqwRYlcsVii3FAVsdQ == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedrudeiledgjeekucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpeffhffvuffkfhggtggujgesmhdtre ertddtvdenucfhrhhomhepnfgvohcuhfgrmhhulhgrrhhiuceolhgvohesfhgrmhhulhgr rhhirdhnrghmvgeqnecuggftrfgrthhtvghrnheptdegueeiheelheffjeetieehffelfe ektdefuedtjeeufeegjeekfedtheevkefhnecukfhppeejfedrudeguddruddvjedrudeg ieenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehlvg hosehfrghmuhhlrghrihdrnhgrmhgv X-ME-Proxy: Received: from localhost (c-73-141-127-146.hsd1.pa.comcast.net [73.141.127.146]) by mail.messagingengine.com (Postfix) with ESMTPA id 8D072108005F; Sat, 5 Dec 2020 00:14:37 -0500 (EST) Date: Sat, 5 Dec 2020 00:14:35 -0500 From: Leo Famulari To: EuAndreh Subject: Re: [PATCH v3] gnu: Add diff-so-fancy. Message-ID: References: <871rg5o26c.fsf@euandre.org> <20201204200827.31337-1-eu@euandre.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="h3qwrQweR+dVPzxS" Content-Disposition: inline In-Reply-To: <20201204200827.31337-1-eu@euandre.org> X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 44821 Cc: 44821@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --h3qwrQweR+dVPzxS Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Fri, Dec 04, 2020 at 05:08:27PM -0300, EuAndreh wrote: > * gnu/packages/version-control.scm (diff-so-fancy): New variable. > --- > Fixed the unnecessary propagated input as suggested. Thanks! > + (arguments > + '(#:phases > + (modify-phases %standard-phases > + (add-after 'install 'symlink-executable > + (lambda* (#:key outputs inputs #:allow-other-keys) > + (let ((out (assoc-ref outputs "out")) > + (ncurses (assoc-ref inputs "ncurses")) > + (perl (assoc-ref inputs "perl"))) > + (mkdir (string-append out "/bin")) > + ;; diff-so-fancy looks for lib/ under the directory > + ;; it is in I should have noticed it sooner but I think it's better to adjust how diff-so-fancy finds the library than to work around this unusual expectation. I attached a revised patch that does this. Can you test if it works for you? It simplifies the symlink-executable phase, adds a patch-lib-path phase, and adjusts the install-plan accordingly. If it works then we should be done! --h3qwrQweR+dVPzxS Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="0001-gnu-Add-diff-so-fancy.patch" >From e2aa936812873408292c7c23e160cd5390e90a60 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Fri, 4 Dec 2020 23:45:28 -0500 Subject: [PATCH] gnu: Add diff-so-fancy. * gnu/packages/version-control.scm (diff-so-fancy): New variable. Signed-off-by: Leo Famulari --- gnu/packages/version-control.scm | 47 ++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index eec57b3b6d..da04fdcb93 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -2812,6 +2812,53 @@ for historians.") (home-page "https://www.gnu.org/software/gnu-arch/") (license license:gpl2))) ;version 2 only +(define-public diff-so-fancy + (package + (name "diff-so-fancy") + (version "1.3.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/so-fancy/diff-so-fancy") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0aavxahzha2mms4vdwysk79pa6wzswpfwgsq2hwaxnaf66maahfl")))) + (inputs + `(("perl" ,perl) + ("ncurses" ,ncurses))) + (build-system copy-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-lib-path + (lambda* (#:key outputs #:allow-other-keys) + (let ((lib (string-append (assoc-ref outputs "out") "/lib"))) + (substitute* "diff-so-fancy" + (("use lib.*$") + (string-append "use lib " lib "\n"))) + #t))) + (add-after 'install 'symlink-executable + (lambda* (#:key outputs inputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (ncurses (assoc-ref inputs "ncurses")) + (perl (assoc-ref inputs "perl"))) + (wrap-program (string-append out "/bin/diff-so-fancy") + `("PATH" ":" prefix (,(string-append ncurses "/bin") + ,(string-append perl "/bin")))) + #t)))) + #:install-plan + '(("lib" "lib") + ("diff-so-fancy" "bin/")))) + (home-page "https://github.com/so-fancy/diff-so-fancy") + (synopsis "Makes diffs more human friendly and readable") + (description + "@code{diff-so-fancy} strives to make your diffs human readable instead +of machine readable. This helps improve code quality and helps you spot +defects faster.") + (license license:expat))) + (define-public go-github-go-git (package (name "go-github-go-git") -- 2.29.2 --h3qwrQweR+dVPzxS-- From debbugs-submit-bounces@debbugs.gnu.org Sat Dec 05 06:55:56 2020 Received: (at 44821) by debbugs.gnu.org; 5 Dec 2020 11:55:56 +0000 Received: from localhost ([127.0.0.1]:46655 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1klWAO-0003DY-9e for submit@debbugs.gnu.org; Sat, 05 Dec 2020 06:55:56 -0500 Received: from box.euandre.org ([46.101.160.115]:34377) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1klWAL-0003DI-R5 for 44821@debbugs.gnu.org; Sat, 05 Dec 2020 06:55:54 -0500 Received: from authenticated-user (box.euandre.org [46.101.160.115]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by box.euandre.org (Postfix) with ESMTPSA id E4CD3FC3CD; Sat, 5 Dec 2020 08:55:45 -0300 (-03) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=euandre.org; s=mail; t=1607169347; bh=jcYYxwgllgs9UMoOp2gntaZeCsS2FwR9xfUOpFJwtGE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AKvYGwG0ZBS7m2BkMkUdHf6r6XYWQrUeH3RPYSRJ3ZdnPXWAPTsU+xiWzqQeyBe/U zT/Nix58z3wAXwa9FVqXTy/YRyvgtYigGLmGXorw4pH9//9aVxg3v8/mVvGnBq4oYs ST7Nk4zOlcPgYW0y9Q2taZu3SFLTRwUhoTZPlzzneguTGBdpHzHaRZ60n7ZRDDGmuY Do02EwRMOFOZBzVORKgEJ4hlCdv6AkllutgeItTB+M+WLn+UWj5v/JvsE4QYv6owdk 2wa5JnbiHeK6OMyuGKus5uB9xEefm4vueI5tfvD7vx7zCEG8xlJyg61KDQUjJb5w1w FDrwm2L112n+A== From: EuAndreh To: leo@famulari.name Subject: [PATCH v4] gnu: Add diff-so-fancy. Date: Sat, 5 Dec 2020 08:55:42 -0300 Message-Id: <20201205115542.15427-1-eu@euandre.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 44821 Cc: 44821@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Leo Famulari * gnu/packages/version-control.scm (diff-so-fancy): New variable. --- Thanks for the revised patch. The only thing missing was the proper escaping of the substituted path: (string-append "use lib '" lib "';\n"))) The lib path had to be between quotes, with a final semicolon. I've taken yours and only fixed this part. I've tested it, and it works. gnu/packages/version-control.scm | 47 ++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index eec57b3b6d..12e708e4e8 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -2812,6 +2812,53 @@ for historians.") (home-page "https://www.gnu.org/software/gnu-arch/") (license license:gpl2))) ;version 2 only +(define-public diff-so-fancy + (package + (name "diff-so-fancy") + (version "1.3.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/so-fancy/diff-so-fancy") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0aavxahzha2mms4vdwysk79pa6wzswpfwgsq2hwaxnaf66maahfl")))) + (inputs + `(("perl" ,perl) + ("ncurses" ,ncurses))) + (build-system copy-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-lib-path + (lambda* (#:key outputs #:allow-other-keys) + (let ((lib (string-append (assoc-ref outputs "out") "/lib"))) + (substitute* "diff-so-fancy" + (("use lib.*$") + (string-append "use lib '" lib "';\n"))) + #t))) + (add-after 'install 'symlink-executable + (lambda* (#:key outputs inputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (ncurses (assoc-ref inputs "ncurses")) + (perl (assoc-ref inputs "perl"))) + (wrap-program (string-append out "/bin/diff-so-fancy") + `("PATH" ":" prefix (,(string-append ncurses "/bin") + ,(string-append perl "/bin")))) + #t)))) + #:install-plan + '(("lib" "lib") + ("diff-so-fancy" "bin/")))) + (home-page "https://github.com/so-fancy/diff-so-fancy") + (synopsis "Makes diffs more human friendly and readable") + (description + "@code{diff-so-fancy} strives to make your diffs human readable instead +of machine readable. This helps improve code quality and helps you spot +defects faster.") + (license license:expat))) + (define-public go-github-go-git (package (name "go-github-go-git") -- 2.29.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Dec 05 12:57:07 2020 Received: (at 44821-done) by debbugs.gnu.org; 5 Dec 2020 17:57:07 +0000 Received: from localhost ([127.0.0.1]:48167 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1klbnv-0008M4-BV for submit@debbugs.gnu.org; Sat, 05 Dec 2020 12:57:07 -0500 Received: from wout3-smtp.messagingengine.com ([64.147.123.19]:45221) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1klbnt-0008LZ-Rw for 44821-done@debbugs.gnu.org; Sat, 05 Dec 2020 12:57:06 -0500 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.west.internal (Postfix) with ESMTP id CB440B70; Sat, 5 Dec 2020 12:56:59 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Sat, 05 Dec 2020 12:57:00 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:in-reply-to; s=mesmtp; bh=DBJjW8pg7qY1pPjQ7qFIg3h8 nBYeSft4ttNRRhEUei0=; b=KLOlATA1oFb2jhLtXxzhaboEf8XxSjuDzcjLWuKN S/6TCNwW/6mzzdzuMyUgCCZd98jG/HhRAa4orR3nF/cKYKN5hLywoZwkN6E3CG5B 2pa2CMd475z5B2g2npcsvulWECxNM8KyZOoH+THRfWH46KvsZIziEHStU3VYT2WA +KI= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=DBJjW8 pg7qY1pPjQ7qFIg3h8nBYeSft4ttNRRhEUei0=; b=qUdJwG7ShE90/2pVHZqDFe q8Odwkf08nTeBL50Hf8QBzt38TcP9hpksMh5YT5kAVJhZTaW9bYAJ+0n8yQjFZrW HkB/3ym00743oek+uq8YrC4FNWKx66t2+F/YmNiR+e/VH9a/07g8cqbiCHtrEU7r o75/P5Yk63GJp58V6koc7rYapKK0RUawnO4OUR+PEsCdb6ljIFYgfPsCAbkoWFun cH0AnHE338k4WR2o/fFPW3MLWth1UoWteDTdmgf+7pE33qaDPoqHyTFsCX0r4qbr tqbdXWoEpwTg8FflaVYWNByYayQXa8a+Fp19xAoKe3KddoseiISLty3oXRfiC2tA == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedrudejtddguddutdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecunecujfgurhepfffhvffukfhfgggtuggjsehttd ertddttddvnecuhfhrohhmpefnvghoucfhrghmuhhlrghrihcuoehlvghosehfrghmuhhl rghrihdrnhgrmhgvqeenucggtffrrghtthgvrhhnpeeukeektdffvddtudegjeegtdevhf eufeeivdejiedtieegtdevjedvjeehffevgfenucfkphepjeefrddugedurdduvdejrddu geeinecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomheplh gvohesfhgrmhhulhgrrhhirdhnrghmvg X-ME-Proxy: Received: from localhost (c-73-141-127-146.hsd1.pa.comcast.net [73.141.127.146]) by mail.messagingengine.com (Postfix) with ESMTPA id DB5D024005A; Sat, 5 Dec 2020 12:56:58 -0500 (EST) Date: Sat, 5 Dec 2020 12:56:56 -0500 From: Leo Famulari To: EuAndreh Subject: Re: [PATCH v4] gnu: Add diff-so-fancy. Message-ID: References: <20201205115542.15427-1-eu@euandre.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20201205115542.15427-1-eu@euandre.org> X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 44821-done Cc: 44821-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) On Sat, Dec 05, 2020 at 08:55:42AM -0300, EuAndreh wrote: > From: Leo Famulari > > * gnu/packages/version-control.scm (diff-so-fancy): New variable. > --- > Thanks for the revised patch. The only thing missing was the proper > escaping of the substituted path: > (string-append "use lib '" lib "';\n"))) > > The lib path had to be between quotes, with a final semicolon. > > I've taken yours and only fixed this part. I've tested it, and it works. Great! Pushed as 32a3367930844b242b57ea634c2de43e4ea3b57b From unknown Sat Aug 09 05:01:07 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sun, 03 Jan 2021 12:24:04 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator