Merge master into staging-next

This commit is contained in:
Frederik Rietdijk
2019-05-12 19:59:09 +02:00
118 changed files with 1983 additions and 1205 deletions

View File

@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "groovy-${version}";
version = "2.5.6";
version = "2.5.7";
src = fetchurl {
url = "http://dl.bintray.com/groovy/maven/apache-groovy-binary-${version}.zip";
sha256 = "14lfxnc03hmakwagvl3sb6c0b298v3awcdr1gafwnmsqv03hhkdn";
sha256 = "1q69xg7p790dfk09wyijpx8y85n8g9lfd0fikl6qr73k9zz5v41x";
};
buildInputs = [ unzip makeWrapper ];

View File

@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "janet";
version = "0.4.1";
version = "0.5.0";
src = fetchFromGitHub {
owner = "janet-lang";
repo = "janet";
rev = "v${version}";
sha256 = "06iq2y7c9i4pcmmgc8x2fklqkj2i3jrvmq694djiiyd4x81kzcj5";
sha256 = "00lrj21k85sqyn4hv2rc5sny9vxghafjxyvs0dq4zp68461s3l7c";
};
JANET_BUILD=''\"release\"'';