diff options
Diffstat (limited to 'pkgs/development/tools/build-managers/rebar3/default.nix')
| -rw-r--r-- | pkgs/development/tools/build-managers/rebar3/default.nix | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/pkgs/development/tools/build-managers/rebar3/default.nix b/pkgs/development/tools/build-managers/rebar3/default.nix index f1aa4204a04..a575b0ee3be 100644 --- a/pkgs/development/tools/build-managers/rebar3/default.nix +++ b/pkgs/development/tools/build-managers/rebar3/default.nix @@ -1,11 +1,11 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, +{ lib, stdenv, fetchFromGitHub, fetchgit, fetchHex, erlang, makeWrapper, writeScript, common-updater-scripts, coreutils, git, gnused, nix, rebar3-nix }: let - version = "3.16.1"; + version = "3.17.0"; owner = "erlang"; - deps = import ./rebar-deps.nix { inherit fetchFromGitHub fetchHex; }; + deps = import ./rebar-deps.nix { inherit fetchFromGitHub fetchgit fetchHex; }; rebar3 = stdenv.mkDerivation rec { pname = "rebar3"; inherit version erlang; @@ -16,7 +16,7 @@ let inherit owner; repo = pname; rev = version; - sha256 = "0dhwlx7zykf9y3znk2k8fxrq5j43jy3c3gd76k74q34p1xbajgzr"; + sha256 = "02sk3whrbprzlih4pgcsd6ngmassfjfmkz21gwvb7mq64pib40k6"; }; buildInputs = [ erlang ]; @@ -39,16 +39,6 @@ let HOME=. escript bootstrap ''; - - patches = [ - # TODO: remove this on next rebar3 release - (fetchpatch { - name = "escriptize-erl-libs"; - url = "https://github.com/erlang/rebar3/commit/11055384dbd5bf7d181bca83a33b0e100275ff21.patch"; - sha256 = "01xjaqnhmjlxqdgb8ph15wssjq5crdhjslxnndbs5f0kscqpq14c"; - }) - ]; - checkPhase = '' HOME=. escript ./rebar3 ct ''; @@ -98,7 +88,7 @@ let update-source-version rebar3 "$latest" --version-key=version --print-changes --file="$nix_path/default.nix" tmpdir=$(mktemp -d) cp -R $(nix-build $nixpkgs --no-out-link -A rebar3.src)/* "$tmpdir" - (cd "$tmpdir" && rebar3 nix lock -o "$nix_path/rebar-deps.nix") + (cd "$tmpdir" && rebar3 as test nix lock -o "$nix_path/rebar-deps.nix") else echo "rebar3 is already up-to-date" fi |