Update gitile package and service
modules/packages/gitile.scm
20 | 20 | ||
21 | 21 | (define-module (packages gitile) | |
22 | 22 | #:use-module (gnu packages autotools) | |
23 | + | #:use-module (gnu packages gnupg) | |
23 | 24 | #:use-module (gnu packages guile) | |
24 | 25 | #:use-module (gnu packages guile-xyz) | |
25 | 26 | #:use-module (gnu packages pkg-config) | |
… | |||
37 | 38 | (method git-fetch) | |
38 | 39 | (uri (git-reference | |
39 | 40 | (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"))) | |
42 | 43 | (sha256 | |
43 | 44 | (base32 | |
44 | - | "10v5ffdlr2f1p4mf485r6p7f9vi3ypil4y70p8x1w87s5qa3dwxr")))) | |
45 | + | "1s6pk77glyy6rrx76kv3vzjkp9g7j5kkwn2khbx1hyhada21i63y")))) | |
45 | 46 | (build-system gnu-build-system) | |
46 | 47 | (arguments | |
47 | 48 | `(#:modules ((guix build utils) | |
… | |||
64 | 65 | (git (assoc-ref inputs "guile-git")) | |
65 | 66 | (bytes (assoc-ref inputs "guile-bytestructures")) | |
66 | 67 | (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)) | |
68 | 70 | (guile (assoc-ref %build-inputs "guile")) | |
69 | 71 | (effective (read-line | |
70 | 72 | (open-pipe* OPEN_READ | |
… | |||
94 | 96 | (inputs | |
95 | 97 | `(("guile" ,guile-3.0) | |
96 | 98 | ("guile-fibers" ,guile-fibers) | |
99 | + | ("guile-gcrypt" ,guile-gcrypt) | |
97 | 100 | ("guile-git" ,guile-git) | |
98 | 101 | ("gnutls" ,gnutls))) | |
99 | 102 | (home-page "") |
modules/services/gitile.scm
31 | 31 | #:use-module (guix records) | |
32 | 32 | #:use-module (ice-9 match) | |
33 | 33 | #:export (gitile-service-type | |
34 | - | gitile-configuration)) | |
34 | + | gitile-configuration)) | |
35 | 35 | ||
36 | 36 | (define-record-type* <gitile-configuration> | |
37 | 37 | gitile-configuration make-gitile-configuration gitile-configuration? | |
38 | 38 | (package gitile-configuration-package | |
39 | - | (default gitile)) | |
39 | + | (default gitile)) | |
40 | 40 | (host gitile-configuration-host | |
41 | - | (default "localhost")) | |
41 | + | (default "localhost")) | |
42 | 42 | (port gitile-configuration-port | |
43 | - | (default 8080)) | |
43 | + | (default 8080)) | |
44 | 44 | (database gitile-configuration-database | |
45 | - | (default "/var/lib/gitile/gitile-db.sql")) | |
45 | + | (default "/var/lib/gitile/gitile-db.sql")) | |
46 | 46 | (repositories gitile-configuration-repositories | |
47 | - | (default "/var/lib/gitolite/repositories"))) | |
47 | + | (default "/var/lib/gitolite/repositories"))) | |
48 | 48 | ||
49 | - | (define (gitile-config-file host port database repositories) | |
49 | + | (define (gitile-config-file host port database repositories) | |
50 | 50 | (define build | |
51 | 51 | #~(write `(config | |
52 | - | (port #$port) | |
53 | - | (host #$host) | |
52 | + | (port #$port) | |
53 | + | (host #$host) | |
54 | 54 | (database #$database) | |
55 | 55 | (repositories #$repositories)) | |
56 | - | (open-output-file #$output))) | |
56 | + | (open-output-file #$output))) | |
57 | 57 | ||
58 | 58 | (computed-file "gitile.conf" build)) | |
59 | 59 | ||
… | |||
67 | 67 | (start (let ((gitile (file-append package "/bin/gitile"))) | |
68 | 68 | #~(make-forkexec-constructor | |
69 | 69 | `(,#$gitile "-c" #$(gitile-config-file | |
70 | - | host port database | |
71 | - | repositories))))) | |
70 | + | host port database | |
71 | + | repositories)) | |
72 | + | #:user "gitile" | |
73 | + | #:group "git"))) | |
72 | 74 | (stop #~(make-kill-destructor))))))) | |
73 | 75 | ||
74 | 76 | (define %gitile-accounts |