Fix for aeson version 2 (#112)

hamishmack · web-flow · commit ed5bd7215292 · 2021-11-04T22:27:47.000+13:00
diff --git a/cabal.project b/cabal.project
@@ -1,4 +1,4 @@
-index-state: 2021-02-25T00:00:00Z
+index-state: 2021-11-03T00:00:00Z
 
 packages: .
 
diff --git a/default.nix b/default.nix
@@ -1,4 +1,4 @@
-{ compiler-nix-name ? "ghc8105"
+{ compiler-nix-name ? "ghc8107"
 }:
 let
   sources = import ./nix/sources.nix {};
diff --git a/hackage2nix/Main.hs b/hackage2nix/Main.hs
@@ -118,7 +118,7 @@ revBindingJson
   -> Version
   -> BS.ByteString
   -> Integer
-  -> GPDWriter (Text, Value)
+  -> GPDWriter (Key, Value)
 revBindingJson pname vnum cabalFile revNum = do
   let qualifiedName = mconcat $ intersperse
         "-"
diff --git a/nix-tools.cabal b/nix-tools.cabal
@@ -30,7 +30,7 @@ library
                      , Stack2nix.Stack
   build-depends:       base >=4 && <4.15
                      , Cabal >= 3.4 && <3.5
-                     , aeson
+                     , aeson >= 2.0.0.0
                      , aeson-pretty
                      , base16-bytestring
                      , bytestring
diff --git a/nix/sources.json b/nix/sources.json
@@ -5,10 +5,10 @@
         "homepage": "https://input-output-hk.github.io/haskell.nix",
         "owner": "input-output-hk",
         "repo": "haskell.nix",
-        "rev": "1992b910e9b4d880e1f4639f4fe7266bceb9a5ad",
-        "sha256": "15w3wixjnb52f7cj3s94fy0zc0l1gc94p3n2wyq3qqxj10hvirfw",
+        "rev": "b969bc1b681bddc14d70f14c0dd26ee567fc4464",
+        "sha256": "0k82j1ndq3rfvznwgvy7qlpm689q0r0619iv4zqp9pbs0ashn6id",
         "type": "tarball",
-        "url": "https://github.com/input-output-hk/haskell.nix/archive/1992b910e9b4d880e1f4639f4fe7266bceb9a5ad.tar.gz",
+        "url": "https://github.com/input-output-hk/haskell.nix/archive/b969bc1b681bddc14d70f14c0dd26ee567fc4464.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "niv": {
diff --git a/shell.nix b/shell.nix
@@ -1,3 +1,3 @@
-{ compiler-nix-name ? "ghc8105" }:
+{ compiler-nix-name ? "ghc8107" }:
 (import ./. { inherit compiler-nix-name; }).shell
     

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-index-state: 2021-02-25T00:00:00Z`
	`1`	`+index-state: 2021-11-03T00:00:00Z`
`2`	`2`
`3`	`3`	`packages: .`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-{ compiler-nix-name ? "ghc8105"`
	`1`	`+{ compiler-nix-name ? "ghc8107"`
`2`	`2`	`}:`
`3`	`3`	`let`
`4`	`4`	`sources = import ./nix/sources.nix {};`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`		`-{ compiler-nix-name ? "ghc8105" }:`
	`1`	`+{ compiler-nix-name ? "ghc8107" }:`
`2`	`2`	`(import ./. { inherit compiler-nix-name; }).shell`
`3`	`3`