Upgrade to Dhall 1.25 (#179)

* Upgrade to Dhall 1.25 * Sort record fields in golden test output. Dhall 1.25 has got better at forgetting record field order when we ask it to. This will produce better diffability.
dhall-lang · Aug 20, 2019 · 355ef9d · 355ef9d
1 parent 0f7304d
commit 355ef9d
Show file tree

Hide file tree

Showing 29 changed files with 263 additions and 123 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -2,6 +2,8 @@
 
 ## Next -- [YYYY-MM-DD]
 
+* Use `dhall` version 1.25.
+
 ## 1.3.4.0 -- 2019-07-05
 
 * Add compatibility for `optparse-applicative-0.15`.

diff --git a/MonadRandom.nix b/MonadRandom.nix
@@ -0,0 +1,15 @@
+{ mkDerivation, base, mtl, primitive, random, stdenv, transformers
+, transformers-compat
+}:
+mkDerivation {
+  pname = "MonadRandom";
+  version = "0.5.1.1";
+  sha256 = "abda4a297acf197e664695b839b4fb70f53e240f5420489dc21bcf6103958470";
+  revision = "3";
+  editedCabalFile = "0fiblwmwk48d1g9j99qrcg1ak904csgfb86y80d1nl2vr782cq6w";
+  libraryHaskellDepends = [
+    base mtl primitive random transformers transformers-compat
+  ];
+  description = "Random-number generation monad";
+  license = stdenv.lib.licenses.bsd3;
+}
diff --git a/base-orphans.nix b/base-orphans.nix
@@ -0,0 +1,14 @@
+{ mkDerivation, base, ghc-prim, hspec, hspec-discover, QuickCheck
+, stdenv
+}:
+mkDerivation {
+  pname = "base-orphans";
+  version = "0.8.1";
+  sha256 = "442bd63aed102e753b2fed15df8ae19f35ee07af26590da63837c523b64a99db";
+  libraryHaskellDepends = [ base ghc-prim ];
+  testHaskellDepends = [ base hspec QuickCheck ];
+  testToolDepends = [ hspec-discover ];
+  homepage = "https://github.com/haskell-compat/base-orphans#readme";
+  description = "Backwards-compatible orphan instances for base";
+  license = stdenv.lib.licenses.mit;
+}
diff --git a/dhall-to-cabal.cabal b/dhall-to-cabal.cabal
@@ -67,7 +67,7 @@ library
         bytestring ^>=0.10,
         containers ^>=0.5 || ^>=0.6,
         contravariant ^>=1.4 || ^>=1.5,
-        dhall ^>=1.24.0,
+        dhall ^>=1.25.0,
         filepath ^>=1.4,
         microlens ^>=0.1.0.0 || ^>=0.2.0.0 || ^>=0.3.0.0 || ^>=0.4.0.0,
         text ^>=1.2,
@@ -92,7 +92,7 @@ executable dhall-to-cabal
         Cabal ^>=2.4,
         base ^>=4.10 || ^>=4.11 || ^>=4.12,
         containers ^>=0.5 || ^>=0.6,
-        dhall ^>=1.24.0,
+        dhall ^>=1.25.0,
         dhall-to-cabal -any,
         directory ^>=1.3.0.2,
         filepath ^>=1.4,
@@ -118,7 +118,7 @@ executable cabal-to-dhall
                  -fno-warn-name-shadowing
     build-depends:
         base ^>=4.10 || ^>=4.11 || ^>=4.12,
-        dhall ^>=1.24.0,
+        dhall ^>=1.25.0,
         bytestring ^>=0.10,
         dhall-to-cabal -any,
         optparse-applicative ^>=0.13.2 || ^>=0.14 || ^>=0.15,
@@ -138,7 +138,7 @@ executable dhall-to-cabal-meta
     build-depends:
         base ^>=4.10 || ^>=4.11 || ^>=4.12,
         directory ^>=1.3.0.2,
-        dhall ^>=1.24.0,
+        dhall ^>=1.25.0,
         dhall-to-cabal -any,
         filepath ^>=1.4,
         optparse-applicative ^>=0.13.2 || ^>=0.14 || ^>=0.15,
@@ -159,7 +159,7 @@ test-suite golden-tests
         Cabal ^>=2.4,
         Diff ^>=0.3.4,
         bytestring ^>=0.10,
-        dhall ^>=1.24.0,
+        dhall ^>=1.25.0,
         dhall-to-cabal -any,
         filepath ^>=1.4,
         microlens ^>=0.1.0.0 || ^>=0.2.0.0 || ^>=0.3.0.0 || ^>=0.4.0.0,
@@ -183,7 +183,7 @@ test-suite unit-tests
     build-depends:
         base ^>=4.10 || ^>=4.11 || ^>=4.12,
         Cabal ^>=2.4,
-        dhall ^>=1.24.0,
+        dhall ^>=1.25.0,
         dhall-to-cabal -any,
         tasty ^>=0.11 || ^>=0.12 || ^>=1.0 || ^>=1.1 || ^>=1.2,
         tasty-hunit ^>=0.10.0.1,

diff --git a/dhall-to-cabal.dhall b/dhall-to-cabal.dhall
@@ -27,7 +27,7 @@ let deps =
       , directory =
           majorVersions "directory" [ v "1.3.0.2" ]
       , dhall =
-          majorVersions "dhall" [ v "1.24.0" ]
+          majorVersions "dhall" [ v "1.25.0" ]
       , dhall-to-cabal =
           package "dhall-to-cabal" anyVersion
       , filepath =

diff --git a/dhall.nix b/dhall.nix
@@ -1,40 +1,41 @@
 { mkDerivation, aeson, aeson-pretty, ansi-terminal, base
 , bytestring, case-insensitive, cborg, cborg-json, containers
-, contravariant, criterion, cryptonite, deepseq, Diff, directory
-, doctest, dotgen, exceptions, filepath, foldl, haskeline
+, contravariant, cryptonite, deepseq, Diff, directory, doctest
+, dotgen, either, exceptions, filepath, foldl, gauge, haskeline
 , http-client, http-client-tls, http-types, lens-family-core
 , megaparsec, memory, mockery, mtl, optparse-applicative, parsers
 , prettyprinter, prettyprinter-ansi-terminal, profunctors
-, QuickCheck, quickcheck-instances, repline, scientific, serialise
-, stdenv, tasty, tasty-hunit, tasty-quickcheck, template-haskell
-, text, transformers, transformers-compat, turtle
-, unordered-containers, uri-encode, vector
+, QuickCheck, quickcheck-instances, repline, scientific, semigroups
+, serialise, spoon, stdenv, tasty, tasty-hunit, tasty-quickcheck
+, template-haskell, text, th-lift-instances, transformers
+, transformers-compat, turtle, unordered-containers, uri-encode
+, vector
 }:
 mkDerivation {
   pname = "dhall";
-  version = "1.24.0";
-  sha256 = "67ff6ff2bcd3c3fed0a598f8038f62a18676a419f7f7773a07804a5cc89404d8";
+  version = "1.25.0";
+  sha256 = "10604f648af61bd5ea784769cfe2ff1518a32e7e4e22615e9cbe6fae1ce91835";
   isLibrary = true;
   isExecutable = true;
   libraryHaskellDepends = [
     aeson aeson-pretty ansi-terminal base bytestring case-insensitive
-    cborg cborg-json containers contravariant cryptonite Diff directory
-    dotgen exceptions filepath haskeline http-client http-client-tls
-    http-types lens-family-core megaparsec memory mtl
+    cborg cborg-json containers contravariant cryptonite deepseq Diff
+    directory dotgen either exceptions filepath haskeline http-client
+    http-client-tls http-types lens-family-core megaparsec memory mtl
     optparse-applicative parsers prettyprinter
     prettyprinter-ansi-terminal profunctors repline scientific
-    serialise template-haskell text transformers transformers-compat
-    unordered-containers uri-encode vector
+    serialise template-haskell text th-lift-instances transformers
+    transformers-compat unordered-containers uri-encode vector
   ];
   executableHaskellDepends = [ base ];
   testHaskellDepends = [
     base bytestring cborg containers deepseq directory doctest filepath
-    foldl megaparsec mockery prettyprinter QuickCheck
-    quickcheck-instances serialise tasty tasty-hunit tasty-quickcheck
-    text transformers turtle vector
+    foldl lens-family-core megaparsec mockery prettyprinter QuickCheck
+    quickcheck-instances semigroups serialise spoon tasty tasty-hunit
+    tasty-quickcheck text transformers turtle vector
   ];
   benchmarkHaskellDepends = [
-    base bytestring containers criterion directory serialise text
+    base bytestring containers directory gauge serialise text
   ];
   description = "A configuration language guaranteed to terminate";
   license = stdenv.lib.licenses.bsd3;

diff --git a/either.nix b/either.nix
@@ -0,0 +1,17 @@
+{ mkDerivation, base, bifunctors, mtl, profunctors, QuickCheck
+, semigroupoids, stdenv, test-framework, test-framework-quickcheck2
+}:
+mkDerivation {
+  pname = "either";
+  version = "5.0.1.1";
+  sha256 = "0243d51d6a02ecb541e4854a588a9b6219a4690ebcbdb79387dd14ad519cdf27";
+  libraryHaskellDepends = [
+    base bifunctors mtl profunctors semigroupoids
+  ];
+  testHaskellDepends = [
+    base QuickCheck test-framework test-framework-quickcheck2
+  ];
+  homepage = "http://github.com/ekmett/either/";
+  description = "Combinators for working with sums";
+  license = stdenv.lib.licenses.bsd3;
+}
diff --git a/golden-tests/cabal-to-dhall/SPDX.dhall b/golden-tests/cabal-to-dhall/SPDX.dhall
@@ -3,11 +3,7 @@ let prelude = ./../../dhall/prelude.dhall
 let types = ./../../dhall/types.dhall
 
 in    prelude.defaults.Package
-    ⫽ { name =
-          "foo"
-      , version =
-          prelude.v "0"
-      , license =
+    ⫽ { license =
           types.License.SPDX
           ( prelude.SPDX.and
             ( prelude.SPDX.or
@@ -32,4 +28,8 @@ in    prelude.defaults.Package
               )
             )
           )
-      }
+      , name =
+          "foo"
+      , version =
+          prelude.v "0"
+      }
diff --git a/golden-tests/cabal-to-dhall/benchmark.dhall b/golden-tests/cabal-to-dhall/benchmark.dhall
@@ -3,24 +3,24 @@ let prelude = ./../../dhall/prelude.dhall
 let types = ./../../dhall/types.dhall
 
 in    prelude.defaults.Package
-    ⫽ { name =
-          "blah"
-      , version =
-          prelude.v "1"
-      , benchmarks =
+    ⫽ { benchmarks =
           [ { benchmark =
                   λ(config : types.Config)
                 →   prelude.defaults.Benchmark
-                  ⫽ { main-is =
-                        "Main.hs"
-                    , compiler-options =
+                  ⫽ { compiler-options =
                           prelude.defaults.CompilerOptions
                         ⫽ { GHC = [ "-O2" ] : List Text }
+                    , main-is =
+                        "Main.hs"
                     }
             , name =
                 "fancy-benchmark"
             }
           ]
       , cabal-version =
           prelude.v "2.0"
-      }
+      , name =
+          "blah"
+      , version =
+          prelude.v "1"
+      }
diff --git a/golden-tests/cabal-to-dhall/conditional-dependencies.dhall b/golden-tests/cabal-to-dhall/conditional-dependencies.dhall
@@ -3,11 +3,7 @@ let prelude = ./../../dhall/prelude.dhall
 let types = ./../../dhall/types.dhall
 
 in    prelude.defaults.Package
-    ⫽ { name =
-          "Name"
-      , version =
-          prelude.v "1"
-      , cabal-version =
+    ⫽ { cabal-version =
           prelude.v "2.0"
       , library =
           Some
@@ -62,4 +58,8 @@ in    prelude.defaults.Package
           )
       , license =
           types.License.Unspecified
-      }
+      , name =
+          "Name"
+      , version =
+          prelude.v "1"
+      }
diff --git a/golden-tests/cabal-to-dhall/executable.dhall b/golden-tests/cabal-to-dhall/executable.dhall
@@ -3,11 +3,7 @@ let prelude = ./../../dhall/prelude.dhall
 let types = ./../../dhall/types.dhall
 
 in    prelude.defaults.Package
-    ⫽ { name =
-          "blah"
-      , version =
-          prelude.v "1"
-      , cabal-version =
+    ⫽ { cabal-version =
           prelude.v "2.0"
       , executables =
           [ { executable =
@@ -17,4 +13,8 @@ in    prelude.defaults.Package
                 "hello"
             }
           ]
-      }
+      , name =
+          "blah"
+      , version =
+          prelude.v "1"
+      }
diff --git a/golden-tests/cabal-to-dhall/gh-36.dhall b/golden-tests/cabal-to-dhall/gh-36.dhall
@@ -3,10 +3,8 @@ let prelude = ./../../dhall/prelude.dhall
 let types = ./../../dhall/types.dhall
 
 in    prelude.defaults.Package
-    ⫽ { name =
-          "wai-servlet"
-      , version =
-          prelude.v "0.1.5.0"
+    ⫽ { cabal-version =
+          prelude.v "2.0"
       , flags =
           [ { default =
                 False
@@ -18,8 +16,6 @@ in    prelude.defaults.Package
                 "wai-servlet-debug"
             }
           ]
-      , cabal-version =
-          prelude.v "2.0"
       , library =
           Some
           (   λ(config : types.Config)
@@ -173,4 +169,8 @@ in    prelude.defaults.Package
 
               else  prelude.defaults.Library
           )
-      }
+      , name =
+          "wai-servlet"
+      , version =
+          prelude.v "0.1.5.0"
+      }
diff --git a/golden-tests/cabal-to-dhall/mixins-no-signatures.dhall b/golden-tests/cabal-to-dhall/mixins-no-signatures.dhall
@@ -3,11 +3,7 @@ let prelude = ./../../dhall/prelude.dhall
 let types = ./../../dhall/types.dhall
 
 in    prelude.defaults.Package
-    ⫽ { name =
-          "mixins-test"
-      , version =
-          prelude.v "0"
-      , library =
+    ⫽ { library =
           Some
           (   λ(config : types.Config)
             →   prelude.defaults.Library
@@ -51,4 +47,8 @@ in    prelude.defaults.Package
                     ]
                 }
           )
-      }
+      , name =
+          "mixins-test"
+      , version =
+          prelude.v "0"
+      }
diff --git a/golden-tests/cabal-to-dhall/otheros.dhall b/golden-tests/cabal-to-dhall/otheros.dhall
@@ -3,11 +3,7 @@ let prelude = ./../../dhall/prelude.dhall
 let types = ./../../dhall/types.dhall
 
 in    prelude.defaults.Package
