gnu: ocaml5: Update most ocaml5.3 package prefixes to ocaml5.4.

This is a non-functional change; switching to the 5.4 compiler happens in the
next commit.

* gnu/packages/ocaml5.scm (ocaml5.3-dune-bootstrap)
(ocaml5.3-dune-configurator, ocaml5.3-dune, ocaml5.3-findlib): Rename variable
with `ocaml5.4` prefix.
* guix/build-system/ocaml.scm: (strip-ocaml5.3-variant)
(default-ocaml5.3-findlib, default-ocaml5.3-dune): Rename variable with
`ocaml5.4` prefix.
(package-with-ocaml5.3): Rename variable with `ocaml5.4` prefix. Search for `ocaml5.4`
package variant.

Change-Id: I39b5138001f09d40046b4d2d52e4570b5a6ca0a1
Signed-off-by: Julien Lepiller <julien@lepiller.eu>

3 files changed, 45 insertions, 45 deletions

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 7d3d7975ff3..a56a64bf317 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -1951,7 +1951,7 @@ Descriptions of projects, libraries and executables are provided in
      (list ocaml-csexp))
     (properties `((ocaml4.09-variant . ,(delay ocaml4.09-dune-configurator))
                   (ocaml5.0-variant . ,(delay ocaml5.0-dune-configurator))
-                  (ocaml5.3-variant . ,(delay ocaml5:ocaml5.3-dune-configurator))))
+                  (ocaml5.4-variant . ,(delay ocaml5:ocaml5.4-dune-configurator))))
     (synopsis "Dune helper library for gathering system configuration")
     (description "Dune-configurator is a small library that helps writing
 OCaml scripts that test features available on the system, in order to generate
@@ -1995,7 +1995,7 @@ config.h files for instance.  Among other things, dune-configurator allows one t
     (properties `((ocaml4.07-variant . ,(delay ocaml4.07-dune))
                   (ocaml4.09-variant . ,(delay ocaml4.09-dune))
                   (ocaml5.0-variant . ,(delay ocaml5.0-dune))
-                  (ocaml5.3-variant . ,(delay ocaml5:ocaml5.3-dune))))))
+                  (ocaml5.4-variant . ,(delay ocaml5:ocaml5.4-dune))))))
 
 (define-public ocaml4.09-dune
   (package
@@ -2149,7 +2149,7 @@ executables and libraries")))
      (list ocaml-result))
     (properties `((ocaml4.09-variant . ,(delay ocaml4.09-csexp))
                   (ocaml5.0-variant . ,(delay ocaml5.0-csexp))
-                  (ocaml5.3-variant . ,(delay ocaml5:ocaml5.3-csexp))))
+                  (ocaml5.4-variant . ,(delay ocaml5:ocaml5.4-csexp))))
     (home-page "https://github.com/ocaml-dune/csexp")
     (synopsis "Parsing and printing of S-expressions in Canonical form")
     (description "This library provides minimal support for Canonical
@@ -2310,7 +2310,7 @@ bitsrings in Erlang style as primitives to the language.")))
      `(#:dune ,dune-bootstrap))
     (properties `((ocaml4.09-variant . ,(delay ocaml4.09-result))
                   (ocaml5.0-variant . ,(delay ocaml5.0-result))
-                  (ocaml5.3-variant . ,(delay ocaml5:ocaml5.3-result))))
+                  (ocaml5.4-variant . ,(delay ocaml5:ocaml5.4-result))))
     (home-page "https://github.com/janestreet/result")
     (synopsis "Compatibility Result module")
     (description "Uses the new result type defined in OCaml >= 4.03 while
diff --git a/gnu/packages/ocaml5.scm b/gnu/packages/ocaml5.scm
index 809eaf38479..bfda6247317 100644
--- a/gnu/packages/ocaml5.scm
+++ b/gnu/packages/ocaml5.scm
@@ -254,9 +254,9 @@ the opam file format.")
     ;; With static-linking exception
     (license license:lgpl2.1+)))
 
-(define-public ocaml5.3-result
+(define-public ocaml5.4-result
   (package
-    (name "ocaml5.3-result")
+    (name "ocaml5.4-result")
     (version "1.5")
     (source
      (origin
@@ -269,7 +269,7 @@ the opam file format.")
         (base32 "166laj8qk7466sdl037c6cjs4ac571hglw4l5qpyll6df07h6a7q"))))
     (build-system dune-build-system)
     (arguments
-     `(#:dune ,ocaml5.3-dune-bootstrap))
+     `(#:dune ,ocaml5.4-dune-bootstrap))
     (home-page "https://github.com/janestreet/result")
     (synopsis "Compatibility Result module")
     (description
@@ -280,7 +280,7 @@ defined in this library.")
 
 ;; Use this version of `ocaml-result` for packages built with the default
 ;; ocaml 5.x compiler.
-(define-public ocaml-result ocaml5.3-result)
+(define-public ocaml-result ocaml5.4-result)
 
 (define-public ocaml-topkg
   (package
@@ -1420,10 +1420,10 @@ Descriptions of projects, libraries and executables are provided in
 @file{dune} files following an s-expression syntax.")
     (license license:expat)))
 
-(define-public ocaml5.3-dune-bootstrap
+(define-public ocaml5.4-dune-bootstrap
   (package
     (inherit %dune-base)
-    (name "ocaml5.3-dune")
+    (name "ocaml5.4-dune")
     (build-system ocaml-build-system)
     (arguments
      `(#:tests? #f; require odoc
@@ -1441,20 +1441,20 @@ Descriptions of projects, libraries and executables are provided in
     (properties '((hidden? . #t)))))
 
 ;; Use this alias for packages built with the default ocaml 5.x compiler.
-(define-public dune ocaml5.3-dune-bootstrap)
+(define-public dune ocaml5.4-dune-bootstrap)
 
 (define-public ocaml5.0-dune-bootstrap
   (package
-    (inherit ocaml5.3-dune-bootstrap)
+    (inherit ocaml5.4-dune-bootstrap)
     (name "ocaml5.0-dune-bootstrap")
     (arguments
-     `(,@(package-arguments ocaml5.3-dune-bootstrap)
+     `(,@(package-arguments ocaml5.4-dune-bootstrap)
        #:ocaml ,ocaml-5.0
        #:findlib ,ocaml5.0-findlib))))
 
-(define-public ocaml5.3-csexp
+(define-public ocaml5.4-csexp
   (package
-    (name "ocaml5.3-csexp")
+    (name "ocaml5.4-csexp")
     (version "1.5.2")
     (source
      (origin
@@ -1468,14 +1468,14 @@ Descriptions of projects, libraries and executables are provided in
     (build-system dune-build-system)
     (arguments
      `(#:tests? #f ;FIXME: needs ppx_expect, but which version?
-       #:dune ,ocaml5.3-dune-bootstrap
+       #:dune ,ocaml5.4-dune-bootstrap
        #:phases (modify-phases %standard-phases
                   (add-before 'build 'chmod
                     (lambda _
                       (for-each (lambda (file)
                                   (chmod file #o644))
                                 (find-files "." ".*")) #t)))))
-    (propagated-inputs (list ocaml5.3-result))
+    (propagated-inputs (list ocaml5.4-result))
     (home-page "https://github.com/ocaml-dune/csexp")
     (synopsis "Parsing and printing of S-expressions in Canonical form")
     (description
@@ -1494,7 +1494,7 @@ module of this library is parameterised by the type of S-expressions.")
     (license license:expat)))
 
 ;; Use this alias for packages built with the default ocaml 5.x compiler.
-(define-public ocaml-csexp ocaml5.3-csexp)
+(define-public ocaml-csexp ocaml5.4-csexp)
 
 ;; Base package for all libraries (not the binary) hosted in the main dune
 ;; repo.
@@ -1520,16 +1520,16 @@ module of this library is parameterised by the type of S-expressions.")
             (lambda _
               (delete-file-recursively "vendor"))))))))
 
-(define-public ocaml5.3-dune-configurator
+(define-public ocaml5.4-dune-configurator
   (package
     (inherit %dune-lib-base)
-    (name "ocaml5.3-dune-configurator")
+    (name "ocaml5.4-dune-configurator")
     (build-system dune-build-system)
     (arguments
      (substitute-keyword-arguments (package-arguments %dune-lib-base)
        ((#:package _ #f) "dune-configurator")
-       ((#:dune _ #f) ocaml5.3-dune-bootstrap)))
-    (propagated-inputs (list ocaml5.3-csexp))
+       ((#:dune _ #f) ocaml5.4-dune-bootstrap)))
+    (propagated-inputs (list ocaml5.4-csexp))
     (synopsis "Dune helper library for gathering system configuration")
     (description
      "Dune-configurator is a small library that helps writing
@@ -1545,17 +1545,17 @@ config.h files for instance.  Among other things, dune-configurator allows one t
 
 ;; Use this version of `dune-configurator` for packages built with the default
 ;; ocaml 5.x compiler.
-(define-public dune-configurator ocaml5.3-dune-configurator)
+(define-public dune-configurator ocaml5.4-dune-configurator)
 
-(define-public ocaml5.3-dune
+(define-public ocaml5.4-dune
   (package
-    (inherit ocaml5.3-dune-bootstrap)
-    (propagated-inputs (list ocaml5.3-dune-configurator))
+    (inherit ocaml5.4-dune-bootstrap)
+    (propagated-inputs (list ocaml5.4-dune-configurator))
     (properties '())))
 
-(define-public ocaml5.3-findlib
+(define-public ocaml5.4-findlib
   (package
-    (name "ocaml5.3-findlib")
+    (name "ocaml5.4-findlib")
     (version "1.9.8")
     (source
      (origin
@@ -1609,7 +1609,7 @@ compilers that can directly deal with packages.")
 
 (define-public ocaml5.0-findlib
   (package
-    (inherit ocaml5.3-findlib)
+    (inherit ocaml5.4-findlib)
     (name "ocaml5.0-findlib")
     (native-inputs
      (list m4 ocaml-5.0))))
diff --git a/guix/build-system/ocaml.scm b/guix/build-system/ocaml.scm
index 88b3f6bf9e1..ff3df00c5a6 100644
--- a/guix/build-system/ocaml.scm
+++ b/guix/build-system/ocaml.scm
@@ -34,8 +34,8 @@
             strip-ocaml4.09-variant
             package-with-ocaml5.0
             strip-ocaml5.0-variant
-            package-with-ocaml5.3
-            strip-ocaml5.3-variant
+            package-with-ocaml5.4
+            strip-ocaml5.4-variant
             default-findlib
             default-ocaml
             default-dune
@@ -133,19 +133,19 @@
 (define (default-ocaml5.3)
   (@* (gnu packages ocaml5) ocaml-5.3))
 
-(define (default-ocaml5.3-findlib)
-  (@* (gnu packages ocaml5) ocaml5.3-findlib))
+(define (default-ocaml5.4-findlib)
+  (@* (gnu packages ocaml5) ocaml5.4-findlib))
 
-(define (default-ocaml5.3-dune)
-  (@* (gnu packages ocaml5) ocaml5.3-dune))
+(define (default-ocaml5.4-dune)
+  (@* (gnu packages ocaml5) ocaml5.4-dune))
 
 ;; The default versions of core packages within the 5.x series.
 
 (define default-ocaml5 default-ocaml5.3)
 
-(define default-ocaml5-findlib default-ocaml5.3-findlib)
+(define default-ocaml5-findlib default-ocaml5.4-findlib)
 
-(define default-ocaml5-dune default-ocaml5.3-dune)
+(define default-ocaml5-dune default-ocaml5.4-dune)
 
 (define* (package-with-explicit-ocaml ocaml findlib dune old-prefix new-prefix
                                        #:key variant-property)
@@ -251,18 +251,18 @@ pre-defined variants."
     (inherit p)
     (properties (alist-delete 'ocaml5.0-variant (package-properties p)))))
 
-(define package-with-ocaml5.3
+(define package-with-ocaml5.4
   (package-with-explicit-ocaml (delay (default-ocaml5.3))
-                               (delay (default-ocaml5.3-findlib))
-                               (delay (default-ocaml5.3-dune))
-                               "ocaml-" "ocaml5.3-"
-                               #:variant-property 'ocaml5.3-variant))
+                               (delay (default-ocaml5.4-findlib))
+                               (delay (default-ocaml5.4-dune))
+                               "ocaml-" "ocaml5.4-"
+                               #:variant-property 'ocaml5.4-variant))
 
-(define (strip-ocaml5.3-variant p)
-  "Remove the 'ocaml5.3-variant' property from P."
+(define (strip-ocaml5.4-variant p)
+  "Remove the 'ocaml5.4-variant' property from P."
   (package
     (inherit p)
-    (properties (alist-delete 'ocaml5.3-variant (package-properties p)))))
+    (properties (alist-delete 'ocaml5.4-variant (package-properties p)))))
 
 (define (make-lower default-ocaml default-findlib)
   (lambda* (name