From dd1f0a1518ef09a2b52f9ab6bdf6aa85616396df Mon Sep 17 00:00:00 2001 From: Samuel Rivas Date: Mon, 27 Apr 2020 08:21:12 +0200 Subject: [PATCH] stylish-haskell: Unmark broken in hackage-packages HsYAML-aeson: Unmark broken As suggested in the review --- pkgs/development/haskell-modules/configuration-common.nix | 6 +++--- pkgs/development/haskell-modules/hackage-packages.nix | 4 ---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 2f58c13faed7..1f5a6089cd97 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1432,11 +1432,11 @@ self: super: { # HsYAML-aeson depends on a more modern version of HsYAML than the one # available in stackage's LTS 14.23 - HsYAML-aeson = unmarkBroken (super.HsYAML-aeson.override { + HsYAML-aeson = super.HsYAML-aeson.override { HsYAML = self.HsYAML_0_2_1_0; - }); + }; - stylish-haskell = (unmarkBroken super.stylish-haskell).override { + stylish-haskell = super.stylish-haskell.override { HsYAML = self.HsYAML_0_2_1_0; }; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index b1c8f5b67c0b..9bf660173a07 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -10861,8 +10861,6 @@ self: { ]; description = "JSON to YAML Adapter"; license = stdenv.lib.licenses.gpl2Plus; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "Hsed" = callPackage @@ -234129,8 +234127,6 @@ self: { ]; description = "Haskell code prettifier"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "stylist" = callPackage