Merge pull request #79528 from clkamp/fix-stylish-haskell

Fix stylish haskell by using HsYAML 0.2.1.0
NixOS · Feb 8, 2020 · 89ae888 · 89ae888
2 parents 4e95bba + e65ae09
commit 89ae888
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1393,4 +1393,14 @@ self: super: {
   # See https://github.com/ekmett/perhaps/pull/5
   perhaps = doJailbreak super.perhaps;
 
+  # it depends on HsYAML >=0.2.0 && < 0.3, so use 0.2.1.0
+  HsYAML-aeson = super.HsYAML-aeson.override {
+    HsYAML = self.HsYAML_0_2_1_0;
+  };
+
+  # it depends on HsYAML >=0.2.0 && < 0.3, so use 0.2.1.0
+  stylish-haskell = super.stylish-haskell.override {
+    HsYAML = self.HsYAML_0_2_1_0;
+  };
+
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -6204,7 +6204,6 @@ broken-packages:
   - hsx-xhtml
   - hsx2hs
   - hsXenCtrl
-  - HsYAML-aeson
   - hsyscall
   - hsyslog-tcp
   - hsyslog-udp
@@ -9389,7 +9388,6 @@ broken-packages:
   - structures
   - stt
   - stunts
-  - stylish-haskell
   - stylist
   - stylized
   - suavemente