From 00ee61b3cc858ebf7652b7317a3d91a59d3e85f1 Mon Sep 17 00:00:00 2001 From: David Date: Sun, 6 Jun 2021 16:43:34 +0200 Subject: [PATCH] rebar3: add checkPhase --- .../tools/build-managers/rebar3/default.nix | 9 + .../build-managers/rebar3/rebar-deps.nix | 168 ++++++++++++------ 2 files changed, 125 insertions(+), 52 deletions(-) diff --git a/pkgs/development/tools/build-managers/rebar3/default.nix b/pkgs/development/tools/build-managers/rebar3/default.nix index ba4641552feb..9be3d232fb89 100644 --- a/pkgs/development/tools/build-managers/rebar3/default.nix +++ b/pkgs/development/tools/build-managers/rebar3/default.nix @@ -39,6 +39,12 @@ let HOME=. escript bootstrap ''; + checkPhase = '' + HOME=. escript ./rebar3 ct + ''; + + doCheck = true; + installPhase = '' mkdir -p $out/bin cp rebar3 $out/bin/rebar3 @@ -101,6 +107,9 @@ let # instruct rebar3 to always load a certain plugin. It is necessary since # REBAR_GLOBAL_CONFIG_DIR doesn't seem to work for this. patches = [ ./skip-plugins.patch ./global-plugins.patch ]; + + # our patches cause the tests to fail + doCheck = false; })); 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 6894b8666e68..34c4821aaeca 100644 --- a/pkgs/development/tools/build-managers/rebar3/rebar-deps.nix +++ b/pkgs/development/tools/build-managers/rebar3/rebar-deps.nix @@ -1,54 +1,118 @@ # Generated by rebar3_nix -{ fetchHex, fetchFromGitHub }: -{ - ssl_verify_fun = fetchHex { - pkg = "ssl_verify_fun"; - version = "1.1.6"; - sha256 = "sha256-vbDSRx9FPIj/OQjnaG+G+b4yfQZcwewW+kVAGX6gRoA="; +let fetchOnly = { src, ... }: src; +in { builder ? fetchOnly, fetchHex, fetchFromGitHub, overrides ? (x: y: { }) }: +let + self = packages // (overrides self packages); + packages = with self; { + ssl_verify_fun = builder { + name = "ssl_verify_fun"; + version = "1.1.6"; + src = fetchHex { + pkg = "ssl_verify_fun"; + version = "1.1.6"; + sha256 = "sha256-vbDSRx9FPIj/OQjnaG+G+b4yfQZcwewW+kVAGX6gRoA="; + }; + beamDeps = [ ]; + }; + relx = builder { + name = "relx"; + version = "4.4.0"; + src = fetchHex { + pkg = "relx"; + version = "4.4.0"; + sha256 = "sha256-VcDtY7tdVeuYOhnrlNfzB1320Sbb3/QxAqZmCpH86SU="; + }; + beamDeps = [ bbmustache ]; + }; + providers = builder { + name = "providers"; + version = "1.8.1"; + src = fetchHex { + pkg = "providers"; + version = "1.8.1"; + sha256 = "sha256-5FdFrenEdqmkaeoIQOQYqxk2DcRPAaIzME4RikRIa6A="; + }; + beamDeps = [ getopt ]; + }; + getopt = builder { + name = "getopt"; + version = "1.0.1"; + src = fetchHex { + pkg = "getopt"; + version = "1.0.1"; + sha256 = "sha256-U+Grg7nOtlyWctPno1uAkum9ybPugHIUcaFhwQxZlZw="; + }; + beamDeps = [ ]; + }; + eunit_formatters = builder { + name = "eunit_formatters"; + version = "0.5.0"; + src = fetchHex { + pkg = "eunit_formatters"; + version = "0.5.0"; + sha256 = "sha256-1si6ITQklE5uBbvAl8MgAc3Qq+OSXQJFTyKbINaHY8k="; + }; + beamDeps = [ ]; + }; + erlware_commons = builder { + name = "erlware_commons"; + version = "1.5.0"; + src = fetchHex { + pkg = "erlware_commons"; + version = "1.5.0"; + sha256 = "sha256-PnxvsrpMKbDdXf6dAxtmRJ4giOzsGoFGW9n94F7X0Ns="; + }; + beamDeps = [ cf ]; + }; + cth_readable = builder { + name = "cth_readable"; + version = "1.5.1"; + src = fetchHex { + pkg = "cth_readable"; + version = "1.5.1"; + sha256 = "sha256-aGVBoi7+bKWkGgR7OVFsLdKPs8reXySi8ZFFs5Z/nYA="; + }; + beamDeps = [ cf ]; + }; + cf = builder { + name = "cf"; + version = "0.3.1"; + src = fetchHex { + pkg = "cf"; + version = "0.3.1"; + sha256 = "sha256-MV6NRH06SwK82/o5etA7u5iKbgqm9E063Q9OPDv5dnI="; + }; + beamDeps = [ ]; + }; + certifi = builder { + name = "certifi"; + version = "2.6.1"; + src = fetchHex { + pkg = "certifi"; + version = "2.6.1"; + sha256 = "sha256-UkyXtJkbOEndXBemMSI4licsawr0RneLpGdaHf9Tu34="; + }; + beamDeps = [ ]; + }; + bbmustache = builder { + name = "bbmustache"; + version = "1.10.0"; + src = fetchHex { + pkg = "bbmustache"; + version = "1.10.0"; + sha256 = "sha256-Q+/6P9S7lSMVevWp4idsSTSVuEWfyHNxRKoYbLE84u4="; + }; + beamDeps = [ ]; + }; + meck = builder { + name = "meck"; + version = "0.8.13"; + src = fetchHex { + pkg = "meck"; + version = "0.8.13"; + sha256 = "sha256-008BPBVttRrVfMVWiRuXIOahwd9f4uFa+ZnITWzr6xo="; + }; + beamDeps = [ ]; + }; }; - relx = fetchHex { - pkg = "relx"; - version = "4.4.0"; - sha256 = "sha256-VcDtY7tdVeuYOhnrlNfzB1320Sbb3/QxAqZmCpH86SU="; - }; - providers = fetchHex { - pkg = "providers"; - version = "1.8.1"; - sha256 = "sha256-5FdFrenEdqmkaeoIQOQYqxk2DcRPAaIzME4RikRIa6A="; - }; - 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.5.0"; - sha256 = "sha256-PnxvsrpMKbDdXf6dAxtmRJ4giOzsGoFGW9n94F7X0Ns="; - }; - 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.6.1"; - sha256 = "sha256-UkyXtJkbOEndXBemMSI4licsawr0RneLpGdaHf9Tu34="; - }; - bbmustache = fetchHex { - pkg = "bbmustache"; - version = "1.10.0"; - sha256 = "sha256-Q+/6P9S7lSMVevWp4idsSTSVuEWfyHNxRKoYbLE84u4="; - }; -} +in self