Bump dependencies, nixpkgs, haskell.nix, iohk-nix.

cabal.project

@@ -1,4 +1,4 @@
-index-state: 2021-01-10T00:00:00Z
+index-state: 2022-01-17T00:00:00Z
 
 packages:
   ./metadata-lib
@@ -89,42 +89,63 @@ package *
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-prelude
-  tag: 116087dbcebb88aafdc7d3d0577477ba36129b41
-  --sha256: 0kxk5vcywsl19qc65y8mkc0npv5qz9fm23avs247xnb0zq17wcrd
+  tag: bb4ed71ba8e587f672d06edf9d2e376f4b055555
+  --sha256: 00h10l5mmiza9819p9v5q5749nb9pzgi20vpzpy1d34zmh6gf1cj
   subdir:
     cardano-prelude
     cardano-prelude-test
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-crypto
-  tag: 2547ad1e80aeabca2899951601079408becbc92c
-  --sha256: 1p2kg2w02q5w1cvqzhfhqmxviy4xrzada3mmb096j2n6hfr20kri
+  tag: f73079303f663e028288f9f4a9e08bcca39a923e
+  --sha256: 1n87i15x54s0cjkh3nsxs4r1x016cdw1fypwmr68936n3xxsjn6q
 
 source-repository-package
     type: git
     location: https://github.com/input-output-hk/cardano-node
-    tag: e15515b785f7caae0ae5d997b26d9c4518062c71
-    --sha256: 14w39l4jgxhb68xzv889bibj8q44aknqnsdrz1kbwx2ca3yzbkpw
-    subdir: cardano-api
-            cardano-api/test
-            cardano-cli
-            cardano-config
-            cardano-node
-            hedgehog-extras
+    tag: 1a7453427d6ec8e4128a0951dfaa25e69fb4711e
+    --sha256: 0w6f27iza6brpszlsb639v1x10hdirm2dp57h8zm2dk2p1a3n82g
+    subdir:
+      cardano-api
+      cardano-cli
+      cardano-node
+
+source-repository-package
+  type: git
+  location: https://github.com/input-output-hk/cardano-config
+  tag: e9de7a2cf70796f6ff26eac9f9540184ded0e4e6
+  --sha256: 1wm1c99r5zvz22pdl8nhkp13falvqmj8dgkm8fxskwa9ydqz01ld
+
+-- Using a fork until our patches can be merged upstream
+source-repository-package
+  type: git
+  location: https://github.com/input-output-hk/optparse-applicative
+  tag: 7497a29cb998721a9068d5725d49461f2bba0e7a
+  --sha256: 1gvsrg925vynwgqwplgjmp53vj953qyh3wbdf34pw21c8r47w35r
+
+source-repository-package
+  type: git
+  location: https://github.com/input-output-hk/hedgehog-extras
+  tag: edf6945007177a638fbeb8802397f3a6f4e47c14
+  --sha256: 0wc7qzkc7j4ns2rz562h6qrx2f8xyq7yjcb7zidnj7f6j0pcd0i9
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-base
-  tag: 4251c0bb6e4f443f00231d28f5f70d42876da055
-  --sha256: 02a61ymvx054pcdcgvg5qj9kpybiajg993nr22iqiya196jmgciv
+  tag: 41545ba3ac6b3095966316a99883d678b5ab8da8
+  --sha256: 0icq9y3nnl42fz536da84414av36g37894qnyw4rk3qkalksqwir
   subdir:
+    base-deriving-via
     binary
     binary/test
     cardano-crypto-class
     cardano-crypto-praos
     cardano-crypto-tests
+    measures
+    orphans-deriving-via
     slotting
+    strict-containers
 
 source-repository-package
   type: git
@@ -134,28 +155,37 @@ source-repository-package
 
 source-repository-package
   type: git
-  location: https://github.com/input-output-hk/cardano-ledger-specs
-  tag: 99e2f2e32ebfca3291fa523ddcae14c8cbb48fa0
-  --sha256: 0fy8y7cp10ls8p3zs2fqzqpd41vri6z0imhyif5wa9bi2rp57i3z
+  location: https://github.com/input-output-hk/cardano-ledger
+  tag: b765575f51d6eaf3af296bede89a6bafd4d8e93c
+  --sha256: 0i56xxcbpw55yasjgjqiyjqm67az42ffdm13ld6py8hzdfpqp0n4
   subdir:
