Use hpack-0.36.0 in tests

- Regenerate .cabal files - Regenerate .yaml files - Regenerate .cabal.golden files - Normalize file endings in golden tests
cabalism · Jun 4, 2024 · c67a9c4 · c67a9c4
1 parent 70e940d
commit c67a9c4
Show file tree

Hide file tree

Showing 48 changed files with 48 additions and 60 deletions.
diff --git a/test-suite-golden/test-files/key/empty-inferred/empty-inferred.cabal b/test-suite-golden/test-files/key/empty-inferred/empty-inferred.cabal
@@ -1,10 +1,8 @@
 cabal-version: 1.12
 
--- This file has been generated from package.dhall by hpack version 0.31.0.
+-- This file has been generated from package.dhall by hpack version 0.36.0.
 --
 -- see: https://github.com/sol/hpack
---
--- hash: 9f10239d716ef4564587e29b36c0e3b74056721733790211e20061a86a0feb53
 
 name:           empty-inferred
 version:        0.0.0

diff --git a/test-suite-golden/test-files/key/empty-inferred/empty-inferred.cabal.golden b/test-suite-golden/test-files/key/empty-inferred/empty-inferred.cabal.golden
@@ -1,10 +1,8 @@
 cabal-version: 1.12
 
--- This file has been generated from package.dhall by hpack version 0.31.0.
+-- This file has been generated from package.dhall by hpack version 0.36.0.
 --
 -- see: https://github.com/sol/hpack
---
--- hash: 9f10239d716ef4564587e29b36c0e3b74056721733790211e20061a86a0feb53
 
 name:           empty-inferred
 version:        0.0.0

diff --git a/test-suite-golden/test-files/key/empty-inferred/package.json.golden b/test-suite-golden/test-files/key/empty-inferred/package.json.golden
@@ -1 +1 @@
-{}
+{}
diff --git a/test-suite-golden/test-files/key/empty-inferred/package.yaml b/test-suite-golden/test-files/key/empty-inferred/package.yaml
@@ -1 +1,2 @@
 {}
+
diff --git a/test-suite-golden/test-files/key/empty-inferred/package.yaml.cabal b/test-suite-golden/test-files/key/empty-inferred/package.yaml.cabal
@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.35.0.
+-- This file has been generated from package.yaml by hpack version 0.36.0.
 --
 -- see: https://github.com/sol/hpack
 

diff --git a/test-suite-golden/test-files/key/empty-inferred/package.yaml.golden b/test-suite-golden/test-files/key/empty-inferred/package.yaml.golden
@@ -1 +1,2 @@
 {}
+
diff --git a/test-suite-golden/test-files/key/empty-package.cabal b/test-suite-golden/test-files/key/empty-package.cabal
@@ -1,10 +1,8 @@
 cabal-version: 1.12
 
--- This file has been generated from empty-package.dhall by hpack version 0.31.0.
+-- This file has been generated from empty-package.dhall by hpack version 0.36.0.
 --
 -- see: https://github.com/sol/hpack
---
--- hash: e0a74f511d829cae53cd712664781db312951dd773249603163ba1b1e32afd04
 
 name:           empty-package
 version:        0.0.0

diff --git a/test-suite-golden/test-files/key/empty-package.cabal.golden b/test-suite-golden/test-files/key/empty-package.cabal.golden
@@ -1,10 +1,8 @@
 cabal-version: 1.12
 
--- This file has been generated from empty-package.dhall by hpack version 0.31.0.
+-- This file has been generated from empty-package.dhall by hpack version 0.36.0.
 --
 -- see: https://github.com/sol/hpack
---
--- hash: e0a74f511d829cae53cd712664781db312951dd773249603163ba1b1e32afd04
 
 name:           empty-package
 version:        0.0.0

diff --git a/test-suite-golden/test-files/key/empty-package.json.golden b/test-suite-golden/test-files/key/empty-package.json.golden
@@ -1,3 +1,3 @@
 {
     "name": "empty-package"
-}
+}
diff --git a/test-suite-golden/test-files/key/empty-package.yaml b/test-suite-golden/test-files/key/empty-package.yaml
@@ -1 +1,2 @@
 name: empty-package
+
diff --git a/test-suite-golden/test-files/key/empty-package.yaml.cabal b/test-suite-golden/test-files/key/empty-package.yaml.cabal
@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from empty-package.yaml by hpack version 0.35.0.
+-- This file has been generated from empty-package.yaml by hpack version 0.36.0.
 --
 -- see: https://github.com/sol/hpack
 

diff --git a/test-suite-golden/test-files/key/empty-package.yaml.golden b/test-suite-golden/test-files/key/empty-package.yaml.golden
@@ -1 +1,2 @@
 name: empty-package
