From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id ZfazOWDzKmBoTgAA0tVLHw (envelope-from ) for ; Mon, 15 Feb 2021 22:19:12 +0000 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id cKP4NGDzKmCUXQAA1q6Kng (envelope-from ) for ; Mon, 15 Feb 2021 22:19:12 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 088361F05F for ; Mon, 15 Feb 2021 23:19:12 +0100 (CET) Received: from localhost ([::1]:52596 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lBmD1-00070i-2W for larch@yhetil.org; Mon, 15 Feb 2021 17:19:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34518) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lBmCs-00070T-Cf for guix-patches@gnu.org; Mon, 15 Feb 2021 17:19:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:55553) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lBmCs-00059Q-47 for guix-patches@gnu.org; Mon, 15 Feb 2021 17:19:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lBmCs-0007Lc-07 for guix-patches@gnu.org; Mon, 15 Feb 2021 17:19:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#43929] gnu: Add pijul. Resent-From: John Soo Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 15 Feb 2021 22:19:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43929 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Julien Lepiller Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= , 43929 <43929@debbugs.gnu.org>, zimoun Received: via spool by 43929-submit@debbugs.gnu.org id=B43929.161342753528232 (code B ref 43929); Mon, 15 Feb 2021 22:19:01 +0000 Received: (at 43929) by debbugs.gnu.org; 15 Feb 2021 22:18:55 +0000 Received: from localhost ([127.0.0.1]:38866 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lBmCk-0007LH-Dq for submit@debbugs.gnu.org; Mon, 15 Feb 2021 17:18:55 -0500 Received: from mail-pl1-f172.google.com ([209.85.214.172]:36635) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lBmCh-0007Kx-EU for 43929@debbugs.gnu.org; Mon, 15 Feb 2021 17:18:53 -0500 Received: by mail-pl1-f172.google.com with SMTP id e9so4450960plh.3 for <43929@debbugs.gnu.org>; Mon, 15 Feb 2021 14:18:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=asu-edu.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=nOavghWn03PEdbX5YxTQBjkCN3x5lCkc3zZkxK9xKQA=; b=MF+vzGy21zDl3ZAR2Fu6SoPLXhFkZt9K+ClCtnhHxWQVKehUTAUnI9F+SH5LmBVL9C cpGdUvlEbTcKhGBwrTZ0mzp0fbcvYUQGRp1XaOEZXrxclamoKiwcKS+MDX6P6AKKE3Qt p1qLvVafNfbIP6QnDDmQunH5fth4jVQ2AFHFhEyuqU+sqshFIyW0VIba8zoZZU9WL6eV +5/iPvNH4czSyeUkHLEwHTOQfgyyVCqteGUsvCqo7ZBKuRgOhFTBrnAKs2n77c9FAqvv lLW+zei+JOdeFucD25pA8k8V2+p5V9fLuVQiJXpj/S8bi/rqOBABmksySWE2gj4XbvCR 9CNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=nOavghWn03PEdbX5YxTQBjkCN3x5lCkc3zZkxK9xKQA=; b=bdVVVHRAbzxtNYvWyLamXmGh9Kk2PV4RV0Ez0JMXynu5vSAgS3cTbZtITF8p+imY5v fjkrWOPmpD/76veI75Y7Sbenv8l776/aAU7KLXjngs1lNQsTCIuswTZ3Y1BI+JcNeS9N 7pQvlCWe7DCPEvK0R4s65BsLZaguNjM3v4R1Y5oBuaCZpLPOSuQfC1l+28+mvLoJ6zHk eSRiGco5w4b0l8QgJNORoWN9zw/+YMPxHzhKyyJWPm9iAIbXDSETSUCo/7d2EPWh43Oi 1X0KdyT4xT6qaUf7nEdLRGkg5c2VIbaJCpQLay20yGSMYrxNrh7TOdlWZHYKg7pNqfvf 2cvw== X-Gm-Message-State: AOAM532dPYk+ANpCPlE9sZViuT8ZxX/paIPrtGUlyNsLi6NacR0QU6XA Thaxh9hkn6yv6zBwmhiS7gVqDQ== X-Google-Smtp-Source: ABdhPJw5Qkf+tciIdDG7nExjznLsdCiYBWkuyPWJHdJSxl12vTF7bXCuI0HcOPLUx971lVq8xMjyHA== X-Received: by 2002:a17:90b:1808:: with SMTP id lw8mr935475pjb.42.1613427525399; Mon, 15 Feb 2021 14:18:45 -0800 (PST) Received: from ecenter (2603-8001-433f-08c9-0000-0000-0000-1ca6.res6.spectrum.com. [2603:8001:433f:8c9::1ca6]) by smtp.gmail.com with ESMTPSA id s184sm19696653pfs.112.2021.02.15.14.18.43 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 15 Feb 2021 14:18:44 -0800 (PST) From: John Soo References: <87lfgcog2g.fsf@asu.edu> <864kme2w8g.fsf@gmail.com> <2DFC6265-699A-4EA3-8E50-5352B8EA59F6@lepiller.eu> <87a6vvvkxq.fsf@asu.edu> <878saptpbd.fsf@asu.edu> Date: Mon, 15 Feb 2021 14:18:42 -0800 In-Reply-To: <878saptpbd.fsf@asu.edu> (John Soo's message of "Wed, 25 Nov 2020 07:43:18 -0800") Message-ID: <875z2tdlfh.fsf_-_@asu.edu> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: 0.24 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=asu-edu.20150623.gappssmtp.com header.s=20150623 header.b=MF+vzGy2; dmarc=fail reason="SPF not aligned (relaxed)" header.from=asu.edu (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 088361F05F X-Spam-Score: 0.24 X-Migadu-Scanner: scn1.migadu.com X-TUID: QUnYMfBPLcRW --=-=-= Content-Type: text/plain Hello again, I rebased these patches on master. Pijul definitely works. Thanks! John --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-gnu-Add-rust-trust-dns-rustls-0.7.patch >From 38f143338634c3ece44b2a327fcdbd1e5be1f005 Mon Sep 17 00:00:00 2001 From: John Soo Date: Wed, 17 Jun 2020 17:32:40 -0700 Subject: [PATCH 01/14] gnu: Add rust-trust-dns-rustls-0.7. * gnu/packages/crates-io.scm (rust-trust-dns-rustls-0.7): New variable. * gnu/packages/crates-io.scm (rust-trust-dns-rustls-0.6): Inherit from rust-trust-dns-rustls-0.7. --- gnu/packages/crates-io.scm | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a5ea75a594..696da8f899 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -44179,10 +44179,37 @@ extension for the Trust-DNS client to use rustls for TLS.") #:cargo-development-inputs (("rust-openssl" ,rust-openssl-0.10)))))) -(define-public rust-trust-dns-rustls-0.6 +(define-public rust-trust-dns-rustls-0.7 (package (inherit rust-trust-dns-rustls-0.19) (name "rust-trust-dns-rustls") + (version "0.7.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "trust-dns-rustls" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0glpggq31764q7lp19h5l6implsr7ik015qkm5rg7pqwy93krsb3")))) + (arguments + `(#:cargo-inputs + (("rust-futures" ,rust-futures-0.1) + ("rust-log" ,rust-log-0.4) + ("rust-rustls" ,rust-rustls-0.16) + ("rust-tokio-rustls" ,rust-tokio-rustls-0.12) + ("rust-tokio-tcp" ,rust-tokio-tcp-0.1) + ("rust-trust-dns-proto" ,rust-trust-dns-proto-0.19) + ("rust-webpki" ,rust-webpki-0.21)) + #:cargo-development-inputs + (("rust-openssl" ,rust-openssl-0.10) + ("rust-tokio" ,rust-tokio-0.1)))))) + +(define-public rust-trust-dns-rustls-0.6 + (package + (inherit rust-trust-dns-rustls-0.7) + (name "rust-trust-dns-rustls") (version "0.6.4") (source (origin -- 2.30.1 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0002-gnu-Add-rust-yasna-0.1.patch >From 5b6224b7233542ea89ea7d3a4a0307ac33b97bff Mon Sep 17 00:00:00 2001 From: John Soo Date: Wed, 17 Jun 2020 18:14:33 -0700 Subject: [PATCH 02/14] gnu: Add rust-yasna-0.1. * gnu/packages/crates-io.scm (rust-yasna-0.1): New variable. --- gnu/packages/crates-io.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 696da8f899..3a55ccebd5 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -47953,6 +47953,35 @@ Read/Write streams as well as low-level in-memory encoding and decoding.") library.") (license (list license:expat license:asl2.0)))) +(define-public rust-yasna-0.1 + (package + (name "rust-yasna") + (version "0.1.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "yasna" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1frcd79rzi6dlly7lldjn2avnhfmj6yxrjsgvb2p1k2zbxdzyc9s")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-bit-vec" ,rust-bit-vec-0.4) + ("rust-chrono" ,rust-chrono-0.4) + ("rust-num" ,rust-num-0.1) + ("rust-num-bigint" ,rust-num-bigint-0.1)) + #:cargo-development-inputs + (("rust-num-traits" ,rust-num-traits-0.2)))) + (home-page "https://github.com/qnighy/yasna.rs") + (synopsis "ASN.1 library for Rust") + (description + "To serialize ASN.1 data, you can use @code{construct_der}. +To deserialize ASN.1 data, you can use parse_ber or @code{parse_der}." ) + (license (list license:asl2.0 license:expat)))) + (define-public rust-zbase32-0.1 (package (name "rust-zbase32") -- 2.30.1 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0003-gnu-Add-rust-thrussh-keys-0.11.patch >From f29843e64dc6790b82c4ca3a23e3b1e36320531a Mon Sep 17 00:00:00 2001 From: John Soo Date: Wed, 17 Jun 2020 18:16:52 -0700 Subject: [PATCH 03/14] gnu: Add rust-thrussh-keys-0.11. * gnu/packages/crates-io.scm (rust-thrussh-keys-0.11): New variable. --- gnu/packages/crates-io.scm | 45 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 3a55ccebd5..411984edfc 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -41101,6 +41101,51 @@ fixed set of worker threads.") (license (list license:asl2.0 license:expat)))) +(define-public rust-thrussh-keys-0.11 + (package + (name "rust-thrussh-keys") + (version "0.11.9") + (source + (origin + (method url-fetch) + (uri (crate-uri "thrussh-keys" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0rkhkkav9kv1q9lgxgydnrkniq4ccrf107lcygimralnkwyzjwjy")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-base64" ,rust-base64-0.10) + ("rust-bit-vec" ,rust-bit-vec-0.4) + ("rust-byteorder" ,rust-byteorder-1) + ("rust-cryptovec" ,rust-cryptovec-0.4) + ("rust-dirs" ,rust-dirs-2) + ("rust-futures" ,rust-futures-0.1) + ("rust-hex" ,rust-hex-0.3) + ("rust-log" ,rust-log-0.4) + ("rust-num-bigint" ,rust-num-bigint-0.1) + ("rust-num-integer" ,rust-num-integer-0.1) + ("rust-openssl" ,rust-openssl-0.10) + ("rust-serde" ,rust-serde-1) + ("rust-serde-derive" ,rust-serde-derive-1) + ("rust-thrussh-libsodium" + ,rust-thrussh-libsodium-0.1) + ("rust-tokio" ,rust-tokio-0.1) + ("rust-yasna" ,rust-yasna-0.1)) + #:cargo-development-inputs + (("rust-env-logger" ,rust-env-logger-0.6) + ("rust-tempdir" ,rust-tempdir-0.3) + ("rust-tokio-uds" ,rust-tokio-uds-0.2)))) + (home-page "https://pijul.org/thrussh") + (synopsis + "Deal with SSH keys in Rust") + (description + "This package provides a rust library to deal with SSH keys. +With it you can load them, decrypt them, and call an SSH agent.") + (license license:asl2.0))) + (define-public rust-thrussh-libsodium-0.1 (package (name "rust-thrussh-libsodium") -- 2.30.1 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0004-gnu-Add-rust-thrussh-0.21.patch >From 7f742f4badb2cb7927c02c0005a38614e83f08e2 Mon Sep 17 00:00:00 2001 From: John Soo Date: Wed, 17 Jun 2020 18:18:13 -0700 Subject: [PATCH 04/14] gnu: Add rust-thrussh-0.21. * gnu/packages/crates-io.scm (rust-thrussh-0.21): New variable. --- gnu/packages/crates-io.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 411984edfc..9988a4c6e2 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -41101,6 +41101,41 @@ fixed set of worker threads.") (license (list license:asl2.0 license:expat)))) +(define-public rust-thrussh-0.21 + (package + (name "rust-thrussh") + (version "0.21.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "thrussh" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0k8ah3kx8q6vnkq3hi78s8acxdcws6yck0x989xzx2wi89nqflhl")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-byteorder" ,rust-byteorder-1) + ("rust-cryptovec" ,rust-cryptovec-0.4) + ("rust-futures" ,rust-futures-0.1) + ("rust-log" ,rust-log-0.4) + ("rust-openssl" ,rust-openssl-0.10) + ("rust-thrussh-keys" ,rust-thrussh-keys-0.11) + ("rust-thrussh-libsodium" + ,rust-thrussh-libsodium-0.1) + ("rust-tokio" ,rust-tokio-0.1) + ("rust-tokio-io" ,rust-tokio-io-0.1)) + #:cargo-development-inputs + (("rust-env-logger" ,rust-env-logger-0.6)))) + (home-page "https://pijul.org/thrussh") + (synopsis "Client and server SSH library in Rust") + (description + "This package provides a client and server SSH library.") + (license license:asl2.0))) + (define-public rust-thrussh-keys-0.11 (package (name "rust-thrussh-keys") -- 2.30.1 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0005-gnu-Add-rust-thrussh-config-0.2.patch >From b8715723aa64d897ec8fda823a4a29b689448b46 Mon Sep 17 00:00:00 2001 From: John Soo Date: Wed, 17 Jun 2020 18:19:52 -0700 Subject: [PATCH 05/14] gnu: Add rust-thrussh-config-0.2. * gnu/packages/crates-io.scm (rust-thrussh-config-0.2): New variable. --- gnu/packages/crates-io.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 9988a4c6e2..123f5ec2a1 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -41136,6 +41136,38 @@ fixed set of worker threads.") "This package provides a client and server SSH library.") (license license:asl2.0))) +(define-public rust-thrussh-config-0.2 + (package + (name "rust-thrussh-config") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "thrussh-config" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0h19qysnbdvv6z2y3ii3cxqn42yvjg73wnghx83kbwj6af6chryb")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-dirs" ,rust-dirs-2) + ("rust-futures" ,rust-futures-0.1) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-log" ,rust-log-0.4) + ("rust-regex" ,rust-regex-1) + ("rust-thrussh" ,rust-thrussh-0.21) + ("rust-tokio" ,rust-tokio-0.1)))) + (home-page + "https://nest.pijul.com/pijul_org/thrussh") + (synopsis + "Utilities to parse .ssh/config files, including helpers") + (description + "This package contains utilities to parse .ssh/config files, +including helpers to implement ProxyCommand in Thrussh.") + (license license:asl2.0))) + (define-public rust-thrussh-keys-0.11 (package (name "rust-thrussh-keys") -- 2.30.1 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0006-gnu-Add-rust-advapi32-sys-0.2.patch >From 1299552512c43dc0118346074ef7279068301659 Mon Sep 17 00:00:00 2001 From: John Soo Date: Wed, 17 Jun 2020 18:55:46 -0700 Subject: [PATCH 06/14] gnu: Add rust-advapi32-sys-0.2. * gnu/package/crates-io.scm (rust-advapi32-sys-0.2): New variable. --- gnu/packages/crates-io.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 123f5ec2a1..9d439797ea 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1093,6 +1093,34 @@ the Rust programming language.") (license (list license:bsd-3 license:zlib)))) +(define-public rust-advapi32-sys-0.2 + (package + (name "rust-advapi32-sys") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "advapi32-sys" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "16largvlrd1800vvdchml0ngnszjlnpqm01rcz5hm7di1h48hrg0")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-winapi" ,rust-winapi-0.3)) + #:cargo-development-inputs + (("rust-winapi-build" ,rust-winapi-build-0.1)))) + (home-page + "https://github.com/retep998/winapi-rs") + (synopsis + "Contains function definitions for the Windows API library advapi32") + (description + "Contains function definitions for the Windows API library advapi32. +The winapi crate's types and constants has more details about this API.") + (license license:expat))) + (define-public rust-aead-0.3 (package (name "rust-aead") -- 2.30.1 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0007-gnu-Add-rust-username-0.2.patch >From 92395766d44b1a7d97b07cf330d2b14703c5e935 Mon Sep 17 00:00:00 2001 From: John Soo Date: Wed, 17 Jun 2020 18:23:06 -0700 Subject: [PATCH 07/14] gnu: Add rust-username-0.2. * gnu/packages/crates-io.scm (rust-username-0.2): New variable. --- gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 9d439797ea..765d040229 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -45594,6 +45594,32 @@ encoding.") See winapi for types and constants.") (license license:expat))) +(define-public rust-username-0.2 + (package + (name "rust-username") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "username" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "028s7gpsz17z6chy818bpkxldixfxhlvicvyvhdbrxr7cpgjbr4j")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-advapi32-sys" ,rust-advapi32-sys-0.2) + ("rust-winapi" ,rust-winapi-0.3)))) + (home-page "https://pijul.org/darcs/user") + (synopsis + "Portably retrieve the username of the user running the current thread") + (description + "Portably retrieve the user name (and possibly other information in +future versions) of the user running the current thread.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-users-0.10 (package (name "rust-users") -- 2.30.1 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0008-gnu-Add-rust-lazycell-0.4.patch >From 8ba2fa71c5bac7991b0729938289db247816b404 Mon Sep 17 00:00:00 2001 From: John Soo Date: Mon, 26 Oct 2020 08:13:05 -0700 Subject: [PATCH 08/14] gnu: Add rust-lazycell-0.4. * gnu/packages/crates-io.scm (rust-lazycell-0.4): New variable. --- gnu/packages/crates-io.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 765d040229..a1cd8686aa 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -20417,6 +20417,24 @@ requires non-const function calls to be computed.") "This package provides a library providing a lazily filled Cell struct.") (license (list license:expat license:asl2.0)))) +(define-public rust-lazycell-0.4 + (package + (inherit rust-lazycell-1) + (name "rust-lazycell") + (version "0.4.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "lazycell" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0szgqfl2aw18kn9cf6qqpxxkiw6x6hx9y4r3gklnxn1r8xn304nf")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs (("rust-clippy" ,rust-clippy-0.0)))))) + (define-public rust-lexical-core-0.7 (package (name "rust-lexical-core") -- 2.30.1 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0009-gnu-Add-rust-pretty-env-logger-0.2.patch >From 222a804b939d08aaaa1bd463515e06bb22c18c95 Mon Sep 17 00:00:00 2001 From: John Soo Date: Mon, 26 Oct 2020 08:23:12 -0700 Subject: [PATCH 09/14] gnu: Add rust-pretty-env-logger-0.2. * gnu/packages/crates-io.scm (rust-pretty-env-logger-0.2): New variable. --- gnu/packages/crates-io.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a1cd8686aa..dde65a44ad 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -28936,6 +28936,28 @@ replacements, adding colorful diffs.") ("rust-chrono" ,rust-chrono-0.4) ("rust-env-logger" ,rust-env-logger-0.6)))))) +(define-public rust-pretty-env-logger-0.2 + (package + (inherit rust-pretty-env-logger-0.3) + (name "rust-pretty-env-logger") + (version "0.2.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "pretty_env_logger" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0a0c53plsr4abw0y1iyjxs0d64f0a6dn48464a2rp21f0iiix3gd")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-ansi-term" ,rust-ansi-term-0.11) + ("rust-chrono" ,rust-chrono-0.4) + ("rust-env-logger" ,rust-env-logger-0.5) + ("rust-log" ,rust-log-0.4)))))) + (define-public rust-pretty-hex-0.2 (package (name "rust-pretty-hex") -- 2.30.1 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0010-gnu-Add-rust-spmc-0.2.patch >From 2ef38f9043385f7769324f99f0e6b9c973072d51 Mon Sep 17 00:00:00 2001 From: John Soo Date: Mon, 26 Oct 2020 08:29:11 -0700 Subject: [PATCH 10/14] gnu: Add rust-spmc-0.2. * gnu/packages/crates-io.scm (rust-spmc-0.2): New variable. --- gnu/packages/crates-io.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index dde65a44ad..5899a2e87d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -38270,6 +38270,26 @@ provided by @code{lock_api}.") (description "Simple SPMC channel") (license (list license:expat license:asl2.0)))) +(define-public rust-spmc-0.2 + (package + (inherit rust-spmc-0.3) + (name "rust-spmc") + (version "0.2.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "spmc" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1nhbjc65avbb4nffk6b49spbv7rsmmnrppj2qnx39mhwi57spgiw")))) + (arguments + `(#:tests? #f ;; tests hang + #:cargo-development-inputs + (("rust-loom" ,rust-loom-0.2)))) + ;; This package is broken before 0.3 + ;; Only included for pijul@1 + (properties `((hidden? . #t))))) + (define-public rust-spsc-buffer-0.1 (package (name "rust-spsc-buffer") -- 2.30.1 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0011-gnu-Add-rust-tokio-tls-0.1.patch >From 45187dad4c1a780762d88c3a4dc38b4d0b21716d Mon Sep 17 00:00:00 2001 From: John Soo Date: Mon, 26 Oct 2020 09:12:18 -0700 Subject: [PATCH 11/14] gnu: Add rust-tokio-tls-0.1. * gnu/packages/crates-io.scm (rust-tokio-tls-0.1): New variable. --- gnu/packages/crates-io.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 5899a2e87d..4706e5afa0 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -43043,6 +43043,39 @@ implementation of TLS for nonblocking I/O streams.") ("rust-security-framework" ,rust-security-framework-0.2) ("rust-tokio" ,rust-tokio-0.1)))))) +(define-public rust-tokio-tls-0.1 + (package + (inherit rust-tokio-tls-0.3) + (version "0.1.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "tokio-tls" version)) + (file-name + (string-append + (package-name rust-tokio-tls-0.3) "-" version ".tar.gz")) + (sha256 + (base32 + "04yrdscn8m9qza8ms09pqipbmj6x2q64jgm5n3ipy4b0wl24nbvp")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-futures" ,rust-futures-0.1) + ("rust-native-tls" ,rust-native-tls-0.1) + ("rust-tokio-core" ,rust-tokio-core-0.1) + ("rust-tokio-io" ,rust-tokio-io-0.1) + ("rust-tokio-proto" ,rust-tokio-proto-0.1)) + #:cargo-development-inputs + (("rust-cfg-if" ,rust-cfg-if-0.1) + ("rust-env-logger" ,rust-env-logger-0.4) + ("rust-hyper" ,rust-hyper-0.11) + ("rust-openssl" ,rust-openssl-0.9) + ("rust-schannel" ,rust-schannel-0.1) + ("rust-security-framework" + ,rust-security-framework-0.1) + ("rust-tokio-service" ,rust-tokio-service-0.1) + ("rust-winapi" ,rust-winapi-0.3)))))) + (define-public rust-tokio-trace-core-0.2 (package (name "rust-tokio-trace-core") -- 2.30.1 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0012-gnu-Update-rust-tokio-executor-0.1-to-0.1.8.patch >From a1a8c82dbfd1fd0d95f77c58253477cab9090f01 Mon Sep 17 00:00:00 2001 From: John Soo Date: Mon, 26 Oct 2020 09:34:42 -0700 Subject: [PATCH 12/14] gnu: Update rust-tokio-executor-0.1 to 0.1.8. * gnu/packages/crates-io.scm (rust-tokio-executor-0.1): Update it. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 4706e5afa0..7dc0f34ee5 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -41996,7 +41996,7 @@ the current thread.") (define-public rust-tokio-executor-0.1 (package (name "rust-tokio-executor") - (version "0.1.7") + (version "0.1.8") (source (origin (method url-fetch) @@ -42005,7 +42005,7 @@ the current thread.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0pjmgpg58k3hf5q9w6xjljsv8xy66lf734qnfwsc0g3pq3349sl3")))) + "1b5n6barppmhfyb1m2cvswp7nqvyrr3lb0kk545my75hdl7fw9qg")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t -- 2.30.1 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0013-gnu-Fix-rust-tokio-0.1-dependencies.patch >From e24157ce11f6734954cb2387b5d3580a264d616b Mon Sep 17 00:00:00 2001 From: John Soo Date: Mon, 26 Oct 2020 09:37:39 -0700 Subject: [PATCH 13/14] gnu: Fix rust-tokio-0.1 dependencies. * gnu/packages/crates-io.scm (rust-tokio-0.1): [arguments] Add required cargo-inputs. --- gnu/packages/crates-io.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 7dc0f34ee5..f82f1458a4 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -41806,7 +41806,6 @@ writing asynchronous I/O backed applications.") (("rust-bytes" ,rust-bytes-0.4) ("rust-futures" ,rust-futures-0.1) ("rust-mio" ,rust-mio-0.6) - ("rust-miow" ,rust-miow-0.3) ("rust-num-cpus" ,rust-num-cpus-1) ("rust-tokio-codec" ,rust-tokio-codec-0.1) ("rust-tokio-current-thread" ,rust-tokio-current-thread-0.1) @@ -41818,9 +41817,9 @@ writing asynchronous I/O backed applications.") ("rust-tokio-tcp" ,rust-tokio-tcp-0.1) ("rust-tokio-threadpool" ,rust-tokio-threadpool-0.1) ("rust-tokio-timer" ,rust-tokio-timer-0.2) - ("rust-tokio-trace-core" ,rust-tokio-trace-core-0.2) ("rust-tokio-udp" ,rust-tokio-udp-0.1) - ("rust-tokio-uds" ,rust-tokio-uds-0.2)) + ("rust-tokio-uds" ,rust-tokio-uds-0.2) + ("rust-tracing-core" ,rust-tracing-core-0.1)) #:cargo-development-inputs (("rust-env-logger" ,rust-env-logger-0.5) ("rust-flate2" ,rust-flate2-1) -- 2.30.1 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0014-gnu-Add-pijul.patch >From 271fc728ab7a47630457d6611b0603b705c9097c Mon Sep 17 00:00:00 2001 From: John Soo Date: Wed, 17 Jun 2020 18:23:46 -0700 Subject: [PATCH 14/14] gnu: Add pijul. * gnu/packages/rust-apps.scm (pijul): New variable. --- gnu/packages/rust-apps.scm | 114 +++++++++++++++++++++++++++++++++++++ 1 file changed, 114 insertions(+) diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index 9511cbf308..91924d2322 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -34,10 +34,13 @@ #:use-module (gnu packages compression) #:use-module (gnu packages crates-io) #:use-module (gnu packages crates-graphics) + #:use-module (gnu packages crypto) #:use-module (gnu packages documentation) #:use-module (gnu packages fontutils) #:use-module (gnu packages gtk) #:use-module (gnu packages jemalloc) + #:use-module (gnu packages llvm) + #:use-module (gnu packages nettle) #:use-module (gnu packages pcre) #:use-module (gnu packages pkg-config) #:use-module (gnu packages tls) @@ -329,6 +332,117 @@ for distinguishing different kinds of bytes such as NULL bytes, printable ASCII characters, ASCII whitespace characters, other ASCII characters and non-ASCII.") (license (list license:expat license:asl2.0)))) +(define-public pijul + (package + (name "pijul") + (version "0.12.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "pijul" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "12aqpfd2si70qbvfnn9kvznxyd5g5gsb1kk1q52wm077cd03yapr")))) + (build-system cargo-build-system) + (inputs + `(("clang" ,clang) + ("libressl" ,libressl) + ("libsodium" ,libsodium) + ("nettle" ,nettle) + ("pkg-config" ,pkg-config))) + (arguments + `(#:cargo-inputs + (("rust-atty" ,rust-atty-0.2) + ("rust-base64" ,rust-base64-0.9) + ("rust-bincode" ,rust-bincode-1) + ("rust-bs58" ,rust-bs58-0.2) + ("rust-chrono" ,rust-chrono-0.4) + ("rust-clap" ,rust-clap-2) + ("rust-cryptovec" ,rust-cryptovec-0.4) + ("rust-dirs" ,rust-dirs-1) + ("rust-env-logger" ,rust-env-logger-0.6) + ("rust-failure" ,rust-failure-0.1) + ("rust-flate2" ,rust-flate2-1) + ("rust-futures" ,rust-futures-0.1) + ("rust-getch" ,rust-getch-0.2) + ("rust-hex" ,rust-hex-0.3) + ("rust-ignore" ,rust-ignore-0.4) + ("rust-libpijul" ,rust-libpijul-0.12) + ("rust-line" ,rust-line-0.1) + ("rust-log" ,rust-log-0.4) + ("rust-pathdiff" ,rust-pathdiff-0.1) + ("rust-progrs" ,rust-progrs-0.1) + ("rust-rand" ,rust-rand-0.6) + ("rust-regex" ,rust-regex-1) + ("rust-reqwest" ,rust-reqwest-0.9) + ("rust-rpassword" ,rust-rpassword-2) + ("rust-sequoia-openpgp" ,rust-sequoia-openpgp-0.9) + ("rust-serde" ,rust-serde-1) + ("rust-serde-derive" ,rust-serde-derive-1) + ("rust-shell-escape" ,rust-shell-escape-0.1) + ("rust-tar" ,rust-tar-0.4) + ("rust-tempfile" ,rust-tempfile-3) + ("rust-term" ,rust-term-0.5) + ("rust-thrussh" ,rust-thrussh-0.21) + ("rust-thrussh-config" ,rust-thrussh-config-0.2) + ("rust-thrussh-keys" ,rust-thrussh-keys-0.11) + ("rust-tokio" ,rust-tokio-0.1) + ("rust-tokio-uds" ,rust-tokio-uds-0.2) + ("rust-toml" ,rust-toml-0.4) + ("rust-username" ,rust-username-0.2)) + #:cargo-development-inputs + (("rust-walkdir" ,rust-walkdir-2)) + #:phases + (modify-phases %standard-phases + (add-before 'build 'set-clang-env + (lambda* (#:key inputs #:allow-other-keys) + (setenv + "LIBCLANG_PATH" + (string-append (assoc-ref inputs "clang") "/lib")) + #t)) + (add-after 'install 'install-completions + (lambda* (#:key outputs #:allow-other-keys) + (use-modules (ice-9 popen) + (ice-9 textual-ports)) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (share (string-append out "/share")) + (bash (string-append + share "/bash-completion/completions")) + (zsh (string-append + share "/zsh/site-functions")) + (fish (string-append + share "/fish/vendor_completions.d"))) + (for-each + (lambda (x) + (let ((dir (cddr x)) + (file (cadr x)) + (shell (car x))) + (mkdir-p dir) + (call-with-output-file (string-append dir "/" file) + (lambda (f) + (let* ((cmd (string-append + bin "/pijul generate-completions --" + shell)) + (pipe (open-input-pipe cmd)) + (completion (get-string-all pipe))) + (format f "~A" completion) + (close-pipe pipe)))) )) + `(("bash" . ("pijul" . ,bash)) + ("zsh" . ("_pijul" . ,zsh)) + ("fish" . ("pijul.fish" . ,fish)))) + #t)))))) + (home-page "https://pijul.org/") + (synopsis + "Patch-based distributed version control system") + (description + "This package is a version control system based on patches. Its +fundamental promise is that two patches producible in parallel always commute. +This makes the whole system more correct, and much simpler to use.") + (license license:gpl2+))) + (define-public ripgrep (package (name "ripgrep") -- 2.30.1 --=-=-=--