2017-10-29 20:51:16 +01:00
|
|
|
{ stdenv, buildPackages, lib
|
2019-09-07 15:02:40 +02:00
|
|
|
, fetchurl, fetchpatch, fetchFromSavannah, fetchFromGitHub
|
2015-09-26 15:25:01 +02:00
|
|
|
, zlib, openssl, gdbm, ncurses, readline, groff, libyaml, libffi, autoreconfHook, bison
|
2018-05-04 19:56:38 +02:00
|
|
|
, autoconf, libiconv, libobjc, libunwind, Foundation
|
|
|
|
, buildEnv, bundler, bundix
|
2019-05-18 19:45:38 +02:00
|
|
|
, makeWrapper, buildRubyGem, defaultGemConfig
|
2015-09-26 15:25:01 +02:00
|
|
|
} @ args:
|
|
|
|
|
|
|
|
let
|
2016-09-20 18:41:16 +02:00
|
|
|
op = lib.optional;
|
|
|
|
ops = lib.optionals;
|
|
|
|
opString = lib.optionalString;
|
2015-09-26 15:25:01 +02:00
|
|
|
patchSet = import ./rvm-patchsets.nix { inherit fetchFromGitHub; };
|
|
|
|
config = import ./config.nix { inherit fetchFromSavannah; };
|
2019-06-16 21:59:06 +02:00
|
|
|
rubygems = import ./rubygems { inherit stdenv lib fetchurl; };
|
2015-09-26 15:25:01 +02:00
|
|
|
|
2016-09-20 18:41:16 +02:00
|
|
|
# Contains the ruby version heuristics
|
|
|
|
rubyVersion = import ./ruby-version.nix { inherit lib; };
|
|
|
|
|
2017-10-29 20:51:16 +01:00
|
|
|
# Needed during postInstall
|
|
|
|
buildRuby =
|
|
|
|
if stdenv.hostPlatform == stdenv.buildPlatform
|
|
|
|
then "$out/bin/ruby"
|
|
|
|
else "${buildPackages.ruby}/bin/ruby";
|
|
|
|
|
2016-09-20 18:41:16 +02:00
|
|
|
generic = { version, sha256 }: let
|
|
|
|
ver = version;
|
|
|
|
tag = ver.gitTag;
|
2018-12-25 20:25:45 +01:00
|
|
|
atLeast25 = lib.versionAtLeast ver.majMin "2.5";
|
2019-05-06 00:37:43 +02:00
|
|
|
baseruby = self.override {
|
|
|
|
useRailsExpress = false;
|
|
|
|
docSupport = false;
|
2019-05-18 19:45:38 +02:00
|
|
|
rubygemsSupport = false;
|
2019-05-06 00:37:43 +02:00
|
|
|
};
|
2015-09-26 15:25:01 +02:00
|
|
|
self = lib.makeOverridable (
|
2018-05-04 19:56:38 +02:00
|
|
|
{ stdenv, buildPackages, lib
|
2019-09-07 15:02:40 +02:00
|
|
|
, fetchurl, fetchpatch, fetchFromSavannah, fetchFromGitHub
|
2015-09-26 15:25:01 +02:00
|
|
|
, useRailsExpress ? true
|
2019-05-18 19:45:38 +02:00
|
|
|
, rubygemsSupport ? true
|
2015-09-26 15:25:01 +02:00
|
|
|
, zlib, zlibSupport ? true
|
|
|
|
, openssl, opensslSupport ? true
|
|
|
|
, gdbm, gdbmSupport ? true
|
|
|
|
, ncurses, readline, cursesSupport ? true
|
2019-05-06 00:39:16 +02:00
|
|
|
, groff, docSupport ? true
|
2015-09-26 15:25:01 +02:00
|
|
|
, libyaml, yamlSupport ? true
|
|
|
|
, libffi, fiddleSupport ? true
|
|
|
|
, autoreconfHook, bison, autoconf
|
2018-05-04 19:56:38 +02:00
|
|
|
, buildEnv, bundler, bundix
|
|
|
|
, libiconv, libobjc, libunwind, Foundation
|
2019-05-18 19:45:38 +02:00
|
|
|
, makeWrapper, buildRubyGem, defaultGemConfig
|
2015-09-26 15:25:01 +02:00
|
|
|
}:
|
2019-04-28 14:30:52 +02:00
|
|
|
stdenv.mkDerivation rec {
|
2019-08-13 23:52:01 +02:00
|
|
|
pname = "ruby";
|
|
|
|
inherit version;
|
2019-04-28 14:30:52 +02:00
|
|
|
|
|
|
|
src = if useRailsExpress then fetchFromGitHub {
|
2015-09-26 15:25:01 +02:00
|
|
|
owner = "ruby";
|
|
|
|
repo = "ruby";
|
|
|
|
rev = tag;
|
|
|
|
sha256 = sha256.git;
|
|
|
|
} else fetchurl {
|
2018-12-25 20:25:45 +01:00
|
|
|
url = "https://cache.ruby-lang.org/pub/ruby/${ver.majMin}/ruby-${ver}.tar.gz";
|
2015-09-26 15:25:01 +02:00
|
|
|
sha256 = sha256.src;
|
|
|
|
};
|
|
|
|
|
|
|
|
# Have `configure' avoid `/usr/bin/nroff' in non-chroot builds.
|
2018-02-13 21:11:17 +01:00
|
|
|
NROFF = if docSupport then "${groff}/bin/nroff" else null;
|
2015-09-26 15:25:01 +02:00
|
|
|
|
2019-05-06 00:38:52 +02:00
|
|
|
outputs = [ "out" ] ++ lib.optional docSupport "devdoc";
|
|
|
|
|
2018-12-11 09:01:58 +01:00
|
|
|
nativeBuildInputs = [ autoreconfHook bison ]
|
|
|
|
++ (op docSupport groff)
|
|
|
|
++ op (stdenv.buildPlatform != stdenv.hostPlatform) buildPackages.ruby;
|
2017-09-19 04:27:05 +02:00
|
|
|
buildInputs =
|
|
|
|
(op fiddleSupport libffi)
|
2015-09-26 15:25:01 +02:00
|
|
|
++ (ops cursesSupport [ ncurses readline ])
|
|
|
|
++ (op zlibSupport zlib)
|
|
|
|
++ (op opensslSupport openssl)
|
|
|
|
++ (op gdbmSupport gdbm)
|
|
|
|
++ (op yamlSupport libyaml)
|
2018-12-25 20:25:45 +01:00
|
|
|
++ (op atLeast25 autoconf)
|
2015-09-26 15:25:01 +02:00
|
|
|
# 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 disabled (if it's enabled, we already have it) and we're
|
|
|
|
# running on darwin
|
2018-05-04 19:56:38 +02:00
|
|
|
++ op (!cursesSupport && stdenv.isDarwin) readline
|
|
|
|
++ ops stdenv.isDarwin [ libiconv libobjc libunwind Foundation ];
|
2015-09-26 15:25:01 +02:00
|
|
|
|
|
|
|
enableParallelBuilding = true;
|
|
|
|
|
2016-03-02 11:05:01 +01:00
|
|
|
patches =
|
|
|
|
(import ./patchsets.nix {
|
2019-09-07 15:02:40 +02:00
|
|
|
inherit patchSet useRailsExpress ops fetchpatch;
|
2016-09-20 18:41:16 +02:00
|
|
|
patchLevel = ver.patchLevel;
|
2019-08-13 23:52:01 +02:00
|
|
|
}).${ver.majMinTiny};
|
2015-09-26 15:25:01 +02:00
|
|
|
|
2019-05-18 19:45:38 +02:00
|
|
|
postUnpack = opString rubygemsSupport ''
|
2019-05-19 17:15:07 +02:00
|
|
|
rm -rf $sourceRoot/{lib,test}/rubygems*
|
|
|
|
cp -r ${rubygems}/lib/rubygems* $sourceRoot/lib
|
|
|
|
cp -r ${rubygems}/test/rubygems $sourceRoot/test
|
2015-09-26 15:25:01 +02:00
|
|
|
'';
|
|
|
|
|
2018-12-25 20:25:45 +01:00
|
|
|
postPatch = if atLeast25 then ''
|
2018-01-02 10:50:37 +01:00
|
|
|
sed -i configure.ac -e '/config.guess/d'
|
2018-10-18 03:05:14 +02:00
|
|
|
cp --remove-destination ${config}/config.guess tool/
|
|
|
|
cp --remove-destination ${config}/config.sub tool/
|
2018-01-02 10:50:37 +01:00
|
|
|
''
|
2015-11-16 18:10:20 +01:00
|
|
|
else opString useRailsExpress ''
|
2015-09-26 15:25:01 +02:00
|
|
|
sed -i configure.in -e '/config.guess/d'
|
|
|
|
cp ${config}/config.guess tool/
|
|
|
|
cp ${config}/config.sub tool/
|
2015-11-16 18:10:20 +01:00
|
|
|
'';
|
2015-09-26 15:25:01 +02:00
|
|
|
|
2019-11-18 07:39:33 +01:00
|
|
|
configureFlags = ["--enable-shared" "--enable-pthread" "--with-soname=ruby_${tag}"]
|
2015-09-26 15:25:01 +02:00
|
|
|
++ op useRailsExpress "--with-baseruby=${baseruby}/bin/ruby"
|
2016-12-27 18:55:10 +01:00
|
|
|
++ op (!docSupport) "--disable-install-doc"
|
2015-09-26 15:25:01 +02:00
|
|
|
++ ops stdenv.isDarwin [
|
|
|
|
# on darwin, we have /usr/include/tk.h -- so the configure script detects
|
|
|
|
# that tk is installed
|
|
|
|
"--with-out-ext=tk"
|
|
|
|
# on yosemite, "generating encdb.h" will hang for a very long time without this flag
|
|
|
|
"--with-setjmp-type=setjmp"
|
2017-10-29 20:51:16 +01:00
|
|
|
]
|
|
|
|
++ op (stdenv.hostPlatform != stdenv.buildPlatform)
|
|
|
|
"--with-baseruby=${buildRuby}";
|
2015-09-26 15:25:01 +02:00
|
|
|
|
2019-05-06 00:38:52 +02:00
|
|
|
preConfigure = opString docSupport ''
|
|
|
|
configureFlagsArray+=("--with-ridir=$devdoc/share/ri")
|
|
|
|
'';
|
|
|
|
|
Merge staging-next into master (#44009)
* substitute(): --subst-var was silently coercing to "" if the variable does not exist.
* libffi: simplify using `checkInputs`
* pythonPackges.hypothesis, pythonPackages.pytest: simpify dependency cycle fix
* utillinux: 2.32 -> 2.32.1
https://lkml.org/lkml/2018/7/16/532
* busybox: 1.29.0 -> 1.29.1
* bind: 9.12.1-P2 -> 9.12.2
https://ftp.isc.org/isc/bind9/9.12.2/RELEASE-NOTES-bind-9.12.2.html
* curl: 7.60.0 -> 7.61.0
* gvfs: make tests run, but disable
* ilmbase: disable tests on i686. Spooky!
* mdds: fix tests
* git: disable checks as tests are run in installcheck
* ruby: disable tests
* libcommuni: disable checks as tests are run in installcheck
* librdf: make tests run, but disable
* neon, neon_0_29: make tests run, but disable
* pciutils: 3.6.0 -> 3.6.1
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pciutils/versions.
* mesa: more include fixes
mostly from void-linux (thanks!)
* npth: 1.5 -> 1.6
minor bump
* boost167: Add lockfree next_prior patch
* stdenv: cleanup darwin bootstrapping
Also gets rid of the full python and some of it's dependencies in the
stdenv build closure.
* Revert "pciutils: use standardized equivalent for canonicalize_file_name"
This reverts commit f8db20fb3ae382eba1ba2b160fe24739f43c0bd7.
Patching should no longer be needed with 3.6.1.
* binutils-wrapper: Try to avoid adding unnecessary -L flags
(cherry picked from commit f3758258b8895508475caf83e92bfb236a27ceb9)
Signed-off-by: Domen Kožar <domen@dev.si>
* libffi: don't check on darwin
libffi usages in stdenv broken darwin. We need to disable doCheck for that case.
* "rm $out/share/icons/hicolor/icon-theme.cache" -> hicolor-icon-theme setup-hook
* python.pkgs.pytest: setupHook to prevent creation of .pytest-cache folder, fixes #40273
When `py.test` was run with a folder as argument, it would not only
search for tests in that folder, but also create a .pytest-cache folder.
Not only is this state we don't want, but it was also causing
collisions.
* parity-ui: fix after merge
* python.pkgs.pytest-flake8: disable test, fix build
* Revert "meson: 0.46.1 -> 0.47.0"
With meson 0.47.0 (or 0.47.1, or git)
things are very wrong re:rpath handling
resulting in at best missing libs but
even corrupt binaries :(.
When we run patchelf it masks the problem
by removing obviously busted paths.
Which is probably why this wasn't noticed immediately.
Unfortunately the binary already
has a long series of paths scribbled
in a space intended for a much smaller string;
in my testing it was something like
lengths were 67 with 300+ written to it.
I think we've reported the relevant issues upstream,
but unfortunately it appears our patches
are what introduces the overwrite/corruption
(by no longer being correct in what they assume)
This doesn't look so bad to fix but it's
not something I can spend more time on
at the moment.
--
Interestingly the overwritten string data
(because it is scribbled past the bounds)
remains in the binary and is why we're suddenly
seeing unexpected references in various builds
-- notably this is is the reason we're
seeing the "extra-utils" breakage
that entirely crippled NixOS on master
(and probably on staging before?).
Fixes #43650.
This reverts commit 305ac4dade5758c58e8ab1666ad0197fd305828d.
(cherry picked from commit 273d68eff8f7b6cd4ebed3718e5078a0f43cb55d)
Signed-off-by: Domen Kožar <domen@dev.si>
2018-07-24 16:04:48 +02:00
|
|
|
# fails with "16993 tests, 2229489 assertions, 105 failures, 14 errors, 89 skips"
|
|
|
|
# mostly TZ- and patch-related tests
|
|
|
|
# TZ- failures are caused by nix sandboxing, I didn't investigate others
|
|
|
|
doCheck = false;
|
|
|
|
|
2018-02-20 17:16:16 +01:00
|
|
|
preInstall = ''
|
|
|
|
# Ruby installs gems here itself now.
|
|
|
|
mkdir -pv "$out/${passthru.gemPath}"
|
|
|
|
export GEM_HOME="$out/${passthru.gemPath}"
|
|
|
|
'';
|
|
|
|
|
2015-09-26 15:25:01 +02:00
|
|
|
installFlags = stdenv.lib.optionalString docSupport "install-doc";
|
|
|
|
# Bundler tries to create this directory
|
|
|
|
postInstall = ''
|
2016-10-31 22:39:44 +01:00
|
|
|
# Remove unnecessary groff reference from runtime closure, since it's big
|
|
|
|
sed -i '/NROFF/d' $out/lib/ruby/*/*/rbconfig.rb
|
|
|
|
|
2015-09-26 15:25:01 +02:00
|
|
|
# Bundler tries to create this directory
|
|
|
|
mkdir -p $out/nix-support
|
|
|
|
cat > $out/nix-support/setup-hook <<EOF
|
|
|
|
addGemPath() {
|
|
|
|
addToSearchPath GEM_PATH \$1/${passthru.gemPath}
|
|
|
|
}
|
2019-05-06 00:38:52 +02:00
|
|
|
addRubyLibPath() {
|
|
|
|
addToSearchPath RUBYLIB \$1/lib/ruby/site_ruby
|
|
|
|
addToSearchPath RUBYLIB \$1/lib/ruby/site_ruby/${ver.libDir}
|
|
|
|
addToSearchPath RUBYLIB \$1/lib/ruby/site_ruby/${ver.libDir}/${stdenv.targetPlatform.system}
|
|
|
|
}
|
2015-09-26 15:25:01 +02:00
|
|
|
|
2017-08-11 00:22:07 +02:00
|
|
|
addEnvHooks "$hostOffset" addGemPath
|
2019-05-06 00:38:52 +02:00
|
|
|
addEnvHooks "$hostOffset" addRubyLibPath
|
2015-09-26 15:25:01 +02:00
|
|
|
EOF
|
|
|
|
|
2019-05-06 00:38:52 +02:00
|
|
|
rbConfig=$(find $out/lib/ruby -name rbconfig.rb)
|
|
|
|
'' + opString docSupport ''
|
|
|
|
# Prevent the docs from being included in the closure
|
|
|
|
sed -i "s|\$(DESTDIR)$devdoc|\$(datarootdir)/\$(RI_BASE_NAME)|" $rbConfig
|
|
|
|
sed -i "s|'--with-ridir=$devdoc/share/ri'||" $rbConfig
|
|
|
|
|
|
|
|
# Add rbconfig shim so ri can find docs
|
|
|
|
mkdir -p $devdoc/lib/ruby/site_ruby
|
|
|
|
cp ${./rbconfig.rb} $devdoc/lib/ruby/site_ruby/rbconfig.rb
|
|
|
|
'' + opString useRailsExpress ''
|
2015-09-26 15:25:01 +02:00
|
|
|
# Prevent the baseruby from being included in the closure.
|
|
|
|
sed -i '/^ CONFIG\["BASERUBY"\]/d' $rbConfig
|
|
|
|
sed -i "s|'--with-baseruby=${baseruby}/bin/ruby'||" $rbConfig
|
|
|
|
'';
|
|
|
|
|
2017-09-08 06:07:39 +02:00
|
|
|
meta = with stdenv.lib; {
|
2015-09-26 15:25:01 +02:00
|
|
|
description = "The Ruby language";
|
2017-09-08 06:07:39 +02:00
|
|
|
homepage = http://www.ruby-lang.org/en/;
|
|
|
|
license = licenses.ruby;
|
|
|
|
maintainers = with maintainers; [ vrthra manveru ];
|
|
|
|
platforms = platforms.all;
|
2015-09-26 15:25:01 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
passthru = rec {
|
2016-09-20 18:41:16 +02:00
|
|
|
version = ver;
|
2015-09-26 15:25:01 +02:00
|
|
|
rubyEngine = "ruby";
|
|
|
|
baseRuby = baseruby;
|
2016-09-20 18:41:16 +02:00
|
|
|
libPath = "lib/${rubyEngine}/${ver.libDir}";
|
|
|
|
gemPath = "lib/${rubyEngine}/gems/${ver.libDir}";
|
2016-04-17 03:52:43 +02:00
|
|
|
devEnv = import ./dev.nix {
|
2016-03-01 21:00:54 +01:00
|
|
|
inherit buildEnv bundler bundix;
|
|
|
|
ruby = self;
|
|
|
|
};
|
2016-09-20 18:41:16 +02:00
|
|
|
|
2019-05-18 19:45:38 +02:00
|
|
|
inherit (import ../../ruby-modules/with-packages {
|
|
|
|
inherit lib stdenv makeWrapper buildRubyGem buildEnv;
|
|
|
|
gemConfig = defaultGemConfig;
|
|
|
|
ruby = self;
|
|
|
|
}) withPackages gems;
|
|
|
|
|
2016-09-20 18:41:16 +02:00
|
|
|
# deprecated 2016-09-21
|
|
|
|
majorVersion = ver.major;
|
|
|
|
minorVersion = ver.minor;
|
|
|
|
teenyVersion = ver.tiny;
|
|
|
|
patchLevel = ver.patchLevel;
|
2015-09-26 15:25:01 +02:00
|
|
|
};
|
|
|
|
}
|
|
|
|
) args; in self;
|
|
|
|
|
|
|
|
in {
|
2018-02-14 10:53:54 +01:00
|
|
|
ruby_2_4 = generic {
|
2019-10-02 11:20:00 +02:00
|
|
|
version = rubyVersion "2" "4" "9" "";
|
2016-12-27 18:55:10 +01:00
|
|
|
sha256 = {
|
2019-10-02 11:20:00 +02:00
|
|
|
src = "1bn6n5b920qy3lsx99jr8495jkc3sg89swgb96d5fgd579g6p6zr";
|
|
|
|
git = "066kb1iki7mx7qkm10xhj5b6v8s47wg68v43l3nc36y2hyim1w2c";
|
2016-12-27 18:55:10 +01:00
|
|
|
};
|
|
|
|
};
|
2018-01-02 10:50:37 +01:00
|
|
|
|
2018-02-14 10:53:54 +01:00
|
|
|
ruby_2_5 = generic {
|
2019-10-02 07:02:00 +02:00
|
|
|
version = rubyVersion "2" "5" "7" "";
|
2018-01-02 10:50:37 +01:00
|
|
|
sha256 = {
|
2019-10-02 07:02:00 +02:00
|
|
|
src = "1m6nmnj9shifp8g3yh7aimac01vl035bzcc19x2spdji6ig0sb8b";
|
|
|
|
git = "0wppf82c9ccdbnvj30mppr5a3mc7sxm05diahjdw7hhk29n43knp";
|
2018-01-02 10:50:37 +01:00
|
|
|
};
|
|
|
|
};
|
2018-12-25 20:25:45 +01:00
|
|
|
|
|
|
|
ruby_2_6 = generic {
|
2019-10-02 07:01:00 +02:00
|
|
|
version = rubyVersion "2" "6" "5" "";
|
2018-12-25 20:25:45 +01:00
|
|
|
sha256 = {
|
2019-10-02 07:01:00 +02:00
|
|
|
src = "0zgdrgylq6avbblf78kpaf0k2xnkpc3jng3wkd7x67ycdrqnp5v6";
|
|
|
|
git = "0pay6ic22ag3bnvxffhgwp7z6clkd0p93944a1l4lvc5hxc8v77j";
|
2018-12-25 20:25:45 +01:00
|
|
|
};
|
|
|
|
};
|
2015-09-26 15:25:01 +02:00
|
|
|
}
|