Merge master into staging-next

2021-04-08 00:17:24 +00:00
parent 6e4d572602 d70959a2e2
commit 8d1d992273
62 changed files with 1712 additions and 1320 deletions
@@ -3,14 +3,14 @@

 stdenv.mkDerivation rec {
  pname = "sbt-extras";
-  rev = "b430596eb8566a59793ea0b8ddd2c693505e801f";
-  version = "2021-03-29";
+  rev = "a76f1f15e6ec39d886f8bf07d5bdfaf70cdc62d8";
+  version = "2021-04-06";

  src = fetchFromGitHub {
    owner = "paulp";
    repo = "sbt-extras";
    inherit rev;
-    sha256 = "0r0ysv7dzrlmj3c82fv60i2490ky7q70jlv40q7zdmm5q2wp7y63";
+    sha256 = "0zmhn8nvzrbw047g5z4q2slp0wdg6pvfh2pqnpwcq1hscf7dvz8f";
  };

  dontBuild = true;