From b1f796eabe317d441626e616ed96d23eed1432af Mon Sep 17 00:00:00 2001
From: David <dlesl@users.noreply.github.com>
Date: Sat, 8 May 2021 17:30:22 +0200
Subject: [PATCH] rebar3: 3.14.4 -> 3.15.1

---
 .../tools/build-managers/rebar3/default.nix   | 78 ++-----------------
 .../build-managers/rebar3/rebar-deps.nix      | 58 ++++++++++++++
 2 files changed, 64 insertions(+), 72 deletions(-)
 create mode 100644 pkgs/development/tools/build-managers/rebar3/rebar-deps.nix

diff --git a/pkgs/development/tools/build-managers/rebar3/default.nix b/pkgs/development/tools/build-managers/rebar3/default.nix
index c2b10d823a3..b9070a42764 100644
--- a/pkgs/development/tools/build-managers/rebar3/default.nix
+++ b/pkgs/development/tools/build-managers/rebar3/default.nix
@@ -3,70 +3,12 @@
   tree }:
 
 let
-  version = "3.14.4";
+  version = "3.15.1";
 
   # Dependencies should match the ones in:
   # https://github.com/erlang/rebar3/blob/${version}/rebar.lock
   # `sha256` could also be taken from https://hex.pm - Checksum
