Merge master into staging-next

2021-03-10 00:39:07 +00:00
parent cf320b516a 6bd4e08c34
commit 149a81c88d
65 changed files with 1235 additions and 376 deletions
--- a/pkgs/development/libraries/java/commons/lang/default.nix
+++ b/pkgs/development/libraries/java/commons/lang/default.nix
@@ -1,12 +1,12 @@
 { lib, stdenv, fetchurl }:

 stdenv.mkDerivation rec {
-  version = "3.11";
+  version = "3.12.0";
  pname = "commons-lang";

  src = fetchurl {
    url    = "mirror://apache/commons/lang/binaries/commons-lang3-${version}-bin.tar.gz";
-    sha256 = "08w7zg9v48rlaq0n17dnph8jydz9srh1pl3ffs3xdfsg9a7axjm4";
+    sha256 = "sha256-MwEkZd/Lf3kKyjM+CevxBeKl+5XCxjiz33kNPvqQjig=";
  };

  installPhase = ''