Skip to content

Remove custom version of operational #2249

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Oct 5, 2021
Merged

Remove custom version of operational #2249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
86f3025
Remove operational custom version
jneira Sep 30, 2021
25e1a77
Update index to get new version
jneira Sep 30, 2021
fea0ba6
Use operational released version
jneira Sep 30, 2021
9aac173
Remove custom operational version in nix
jneira Sep 30, 2021
2e21426
Remove operational for ghc-9.2
jneira Sep 30, 2021
c38d903
Add Nix override for operational
michaelpj Oct 1, 2021
a59cb50
Merge branch 'master' into jneira/remove-operational
jneira Oct 4, 2021
785563a
Merge branch 'master' into jneira/remove-operational
jneira Oct 4, 2021
395c75c
Merge branch 'master' into jneira/remove-operational
jneira Oct 5, 2021
fef4e5a
Merge branch 'master' into jneira/remove-operational
mergify[bot] Oct 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions cabal-ghc901.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,15 +53,9 @@ source-repository-package
subdir: dependent-sum-template
-- https://github.com/obsidiansystems/dependent-sum/pull/59

-- benchmark dependency
source-repository-package
type: git
location: https://github.com/HeinrichApfelmus/operational
tag: 16e19aaf34e286f3d27b3988c61040823ec66537

write-ghc-environment-files: never

index-state: 2021-09-16T07:00:23Z
index-state: 2021-09-29T21:38:47Z

constraints:
-- These plugins don't work on GHC9 yet
Expand Down
8 changes: 1 addition & 7 deletions cabal-ghc921.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,6 @@ source-repository-package
tag: b6245884ae83e00dd2b5261762549b37390179f8
-- https://github.com/lspitzner/czipwith/pull/2

-- benchmark dependency
source-repository-package
type: git
location: https://github.com/HeinrichApfelmus/operational
tag: 16e19aaf34e286f3d27b3988c61040823ec66537

-- Head of hiedb
source-repository-package
type: git
Expand All @@ -57,7 +51,7 @@ source-repository-package

write-ghc-environment-files: never

index-state: 2021-09-16T07:00:23Z
index-state: 2021-09-29T21:38:47Z

constraints:
-- These plugins doesn't work on GHC9 yet
Expand Down
15 changes: 8 additions & 7 deletions configuration-ghc-901.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,6 @@ let

ormolu = hself.ormolu_0_2_0_0;

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

diagrams-core = hself.diagrams-core_1_5_0;

diagrams-lib = hself.diagrams-lib_1_4_4;
Expand All @@ -77,6 +70,14 @@ let

monoid-extras = hself.monoid-extras_0_6;

# Released on hackage, but not in nixpkgs yet
operational = hself.callCabal2nix "operational" (pkgs.fetchFromGitHub {
owner = "HeinrichApfelmus";
repo = "operational";
rev = "2b33e0055066cf92a302ee2c32058dfa44ac8882";
sha256 = "sha256-nwB4vssm4wUTkVryjQVb3peOwR6js7vdekkbaWedHNI=";
}) { };

# Re-generate HLS drv excluding some plugins
haskell-language-server =
hself.callCabal2nixWithOptions "haskell-language-server" ./.
Expand Down
4 changes: 1 addition & 3 deletions stack-9.0.1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,14 +78,12 @@ extra-deps:
- Chart-1.9.3@sha256:640a38463318b070d80a049577e4f0b3322df98290abb7afcf0cb74a4ad5b512,2948
- Chart-diagrams-1.9.3@sha256:1535d5d0d3febca63138cecfde234315212611c21bb7f4358b2dae8c55c59003,1801
- statestack-0.3@sha256:be43ce2cd790a4732b88cdc9480458503cb5e307b4f79a502d99d5b3d417730e,1135
- operational-0.2.4.0

- github: diagrams/active
commit: ca23431a8dfa013992f9164ccc882a3277361f17
# https://github.com/diagrams/active/pull/36

- github: HeinrichApfelmus/operational
commit: 16e19aaf34e286f3d27b3988c61040823ec66537

# end of shake-bench dpendencies

# due to floskell-0.10.5 and diagrams-core-1.5.0
Expand Down