From 98abdbff3d5316a75f27d6a76fe09317d56f2a38 Mon Sep 17 00:00:00 2001 From: Vincent Bernardoff Date: Sun, 10 Feb 2019 14:47:07 +0100 Subject: [PATCH] Fix compilation with newer base64 versions --- opam | 2 +- piqilib/piqi_base64.ml | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/opam b/opam index 3a9128e..bb5a53f 100644 --- a/opam +++ b/opam @@ -26,6 +26,6 @@ depends: [ "easy-format" "ulex" "xmlm" - "base64" {>="2.0.0"} + "base64" {>="3.1.0"} ] dev-repo: "git://github.com/alavrik/piqi" diff --git a/piqilib/piqi_base64.ml b/piqilib/piqi_base64.ml index c5a6ae7..a98346e 100644 --- a/piqilib/piqi_base64.ml +++ b/piqilib/piqi_base64.ml @@ -18,12 +18,11 @@ (* TODO: add more base64 validation; the base64 library doesn't do any * validation *) let decode x = - try - B64.decode x - with _ -> - invalid_arg "Piqi_base64.decode" + match Base64.decode x with + | Error _ -> invalid_arg "Piqi_base64.decode" + | Ok v -> v let encode x = - B64.encode x + Base64.encode_exn x -- 2.21.0 /guix/refs/?id=08512512eae2bd8b71f2e99251ee8dcadcefc1a1'>refslogtreecommitdiff
path: root/etc/guix-publish.service.in
AgeCommit message (Expand)Author
2021-02-09etc: 'guix-publish.service' depends on 'guix-daemon.service'....Reported by Dimitri Delabroye <dimitri.delabroye@inria.fr>. * etc/guix-publish.service.in (Requires, PartOf, After): New fields. Ludovic Courtès
2019-06-05etc: Fix GUIX_LOCPATH quoting in 'guix-publish.service' file....This is a followup to 579d17b70dac067f8194ede46513400b91ac136a. * etc/guix-publish.service.in (Environment): Move GUIX_LOCPATH inside the quotes. Jack Hill
2019-05-13Set 'LC_ALL=en_US.utf8' in systemd '.service' files....Fixes <https://bugs.gnu.org/35671>. * etc/guix-daemon.service.in (Environment): Quote the 'GUIX_LOCPATH' value; add 'LC_ALL'. * etc/guix-publish.service.in (Environment): Likewise. Ludovic Courtès
2018-11-23build: Binary tarball now populates the "current-guix" profile....* Makefile.am (guix-binary.%.tar.xz): Pass '--profile-name=current-guix'. Remove glibc and glibc-utf8-locales. * doc/guix.texi (Binary Installation): Update accordingly. * etc/guix-install.sh * etc/guix-install.sh (sys_create_store, sys_enable_guix_daemon) (sys_authorize_build_farms): Likewise. * etc/guix-publish.conf.in, etc/guix-publish.service.in, etc/guix-daemon.conf.in, etc/guix-daemon.service.in: Update file names accordingly. Ludovic Courtès
2017-03-06build: Don't embed absolute paths in .service and .conf service files....Otherwise, users will be stuck running an old copy of guix and the guix-daemon if they copy the service files instead of symlinking them. * etc/guix-daemon.conf.in, etc/guix-daemon.service.in, etc/guix-publish.conf.in, etc/guix-publish.service.in: Expand @localstatedir@ instead of @bindir@. * nix/local.mk (etc/guix-%.service, etc/guix-%.conf): Use @localstatedir@ instead of @bindir@. Leo Famulari
2016-11-24Add system start-up files for "guix publish"....* .gitignore: add etc/guix-publish.conf and /etc/guix-publish.service. * etc/guix-publish.conf.in: New file. * etc/guix-publish.service.in: New file. * nix/local.mk (etc/guix-%.service, etc/guix-%.conf): Generalized former build-rules for by using patterns. (nodist_systemdservice_DATA): Add etc/guix-publish.service, update comment. (nodist_upstartjob_DATA): Add etc/guix-publish.conf, update comment. * doc/guix.texi (Invoking guix publish): Add description for enabling "guix publish" on host distros using the new files. Hartmut Goebel