Merge staging-next into staging

pkgs/development/compilers/mlkit/default.nix

@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "mlkit";
-  version = "4.5.6";
+  version = "4.5.7";
 
   src = fetchFromGitHub {
     owner = "melsman";
     repo = "mlkit";
     rev = "v${version}";
-    sha256 = "sha256-aa6dRcGTXGakJsHCvHXRKs5BHtIZi6V2r8348epzpVc=";
+    sha256 = "sha256-Wq+Os7nzRA5Pxz6Ba7DudcDQs3KA0eYVLy1nO/A16EE=";
   };
 
   nativeBuildInputs = [ autoreconfHook mlton ];

pkgs/development/compilers/owl-lisp/default.nix

@@ -1,22 +1,19 @@
-{ lib, stdenv, fetchFromGitLab, coreutils, which }:
+{ lib, stdenv, fetchFromGitLab, which }:
 
 stdenv.mkDerivation rec {
   pname = "owl-lisp";
-  version = "0.1.23";
+  version = "0.2";
 
   src = fetchFromGitLab {
     owner  = "owl-lisp";
     repo   = "owl";
     rev    = "v${version}";
-    sha256 = "1indcbicqcdlk9sinkdyhk50fi1b4cb7yrr14vr874gjzmwr2l3i";
+    sha256 = "sha256-G12yZxlq6Hss5j4Seq1hcPQWXMIeL2Z8VkBdmIGESX8=";
   };
 
   nativeBuildInputs = [ which ];
 
-  prePatch = ''
-    substituteInPlace Makefile \
-      --replace /usr $out
-  '';
+  makeFlags = [ "PREFIX=${placeholder "out"}" "CC=cc" ];
 
   # tests are run as part of the compilation process
   doCheck = false;
@@ -26,6 +23,6 @@ stdenv.mkDerivation rec {
     homepage    = "https://gitlab.com/owl-lisp/owl";
     license     = licenses.mit;
     maintainers = with maintainers; [ peterhoeg ];
-    platforms   = platforms.linux;
+    platforms   = platforms.unix;
   };
 }

pkgs/development/compilers/yosys/default.nix

@@ -103,5 +103,12 @@ stdenv.mkDerivation rec {
     license     = licenses.isc;
     platforms   = platforms.all;
     maintainers = with maintainers; [ shell thoughtpolice emily ];
+    #In file included from kernel/driver.cc:20:
+    #./kernel/yosys.h:42:10: fatal error: 'map' file not found
+    ##include <map>
+
+    #https://github.com/YosysHQ/yosys/issues/681
+    #https://github.com/YosysHQ/yosys/issues/2011
+    broken = stdenv.isDarwin;
   };
 }