Merge branch 'staging-next' into staging

This commit is contained in:
Jan Tojnar
2019-12-25 05:18:52 +01:00
491 changed files with 22214 additions and 7240 deletions

View File

@@ -3,14 +3,14 @@
let
name = "doit";
version = "0.31.1";
version = "0.32.0";
in python3Packages.buildPythonApplication {
name = "${name}-${version}";
src = fetchurl {
url = "mirror://pypi/d/${name}/${name}-${version}.tar.gz";
sha256 = "1spm8vfjh4kvalaj0i2ggbdln1yy5k68d8mfwfnpqlzxxx4ikl5s";
sha256 = "033m6y9763l81kgqd07rm62bngv3dsm3k9p28nwsn2qawl8h8g9j";
};
buildInputs = with python3Packages; [ mock pytest ];

View File

@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
pname = "icmake";
version = "9.02.08";
version = "9.02.09";
src = fetchFromGitLab {
sha256 = "1pr5lagmdls3clzwa2xwcfa3k5750rf7i0j3zld0xirb41zx07q2";
sha256 = "0f4vyqgjribwa60j3a1c2xv69zllc7rfhaafq0jj1mdy8hdzvxpd";
rev = version;
repo = "icmake";
owner = "fbb-git";

View File

@@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
pname = "sbt";
version = "1.3.4";
version = "1.3.5";
src = fetchurl {
urls = [
"https://piccolo.link/sbt-${version}.tgz"
"https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz"
];
sha256 = "0bz6jj7jiwxd35xw9l1jbd846r0129pwgdi8m6dxwb8zybj73k2m";
sha256 = "1c1ha4w3c36l7w2ncmwvry05hwcj8pv7dkpq23wdc25w1yj0l7sn";
};
patchPhase = ''