diff options
| author | Julien Lepiller <julien@lepiller.eu> | 2019-05-14 21:02:23 +0200 |
|---|---|---|
| committer | Julien Lepiller <julien@lepiller.eu> | 2019-05-14 21:05:32 +0200 |
| commit | 3617d4f913b2ab53420d3f696126d5c2bd20ea2a (patch) | |
| tree | 05aa7c2f21637f0a2766f779fded7a1c9ec39964 /gnu/packages/ocaml.scm | |
| parent | 9f5a3ba659ff50d324c95473ef921b8924d1c759 (diff) | |
| download | guix-3617d4f913b2ab53420d3f696126d5c2bd20ea2a.tar guix-3617d4f913b2ab53420d3f696126d5c2bd20ea2a.tar.gz | |
gnu: ocaml-base64: Update to 3.2.0.
* gnu/packages/ocaml.scm (ocaml-base64): Update to 3.2.0.
[origin]: Use git-fetch.
(ocaml-piqilib)[origin]: Add a patch to fix building with new
versions of ocaml-base64.
* gnu/packages/patches/ocaml-piqilib-Update-base64.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
Diffstat (limited to 'gnu/packages/ocaml.scm')
| -rw-r--r-- | gnu/packages/ocaml.scm | 34 |
1 files changed, 14 insertions, 20 deletions
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index ca7c3455fb..d4df52edc6 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2170,29 +2170,21 @@ multitude of other network protocols (FTP/SMTP/RTSP/etc).") (define-public ocaml-base64 (package (name "ocaml-base64") - (version "2.1.2") + (version "3.2.0") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/mirage/ocaml-base64/" - "releases/download/v" version "/base64-" - version ".tbz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/mirage/ocaml-base64") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1p45sawchmrkr22gkmydjc4ary23pisp58zsnb7iq7d82nxs1lfq")))) - (build-system ocaml-build-system) - (arguments - `(#:build-flags (list "build" "--tests" "true") - #:phases - (modify-phases %standard-phases - (delete 'configure)))) + "1ilw3zj0w6cq7i4pvr8m2kv5l5f2y9aldmv72drlwwns013b1gwy")))) + (build-system dune-build-system) (native-inputs - `(("topkg" ,ocaml-topkg) - ("ocamlbuild" ,ocamlbuild) - ("opam" ,opam) - ("rresult" ,ocaml-rresult) - ("bos" ,ocaml-bos) - ("alcotest" ,ocaml-alcotest))) + `(("ocaml-alcotest" ,ocaml-alcotest) + ("ocaml-bos" ,ocaml-bos) + ("ocaml-rresult" ,ocaml-rresult))) (home-page "https://github.com/mirage/ocaml-base64") (synopsis "Base64 encoding for OCaml") (description "Base64 is a group of similar binary-to-text encoding schemes @@ -2732,7 +2724,9 @@ Format module of the OCaml standard library.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0lyqllmfsxmwlg7qidy92kvxi9n39lvachmydcyi81f8p07ykd2d")))) + (base32 "0lyqllmfsxmwlg7qidy92kvxi9n39lvachmydcyi81f8p07ykd2d")) + (patches + (search-patches "ocaml-piqilib-Update-base64.patch")))) (build-system ocaml-build-system) (arguments `(#:phases |