File tree Expand file tree Collapse file tree 6 files changed +35
-51
lines changed Expand file tree Collapse file tree 6 files changed +35
-51
lines changed Original file line number Diff line number Diff line change @@ -51,7 +51,7 @@ package *
51
51
52
52
write-ghc-environment-files : never
53
53
54
- index-state : 2022-12-13T21:00 :15Z
54
+ index-state : 2022-12-19T19:08 :33Z
55
55
56
56
constraints :
57
57
-- For GHC 9.4, older versions of entropy fail to build on Windows
@@ -82,13 +82,6 @@ source-repository-package
82
82
-- https://github.com/tibbe/ekg-json/pull/12
83
83
-- END DELETE
84
84
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
-
92
85
allow-newer :
93
86
-- ghc-9.4
94
87
Chart-diagrams :lens,
Original file line number Diff line number Diff line change 38
38
{ } ;
39
39
40
40
retrie = hself . retrie_1_1_0_0 ;
41
+ apply-refact = hself . apply-refact_0_9_3_0 ;
41
42
42
43
} ) ;
43
44
in {
Original file line number Diff line number Diff line change 34
34
hself . callCabal2nixWithOptions "haskell-language-server" ./.
35
35
( pkgs . lib . concatStringsSep " " [ "-fpedantic" "-f-hlint" ] ) { } ;
36
36
37
- apply-refact = hself . apply-refactHEAD ;
38
-
39
37
} ) ;
40
38
in {
41
39
inherit disabledPlugins ;
Original file line number Diff line number Diff line change 47
47
url = "https://hackage.haskell.org/package/constraints-extras-0.3.2.1/constraints-extras-0.3.2.1.tar.gz" ;
48
48
flake = false ;
49
49
} ;
50
- retrie_1100 = {
50
+ retrie-1100 = {
51
51
url = "https://hackage.haskell.org/package/retrie-1.1.0.0/retrie-1.1.0.0.tar.gz" ;
52
52
flake = false ;
53
53
} ;
88
88
flake = false ;
89
89
} ;
90
90
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" ;
92
96
flake = false ;
93
97
} ;
94
98
implicit-hie = {
160
164
hiedb = hsuper . callCabal2nix "hiedb" inputs . hiedb { } ;
161
165
hw-prim = hsuper . callCabal2nix "hw-prim" inputs . hw-prim { } ;
162
166
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 { } ;
165
170
implicit-hie = hsuper . callCabal2nix "implicit-hie" inputs . implicit-hie { } ;
166
171
167
172
# https://github.com/NixOS/nixpkgs/issues/140774
Original file line number Diff line number Diff line change @@ -59,9 +59,12 @@ library
59
59
, text
60
60
, transformers
61
61
, unordered-containers
62
- , apply-refact >= 0.9.0.0
63
62
, ghc-lib-parser
64
63
, 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
65
68
66
69
cpp-options : -DHLINT_ON_GHC_LIB
67
70
ghc-options :
You can’t perform that action at this time.
0 commit comments