Don't compare generated cabal files

Fixes #5045. See relevant PR for pantry for more details: commercialhaskell/pantry#7
commercialhaskell · Oct 3, 2019 · fe0d5a6 · fe0d5a6
1 parent 4ac677c
commit fe0d5a6
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 46 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -19,6 +19,8 @@ Bug fixes:
 
 * Fix using relative links in haddocks output.  See
   [#4971](https://github.com/commercialhaskell/stack/issues/4971).
+* Do not include generated cabal file information in lock files. See
+  [#5045](https://github.com/commercialhaskell/stack/issues/5045).
 
 * Use proper Hoogle executable path when installed automatically. See
   [#4905](https://github.com/commercialhaskell/stack/issues/4905)

diff --git a/doc/lock_files.md b/doc/lock_files.md
@@ -67,9 +67,6 @@ the `stack.yaml` file to fully resolve that package. That looks like:
 extra-deps:
 - size: 1442
   url: https://hackage.haskell.org/package/acme-missiles-0.3.tar.gz
-  cabal-file:
-    size: 613
-    sha256: 2ba66a092a32593880a87fb00f3213762d7bca65a687d45965778deb8694c5d1
   name: acme-missiles
   version: '0.3'
   sha256: e563d8b524017a06b32768c4db8eff1f822f3fb22a90320b7e414402647b735b
@@ -150,9 +147,6 @@ packages:
   completed:
     size: 1442
     url: https://hackage.haskell.org/package/acme-missiles-0.3.tar.gz
-    cabal-file:
-      size: 613
-      sha256: 2ba66a092a32593880a87fb00f3213762d7bca65a687d45965778deb8694c5d1
     name: acme-missiles
     version: '0.3'
     sha256: e563d8b524017a06b32768c4db8eff1f822f3fb22a90320b7e414402647b735b

diff --git a/doc/pantry.md b/doc/pantry.md
@@ -191,9 +191,6 @@ Would be converted into:
 ```yaml
 extra-deps:
 - subdir: auto-update
-  cabal-file:
-    size: 1219
-    sha256: c07b2b1a2df1199f83eef819ac9bb067567e100b60586a52f8b92fc733ae3a6d
   name: auto-update
   version: 0.1.2.1
   git: git@github.com:yesodweb/wai
@@ -202,9 +199,6 @@ extra-deps:
     sha256: 26377897f35ccd3890b4405d72523233717afb04d62f2d36031bf6b18dcef74f
   commit: 2f8a8e1b771829f4a8a77c0111352ce45a14c30f
 - subdir: wai
-  cabal-file:
-    size: 1717
-    sha256: 7b46e7a8b121d668351fa8a684810afadf58c39276125098485203ef274fd056
   name: wai
   version: 3.0.2.3
   git: git@github.com:yesodweb/wai
@@ -260,9 +254,6 @@ With the `stack freeze` command, this would be replaced with:
 extra-deps:
 - size: 1540
   url: https://hackage.haskell.org/package/acme-dont-1.1.tar.gz
-  cabal-file:
-    size: 602
-    sha256: 8264ad3e5113d3e0417b46e71d5a9c0914a1f03b5b81319cc329f1dc0f49b96c
   name: acme-dont
   version: '1.1'
   sha256: c32231ff8548bccd4f3bafcc9b1eb84947a2e5e0897c50c048e0e7609fc443ce
@@ -272,9 +263,6 @@ extra-deps:
 - size: 285152
   subdir: wai
   url: http://github.com/yesodweb/wai/archive/2f8a8e1b771829f4a8a77c0111352ce45a14c30f.zip
-  cabal-file:
-    size: 1717
-    sha256: 7b46e7a8b121d668351fa8a684810afadf58c39276125098485203ef274fd056
   name: wai
   version: 3.0.2.3
   sha256: 3b6eb04f3763ca16432f3ab2135d239161fbe2c8811b8cd1778ffa67469289ba
@@ -284,9 +272,6 @@ extra-deps:
 - size: 285152
   subdir: warp
   url: http://github.com/yesodweb/wai/archive/2f8a8e1b771829f4a8a77c0111352ce45a14c30f.zip
-  cabal-file:
-    size: 6648
-    sha256: e3f01fd7417af923fd30962e9e6a4fe4de41ebc5e02af9819067fed79c9c6575
   name: warp
   version: 3.0.13.1
   sha256: 3b6eb04f3763ca16432f3ab2135d239161fbe2c8811b8cd1778ffa67469289ba
@@ -295,9 +280,6 @@ extra-deps:
     sha256: d6b1def306a042b5fc500930302533a3ea828e916c99cbd82c0b7e2c4e3a8e09
 - size: 1442
   filepath: acme-missiles-0.3.tar.gz
-  cabal-file:
-    size: 613
-    sha256: 2ba66a092a32593880a87fb00f3213762d7bca65a687d45965778deb8694c5d1
   name: acme-missiles
   version: '0.3'
   sha256: e563d8b524017a06b32768c4db8eff1f822f3fb22a90320b7e414402647b735b

diff --git a/package.yaml b/package.yaml
@@ -93,7 +93,7 @@ dependencies:
 - network-uri
 - open-browser
 - optparse-applicative
-- pantry
+- pantry >= 0.2
 - path
 - path-io
 - persistent

diff --git a/snapshot-lts-12.yaml b/snapshot-lts-12.yaml
@@ -19,8 +19,9 @@ packages:
 - rio-prettyprint-0.1.0.0@rev:0
 - hi-file-parser-0.1.0.0@rev:0
 - http-download-0.1.0.0@rev:0
-- pantry-0.1.1.1@rev:0
-- git: https://github.com/snoyberg/filelock.git
+- github: commercialhaskell/pantry
+  commit: 1295ec4a2220bd29d488b406072fe78622414676
+- github: snoyberg/filelock
   commit: 97e83ecc133cd60a99df8e1fa5a3c2739ad007dc
 
 drop-packages:

diff --git a/snapshot-nightly.yaml b/snapshot-nightly.yaml
@@ -2,13 +2,14 @@ resolver: nightly-2019-07-15
 name: snapshot-for-building-stack-with-ghc-8.6.5
 
 packages:
-- git: https://github.com/snoyberg/filelock.git
+- github: snoyberg/filelock
   commit: 97e83ecc133cd60a99df8e1fa5a3c2739ad007dc
 - rio-0.1.11.0@rev:0
 - persistent-template-2.7.1@rev:0
 - persistent-2.10.0@rev:0
 - persistent-sqlite-2.10.1@rev:0
-- pantry-0.1.1.1@rev:0
+- github: commercialhaskell/pantry
+  commit: 1295ec4a2220bd29d488b406072fe78622414676
 
 drop-packages:
 # See https://github.com/commercialhaskell/stack/pull/4712

diff --git a/snapshot.yaml b/snapshot.yaml
@@ -26,8 +26,9 @@ packages:
 - rio-prettyprint-0.1.0.0@rev:0
 - hi-file-parser-0.1.0.0@rev:0
 - http-download-0.1.0.0@rev:0
-- pantry-0.1.1.1@rev:0
-- git: https://github.com/snoyberg/filelock.git
+- github: commercialhaskell/pantry
+  commit: 1295ec4a2220bd29d488b406072fe78622414676
+- github: snoyberg/filelock
   commit: 97e83ecc133cd60a99df8e1fa5a3c2739ad007dc
 
 drop-packages:

diff --git a/src/test/Stack/LockSpec.hs b/src/test/Stack/LockSpec.hs
@@ -90,9 +90,6 @@ packages:
     commit: d11d63f1a6a92db8c637a8d33e7953ce6194a3e0
   completed:
     subdir: wai
-    cabal-file:
-      size: 1765
-      sha256: eea52c4967d8609c2f79213d6dffe6d6601034f1471776208404781de7051410
     name: wai
     version: 3.2.1.2
     git: https://github.com/yesodweb/wai.git
@@ -106,9 +103,6 @@ packages:
     commit: d11d63f1a6a92db8c637a8d33e7953ce6194a3e0
   completed:
     subdir: warp
-    cabal-file:
-      size: 10725
-      sha256: cfec5336260bb4b1ecbd833f7d6948fd1ee373770471fe79796cf9c389c71758
     name: warp
     version: 3.2.25
     git: https://github.com/yesodweb/wai.git
@@ -128,7 +122,6 @@ packages:
             emptyRPM = RawPackageMetadata { rpmName = Nothing
                                           , rpmVersion = Nothing
                                           , rpmTreeKey = Nothing
-                                          , rpmCabal = Nothing
                                           }
         pkgImm `shouldBe`
             [ LockedLocation
@@ -145,10 +138,6 @@ packages:
                                            (decodeSHA
                                              "ecfd0b4b75f435a3f362394807b35e5ef0647b1a25005d44a3632c49db4833d2")
                                            (FileSize 714))
-                                     , pmCabal =
-                                         toBlobKey
-                                         "eea52c4967d8609c2f79213d6dffe6d6601034f1471776208404781de7051410"
-                                         1765
                                      }))
             , LockedLocation
               (RPLIRepo (waiSubdirRepo "warp") emptyRPM)
@@ -164,9 +153,5 @@ packages:
                                         (decodeSHA
                                           "f808e075811b002563d24c393ce115be826bb66a317d38da22c513ee42b7443a")
                                         (FileSize 5103))
-                                    , pmCabal =
-                                      toBlobKey
-                                      "cfec5336260bb4b1ecbd833f7d6948fd1ee373770471fe79796cf9c389c71758"
-                                      10725
                                     }))
             ]