+
diff --git a/test-suite-golden/test-files/key/import-local/import-local.cabal b/test-suite-golden/test-files/key/import-local/import-local.cabal
@@ -1,10 +1,8 @@
 cabal-version: 1.12
 
--- This file has been generated from package.dhall by hpack version 0.31.0.
+-- This file has been generated from package.dhall by hpack version 0.36.0.
 --
 -- see: https://github.com/sol/hpack
---
--- hash: fb3f09267f149cb49eb030ac951c27be9964aa0d51e91460e5b2d59ee1a5082f
 
 name:           import-local
 version:        0.0.0

diff --git a/test-suite-golden/test-files/key/import-local/import-local.cabal.golden b/test-suite-golden/test-files/key/import-local/import-local.cabal.golden
@@ -1,10 +1,8 @@
 cabal-version: 1.12
 
--- This file has been generated from package.dhall by hpack version 0.31.0.
+-- This file has been generated from package.dhall by hpack version 0.36.0.
 --
 -- see: https://github.com/sol/hpack
---
--- hash: fb3f09267f149cb49eb030ac951c27be9964aa0d51e91460e5b2d59ee1a5082f
 
 name:           import-local
 version:        0.0.0

diff --git a/test-suite-golden/test-files/key/import-local/package.json.golden b/test-suite-golden/test-files/key/import-local/package.json.golden
@@ -1,3 +1,3 @@
 {
     "name": "import-local"
-}
+}
diff --git a/test-suite-golden/test-files/key/import-local/package.yaml b/test-suite-golden/test-files/key/import-local/package.yaml
@@ -1 +1,2 @@
 name: import-local
+
diff --git a/test-suite-golden/test-files/key/import-local/package.yaml.cabal b/test-suite-golden/test-files/key/import-local/package.yaml.cabal
@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.35.0.
+-- This file has been generated from package.yaml by hpack version 0.36.0.
 --
 -- see: https://github.com/sol/hpack
 

diff --git a/test-suite-golden/test-files/key/import-local/package.yaml.golden b/test-suite-golden/test-files/key/import-local/package.yaml.golden
@@ -1 +1,2 @@
 name: import-local
+
diff --git a/test-suite-golden/test-files/key/import-relative/import-relative.cabal b/test-suite-golden/test-files/key/import-relative/import-relative.cabal
@@ -1,10 +1,8 @@
 cabal-version: 1.12
 
--- This file has been generated from package.dhall by hpack version 0.31.0.
+-- This file has been generated from package.dhall by hpack version 0.36.0.
 --
 -- see: https://github.com/sol/hpack
---
--- hash: 989056d21c3910e06ec15967716df134a39f43c561858afff828d22802a22005
 
 name:           import-relative
 version:        0.0.0

diff --git a/test-suite-golden/test-files/key/import-relative/import-relative.cabal.golden b/test-suite-golden/test-files/key/import-relative/import-relative.cabal.golden
@@ -1,10 +1,8 @@
 cabal-version: 1.12
 
--- This file has been generated from package.dhall by hpack version 0.31.0.
+-- This file has been generated from package.dhall by hpack version 0.36.0.
 --
 -- see: https://github.com/sol/hpack
---
--- hash: 989056d21c3910e06ec15967716df134a39f43c561858afff828d22802a22005
 
 name:           import-relative
 version:        0.0.0

diff --git a/test-suite-golden/test-files/key/import-relative/package.json.golden b/test-suite-golden/test-files/key/import-relative/package.json.golden
@@ -1,3 +1,3 @@
 {
     "name": "import-relative"
-}
+}
diff --git a/test-suite-golden/test-files/key/import-relative/package.yaml b/test-suite-golden/test-files/key/import-relative/package.yaml
@@ -1 +1,2 @@
 name: import-relative
+
diff --git a/test-suite-golden/test-files/key/import-relative/package.yaml.cabal b/test-suite-golden/test-files/key/import-relative/package.yaml.cabal
@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.35.0.
+-- This file has been generated from package.yaml by hpack version 0.36.0.
 --
 -- see: https://github.com/sol/hpack
 

diff --git a/test-suite-golden/test-files/key/import-relative/package.yaml.golden b/test-suite-golden/test-files/key/import-relative/package.yaml.golden
@@ -1 +1,2 @@
 name: import-relative
+
diff --git a/test-suite-golden/test-files/key/when-dependencies.cabal b/test-suite-golden/test-files/key/when-dependencies.cabal
@@ -1,10 +1,8 @@
 cabal-version: 1.12
 
--- This file has been generated from when-dependencies.dhall by hpack version 0.31.1.
+-- This file has been generated from when-dependencies.dhall by hpack version 0.36.0.
 --
 -- see: https://github.com/sol/hpack
