diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-10-22 08:39:18 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-10-22 08:39:18 +0000 |
commit | 403acf82248d3cdbc0beda0c5c373c1b46b9b636 (patch) | |
tree | e3913fd47e374b9525858fa1e61064fd1113e475 /nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix | |
parent | b5faee77a2dceb31545db209ebee1476acb71198 (diff) | |
parent | 8dfad603247387df1df4826b8bea58efc5d012d8 (diff) | |
download | nixlib-403acf82248d3cdbc0beda0c5c373c1b46b9b636.tar nixlib-403acf82248d3cdbc0beda0c5c373c1b46b9b636.tar.gz nixlib-403acf82248d3cdbc0beda0c5c373c1b46b9b636.tar.bz2 nixlib-403acf82248d3cdbc0beda0c5c373c1b46b9b636.tar.lz nixlib-403acf82248d3cdbc0beda0c5c373c1b46b9b636.tar.xz nixlib-403acf82248d3cdbc0beda0c5c373c1b46b9b636.tar.zst nixlib-403acf82248d3cdbc0beda0c5c373c1b46b9b636.zip |
Merge commit '8dfad603247387df1df4826b8bea58efc5d012d8'
Diffstat (limited to 'nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix')
-rw-r--r-- | nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix b/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix index 29e7aab2491a..0c1bf8518ea4 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -71,10 +71,9 @@ self: super: { Cabal-syntax = self.Cabal-syntax_3_8_1_0; }; - fourmolu = self.fourmolu_0_10_1_0.override { - Cabal-syntax = self.Cabal-syntax_3_8_1_0; - }; + stylish-haskell = doJailbreak super.stylish-haskell_0_14_4_0; + haskell-language-server = disableCabalFlag "fourmolu" (super.haskell-language-server.override { hls-fourmolu-plugin = null; }); # For GHC < 9.4, some packages need data-array-byte as an extra dependency hashable = addBuildDepends [ self.data-array-byte ] super.hashable; primitive = addBuildDepends [ self.data-array-byte ] super.primitive; |