-
-  bbmustache = fetchHex {
-    pkg = "bbmustache";
-    version = "1.10.0";
-    sha256 = "1vp27jqnq65a8iqp7j4z8nw9ad29dhky5agmg8aj75dvshzzmvs3";
-  };
-  certifi = fetchHex {
-    pkg = "certifi";
-    version = "2.5.3";
-    sha256 = "040w1scglvqhcvc1ifdnlcyrbwr0smi00w4xi8h03c99775nllgd";
-  };
-  cf = fetchHex {
-    pkg = "cf";
-    version = "0.3.1";
-    sha256 = "0wknz4xkqkhgvlx4vx5619p8m65v7g87lfgsvfy04jrsgm28spii";
-  };
-  cth_readable = fetchHex {
-    pkg = "cth_readable";
-    version = "1.5.0";
-    sha256 = "0z58b6frqdnhyzrmbdf6x78l3izbbh5z5i3am8hqc253r7xwv0dx";
-  };
-  erlware_commons = fetchHex {
-    pkg = "erlware_commons";
-    version = "1.4.0";
-    sha256 = "1rp2vkgzqm6sax7fc13rh9x6qzxsgg718dnv7l0kmarvyifcyphq";
-  };
-  eunit_formatters = fetchHex {
-    pkg = "eunit_formatters";
-    version = "0.5.0";
-    sha256 = "1jb3hzb216r29x2h4pcjwfmx1k81431rgh5v0mp4x5146hhvmj6n";
-  };
-  getopt = fetchHex {
-    pkg = "getopt";
-    version = "1.0.1";
-    sha256 = "53e1ab83b9ceb65c9672d3e7a35b8092e9bdc9b3ee80721471a161c10c59959c";
-  };
-  parse_trans = fetchHex {
-    pkg = "parse_trans";
-    version = "3.3.1";
-    sha256 = "12w8ai6b5s6b4hnvkav7hwxd846zdd74r32f84nkcmjzi1vrbk87";
-  };
-
-  providers = fetchHex {
-    pkg = "providers";
-    version = "1.8.1";
-    sha256 = "183b9128l4af60rs40agqh6kc6db33j4027ad6jajxn4x6nlamz4";
-  };
-
-  relx = fetchHex {
-    pkg = "relx";
-    version = "4.3.0";
-    sha256 = "0h044arh41sr92r1nlg176shavlv7pvw17alwklhszgwlr4hk3kk";
-  };
-
-  ssl_verify_fun = fetchHex {
-    pkg = "ssl_verify_fun";
-    version = "1.1.6";
-    sha256 = "1026l1z1jh25z8bfrhaw0ryk5gprhrpnirq877zqhg253x3x5c5x";
-  };
+  deps = import ./rebar-deps.nix { inherit fetchHex; };
 in
 stdenv.mkDerivation rec {
   pname = "rebar3";
@@ -78,7 +20,7 @@ stdenv.mkDerivation rec {
     owner = "erlang";
     repo = pname;
     rev = version;
-    sha256 = "09bnqwli93sq1pcz4h88ks7qg7k8yrjy9fd46yyp8xdl7i4irwy2";
+    sha256 = "1pcy5m79g0l9l3d8lkbx6cq1w87z1g3sa6wwvgbgraj2v3wkyy5g";
   };
 
   bootstrapper = ./rebar3-nix-bootstrap;
@@ -89,17 +31,9 @@ stdenv.mkDerivation rec {
     mkdir -p _checkouts
     mkdir -p _build/default/lib/
 
-    cp --no-preserve=mode -R ${bbmustache} _checkouts/bbmustache
-    cp --no-preserve=mode -R ${certifi} _checkouts/certifi
-    cp --no-preserve=mode -R ${cf} _checkouts/cf
-    cp --no-preserve=mode -R ${cth_readable} _checkouts/cth_readable
-    cp --no-preserve=mode -R ${erlware_commons} _checkouts/erlware_commons
-    cp --no-preserve=mode -R ${eunit_formatters} _checkouts/eunit_formatters
-    cp --no-preserve=mode -R ${getopt} _checkouts/getopt
-    cp --no-preserve=mode -R ${parse_trans} _checkouts/parse_trans
-    cp --no-preserve=mode -R ${providers} _checkouts/providers
-    cp --no-preserve=mode -R ${relx} _checkouts/relx
-    cp --no-preserve=mode -R ${ssl_verify_fun} _checkouts/ssl_verify_fun
+    ${toString (lib.mapAttrsToList (k: v: ''
+      cp -R --no-preserve=mode ${v} _checkouts/${k}
+    '') deps)}
 
     # Bootstrap script expects the dependencies in _build/default/lib
     # TODO: Make it accept checkouts?
diff --git a/pkgs/development/tools/build-managers/rebar3/rebar-deps.nix b/pkgs/development/tools/build-managers/rebar3/rebar-deps.nix
new file mode 100644
index 00000000000..60dfc0b5b83
--- /dev/null
+++ b/pkgs/development/tools/build-managers/rebar3/rebar-deps.nix
@@ -0,0 +1,58 @@
+{ fetchHex }:
+{
+  ssl_verify_fun = fetchHex {
+    pkg = "ssl_verify_fun";
+    version = "1.1.6";
+    sha256 = "sha256-vbDSRx9FPIj/OQjnaG+G+b4yfQZcwewW+kVAGX6gRoA=";
+  };
+  relx = fetchHex {
+    pkg = "relx";
+    version = "4.4.0";
+    sha256 = "sha256-VcDtY7tdVeuYOhnrlNfzB1320Sbb3/QxAqZmCpH86SU=";
+  };
+  providers = fetchHex {
+    pkg = "providers";
+    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";
+    sha256 = "sha256-U+Grg7nOtlyWctPno1uAkum9ybPugHIUcaFhwQxZlZw=";
+  };
+  eunit_formatters = fetchHex {
+    pkg = "eunit_formatters";
+    version = "0.5.0";
+    sha256 = "sha256-1si6ITQklE5uBbvAl8MgAc3Qq+OSXQJFTyKbINaHY8k=";
+  };
+  erlware_commons = fetchHex {
+    pkg = "erlware_commons";
+    version = "1.4.0";
+    sha256 = "sha256-GF7PXPQ7qzoBPds2FM57un9seoJ5BOZOV9pU/N/c4uY=";
+  };
+  cth_readable = fetchHex {
+    pkg = "cth_readable";
+    version = "1.5.1";
+    sha256 = "sha256-aGVBoi7+bKWkGgR7OVFsLdKPs8reXySi8ZFFs5Z/nYA=";
+  };
+  cf = fetchHex {
+    pkg = "cf";
+    version = "0.3.1";
+    sha256 = "sha256-MV6NRH06SwK82/o5etA7u5iKbgqm9E063Q9OPDv5dnI=";
+  };
+  certifi = fetchHex {
+    pkg = "certifi";
+    version = "2.5.3";
+    sha256 = "sha256-7VFqyzkpsQEgip1wAGLVIPOVPaO2uRjYZhBv+pgOHBA=";
+  };
+  bbmustache = fetchHex {
+    pkg = "bbmustache";
+    version = "1.10.0";
+    sha256 = "sha256-Q+/6P9S7lSMVevWp4idsSTSVuEWfyHNxRKoYbLE84u4=";
+  };
+}