From 6e6ac3502438c7e8c00eb7c16a695bbfa4def7e3 Mon Sep 17 00:00:00 2001 From: Charles Strahan Date: Wed, 12 Nov 2014 22:32:32 +0000 Subject: [PATCH] more rubyLibs renaming --- doc/language-support.xml | 2 +- nixos/modules/services/misc/redmine.nix | 4 ++-- nixos/modules/services/monitoring/riemann-dash.nix | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/language-support.xml b/doc/language-support.xml index 5e49121e695..2816d7fe0b8 100644 --- a/doc/language-support.xml +++ b/doc/language-support.xml @@ -239,7 +239,7 @@ twisted = buildPythonPackage { $ nix-env -i gem-nix $ gem-nix --no-user-install --nix-file=pkgs/development/interpreters/ruby/generated.nix yajl-ruby - $ nix-build -A rubyLibs.yajl-ruby + $ nix-build -A rubyPackages.yajl-ruby diff --git a/nixos/modules/services/misc/redmine.nix b/nixos/modules/services/misc/redmine.nix index d7e64590f50..4b2f3bbb762 100644 --- a/nixos/modules/services/misc/redmine.nix +++ b/nixos/modules/services/misc/redmine.nix @@ -8,7 +8,7 @@ let cfg = config.services.redmine; ruby = pkgs.ruby; - rubyLibs = pkgs.rubyLibs; + rubyPackages = pkgs.rubyPackages; databaseYml = '' production: @@ -155,7 +155,7 @@ in { environment.HOME = "${pkgs.redmine}/share/redmine"; environment.REDMINE_LANG = "en"; environment.GEM_HOME = "${pkgs.redmine}/share/redmine/vendor/bundle/ruby/1.9.1"; - environment.GEM_PATH = "${rubyLibs.bundler}/lib/ruby/gems/1.9"; + environment.GEM_PATH = "${rubyPackages.bundler}/lib/ruby/gems/1.9"; path = with pkgs; [ imagemagickBig subversion diff --git a/nixos/modules/services/monitoring/riemann-dash.nix b/nixos/modules/services/monitoring/riemann-dash.nix index 148dc046805..32bda033467 100644 --- a/nixos/modules/services/monitoring/riemann-dash.nix +++ b/nixos/modules/services/monitoring/riemann-dash.nix @@ -15,7 +15,7 @@ let launcher = writeScriptBin "riemann-dash" '' #!/bin/sh - exec ${rubyLibs.riemann_dash}/bin/riemann-dash ${conf} + exec ${rubyPackages.riemann_dash}/bin/riemann-dash ${conf} ''; in {