From 86f3025a001e3ba98621cfd350de3fe6086ac7b0 Mon Sep 17 00:00:00 2001 From: Javier Neira Date: Thu, 30 Sep 2021 07:36:38 +0200 Subject: [PATCH 1/6] Remove operational custom version --- cabal-ghc901.project | 6 ------ 1 file changed, 6 deletions(-) diff --git a/cabal-ghc901.project b/cabal-ghc901.project index 325b3763b7..d9f33caf76 100644 --- a/cabal-ghc901.project +++ b/cabal-ghc901.project @@ -53,12 +53,6 @@ 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 From 25e1a776cd7ce300cbf49bad82f49914b02c16a3 Mon Sep 17 00:00:00 2001 From: Javier Neira Date: Thu, 30 Sep 2021 07:38:48 +0200 Subject: [PATCH 2/6] Update index to get new version --- cabal-ghc901.project | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cabal-ghc901.project b/cabal-ghc901.project index d9f33caf76..ff21bf3017 100644 --- a/cabal-ghc901.project +++ b/cabal-ghc901.project @@ -55,7 +55,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 don't work on GHC9 yet From fea0ba63c362e130945c2d7e68371e69610cfd0f Mon Sep 17 00:00:00 2001 From: Javier Neira Date: Thu, 30 Sep 2021 07:41:11 +0200 Subject: [PATCH 3/6] Use operational released version --- stack-9.0.1.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/stack-9.0.1.yaml b/stack-9.0.1.yaml index 7de85baba2..cd9cd63321 100644 --- a/stack-9.0.1.yaml +++ b/stack-9.0.1.yaml @@ -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 From 9aac173f82c6fb499fac8eb0f1c8afd1fa225de6 Mon Sep 17 00:00:00 2001 From: Javier Neira Date: Thu, 30 Sep 2021 07:42:36 +0200 Subject: [PATCH 4/6] Remove custom operational version in nix --- configuration-ghc-901.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/configuration-ghc-901.nix b/configuration-ghc-901.nix index f10724f125..cd4ff64350 100644 --- a/configuration-ghc-901.nix +++ b/configuration-ghc-901.nix @@ -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; From 2e214269565712788a5ac0ec1251172a98b66c3a Mon Sep 17 00:00:00 2001 From: Javier Neira Date: Thu, 30 Sep 2021 07:58:09 +0200 Subject: [PATCH 5/6] Remove operational for ghc-9.2 --- cabal-ghc921.project | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/cabal-ghc921.project b/cabal-ghc921.project index 96fa2f2002..dc6f41ec17 100644 --- a/cabal-ghc921.project +++ b/cabal-ghc921.project @@ -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 @@ -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 From c38d903da21ad8e906dea21c38adeb59a1c49889 Mon Sep 17 00:00:00 2001 From: Michael Peyton Jones Date: Fri, 1 Oct 2021 12:49:19 +0100 Subject: [PATCH 6/6] Add Nix override for operational Nixpkgs hasn't caught up with hackage yet. --- configuration-ghc-901.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/configuration-ghc-901.nix b/configuration-ghc-901.nix index cd4ff64350..33c0cfeee4 100644 --- a/configuration-ghc-901.nix +++ b/configuration-ghc-901.nix @@ -70,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" ./.