Merge branch 'master' into staging-next

A mass darwin rebuild from master (#55784).
This commit is contained in:
Vladimír Čunát
2019-02-17 07:58:47 +01:00
62 changed files with 838 additions and 413 deletions

View File

@@ -3,11 +3,11 @@
, withContrib ? true }:
let
versionPkg = "0.3.12" ;
versionPkg = "0.3.13" ;
contrib = fetchurl {
url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-contrib-${versionPkg}.tgz" ;
sha256 = "6e53e3070f50600373b857a73a76196adffcabc3c0d3173eaaf9a5f50f4596f4";
url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-contrib-${versionPkg}.tgz";
sha256 = "5f64172b2df08c8563b01febc32b582b2d7b59c0c514bd2beb727e69bb8e24ee";
};
postInstallContrib = stdenv.lib.optionalString withContrib
@@ -30,8 +30,8 @@ stdenv.mkDerivation rec {
version = versionPkg;
src = fetchurl {
url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-${version}.tgz";
sha256 = "63eb02b225a11752745e8f08691140ed764288ab4ceda3710670cde24835b0d8";
url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-gmp-${version}.tgz";
sha256 = "0056ff5bfa55c9b9831dce004e7b1b9e7a98d56a9d8ae49d827f9fd0ef823c23";
};
buildInputs = [ gmp ];