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

Merge staging-next into staging

Browse Source
This commit is contained in:
Frederik Rietdijk
2020-03-28 21:15:15 +01:00
parent 48a137da73 7f4e4b279e
commit a36be028f5
639 changed files with 13721 additions and 10162 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/version-management/git-and-tools/default.nix
+5 -15
View File
@@ -34,9 +34,7 @@ let
inherit (darwin.apple_sdk.frameworks) Security;
};
ghq = callPackage ./ghq {
inherit (darwin.apple_sdk.frameworks) Security;
};
ghq = callPackage ./ghq { };
git = appendToName "minimal" gitBase;
@@ -67,9 +65,7 @@ let
git-appraise = callPackage ./git-appraise {};
git-bug = callPackage ./git-bug {
inherit (darwin.apple_sdk.frameworks) Security;
};
git-bug = callPackage ./git-bug { };
# support for bugzilla
git-bz = callPackage ./git-bz { };
@@ -140,9 +136,7 @@ let
git-subrepo = callPackage ./git-subrepo { };
git-subtrac = callPackage ./git-subtrac {
inherit (darwin.apple_sdk.frameworks) Security;
};
git-subtrac = callPackage ./git-subtrac { };
git-sync = callPackage ./git-sync { };
@@ -183,13 +177,9 @@ let
inherit (darwin) Security;
};
lab = callPackage ./lab {
inherit (darwin.apple_sdk.frameworks) Security;
};
lab = callPackage ./lab { };
lefthook = callPackage ./lefthook {
inherit (darwin.apple_sdk.frameworks) Security;
};
lefthook = callPackage ./lefthook { };
pass-git-helper = python3Packages.callPackage ./pass-git-helper { };
pkgs/applications/version-management/git-and-tools/ghq/default.nix
+1 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, buildGoModule, fetchFromGitHub, Security }:
{ stdenv, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "ghq";
@@ -13,8 +13,6 @@ buildGoModule rec {
modSha256 = "0hlbhky3c6zva9khn73n6xgq57k5p8anskxy3g2m0wzhr72cyc41";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
buildFlagsArray = ''
-ldflags=
-X=main.Version=${version}
pkgs/applications/version-management/git-and-tools/git-bug/default.nix
+1 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, buildGoModule, fetchFromGitHub, Security }:
{ stdenv, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "git-bug";
@@ -15,8 +15,6 @@ buildGoModule rec {
modSha256 = "1cfn49cijiarzzczrpd28x1k7ib98xyzlvn3zghwk2ngfgiah3ld";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
buildFlagsArray = ''
-ldflags=
-X ${goPackagePath}/commands.GitCommit=${rev}
pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "git-filter-repo";
version = "2.25.0";
version = "2.26.0";
src = fetchurl {
url = "https://github.com/newren/git-filter-repo/releases/download/v${version}/${pname}-${version}.tar.xz";
sha256 = "1772if8ajaw80dsdw4ic6vjw24dq0b9w87qlkn0iw4b8r9yxp37a";
sha256 = "15d07i66b090bhjfj9s4s2s38k75mhxmddzyn44bnnyb967w6yjk";
};
buildInputs = [ pythonPackages.python ];
pkgs/applications/version-management/git-and-tools/git-subtrac/default.nix
+2 -4
View File
@@ -1,4 +1,4 @@
{ stdenv, buildGoModule, fetchFromGitHub, Security }:
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "git-subtrac";
@@ -13,9 +13,7 @@ buildGoModule rec {
modSha256 = "147vzllp1gydk2156hif313vwykagrj35vaiqy1swqczxs7p9hhs";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
meta = with stdenv.lib; {
meta = with lib; {
description = "Keep the content for your git submodules all in one place: the parent repo";
homepage = "https://github.com/apenwarr/git-subtrac";
license = licenses.asl20;
pkgs/applications/version-management/git-and-tools/grv/default.nix
+21 -6
View File
@@ -1,13 +1,14 @@
{ stdenv, buildGoPackage, fetchFromGitHub, curl, libgit2, ncurses, pkgconfig, readline }:
{ stdenv, buildGoPackage, fetchFromGitHub, curl, ncurses, pkgconfig, readline
, cmake }:
let
version = "0.3.1";
version = "0.3.2";
in
buildGoPackage {
pname = "grv";
inherit version;
buildInputs = [ ncurses readline curl libgit2 ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ ncurses readline curl ];
nativeBuildInputs = [ pkgconfig cmake ];
goPackagePath = "github.com/rgburke/grv";
@@ -15,7 +16,7 @@ buildGoPackage {
owner = "rgburke";
repo = "grv";
rev = "v${version}";
sha256 = "16ylapsibqrqwx45l4ypr3av07rd1haf10v838mjqsakf8l1xc0b";
sha256 = "0bpjsk35rlp56z8149z890adnhmxyh743vsls3q86j4682b83kyf";
fetchSubmodules = true;
};
@@ -23,7 +24,21 @@ buildGoPackage {
rm util/update_latest_release.go
'';
buildFlagsArray = [ "-ldflags=" "-X main.version=${version}" ];
postConfigure = ''
cd $NIX_BUILD_TOP/go/src/$goPackagePath
'';
buildPhase = ''
runHook preBuild
make build-only
runHook postBuild
'';
installPhase = ''
runHook preInstall
install -D grv $bin/bin/grv
runHook postInstall
'';
meta = with stdenv.lib; {
description = "GRV is a terminal interface for viewing Git repositories";
pkgs/applications/version-management/git-and-tools/lab/default.nix
+1 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, buildGoModule, fetchFromGitHub, Security }:
{ stdenv, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "lab";
@@ -15,8 +15,6 @@ buildGoModule rec {
modSha256 = "03fqa7s6729g0a6ffiyc61dkldpi7vg8pvvpqak4c0mqi1dycivd";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
postInstall = ''
pkgs/applications/version-management/git-and-tools/lefthook/default.nix
+1 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, buildGoModule, fetchFromGitHub, Security }:
{ stdenv, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "lefthook";
@@ -13,8 +13,6 @@ buildGoModule rec {
modSha256 = "0ih11gw2y9dhv3zw1fzjmdfjln5h6zg1bj7sl68cglf6743siqnq";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
meta = with stdenv.lib; {
description = "Fast and powerful Git hooks manager for any type of projects";
homepage = "https://github.com/Arkweid/lefthook";