Skip to content

Commit 61aca10

Browse files
committed
use apply-refact-0.11.0.0 on hackage.
1 parent eac6f1b commit 61aca10

File tree

6 files changed

+35
-51
lines changed

6 files changed

+35
-51
lines changed

cabal.project

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ package *
5151

5252
write-ghc-environment-files: never
5353

54-
index-state: 2022-12-13T21:00:15Z
54+
index-state: 2022-12-19T19:08:33Z
5555

5656
constraints:
5757
-- For GHC 9.4, older versions of entropy fail to build on Windows
@@ -82,13 +82,6 @@ source-repository-package
8282
-- https://github.com/tibbe/ekg-json/pull/12
8383
-- END DELETE
8484

85-
-- THIS WILL BE DELETED WHEN apply-refact-0.11 is released.
86-
if (impl(ghc >= 9.2))
87-
source-repository-package
88-
type:git
89-
location: https://github.com/mpickering/apply-refact
90-
tag: 671b02946f8cb2b5062f4d314ec902a8e0989938
91-
9285
allow-newer:
9386
-- ghc-9.4
9487
Chart-diagrams:lens,

configuration-ghc-90.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ let
3838
{ };
3939

4040
retrie = hself.retrie_1_1_0_0;
41+
apply-refact = hself.apply-refact_0_9_3_0;
4142

4243
});
4344
in {

configuration-ghc-94.nix

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@ let
3434
hself.callCabal2nixWithOptions "haskell-language-server" ./.
3535
(pkgs.lib.concatStringsSep " " [ "-fpedantic" "-f-hlint" ]) { };
3636

37-
apply-refact = hself.apply-refactHEAD;
38-
3937
});
4038
in {
4139
inherit disabledPlugins;

flake.lock

Lines changed: 20 additions & 36 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
url = "https://hackage.haskell.org/package/constraints-extras-0.3.2.1/constraints-extras-0.3.2.1.tar.gz";
4848
flake = false;
4949
};
50-
retrie_1100 = {
50+
retrie-1100 = {
5151
url = "https://hackage.haskell.org/package/retrie-1.1.0.0/retrie-1.1.0.0.tar.gz";
5252
flake = false;
5353
};
@@ -88,7 +88,11 @@
8888
flake = false;
8989
};
9090
apply-refact = {
91-
url = "github:July541/apply-refact/ghc-9.4";
91+
url = "https://hackage.haskell.org/package/apply-refact-0.11.0.0/apply-refact-0.11.0.0.tar.gz";
92+
flake = false;
93+
};
94+
apply-refact-0930 = {
95+
url = "https://hackage.haskell.org/package/apply-refact-0.9.3.0/apply-refact-0.9.3.0.tar.gz";
9296
flake = false;
9397
};
9498
implicit-hie = {
@@ -160,8 +164,9 @@
160164
hiedb = hsuper.callCabal2nix "hiedb" inputs.hiedb {};
161165
hw-prim = hsuper.callCabal2nix "hw-prim" inputs.hw-prim {};
162166
retrie = hsuper.callCabal2nix "retrie" inputs.retrie {};
163-
retrie_1_1_0_0 = hsuper.callCabal2nix "retrie" inputs.retrie_1100 {};
164-
apply-refactHEAD = hsuper.callCabal2nix "apply-refact" inputs.apply-refact {};
167+
retrie_1_1_0_0 = hsuper.callCabal2nix "retrie" inputs.retrie-1100 {};
168+
apply-refact = hsuper.callCabal2nix "apply-refact" inputs.apply-refact {};
169+
apply-refact_0_9_3_0 = hsuper.callCabal2nix "apply-refact" inputs.apply-refact-0930 {};
165170
implicit-hie = hsuper.callCabal2nix "implicit-hie" inputs.implicit-hie {};
166171

167172
# https://github.com/NixOS/nixpkgs/issues/140774

plugins/hls-hlint-plugin/hls-hlint-plugin.cabal

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,12 @@ library
5959
, text
6060
, transformers
6161
, unordered-containers
62-
, apply-refact >=0.9.0.0
6362
, ghc-lib-parser
6463
, ghc-lib-parser-ex
64+
if impl(ghc >= 9.2)
65+
build-depends: apply-refact ^>= 0.11.0.0
66+
else
67+
build-depends: apply-refact ^>= 0.9.0.0
6568

6669
cpp-options: -DHLINT_ON_GHC_LIB
6770
ghc-options:

0 commit comments

Comments
 (0)