Merge staging-next into staging

This commit is contained in:
Frederik Rietdijk
2020-11-18 15:36:56 +01:00
438 changed files with 9353 additions and 6713 deletions
@@ -5,13 +5,13 @@ let
in buildPythonApplication rec {
pname = "git-cola";
version = "3.5";
version = "3.8";
src = fetchFromGitHub {
owner = "git-cola";
repo = "git-cola";
rev = "v${version}";
sha256 = "09b60jbpdr4czx7h4vqahqmmi7m9vn77jlkpjfhys7crrdnxjp9i";
sha256 = "1qxv2k8lxcxpqx46ka7f042xk90xns5w9lc4009cxmsqvcdba03a";
};
buildInputs = [ git gettext ];
@@ -21,6 +21,6 @@ rustPlatform.buildRustPackage rec {
description = "Blazing fast terminal-ui for git written in rust";
homepage = "https://github.com/extrawurst/gitui";
license = licenses.mit;
maintainers = with maintainers; [ filalex77 yanganto ];
maintainers = with maintainers; [ Br1ght0ne yanganto ];
};
}
@@ -29,6 +29,6 @@ in crystal.buildCrystalPackage rec {
description = "A better one-line git log";
homepage = "https://github.com/taylorthurlow/thicket";
license = licenses.mit;
maintainers = with maintainers; [ filalex77 ];
maintainers = with maintainers; [ Br1ght0ne ];
};
}
@@ -8,11 +8,11 @@ with stdenv.lib;
buildGoPackage rec {
pname = "gitea";
version = "1.12.5";
version = "1.12.6";
src = fetchurl {
url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz";
sha256 = "03p4nn7xklqr43h4d98qvv2xc14ly7mbb90njnxljj64yh7svw4n";
sha256 = "sha256-mEhtFcWLUhd+WK8wDhrGr6RvL4X2G42W6su/c8zxGR4=";
};
unpackPhase = ''
@@ -15,14 +15,14 @@
rustPlatform.buildRustPackage rec {
pname = "pijul";
version = "1.0.0-alpha";
version = "1.0.0-alpha.3";
src = fetchCrate {
inherit version pname;
sha256 = "0dnw2cxsxb20my81szyqjsmmnkakxawvsk6cnd1fi88k4lr0z2xh";
sha256 = "0bz38vvzjrplb2mgcypg2p4kq33v6m58yivg15s2ghr7ly9k5ybx";
};
cargoSha256 = "130vryqs0g4a0328ivqafdylwqs64g4mp8vgmz6nz4c9l3h9wgcx";
cargoSha256 = "0p9djvdjzyjzsn3fyw6f74fix39s3y92246cgzcqhc1qlwwz67rl";
cargoBuildFlags = stdenv.lib.optional gitImportSupport "--features=git";
LIBCLANG_PATH = "${libclang}/lib";