-    byron/chain/executable-spec
-    byron/crypto
-    byron/crypto/test
-    byron/ledger/executable-spec
-    byron/ledger/impl
-    byron/ledger/impl/test
-    semantics/executable-spec
-    semantics/small-steps-test
-    shelley/chain-and-ledger/dependencies/non-integer
-    shelley/chain-and-ledger/executable-spec
-    shelley/chain-and-ledger/shelley-spec-ledger-test
-    shelley-ma/impl
+    eras/alonzo/impl
+    eras/alonzo/test-suite
+    eras/byron/chain/executable-spec
+    eras/byron/crypto
+    eras/byron/crypto/test
+    eras/byron/ledger/executable-spec
+    eras/byron/ledger/impl
+    eras/byron/ledger/impl/test
+    eras/shelley/impl
+    eras/shelley/test-suite
+    eras/shelley-ma/impl
+    eras/shelley-ma/test-suite
+    libs/cardano-ledger-core
+    libs/cardano-ledger-pretty
+    libs/cardano-protocol-tpraos
+    libs/cardano-data
+    libs/compact-map
+    libs/set-algebra
+    libs/small-steps
+    libs/small-steps-test
+    libs/non-integral
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-prelude
-  tag: ee4e7b547a991876e6b05ba542f4e62909f4a571
-  --sha256: 0dg6ihgrn5mgqp95c4f11l6kh9k3y75lwfqf47hdp554w7wyvaw6
+  tag: bb4ed71ba8e587f672d06edf9d2e376f4b055555
+  --sha256: 00h10l5mmiza9819p9v5q5749nb9pzgi20vpzpy1d34zmh6gf1cj
   subdir:
     cardano-prelude
     cardano-prelude-test
@@ -169,8 +199,8 @@ source-repository-package
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/iohk-monitoring-framework
-  tag: 60b13d80afa266f02f363672950e896ed735e807
-  --sha256: 0gci6r4c6ldrgracbr4fni4hbrl62lmm5p70cafkwk21a0kqs8cz
+  tag: 808724ff8a19a33d0ed06f9ef59fbd900b08553c
+  --sha256: 0298dpl29gxzs9as9ha6y0w18hqwc00ipa3hzkxv7nlfrjjz8hmz
   subdir:
     contra-tracer
     iohk-monitoring
@@ -181,27 +211,62 @@ source-repository-package
     plugins/scribe-systemd
     tracer-transformers
 
+source-repository-package
+  type: git
+  location: https://github.com/input-output-hk/plutus
+  tag: 1efbb276ef1a10ca6961d0fd32e6141e9798bd11
+  --sha256: 1jicyk4hr8p0xksj4048gdxndrb42jz4wsnkhc3ymxbm5v6snalf
+  subdir:
+    freer-extras
+    plutus-core
+    plutus-ledger
+    plutus-ledger-api
+    plutus-tx
+    plutus-tx-plugin
+    prettyprinter-configurable
+    stubs/plutus-ghc-stub
+    word-array
+
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 96cf17bcc6ea4ef455a19430313ce17d476d62b5
-  --sha256: 00xp605lb8qp1jhp43mg7818x8yzn2rnsd18qcy5721yj4q675nz
+  tag: d2d219a86cda42787325bb8c20539a75c2667132
+  --sha256: 18xk7r0h2pxrbx76d6flsxifh0a9rz1cj1rjqs1pbs5kdmy8b7kx
   subdir:
     io-sim
-    io-sim-classes
+    io-classes
+    monoidal-synchronisation
     network-mux
     ouroboros-consensus
     ouroboros-consensus-byron
     ouroboros-consensus-cardano
+    ouroboros-consensus-protocol
     ouroboros-consensus-shelley
     ouroboros-network
     ouroboros-network-framework
+    ouroboros-network-testing
+    strict-stm
     typed-protocols
+    typed-protocols-cborg
     typed-protocols-examples
-    Win32-network
+
+source-repository-package
+  type: git
+  location: https://github.com/input-output-hk/Win32-network
+  tag: 3825d3abf75f83f406c1f7161883c438dac7277d
+  --sha256: 19wahfv726fa3mqajpqdqhnl9ica3xmf68i254q45iyjcpj1psqx
+
+-- Drops an instance breaking our code. Should be released to Hackage eventually.
+source-repository-package
+  type: git
+  location: https://github.com/input-output-hk/flat
+  tag: ee59880f47ab835dbd73bea0847dab7869fc20d8
+  --sha256: 1lrzknw765pz2j97nvv9ip3l1mcpf2zr4n56hwlz0rk7wq7ls4cm
 
 allow-newer:
-  github:base16-bytestring
+  github:base16-bytestring,
+  monoidal-containers:aeson,
+  size-based:template-haskell
 
 -- Needed for the Windows cabal constraint solver.
 max-backjumps: 10000

metadata-lib/metadata-lib.cabal

@@ -37,7 +37,6 @@ library
                      , bytestring
                      , canonical-json
                      , cardano-api
-                     , cardano-api-test
                      , co-log
                      , filepath
                      , cardano-crypto
@@ -51,7 +50,7 @@ library
                      , github-webhooks
                      , hashable
                      , hedgehog
-                     , hspec
+                     , hspec  <2.8
                      , http-api-data
                      , http-client
                      , http-types
@@ -113,7 +112,7 @@ test-suite unit-tests
                 , containers
                 , filepath
                 , hedgehog
