summary refs log tree commit diff
diff options
context:
space:
mode:
authorArun Isaac2023-07-06 10:31:27 +0100
committerArun Isaac2023-07-06 11:19:45 +0100
commit93d506ee823b376913422c6ac4c8829bf2e88925 (patch)
treebbb3ee387bdaf7ef288ffb1e858d36c9347dbbbd
parent61836cac52fb047a6f376ed985f35615f21e530f (diff)
downloadtissue-93d506ee823b376913422c6ac4c8829bf2e88925.tar.gz
tissue-93d506ee823b376913422c6ac4c8829bf2e88925.tar.lz
tissue-93d506ee823b376913422c6ac4c8829bf2e88925.zip
Make repository a guix channel.
* .guix-authorizations, .guix-channel: New files.
* guix.scm: Convert to a symlink pointing to
.guix/tissue-package.scm. Move original there.
* .guix/tissue-package.scm: Convert into a module with public
packages.
-rw-r--r--.guix-authorizations4
-rw-r--r--.guix-channel3
-rw-r--r--.guix/tissue-package.scm70
l---------[-rw-r--r--]guix.scm67
4 files changed, 78 insertions, 66 deletions
diff --git a/.guix-authorizations b/.guix-authorizations
new file mode 100644
index 0000000..a8ef8be
--- /dev/null
+++ b/.guix-authorizations
@@ -0,0 +1,4 @@
+(authorizations
+ (version 0)
+ (("7F73 0343 F2F0 9F3C 77BF  79D3 2E25 EE8B 6180 2BB3"
+   (name "arunisaac"))))
diff --git a/.guix-channel b/.guix-channel
new file mode 100644
index 0000000..35e181f
--- /dev/null
+++ b/.guix-channel
@@ -0,0 +1,3 @@
+(channel
+ (version 0)
+ (directory ".guix"))
diff --git a/.guix/tissue-package.scm b/.guix/tissue-package.scm
new file mode 100644
index 0000000..305b501
--- /dev/null
+++ b/.guix/tissue-package.scm
@@ -0,0 +1,70 @@
+;;; tissue --- Text based issue tracker
+;;; Copyright © 2022, 2023 Arun Isaac <arunisaac@systemreboot.net>
+;;;
+;;; This file is part of tissue.
+;;;
+;;; tissue 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.
+;;;
+;;; tissue 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 tissue.  If not, see <https://www.gnu.org/licenses/>.
+
+(define-module (tissue-package)
+  #:use-module ((gnu packages fonts) #:select (font-ibm-plex))
+  #:use-module ((gnu packages guile) #:select (guile-git) #:prefix guix:)
+  #:use-module ((gnu packages version-control) #:select (libgit2-1.3) #:prefix guix:)
+  #:use-module ((gnu packages web) #:select (tissue) #:prefix guix:)
+  #:use-module (guix gexp)
+  #:use-module (guix git-download)
+  #:use-module (guix packages)
+  #:use-module (guix utils))
+
+;; Run this version of libgit2 for guile-git until guile-git is
+;; updated upstream and https://github.com/libgit2/libgit2/issues/6536
+;; is fixed.
+(define libgit2
+  (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
+            ;; Disable ownership validation until
+            ;; https://github.com/libgit2/libgit2/issues/6536 is fixed.
+            (add-after 'unpack 'disable-ownership-validation
+              (lambda _
+                (substitute* "src/repository.c"
+                  (("git_repository__validate_ownership = true")
+                   "git_repository__validate_ownership = false"))))))))))
+
+(define guile-git
+  (package
+    (inherit guix:guile-git)
+    (inputs
+     (modify-inputs (package-inputs guix:guile-git)
+       (replace "libgit2" libgit2)))))
+
+(define-public tissue
+  (package
+    (inherit guix:tissue)
+    (source (let ((source-directory (dirname (current-source-directory))))
+              (local-file source-directory
+                          "tissue-checkout"
+                          #:recursive? #t
+                          #:select? (git-predicate source-directory))))
+    (inputs
+     (modify-inputs (package-inputs guix:tissue)
+       (replace "guile-git" guile-git)))
+    (native-inputs
+     (modify-inputs (package-native-inputs guix:tissue)
+       (prepend font-ibm-plex)))))
+
+tissue
diff --git a/guix.scm b/guix.scm
index 08847da..2bd185f 100644..120000
--- a/guix.scm
+++ b/guix.scm
@@ -1,66 +1 @@
-;;; tissue --- Text based issue tracker
-;;; Copyright © 2022, 2023 Arun Isaac <arunisaac@systemreboot.net>
-;;;
-;;; This file is part of tissue.
-;;;
-;;; tissue 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.
-;;;
-;;; tissue 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 tissue.  If not, see <https://www.gnu.org/licenses/>.
-
-(use-modules ((gnu packages fonts) #:select (font-ibm-plex))
-             ((gnu packages guile) #:select (guile-git) #:prefix guix:)
-             ((gnu packages version-control) #:select (libgit2-1.3) #:prefix guix:)
-             ((gnu packages web) #:select (tissue) #:prefix guix:)
-             (guix gexp)
-             (guix git-download)
-             (guix packages)
-             (guix utils))
-
-(define %source-dir (dirname (current-filename)))
-
-;; Run this version of libgit2 for guile-git until guile-git is
-;; updated upstream and https://github.com/libgit2/libgit2/issues/6536
-;; is fixed.
-(define-public libgit2
-  (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
-            ;; Disable ownership validation until
-            ;; https://github.com/libgit2/libgit2/issues/6536 is fixed.
-            (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)))))
-
-(package
-  (inherit guix:tissue)
-  (source (local-file %source-dir
-                      #:recursive? #t
-                      #:select? (git-predicate %source-dir)))
-  (inputs
-   (modify-inputs (package-inputs guix:tissue)
-     (replace "guile-git" guile-git)))
-  (native-inputs
-   (modify-inputs (package-native-inputs guix:tissue)
-     (prepend font-ibm-plex))))
+.guix/tissue-package.scm
\ No newline at end of file