From 07da703b69f192116da55d674f874b4ed083acf8 Mon Sep 17 00:00:00 2001
From: Arun Isaac
Date: Wed, 5 Jul 2023 20:47:53 +0100
Subject: tissue: Use latest tissue with a patched libgit2.

* guix/forge/guile-git.scm: New file.
* guix/forge/tissue.scm: Import guile-git from (forge
guile-git), (guix git-download) and (guix packages). Import tissue
with a guix: prefix.
(tissue): New public variable.
---
 guix/forge/guile-git.scm | 49 ++++++++++++++++++++++++++++++++++++++++++++++++
 guix/forge/tissue.scm    | 27 +++++++++++++++++++++++++-
 2 files changed, 75 insertions(+), 1 deletion(-)
 create mode 100644 guix/forge/guile-git.scm

(limited to 'guix')

diff --git a/guix/forge/guile-git.scm b/guix/forge/guile-git.scm
new file mode 100644
index 0000000..f582b7d
--- /dev/null
+++ b/guix/forge/guile-git.scm
@@ -0,0 +1,49 @@
+;;; guix-forge --- Guix software forge meta-service
+;;; Copyright © 2023 Arun Isaac <arunisaac@systemreboot.net>
+;;;
+;;; This file is part of guix-forge.
+;;;
+;;; guix-forge is free software: you can redistribute it and/or modify
+;;; it under the terms of the GNU General Public License as published
+;;; by the Free Software Foundation, either version 3 of the License,
+;;; or (at your option) any later version.
+;;;
+;;; guix-forge is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;;; General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with guix-forge.  If not, see
+;;; <https://www.gnu.org/licenses/>.
+
+(define-module (forge guile-git)
+  #:use-module ((gnu packages guile) #:select (guile-git) #:prefix guix:)
+  #:use-module ((gnu packages version-control) #:select (libgit2-1.3) #:prefix guix:)
+  #:use-module (guix gexp)
+  #:use-module (guix packages)
+  #:use-module (guix utils))
+
+;; Use a patched libgit2 until there is a way to disable repository
+;; ownership validation using the API. See
+;; https://issues.guix.gnu.org/55399
+(define libgit2-1.3
+  (package
+    (inherit guix:libgit2-1.3)
+    (name "libgit2")
+    (arguments
+     (substitute-keyword-arguments (package-arguments guix:libgit2-1.3)
+       ((#:phases phases #~%standard-phases)
+        #~(modify-phases #$phases
+            (add-after 'unpack 'disable-ownership-validation
+              (lambda _
+                (substitute* "src/repository.c"
+                  (("git_repository__validate_ownership = true")
+                   "git_repository__validate_ownership = false"))))))))))
+
+(define-public guile-git
+  (package
+    (inherit guix:guile-git)
+    (inputs
+     (modify-inputs (package-inputs guix:guile-git)
+       (replace "libgit2" libgit2-1.3)))))
diff --git a/guix/forge/tissue.scm b/guix/forge/tissue.scm
index 7836b13..f008686 100644
--- a/guix/forge/tissue.scm
+++ b/guix/forge/tissue.scm
@@ -19,17 +19,20 @@
 
 (define-module (forge tissue)
   #:use-module (srfi srfi-1)
+  #:use-module ((forge guile-git) #:select (guile-git))
   #:use-module (forge socket)
   #:use-module (gnu build linux-container)
   #:use-module ((gnu packages admin) #:select (shadow))
-  #:use-module ((gnu packages web) #:select (tissue))
+  #:use-module ((gnu packages web) #:select (tissue) #:prefix guix:)
   #:use-module (gnu services)
   #:use-module (gnu services shepherd)
   #:use-module (gnu system file-systems)
   #:use-module (gnu system shadow)
   #:use-module (guix gexp)
+  #:use-module (guix git-download)
   #:use-module (guix least-authority)
   #:use-module (guix modules)
+  #:use-module (guix packages)
   #:use-module (guix records)
   #:export (tissue-service-type
             <tissue-configuration>
@@ -46,6 +49,28 @@
             tissue-host-user
             tissue-host-upstream-repository))
 
+;; Run an updated version of tissue until the the 0.1.1 release is
+;; out.
+(define-public tissue
+  (let ((commit "0c3d6cb7d781fbc0c12eba1563cc7b7ebb370ba9")
+        (revision "1"))
+    (package
+      (inherit guix:tissue)
+      (name "tissue")
+      (version (git-version "0.1.0" revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://git.systemreboot.net/tissue")
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "0hdqa5n8dm2nc4ccx39xclgajv3ivwpb1hbz9kpbbv25iizqhnv2"))))
+      (inputs
+       (modify-inputs (package-inputs guix:tissue)
+         (replace "guile-git" guile-git))))))
+
 (define-record-type* <tissue-configuration>
   tissue-configuration make-tissue-configuration
   tissue-configuration?
-- 
cgit v1.2.3