From patchwork Mon Feb 15 22:18:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Soo X-Patchwork-Id: 27079 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 3372227BC2E; Mon, 15 Feb 2021 22:19:13 +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 5B44627BC2E for ; Mon, 15 Feb 2021 22:19:11 +0000 (GMT) Received: from localhost ([::1]:52596 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lBmD0-00070i-Cg for patchwork@mira.cbaines.net; Mon, 15 Feb 2021 17:19:10 -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 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 Hello again, I rebased these patches on master. Pijul definitely works. Thanks! John 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