public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk
2019-07-22 14:15:32 +02:00
parent 16dec39746 62cb4f7228
commit db6c38a075
243 changed files with 4996 additions and 2661 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/default.nix
+4 -2
View File
@@ -1,4 +1,4 @@
{ lib, bundlerEnv, ruby }:
{ lib, bundlerEnv, ruby, bundlerUpdateScript }:
bundlerEnv rec {
name = "bitbucket-server-cli-${version}";
@@ -9,11 +9,13 @@ bundlerEnv rec {
pname = "atlassian-stash";
passthru.updateScript = bundlerUpdateScript "gitAndTools.bitbucket-server-cli";
meta = with lib; {
description = "A command line interface to interact with BitBucket Server (formerly Atlassian Stash)";
homepage = https://bitbucket.org/atlassian/bitbucket-server-cli;
license = licenses.mit;
maintainers = with maintainers; [ jgertm ];
maintainers = with maintainers; [ jgertm nicknovitski ];
platforms = platforms.unix;
};
}
pkgs/applications/version-management/git-and-tools/git-fame/default.nix
+4 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, bundlerEnv, ruby }:
{ stdenv, bundlerEnv, ruby, bundlerUpdateScript }:
bundlerEnv rec {
inherit ruby;
@@ -7,13 +7,15 @@ bundlerEnv rec {
gemdir = ./.;
passthru.updateScript = bundlerUpdateScript "gitAndTools.git-fame";
meta = with stdenv.lib; {
description = ''
A command-line tool that helps you summarize and pretty-print collaborators based on contributions
'';
homepage = http://oleander.io/git-fame-rb;
license = licenses.mit;
maintainers = with maintainers; [ expipiplus1 ];
maintainers = with maintainers; [ expipiplus1 nicknovitski ];
platforms = platforms.unix;
};
}
pkgs/applications/version-management/git-and-tools/hub/default.nix
+2 -2
View File
@@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "hub";
version = "2.12.2";
version = "2.12.3";
goPackagePath = "github.com/github/hub";
@@ -13,7 +13,7 @@ buildGoPackage rec {
owner = "github";
repo = pname;
rev = "v${version}";
sha256 = "0sxfmjg26s86m5xa9nbj8287kg12kygxw6gggahal6v7zjhwcvaz";
sha256 = "13l4nc3k6vl9x1x0153mwi351j3z266wx0fp7xw2851avrgkk9zg";
};
nativeBuildInputs = [ groff utillinux ];