From patchwork Fri Jun 28 05:13:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "ashish.is--- via Guix-patches\" via" X-Patchwork-Id: 65706 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 1777727BBE9; Fri, 28 Jun 2024 07:03:36 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 AFE6027BBE2 for ; Fri, 28 Jun 2024 07:03:33 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sN4hN-0002NU-RL; Fri, 28 Jun 2024 02:03:05 -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 1sN4hL-0002N9-JX for guix-patches@gnu.org; Fri, 28 Jun 2024 02:03:03 -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 1sN4hL-0005Dh-Bz for guix-patches@gnu.org; Fri, 28 Jun 2024 02:03:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sN4hJ-0000k6-WB for guix-patches@gnu.org; Fri, 28 Jun 2024 02:03:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71764] [PATCH v3] gnu: Add got. References: In-Reply-To: Resent-From: ashish.is@lostca.se Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 28 Jun 2024 06:03: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.is@lostca.se X-Debbugs-Original-Cc: Ashish SHUKLA , guix-patches@gnu.org Received: via spool by 71764-submit@debbugs.gnu.org id=B71764.17195545532805 (code B ref 71764); Fri, 28 Jun 2024 06:03:01 +0000 Received: (at 71764) by debbugs.gnu.org; 28 Jun 2024 06:02:33 +0000 Received: from localhost ([127.0.0.1]:51405 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sN4gr-0000jB-0Q for submit@debbugs.gnu.org; Fri, 28 Jun 2024 02:02:33 -0400 Received: from anamika.lostca.se ([65.21.75.227]:59646) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sN4go-0000ix-3B for 71764@debbugs.gnu.org; Fri, 28 Jun 2024 02:02:31 -0400 Received: from localhost.localdomain (99.red-81-34-48.dynamicip.rima-tde.net [81.34.48.99]) (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 2C3C615540; Fri, 28 Jun 2024 05:14:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lostca.se; s=anamika; t=1719551662; 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=20L30TABRIyQr7I5UQPvq40jXniIMMqBFkil9oM28tQ=; b=FVl3KugImbleHMMdFXbZBF2M6SCis1bjTtfTMBlObr12+28urypnlo81pOT99yugppw32O e72RCHpRE0qSytLbCdzb8Q7jZ1skq/VO3eGNSzh5snMv2z+ZQLDmlwq/Thl41S8Rw5Z8cv nCdkeyH5jQ7N8XlXw++KKcHwZT69IhU= Date: Fri, 28 Jun 2024 07:13:15 +0200 Message-ID: X-Mailer: git-send-email 2.45.2 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.is@lostca.se X-ACL-Warn: , "ashish.is--- via Guix-patches" X-Patchwork-Original-From: "ashish.is--- via Guix-patches" via From: "ashish.is--- via Guix-patches\" via" 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 From: Ashish SHUKLA * gnu/packages/version-control.scm (got): New variable. Change-Id: I309a975c1abfad1461cf475136eae39fe31e3097 --- This revision adds a workaround for hardcoded paths of ssh, ssh-keygen, and signify executables by switching to execvp from execv. gnu/packages/version-control.scm | 50 ++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) base-commit: 78b881722f08325c76096557313a0faee847c66f diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index da02d0e4ea..4a063cd221 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -52,6 +52,7 @@ ;;; Copyright © 2023 Steve George ;;; Copyright © 2023 Josselin Poiret ;;; Copyright © 2024 Hilton Chain +;;; Copyright © 2024 Ashish SHUKLA ;;; ;;; This file is part of GNU Guix. ;;; @@ -98,6 +99,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) @@ -120,6 +122,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) @@ -830,6 +834,52 @@ (define-public git-cal to GitHub contributions calendar.") (license license:expat))) +(define-public got + (package + (name "got") + (version "0.100") + (source (origin + (method url-fetch) + (uri (string-append "https://gameoftrees.org/releases/portable/got-portable-" + version ".tar.gz")) + (sha256 + (base32 + "04jhaqzskr26akmy963yc8gaw1pqbsxhgsxzd0yrssgzcwh8lfpw")))) + (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"))