From patchwork Sat Oct 31 18:15:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: John Soo X-Patchwork-Id: 24912 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 2BE5E27BBF6; Sat, 31 Oct 2020 18:16:37 +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,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 9856C27BBF5 for ; Sat, 31 Oct 2020 18:16:25 +0000 (GMT) Received: from localhost ([::1]:33968 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kYvQO-00036G-L5 for patchwork@mira.cbaines.net; Sat, 31 Oct 2020 14:16:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36826) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kYvQ2-000366-BA for guix-patches@gnu.org; Sat, 31 Oct 2020 14:16:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51190) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kYvQ2-0001bY-1W for guix-patches@gnu.org; Sat, 31 Oct 2020 14:16:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kYvQ1-0000F8-S2 for guix-patches@gnu.org; Sat, 31 Oct 2020 14:16:01 -0400 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: Sat, 31 Oct 2020 18:16: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.1604168132893 (code B ref 43929); Sat, 31 Oct 2020 18:16:01 +0000 Received: (at 43929) by debbugs.gnu.org; 31 Oct 2020 18:15:32 +0000 Received: from localhost ([127.0.0.1]:34504 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kYvPY-0000EL-Hu for submit@debbugs.gnu.org; Sat, 31 Oct 2020 14:15:32 -0400 Received: from mail-pj1-f49.google.com ([209.85.216.49]:54925) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kYvPW-0000E8-S8 for 43929@debbugs.gnu.org; Sat, 31 Oct 2020 14:15:31 -0400 Received: by mail-pj1-f49.google.com with SMTP id az3so1024330pjb.4 for <43929@debbugs.gnu.org>; Sat, 31 Oct 2020 11:15:30 -0700 (PDT) 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=OFeiESdAhsMV7uxepMrZjZeltHx2kMbE86StAPHt+RA=; b=uAxhDu+54Gr8fIU8Cuo7AQOrw+7BdYPyJetAKJwRs2HbUVlMuIlrCwhPCGuZzIdb6C c7wmzY1j8L3sFa647G/1NXd/2ylxemTfhCr6xkusGlEHIc/ndmo4yr4bHYh+jZGkbgYO dE9MVeZRlobQgb2U7XIQyG1V3vOyreZF1VLkmKsu3oM34IxVwn8u8oLsxwMwqZ4FBER+ NZDPBsUfC/4fekwFIkEIY47BIR5uYtdafc4WvOAsqnmbdXK/h1Fcr370l4OK/J8Yqyi1 utCgAJe9LwZ/njbDImtS8Fh1dkMnm23GFiJghu6wVQ6OolIezg3peM+C8uSSOD2caKKW 9yPw== 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=OFeiESdAhsMV7uxepMrZjZeltHx2kMbE86StAPHt+RA=; b=XiQltHHoy03UiZvAL1N2dNE1YvhYVLqwe5LWdDYKuD24evfwyLoJxWFAf/FUwOSoNl 7EYPDH1GuP5j6HL5q4jYWjxnuUkzHx/YsgCVmaQYpADk1U8gyulZlm3otKOUZvMlqsbB 6ZbF3+JqhSWEzoc0SDorUF1+AMhcphQb9hUnndw5z8MEaaB7Mi2nzDtLymXJ7twZZtwn /kCts14Hq3qdntvcLFWroywRidrD1z+nP/FQ99CVRrT4LbBtVxRFCUCYbQCxhsQ2vvMs kcELW7j1WvY0zoI/nAZK7pZ2c/ff4lW5TogZF4lnV6jYt/FJ5zobUQYNEToUySySjhTm uDpA== X-Gm-Message-State: AOAM533CfQUZ9d/gs63QoFFQk+KnNcSFIg4KRHmArE9Co3UBfjCIBTLj SooaC1wY9fGWJkL6yntJqq3CcaQtYo6uuQ== X-Google-Smtp-Source: ABdhPJyVRwniHtT8SeCdT5GTRArOqpr/vfuL/JCbJAwBw/+9W38fnQ13URrOam6PFLexI8+WXuSnMQ== X-Received: by 2002:a17:90a:7bc5:: with SMTP id d5mr8912909pjl.99.1604168124671; Sat, 31 Oct 2020 11:15:24 -0700 (PDT) Received: from ecenter ([2600:1700:83b0:8bd0::7a8]) by smtp.gmail.com with ESMTPSA id j11sm9152718pfe.80.2020.10.31.11.15.20 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 31 Oct 2020 11:15:21 -0700 (PDT) From: John Soo References: <87lfgcog2g.fsf@asu.edu> <864kme2w8g.fsf@gmail.com> <2DFC6265-699A-4EA3-8E50-5352B8EA59F6@lepiller.eu> Date: Sat, 31 Oct 2020 11:15:19 -0700 In-Reply-To: <2DFC6265-699A-4EA3-8E50-5352B8EA59F6@lepiller.eu> (Julien Lepiller's message of "Wed, 28 Oct 2020 13:37:31 -0400") Message-ID: <871rhe1cug.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 Hi everyone, Julien Lepiller writes: > Le 28 octobre 2020 11:42:07 GMT-04:00, zimoun >>From my point of view, because of the “time-machine”, it is nice to >>include any version – especially when it is already done. :-) > > Yeah I agree, you don't have to wait, since you already have > everything available :) I agree. Attached the updated patches. I rebased them this morning. However, during the rebase, I found some that do not build. I marked these with [WIP]. I believe this to be something amiss with the rust-openssl-sys@0.9 dependency. Thanks! - John From 5105b110d7bcbc7f922691982c798d301595fe3c Mon Sep 17 00:00:00 2001 From: John Soo Date: Wed, 17 Jun 2020 18:23:46 -0700 Subject: [PATCH 89/89] 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 fabb4e0380..2b5a426e1b 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -30,8 +30,11 @@ #: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 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) @@ -235,6 +238,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))) + (native-inputs + `(("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.0) + ("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.1.0) + ("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 provides a patch-based distributed version control +system, easy to use and fast. Command-line interface.") + (license license:gpl2+))) + (define-public ripgrep (package (name "ripgrep") -- 2.28.0