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

Commits on Sep 30, 2019

  1. Copy the full SHA
    cad5d81 View commit details

Commits on Oct 5, 2019

  1. Merge pull request #70148 from marsam/update-rubocop

    rubocop: 0.74.0 -> 0.75.0
    marsam authored Oct 5, 2019
    Copy the full SHA
    d9a068b View commit details
Showing with 6 additions and 6 deletions.
  1. +2 −2 pkgs/development/tools/rubocop/Gemfile.lock
  2. +4 −4 pkgs/development/tools/rubocop/gemset.nix
4 changes: 2 additions & 2 deletions pkgs/development/tools/rubocop/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -4,10 +4,10 @@ GEM
ast (2.4.0)
jaro_winkler (1.5.3)
parallel (1.17.0)
parser (2.6.3.0)
parser (2.6.4.1)
ast (~> 2.4.0)
rainbow (3.0.0)
rubocop (0.74.0)
rubocop (0.75.0)
jaro_winkler (~> 1.5.1)
parallel (~> 1.10)
parser (>= 2.6)
8 changes: 4 additions & 4 deletions pkgs/development/tools/rubocop/gemset.nix
Original file line number Diff line number Diff line change
@@ -35,10 +35,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1pnks149x0fzgqiw53qlmvcd8bi746cxdw03sjljby5s97p1fskn";
sha256 = "1axig0czm40ydbnay9b9qzzavszx2p7knidbwim8lgcpfm4ynxdw";
type = "gem";
};
version = "2.6.3.0";
version = "2.6.4.1";
};
rainbow = {
groups = ["default"];
@@ -56,10 +56,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0wpyass9qb2wvq8zsc7wdzix5xy2ldiv66wnx8mwwprz2dcvzayk";
sha256 = "1x0hc3b9admal4684cfa1rh778khsydkv1dwf18cxyvb3v2h9rab";
type = "gem";
};
version = "0.74.0";
version = "0.75.0";
};
ruby-progressbar = {
groups = ["default"];