Merge branch 'master' into staging-next

Hydra nixpkgs: ?compare=1523028
This commit is contained in:
Vladimír Čunát
2019-06-03 10:00:49 +02:00
392 changed files with 11536 additions and 4972 deletions

View File

@@ -129,7 +129,7 @@ in rec {
sha256s = {
"x86_64-linux" = "1xban102yiiwmlklxvn3xp3q546bp8hlxxpakayajkhhnpl6yv45";
"i686-linux" = "1igspf1lrv7wpmz0pfrkbx8m1ykvnv4zhic53cav4nicppm2v0ic";
"x86_64-darwin" = "0hzc65ccajr0yhmvi5vbdgbzbp1gbjy56da24ds3zwwkam1ddk0k";
"x86_64-darwin" = "1mri8bfrcldl69gczxpihxpv1shn4bijx28m3qby8vnk0ii63n9s";
};
};

View File

@@ -10,11 +10,11 @@
stdenv.mkDerivation rec {
name = "sbcl-${version}";
version = "1.5.1";
version = "1.5.3";
src = fetchurl {
url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2";
sha256 = "08z62qba0kmm15k93s2rq7ipi769895g8iwigcp20qjh6amwnwph";
sha256 = "0334cfnvjy0ccq9p05mxrgawhww8wb73rp318qcsf9yj8h8r19yj";
};
buildInputs = [texinfo];

View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, autoconf, bison, boost, flex, texinfo, gputils ? null
{ stdenv, fetchurl, autoconf, bison, boost, flex, texinfo, zlib, gputils ? null
, excludePorts ? [] }:
with stdenv.lib;
@@ -10,14 +10,14 @@ in
stdenv.mkDerivation rec {
name = "sdcc-${version}";
version = "3.7.0";
version = "3.8.0";
src = fetchurl {
url = "mirror://sourceforge/sdcc/sdcc-src-${version}.tar.bz2";
sha256 = "13llvx0j3v5qa7qd4fh7nix4j3alpd3ccprxvx163c4q8q4lfkc5";
sha256 = "08dvvdxd99hb50wvs8m986v3scfj1rdjw18js7pk5n3vxf6nccdk";
};
buildInputs = [ autoconf bison boost flex gputils texinfo ];
buildInputs = [ autoconf bison boost flex gputils texinfo zlib ];
configureFlags = map (f: "--disable-${f}-port") excludedPorts;

View File

@@ -6,9 +6,9 @@ assert z3Support -> z3 != null;
assert z3Support -> stdenv.lib.versionAtLeast z3.version "4.6.0";
let
version = "0.5.8";
rev = "23d335f28e4055e67c3b22466ac7c4e41dc48344";
sha256 = "10fa4qwfr3gfvxkzzjfs0w2fyij67cczklpj2x5hghcg08amkq37";
version = "0.5.9";
rev = "c68bc34e9466ef22326dd9072d557c56160e9092";
sha256 = "1b611piwnwiwk4dcvn2qm4wjb9msa385lpx81y3k669ga3ip9rkc";
jsoncppURL = https://github.com/open-source-parsers/jsoncpp/archive/1.8.4.tar.gz;
jsoncpp = fetchzip {
url = jsoncppURL;

View File

@@ -1,17 +1,17 @@
{ stdenv, fetchurl, file, openssl, mlton
, mysql, postgresql, sqlite, gcc
, mysql, postgresql, sqlite, gcc, icu
}:
stdenv.mkDerivation rec {
name = "urweb-${version}";
version = "20180616";
version = "20190217";
src = fetchurl {
url = "https://github.com/urweb/urweb/releases/download/${version}/${name}.tar.gz";
sha256 = "04iy2ky78q6w0d2xyfz2a1k26g2yrwsh1hw1bgs5ia9v3ih965r1";
sha256 = "1cl0x0sy7w1lazszc8q06q3wx0x0rczxh27vimrsw54s6s9y096s";
};
buildInputs = [ openssl mlton mysql.connector-c postgresql sqlite ];
buildInputs = [ openssl mlton mysql.connector-c postgresql sqlite icu ];
prePatch = ''
sed -e 's@/usr/bin/file@${file}/bin/file@g' -i configure