Update gitile package and service

Julien LepillerTue Oct 06 14:13:41+0200 2020

4d7aea5

Update gitile package and service

modules/packages/gitile.scm

2020
2121
(define-module (packages gitile)
2222
  #:use-module (gnu packages autotools)
23+
  #:use-module (gnu packages gnupg)
2324
  #:use-module (gnu packages guile)
2425
  #:use-module (gnu packages guile-xyz)
2526
  #:use-module (gnu packages pkg-config)

3738
              (method git-fetch)
3839
              (uri (git-reference
3940
                     (url "https://git.lepiller.eu/git/gitile")
40-
                     (commit "e78303702bdc16fe49246a97e53b33dc47bb64de")))
41-
              (file-name (git-file-name name (string-append version "-e783037")))
41+
                     (commit "47c1ff58e830b905a394f023f62dd7a03c111606")))
42+
              (file-name (git-file-name name (string-append version "-47c1ff5")))
4243
              (sha256
4344
               (base32
44-
                "10v5ffdlr2f1p4mf485r6p7f9vi3ypil4y70p8x1w87s5qa3dwxr"))))
45+
                "1s6pk77glyy6rrx76kv3vzjkp9g7j5kkwn2khbx1hyhada21i63y"))))
4546
    (build-system gnu-build-system)
4647
    (arguments
4748
     `(#:modules ((guix build utils)

6465
                      (git    (assoc-ref inputs "guile-git"))
6566
                      (bytes  (assoc-ref inputs "guile-bytestructures"))
6667
                      (fibers (assoc-ref inputs "guile-fibers"))
67-
                      (deps   (list out git bytes fibers))
68+
                      (gcrypt (assoc-ref inputs "guile-gcrypt"))
69+
                      (deps   (list out git bytes fibers gcrypt))
6870
                      (guile  (assoc-ref %build-inputs "guile"))
6971
                      (effective (read-line
7072
                                  (open-pipe* OPEN_READ

9496
    (inputs
9597
     `(("guile" ,guile-3.0)
9698
       ("guile-fibers" ,guile-fibers)
99+
       ("guile-gcrypt" ,guile-gcrypt)
97100
       ("guile-git" ,guile-git)
98101
       ("gnutls" ,gnutls)))
99102
    (home-page "")

modules/services/gitile.scm

3131
  #:use-module (guix records)
3232
  #:use-module (ice-9 match)
3333
  #:export (gitile-service-type
34-
	    gitile-configuration))
34+
            gitile-configuration))
3535
3636
(define-record-type* <gitile-configuration>
3737
  gitile-configuration make-gitile-configuration gitile-configuration?
3838
  (package gitile-configuration-package
39-
	   (default gitile))
39+
           (default gitile))
4040
  (host gitile-configuration-host
41-
	(default "localhost"))
41+
        (default "localhost"))
4242
  (port gitile-configuration-port
43-
	(default 8080))
43+
        (default 8080))
4444
  (database gitile-configuration-database
45-
	    (default "/var/lib/gitile/gitile-db.sql"))
45+
            (default "/var/lib/gitile/gitile-db.sql"))
4646
  (repositories gitile-configuration-repositories
47-
		(default "/var/lib/gitolite/repositories")))
47+
                (default "/var/lib/gitolite/repositories")))
4848
49-
(define (gitile-config-file host port database repositories) 
49+
(define (gitile-config-file host port database repositories)
5050
  (define build
5151
    #~(write `(config
52-
		(port #$port)
53-
	        (host #$host)
52+
                (port #$port)
53+
                (host #$host)
5454
                (database #$database)
5555
                (repositories #$repositories))
56-
	     (open-output-file #$output)))
56+
             (open-output-file #$output)))
5757
5858
  (computed-file "gitile.conf" build))
5959

6767
             (start (let ((gitile (file-append package "/bin/gitile")))
6868
                          #~(make-forkexec-constructor
6969
                              `(,#$gitile "-c" #$(gitile-config-file
70-
						   host port database
71-
						   repositories)))))
70+
                                                   host port database
71+
                                                   repositories))
72+
                              #:user "gitile"
73+
                              #:group "git")))
7274
             (stop #~(make-kill-destructor)))))))
7375
7476
(define %gitile-accounts