summary refs log tree commit diff
path: root/pkgs/development/haskell-modules/configuration-common.nix
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2015-04-27 15:25:54 +0200
committerPeter Simons <simons@cryp.to>2015-04-27 17:24:14 +0200
commit6db9c9a2bbb80bd6c3bd0f5b79d987c39c1e5aa6 (patch)
tree49ef72fb48f1dd88812e213f98bfaeb48bf16e19 /pkgs/development/haskell-modules/configuration-common.nix
parent2028ece4a8c551050b6a2c92da4bfbf631022654 (diff)
downloadnixpkgs-6db9c9a2bbb80bd6c3bd0f5b79d987c39c1e5aa6.tar
nixpkgs-6db9c9a2bbb80bd6c3bd0f5b79d987c39c1e5aa6.tar.gz
nixpkgs-6db9c9a2bbb80bd6c3bd0f5b79d987c39c1e5aa6.tar.bz2
nixpkgs-6db9c9a2bbb80bd6c3bd0f5b79d987c39c1e5aa6.tar.lz
nixpkgs-6db9c9a2bbb80bd6c3bd0f5b79d987c39c1e5aa6.tar.xz
nixpkgs-6db9c9a2bbb80bd6c3bd0f5b79d987c39c1e5aa6.tar.zst
nixpkgs-6db9c9a2bbb80bd6c3bd0f5b79d987c39c1e5aa6.zip
haskell-configuration-common: build hruby with ruby 2.1
Our default version, 1.9, is not supported.
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-common.nix')
-rw-r--r--pkgs/development/haskell-modules/configuration-common.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 2e2a5ba6a1c..173ca92dd3e 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; };