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: 74953236661f
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3b9f952e04e4
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Oct 27, 2019

  1. ruby: workaround __toString issue with toJSON

    revert after NixOS/nix#3167 is released
    globin committed Oct 27, 2019
    2
    Copy the full SHA
    3b9f952 View commit details
Showing with 2 additions and 1 deletion.
  1. +2 −1 pkgs/development/interpreters/ruby/default.nix
3 changes: 2 additions & 1 deletion pkgs/development/interpreters/ruby/default.nix
Original file line number Diff line number Diff line change
@@ -25,6 +25,7 @@ let

generic = { version, sha256 }: let
ver = version;
versionString = version.__toString version;
tag = ver.gitTag;
atLeast25 = lib.versionAtLeast ver.majMin "2.5";
baseruby = self.override {
@@ -51,7 +52,7 @@ let
}:
stdenv.mkDerivation rec {
pname = "ruby";
inherit version;
version = versionString;

src = if useRailsExpress then fetchFromGitHub {
owner = "ruby";