Skip to content

Commit

Permalink
Use operational master commit to fix build for ghc-9.0.1 (#2017)
Browse files Browse the repository at this point in the history
* Use operational master

* Use operational master in cabal.project

* Update configuration-ghc-901.nix

Co-authored-by: Potato Hatsue <berberman@yandex.com>
  • Loading branch information
jneira and berberman committed Jul 14, 2021
1 parent a0f6f5f commit 6e47614
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 8 deletions.
5 changes: 2 additions & 3 deletions cabal-ghc901.project
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,8 @@ source-repository-package
-- benchmark dependency
source-repository-package
type: git
location: https://github.com/berberman/operational
tag: 0e062895678f49fd673ae493371262cfb8c5ab56
-- https://github.com/HeinrichApfelmus/operational/pull/26
location: https://github.com/HeinrichApfelmus/operational
tag: 16e19aaf34e286f3d27b3988c61040823ec66537

write-ghc-environment-files: never

Expand Down
4 changes: 2 additions & 2 deletions configuration-ghc-901.nix
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,9 @@ let
ghc-lib-parser-ex = hself.ghc-lib-parser-ex_9_0_0_4;

operational = hself.callCabal2nix "operational" (pkgs.fetchFromGitHub {
owner = "berberman";
owner = "HeinrichApfelmus";
repo = "operational";
rev = "0e062895678f49fd673ae493371262cfb8c5ab56";
rev = "16e19aaf34e286f3d27b3988c61040823ec66537";
sha256 = "P+aocEcqCN8klnW3IMrmIqq6ztBZJxk4sBp1ewN6YaA=";
}) { };

Expand Down
5 changes: 2 additions & 3 deletions stack-9.0.1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,8 @@ extra-deps:
# https://github.com/diagrams/active/pull/36

# benchmark dependency
- github: berberman/operational
commit: 0e062895678f49fd673ae493371262cfb8c5ab56
# https://github.com/HeinrichApfelmus/operational/pull/26
- github: HeinrichApfelmus/operational
commit: 16e19aaf34e286f3d27b3988c61040823ec66537

configure-options:
ghcide:
Expand Down

0 comments on commit 6e47614

Please sign in to comment.