@@ -1,9 +1,9 @@
1−{ lib, stdenv, fetchFromGitHub, fetchpatch,
1+{ lib, stdenv, fetchFromGitHub,
22 fetchHex, erlang, makeWrapper,
33 writeScript, common-updater-scripts, coreutils, git, gnused, nix, rebar3-nix }:
44
55let
6− version = "3.15.1";
6+ version = "3.16.0";
77 owner = "erlang";
88 deps = import ./rebar-deps.nix { inherit fetchFromGitHub fetchHex; };
99 rebar3 = stdenv.mkDerivation rec {
@@ -16,20 +16,11 @@ let
1616 inherit owner;
1717 repo = pname;
1818 rev = version;
19− sha256 = "1pcy5m79g0l9l3d8lkbx6cq1w87z1g3sa6wwvgbgraj2v3wkyy5g";
19+ sha256 = "1yqvm37l5rn5dyg4sc2hv47930s2524qrdpnjwy3zqa27r7k5n36";
2020 };
2121
2222 buildInputs = [ erlang ];
2323
24− patches = [
25− # TODO: remove this on next rebar3 release
26− (fetchpatch {
27− name = "escriptize-erl-libs";
28− url = "https://github.com/erlang/rebar3/commit/8049a92512420b0967a4c23acfa304d8ca7a712e.patch";
29− sha256 = "0jzdy7n2nz4v38nn76bgjcmssvqgvdhy9v2gl867ylwqn1y5sdm1";
30− })
31− ];
32−
3324 postPatch = ''
3425 mkdir -p _checkouts _build/default/lib/
3526
@@ -109,7 +100,7 @@ let
109100 # global-deps.patch makes it possible to use REBAR_GLOBAL_PLUGINS to
110101 # instruct rebar3 to always load a certain plugin. It is necessary since
111102 # REBAR_GLOBAL_CONFIG_DIR doesn't seem to work for this.
112− patches = old.patches ++ [ ./skip-plugins.patch ./global-plugins.patch ];
103+ patches = [ ./skip-plugins.patch ./global-plugins.patch ];
113104 }));
114105 in stdenv.mkDerivation {
115106 pname = "rebar3-with-plugins";