From 6db9c9a2bbb80bd6c3bd0f5b79d987c39c1e5aa6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 27 Apr 2015 15:25:54 +0200 Subject: [PATCH] haskell-configuration-common: build hruby with ruby 2.1 Our default version, 1.9, is not supported. --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 2e2a5ba6a1cc..173ca92dd3e6 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -22,8 +22,8 @@ self: super: { statistics = dontCheck super.statistics; text = dontCheck super.text; - # https://github.com/bartavelle/hruby/issues/10 - hruby = addExtraLibrary super.hruby pkgs.ruby_2_1; + # The package doesn't compile with ruby 1.9, which is our default at the moment. + hruby = super.hruby.override { ruby = pkgs.ruby_2_1; }; # Doesn't compile with lua 5.2. hslua = super.hslua.override { lua = pkgs.lua5_1; };