Merge master into staging-next

This commit is contained in:
Frederik Rietdijk
2020-01-28 10:46:13 +01:00
745 changed files with 15146 additions and 15353 deletions
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
pname = "icmake";
version = "9.02.09";
version = "9.03.01";
src = fetchFromGitLab {
sha256 = "0f4vyqgjribwa60j3a1c2xv69zllc7rfhaafq0jj1mdy8hdzvxpd";
sha256 = "05r0a69w0hv2qhjpb2bxd0lmp2vv5r2d4iggg6ly4miam0i318jy";
rev = version;
repo = "icmake";
owner = "fbb-git";
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "mill";
version = "0.5.6";
version = "0.6.0";
src = fetchurl {
url = "https://github.com/lihaoyi/mill/releases/download/${version}/${version}";
sha256 = "16fjbgsy6fz1vw1s883z7xv380525rr47j7pcc365p5nm8y1hfp1";
sha256 = "0pdyv3bk2d50gqqd9h4a2i4yym4k01p7qkwhzz2mxa18f64777s9";
};
nativeBuildInputs = [ makeWrapper ];
@@ -2,7 +2,7 @@
let
version = "2.5.1";
version = "2.6.4";
in
stdenv.mkDerivation {
pname = "rebar";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "https://github.com/rebar/rebar/archive/${version}.tar.gz";
sha256 = "1y9b0smw0g5q197xf4iklzmcf8ad6w52p6mwzpf7b0ib1nd89jw6";
sha256 = "01xxq1f1vrwca00pky2van26hi2hhr05ghfhy71v5cifzax4cwjp";
};
buildInputs = [ erlang ];
@@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
pname = "sbt";
version = "1.3.5";
version = "1.3.7";
src = fetchurl {
urls = [
"https://piccolo.link/sbt-${version}.tgz"
"https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz"
];
sha256 = "1c1ha4w3c36l7w2ncmwvry05hwcj8pv7dkpq23wdc25w1yj0l7sn";
sha256 = "054qfbvhkh1w66f2nvsv1mvrkjc9qddzsnfrhmaqx79gglxllgc1";
};
patchPhase = ''