Merge branch 'master' into staging-next

2021-04-06 16:01:14 +02:00
parent 44e3fc61fe 413e9561f8
commit c04a14edd6
493 changed files with 4687 additions and 2055 deletions
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, yacc }:
+{ lib, stdenv, fetchurl, bison }:

 stdenv.mkDerivation rec {
  name = "jam-2.6.1";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
    sha256 = "19xkvkpycxfsncxvin6yqrql3x3z9ypc1j8kzls5k659q4kv5rmc";
  };

-  nativeBuildInputs = [ yacc ];
+  nativeBuildInputs = [ bison ];

  preConfigure = ''
    unset AR
@@ -8,11 +8,11 @@

 stdenv.mkDerivation rec {
  pname = "sbt";
-  version = "1.4.9";
+  version = "1.5.0";

  src = fetchurl {
    url = "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz";
-    sha256 = "sha256-lUaBGfdkFJk2czCmCkuKYhHm6n+L3n1kfGexndj9224=";
+    sha256 = "1dj241cj3v8kzqnz5s499rijpl7wv4rw171swqnc0xza90513pxa";
  };

  postPatch = ''