Merge branch 'staging-next' into staging

This commit is contained in:
Jan Tojnar
2021-03-04 22:16:45 +01:00
325 changed files with 4167 additions and 1748 deletions
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "gh";
version = "1.6.2";
version = "1.7.0";
src = fetchFromGitHub {
owner = "cli";
repo = "cli";
rev = "v${version}";
sha256 = "1wq8k626w3w2cnqp9gqdk7g4pjnqjjybkjgbfq5cvqsql3jdjg65";
sha256 = "0ndi264rrssqin03qmv7n0fpzs3kasfqykidrlcyizw1ngyfgc1a";
};
vendorSha256 = "0nk5axyr3nd9cbk8wswfhqf25dks22mky3rdn6ba9s0fpxhhkr5g";
vendorSha256 = "0ywh5d41b1c5ivwngsgn46d6yb7s1wqyzl5b0j1x4mcvydi5yi98";
nativeBuildInputs = [ installShellFiles ];
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
'';
homepage = "https://android.googlesource.com/tools/repo";
license = licenses.asl20;
maintainers = [ maintainers.primeos ];
maintainers = [ ];
platforms = platforms.unix;
};
}
@@ -9,11 +9,11 @@ with lib;
buildGoPackage rec {
pname = "gitea";
version = "1.13.2";
version = "1.13.3";
src = fetchurl {
url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz";
sha256 = "sha256-uezg8GdNqgKVHgJj9rTqHFLWuLdyDp63fzr7DMslOII=";
sha256 = "sha256-+uuadtpDC4br+DUHpoY2aOwklpD9LxvkSqcBMC0+UHE=";
};
unpackPhase = ''
@@ -13,14 +13,14 @@
rustPlatform.buildRustPackage rec {
pname = "pijul";
version = "1.0.0-alpha.38";
version = "1.0.0-alpha.46";
src = fetchCrate {
inherit version pname;
sha256 = "0f14jkr1yswwyqz0l47b0287vpyz0g1qmksr3hkskhbmwlkf1q2b";
sha256 = "0x095g26qdch1m3izkn8ynwk1xg1qyz9ia8di23j61k7z2rqk0j5";
};
cargoSha256 = "08p2dq48d1islk02xz1j39402fqxfh4isf8qi219aivl0yciwjn3";
cargoSha256 = "0cw1y4vmhn70a94512mppk0kfh9xdfm0v4rp3zm00y06jzq1a1fp";
cargoBuildFlags = lib.optional gitImportSupport "--features=git";