From patchwork Thu Aug 15 20:05:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ashish SHUKLA X-Patchwork-Id: 67044 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 6EE7E27BBEA; Thu, 15 Aug 2024 21:07:37 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id D897427BBE2 for ; Thu, 15 Aug 2024 21:07:35 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1segkq-0000Un-Rj; Thu, 15 Aug 2024 16:07:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1segkp-0000Uf-Bi for guix-patches@gnu.org; Thu, 15 Aug 2024 16:07:27 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1segkp-00080h-2S for guix-patches@gnu.org; Thu, 15 Aug 2024 16:07:27 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:In-Reply-To:References:Subject; bh=jSdtLU+rvFwQRCLGgAfGI6yDocGMeN4mLDrw9fy/QmE=; b=TnVxCN9ba4ObJIvT4/KVMUKgUjmbAZ4I2ZwdYEzy4mz+zQWzRJVxd0mFQdqRd33kWw+uicJv7PGr04dLVTdJOkwr8gcbd1OUxcixle6E3vFyWczlpJyq73ab6TAL+T+3+sdFDlSHnODDGaKckc4useS3mM1GyENxwyzZLCO9L+xojSWaEqRys1T5xKkVFgQPInLrUze9cSDNEsmh+eHkqApGYsLnuGp2txnKgaZzbo7aCEpVrjr3MGz2o3/tPkxEyA6uopZ2ozKdnteuC4KZiybf5HOYLyMnx+g9d1pqU00PQ3cPHZAnjUU+Fyo6UJBhClheK3W3qsTADIFDchiLEQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1seglO-0008Uj-Is; Thu, 15 Aug 2024 16:08:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71764] [PATCH v6] gnu: Add got. References: In-Reply-To: Resent-From: Ashish SHUKLA Original-Sender: "Debbugs-submit" Resent-CC: ashish.is@lostca.se, ashish.is@lostca.se, ashish.is@lostca.se, guix-patches@gnu.org Resent-Date: Thu, 15 Aug 2024 20:08:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71764 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71764@debbugs.gnu.org Cc: Ashish SHUKLA , ashish.is@lostca.se, Ashish SHUKLA , Ashish X-Debbugs-Original-Xcc: ashish.is@lostca.se, Ashish SHUKLA , Ashish Received: via spool by 71764-submit@debbugs.gnu.org id=B71764.172375246232607 (code B ref 71764); Thu, 15 Aug 2024 20:08:02 +0000 Received: (at 71764) by debbugs.gnu.org; 15 Aug 2024 20:07:42 +0000 Received: from localhost ([127.0.0.1]:49809 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1segl3-0008Tr-Hp for submit@debbugs.gnu.org; Thu, 15 Aug 2024 16:07:42 -0400 Received: from anamika.lostca.se ([65.21.75.227]:46836) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1segkz-0008TS-W9 for 71764@debbugs.gnu.org; Thu, 15 Aug 2024 16:07:40 -0400 Received: from localhost.localdomain (207.red-81-35-38.dynamicip.rima-tde.net [81.35.38.207]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: abbe) by anamika.lostca.se (Postfix) with ESMTPSA id CE6AF228C8; Thu, 15 Aug 2024 20:06:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lostca.se; s=anamika; t=1723752384; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jSdtLU+rvFwQRCLGgAfGI6yDocGMeN4mLDrw9fy/QmE=; b=sUM1xMiFo70pNmo/g6xuCmTp7K3bolGR1fKGZIsrgSZcagI1e4de62emqJuuiMrCUIbk4F 2Ve7T+s6K+oJBQ+ArL9AnSQ6yvUtH583sYSiuSCFJYKW4VQ8FDwPkU44LFljriVm+A1wPt g0jZzO0SswWdeahwHEoJmYYV8QUyjV4= Date: Thu, 15 Aug 2024 22:05:40 +0200 Message-ID: <916ff4bfcc6a6eac4af6b3126f1c7d0d1fdc709c.1723752331.git.ashish.is@lostca.se> X-Mailer: git-send-email 2.46.0 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: , Reply-to: Ashish SHUKLA X-ACL-Warn: , Ashish SHUKLA via Guix-patches X-Patchwork-Original-From: Ashish SHUKLA via Guix-patches via From: Ashish SHUKLA Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/version-control.scm (got): New variable. Change-Id: I309a975c1abfad1461cf475136eae39fe31e3097 --- gnu/packages/version-control.scm | 50 ++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) base-commit: 888fdfd1b1c4e4b3913b7b229f1ebc9f4596be20 diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 9f67237d5d..7fdb8abf9b 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -53,6 +53,7 @@ ;;; Copyright © 2023 Josselin Poiret ;;; Copyright © 2024 Hilton Chain ;;; Copyright © 2024 Suhail Singh +;;; Copyright © 2024 Ashish SHUKLA ;;; ;;; This file is part of GNU Guix. ;;; @@ -99,6 +100,7 @@ (define-module (gnu packages version-control) #:use-module (gnu packages cook) #:use-module (gnu packages crates-io) #:use-module (gnu packages crates-vcs) + #:use-module (gnu packages crypto) #:use-module (gnu packages curl) #:use-module (gnu packages databases) #:use-module (gnu packages docbook) @@ -121,6 +123,8 @@ (define-module (gnu packages version-control) #:use-module (gnu packages guile-xyz) #:use-module (gnu packages image) #:use-module (gnu packages imagemagick) + #:use-module (gnu packages libbsd) + #:use-module (gnu packages libevent) #:use-module (gnu packages linux) #:use-module (gnu packages mail) #:use-module (gnu packages man) @@ -877,6 +881,52 @@ (define-public git-tools @end itemize") (license license:gpl3+))) +(define-public got + (package + (name "got") + (version "0.102") + (source (origin + (method url-fetch) + (uri (string-append "https://gameoftrees.org/releases/portable/got-portable-" + version ".tar.gz")) + (sha256 + (base32 + "0xrpx2k6v4bypfgy378gz5s48scwgg5vh6p4wq5xc2abcvm51jxa")))) + (inputs + `(("libevent" ,libevent) + ("libuuid" ,util-linux "lib") + ("zlib" ,zlib) + ("libressl" ,libressl) + ("libmd" ,libmd) + ("libbsd" ,libbsd) + ("ncurses" ,ncurses))) + (native-inputs + (list pkg-config perl)) + (arguments + `(;; disable runpath validation, courtesy: libbsd's special + ;; treatment of libmd + #:validate-runpath? #f + #:configure-flags + '("CFLAGS=-DGOT_DIAL_PATH_SSH=\\\"ssh\\\" -DGOT_TAG_PATH_SSH_KEYGEN=\\\"ssh-keygen\\\" -DGOT_TAG_PATH_SIGNIFY=\\\"signify\\\"") + #:phases ,#~(modify-phases %standard-phases + (add-after 'unpack 'patch-execv-to-execvp + (lambda _ + ;; got sources has paths hardcoded to /usr/bin + (substitute* "lib/dial.c" + (("execv\\(GOT_DIAL_") "execvp(GOT_DIAL_") + (("execv %s\", GOT_DIAL") "execvp %s\", GOT_DIAL")) + (substitute* "lib/sigs.c" + (("execv\\(GOT_TAG") "execvp(GOT_TAG") + (("execv %s\", GOT_TAG") "execvp %s\", GOT_TAG")) + #t))))) + (build-system gnu-build-system) + (synopsis "Distributed version control system") + (description + "Game of Trees (Got) is a version control system which prioritizes ease of use +and simplicity over flexibility.") + (license license:bsd-3) + (home-page "https://gameoftrees.org/"))) + (define-public xdiff (let ((revision "0") (commit "a137bc7ee6c76618ed1737c257548eaa10ac0089"))