Skip to content

ruby: Revert rubygems to 3.0.6 for ruby 2.6 and earlier #76757

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
andersk wants to merge 2 commits into from
Closed

ruby: Revert rubygems to 3.0.6 for ruby 2.6 and earlier #76757

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f49dd19
ruby: Revert rubygems to 3.0.6 for ruby 2.6 and earlier
andersk Jan 1, 2020
02035a5
vagrant: Improve installCheckPhase to verify an actual operation
andersk Jan 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions pkgs/development/interpreters/ruby/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ let
opString = lib.optionalString;
patchSet = import ./rvm-patchsets.nix { inherit fetchFromGitHub; };
config = import ./config.nix { inherit fetchFromSavannah; };
rubygems = import ./rubygems { inherit stdenv lib fetchurl; };
inherit (import ./rubygems { inherit stdenv lib fetchurl; })
rubygems_3_0 rubygems_3_1;

# Contains the ruby version heuristics
rubyVersion = import ./ruby-version.nix { inherit lib; };
Expand All @@ -23,7 +24,7 @@ let
then "$out/bin/ruby"
else "${buildPackages.ruby}/bin/ruby";

generic = { version, sha256 }: let
generic = { version, sha256, rubygems }: let
ver = version;
tag = ver.gitTag;
atLeast25 = lib.versionAtLeast ver.majMin "2.5";
Expand Down Expand Up @@ -236,6 +237,7 @@ in {
src = "1bn6n5b920qy3lsx99jr8495jkc3sg89swgb96d5fgd579g6p6zr";
git = "066kb1iki7mx7qkm10xhj5b6v8s47wg68v43l3nc36y2hyim1w2c";
};
rubygems = rubygems_3_0;
};

ruby_2_5 = generic {
Expand All @@ -244,6 +246,7 @@ in {
src = "1m6nmnj9shifp8g3yh7aimac01vl035bzcc19x2spdji6ig0sb8b";
git = "0wppf82c9ccdbnvj30mppr5a3mc7sxm05diahjdw7hhk29n43knp";
};
rubygems = rubygems_3_0;
};

ruby_2_6 = generic {
Expand All @@ -252,6 +255,7 @@ in {
src = "0zgdrgylq6avbblf78kpaf0k2xnkpc3jng3wkd7x67ycdrqnp5v6";
git = "0pay6ic22ag3bnvxffhgwp7z6clkd0p93944a1l4lvc5hxc8v77j";
};
rubygems = rubygems_3_0;
};

ruby_2_7 = generic {
Expand All @@ -260,5 +264,6 @@ in {
src = "1glc3zpnih6h8mrgfcak0aa7cgmi4zyvxfyi6y2brwg2nn9sm6cc";
git = "11iz64k95czs273mb10195d1j75mmbcgddfdx1vay5876ffw81dq";
};
rubygems = rubygems_3_1;
};
}
16 changes: 13 additions & 3 deletions pkgs/development/interpreters/ruby/rubygems/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{ stdenv, lib, fetchurl }:

stdenv.mkDerivation rec {
let generic = { version, sha256 }: stdenv.mkDerivation {
name = "rubygems";
version = "3.1.2";
inherit version;

src = fetchurl {
url = "https://rubygems.org/rubygems/rubygems-${version}.tgz";
sha256 = "0h7ij4jpj8rgnpkl63cwh2lnav73pw5wpfqra3va7077lsyadlgd";
inherit sha256;
};

patches = [
Expand All @@ -27,4 +27,14 @@ stdenv.mkDerivation rec {
license = with licenses; [ mit /* or */ ruby ];
maintainers = with maintainers; [ qyliss zimbatm ];
};
};
in {
rubygems_3_0 = generic {
version = "3.0.6";
sha256 = "1ca1i4xmggizr59m6p28gprlvshczsbx30q8iyzxb2vj4jn8arzx";
};
rubygems_3_1 = generic {
version = "3.1.2";
sha256 = "0h7ij4jpj8rgnpkl63cwh2lnav73pw5wpfqra3va7077lsyadlgd";
};
}
7 changes: 1 addition & 6 deletions pkgs/development/tools/vagrant/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,7 @@ in buildRubyGem rec {
'';

installCheckPhase = ''
if [[ "$("$out/bin/vagrant" --version)" == "Vagrant ${version}" ]]; then
echo 'Vagrant smoke check passed'
else
echo 'Vagrant smoke check failed'
return 1
fi
HOME="$(mktemp -d)" $out/bin/vagrant init --output - > /dev/null
'';

# `patchShebangsAuto` patches this one script which is intended to run
Expand Down