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-08-17 17:51:54 +02:00
parent 7894420373 0ac85bc455
commit 7dba683656
499 changed files with 2713 additions and 6206 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/tools/build-managers/apache-ant/1.9.nix
+2 -2
View File
@@ -1,6 +1,6 @@
{ fetchurl, stdenv, coreutils, makeWrapper }:
let version = "1.9.6"; in
let version = "1.9.15"; in
stdenv.mkDerivation {
pname = "ant";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "mirror://apache/ant/binaries/apache-ant-${version}-bin.tar.bz2";
sha256 = "1cwd5vq175gyicw0hkm8idwa33zxwhf7xlxywaqxcqqdjql0jfx4";
sha256 = "0yfx5qsvrg12lar4908ndbnlpppy7g7qk8ay41y4sz9g873v07mr";
};
contrib = fetchurl {
pkgs/development/tools/build-managers/apache-ant/default.nix
+3 -3
View File
@@ -1,6 +1,6 @@
{ fetchurl, stdenv, coreutils, makeWrapper }:
let version = "1.10.2"; in
let version = "1.10.8"; in
stdenv.mkDerivation {
pname = "ant";
@@ -10,12 +10,12 @@ stdenv.mkDerivation {
src = fetchurl {
url = "mirror://apache/ant/binaries/apache-ant-${version}-bin.tar.bz2";
sha256 = "0662qammjvibh9kgkxzadkayfn2r7iwnagbwaw28crqqclrb2rp1";
sha256 = "0zh94csb2hl6ir2ccn18ps506mjgh3mffnrb8wpsmp1x5fcykha5";
};
contrib = fetchurl {
url = "mirror://sourceforge/ant-contrib/ant-contrib-1.0b3-bin.tar.bz2";
sha256 = "96effcca2581c1ab42a4828c770b48d54852edf9e71cefc9ed2ffd6590571ad1";
sha256 = "1l8say86bz9gxp4yy777z7nm4j6m905pg342li1aphc14p5grvwn";
};
installPhase =
pkgs/development/tools/build-managers/bazel/buildtools/default.nix
-1
View File
@@ -24,6 +24,5 @@ buildGoPackage rec {
homepage = "https://github.com/bazelbuild/buildtools";
license = licenses.asl20;
maintainers = with maintainers; [ elasticdog uri-canva marsam ];
platforms = platforms.all;
};
}
pkgs/development/tools/build-managers/gradle/default.nix
+5 -5
View File
@@ -51,15 +51,15 @@ rec {
};
};
gradle_latest = gradle_6_5;
gradle_latest = gradle_6_6;
gradle_6_5 = gradleGen rec {
name = "gradle-6.5.1";
nativeVersion = "0.22-milestone-3";
gradle_6_6 = gradleGen rec {
name = "gradle-6.6";
nativeVersion = "0.22-milestone-4";
src = fetchurl {
url = "https://services.gradle.org/distributions/${name}-bin.zip";
sha256 = "0jmmipjh4fbsn92zpifa5cqg5ws2a4ha0s4jzqhrg4zs542x79sh";
sha256 = "09a0fnz6fn8yaxm3q3iwyjm3nnaz7k8i1xlpc7sm414py043by76";
};
};
pkgs/development/tools/build-managers/mage/default.nix
-1
View File
@@ -27,6 +27,5 @@ buildGoModule rec {
homepage = "https://magefile.org/";
license = licenses.asl20;
maintainers = with maintainers; [ swdunlop ];
platforms = platforms.all;
};
}