From e71d3fe7556d0334e012c550477d36d1ca52df75 Mon Sep 17 00:00:00 2001 From: Vivien Date: Thu, 21 Oct 2021 02:16:10 +0200 Subject: Update package --- vkraus/packages/disfluid.scm | 4 +-- vkraus/services/disfluid.scm | 64 ++++++++++++++++++++++---------------------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/vkraus/packages/disfluid.scm b/vkraus/packages/disfluid.scm index b8514f4..03eb619 100644 --- a/vkraus/packages/disfluid.scm +++ b/vkraus/packages/disfluid.scm @@ -296,6 +296,6 @@ corresponding source, as an AGPL requirement."))) `(,branch ,(file-append (disfluid-htmlize package) "/share/doc/disfluid/disfluid.html")))) branch-disfluids))))))))) (define-public disfluid-snapshot-debug (disfluid-branch-snapshot #:branch-name "debug" #:version "0.5.3-93-g424d46f" #:manual-mdate "2021-10-11T16:50:26+02:00" #:release-date "2021-10-12T22:03:53+02:00" #:commit-id "424d46f0c00b30d8dacacc6192d1a9d39a78557b" #:hash "01l6rjwy3s0svsbdwwladqpf1scdgxw1hyw24f0crzyrx8009w1n")) -(define-public disfluid (disfluid-release #:version "0.6.0-9-gb549018" #:manual-mdate "2021-10-20T19:51:06+02:00" #:release-date "2021-10-20T19:51:06+02:00" #:commit-id "b549018336c1953b6ace257a1623b4723f34d107" #:hash "012zp8v05x343daar76n0y9qmpvsiwyy3axqjg2q1xz94sz32jir")) -(define-public disfluid-snapshot-master (disfluid-branch-snapshot #:branch-name "master" #:version "0.6.0-9-gb549018" #:manual-mdate "2021-10-20T19:51:06+02:00" #:release-date "2021-10-20T19:51:06+02:00" #:commit-id "b549018336c1953b6ace257a1623b4723f34d107" #:hash "012zp8v05x343daar76n0y9qmpvsiwyy3axqjg2q1xz94sz32jir")) +(define-public disfluid (disfluid-release #:version "0.6.0-9-g8588038" #:manual-mdate "2021-10-21T02:00:53+02:00" #:release-date "2021-10-21T02:00:53+02:00" #:commit-id "858803815d562ec5ab258ad4bdf2adb515e4d3db" #:hash "1v0wglpdv2l4jf3dyw40fw030c6qgaxm1qb2jk9hw4xdbxjhphgb")) +(define-public disfluid-snapshot-master (disfluid-branch-snapshot #:branch-name "master" #:version "0.6.0-9-g8588038" #:manual-mdate "2021-10-21T02:00:53+02:00" #:release-date "2021-10-21T02:00:53+02:00" #:commit-id "858803815d562ec5ab258ad4bdf2adb515e4d3db" #:hash "1v0wglpdv2l4jf3dyw40fw030c6qgaxm1qb2jk9hw4xdbxjhphgb")) (define-public disfluid:website (make-website disfluid (list (cons "debug" disfluid-snapshot-debug) (cons "master" disfluid-snapshot-master)))) diff --git a/vkraus/services/disfluid.scm b/vkraus/services/disfluid.scm index 7dbcbb3..d2ac961 100644 --- a/vkraus/services/disfluid.scm +++ b/vkraus/services/disfluid.scm @@ -54,8 +54,8 @@ (define configuration->shepherd-service (match-lambda - ((($ - disfluid ccs configuration port extra-options)) + (($ + disfluid ccs configuration port extra-options) `(,(shepherd-service (provision (list "disfluid")) (documentation (format #f "Run disfluid")) @@ -64,34 +64,34 @@ (gnu system file-systems))) (start (with-imported-modules - (source-module-closure - '((gnu build shepherd) - (gnu system file-systems))) - #~(begin - (let* ((user (getpwnam "disfluid")) - (prepare-directory - (lambda (dir) - (mkdir-p dir) - (chown dir (passwd:uid user) (passwd:gid user)) - (chmod dir #o700)))) - (prepare-directory "/var/log/disfluid") - (prepare-directory "/var/lib/disfluid") - (prepare-directory "/var/cache/disfluid")) - (make-forkexec-constructor - (list - (string-append #$disfluid "/bin/disfluid") - "-S" #$ccs - "-c" #$configuration - "-p" (with-output-to-string (lambda () (display #$port))) - "-l" "server.log" - "-e" "server.err" - #$@extra-options) - #:user "disfluid" - #:group "disfluid" - #:directory "/var/log/disfluid" - #:environment-variables - '("XDG_DATA_HOME=/var/lib/disfluid" - "XDG_CACHE_HOME=/var/cache/disfluid"))))) + (source-module-closure + '((gnu build shepherd) + (gnu system file-systems))) + #~(begin + (let* ((user (getpwnam "disfluid")) + (prepare-directory + (lambda (dir) + (mkdir-p dir) + (chown dir (passwd:uid user) (passwd:gid user)) + (chmod dir #o700)))) + (prepare-directory "/var/log/disfluid") + (prepare-directory "/var/lib/disfluid") + (prepare-directory "/var/cache/disfluid")) + (make-forkexec-constructor + (list + (string-append #$disfluid "/bin/disfluid") + "-S" #$ccs + "-c" #$configuration + "-p" (with-output-to-string (lambda () (display #$port))) + "-l" "server.log" + "-e" "server.err" + #$@extra-options) + #:user "disfluid" + #:group "disfluid" + #:directory "/var/log/disfluid" + #:environment-variables + '("XDG_DATA_HOME=/var/lib/disfluid" + "XDG_CACHE_HOME=/var/cache/disfluid"))))) (stop #~(make-kill-destructor))))))) (define %disfluid-accounts @@ -107,8 +107,8 @@ (define configuration->log-rotation (match-lambda - ((($ - disfluid ccs configuration port extra-options)) + (($ + disfluid ccs configuration port extra-options) `(,(log-rotation (frequency 'daily) (files -- cgit v1.2.3