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

thor'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=b77a901e06dbaf62f59de8d148938276f9d73f71&amp;showmsg=1'>root</a>/<a href='/guix/log/gnu?id=b77a901e06dbaf62f59de8d148938276f9d73f71&amp;showmsg=1'>gnu</a>/<a href='/guix/log/gnu/system?id=b77a901e06dbaf62f59de8d148938276f9d73f71&amp;showmsg=1'>system</a>/<a href='/guix/log/gnu/system/file-systems.scm?id=b77a901e06dbaf62f59de8d148938276f9d73f71&amp;showmsg=1'>file-systems.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/system/file-systems.scm?id=b77a901e06dbaf62f59de8d148938276f9d73f71'>Collapse</a>)</th><th class='left'>Author</th></tr>
<tr class='logheader'><td><span title='2019-11-04 23:35:32 +0100'>2019-11-04</span></td><td class='logsubject'><a href='/guix/commit/gnu/system/file-systems.scm?id=625bdf09d344302ec2d5da7f35fe35ca1d128a93'>file-systems: Mount /var/run/nscd read-write in containers.</a></td><td>Ludovic Courtès</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
Fixes &lt;https://bugs.gnu.org/37967&gt;.
Reported by Ivan Vilata i Balaguer &lt;ivan@selidor.net&gt;.

* gnu/system/file-systems.scm (%network-file-mappings): Set 'writable?'
to #true for /var/run/nscd.


</td></tr>
<tr class='logheader'><td><span title='2019-09-12 23:07:42 +0200'>2019-09-12</span></td><td class='logsubject'><a href='/guix/commit/gnu/system/file-systems.scm?id=5ccec77176b7e0c67ed58c8849e5e76f3dd79a88'>file-systems: Add /var/run/nscd to '%network-file-mappings'.</a></td><td>Ludovic Courtès</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
This allows containers created by "guix environment -CN" or by
"guix system container -N" to talk to the host nscd.

* gnu/system/file-systems.scm (%network-file-mappings): Add
"/var/run/nscd".
* gnu/build/shepherd.scm (default-mounts)[nscd-socket]: Remove.
* gnu/system/linux-container.scm (container-script)[nscd-run-directory]
[nscd-mapping, nscd-os, nscd-specs]: Remove.
[script]: Filter out from SPECS bind-mounts where the device does not
exist.
* guix/scripts/environment.scm (launch-environment/container)
[optional-mapping-&gt;fs]: New procedure.
[mappings]: Remove %NETWORK-FILE-MAPPINGS.
[file-systems]: Add %NETWORK-FILE-MAPPINGS here, filtered through
'optional-mapping-&gt;fs'.


</td></tr>
<tr class='logheader'><td><span title='2019-07-19 11:53:47 +0200'>2019-07-19</span></td><td class='logsubject'><a href='/guix/commit/gnu/system/file-systems.scm?id=b41c7beb0b5b7a16656d6acf53f77eaf2a58e125'>file-systems: Use 'no-atime' for %IMMUTABLE-STORE.</a></td><td>Ludovic Courtès</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
* gnu/system/file-systems.scm (%immutable-store): Add 'no-atime'.


</td></tr>