From aeca7656f499d7f4595319858f242276920e31bb Mon Sep 17 00:00:00 2001
From: Louis Gesbert <louis.gesbert@ocamlpro.com>
Date: Sat, 2 Dec 2017 12:51:01 +0100
Subject: [PATCH] Fix for ocaml 4.06

---
 common/criteria_lexer.mll | 8 ++++----
 common/util.ml            | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/criteria_lexer.mll b/common/criteria_lexer.mll
index 71f9178..fc4eae3 100644
--- a/common/criteria_lexer.mll
+++ b/common/criteria_lexer.mll
@@ -18,7 +18,7 @@
     let c = Lexing.lexeme_char lexbuf 2 in (* the delimiter can be any character *)
     (* find the terminating delimiter *)
     let endpos =
-      try String.index_from lexbuf.lex_buffer (lexbuf.lex_start_pos + 3) c with
+      try Bytes.index_from lexbuf.lex_buffer (lexbuf.lex_start_pos + 3) c with
       |Invalid_argument _ ->
           raise (Format822.Syntax_error (
             Format822.error lexbuf "String too short"))
@@ -27,9 +27,9 @@
             Format822.error lexbuf (Printf.sprintf "cannot find: %c" c)))
     in
     let len = endpos - (lexbuf.lex_start_pos + 3) in
-    let s = String.sub lexbuf.lex_buffer (lexbuf.lex_start_pos + 3) len in
-    lexbuf.Lexing.lex_curr_pos <- lexbuf.Lexing.lex_start_pos + ((String.length s)+4);
-    s
+    let s = Bytes.sub lexbuf.lex_buffer (lexbuf.lex_start_pos + 3) len in
+    lexbuf.Lexing.lex_curr_pos <- lexbuf.Lexing.lex_start_pos + ((Bytes.length s)+4);
+    Bytes.to_string s
 
 }
 
diff --git a/common/util.ml b/common/util.ml
index 598f266..36ca3d1 100644
--- a/common/util.ml
+++ b/common/util.ml
@@ -87,7 +87,7 @@ module MakeMessages(X : sig val label : string end) = struct
   let clean label =
     try 
       let s = Filename.chop_extension (Filename.basename label) in
-      String.capitalize s
+      String.capitalize_ascii s
     with Invalid_argument _ -> label
 
   let create ?(enabled=false) label =
-- 
2.11.0

pe='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=863bd265e458d2761906770802716555c54e69a4'>root</a>/<a href='/guix/log/gnu?id=863bd265e458d2761906770802716555c54e69a4'>gnu</a>/<a href='/guix/log/gnu/installer?id=863bd265e458d2761906770802716555c54e69a4'>installer</a>/<a href='/guix/log/gnu/installer/record.scm?id=863bd265e458d2761906770802716555c54e69a4'>record.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/installer/record.scm?id=863bd265e458d2761906770802716555c54e69a4&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-12-11 21:37:07 +0100'>2020-12-11</span></td><td><a href='/guix/commit/gnu/installer/record.scm?id=8361817bf693742757b096468198626f297bb09e'>install: Discover local substitute servers.</a><span class='msg-avail'>...</span></td><td>Mathieu Othacehe</td></tr>
<tr><td><span title='2020-04-09 02:42:54 +0000'>2020-04-09</span></td><td><a href='/guix/commit/gnu/installer/record.scm?id=91c231a2223440081426929828a23c7baa0214fd'>installer: Allow Alt+Shift toggle from non-Latin keyboard layouts.</a><span class='msg-avail'>...</span></td><td>Florian Pelz</td></tr>
<tr><td><span title='2020-04-08 10:24:02 +0200'>2020-04-08</span></td><td><a href='/guix/commit/gnu/installer/record.scm?id=07a53bd512530d8f87e076263227216c467727bb'>installer: Turn help menu into parameters menu.</a><span class='msg-avail'>...</span></td><td>Mathieu Othacehe</td></tr>
<tr><td><span title='2020-04-06 15:06:03 +0200'>2020-04-06</span></td><td><a href='/guix/commit/gnu/installer/record.scm?id=786c9c39bc0826737e99f0c750ea30033cdbc202'>installer: Add a help page.</a><span class='msg-avail'>...</span></td><td>Mathieu Othacehe</td></tr>