Merge pull request #3354 from input-output-hk/mpj/index-state-some-wtf

Bump index-state and hackage.nix
IntersectMBO · Jun 14, 2021 · 5370b63 · 5370b63
2 parents 5997b39 + 09ea470
commit 5370b63
Show file tree

Hide file tree

Showing 10 changed files with 44 additions and 46 deletions.
diff --git a/cabal.project b/cabal.project
@@ -1,5 +1,5 @@
 -- Bump this if you need newer packages
-index-state: 2021-04-13T00:00:00Z
+index-state: 2021-06-10T00:00:00Z
 
 packages: doc
           freer-extras
@@ -44,21 +44,17 @@ package eventful-sql-common
   ghc-options: -XDerivingStrategies -XStandaloneDeriving -XUndecidableInstances -XDataKinds -XFlexibleInstances
 
 allow-newer:
-           -- Has a commit to allow newer aeson, not on Hackage yet
-           monoidal-containers:aeson
            -- Pins to an old version of Template Haskell, unclear if/when it will be updated
-           , size-based:template-haskell
+           size-based:template-haskell
 
            -- The following two dependencies are needed by plutus.
            , eventful-sql-common:persistent
            , eventful-sql-common:persistent-template
            , ouroboros-consensus-byron:formatting
 
 constraints:
-  -- aws-lambda-haskell-runtime-wai doesn't compile with newer versions
-  aws-lambda-haskell-runtime <= 3.0.3
   -- big breaking change here, inline-r doens't have an upper bound
-  , singletons < 3.0
+  singletons < 3.0
   -- breaks eventful even more than it already was
   , persistent-template < 2.12
 

diff --git a/nix/pkgs/haskell/agda.sha b/nix/pkgs/haskell/agda.sha
@@ -1 +1 @@
-0w6cra4ynqprbv83qbc8bsnnzly9sv3ry99jfskls4cr47l3gjks
+014j6ph6ampxgnqwpphcfc52z8nhnv3ypahsqpr1kyqg9ynrj2lx
diff --git a/nix/pkgs/haskell/cabal-install.sha b/nix/pkgs/haskell/cabal-install.sha
@@ -1 +1 @@
-0z0ir8kcs9b8f0d72rx5xkq7w1m9s76i3h84lbk0bdh3l4kqld8r
+1m6xiymlffvlwsb8s2cbzwz4cgwrrn3ryabn7i4h3sf1vvynnyb0
diff --git a/nix/pkgs/haskell/hlint.sha b/nix/pkgs/haskell/hlint.sha
@@ -1 +1 @@
-138zligphj3ndvjzb2hhb40jjji83m3brnqs2maysblplwcsm4gr
+0p31r7c50sx4ksl67ilnrll9g6ndwan69sn8q5l70yx3fdplyqiq
diff --git a/nix/pkgs/haskell/hls-darwin.sha b/nix/pkgs/haskell/hls-darwin.sha
@@ -1 +1 @@
-0w6bwrysl0ni87k6qjsssv64h1hcg5czv6ml5czsl6rw8id0i9cj
+1rlwwffingq9hk9iz33c0mla4f9cnqgas5n15rvcdb57lxsldz9q
diff --git a/nix/pkgs/haskell/hls-linux.sha b/nix/pkgs/haskell/hls-linux.sha
@@ -1 +1 @@
-0q6m14y4fbk75z5mm92ylyzbfjla885fyibq4cxcd6gsn445ai51
+1cj3dyd2xxfi1lickbvxjjss0ma0sngji5ykp7nxydwfnbai1xjd
diff --git a/nix/pkgs/haskell/materialized-unix/default.nix b/nix/pkgs/haskell/materialized-unix/default.nix
diff --git a/nix/pkgs/haskell/stylish-haskell.sha b/nix/pkgs/haskell/stylish-haskell.sha
@@ -1 +1 @@
-1pgmscvz7jx5lx22pqbx6vw43mjd1a7sjj81i988bqw5ab4iq264
+088bgj68k8zy81ain9qlgqyhbk49wxqkcvfmwvpr6z6sn3yyzc1a
diff --git a/nix/sources.json b/nix/sources.json
@@ -43,10 +43,10 @@
         "homepage": "",
         "owner": "input-output-hk",
         "repo": "hackage.nix",
-        "rev": "c63c196d3f72ed29840b0ac7605eeb4408c1bc6c",
-        "sha256": "0qnmqnvsvk94b7lrm788pdcwswjhzk6cfaawq4cnanalmg2976pw",
+        "rev": "6dba3997f6a39d51fe814d312b1a4b52838a8055",
+        "sha256": "0c41a066jm2j1lvg5x75193x1sy8i5p4s2a2qmdfxd2csghgi02w",
         "type": "tarball",
-        "url": "https://github.com/input-output-hk/hackage.nix/archive/c63c196d3f72ed29840b0ac7605eeb4408c1bc6c.tar.gz",
+        "url": "https://github.com/input-output-hk/hackage.nix/archive/6dba3997f6a39d51fe814d312b1a4b52838a8055.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "haskell-language-server": {

diff --git a/stack.yaml b/stack.yaml
@@ -37,8 +37,6 @@ extra-deps:
 - Stream-0.4.7.2@sha256:ed78165aa34c4e23dc53c9072f8715d414a585037f2145ea0eb2b38300354c53,1009
 - lazysmallcheck-0.6@sha256:dac7a1e4877681f1260309e863e896674dd6efc1159897b7945893e693f2a6bc,1696
 # Other missing packages
-- aws-lambda-haskell-runtime-3.0.3
-- aws-lambda-haskell-runtime-wai-1.0.2@sha256:5ce655247461b562c8048011ddc022130135a03417def8203aad92366cc979ab,1965
 - composition-prelude-3.0.0.2
 - constraints-extras-0.3.0.2
 - dependent-map-0.4.0.0