aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArun Isaac2023-07-05 21:59:23 +0100
committerArun Isaac2023-07-19 15:39:32 +0100
commitc300665c887350ff346e3d49fcd087240435e996 (patch)
tree8f1298e4d7a736b4316a23c4c98102a3354f07a8
parente82d8bcf5eebc6c86fee911acde32cb9193bf833 (diff)
downloadgn-machines-c300665c887350ff346e3d49fcd087240435e996.tar.gz
Use tissue from guix-forge.
The libgit2 patch is now in guix-forge. So, we don't have to repeat it here. * genenetwork-development.scm (libgit2-1.3, guile-git-for-tissue, tissue): Delete variables. (operating-system)[services]: Do not specify package for tissue service.
-rw-r--r--genenetwork-development.scm32
1 files changed, 0 insertions, 32 deletions
diff --git a/genenetwork-development.scm b/genenetwork-development.scm
index 470795c..9d53fe2 100644
--- a/genenetwork-development.scm
+++ b/genenetwork-development.scm
@@ -787,37 +787,6 @@ described by CONFIG, a <genenetwork-configuration> object."
;;; gn-gemtext-threads
;;;
-;; Use a patched libgit2 for tissue 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 guile-git-for-tissue
- (package
- (inherit guile-git)
- (inputs
- (modify-inputs (package-inputs guile-git)
- (replace "libgit2" libgit2-1.3)))))
-
-(define tissue
- (package
- (inherit guix:tissue)
- (inputs
- (modify-inputs (package-inputs guix:tissue)
- (replace "guile-git" guile-git-for-tissue)))))
-
(define gn-gemtext-threads-project
(forge-project
(name "gn-gemtext-threads")
@@ -1115,7 +1084,6 @@ reverse proxy tissue."
#:directories? #t))))))
(service tissue-service-type
(tissue-configuration
- (package tissue)
(socket
(forge-ip-socket
(port %tissue-port)))