Merge staging-next into staging

This commit is contained in:
Frederik Rietdijk
2020-03-06 07:09:30 +01:00
102 changed files with 1212 additions and 482 deletions
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "joker";
version = "0.14.1";
version = "0.14.2";
src = fetchFromGitHub {
rev = "v${version}";
owner = "candid82";
repo = "joker";
sha256 = "0da07fswj7x87njd9bi3gf8rzfyaq3zfcszgyb37w7q0ng4gg25n";
sha256 = "1wi80sr8h9fwh4xipff0y6qdzrliwyk2w1bmi33ncykxd9r2g7nk";
};
modSha256 = "0i16vf7n1xfz5kp9w3fvyc9y9wgz4h396glgpdaznpxjr12rb43j";
@@ -20,7 +20,7 @@ buildGoModule rec {
subPackages = [ "." ];
meta = with stdenv.lib; {
homepage = https://github.com/candid82/joker;
homepage = "https://github.com/candid82/joker";
description = "A small Clojure interpreter and linter written in Go";
license = licenses.epl10;
platforms = platforms.all;
@@ -6,11 +6,11 @@ rubyVersion = callPackage ../ruby/ruby-version.nix {} "2" "3" "3" "";
jruby = stdenv.mkDerivation rec {
pname = "jruby";
version = "9.2.10.0";
version = "9.2.11.0";
src = fetchurl {
url = "https://s3.amazonaws.com/jruby.org/downloads/${version}/jruby-bin-${version}.tar.gz";
sha256 = "0lwmqyg06rv3iyhmfnqcg4xzaxcfrgjivjrc4ljwb0y629vp16ci";
sha256 = "01yzpasnpqqm0vfc0ki8vkxbzijjfws135jw8k0r50b5lahjvs4a";
};
buildInputs = [ makeWrapper ];
@@ -48,7 +48,7 @@ jruby = stdenv.mkDerivation rec {
meta = {
description = "Ruby interpreter written in Java";
homepage = http://jruby.org/;
homepage = "http://jruby.org/";
license = with stdenv.lib.licenses; [ cpl10 gpl2 lgpl21 ];
platforms = stdenv.lib.platforms.unix;
};
@@ -286,7 +286,7 @@ in {
};
php74 = generic {
version = "7.4.2";
sha256 = "05p8z0ld058yjanxaphy3ka20hn7x7d6nak5sm782w4wprs9k402";
version = "7.4.3";
sha256 = "wVF7pJV4+y3MZMc6Ptx21PxQfEp6xjmYFYTMfTtMbRQ=";
};
}