Skip to content

Commit

Permalink
Merge #2947
Browse files Browse the repository at this point in the history
2947: Add Nix expressions required to use newest fmt library r=sevanspowell a=sevanspowell

- We want to update to the newest fmt library (fmt-6.3.0) to make use of new Buildable instances.
- Ran `niv update haskell.nix` to get latest hackage.nix, which provides us with the Nix expressions for fmt-6.3.0.
- There is some build issue with haskell-language-server-1.2.0.0 and the version of haskell.nix we've pinned, so update haskell-language-server to 1.4.0.0.
- Update the index-state so we can build it.
- `./nix/regenerate.sh`: regenerate the materialized files


Co-authored-by: Samuel Evans-Powell <mail@sevanspowell.net>
Co-authored-by: IOHK <devops+stack-project@iohk.io>
  • Loading branch information
3 people committed Oct 14, 2021
2 parents fdc666b + ced95e1 commit 99143c9
Show file tree
Hide file tree
Showing 21 changed files with 387 additions and 407 deletions.
4 changes: 2 additions & 2 deletions cabal.project
Expand Up @@ -38,8 +38,8 @@
--
--------------------------------------------------------------------------------

index-state: 2021-06-30T00:00:00Z
with-compiler: ghc-8.10.5
index-state: 2021-10-05T00:00:00Z
with-compiler: ghc-8.10.7

packages:
lib/core/
Expand Down
2 changes: 1 addition & 1 deletion lib/core/src/Cardano/Wallet/Compat.hs
Expand Up @@ -2,7 +2,7 @@
-- Copyright: © 2021 IOHK
-- License: Apache-2.0
--
-- Temporary compatibility functions for the ghc-8.10.4 update.
-- Temporary compatibility functions for the ghc-8.10 update.

module Cardano.Wallet.Compat
( (^?)
Expand Down
8 changes: 4 additions & 4 deletions nix/.stack.nix/default.nix

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion nix/default.nix
Expand Up @@ -28,7 +28,7 @@ let
(builtins.trace "Not using Haskell.nix nixpkgs pin (use 'niv drop nixpkgs' to use default for better sharing)"
sources.nixpkgs)
# else iohkNixMain.nixpkgs;
else haskellNix.sources.nixpkgs-unstable;
else haskellNix.sources.nixpkgs;

# for inclusion in pkgs:
overlays =
Expand Down
4 changes: 4 additions & 0 deletions nix/haskell.nix
Expand Up @@ -302,6 +302,10 @@ let
# "stm" "terminfo"
];
}
{
packages.cardano-wallet-core.components.library.build-tools = [ pkgs.buildPackages.buildPackages.gitMinimal ];
packages.cardano-config.components.library.build-tools = [ pkgs.buildPackages.buildPackages.gitMinimal ];
}
];
};

Expand Down
78 changes: 39 additions & 39 deletions nix/materialized/cabal-cache/default.nix

Large diffs are not rendered by default.

32 changes: 16 additions & 16 deletions nix/materialized/cabal-install/default.nix

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

This file was deleted.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 99143c9

Please sign in to comment.