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-10-21 09:55:24 +02:00
parent a110c8e69d 7474d9c3bf
commit b6ba25ce95
56 changed files with 608 additions and 359 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/tools/analysis/checkstyle/default.nix
View File

@@ -1,12 +1,12 @@
{ stdenv, fetchurl, makeWrapper, jre }:
stdenv.mkDerivation rec {
version = "8.24";
version = "8.25";
pname = "checkstyle";
src = fetchurl {
url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar";
sha256 = "01h1xv6lqf1fhmzbghdj2dbygdspcb6dxk0fil16s2ggs3w62fmm";
sha256 = "04asn3cqh0f78c4b0968ic2fxgijf47paw3zgh9dh96x1165yhkf";
};
nativeBuildInputs = [ makeWrapper ];

4
pkgs/development/tools/avro-tools/default.nix
View File

@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "avro-tools";
version = "1.9.0";
version = "1.9.1";
src = fetchurl {
url =
"https://repo1.maven.org/maven2/org/apache/avro/avro-tools/${version}/${pname}-${version}.jar";
sha256 = "164mcz7ljd2ikwsq9ba98galcjar4g4n6ag7kkh466nwrpbmd2zi";
sha256 = "0d73qbfx59pa4mgsjwgl5dvc4895rm90pdwr4sbd77biscjad94s";
};
dontUnpack = true;

6
pkgs/development/tools/bazelisk/default.nix
View File

@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "bazelisk";
version = "1.0";
version = "1.1.0";
src = fetchFromGitHub {
owner = "bazelbuild";
repo = pname;
rev = "v${version}";
sha256 = "0516rx3qx6nxavy0a1qxjx2rcvdfb2ggig0q4n7fkmrxbnwxh2c9";
sha256 = "1pv113sk7hfxp4m2rcriqqp6mbbzcfdr0yrx4g1yiam93rx34yb7";
};
modSha256 = "1f73j6ryidzi3kfy3rhsqx047vzwvzaqcsl7ykhg87rn2l2s7fdl";
modSha256 = "0gs8y618izqi0gfa46jqh79yj8lzsmc6yj95fakhp2f5i8v1xrmx";
meta = with stdenv.lib; {
description = "A user-friendly launcher for Bazel";

4
pkgs/development/tools/build-managers/buck/default.nix
View File

@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "buck";
version = "2019.09.12.01";
version = "2019.10.17.01";
src = fetchFromGitHub {
owner = "facebook";
repo = pname;
rev = "v${version}";
sha256 = "02rid0r0swxa6n6hl89lcll7hgxn1wjh2kjzxcj4arm7d34243bw";
sha256 = "1irgp8yq1z11bq3b83yxvj35wqqq7y7b8q4d4y0hc05ac19ja0vj";
};
patches = [ ./pex-mtime.patch ];

6
pkgs/development/tools/chit/default.nix
View File

@@ -6,16 +6,16 @@ with rustPlatform;
buildRustPackage rec {
pname = "chit";
version = "0.1.14";
version = "0.1.15";
src = fetchFromGitHub {
owner = "peterheesterman";
repo = pname;
rev = version;
sha256 = "1rzy15xwlf87c8kpy9pwvir6s9z3qc8d9iz4pk0gfdj2il3vmjwv";
sha256 = "0iixczy3cad44j2d7zzj8f3lnmp4jwnb0snmwfgiq3vj9wrn28pz";
};
cargoSha256 = "1jqnnf4jgjpm1i310hda15423nxfw9frgpmc2kbrs66qcsj7avaw";
cargoSha256 = "0k6z69a09ps55w2rdgnf92yscw6rlbcpb4q9yf3rsav15pgpqvw8";
nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkgconfig ];
buildInputs = []

26
pkgs/development/tools/kustomize/default.nix
View File

@@ -1,29 +1,29 @@
{ lib, buildGoModule, fetchFromGitHub }:
{ lib, buildGoModule, fetchFromGitHub, tree }:
buildGoModule rec {
pname = "kustomize";
version = "3.1.0";
# rev is the 3.1.0 commit, mainly for kustomize version command output
rev = "95f3303493fdea243ae83b767978092396169baf";
version = "3.3.1";
# rev is the 3.3.1 commit, mainly for kustomize version command output
rev = "f2ac5a2d0df13c047fb20cbc12ef1a3b41ce2dad";
goPackagePath = "sigs.k8s.io/kustomize";
subPackages = [ "cmd/kustomize" ];
buildFlagsArray = let t = "${goPackagePath}/v3/pkg/commands/misc"; in ''
buildFlagsArray = let t = "sigs.k8s.io/kustomize/v3/provenance"; in ''
-ldflags=
-s -X ${t}.kustomizeVersion=${version}
-s -X ${t}.version=${version}
-X ${t}.gitCommit=${rev}
-X ${t}.buildDate=unknown
'';
src = fetchFromGitHub {
sha256 = "0kigcirkjvnj3xi1p28p9yp3s0lff24q5qcvf8ahjwvpbwka14sh";
rev = "v${version}";
repo = pname;
owner = "kubernetes-sigs";
repo = pname;
rev = "v${version}";
sha256 = "0yxxz0b56r18w178y32s619zy8ci6l93c6vlzx11hhxhbw43f6v6";
};
modSha256 = "0w8sp73pmj2wqrg7x7z8diglyfq6c6gn9mmck0k1gk90nv7s8rf1";
# avoid finding test and development commands
sourceRoot = "source/kustomize";
modSha256 = "1bas6al14ck0d2ccb4235426a5hldqsm0nf8vi76chz4nahzb71g";
meta = with lib; {
description = "Customization of kubernetes YAML configurations";

6
pkgs/development/tools/rust/cargo-generate/default.nix
View File

@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-generate";
version = "0.3.0";
version = "0.4.0";
src = fetchFromGitHub {
owner = "ashleygwilliams";
repo = "cargo-generate";
rev = "v${version}";
sha256 = "0n6na6xq4bvs9hc7vc86qqmlrkv824qdmja27b21l2wz3l77r4jb";
sha256 = "09276jrb0a735v6p06wz94kbk8bblwpca13vpvy8n0jjmqack2xb";
};
cargoSha256 = "00fgzh1s63rr1vs3ahra604m81fc4imx3s09brw2y0n46syhwypi";
cargoSha256 = "1gbxfmhwzpxm0gs3zwzs010j0ndi5aw6xsvvngg0h1lpwg9ypnbr";
nativeBuildInputs = [ pkgconfig ];