diff options
author | Marius Bakke <mbakke@fastmail.com> | 2018-12-09 00:18:32 +0100 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2018-12-09 00:18:32 +0100 |
commit | fbb7b04a8563fbb5dfbe7b3c7be171c8dec23442 (patch) | |
tree | 5508f13c24ef19dd018cd91fe287e8fa50eda7e4 /gnu/packages/serialization.scm | |
parent | 16735b0b632b5f05fc914836b8f345e3a9e601dd (diff) | |
parent | cec0c4e29c6efb337ae65d9c533cdbb2bf724430 (diff) | |
download | guix-fbb7b04a8563fbb5dfbe7b3c7be171c8dec23442.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/serialization.scm')
-rw-r--r-- | gnu/packages/serialization.scm | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm index 2df0ce1364..2d61f7451b 100644 --- a/gnu/packages/serialization.scm +++ b/gnu/packages/serialization.scm @@ -306,7 +306,7 @@ it a convenient format to store user input files.") (define-public capnproto (package (name "capnproto") - (version "0.6.1") + (version "0.7.0") (source (origin (method url-fetch) (uri (string-append @@ -314,7 +314,7 @@ it a convenient format to store user input files.") version ".tar.gz")) (sha256 (base32 - "010s9yhq4531wvdfrdf2477zswhck6cjfby79w73rff3v06090l0")))) + "0hfdnhlbskagzgvby8wy6lrxj53zfzpfqimbhga68c0ji2yw1969")))) (build-system gnu-build-system) (arguments `(#:phases @@ -324,6 +324,14 @@ it a convenient format to store user input files.") ;; Workaround for test that tries to resolve port name from ;; /etc/services, which is not present in build environment. (substitute* "src/kj/async-io-test.c++" ((":http") ":80")) + #t)) + (add-before 'check 'use-tmp-for-tempory-files + (lambda _ + ;; Use /tmp for tempory files, as the default /var/tmp directory + ;; doesn't exist. + (substitute* "src/kj/filesystem-disk-test.c++" + (("VAR\\_TMP \"/var/tmp\"") + "VAR_TMP \"/tmp\"")) #t))))) (home-page "https://capnproto.org") (synopsis "Capability-based RPC and serialization system") |