Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e639d3e844d7
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ddc83e68ccf0
Choose a head ref
  • 6 commits
  • 4 files changed
  • 2 contributors

Commits on Jan 9, 2020

  1. buildRubyGem: strip by default 

    I'm not sure why this was disabled, but it looks like a pretty
harmless way to bring down closure size and remove references to
compilers and stuff.
    @alyssais
    alyssais committed Jan 9, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    alyssais Alyssa Ross
    GPG key ID: F9DBED4859B271C0
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    11970ee View commit details

  2. buildRubyGem: remove more bloat files

    @alyssais
    alyssais committed Jan 9, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    alyssais Alyssa Ross
    GPG key ID: F9DBED4859B271C0
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ec8293f View commit details

  3. ruby: remove references to CC by default 

    This makes RbConfig["CC"] return an invalid path, but I hope nothing
is depending on that anyway...
    @alyssais
    alyssais committed Jan 9, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    alyssais Alyssa Ross
    GPG key ID: F9DBED4859B271C0
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    1636189 View commit details

  4. defaultGemConfig: reduce mathematical closure size 

    ext/ isn't needed once the extensions have been built, contains
references to a bunch of huge dependencies, and contains megabytes of
tests.
    @alyssais
    alyssais committed Jan 9, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    alyssais Alyssa Ross
    GPG key ID: F9DBED4859B271C0
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    fbe4716 View commit details

  5. defaultGemConfig: remove asciidoctor-diagram JARs 

    (Except on JRuby, where these are presumably important.)
    @alyssais
    alyssais committed Jan 9, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    alyssais Alyssa Ross
    GPG key ID: F9DBED4859B271C0
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    1ac11cc View commit details

Commits on Jan 10, 2020

  1. Merge pull request #77149 from alyssais/asciidoctor 

    Reduce AsciiDoctor closure size
    @zimbatm
    zimbatm authored Jan 10, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ddc83e6 View commit details
2 changes: 1 addition & 1 deletion pkgs/development/interpreters/ruby/default.nix
View file
Original file line number Diff line number Diff line change
@@ -49,7 +49,7 @@ let
# puts a reference to the C compiler in the binary.
# This might be required by some gems at runtime,
# but we allow to strip it out for smaller closure size.
, removeReferencesTo, removeReferenceToCC ? false
, removeReferencesTo, removeReferenceToCC ? true
, autoreconfHook, bison, autoconf
, buildEnv, bundler, bundix
, libiconv, libobjc, libunwind, Foundation
17 changes: 17 additions & 0 deletions pkgs/development/ruby-modules/gem-config/default.nix
View file
Original file line number Diff line number Diff line change
@@ -39,6 +39,15 @@ let
in

{
asciidoctor-diagram = { version, ruby, ... }: {
postInstall = ''
# Delete vendored JAR files unless using JRuby.
if ruby -e 'exit(RUBY_PLATFORM != "java")'; then
rm -v $out/${ruby.gemPath}/gems/$gemName-${version}/lib/*.jar
fi
'';
};

atk = attrs: {
dependencies = attrs.dependencies ++ [ "gobject-introspection" ];
nativeBuildInputs = [ rake bundler pkgconfig ];
@@ -315,6 +324,14 @@ in
# The ruby build script takes care of this
dontUseCmakeConfigure = true;

postInstall = ''
# Reduce output size by a lot, and remove some unnecessary references.
# The ext directory should only be required at build time, so
# can be deleted now.
rm -r $out/${ruby.gemPath}/gems/mathematical-${attrs.version}/ext \
$out/${ruby.gemPath}/extensions/*/*/mathematical-${attrs.version}/gem_make.out
'';

# For some reason 'mathematical.so' is missing cairo and glib in its RPATH, add them explicitly here
postFixup = lib.optionalString stdenv.isLinux ''
soPath="$out/${ruby.gemPath}/gems/mathematical-${attrs.version}/lib/mathematical/mathematical.so"
9 changes: 6 additions & 3 deletions pkgs/development/ruby-modules/gem/default.nix
View file
Original file line number Diff line number Diff line change
@@ -39,7 +39,7 @@ lib.makeOverridable (
, meta ? {}
, patches ? []
, gemPath ? []
, dontStrip ? true
, dontStrip ? false
# Assume we don't have to build unless strictly necessary (e.g. the source is a
# git checkout).
# If you need to apply patches, make sure to set `dontBuild = false`;
@@ -205,8 +205,11 @@ stdenv.mkDerivation ((builtins.removeAttrs attrs ["source"]) // {
$gempkg $gemFlags -- $buildFlags
# looks like useless files which break build repeatability and consume space
rm -fv $out/${ruby.gemPath}/doc/*/*/created.rid || true
rm -fv $out/${ruby.gemPath}/gems/*/ext/*/mkmf.log || true
pushd $out/${ruby.gemPath}
rm -fv doc/*/*/created.rid || true
rm -fv {gems/*/ext/*,extensions/*/*/*}/{mkmf.log,gem_make.out} || true
rm -fvr cache
popd
# write out metadata and binstubs
spec=$(echo $out/${ruby.gemPath}/specifications/*.gemspec)
2 changes: 0 additions & 2 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -9409,8 +9409,6 @@ in
docSupport = false;
yamlSupport = false;
fiddleSupport = false;
# remove gcc from runtime closure
removeReferenceToCC = true;
};

ruby = ruby_2_6;