From patchwork Mon Nov 30 09:50:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alexandru-Sergiu Marton X-Patchwork-Id: 25460 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 E9BB727BBF9; Mon, 30 Nov 2020 07:52:27 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3FBA027BBF8 for ; Mon, 30 Nov 2020 07:52:27 +0000 (GMT) Received: from localhost ([::1]:52160 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kjdz0-0004mj-EJ for patchwork@mira.cbaines.net; Mon, 30 Nov 2020 02:52:26 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50442) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kjdyc-0004mb-D2 for guix-patches@gnu.org; Mon, 30 Nov 2020 02:52:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:41795) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kjdyc-00025Z-58 for guix-patches@gnu.org; Mon, 30 Nov 2020 02:52:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kjdyc-0001YN-3V for guix-patches@gnu.org; Mon, 30 Nov 2020 02:52:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#44620] [PATCH v3] gnu: Add gmni. Resent-From: Alexandru-Sergiu Marton Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 30 Nov 2020 07:52:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 44620 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 44620@debbugs.gnu.org Cc: Alexandru-Sergiu Marton , Ludovic Courtes , Christopher Baines Received: via spool by 44620-submit@debbugs.gnu.org id=B44620.16067226765903 (code B ref 44620); Mon, 30 Nov 2020 07:52:02 +0000 Received: (at 44620) by debbugs.gnu.org; 30 Nov 2020 07:51:16 +0000 Received: from localhost ([127.0.0.1]:53341 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kjdxo-0001X4-0W for submit@debbugs.gnu.org; Mon, 30 Nov 2020 02:51:15 -0500 Received: from mout01.posteo.de ([185.67.36.65]:51400) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kjdxl-0001Wo-Nx for 44620@debbugs.gnu.org; Mon, 30 Nov 2020 02:51:11 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 41E71160062 for <44620@debbugs.gnu.org>; Mon, 30 Nov 2020 08:51:03 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.ro; s=2017; t=1606722663; bh=MyqsBNIrj587QZ+W80ECxKXnLF09jX6kjRaEVuTxBg0=; h=From:To:Cc:Subject:Date:From; b=gmmH3RRNsLv+eH0zJycABkvCU6O6FLwUYlia3GhsYTdCAQm6kDgCgzIjh8u2HoStb dQqQJJnOhyMO0eOnoSJdiTFhutIFxKWlL2I004oDM5SAtyxd+znRO69JqPhUmJWmJX g74jLGNOe7k8Cc3/s4LqJDFJSfEmxAnwsX8MHirfOu6NTIbBhZ+lDQAurpGAu2aOzq 1zSlknVYXmBPBIQt4bxHw6rXmiGsk2omlNFoPgWoffDIWfuIjD/mSBZnNpSLzGd0A1 0BgnjxTCChaHh8uhquGxzbMbaFn6HUOz8JX9zUpJ75KzZoSMt7aesPt8GpG+VGn05/ 44re3VwsNSoVA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Cky8k2kqRz6tmG; Mon, 30 Nov 2020 08:51:02 +0100 (CET) From: Alexandru-Sergiu Marton Date: Mon, 30 Nov 2020 11:50:41 +0200 Message-Id: <20201130095041.11111-1-brown121407@posteo.ro> X-Mailer: git-send-email 2.29.2 In-Reply-To: <87czzvpzhs.fsf@gnu.org> References: <87czzvpzhs.fsf@gnu.org> 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/web-browsers.scm (gmni): New variable. --- This new patch version should take into account the comments provided by Christopher. It also uses a newer commit for gmni and should fix some conflicts when applying it to the guix repository. Sorry for the delay! gnu/packages/web-browsers.scm | 40 +++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index 7fe890502e..b101b78008 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2020 B. Wilson ;;; Copyright © 2020 Michael Rohleder ;;; Copyright © 2020 Nicolò Balzarotti +;;; Copyright © 2020 Alexandru-Sergiu Marton ;;; ;;; This file is part of GNU Guix. ;;; @@ -41,6 +42,7 @@ #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) + #:use-module (guix utils) #:use-module (gnu packages) #:use-module (gnu packages backup) #:use-module (gnu packages compression) @@ -62,6 +64,7 @@ #:use-module (gnu packages lisp) #:use-module (gnu packages lisp-xyz) #:use-module (gnu packages lua) + #:use-module (gnu packages man) #:use-module (gnu packages markup) #:use-module (gnu packages ncurses) #:use-module (gnu packages perl) @@ -706,6 +709,43 @@ key-bindings and is fully configurable and extensible in Common Lisp.") (define-public sbcl-next (deprecated-package "sbcl-next" nyxt)) +(define-public gmni + (let ((commit "d8f0870446c471a42612d6a8e853ad9b723a6d39") + (revision "0")) + (package + (name "gmni") + (version (git-version "0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://git.sr.ht/~sircmpwn/gmni") + (commit commit))) + (sha256 + (base32 + "1h0iqm7l0i06glf5b2872w656s1mjdiqva14zh6sl4f5yp7zmvwr")) + (file-name (git-file-name name version)))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; no check target + #:make-flags (list (string-append "CC=" ,(cc-for-target))))) + (inputs + `(("openssl" ,openssl))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("scdoc" ,scdoc))) + (home-page "https://sr.ht/~sircmpwn/gmni") + (synopsis "Minimalist command line Gemini client") + (description "The gmni package includes: + +@itemize +@item A CLI utility (like curl): gmni +@item A line-mode browser: gmnlm +@end itemize") + (license (list license:gpl3+ + (license:non-copyleft + "https://curl.se/docs/copyright.html" + "Used only for files taken from curl.")))))) + (define-public bombadillo (package (name "bombadillo")