public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PR comments

Browse Source
This commit is contained in:
Jude Taylor 2015-09-26 06:23:25 -07:00
parent 1223210576
commit 68e802c46b
2 changed files with 110 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/interpreters/ruby/default.nix
View File

@ -10,7 +10,7 @@ let
patchSet = import ./rvm-patchsets.nix { inherit fetchFromGitHub; }; patchSet = import ./rvm-patchsets.nix { inherit fetchFromGitHub; };
config = import ./config.nix { inherit fetchFromSavannah; }; config = import ./config.nix { inherit fetchFromSavannah; };
generic = { majorVersion, minorVersion, teenyVersion, patchLevel, sha256 }: let generic = { majorVersion, minorVersion, teenyVersion, patchLevel, sha256 }: let
versionNoPatch = "${majorVersion}.${minorVersion}.${teenyVersion}"; versionNoPatch = "${majorVersion}.${minorVersion}.${teenyVersion}";
version = "${versionNoPatch}-p${patchLevel}"; version = "${versionNoPatch}-p${patchLevel}";
fullVersionName = if patchLevel != "0" && stdenv.lib.versionOlder versionNoPatch "2.1" fullVersionName = if patchLevel != "0" && stdenv.lib.versionOlder versionNoPatch "2.1"

2
pkgs/top-level/all-packages.nix
View File

@ -5088,7 +5088,7 @@ let
bundlerEnv = callPackage ../development/interpreters/ruby/bundler-env { }; bundlerEnv = callPackage ../development/interpreters/ruby/bundler-env { };
ruby_1_8_7 = callPackage ../development/interpreters/ruby/ruby-1.8.7.nix { }; ruby_1_8_7 = callPackage ../development/interpreters/ruby/ruby-1.8.7.nix { };
inherit (callPackage ../development/interpreters/ruby {}) inherit (callPackages ../development/interpreters/ruby {})
# TODO: uncomment when ruby_1_8_7 doesn't need autoconf # TODO: uncomment when ruby_1_8_7 doesn't need autoconf
# ruby_1_8_7 # ruby_1_8_7
ruby_1_9_3 ruby_1_9_3