Update gitile

Julien LepillerTue Jan 23 19:23:18+0100 2024

f0a31ed

Update gitile

modules/packages/gitile.scm

1818 
1919 
(define-module (packages gitile)
2020 
  #:use-module (guix packages)
21-
  #:use-module (guix licenses)
21+
  #:use-module ((guix licenses) #:prefix license:)
2222 
  #:use-module (guix build-system gnu)
2323 
  #:use-module (guix git-download)
2424 
  #:use-module (guix git)
…
4949 
       ,@(package-native-inputs guile-syntax-highlight)))))
5050 
5151 
(define-public gitile
52-
  (package
53-
    (name "gitile")
54-
    (version "0.1.4")
55-
    (source (origin
56-
              (method git-fetch)
57-
              (uri (git-reference
58-
                     (url "https://git.lepiller.eu/git/gitile")
59-
                     (commit "aab4989efe4b5bcd3b1ac7fe108e1290de975fc0")))
60-
              (file-name (git-file-name name "0.1.4.aab4989"))
61-
              (sha256
62-
               (base32
63-
                "0rslmrqspv32pbf9qz0glm8d3cxb1bz1sgi6ak2zl7blg25lw2l1"))))
64-
    (build-system gnu-build-system)
65-
    (arguments
66-
     `(#:modules ((guix build utils)
67-
                  (guix build gnu-build-system)
68-
                  (ice-9 rdelim)
69-
                  (ice-9 popen))
70-
       #:make-flags (list "GUILE_AUTO_COMPILE=0")
71-
       #:phases
72-
       (modify-phases %standard-phases
73-
         (add-after 'install-bin 'wrap-program
74-
           (lambda* (#:key inputs outputs #:allow-other-keys)
75-
             ;; Wrap the 'gitile' command to refer to the right modules.
76-
             (let* ((out    (assoc-ref outputs "out"))
77-
                    (commonmark (assoc-ref inputs "guile-commonmark"))
78-
                    (git    (assoc-ref inputs "guile-git"))
79-
                    (bytes  (assoc-ref inputs "guile-bytestructures"))
80-
                    (fibers (assoc-ref inputs "guile-fibers"))
81-
                    (gcrypt (assoc-ref inputs "guile-gcrypt"))
82-
                    (syntax-highlight (assoc-ref inputs "guile-syntax-highlight"))
83-
                    (deps   (list out commonmark git bytes fibers gcrypt
84-
                                  syntax-highlight))
85-
                    (guile  (assoc-ref %build-inputs "guile"))
86-
                    (effective (read-line
87-
                                (open-pipe* OPEN_READ
88-
                                            (string-append guile "/bin/guile")
89-
                                            "-c" "(display (effective-version))")))
90-
                    (mods   (string-drop-right  ;drop trailing colon
91-
                             (string-join deps
92-
                                          (string-append "/share/guile/site/"
93-
                                                         effective ":")
94-
                                          'suffix)
95-
                             1))
96-
                    (objs   (string-drop-right
97-
                             (string-join deps
98-
                                          (string-append "/lib/guile/" effective
99-
                                                         "/site-ccache:")
100-
                                          'suffix)
101-
                             1)))
102-
               (wrap-program (string-append out "/bin/gitile")
103-
                 `("GUILE_LOAD_PATH" ":" prefix (,mods))
104-
                 `("GUILE_LOAD_COMPILED_PATH" ":" prefix (,objs)))))))))
105-
    (propagated-inputs
106-
     `(("guile-commonmark" ,guile-commonmark)
107-
       ("guile-git" ,guile-git)
108-
       ("guile-gcrypt" ,guile-gcrypt)
109-
       ("guile-syntax-highlight" ,my-guile-syntax-highlight)
110-
       ("gnutls" ,gnutls)
111-
       ("guile-fibers" ,guile-fibers)))
112-
    (native-inputs
113-
     `(("autoconf" ,autoconf)
114-
       ("automake" ,automake)
115-
       ("libtool" ,libtool)
116-
       ("pkg-config" ,pkg-config)
117-
       ("guile" ,guile-3.0)))
118-
    (home-page "https://git.lepiller.eu")
119-
    (synopsis "Simple git forge written in Guile")
120-
    (description "Gitile is a git forge written in Guile that lets you
52+
  (let ((commit "aab4989efe4b5bcd3b1ac7fe108e1290de975fc0")
53+
	(revision "0"))
54+
    (package
55+
      (name "gitile")
56+
      (version (git-version "0.1.4" revision commit))
57+
      (source
58+
       (origin
59+
         (method git-fetch)
60+
         (uri (git-reference
61+
                (url "https://git.lepiller.eu/git/gitile")
62+
                (commit commit)))
63+
         (file-name (git-file-name name version))
64+
         (sha256
65+
          (base32 "0rslmrqspv32pbf9qz0glm8d3cxb1bz1sgi6ak2zl7blg25lw2l1"))))
66+
      (build-system gnu-build-system)
67+
      (arguments
68+
       `(#:imported-modules ((guix build guile-build-system)
69+
                             ,@%gnu-build-system-modules)
70+
         #:make-flags (list "GUILE_AUTO_COMPILE=0")
71+
         #:phases
72+
         (modify-phases %standard-phases
73+
           (replace 'bootstrap
74+
             (lambda _
75+
               ;; The 'bootstrap' script lacks a shebang, leading to "Exec
76+
               ;; format error" with glibc 2.35.
77+
               (invoke "autoreconf" "-vfi")))
78+
           (add-after 'install-bin 'wrap-program
79+
             (lambda* (#:key inputs outputs #:allow-other-keys)
80+
               (use-modules (guix build guile-build-system))
81+
               ;; Wrap the 'gitile' command to refer to the right modules.
82+
               (let* ((out    (assoc-ref outputs "out"))
83+
                      (commonmark (assoc-ref inputs "guile-commonmark"))
84+
                      (git    (assoc-ref inputs "guile-git"))
85+
                      (bytes  (assoc-ref inputs "guile-bytestructures"))
86+
                      (fibers (assoc-ref inputs "guile-fibers"))
87+
                      (gcrypt (assoc-ref inputs "guile-gcrypt"))
88+
                      (syntax-highlight (assoc-ref inputs "guile-syntax-highlight"))
89+
                      (deps   (list out commonmark git bytes fibers gcrypt
90+
                                    syntax-highlight))
91+
                      (guile  (assoc-ref inputs "guile"))
92+
                      (effective (target-guile-effective-version))
93+
                      (mods   (string-drop-right  ;drop trailing colon
94+
                               (string-join deps
95+
                                            (string-append "/share/guile/site/"
96+
                                                           effective ":")
97+
                                            'suffix)
98+
                               1))
99+
                      (objs   (string-drop-right
100+
                               (string-join deps
101+
                                            (string-append "/lib/guile/" effective
102+
                                                           "/site-ccache:")
103+
                                            'suffix)
104+
                               1)))
105+
                 (wrap-program (string-append out "/bin/gitile")
106+
                   `("GUILE_LOAD_PATH" ":" prefix (,mods))
107+
                   `("GUILE_LOAD_COMPILED_PATH" ":" prefix (,objs)))))))))
108+
      (native-inputs
109+
       (list autoconf automake guile-3.0 pkg-config))
110+
      (inputs
111+
       (list guile-3.0
112+
             guile-commonmark
113+
             guile-fibers-1.3
114+
             guile-gcrypt
115+
             guile-git
116+
             guile-syntax-highlight-for-gitile
117+
             guile-gnutls))
118+
      (home-page "https://git.lepiller.eu/gitile")
119+
      (synopsis "Simple Git forge written in Guile")
120+
      (description "Gitile is a Git forge written in Guile that lets you
121121 
visualize your public Git repositories on a web interface.")
122-
    (license agpl3+)))
122+
      (license license:agpl3+))))
123123 
124124 
gitile
modules/services/gitile.scm
112112 
                                                   repositories
113113 
                                                   base-git-url index-title
114114 
                                                   intro footer))
115-
                              #:user "gitile"
115+
                              #:user "git"
116116 
                              #:group "git")))
117117 
             (stop #~(make-kill-destructor)))))))
118118