From 454255ee58a66c3d9d133b6edb2ce845f71cf1ce Mon Sep 17 00:00:00 2001
From: David <dlesl@users.noreply.github.com>
Date: Fri, 21 May 2021 18:40:28 +0200
Subject: [PATCH] rebar3: 3.15.1 -> 3.16.0

---
 .../tools/build-managers/rebar3/default.nix     | 17 ++++-------------
 .../tools/build-managers/rebar3/rebar-deps.nix  | 13 ++++---------
 2 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/pkgs/development/tools/build-managers/rebar3/default.nix b/pkgs/development/tools/build-managers/rebar3/default.nix
index 68b593e3f5d6..d6798c2d8e39 100644
--- a/pkgs/development/tools/build-managers/rebar3/default.nix
+++ b/pkgs/development/tools/build-managers/rebar3/default.nix
@@ -1,9 +1,9 @@
-{ lib, stdenv, fetchFromGitHub, fetchpatch,
+{ lib, stdenv, fetchFromGitHub,
   fetchHex, erlang, makeWrapper,
   writeScript, common-updater-scripts, coreutils, git, gnused, nix, rebar3-nix }:
 
 let
-  version = "3.15.1";
+  version = "3.16.0";
   owner = "erlang";
   deps = import ./rebar-deps.nix { inherit fetchFromGitHub fetchHex; };
   rebar3 = stdenv.mkDerivation rec {
@@ -16,20 +16,11 @@ let
       inherit owner;
       repo = pname;
       rev = version;
-      sha256 = "1pcy5m79g0l9l3d8lkbx6cq1w87z1g3sa6wwvgbgraj2v3wkyy5g";
+      sha256 = "1yqvm37l5rn5dyg4sc2hv47930s2524qrdpnjwy3zqa27r7k5n36";
     };
 
     buildInputs = [ erlang ];
 
-    patches = [
-      # TODO: remove this on next rebar3 release
-      (fetchpatch {
-        name = "escriptize-erl-libs";
-        url = "https://github.com/erlang/rebar3/commit/8049a92512420b0967a4c23acfa304d8ca7a712e.patch";
-        sha256 = "0jzdy7n2nz4v38nn76bgjcmssvqgvdhy9v2gl867ylwqn1y5sdm1";
-      })
-    ];
-
     postPatch = ''
       mkdir -p _checkouts _build/default/lib/
 
@@ -109,7 +100,7 @@ let
         # global-deps.patch makes it possible to use REBAR_GLOBAL_PLUGINS to
         # instruct rebar3 to always load a certain plugin. It is necessary since
         # REBAR_GLOBAL_CONFIG_DIR doesn't seem to work for this.
-        patches = old.patches ++ [ ./skip-plugins.patch ./global-plugins.patch ];
+        patches = [ ./skip-plugins.patch ./global-plugins.patch ];
       }));
     in stdenv.mkDerivation {
       pname = "rebar3-with-plugins";
diff --git a/pkgs/development/tools/build-managers/rebar3/rebar-deps.nix b/pkgs/development/tools/build-managers/rebar3/rebar-deps.nix
index 3aa1d1c165d3..6894b8666e68 100644
--- a/pkgs/development/tools/build-managers/rebar3/rebar-deps.nix
+++ b/pkgs/development/tools/build-managers/rebar3/rebar-deps.nix
@@ -16,11 +16,6 @@
     version = "1.8.1";
     sha256 = "sha256-5FdFrenEdqmkaeoIQOQYqxk2DcRPAaIzME4RikRIa6A=";
   };
-  parse_trans = fetchHex {
-    pkg = "parse_trans";
-    version = "3.3.1";
-    sha256 = "sha256-B82Vd4hfVjYtQU6MTE5r3xDUOodnq7ktJMvoskxUiIs=";
-  };
   getopt = fetchHex {
     pkg = "getopt";
     version = "1.0.1";
@@ -33,8 +28,8 @@
   };
   erlware_commons = fetchHex {
     pkg = "erlware_commons";
-    version = "1.4.0";
-    sha256 = "sha256-GF7PXPQ7qzoBPds2FM57un9seoJ5BOZOV9pU/N/c4uY=";
+    version = "1.5.0";
+    sha256 = "sha256-PnxvsrpMKbDdXf6dAxtmRJ4giOzsGoFGW9n94F7X0Ns=";
   };
   cth_readable = fetchHex {
     pkg = "cth_readable";
@@ -48,8 +43,8 @@
   };
   certifi = fetchHex {
     pkg = "certifi";
-    version = "2.5.3";
-    sha256 = "sha256-7VFqyzkpsQEgip1wAGLVIPOVPaO2uRjYZhBv+pgOHBA=";
+    version = "2.6.1";
+    sha256 = "sha256-UkyXtJkbOEndXBemMSI4licsawr0RneLpGdaHf9Tu34=";
   };
   bbmustache = fetchHex {
     pkg = "bbmustache";