From patchwork Tue May 5 20:53:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Giacomo Leidi X-Patchwork-Id: 21911 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 1C4A827BBE4; Tue, 5 May 2020 21:54:25 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_ADSP_ALL, DKIM_SIGNED,MAILING_LIST_MULTI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:470:142::17]) by mira.cbaines.net (Postfix) with ESMTP id A056527BBE1 for ; Tue, 5 May 2020 21:54:24 +0100 (BST) Received: from localhost ([::1]:58190 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jW4a7-0006UJ-VH for patchwork@mira.cbaines.net; Tue, 05 May 2020 16:54:24 -0400 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 1jW4Zn-0006S9-04 for guix-patches@gnu.org; Tue, 05 May 2020 16:54:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54406) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jW4Zm-0001Mb-Mq for guix-patches@gnu.org; Tue, 05 May 2020 16:54:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jW4Zm-0000bs-LD for guix-patches@gnu.org; Tue, 05 May 2020 16:54:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41056] [PATCH 1/2] gnu: Add editline. References: In-Reply-To: Resent-From: Giacomo Leidi Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 05 May 2020 20:54:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41056 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 41056@debbugs.gnu.org Cc: Giacomo Leidi Received: via spool by 41056-submit@debbugs.gnu.org id=B41056.15887120152289 (code B ref 41056); Tue, 05 May 2020 20:54:02 +0000 Received: (at 41056) by debbugs.gnu.org; 5 May 2020 20:53:35 +0000 Received: from localhost ([127.0.0.1]:37717 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jW4ZK-0000am-VO for submit@debbugs.gnu.org; Tue, 05 May 2020 16:53:35 -0400 Received: from confino.investici.org ([212.103.72.250]:20867) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jW4ZF-0000aS-AS for 41056@debbugs.gnu.org; Tue, 05 May 2020 16:53:29 -0400 Received: from mx1.investici.org (unknown [127.0.0.1]) by confino.investici.org (Postfix) with ESMTP id 7EB2D20FC9; Tue, 5 May 2020 20:53:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=autistici.org; s=stigmate; t=1588712007; bh=U2mSbuGxhAq8Q12tPMlMLhVPTriUbmJI3GTEFxu8Lyg=; h=From:To:Cc:Subject:Date:From; b=n9P8S5vxJ2gxLSuWHM9lRfbLXhp9/htHf6fae360oEQ8U94OIVIeclQ8BkNu1M1oj frkRFfUbacZLgwYElYpQd2YUdiuDwo65bLUVBOyusvrsGJ8y4kVzlQgsJfW5IZVBTc INr+VStbIGpU2KnGd+NnJFYzQE8MG5hjVsdXPKxg= Received: from [212.103.72.250] (mx1.investici.org [212.103.72.250]) (Authenticated sender: goodoldpaul@autistici.org) by localhost (Postfix) with ESMTPSA id 5A912210BD; Tue, 5 May 2020 20:53:27 +0000 (UTC) From: Giacomo Leidi Date: Tue, 5 May 2020 22:53:17 +0200 Message-Id: <20200505205318.17668-1-goodoldpaul@autistici.org> X-Mailer: git-send-email 2.26.2 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/libedit.scm (editline): New variable. --- gnu/packages/libedit.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/libedit.scm b/gnu/packages/libedit.scm index 37638a2b6a..38da02572a 100644 --- a/gnu/packages/libedit.scm +++ b/gnu/packages/libedit.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2015 Ricardo Wurmus ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2019 Gábor Boskovits +;;; Copyright © 2020 Giacomo Leidi ;;; ;;; This file is part of GNU Guix. ;;; @@ -48,3 +49,24 @@ library (libedit). This Berkeley-style licensed command line editor library provides generic line editing, history, and tokenization functions, similar to those found in GNU Readline.") (license bsd-3))) + +(define-public editline + (package + (name "editline") + (version "1.17.1") + (source + (origin + (method url-fetch) + (uri (string-append + "https://ftp.troglobit.com/editline/editline-" version ".tar.xz")) + (sha256 + (base32 "03pw3z6pz590v8xfnjx0yynnzij2sb9xwjbvqvdzsid56crkn8nz")))) + (build-system gnu-build-system) + (home-page "https://troglobit.com/projects/editline/") + (synopsis "Line editing library") + (description + "@code{editline} is a small line editing library. It can be linked into almost +any program to provide command line editing and history functions. It is call +compatible with the GNU Readline library, but at a fraction of the size, +and as a result fewer features.") + (license bsd-4))) From patchwork Tue May 5 20:53:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Giacomo Leidi X-Patchwork-Id: 21912 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 B4B4427BBE1; Tue, 5 May 2020 21:54:25 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_ADSP_ALL, DKIM_SIGNED,MAILING_LIST_MULTI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:470:142::17]) by mira.cbaines.net (Postfix) with ESMTP id 1505927BBE3 for ; Tue, 5 May 2020 21:54:25 +0100 (BST) Received: from localhost ([::1]:58230 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jW4a8-0006VG-EJ for patchwork@mira.cbaines.net; Tue, 05 May 2020 16:54:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50438) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jW4Zm-0006Re-Hf for guix-patches@gnu.org; Tue, 05 May 2020 16:54:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54405) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jW4Zm-0001Ky-80 for guix-patches@gnu.org; Tue, 05 May 2020 16:54:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jW4Zm-0000bi-74 for guix-patches@gnu.org; Tue, 05 May 2020 16:54:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41056] [PATCH 2/2] gnu: nix: Update to 2.3.4. Resent-From: Giacomo Leidi Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 05 May 2020 20:54:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41056 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 41056@debbugs.gnu.org Cc: Giacomo Leidi Received: via spool by 41056-submit@debbugs.gnu.org id=B41056.15887120152283 (code B ref 41056); Tue, 05 May 2020 20:54:02 +0000 Received: (at 41056) by debbugs.gnu.org; 5 May 2020 20:53:35 +0000 Received: from localhost ([127.0.0.1]:37715 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jW4ZH-0000ag-HD for submit@debbugs.gnu.org; Tue, 05 May 2020 16:53:34 -0400 Received: from confino.investici.org ([212.103.72.250]:38181) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jW4ZF-0000aR-Av for 41056@debbugs.gnu.org; Tue, 05 May 2020 16:53:29 -0400 Received: from mx1.investici.org (unknown [127.0.0.1]) by confino.investici.org (Postfix) with ESMTP id A62D3210BD; Tue, 5 May 2020 20:53:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=autistici.org; s=stigmate; t=1588712007; bh=6izgsG9F3o6ZiIMQdYcdI84v30e185nh1vCl1FgHKDc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ip4mLZTt7nV42OhsHyi2hSuwOTuMVLLggzvNtr8Yr6Cy4C0IJHIP6DkmQqy3VFEEO hdMxlQwgaRdBs8D++2+wzmu3xB75qu+e5c3XI3QiGir1UcE/pq/5DDJnxzFWo0+mP8 +TvX87/j10Rd9AUSLunWoDYRLWgDizmsCGiWuuE0= Received: from [212.103.72.250] (mx1.investici.org [212.103.72.250]) (Authenticated sender: goodoldpaul@autistici.org) by localhost (Postfix) with ESMTPSA id 88590210B6; Tue, 5 May 2020 20:53:27 +0000 (UTC) From: Giacomo Leidi Date: Tue, 5 May 2020 22:53:18 +0200 Message-Id: <20200505205318.17668-2-goodoldpaul@autistici.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200505205318.17668-1-goodoldpaul@autistici.org> References: <20200505205318.17668-1-goodoldpaul@autistici.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/package-management.scm (nix): Update to 2.3.4, [inputs]: Add boost, brotli, editline. --- gnu/packages/package-management.scm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 44fcb514b7..1fbc2baf33 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2018, 2019 Eric Bavier ;;; Copyright © 2019, 2020 Efraim Flashner ;;; Copyright © 2019 Jonathan Brielmaier +;;; Copyright © 2020 Giacomo Leidi ;;; ;;; This file is part of GNU Guix. ;;; @@ -37,6 +38,7 @@ #:use-module (gnu packages base) #:use-module (gnu packages bdw-gc) #:use-module (gnu packages bison) + #:use-module (gnu packages boost) #:use-module (gnu packages bootstrap) ;for 'bootstrap-guile-origin' #:use-module (gnu packages check) #:use-module (gnu packages compression) @@ -54,6 +56,7 @@ #:use-module (gnu packages gtk) #:use-module (gnu packages guile) #:use-module (gnu packages guile-xyz) + #:use-module (gnu packages libedit) #:use-module (gnu packages linux) #:use-module (gnu packages lisp) #:use-module (gnu packages man) @@ -480,18 +483,21 @@ out) and returning a package that uses that as its 'source'." (define-public nix (package (name "nix") - (version "2.0.4") + (version "2.3.4") (source (origin (method url-fetch) (uri (string-append "http://nixos.org/releases/nix/nix-" version "/nix-" version ".tar.xz")) (sha256 (base32 - "0ss9svxlh1pvrdmnqjvjyqjmbqmrdbyfarvbb14i9d4bggzl0r8n")))) + "03fhbb8088sgz3709zd9n9rydavar79w87l9n4q9iimcw06nlqhw")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) - (inputs `(("curl" ,curl) + (inputs `(("boost" ,boost) + ("brotli" ,brotli) ("bzip2" ,bzip2) + ("curl" ,curl) + ("editline" ,editline) ("libgc" ,libgc) ("libseccomp" ,libseccomp) ("libsodium" ,libsodium)