---
--- hash: a1d315a919b697e7986a0c149715373427427e43104f82f05f394a439793907f
 
 name:           when-dependencies
 version:        0.0.0

diff --git a/test-suite-golden/test-files/key/when-dependencies.cabal.golden b/test-suite-golden/test-files/key/when-dependencies.cabal.golden
@@ -1,10 +1,8 @@
 cabal-version: 1.12
 
--- This file has been generated from when-dependencies.dhall by hpack version 0.31.1.
+-- This file has been generated from when-dependencies.dhall by hpack version 0.36.0.
 --
 -- see: https://github.com/sol/hpack
---
--- hash: a1d315a919b697e7986a0c149715373427427e43104f82f05f394a439793907f
 
 name:           when-dependencies
 version:        0.0.0

diff --git a/test-suite-golden/test-files/key/when-dependencies.json.golden b/test-suite-golden/test-files/key/when-dependencies.json.golden
@@ -15,4 +15,4 @@
             ]
         }
     }
-}
+}
diff --git a/test-suite-golden/test-files/key/when-dependencies.yaml b/test-suite-golden/test-files/key/when-dependencies.yaml
@@ -9,3 +9,4 @@ when:
     dependencies:
     - base == 4.*
     - yaml-pretty-extras
+
diff --git a/test-suite-golden/test-files/key/when-dependencies.yaml.cabal b/test-suite-golden/test-files/key/when-dependencies.yaml.cabal
@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from when-dependencies.yaml by hpack version 0.35.0.
+-- This file has been generated from when-dependencies.yaml by hpack version 0.36.0.
 --
 -- see: https://github.com/sol/hpack
 

diff --git a/test-suite-golden/test-files/key/when-dependencies.yaml.golden b/test-suite-golden/test-files/key/when-dependencies.yaml.golden
@@ -9,3 +9,4 @@ when:
     dependencies:
     - base == 4.*
     - yaml-pretty-extras
+
diff --git a/test-suite-golden/test-files/key/with-GHC2021.cabal b/test-suite-golden/test-files/key/with-GHC2021.cabal
@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from with-GHC2021.dhall by hpack version 0.34.6.
+-- This file has been generated from with-GHC2021.dhall by hpack version 0.36.0.
 --
 -- see: https://github.com/sol/hpack
 

diff --git a/test-suite-golden/test-files/key/with-GHC2021.cabal.golden b/test-suite-golden/test-files/key/with-GHC2021.cabal.golden
@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from with-GHC2021.dhall by hpack version 0.34.6.
+-- This file has been generated from with-GHC2021.dhall by hpack version 0.36.0.
 --
 -- see: https://github.com/sol/hpack
 

diff --git a/test-suite-golden/test-files/key/with-GHC2021.json.golden b/test-suite-golden/test-files/key/with-GHC2021.json.golden
@@ -52,4 +52,4 @@
         "main": "Main.hs",
         "source-dirs": "src"
     }
-}
+}
diff --git a/test-suite-golden/test-files/key/with-GHC2021.yaml b/test-suite-golden/test-files/key/with-GHC2021.yaml
@@ -49,3 +49,4 @@ default-extensions:
 executable:
   main: Main.hs
   source-dirs: src
+
diff --git a/test-suite-golden/test-files/key/with-GHC2021.yaml.cabal b/test-suite-golden/test-files/key/with-GHC2021.yaml.cabal
@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from with-GHC2021.yaml by hpack version 0.35.0.
+-- This file has been generated from with-GHC2021.yaml by hpack version 0.36.0.
 --
 -- see: https://github.com/sol/hpack
 

diff --git a/test-suite-golden/test-files/key/with-GHC2021.yaml.golden b/test-suite-golden/test-files/key/with-GHC2021.yaml.golden
@@ -49,3 +49,4 @@ default-extensions:
 executable:
   main: Main.hs
   source-dirs: src
+
diff --git a/test-suite-golden/test-files/real-world/hpack/hpack.cabal b/test-suite-golden/test-files/real-world/hpack/hpack.cabal
@@ -1,10 +1,8 @@
 cabal-version: 1.12
 
--- This file has been generated from hpack.dhall by hpack version 0.31.0.
+-- This file has been generated from hpack.dhall by hpack version 0.36.0.
 --
 -- see: https://github.com/sol/hpack
---
--- hash: 6233d5bc3d8cc3400d64ab30856182d4a593d9245bfdd5096e1287213cc3ae31
 
 name:           hpack
 version:        0.31.1

diff --git a/test-suite-golden/test-files/real-world/hpack/hpack.cabal.golden b/test-suite-golden/test-files/real-world/hpack/hpack.cabal.golden
@@ -1,10 +1,8 @@
 cabal-version: 1.12
 
