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: 540670259c18
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d1055c0ed763
Choose a head ref
  • 2 commits
  • 3 files changed
  • 2 contributors

Commits on Nov 28, 2016

  1. ruby: 3.2.1 -> 2.3.3

    @manveru @grahamc
    manveru authored and grahamc committed Nov 28, 2016
    1

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    grahamc Graham Christensen
    GPG key ID: ACA1C1D120C83D5C
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    bff2b98 View commit details

  2. all-packages.nix: whitespace cleanup

    @grahamc
    grahamc committed Nov 28, 2016

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    grahamc Graham Christensen
    GPG key ID: ACA1C1D120C83D5C
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    d1055c0 View commit details
Showing with 12 additions and 7 deletions.
  1. +4 −4 pkgs/development/interpreters/ruby/default.nix
  2. +5 −0 pkgs/development/interpreters/ruby/patchsets.nix
  3. +3 −3 pkgs/top-level/all-packages.nix
8 changes: 4 additions & 4 deletions pkgs/development/interpreters/ruby/default.nix
View file
Original file line number Diff line number Diff line change
@@ -211,11 +211,11 @@ in {
};
};

ruby_2_3_1 = generic {
version = rubyVersion "2" "3" "1" "";
ruby_2_3_3 = generic {
version = rubyVersion "2" "3" "3" "";
sha256 = {
src = "1kbxg72las93w0y553cxv3lymy2wvij3i3pg1y9g8aq3na676z5q";
git = "0dv1rf5f9lj3icqs51bq7ljdcf17sdclmxm9hilwxps5l69v5q9r";
src = "1dqmh42p6siv9aqzdjldsnhljj3f2h30m0v8cf25icjmqp40h514";
git = "0cwjf0nrzaa5g81bw0qp65byyadhxvbnvprkshv3ckjl7yi46zf6";
};
};
}
5 changes: 5 additions & 0 deletions pkgs/development/interpreters/ruby/patchsets.nix
View file
Original file line number Diff line number Diff line change
@@ -60,4 +60,9 @@ rec {
"${patchSet}/patches/ruby/2.3/head/railsexpress/02-improve-gc-stats.patch"
"${patchSet}/patches/ruby/2.3/head/railsexpress/03-display-more-detailed-stack-trace.patch"
];
"2.3.3" = ops useRailsExpress [
"${patchSet}/patches/ruby/2.3/head/railsexpress/01-skip-broken-tests.patch"
"${patchSet}/patches/ruby/2.3/head/railsexpress/02-improve-gc-stats.patch"
"${patchSet}/patches/ruby/2.3/head/railsexpress/03-display-more-detailed-stack-trace.patch"
];
}
6 changes: 3 additions & 3 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -5713,15 +5713,15 @@ in
ruby_2_0_0
ruby_2_1_10
ruby_2_2_5
ruby_2_3_1;
ruby_2_3_3;

# Ruby aliases
ruby = ruby_2_3;
ruby_1_9 = ruby_1_9_3;
ruby_2_0 = ruby_2_0_0;
ruby_2_1 = ruby_2_1_10;
ruby_2_2 = ruby_2_2_5;
ruby_2_3 = ruby_2_3_1;
ruby_2_3 = ruby_2_3_3;

scsh = callPackage ../development/interpreters/scsh { };

@@ -10270,7 +10270,7 @@ in
riak = callPackage ../servers/nosql/riak/2.1.1.nix { };

riak-cs = callPackage ../servers/nosql/riak-cs/2.1.1.nix {
erlang = erlang_basho_R16B03;
erlang = erlang_basho_R16B03;
};

stanchion = callPackage ../servers/nosql/riak-cs/stanchion.nix {