dhall: BREAKING CHANGE update dhall config for 1.33+ compatibility

Since dhall 1.33.0 lang version the `Optional/fold` function is
removed from the language and can be replaced by the usage of the
`merge` function which now works on Optional values 🎉 since 1.29

https://github.com/dhall-lang/dhall-haskell/pull/1608

This new code is thus not compatible with versions of dhall
<1.29.0 (due to the new feature of the `merge` fonction).

diff --git a/.travis.yml b/.travis.yml
index 14ab868b529eae5894a46235d4d8934a6757c3b3..99c10c595d9cce9f6403c112c9513c241b6e900c 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,7 @@ install:
 
   # Install ansible
   - nix-env -i python3 ansible ansible-lint
-  - nix-env -if ./dhall-1.26.1.nix
+  - nix-env -if ./dhall-1.34.0.nix
 
   # Check ansible version
   - ansible --version

diff --git a/dhall-1.26.1.nix b/dhall-1.34.0.nix
similarity index 87%
rename from dhall-1.26.1.nix
rename to dhall-1.34.0.nix
index 918a528a197ee1942ea3490c9ad3fdac850b0d74..a70d201f47ccfae3c5517f0b2343d2638dc5d6a1 100644 (file)
--- a/dhall-1.26.1.nix
+++ b/dhall-1.34.0.nix
@@ -19,4 +19,4 @@ let
         '';
       };
 in
-  mkVersion "1.26.1" "0sl4r3mfairgd6kn26hs1r1lkh8rn992grd73078rhqf5w90ag05"
+  mkVersion "1.34.0" "0n64jkgbv7a3cmlv3gxpgc11p9b5w0k9nc0zm9am2pzmp6vm6b4n"

diff --git a/dhall/server/service/plugin/correlationId.dhall b/dhall/server/service/plugin/correlationId.dhall
index d5d592860d0db6134576c57aa2fa40a5df22c08a..41c572098cfe26805366f3cd391a781fd0174984 100644 (file)
--- a/dhall/server/service/plugin/correlationId.dhall
+++ b/dhall/server/service/plugin/correlationId.dhall
@@ -2,22 +2,16 @@ let Plugin = ./Plugin.dhall
 
 let config = ./Config.dhall
 
-in    λ(generator : Optional Text)
-    →   { name =
-            "correlation-id"
+in  λ(generator : Optional Text) →
+        { name = "correlation-id"
         , config =
             config.CorrelationId
-            { header_name =
-                "X-correl"
-            , echo_downstream =
-                True
-            , generator =
-                Optional/fold
-                Text
-                generator
-                Text
-                (λ(t : Text) → t)
-                "uuid#counter"
-            }
+              { header_name = "X-correl"
+              , echo_downstream = True
+              , generator =
+                  merge
+                    { None = "uuid#counter", Some = λ(x : Text) → x }
+                    generator
+              }
         }
       : Plugin