From b6944026c61fa7b340e2f6746cd93118307b7c2f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 19 Apr 2015 23:53:33 +0200 Subject: [PATCH] haskell-hruby: add missing system dependency and disable broken test suite Work around https://github.com/bartavelle/hruby/issues/10 and https://github.com/bartavelle/hruby/issues/9 as suggested in https://github.com/NixOS/nixpkgs/pull/7442. --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++++ pkgs/development/haskell-modules/hackage-packages.nix | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index cc875b7d33c9..c6e25b10e2aa 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -22,6 +22,10 @@ self: super: { statistics = dontCheck super.statistics; text = dontCheck super.text; + # https://github.com/bartavelle/hruby/issues/10 + # https://github.com/bartavelle/hruby/issues/9 + hruby = addExtraLibrary (dontCheck super.hruby) pkgs.ruby_2_1; + # Doesn't compile with lua 5.2. hslua = super.hslua.override { lua = pkgs.lua5_1; }; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 41fe60ef559c..6f4f4a8ef4bf 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -65613,7 +65613,6 @@ self: { jailbreak = true; description = "Embed a Ruby intepreter in your Haskell program !"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hs-GeoIP" = callPackage