--- This file has been generated from hpack.dhall by hpack version 0.31.0.
+-- This file has been generated from hpack.dhall by hpack version 0.36.0.
 --
 -- see: https://github.com/sol/hpack
---
--- hash: 6233d5bc3d8cc3400d64ab30856182d4a593d9245bfdd5096e1287213cc3ae31
 
 name:           hpack
 version:        0.31.1

diff --git a/test-suite-golden/test-files/real-world/hpack/hpack.json.golden b/test-suite-golden/test-files/real-world/hpack/hpack.json.golden
@@ -70,4 +70,4 @@
             "build-tools": "hspec-discover"
         }
     }
-}
+}
diff --git a/test-suite-golden/test-files/real-world/hpack/hpack.yaml b/test-suite-golden/test-files/real-world/hpack/hpack.yaml
@@ -59,3 +59,4 @@ tests:
     - template-haskell
     - HUnit >= 1.6.0.0
     build-tools: hspec-discover
+
diff --git a/test-suite-golden/test-files/real-world/hpack/hpack.yaml.cabal b/test-suite-golden/test-files/real-world/hpack/hpack.yaml.cabal
@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from hpack.yaml by hpack version 0.35.0.
+-- This file has been generated from hpack.yaml by hpack version 0.36.0.
 --
 -- see: https://github.com/sol/hpack
 

diff --git a/test-suite-golden/test-files/real-world/hpack/hpack.yaml.golden b/test-suite-golden/test-files/real-world/hpack/hpack.yaml.golden
@@ -59,3 +59,4 @@ tests:
     - template-haskell
     - HUnit >= 1.6.0.0
     build-tools: hspec-discover
+
diff --git a/test-suite-golden/test-files/real-world/stack/stack.cabal b/test-suite-golden/test-files/real-world/stack/stack.cabal
@@ -1,10 +1,8 @@
 cabal-version: 2.0
 
--- This file has been generated from stack.dhall by hpack version 0.35.0.
+-- This file has been generated from stack.dhall by hpack version 0.36.0.
 --
 -- see: https://github.com/sol/hpack
---
--- hash: 645c43bbed2e4ee44172441652f686f9df4f80fe34991062b018c2410e276567
 
 name:           stack
 version:        1.10.0

diff --git a/test-suite-golden/test-files/real-world/stack/stack.cabal.golden b/test-suite-golden/test-files/real-world/stack/stack.cabal.golden
@@ -1,10 +1,8 @@
 cabal-version: 2.0
 
--- This file has been generated from stack.dhall by hpack version 0.35.0.
+-- This file has been generated from stack.dhall by hpack version 0.36.0.
 --
 -- see: https://github.com/sol/hpack
---
--- hash: 645c43bbed2e4ee44172441652f686f9df4f80fe34991062b018c2410e276567
 
 name:           stack
 version:        1.10.0

diff --git a/test-suite-golden/test-files/real-world/stack/stack.json.golden b/test-suite-golden/test-files/real-world/stack/stack.json.golden
@@ -407,4 +407,4 @@
             ]
         }
     }
-}
+}
diff --git a/test-suite-golden/test-files/real-world/stack/stack.yaml b/test-suite-golden/test-files/real-world/stack/stack.yaml
@@ -356,3 +356,4 @@ tests:
     - hspec
     - stack
     - smallcheck
+
diff --git a/test-suite-golden/test-files/real-world/stack/stack.yaml.cabal b/test-suite-golden/test-files/real-world/stack/stack.yaml.cabal
@@ -1,6 +1,6 @@
 cabal-version: 2.0
 
--- This file has been generated from stack.yaml by hpack version 0.35.0.
+-- This file has been generated from stack.yaml by hpack version 0.36.0.
 --
 -- see: https://github.com/sol/hpack
 

diff --git a/test-suite-golden/test-files/real-world/stack/stack.yaml.golden b/test-suite-golden/test-files/real-world/stack/stack.yaml.golden
@@ -356,3 +356,4 @@ tests:
     - hspec
     - stack
     - smallcheck
+
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,4 +15,4 @@ @@
                 ]
             }
         }
-    }
+    }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -9,3 +9,4 @@ when:
		dependencies:
		- base == 4.*
		- yaml-pretty-extras
Original file line number	Diff line number	Diff line change
Expand Up		@@ -49,3 +49,4 @@ default-extensions:
		executable:
		main: Main.hs
		source-dirs: src
Original file line number	Diff line number	Diff line change
Expand Up		@@ -59,3 +59,4 @@ tests:
		- template-haskell
		- HUnit >= 1.6.0.0
		build-tools: hspec-discover
Original file line number	Diff line number	Diff line change
Expand Up		@@ -356,3 +356,4 @@ tests:
		- hspec
		- stack
		- smallcheck