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=2d8eea832b6072ca1b9494e578998a6f7cfc9e2f'>root</a>/<a href='/guix/log/gnu?id=2d8eea832b6072ca1b9494e578998a6f7cfc9e2f'>gnu</a>/<a href='/guix/log/gnu/build?id=2d8eea832b6072ca1b9494e578998a6f7cfc9e2f'>build</a>/<a href='/guix/log/gnu/build/activation.scm?id=2d8eea832b6072ca1b9494e578998a6f7cfc9e2f'>activation.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/build/activation.scm?id=2d8eea832b6072ca1b9494e578998a6f7cfc9e2f&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2022-12-17 17:08:50 +0100'>2022-12-17</span></td><td><a href='/guix/commit/gnu/build/activation.scm?id=4d94cdf69889043dd8d9b1305f5f3946ec0f8ff6'>activation: Firmware activation handles missing support in kernel.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/build/activation.scm (activate-firmware): Check if firmware loading is
enabled before attempting to use it.
</span></span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2022-03-01 10:30:17 -0500'>2022-03-01</span></td><td><a href='/guix/commit/gnu/build/activation.scm?id=0dc019e19a23fea614be5623360849ab9bc35e74'>initrd: Use non-hyphenated kernel command-line parameter names.</a><span class='msg-avail'>...<span class='msg-tooltip'>This is to make it less surprising, given the common convention sets forth by
the kernel Linux command-line parameters.

* gnu/build/linux-boot.scm (boot-system): Rename '--load', '--repl', '--root'
and '--system' to 'gnu.load', 'gnu.repl', 'root' and 'gnu.system',
respectively.  Adjust doc.
(find-long-option): Adjust doc.
* gnu/installer/parted.scm (installer-root-partition-path): Adjust accordingly.
* gnu/system.scm (bootable-kernel-arguments): Add a VERSION argument and
update doc.  Use VERSION to conditionally return old style vs new style initrd
arguments.
(%boot-parameters-version): Increment to 1.
(operating-system-boot-parameters): Adjust doc.
(operating-system-boot-parameters-file): Likewise.
* gnu/system/linux-initrd.scm (raw-initrd, base-initrd): Likewise.
* doc/guix.texi: Adjust doc.
* gnu/build/activation.scm (boot-time-system): Adjust accordingly.
* gnu/build/hurd-boot.scm (boot-hurd-system): Likewise.
* gnu/packages/commencement.scm (%final-inputs-riscv64): Adjust comment.
</span></span></td><td>Maxim Cournoyer</td></tr>
<tr><td><span title='2021-07-29 11:32:08 -0400'>2021-07-29</span></td><td><a href='/guix/commit/gnu/build/activation.scm?id=a7ac19851baab3fbcc40c4b2cf5b00a6ac9cd2f3'>services: setuid: More configurable setuid support.</a><span class='msg-avail'>...<span class='msg-tooltip'>New record &lt;setuid-program&gt; with fields for setting the specific user
and group, as well as specifically selecting the setuid and setgid bits,
for a program within the setuid-program-service.

* gnu/services.scm (setuid-program-file-like-deprecated): New function.
  (setuid-program-service-type): Make use of
  setuid-program-&gt;activation-gexp.  Adjust the extend property to handle
  &lt;setuid-program&gt;.
* gnu/build/activation.scm (activate-setuid-programs): Update to expect a
  &lt;setuid-record&gt; list for each program entry.
* gnu/system.scm: (operating-system-setuid-programs): Renamed to
  %operating-system-setuid-programs and replace it with new procedure.
  (operating-system-default-essential-services,
  hurd-default-essential-services): Replace
  operating-system-setuid-programs with
  %operating-system-setuid-programs.
* gnu/system/setuid.scm: New file.
* doc/guix.texi (Setuid Programs): Document &lt;setuid-program&gt;.

Co-authored-by: Brice Waegeneire &lt;brice@waegenei.re&gt;
</span></span></td><td>Chris Lemmer-Webber</td></tr>