Merge staging-next into staging

pkgs/development/compilers/bigloo/default.nix

@@ -1,17 +1,29 @@
-{ fetchurl, stdenv, gmp }:
+{ fetchurl, stdenv, autoconf, automake, libtool, gmp
+, darwin
+}:
 
 stdenv.mkDerivation rec {
   pname = "bigloo";
-  version = "4.1a-2";
+  version = "4.3h";
 
   src = fetchurl {
-    url = "ftp://ftp-sop.inria.fr/indes/fp/Bigloo/bigloo${version}.tar.gz";
-    sha256 = "09yrz8r0jpj7bda39fdxzrrdyhi851nlfajsyf0b6jxanz6ygcjx";
+    url = "ftp://ftp-sop.inria.fr/indes/fp/Bigloo/bigloo-${version}.tar.gz";
+    sha256 = "0fw08096sf8ma2cncipnidnysxii0h0pc7kcqkjhkhdchknp8vig";
   };
 
+  nativeBuildInputs = [ autoconf automake libtool ];
+
+  buildInputs = stdenv.lib.optional stdenv.isDarwin
+    darwin.apple_sdk.frameworks.ApplicationServices
+  ;
+
   propagatedBuildInputs = [ gmp ];
 
   preConfigure =
+    # For libuv on darwin
+    stdenv.lib.optionalString stdenv.isDarwin ''
+      export LIBTOOLIZE=libtoolize
+    '' +
     # Help libgc's configure.
     '' export CXXCPP="$CXX -E"
     '';

pkgs/development/compilers/hop/default.nix

@@ -1,21 +1,27 @@
 { stdenv, fetchurl, bigloo }:
 
+# Compute the “release” version of bigloo (before the first dash, if any)
+let bigloo-release =
+  let inherit (stdenv.lib) head splitString; in
+  head (splitString "-" (builtins.parseDrvName bigloo.name).version)
+; in
+
 stdenv.mkDerivation rec {
-  name = "hop-2.5.1";
+  name = "hop-3.3.0";
   src = fetchurl {
     url = "ftp://ftp-sop.inria.fr/indes/fp/Hop/${name}.tar.gz";
-    sha256 = "1bvp7pc71bln5yvfj87s8750c6l53wjl6f8m12v62q9926adhwys";
+    sha256 = "14gf9ihmw95zdnxsqhn5jymfivpfq5cg9v0y7yjd5i7c787dncp5";
   };
 
+  postPatch = ''
+    substituteInPlace configure --replace "(os-tmp)" '(getenv "TMPDIR")'
+  '';
+
   buildInputs = [ bigloo ];
 
-  preConfigure = ''
-    export NIX_LDFLAGS="$NIX_LDFLAGS -lbigloogc-4.1a";
-  '';
-
   configureFlags = [
     "--bigloo=${bigloo}/bin/bigloo"
-    "--bigloolibdir=${bigloo}/lib/bigloo/4.1a/"
+    "--bigloolibdir=${bigloo}/lib/bigloo/${bigloo-release}/"
   ];
 
   meta = with stdenv.lib; {

pkgs/development/compilers/mcpp/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, fetchpatch }:
 
 stdenv.mkDerivation rec {
   pname = "mcpp";
@@ -11,6 +11,14 @@ stdenv.mkDerivation rec {
 
   configureFlags = [ "--enable-mcpplib" ];
 
+  patches = [
+    (fetchpatch {
+      name = "CVE-2019-14274.patch";
+      url = "https://github.com/h8liu/mcpp/commit/ea453aca2742be6ac43ba4ce0da6f938a7e5a5d8.patch";
+      sha256 = "0svkdr3w9b45v6scgzvggw9nsh6a3k7g19fqk0w3vlckwmk5ydzr";
+    })
+  ];
+
   meta = with stdenv.lib; {
     homepage = "http://mcpp.sourceforge.net/";
     description = "A portable c preprocessor";

pkgs/development/compilers/mruby/bison-36-compat.patch

@@ -1,59 +0,0 @@
-From acab088fd6af0b2ef2df1396aeb93bfc2e020fa5 Mon Sep 17 00:00:00 2001
-From: "Yukihiro \"Matz\" Matsumoto" <matz@ruby.or.jp>
-Date: Mon, 27 Apr 2020 18:52:43 +0900
-Subject: [PATCH 1/2] Updating `parse.y for recent `bison` (retry).
-
----
- mrbgems/mruby-compiler/core/parse.y | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mrbgems/mruby-compiler/core/parse.y b/mrbgems/mruby-compiler/core/parse.y
-index 6a1faf4e..2a4f740e 100644
---- a/mrbgems/mruby-compiler/core/parse.y
-+++ b/mrbgems/mruby-compiler/core/parse.y
-@@ -1323,7 +1323,7 @@ heredoc_end(parser_state *p)
- 
- %}
- 
--%pure-parser
-+%define api.pure
- %parse-param {parser_state *p}
- %lex-param {parser_state *p}
- 
--- 
-2.27.0
-
-From 3cc682d943b29e84928a847a23f411ddbace74b7 Mon Sep 17 00:00:00 2001
-From: "Yukihiro \"Matz\" Matsumoto" <matz@ruby.or.jp>
-Date: Fri, 15 May 2020 12:30:13 +0900
-Subject: [PATCH 2/2] Remove `YYERROR_VERBOSE` which no longer supported since
- `bison 3.6`.
-
-Instead we added `%define parse.error verbose`.
----
- mrbgems/mruby-compiler/core/parse.y | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mrbgems/mruby-compiler/core/parse.y b/mrbgems/mruby-compiler/core/parse.y
-index 2a4f740e..eee6a5e5 100644
---- a/mrbgems/mruby-compiler/core/parse.y
-+++ b/mrbgems/mruby-compiler/core/parse.y
-@@ -9,7 +9,6 @@
- #ifdef PARSER_DEBUG
- # define YYDEBUG 1
- #endif
--#define YYERROR_VERBOSE 1
- #define YYSTACK_USE_ALLOCA 1
- 
- #include <ctype.h>
-@@ -1323,6 +1322,7 @@ heredoc_end(parser_state *p)
- 
- %}
- 
-+%define parse.error verbose
- %define api.pure
- %parse-param {parser_state *p}
- %lex-param {parser_state *p}
--- 
-2.27.0
-

pkgs/development/compilers/mruby/default.nix

@@ -2,26 +2,24 @@
 
 stdenv.mkDerivation rec {
   pname = "mruby";
-  version = "2.1.1";
+  version = "2.1.2";
 
   src = fetchFromGitHub {
     owner   = "mruby";
     repo    = "mruby";
     rev     = version;
-    sha256  = "gEEb0Vn/G+dNgeY6r0VP8bMSPrEOf5s+0GoOcnIPtEU=";
+    sha256  = "0fhfv8pi7i8jn2vgk2n2rjnbnfa12nhj514v8i4k353n7q4pmkh3";
   };
 
   nativeBuildInputs = [ ruby bison rake ];
 
-  patches = [ ./bison-36-compat.patch ];
-
   # Necessary so it uses `gcc` instead of `ld` for linking.
   # https://github.com/mruby/mruby/blob/35be8b252495d92ca811d76996f03c470ee33380/tasks/toolchains/gcc.rake#L25
   preBuild = if stdenv.isLinux then "unset LD" else null;
 
   installPhase = ''
     mkdir $out
-    cp -R build/host/{bin,lib} $out
+    cp -R include build/host/{bin,lib} $out
   '';
 
   doCheck = true;