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-02-27 10:15:34 +01:00
parent df3849e5c7 7b716121de
commit ef156f7a8b
467 changed files with 11067 additions and 5404 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/version-management/git-and-tools/default.nix
+38 -35
View File
@@ -24,7 +24,7 @@ let
bump2version = pkgs.python37Packages.callPackage ./bump2version { };
darcsToGit = callPackage ./darcs-to-git { };
darcs-to-git = callPackage ./darcs-to-git { };
delta = callPackage ./delta { };
@@ -40,29 +40,6 @@ let
inherit (darwin.apple_sdk.frameworks) Security;
};
git-appraise = callPackage ./git-appraise {};
git-fame = callPackage ./git-fame {};
git-filter-repo = callPackage ./git-filter-repo {
pythonPackages = python3Packages;
};
gita = python3Packages.callPackage ./gita {};
# The full-featured Git.
gitFull = gitBase.override {
svnSupport = true;
guiSupport = true;
sendEmailSupport = true;
withLibsecret = !stdenv.isDarwin;
};
# Git with SVN support, but without GUI.
gitSVN = lowPrio (appendToName "with-svn" (gitBase.override {
svnSupport = true;
}));
git-annex = pkgs.haskellPackages.git-annex;
git-annex-metadata-gui = libsForQt5.callPackage ./git-annex-metadata-gui {
@@ -84,6 +61,8 @@ let
git-annex-utils = callPackage ./git-annex-utils { };
git-appraise = callPackage ./git-appraise {};
git-bug = callPackage ./git-bug { };
# support for bugzilla
@@ -101,6 +80,14 @@ let
git-extras = callPackage ./git-extras { };
git-fame = callPackage ./git-fame {};
git-fast-export = callPackage ./fast-export { };
git-filter-repo = callPackage ./git-filter-repo {
pythonPackages = python3Packages;
};
git-gone = callPackage ./git-gone {
inherit (darwin.apple_sdk.frameworks) Security;
};
@@ -117,6 +104,8 @@ let
git-machete = python3Packages.callPackage ./git-machete { };
git-my = callPackage ./git-my { };
git-octopus = callPackage ./git-octopus { };
git-open = callPackage ./git-open { };
@@ -127,6 +116,8 @@ let
utillinux = if stdenv.isLinux then utillinuxMinimal else utillinux;
};
git-remote-gcrypt = callPackage ./git-remote-gcrypt { };
git-remote-hg = callPackage ./git-remote-hg { };
git-reparent = callPackage ./git-reparent { };
@@ -153,9 +144,20 @@ let
git2cl = callPackage ./git2cl { };
gitFastExport = callPackage ./fast-export { };
# The full-featured Git.
gitFull = gitBase.override {
svnSupport = true;
guiSupport = true;
sendEmailSupport = true;
withLibsecret = !stdenv.isDarwin;
};
gitRemoteGcrypt = callPackage ./git-remote-gcrypt { };
# Git with SVN support, but without GUI.
gitSVN = lowPrio (appendToName "with-svn" (gitBase.override {
svnSupport = true;
}));
gita = python3Packages.callPackage ./gita {};
gitflow = callPackage ./gitflow { };
@@ -167,34 +169,31 @@ let
inherit (darwin) Security;
};
hubUnstable = throw "use gitAndTools.hub instead";
lab = callPackage ./lab { };
lefthook = callPackage ./lefthook { };
pre-commit = pkgs.python3Packages.toPythonApplication pkgs.python3Packages.pre-commit;
pass-git-helper = python3Packages.callPackage ./pass-git-helper { };
pre-commit = pkgs.python3Packages.toPythonApplication pkgs.python3Packages.pre-commit;
qgit = qt5.callPackage ./qgit { };
stgit = callPackage ./stgit {
};
stgit = callPackage ./stgit { };
subgit = callPackage ./subgit { };
svn-all-fast-export = libsForQt5.callPackage ./svn-all-fast-export { };
svn2git = callPackage ./svn2git {
git = gitSVN;
};
svn-all-fast-export = libsForQt5.callPackage ./svn-all-fast-export { };
thicket = callPackage ./thicket { };
tig = callPackage ./tig { };
topGit = callPackage ./topgit { };
top-git = callPackage ./topgit { };
transcrypt = callPackage ./transcrypt { };
@@ -202,8 +201,12 @@ let
} // lib.optionalAttrs (config.allowAliases or true) (with self; {
# aliases
darcsToGit = darcs-to-git;
gitAnnex = git-annex;
gitFastExport = git-fast-export;
gitRemoteGcrypt = git-remote-gcrypt;
svn_all_fast_export = svn-all-fast-export;
topGit = top-git;
});
in
self
pkgs/applications/version-management/git-and-tools/delta/default.nix
+1 -4
View File
@@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "01jiqizg1ywvrrwhqzfqzbaqrzyfaqm66sixas0mpyzmd6cdwmh6";
};
# Delete this on next update; see #79975 for details
legacyCargoFetcher = true;
cargoSha256 = "1zmk70hccrxn1gdr1bksnvh6sa2h4518s0ni8k2ihxi4ld1ch5p2";
cargoSha256 = "0hah0qfgnl4w2h0djyh4xx1jks5dkzwin01qw001dqiasl60prn2";
meta = with lib; {
homepage = "https://github.com/dandavison/delta";
pkgs/applications/version-management/git-and-tools/gh/default.nix
+3 -3
View File
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "gh";
version = "0.5.5";
version = "0.5.7";
src = fetchFromGitHub {
owner = "cli";
repo = "cli";
rev = "v${version}";
sha256 = "0jmkcx95kngzylqhllg33s094rggpsrgky704z8v6j4969xgrfnc";
sha256 = "14j8210c1dndnhb8l2ifxcljzhajjhil86lvk9y7ndjkq09805q1";
};
modSha256 = "0ina3m2ixkkz2fws6ifwy34pmp6kn5s3j7w40alz6vmybn2smy1h";
modSha256 = "1qwcl74sg5az9vaivnvn7f40p72ilmkms5rp52sp5imfrql81lxf";
buildFlagsArray = [
"-ldflags=-X github.com/cli/cli/command.Version=${version}"
pkgs/applications/version-management/git-and-tools/git-absorb/default.nix
+1 -4
View File
@@ -13,10 +13,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ];
# Delete this on next update; see #79975 for details
legacyCargoFetcher = true;
cargoSha256 = "1khplyglavsidh13nnq9y5rxd5w89ail08wgzn29a5m03zir1yfd";
cargoSha256 = "13gikjswbb0kkpvb5zhj88qq5l667624gkfb7hd3zygh4qyhsy05";
meta = with stdenv.lib; {
homepage = "https://github.com/tummychow/git-absorb";
pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix
+1 -4
View File
@@ -10,10 +10,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "0bzq4ridzb4l1zqrj1r0vlzkjpgfaqwky5jf49cwjhz4ybwrfpkq";
};
# Delete this on next update; see #79975 for details
legacyCargoFetcher = true;
cargoSha256 = "1k5gxbjv4a8l5y9rm0n4vwzlwp4hk1rb59v0wvcirmj0p7hpw9x9";
cargoSha256 = "0r0hyp15knbbs4l9rcn395pzrx2vbibmwvs4pmga363irmi8mcy5";
meta = with lib; {
homepage = "https://github.com/softprops/git-codeowners";
pkgs/applications/version-management/git-and-tools/git-gone/default.nix
+1 -4
View File
@@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "05wlng563p9iy0ky3z23a4jakcix887fb45r7j2mk0fp5ykdjmzh";
};
# Delete this on next update; see #79975 for details
legacyCargoFetcher = true;
cargoSha256 = "1s3v5p6qgz74sh34gvajf453fsgl13sds4v8hz8c6ivipz4hpby2";
cargoSha256 = "1scp9rzn59akxsf9p48j1zq6clbwdyasnyi4j28nj03ghvdv2i33";
nativeBuildInputs = [ pkgconfig makeWrapper ];
pkgs/applications/version-management/git-and-tools/git-ignore/default.nix
+1 -4
View File
@@ -13,10 +13,7 @@ buildRustPackage rec {
sha256 = "0krz50pw9bkyzl78bvppk6skbpjp8ga7bd34jya4ha1xfmd8p89c";
};
# Delete this on next update; see #79975 for details
legacyCargoFetcher = true;
cargoSha256 = "1ccipxifnm38315qigaq28hlzam2wr8q2p2dbcq96kar6pq377vf";
cargoSha256 = "0vcg2pl0s329fr8p23pwdx2jy7qahbr7n337ib61f69aaxi1xmq0";
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ openssl ]
pkgs/applications/version-management/git-and-tools/git-my/default.nix
+29
View File
@@ -0,0 +1,29 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
pname = "git-my";
version = "1.1.2";
src = fetchFromGitHub {
owner = "davidosomething";
repo = "git-my";
rev = version;
sha256 = "0jji5zw25jygj7g4f6f3k0p0s9g37r8iad8pa0s67cxbq2v4sc0v";
};
dontBuild = true;
installPhase = ''
install -Dm755 -t "$out"/bin ./git-my
'';
meta = with stdenv.lib; {
description =
"List remote branches if they're merged and/or available locally";
homepage = https://github.com/davidosomething/git-my;
license = licenses.free;
maintainers = with maintainers; [ bb010g ];
platforms = platforms.all;
};
}
pkgs/applications/version-management/git-and-tools/git/default.nix
+2 -2
View File
@@ -21,7 +21,7 @@ assert sendEmailSupport -> perlSupport;
assert svnSupport -> perlSupport;
let
version = "2.25.0";
version = "2.25.1";
svn = subversionClient.override { perlBindings = perlSupport; };
gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ];
@@ -33,7 +33,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
sha256 = "1l58v42aazj0x9276gk8r9mwyl9pgp9w99aakz4xfhzv7wd2jq60";
sha256 = "09lzwa183nblr6l8ib35g2xrjf9wm9yhk3szfvyzkwivdv69c9r2";
};
outputs = [ "out" ];
pkgs/applications/version-management/git-and-tools/gitstatus/default.nix
+4 -4
View File
@@ -1,14 +1,14 @@
{callPackage, stdenv, fetchFromGitHub, ...}:
{ callPackage, stdenv, fetchFromGitHub, ...}:
stdenv.mkDerivation {
pname = "gitstatus";
version = "unstable-2020-01-28";
version = "unstable-2020-02-26";
src = fetchFromGitHub {
owner = "romkatv";
repo = "gitstatus";
rev = "edb99aa7b86d10ad0a1cfe25135b57c8031d82ad";
sha256 = "1nys74qswwc7hn9cv0j7syvbpnw0f15chc9pi11him4d6lsflrfd";
rev = "c0e5a24299c1a1a71434dac1de6ea650e80fbe49";
sha256 = "0fj84cvr5a895jqgg86raakx6lqyyhahf1dgzgx05y2gfvnxxh8m";
};
buildInputs = [ (callPackage ./romkatv_libgit2.nix {}) ];
pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{fetchFromGitHub, libgit2, ...}:
{ fetchFromGitHub, libgit2, ...}:
libgit2.overrideAttrs (oldAttrs: {
cmakeFlags = oldAttrs.cmakeFlags ++ [
@@ -13,7 +13,7 @@ libgit2.overrideAttrs (oldAttrs: {
src = fetchFromGitHub {
owner = "romkatv";
repo = "libgit2";
rev = "75be63625a0de418ec3551306362ee1e21034039";
sha256 = "1bwr1ahfxn1nn2f78ri91icxpv8xhpmgypcvg042cmcpm2qrahz9";
rev = "bb77509f4436901f3958e30272026f63d2247d7d";
sha256 = "06iypr0sc6g11xipwfbgm6f039d4qy9krmwb3zww8k4y004s5jcv";
};
})