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: 07fa0411403a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d3983caf451a
Choose a head ref
  • 3 commits
  • 4 files changed
  • 1 contributor

Commits on Sep 7, 2019

  1. unit: drop withRuby_2_3 option 

    Ruby 2.3 is EOL.
    @alyssais
    alyssais committed Sep 7, 2019
    Copy the full SHA
    5262dd2 View commit details

  2. sonic-pi: don't use EOL Ruby 

    This was added to fix a compiler error in
4bc516a, where it was noted that it
still segfaulted after boot. Since it compiles with our default Ruby
now, I have to assume that the problem the override was added to set
has since been resolved. I don't know how to actually test, however.
    @alyssais
    alyssais committed Sep 7, 2019
    Copy the full SHA
    20ed441 View commit details

  3. ruby_2_3: remove 

    This has been EOL since December. We shouldn't still be facilitating
its use.

Fixes #67977.
    @alyssais
    alyssais committed Sep 7, 2019
    Copy the full SHA
    d3983ca View commit details
Showing with 4 additions and 18 deletions.
  1. +0 −8 pkgs/development/interpreters/ruby/default.nix
  2. +0 −3 pkgs/servers/http/unit/default.nix
  3. +3 −2 pkgs/top-level/aliases.nix
  4. +1 −5 pkgs/top-level/all-packages.nix
8 changes: 0 additions & 8 deletions pkgs/development/interpreters/ruby/default.nix
View file
Original file line number Diff line number Diff line change
@@ -211,14 +211,6 @@ let
) args; in self;

in {
ruby_2_3 = generic {
version = rubyVersion "2" "3" "8" "";
sha256 = {
src = "1gwsqmrhpx1wanrfvrsj3j76rv888zh7jag2si2r14qf8ihns0dm";
git = "0158fg1sx6l6applbq0831kl8kzx5jacfl9lfg0shfzicmjlys3f";
};
};

ruby_2_4 = generic {
version = rubyVersion "2" "4" "7" "";
sha256 = {
3 changes: 0 additions & 3 deletions pkgs/servers/http/unit/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,6 @@
, withPHP73 ? false, php73
, withPerl ? true, perl
, withPerldevel ? false, perldevel
, withRuby_2_3 ? false, ruby_2_3
, withRuby_2_4 ? false, ruby_2_4
, withRuby ? true, ruby
, withSSL ? true, openssl ? null
@@ -33,7 +32,6 @@ stdenv.mkDerivation rec {
++ optional withPHP73 php73
++ optional withPerl perl
++ optional withPerldevel perldevel
++ optional withRuby_2_3 ruby_2_3
++ optional withRuby_2_4 ruby_2_4
++ optional withRuby ruby
++ optional withSSL openssl;
@@ -53,7 +51,6 @@ stdenv.mkDerivation rec {
${optionalString withPHP73 "./configure php --module=php73 --config=${php73.dev}/bin/php-config --lib-path=${php73}/lib"}
${optionalString withPerl "./configure perl --module=perl --perl=${perl}/bin/perl"}
${optionalString withPerldevel "./configure perl --module=perl529 --perl=${perldevel}/bin/perl"}
${optionalString withRuby_2_3 "./configure ruby --module=ruby23 --ruby=${ruby_2_3}/bin/ruby"}
${optionalString withRuby_2_4 "./configure ruby --module=ruby24 --ruby=${ruby_2_4}/bin/ruby"}
${optionalString withRuby "./configure ruby --module=ruby --ruby=${ruby}/bin/ruby"}
'';
5 changes: 3 additions & 2 deletions pkgs/top-level/aliases.nix
View file
Original file line number Diff line number Diff line change
@@ -303,8 +303,9 @@ mapAliases ({
rssglx = rss-glx; #added 2015-03-25
ruby_2_0_0 = throw "deprecated 2018-0213: use a newer version of ruby";
ruby_2_1_0 = throw "deprecated 2018-0213: use a newer version of ruby";
ruby_2_2_9 = throw "deprecated 2018-0213: use ruby_2_2 instead";
ruby_2_3_6 = throw "deprecated 2018-0213: use ruby_2_3 instead";
ruby_2_2_9 = throw "deprecated 2018-0213: use a newer version of ruby";
ruby_2_3_6 = throw "deprecated 2018-0213: use a newer version of ruby";
ruby_2_3 = throw "deprecated 2019-09-06: use a newer version of ruby";
ruby_2_4_3 = throw "deprecated 2018-0213: use ruby_2_4 instead";
ruby_2_5_0 = throw "deprecated 2018-0213: use ruby_2_5 instead";
rubygems = throw "deprecated 2016-03-02: rubygems is now bundled with ruby";
6 changes: 1 addition & 5 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -8932,14 +8932,12 @@ in
inherit (darwin) libiconv libobjc libunwind;
inherit (darwin.apple_sdk.frameworks) Foundation;
})
ruby_2_3
ruby_2_4
ruby_2_5
ruby_2_6;

ruby = ruby_2_6;

rubyPackages_2_3 = recurseIntoAttrs ruby_2_3.gems;
rubyPackages_2_4 = recurseIntoAttrs ruby_2_4.gems;
rubyPackages_2_5 = recurseIntoAttrs ruby_2_5.gems;
rubyPackages_2_6 = recurseIntoAttrs ruby_2_6.gems;
@@ -20420,9 +20418,7 @@ in

wavebox = callPackage ../applications/networking/instant-messengers/wavebox { };

sonic-pi = callPackage ../applications/audio/sonic-pi {
ruby = ruby_2_3;
};
sonic-pi = callPackage ../applications/audio/sonic-pi { };

st = callPackage ../applications/misc/st {
conf = config.st.conf or null;