From patchwork Tue Sep 17 20:31:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ashish SHUKLA X-Patchwork-Id: 68023 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 9AD6127BBE9; Tue, 17 Sep 2024 21:35:08 +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=unavailable 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 DCBAB27BBE2 for ; Tue, 17 Sep 2024 21:35:06 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sqeuQ-0000Fj-Dk; Tue, 17 Sep 2024 16:34:50 -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 1sqeuO-0000FZ-1t for guix-patches@gnu.org; Tue, 17 Sep 2024 16:34:48 -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 1sqeuM-0004iT-QB for guix-patches@gnu.org; Tue, 17 Sep 2024 16:34:47 -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:References:In-Reply-To:Date:From:To:Subject; bh=J8AfbE8MnjXo39xMYoSe0uuu0xrP3dECP8ywnk6B0V0=; b=FIhoZOaUo9VRXmT1JKF1eTsl5Lbn+zETBvQ5IJsCiQ60sHv7PjHlMt9NzzLQGwMUs7XCZDBLT77WuGnRP7i7t408nvso0kDpV+VP0vedG47crbeBJXyCbhsT09zJb2AsxYAS2IjnXYWQtTLkPR8fETkJ6VQtaJz321+NAR7BE4Seyg2jh35oNNU0S8tIfpMLkR1USwpazUJCaEZNEJyJyKhxzltlr7HVFKqVadpaT/yotlXRo00M33irMqjOkcqE2U5ZPllvESXGwEjGvHv9r4kZevKsP2j2ILm6EeUZXk2tBUDCHBFHca41UxcPpWgqdMzJadpg4sKewjgslbN9ng==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sqeub-0003fM-LO for guix-patches@gnu.org; Tue, 17 Sep 2024 16:35:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71764] [PATCH v8] gnu: Add got. Resent-From: Ashish SHUKLA Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 17 Sep 2024 20:35:01 +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 Received: via spool by 71764-submit@debbugs.gnu.org id=B71764.172660528214051 (code B ref 71764); Tue, 17 Sep 2024 20:35:01 +0000 Received: (at 71764) by debbugs.gnu.org; 17 Sep 2024 20:34:42 +0000 Received: from localhost ([127.0.0.1]:56120 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sqeuH-0003eZ-R0 for submit@debbugs.gnu.org; Tue, 17 Sep 2024 16:34:42 -0400 Received: from anamika.lostca.se ([65.21.75.227]:34580) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sqeuF-0003eI-7l for 71764@debbugs.gnu.org; Tue, 17 Sep 2024 16:34:40 -0400 Received: from seneca.inet6.in (unknown [IPv6:2401:c080:3400:28a8:5400:5ff:fe16:9400]) (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 EB0D02B8CC; Tue, 17 Sep 2024 20:34:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lostca.se; s=anamika; t=1726605256; 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: in-reply-to:in-reply-to:references:references; bh=J8AfbE8MnjXo39xMYoSe0uuu0xrP3dECP8ywnk6B0V0=; b=GN9/6P79KAVnp3peySPgf9/7idRbTmrTdlq47g9Lf9XtwaMeyBu1Vt3H4hO1piSOd7akFo Wq9iEfCUHT2tGFcVq0Xtd7Gw36DYz3V08xCX87CPp/yy+LlH4XY5sddOEiVPhOFdlU0iXP pnJCnQ+HsaTLqXxwiWAtiJ54fsxKkHM= Date: Tue, 17 Sep 2024 20:31:43 +0000 Message-ID: X-Mailer: git-send-email 2.46.1 In-Reply-To: References: 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: I34d19d90ab36e8831fa88668676aa2399356b002 --- Hi, Following changes are made in this revision: - guix style -S inputs --input-simplification=always got - switched configure-flags to make-flags, and split CFLAGS in multiple values - removed the trailing #t Thanks for reviewing. gnu/packages/version-control.scm | 52 ++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) base-commit: 5bc1fff8f1d1bd68be3183e64b06c8b85f60d96b diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 3bec28c4f7..5ab577d3cf 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -57,6 +57,7 @@ ;;; Copyright © 2024 Suhail Singh ;;; Copyright © 2024 Simon Tournier ;;; Copyright © 2024 Javier Olaechea +;;; Copyright © 2024 Ashish SHUKLA ;;; ;;; This file is part of GNU Guix. ;;; @@ -103,6 +104,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) @@ -125,6 +127,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) @@ -964,6 +968,54 @@ (define-public git-tools @end itemize") (license license:gpl3+))) +(define-public got + (package + (name "got") + (version "0.103") + (source (origin + (method url-fetch) + (uri (string-append "https://gameoftrees.org/releases/portable/got-portable-" + version ".tar.gz")) + (sha256 + (base32 + "0y18961xrj4rja850i31gadiaps2qnkfb4jlramlz9akyf9mwh1j")))) + (inputs + (list libevent + `(,util-linux "lib") + zlib + libressl + libmd + libbsd + ncurses)) + (native-inputs + (list pkg-config perl)) + (arguments + `(;; disable runpath validation, courtesy: libbsd's special + ;; treatment of libmd, as it embeds path to libmd.so + #:validate-runpath? #f + ;; default values of GOT_*_PATH_* point to /usr/bin + #:make-flags + '("CFLAGS+=-DGOT_DIAL_PATH_SSH=\\\"ssh\\\"" + "CFLAGS+=-DGOT_TAG_PATH_SSH_KEYGEN=\\\"ssh-keygen\\\"" + "CFLAGS+=-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"))))))) + (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"))