-    ⫽ { name =
-          "test"
-      , version =
-          prelude.v "0"
-      , cabal-version =
+    ⫽ { cabal-version =
           prelude.v "2.0"
       , library =
           Some
@@ -19,4 +15,8 @@ in    prelude.defaults.Package
 
               else  prelude.defaults.Library ⫽ { exposed-modules = [ "A" ] }
           )
-      }
+      , name =
+          "test"
+      , version =
+          prelude.v "0"
+      }
diff --git a/golden-tests/cabal-to-dhall/repotypeunknown.dhall b/golden-tests/cabal-to-dhall/repotypeunknown.dhall
@@ -3,20 +3,20 @@ let prelude = ./../../dhall/prelude.dhall
 let types = ./../../dhall/types.dhall
 
 in    prelude.defaults.Package
-    ⫽ { name =
-          "foo"
-      , version =
-          prelude.v "2"
-      , cabal-version =
+    ⫽ { cabal-version =
           prelude.v "2.4"
+      , name =
+          "foo"
       , source-repos =
           [   prelude.defaults.SourceRepo
-            ⫽ { type =
-                  Some types.RepoType.Git
+            ⫽ { kind =
+                  types.RepoKind.RepoKindUnknown { _1 = "blargh" }
               , location =
                   Some "https://example.com"
-              , kind =
-                  types.RepoKind.RepoKindUnknown { _1 = "blargh" }
+              , type =
+                  Some types.RepoType.Git
               }
           ]
+      , version =
+          prelude.v "2"
       }