From patchwork Sun Oct 11 16:58:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Soo X-Patchwork-Id: 24565 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 E340C27BBEA; Sun, 11 Oct 2020 17:59:24 +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.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 4CBDB27BBEB for ; Sun, 11 Oct 2020 17:59:14 +0100 (BST) Received: from localhost ([::1]:41418 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kRegj-00042b-Al for patchwork@mira.cbaines.net; Sun, 11 Oct 2020 12:59:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52092) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kRega-00042S-Qm for guix-patches@gnu.org; Sun, 11 Oct 2020 12:59:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:57627) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kRega-0006oz-HH for guix-patches@gnu.org; Sun, 11 Oct 2020 12:59:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kRegY-0005A4-Pu for guix-patches@gnu.org; Sun, 11 Oct 2020 12:59:03 -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: Sun, 11 Oct 2020 16:59:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 43929 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 43929@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.160243551419801 (code B ref -1); Sun, 11 Oct 2020 16:59:01 +0000 Received: (at submit) by debbugs.gnu.org; 11 Oct 2020 16:58:34 +0000 Received: from localhost ([127.0.0.1]:40941 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kReg6-00059J-0s for submit@debbugs.gnu.org; Sun, 11 Oct 2020 12:58:34 -0400 Received: from lists.gnu.org ([209.51.188.17]:58366) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kReg4-00059B-16 for submit@debbugs.gnu.org; Sun, 11 Oct 2020 12:58:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51942) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kReg3-0003wp-OQ for guix-patches@gnu.org; Sun, 11 Oct 2020 12:58:31 -0400 Received: from mail-pg1-x52d.google.com ([2607:f8b0:4864:20::52d]:33448) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kRefu-0006lw-3b for guix-patches@gnu.org; Sun, 11 Oct 2020 12:58:31 -0400 Received: by mail-pg1-x52d.google.com with SMTP id l18so2618426pgg.0 for ; Sun, 11 Oct 2020 09:58:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=asu-edu.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:mime-version; bh=sw1m1lwDelLX0xc0O5vyjDxuQSlT4g19pOAR0HFc24k=; b=SWV9gIjwzQADkhXGVQU61xDFxL33DkOzBBmR5HDeQHFLq5CICJ00sFEWtxUTO5zrgs Dxf+X+bo0BfrwrMgg3BQQV4sSH9Kb3Y7xTOf0egT7prCQjO22psLaIjkXbVZXG/rTe4S RLlijhnCgT8RvnnxuJpF/uCE0EdQfiJKE260uuHeKtort7FgGNaYCzwVCd72Mq2jYHu2 uHdWLhbyhpiKeAzih/aql3S4dbCehOUp1lml8fqjy4kDBXuH87jhF07J0CfsLwPVZHyT iUmHxYOrzNHKS8iYo7kJRuuoUDwqzviojzS+R7MtRBY523h1f6XhHkZQ3POKOxRhmhX6 b0pw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version; bh=sw1m1lwDelLX0xc0O5vyjDxuQSlT4g19pOAR0HFc24k=; b=aXO7hluDlLpo1deb6OxWLdD8PlNZ2M2MWtcs0axi5laOtAx8MHEUXtaW7noFs/z5Xb /ssUB5xP3DNdlotpo/ICuRLvI0PxMFhUNxK9M7Z5Tme3vVv6QT8jtc1qsZGtlU8VzaL8 3yQBYiQwlebuuLmsq1/IZlpWOECbW1ZRZqO8yF5gEWL7HNndpZaWq0/i2szGn4YY4JuQ zdNY5m77ZNMhYpdjOQ0mDbqGzjRN3fPSRcfP9zX5wavqlf+Aatqeze/ZBYkiLc39cr51 AVtG5FWJTcSBQJ62LfdtmV09UUYmxZkpdX0Tw2X3ojASgezll7T+GPSSzhEy4z8tS35q 3YPw== X-Gm-Message-State: AOAM533TbAWyCUvEOyt+IfDMiyqkDXq1b0mlDzMjTBebsjvEoM54800G 9bmbn08YTgsfXN0svTnvj9eZnQqc82BbLugg X-Google-Smtp-Source: ABdhPJzSlGf2LZ/oUPrGcTuBuOYkaMzplny9pSSp4VqrpjEgIhBQ1P/8Kk9tCc1w/YqqgOeUGzxZsg== X-Received: by 2002:a62:a513:0:b029:142:2501:39f6 with SMTP id v19-20020a62a5130000b0290142250139f6mr20125447pfm.69.1602435499519; Sun, 11 Oct 2020 09:58:19 -0700 (PDT) Received: from ecenter ([2600:1700:83b0:8bd0::4ec]) by smtp.gmail.com with ESMTPSA id g3sm20131094pjl.6.2020.10.11.09.58.16 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 11 Oct 2020 09:58:17 -0700 (PDT) From: John Soo Date: Sun, 11 Oct 2020 09:58:15 -0700 Message-ID: <87lfgcog2g.fsf@asu.edu> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::52d; envelope-from=jsoo1@asu.edu; helo=mail-pg1-x52d.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_FILL_THIS_FORM_SHORT=0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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 Guix, I've had these patches for a while and debated whether they should be merged. Pijul works but 2.0 is reportedly being worked on. I haven't seen much news on version 2 so I think 1.0 should be made available to try. Kindly, John From cd2e19016bc0f7ce1979bb2e1ae4fc72e46682e7 Mon Sep 17 00:00:00 2001 From: John Soo Date: Wed, 17 Jun 2020 18:23:46 -0700 Subject: [PATCH 57/57] gnu: Add pijul. * gnu/packages/rust-apps.scm (pijul): New variable. --- gnu/packages/rust-apps.scm | 113 +++++++++++++++++++++++++++++++++++++ 1 file changed, 113 insertions(+) diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index f5501d67dd..3448ecb877 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 perl) #:use-module (gnu packages pkg-config) @@ -238,6 +241,116 @@ 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.10) + ("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.0) + ("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 racer (package (name "racer") -- 2.28.0