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

Merge pull request #52860 from marsam/init-ruby-26

Browse Source 
ruby_2_6: init at 2.6.0
This commit is contained in:
Alyssa Ross 2018-12-26 20:49:08 +00:00 committed by GitHub
commit 626cc7eb21
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,7 +32,7 @@ let
generic = { version, sha256 }: let generic = { version, sha256 }: let
ver = version; ver = version;
tag = ver.gitTag; tag = ver.gitTag;
isRuby25 = ver.majMin == "2.5"; atLeast25 = lib.versionAtLeast ver.majMin "2.5";
baseruby = self.override { useRailsExpress = false; }; baseruby = self.override { useRailsExpress = false; };
self = lib.makeOverridable ( self = lib.makeOverridable (
{ stdenv, buildPackages, lib { stdenv, buildPackages, lib
@ -56,7 +56,7 @@ let
rev = tag; rev = tag;
sha256 = sha256.git; sha256 = sha256.git;
} else fetchurl { } else fetchurl {
url = "http://cache.ruby-lang.org/pub/ruby/${ver.majMin}/ruby-${ver}.tar.gz"; url = "https://cache.ruby-lang.org/pub/ruby/${ver.majMin}/ruby-${ver}.tar.gz";
sha256 = sha256.src; sha256 = sha256.src;
}; };
in in
@ -86,7 +86,7 @@ let
++ (op opensslSupport openssl) ++ (op opensslSupport openssl)
++ (op gdbmSupport gdbm) ++ (op gdbmSupport gdbm)
++ (op yamlSupport libyaml) ++ (op yamlSupport libyaml)
++ (op isRuby25 autoconf) ++ (op atLeast25 autoconf)
# Looks like ruby fails to build on darwin without readline even if curses # Looks like ruby fails to build on darwin without readline even if curses
# support is not enabled, so add readline to the build inputs if curses # support is not enabled, so add readline to the build inputs if curses
# support is disabled (if it's enabled, we already have it) and we're # support is disabled (if it's enabled, we already have it) and we're
@ -109,7 +109,7 @@ let
popd popd
''; '';
postPatch = if isRuby25 then '' postPatch = if atLeast25 then ''
sed -i configure.ac -e '/config.guess/d' sed -i configure.ac -e '/config.guess/d'
cp --remove-destination ${config}/config.guess tool/ cp --remove-destination ${config}/config.guess tool/
cp --remove-destination ${config}/config.sub tool/ cp --remove-destination ${config}/config.sub tool/
@ -224,4 +224,12 @@ in {
git = "0r9mgvqk6gj8pc9q6qmy7j2kbln7drc8wy67sb2ij8ciclcw9nn2"; git = "0r9mgvqk6gj8pc9q6qmy7j2kbln7drc8wy67sb2ij8ciclcw9nn2";
}; };
}; };
ruby_2_6 = generic {
version = rubyVersion "2" "6" "0" "";
sha256 = {
src = "0wn0gxlx6xhhqrm2caxp0h6cj4nw7knnv5gh27qqzj0i9a95phzk";
git = "0bwbl4hz18dd5aij2l4s6xy90dc17d03kk577gdl34l9mbd9m7mn";
};
};
} }

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

@ -16,4 +16,6 @@ rec {
"${patchSet}/patches/ruby/2.5/head/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.5/head/railsexpress/02-improve-gc-stats.patch"
"${patchSet}/patches/ruby/2.5/head/railsexpress/03-more-detailed-stacktrace.patch" "${patchSet}/patches/ruby/2.5/head/railsexpress/03-more-detailed-stacktrace.patch"
]; ];
"2.6.0" = ops useRailsExpress [ # no Rails Express patchset yet (2018-12-26)
];
} }

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

@ -8073,7 +8073,8 @@ in
}) })
ruby_2_3 ruby_2_3
ruby_2_4 ruby_2_4
ruby_2_5; ruby_2_5
ruby_2_6;
ruby = ruby_2_5; ruby = ruby_2_5;