-                , hspec
+                , hspec <2.8
                 , hspec-wai
                 , http-client
                 , http-types

metadata-store-postgres/metadata-store-postgres.cabal

@@ -47,7 +47,7 @@ library
                         -Wpartial-fields
                         -Wcompat
 
-test-suite integration-tests 
+test-suite integration-tests
   hs-source-dirs:       test
   main-is:              Main.hs
   type:                 exitcode-stdio-1.0
@@ -65,7 +65,7 @@ test-suite integration-tests
                 , esqueleto
                 , github-webhooks
                 , hedgehog
-                , hspec
+                , hspec <2.8
                 , http-client
                 , lens
                 , lens-aeson

metadata-sync/metadata-sync.cabal

@@ -50,7 +50,7 @@ library
                         -Wpartial-fields
                         -Wcompat
 
-test-suite integration-tests 
+test-suite integration-tests
   hs-source-dirs:       test
   main-is:              Main.hs
   type:                 exitcode-stdio-1.0
@@ -66,7 +66,7 @@ test-suite integration-tests
                 , containers
                 , directory
                 , hedgehog
-                , hspec
+                , hspec <2.8
                 , http-client
                 , lens
                 , lens-aeson
@@ -137,4 +137,4 @@ executable metadata-sync
                         -Wincomplete-record-updates
                         -Wincomplete-uni-patterns
                         -Wno-unsafe
-                        -threaded
+                        -threaded

nix/default.nix

@@ -7,19 +7,18 @@ let
   sources = import ./sources.nix { inherit pkgs; }
     // sourcesOverride;
   iohkNix = import sources.iohk-nix {};
-  haskellNix = import sources."haskell.nix" {};
+  haskellNix = import sources."haskell.nix" { inherit system; };
   # use our own nixpkgs if it exists in our sources,
   # otherwise use iohkNix default nixpkgs.
   nixpkgs = if (sources ? nixpkgs)
     then (builtins.trace "Not using IOHK default nixpkgs (use 'niv drop nixpkgs' to use default for better sharing)"
       sources.nixpkgs)
-    else (builtins.trace "Using IOHK default nixpkgs"
-      iohkNix.nixpkgs);
+    else haskellNix.sources.nixpkgs-2105;
 
   # for inclusion in pkgs:
   overlays =
     # Haskell.nix (https://github.com/input-output-hk/haskell.nix)
-    haskellNix.overlays
+    haskellNix.nixpkgsArgs.overlays
     # haskell-nix.haskellLib.extra: some useful extra utility functions for haskell.nix
     ++ iohkNix.overlays.haskell-nix-extra
     # iohkNix: nix utilities and niv:
@@ -40,7 +39,7 @@ let
 
   pkgs = import nixpkgs {
     inherit system crossSystem overlays;
-    config = haskellNix.config // config;
+    config = haskellNix.nixpkgsArgs.config // config;
   };
 
 in pkgs

nix/haskell.nix

@@ -17,7 +17,7 @@
 , borsBuild ? null
 # Version info, to be passed when not building from a git work tree
 , gitrev ? null
-, libsodium ? pkgs.libsodium
+, libsodium-vrf ? pkgs.libsodium-vrf
 }:
 let
   haskell = pkgs.haskell-nix;
@@ -31,7 +31,7 @@ let
 
   pkg-set = haskell-nix.cabalProject ({
     inherit src;
-    compiler-nix-name = "ghc8102";
+    compiler-nix-name = "ghc8107";
     modules = [
       # Add source filtering to local packages
       {
@@ -68,7 +68,7 @@ let
 
       # Musl libc fully static build
       (lib.optionalAttrs stdenv.hostPlatform.isMusl (let
-        staticLibs = with pkgs; [ zlib openssl libffi gmp6 libsodium ];
+        staticLibs = with pkgs; [ zlib openssl libffi gmp6 libsodium-vrf ];
 
         # Module options which add GHC flags and libraries for a fully static build
         fullyStaticOptions = {
@@ -83,7 +83,6 @@ let
         packages.metadata-validator-github.components.tests.integration = fullyStaticOptions;
 
         # systemd can't be statically linked - disable lobemo-scribe-journal
-        packages.cardano-config.flags.systemd = false;
         packages.cardano-node.flags.systemd = false;
 
         # Haddock not working for cross builds and is not needed anyway
@@ -135,7 +134,7 @@ let
   # the revision is sourced from the local git work tree.
   setGitRev = ''${haskellBuildUtils}/bin/set-git-rev "${gitrev'}" $out/bin/*'';
   # package with libsodium:
-  setLibSodium = "ln -s ${libsodium}/bin/libsodium-23.dll $out/bin/libsodium-23.dll";
+  setLibSodium = "ln -s ${libsodium-vrf}/bin/libsodium-23.dll $out/bin/libsodium-23.dll";
   gitrev' = if (gitrev == null)
     then buildPackages.commonLib.commitIdFromGitRepoOrZero ../.git
     else gitrev;