Merge master into staging-next

2020-12-17 18:17:15 +00:00
parent 22634a46f3 f5944b74e6
commit 8c3e8bd4b9
59 changed files with 514 additions and 1531 deletions
@@ -4,14 +4,14 @@

 stdenv.mkDerivation rec {
  pname = "sbt-extras";
-  rev = "be2f5d98f13884a18eaf5205458f985575dbe13a";
-  version = "2020-11-23";
+  rev = "32cf43b58f91bd3b7063baa9f2d75d4af45d9c4b";
+  version = "2020-12-17";

  src = fetchFromGitHub {
    owner = "paulp";
    repo = "sbt-extras";
    inherit rev;
-    sha256 = "00acnj357fcwx7w25axaj0l5ync97ixsixg8s55r7hwibkxn0fa7";
+    sha256 = "046xr3x73p63xnfakq981gvl299l5fahxgnn0bacvp7pa8g99dv2";
  };

  dontBuild = true;