fixup! Remove virtual choices

digital-asset · Nov 3, 2021 · f48e149 · f48e149
1 parent 3264132
commit f48e149
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/ci/da-ghc-lib/compile.yml b/ci/da-ghc-lib/compile.yml
@@ -12,7 +12,7 @@ jobs:
   variables:
     ghc-lib-sha: '42e5c306dcfbc84b83336fdd531023e93bfcc5b2'
     base-sha: '9c787d4d24f2b515934c8503ee2bbd7cfac4da20'
-    patches: 'e5bee7249c5d1424f3b66eb7006ab75755dcba55 833ca63be2ab14871874ccb6974921e8952802e9'
+    patches: '734dea7db29e4dae6311fa084027a46abaa3a673 833ca63be2ab14871874ccb6974921e8952802e9'
     flavor: 'ghc-8.8.1'
   steps:
   - checkout: self

diff --git a/stackage_snapshot.json b/stackage_snapshot.json
@@ -1,6 +1,6 @@
 {
-  "__GENERATED_FILE_DO_NOT_MODIFY_MANUALLY": 471434328,
-  "all-cabal-hashes": "https://raw.githubusercontent.com/commercialhaskell/all-cabal-hashes/b09778d07130629090c60bd2409d7e55aa175b2a",
+  "__GENERATED_FILE_DO_NOT_MODIFY_MANUALLY": 1196091276,
+  "all-cabal-hashes": "https://raw.githubusercontent.com/commercialhaskell/all-cabal-hashes/bccce4a5530075ddc52dff62303f6e2b6eaa4f34",
   "resolved": {
     "Cabal": {"dependencies":[],"location":{"type":"core"},"name":"Cabal","version":"3.2.1.0"},
     "Decimal": {"dependencies":["base","deepseq"],"location":{"type":"hackage","url":"https://hackage.haskell.org/package/Decimal-0.5.2/Decimal-0.5.2.tar.gz"},"name":"Decimal","pinned":{"url":["https://hackage.haskell.org/package/Decimal-0.5.2/Decimal-0.5.2.tar.gz","https://s3.amazonaws.com/hackage.fpcomplete.com/package/Decimal-0.5.2.tar.gz"],"sha256":"a37a0220424e4bcb8cae1d38844c7027ee314449758d0d14ff3e2e0a5c8a87a7","cabal-sha256":"83dd16a1c0737fd35fdb1088af36e1a53034e75090e3f0d4ad32296f1a35a13b"},"version":"0.5.2"},
@@ -64,7 +64,7 @@
     "containers": {"dependencies":[],"location":{"type":"core"},"name":"containers","version":"0.6.2.1"},
     "contravariant": {"dependencies":["StateVar","base","transformers"],"location":{"type":"hackage","url":"https://hackage.haskell.org/package/contravariant-1.5.3/contravariant-1.5.3.tar.gz"},"name":"contravariant","pinned":{"url":["https://hackage.haskell.org/package/contravariant-1.5.3/contravariant-1.5.3.tar.gz","https://s3.amazonaws.com/hackage.fpcomplete.com/package/contravariant-1.5.3.tar.gz"],"sha256":"44536f0e331fde471271937323dc90409e95d47f57e42657fdaf242a0fd65dc1","cabal-sha256":"e59a7742e725f94fc6578e3593cd3f6d4e3d46a9510c3a782e5fe5e5f238e3ce"},"version":"1.5.3"},
     "cookie": {"dependencies":["base","bytestring","data-default-class","deepseq","text","time"],"location":{"type":"hackage","url":"https://hackage.haskell.org/package/cookie-0.4.5/cookie-0.4.5.tar.gz"},"name":"cookie","pinned":{"url":["https://hackage.haskell.org/package/cookie-0.4.5/cookie-0.4.5.tar.gz","https://s3.amazonaws.com/hackage.fpcomplete.com/package/cookie-0.4.5.tar.gz"],"sha256":"707f94d1b31018b91d6a1e9e19ef5413e20d02cab00ad93a5fd7d7b3b46a3583","cabal-sha256":"22bbe2bea34cfc546eaca2468386035fec521b8dbae52f5aa2f994ed68b35e0e"},"version":"0.4.5"},
-    "cpphs": {"dependencies":["base","directory","polyparse","time"],"location":{"type":"hackage","url":"https://hackage.haskell.org/package/cpphs-1.20.9.1/cpphs-1.20.9.1.tar.gz"},"name":"cpphs","pinned":{"url":["https://hackage.haskell.org/package/cpphs-1.20.9.1/cpphs-1.20.9.1.tar.gz","https://s3.amazonaws.com/hackage.fpcomplete.com/package/cpphs-1.20.9.1.tar.gz"],"sha256":"7f59b10bc3374004cee3c04fa4ee4a1b90d0dca84a3d0e436d5861a1aa3b919f","cabal-sha256":"a02113e8dc76a21e99592b46bf17fc89f237e4f6dc58b641172294985d3c4f29"},"version":"1.20.9.1"},
+    "cpphs": {"dependencies":["base","directory","polyparse","time"],"location":{"type":"hackage","url":"https://hackage.haskell.org/package/cpphs-1.20.9.1/cpphs-1.20.9.1.tar.gz"},"name":"cpphs","pinned":{"url":["https://hackage.haskell.org/package/cpphs-1.20.9.1/cpphs-1.20.9.1.tar.gz","https://s3.amazonaws.com/hackage.fpcomplete.com/package/cpphs-1.20.9.1.tar.gz"],"sha256":"7f59b10bc3374004cee3c04fa4ee4a1b90d0dca84a3d0e436d5861a1aa3b919f","cabal-sha256":"0ad26fef4e6be4cb13e1df93aab7bdbe9c3d3bc6c63b84d9e29cc0f691fe12b9"},"version":"1.20.9.1"},
     "cryptohash": {"dependencies":["base","byteable","bytestring","cryptonite","ghc-prim","memory"],"location":{"type":"hackage","url":"https://hackage.haskell.org/package/cryptohash-0.11.9/cryptohash-0.11.9.tar.gz"},"name":"cryptohash","pinned":{"url":["https://hackage.haskell.org/package/cryptohash-0.11.9/cryptohash-0.11.9.tar.gz","https://s3.amazonaws.com/hackage.fpcomplete.com/package/cryptohash-0.11.9.tar.gz"],"sha256":"c28f847fc1fcd65b6eea2e74a100300af940919f04bb21d391f6a773968f22fb","cabal-sha256":"59d9494ba0cc9eef087ecba2e12e4d3e2d3b0327dd1542af552e3dca0e7de70d"},"version":"0.11.9"},
     "cryptohash-md5": {"dependencies":["base","bytestring"],"location":{"type":"hackage","url":"https://hackage.haskell.org/package/cryptohash-md5-0.11.100.1/cryptohash-md5-0.11.100.1.tar.gz"},"name":"cryptohash-md5","pinned":{"url":["https://hackage.haskell.org/package/cryptohash-md5-0.11.100.1/cryptohash-md5-0.11.100.1.tar.gz","https://s3.amazonaws.com/hackage.fpcomplete.com/package/cryptohash-md5-0.11.100.1.tar.gz"],"sha256":"710bd48770fa3e9a3b05428c6dc77fb72c91956d334a1eb89ded11bb843e18f9","cabal-sha256":"d293d6f08dc7d9e9e984b3a9a4e822a463417b6f6ba5845bc9dbd3cc9cdb36a4"},"version":"0.11.100.1"},
     "cryptohash-sha1": {"dependencies":["base","bytestring"],"location":{"type":"hackage","url":"https://hackage.haskell.org/package/cryptohash-sha1-0.11.100.1/cryptohash-sha1-0.11.100.1.tar.gz"},"name":"cryptohash-sha1","pinned":{"url":["https://hackage.haskell.org/package/cryptohash-sha1-0.11.100.1/cryptohash-sha1-0.11.100.1.tar.gz","https://s3.amazonaws.com/hackage.fpcomplete.com/package/cryptohash-sha1-0.11.100.1.tar.gz"],"sha256":"3c79af33542512442f8f87f6abb1faef7cd43bbfb2859260a33251d861eb0dab","cabal-sha256":"ec4d5bab6fc413847e3120ee3964fa23d0818beb9cbecfe8ad30f2876bee3783"},"version":"0.11.100.1"},
@@ -188,7 +188,7 @@
     "path": {"dependencies":["aeson","base","deepseq","exceptions","filepath","hashable","template-haskell","text"],"location":{"type":"hackage","url":"https://hackage.haskell.org/package/path-0.8.0/path-0.8.0.tar.gz"},"name":"path","pinned":{"url":["https://hackage.haskell.org/package/path-0.8.0/path-0.8.0.tar.gz","https://s3.amazonaws.com/hackage.fpcomplete.com/package/path-0.8.0.tar.gz"],"sha256":"24cb49bb585f33a3b334ab55cb9bac251b66afdb617b71a20dbaeb820351fa6f","cabal-sha256":"4a522e0a8c0f54bd3d1e5690b22e29c35a7dee91cc2caff68bfe2a5c49ea700b"},"version":"0.8.0"},
     "path-io": {"dependencies":["base","containers","directory","dlist","exceptions","filepath","path","temporary","time","transformers","unix-compat"],"location":{"type":"hackage","url":"https://hackage.haskell.org/package/path-io-1.6.3/path-io-1.6.3.tar.gz"},"name":"path-io","pinned":{"url":["https://hackage.haskell.org/package/path-io-1.6.3/path-io-1.6.3.tar.gz","https://s3.amazonaws.com/hackage.fpcomplete.com/package/path-io-1.6.3.tar.gz"],"sha256":"b604737dd6949cddb44e145bae41f1babafa90441117e025b80375e42022ccb6","cabal-sha256":"371bae3355b69c5db06c516a50ea0d82eed96105da6af1d93f8e9613444e5967"},"version":"1.6.3"},
     "pem": {"dependencies":["base","basement","bytestring","memory"],"location":{"type":"hackage","url":"https://hackage.haskell.org/package/pem-0.2.4/pem-0.2.4.tar.gz"},"name":"pem","pinned":{"url":["https://hackage.haskell.org/package/pem-0.2.4/pem-0.2.4.tar.gz","https://s3.amazonaws.com/hackage.fpcomplete.com/package/pem-0.2.4.tar.gz"],"sha256":"770c4c1b9cd24b3db7f511f8a48404a0d098999e28573c3743a8a296bb96f8d4","cabal-sha256":"cc8e62118b783e284dc0fa032f54fe386a3861a948ec88079370a433c103a705"},"version":"0.2.4"},
-    "polyparse": {"dependencies":["base","bytestring","text"],"location":{"type":"hackage","url":"https://hackage.haskell.org/package/polyparse-1.13/polyparse-1.13.tar.gz"},"name":"polyparse","pinned":{"url":["https://hackage.haskell.org/package/polyparse-1.13/polyparse-1.13.tar.gz","https://s3.amazonaws.com/hackage.fpcomplete.com/package/polyparse-1.13.tar.gz"],"sha256":"1c4c72980e1e5a4f07fea65ca08b2399581d2a6aa21eb1078f7ad286c279707b","cabal-sha256":"d43dc209be86cbc7eb5cb98cd80ad36c8b035397e9dd200f669b19d20f37b8d8"},"version":"1.13"},
+    "polyparse": {"dependencies":["base","bytestring","text"],"location":{"type":"hackage","url":"https://hackage.haskell.org/package/polyparse-1.13/polyparse-1.13.tar.gz"},"name":"polyparse","pinned":{"url":["https://hackage.haskell.org/package/polyparse-1.13/polyparse-1.13.tar.gz","https://s3.amazonaws.com/hackage.fpcomplete.com/package/polyparse-1.13.tar.gz"],"sha256":"1c4c72980e1e5a4f07fea65ca08b2399581d2a6aa21eb1078f7ad286c279707b","cabal-sha256":"85b078b6bf072b34afa6c8cf8002832990e21c8cd66ac4c2aff846dddc46ad41"},"version":"1.13"},
     "pretty": {"dependencies":[],"location":{"type":"core"},"name":"pretty","version":"1.1.3.6"},
     "pretty-show": {"dependencies":["array","base","filepath","ghc-prim","happy","haskell-lexer","pretty","text"],"location":{"type":"hackage","url":"https://hackage.haskell.org/package/pretty-show-1.10/pretty-show-1.10.tar.gz"},"name":"pretty-show","pinned":{"url":["https://hackage.haskell.org/package/pretty-show-1.10/pretty-show-1.10.tar.gz","https://s3.amazonaws.com/hackage.fpcomplete.com/package/pretty-show-1.10.tar.gz"],"sha256":"307f9086e0b063d439dc4f513e36a145e8a57f23de448aefae2a6c00f6da6fd2","cabal-sha256":"bfef8da0ac4db4fc7f41edfec9e9a701ac206418d70702bff1e40f20d6a2b1f1"},"version":"1.10"},
     "prettyprinter": {"dependencies":["base","text"],"location":{"type":"hackage","url":"https://hackage.haskell.org/package/prettyprinter-1.7.0/prettyprinter-1.7.0.tar.gz"},"name":"prettyprinter","pinned":{"url":["https://hackage.haskell.org/package/prettyprinter-1.7.0/prettyprinter-1.7.0.tar.gz","https://s3.amazonaws.com/hackage.fpcomplete.com/package/prettyprinter-1.7.0.tar.gz"],"sha256":"591b87ce8a5cff39d66cb1c156c7d27d04de57952f16eb3ce3afe309ac26e0a7","cabal-sha256":"6a9569e21fa61163a7f066d23d701e23e917893e8f39733d6e617ec72787ae5f"},"version":"1.7.0"},