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: 20f51922c0b8
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f59a544bf1db
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Mar 24, 2018

  1. jsduck: fix build 

    json 1.8.3 is broken with ruby 2.4
    @globin
    globin committed Mar 24, 2018
    Copy the full SHA
    f59a544 View commit details
Showing with 4 additions and 4 deletions.
  1. +1 −1 pkgs/development/tools/jsduck/Gemfile.lock
  2. +3 −3 pkgs/development/tools/jsduck/gemset.nix
2 changes: 1 addition & 1 deletion pkgs/development/tools/jsduck/Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ GEM
parallel (~> 0.7.1)
rdiscount (~> 2.1.6)
rkelly-remix (~> 0.0.4)
json (1.8.3)
json (1.8.6)
parallel (0.7.1)
rdiscount (2.1.8)
rkelly-remix (0.0.7)
6 changes: 3 additions & 3 deletions pkgs/development/tools/jsduck/gemset.nix
View file
Original file line number Diff line number Diff line change
@@ -19,10 +19,10 @@
json = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1nsby6ry8l9xg3yw4adlhk2pnc7i0h0rznvcss4vk3v74qg0k8lc";
sha256 = "0qmj7fypgb9vag723w1a49qihxrcf5shzars106ynw2zk352gbv5";
type = "gem";
};
version = "1.8.3";
version = "1.8.6";
};
parallel = {
source = {
@@ -48,4 +48,4 @@
};
version = "0.0.7";
};
}
}