summary refs log tree commit diff
diff options
context:
space:
mode:
authorJulien Lepiller <julien@lepiller.eu>2022-06-18 12:08:15 +0200
committerJulien Lepiller <julien@lepiller.eu>2022-06-18 13:15:20 +0200
commit3cd53fc08f68e7a47a2ff4b993ab53645b65f386 (patch)
tree7fe1ce7706beabf727bc15fef1632f8e20385b40
parent773837bfd20b1065936a12bee7adc3687188df47 (diff)
downloadguix-3cd53fc08f68e7a47a2ff4b993ab53645b65f386.tar.gz
gnu: omake: Update to 0.10.5.
* gnu/packages/ocaml.scm (omake): Update to 0.10.5.
* gnu/packages/patches/omake-fix-non-determinism.patch: Adjust for new
  version.
-rw-r--r--gnu/packages/ocaml.scm4
-rw-r--r--gnu/packages/patches/omake-fix-non-determinism.patch15
2 files changed, 10 insertions, 9 deletions
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 71e1851a37..808b1a3664 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -3197,14 +3197,14 @@ OCaml code.")
 (define-public omake
   (package
     (name "omake")
-    (version "0.10.3")
+    (version "0.10.5")
     (source (origin
               (method url-fetch)
               (uri (string-append "http://download.camlcity.org/download/"
                                   "omake-" version ".tar.gz"))
               (sha256
                (base32
-                "07bdg1h5i7qnlv9xq81ad5hfypl10hxm771h4rjyl5cn8plhfcgz"))
+                "1i7pcv53kqplrbdx9mllrhbv4j57zf87xwq18r16cvn1lbc6mqal"))
               (patches (search-patches "omake-fix-non-determinism.patch"))))
     (build-system ocaml-build-system)
     (arguments
diff --git a/gnu/packages/patches/omake-fix-non-determinism.patch b/gnu/packages/patches/omake-fix-non-determinism.patch
index 813ce3cd7d..e5060bd703 100644
--- a/gnu/packages/patches/omake-fix-non-determinism.patch
+++ b/gnu/packages/patches/omake-fix-non-determinism.patch
@@ -1,6 +1,6 @@
-From 2e7e254160506dc00f1beabf170512a8e932934b Mon Sep 17 00:00:00 2001
+From 9f70bca2d823b93b334ecb0f92e940d20aafc1c6 Mon Sep 17 00:00:00 2001
 From: Julien Lepiller <julien@lepiller.eu>
-Date: Sat, 31 Dec 2016 15:43:38 +0100
+Date: Sat, 18 Jun 2022 12:02:49 +0200
 Subject: [PATCH] fix build date in binary
 
 ---
@@ -8,19 +8,19 @@ Subject: [PATCH] fix build date in binary
  1 file changed, 2 insertions(+), 10 deletions(-)
 
 diff --git a/src/magic/omake_gen_magic.ml b/src/magic/omake_gen_magic.ml
-index b2419ba..fad52f5 100644
+index c2b9329..3d36c0c 100644
 --- a/src/magic/omake_gen_magic.ml
 +++ b/src/magic/omake_gen_magic.ml
 @@ -150,7 +150,7 @@ let ir_magic = "%s"
  let obj_magic = "%s"
  let lib_dir = "%s"
  let version = "%s"
--let version_message = "OMake %s:\\n\\tbuild [%s %s %d %02d:%02d:%02d %d]\\n\\ton %s"
+-let version_message = "OMake %s:\n    build [%s %s %d %02d:%02d:%02d %d]\n    on %s"
 +let version_message = "OMake %s"
  |}
         default_save_interval
         digest_len
-@@ -160,15 +160,7 @@ let version_message = "OMake %s:\\n\\tbuild [%s %s %d %02d:%02d:%02d %d]\\n\\ton
+@@ -160,15 +160,7 @@ let version_message = "OMake %s:\n    build [%s %s %d %02d:%02d:%02d %d]\n    on
         (digest_files ".omo.magic" ".omo" omo_files)
         (String.escaped libdir)
         (String.escaped (shorten_version version))
@@ -37,5 +37,6 @@ index b2419ba..fad52f5 100644
    List.iter
      (fun (name,value) ->
         Printf.fprintf buf "let %s = %S\n" name value
---
-2.11.0
+-- 
+2.36.1
+