Merge branch 'master' into staging

4 files changed, 7 insertions, 27 deletions

diff --git a/pkgs/development/compilers/ats2/default.nix b/pkgs/development/compilers/ats2/default.nix
index 3abd5c8c82a9..6c523ebb4f14 100644
--- a/pkgs/development/compilers/ats2/default.nix
+++ b/pkgs/development/compilers/ats2/default.nix
@@ -3,11 +3,11 @@
 , withContrib ? true }:
 
 let
-  versionPkg = "0.3.0" ;
+  versionPkg = "0.3.7" ;
 
   contrib = fetchurl {
     url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-contrib-${versionPkg}.tgz" ;
-    sha256 = "1s4yscisn9gsr692jmh4y5mz03012pv84cm7l5n51v83wc08fks0" ;
+    sha256 = "1w59ir9ij5bvvnxj6fb1rvzycfqa57i31wmpwawxbsb10bqwzyr6";
   };
 
   postInstallContrib = stdenv.lib.optionalString withContrib
@@ -31,11 +31,9 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-${version}.tgz";
-    sha256 = "1knf03r8a5sis7n8rw54flf1lxfbr3prywxb1czcdp6hsbcd1v1d";
+    sha256 = "19nxyi39fn42sp38kl14a6pvbxq9wr8y405wx0zz7mqb77r0m0h5";
   };
 
-  patches = [ ./install-postiats-contrib.patch ];
-
   buildInputs = [ gmp ];
 
   setupHook = with stdenv.lib;
diff --git a/pkgs/development/compilers/ats2/install-postiats-contrib.patch b/pkgs/development/compilers/ats2/install-postiats-contrib.patch
deleted file mode 100644
index cb280d028b52..000000000000
--- a/pkgs/development/compilers/ats2/install-postiats-contrib.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Install the parts of the contrib that have been moved to Postiats.
-diff -Naur ATS2-Postiats-0.3.0-upstream/Makefile_dist ATS2-Postiats-0.3.0/Makefile_dist
---- ATS2-Postiats-0.3.0-upstream/Makefile_dist	2017-01-20 10:23:54.000000000 -0400
-+++ ATS2-Postiats-0.3.0/Makefile_dist	2017-01-21 13:14:27.614723335 -0400
-@@ -124,12 +124,12 @@
-   cd "$(abs_top_srcdir)" && \
-   $(MKDIR_P) $(PATSLIBHOME2)/bin && \
-   if [ ! -d $(bindir2) ] ; then $(MKDIR_P) $(bindir2) ; fi && \
--  for x in share ccomp prelude libc libats ; do \
-+  for x in share ccomp prelude libc libats contrib atscntrb ; do \
-     find "$$x" -type d -exec $(MKDIR_P) $(PATSLIBHOME2)/\{} \; -print; \
-   done
- 
- install_files_0: install_dirs ; \
--  for x in share ccomp/runtime prelude libc libats ; do \
-+  for x in share ccomp/runtime prelude libc libats contrib atscntrb ; do \
-     cd "$(abs_top_srcdir)" && \
-     $(INSTALL) -d $(PATSLIBHOME2)/"$$x" && \
-     find "$$x" -type l -exec cp -d \{} $(PATSLIBHOME2)/\{} \; -print && \
diff --git a/pkgs/development/compilers/fpc/lazarus.nix b/pkgs/development/compilers/fpc/lazarus.nix
index 704d9d5be645..e646debd9d7e 100644
--- a/pkgs/development/compilers/fpc/lazarus.nix
+++ b/pkgs/development/compilers/fpc/lazarus.nix
@@ -8,10 +8,10 @@ stdenv, fetchurl
 let
   s =
   rec {
-    version = "1.6";
-    versionSuffix = ".0-0";
+    version = "1.8.0";
+    versionSuffix = "";
     url = "mirror://sourceforge/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%20${version}/lazarus-${version}${versionSuffix}.tar.gz";
-    sha256 = "1a1w9yibi0rsr51bl7csnq6mr59x0934850kiabs80nr3sz05knb";
+    sha256 = "0i58ngrr1vjyazirfmz0cgikglc02z1m0gcrsfw9awpi3ax8h21j";
     name = "lazarus-${version}";
   };
   buildInputs = [
diff --git a/pkgs/development/compilers/mono/5.0.nix b/pkgs/development/compilers/mono/5.0.nix
index 911ba0ae02a7..d10d6e3e6053 100644
--- a/pkgs/development/compilers/mono/5.0.nix
+++ b/pkgs/development/compilers/mono/5.0.nix
@@ -4,4 +4,5 @@ callPackage ./generic-cmake.nix (rec {
   inherit Foundation libobjc;
   version = "5.0.1.1";
   sha256 = "064pgsmanpybpbhpam9jv9n8aicx6mlyb7a91yzh3kcksmqsxmj8";
+  enableParallelBuilding = false; # #32386, https://hydra.nixos.org/build/65820147
 })