Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 38c7c5d3229c
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6cc7e33ac8ac
Choose a head ref
  • 5 commits
  • 5 files changed
  • 2 contributors

Commits on Jul 5, 2019

  1. rubocop: 0.71.0 -> 0.72.0

    marsam committed Jul 5, 2019
    Copy the full SHA
    021cbe0 View commit details

Commits on Jul 8, 2019

  1. Copy the full SHA
    9719889 View commit details

Commits on Jul 9, 2019

  1. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    ea6e5db View commit details
  2. Merge pull request #64433 from marsam/init-git-gone

    gitAndTools.git-gone: init at 0.1.2
    worldofpeace authored Jul 9, 2019
    Copy the full SHA
    a7d2016 View commit details
  3. Merge pull request #64432 from marsam/update-rubocop

    rubocop: 0.71.0 -> 0.72.0
    marsam authored Jul 9, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    6cc7e33 View commit details
Original file line number Diff line number Diff line change
@@ -89,6 +89,10 @@ let

git-extras = callPackage ./git-extras { };

git-gone = callPackage ./git-gone {
inherit (darwin.apple_sdk.frameworks) Security;
};

git-hub = callPackage ./git-hub { };

git-ignore = callPackage ./git-ignore { };
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, curl, libiconv, Security }:

rustPlatform.buildRustPackage rec {
pname = "git-gone";
version = "0.1.2";

src = fetchFromGitHub {
owner = "lunaryorn";
repo = pname;
rev = "v${version}";
sha256 = "0vgkx227wpg9l2zza6446wzshjhnrhba3qhabibn4gg8wwcqmmxf";
};

cargoSha256 = "11h2whlgjhg3j98a9w9k29njj89wx93w0dcyf981985flin709sx";

nativeBuildInputs = [ pkgconfig ];

buildInputs = [ openssl ]
++ stdenv.lib.optionals stdenv.isDarwin [ curl libiconv Security ];

meta = with stdenv.lib; {
description = "Cleanup stale Git branches of pull requests";
homepage = "https://github.com/lunaryorn/git-gone";
license = licenses.asl20;
maintainers = [ maintainers.marsam ];
platforms = platforms.unix;
};
}
4 changes: 2 additions & 2 deletions pkgs/development/tools/rubocop/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -2,12 +2,12 @@ GEM
remote: https://rubygems.org/
specs:
ast (2.4.0)
jaro_winkler (1.5.2)
jaro_winkler (1.5.3)
parallel (1.17.0)
parser (2.6.3.0)
ast (~> 2.4.0)
rainbow (3.0.0)
rubocop (0.71.0)
rubocop (0.72.0)
jaro_winkler (~> 1.5.1)
parallel (~> 1.10)
parser (>= 2.6)
2 changes: 1 addition & 1 deletion pkgs/development/tools/rubocop/default.nix
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ bundlerEnv rec {
description = "Automatic Ruby code style checking tool";
homepage = "https://docs.rubocop.org/";
license = licenses.mit;
maintainers = with maintainers; [ leemachin ];
maintainers = with maintainers; [ marsam leemachin ];
platforms = platforms.unix;
};
}
8 changes: 4 additions & 4 deletions pkgs/development/tools/rubocop/gemset.nix
Original file line number Diff line number Diff line change
@@ -14,10 +14,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1zz27z88qznix4r65gd9h56gl177snlfpgv10b0s69vi8qpl909l";
sha256 = "1930v0chc1q4fr7hn0y1j34mw0v032a8kh0by4d4sbz8ksy056kf";
type = "gem";
};
version = "1.5.2";
version = "1.5.3";
};
parallel = {
groups = ["default"];
@@ -56,10 +56,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0mjyrf1dmf58i40izs8rp2j4mqnyd4qpah9svmkwhs33ckxsjh6b";
sha256 = "192vmm9ah6b4wyabawaszpr8n3z93y3ymykp3m4pncrbwngmn3m2";
type = "gem";
};
version = "0.71.0";
version = "0.72.0";
};
ruby-progressbar = {
groups = ["default"];