rebar3: 3.6.1 -> 3.9.0

Remove hermetic patch (make it compatible with the upstream)
(Mostly) eliminate the need for hex package registry

2 files changed, 23 insertions, 61 deletions

diff --git a/pkgs/development/tools/erlang/hex2nix/default.nix b/pkgs/development/tools/erlang/hex2nix/default.nix
index e21749f90d02..5a24c3c95256 100644
--- a/pkgs/development/tools/erlang/hex2nix/default.nix
+++ b/pkgs/development/tools/erlang/hex2nix/default.nix
@@ -1,29 +1,21 @@
-{ fetchFromGitHub, buildRebar3,
+{ fetchFromGitHub, fetchRebar3Deps, rebar3Relx }:
 
-  # Erlang dependencies:
-  ibrowse_4_2_2,
-  getopt_0_8_2,
-  erlware_commons_1_0_0,
-  jsx_2_8_0 }:
-
-buildRebar3 rec {
+rebar3Relx rec {
     name = "hex2nix";
     version = "0.0.6-a31eadd7";
 
+    releaseType = "escript";
+
+    checkouts = fetchRebar3Deps {
+      inherit name version;
+      src = "${src}/rebar.config";
+      sha256 = "1b59vk6ynakdiwqd1s6axaj9bvkaaq7ll28b48nv613z892h7nm5";
+    };
+
     src = fetchFromGitHub {
       owner  = "erlang-nix";
       repo   = "hex2nix";
       rev    = "a31eadd7af2cbdac1b87991b378e98ea4fb40ae0";
       sha256 = "1hnkrksyrbpq2gq25rfsrnm86n0g3biab88gswm3zj88ddrz6dyk";
     };
-
-    beamDeps = [ ibrowse_4_2_2 jsx_2_8_0 erlware_commons_1_0_0 getopt_0_8_2 ];
-
-    enableDebugInfo = true;
-
-    installPhase = ''
-      runHook preInstall
-      make PREFIX=$out install
-      runHook postInstall
-    '';
- }
+}
diff --git a/pkgs/development/tools/erlang/relx-exe/default.nix b/pkgs/development/tools/erlang/relx-exe/default.nix
index 9bbdc8c8334d..2c32cc5c6706 100644
--- a/pkgs/development/tools/erlang/relx-exe/default.nix
+++ b/pkgs/development/tools/erlang/relx-exe/default.nix
@@ -1,49 +1,19 @@
-{ stdenv, buildHex
+{ stdenv, fetchHex, fetchRebar3Deps, rebar3Relx }:
 
-, getopt_0_8_2, erlware_commons_1_0_0, cf_0_2_2 }:
-
-let
-  providers_1_6_0 = buildHex {
-    name = "providers";
-    version = "1.6.0";
-    sha256 = "0byfa1h57n46jilz4q132j0vk3iqc0v1vip89li38gb1k997cs0g";
-    beamDeps = [ getopt_0_8_2 ];
-  };
-  bbmustache_1_0_4 = buildHex {
-    name = "bbmustache";
-    version = "1.0.4";
-    sha256 = "04lvwm7f78x8bys0js33higswjkyimbygp4n72cxz1kfnryx9c03";
-  };
-
-in
-buildHex rec {
+rebar3Relx rec {
   name = "relx-exe";
   version = "3.23.1";
-  hexPkg = "relx";
-  sha256 = "13j7wds2d7b8v3r9pwy3zhwhzywgwhn6l9gm3slqzyrs1jld0a9d";
+  releaseType = "escript";
 
-  beamDeps = [
-    providers_1_6_0
-    getopt_0_8_2
-    erlware_commons_1_0_0
-    cf_0_2_2
-    bbmustache_1_0_4
-  ];
-
-  postBuild = ''
-    HOME=. rebar3 escriptize
-  '';
-
-  postInstall = ''
-    mkdir -p "$out/bin"
-    cp -r "_build/default/bin/relx" "$out/bin/relx"
-  '';
-
-  meta = {
-    description = "Executable command for Relx";
-    license = stdenv.lib.licenses.asl20;
-    homepage = "https://github.com/erlware/relx";
-    maintainers = with stdenv.lib.maintainers; [ ericbmerritt ];
+  src = fetchHex {
+    pkg = "relx";
+    sha256 = "13j7wds2d7b8v3r9pwy3zhwhzywgwhn6l9gm3slqzyrs1jld0a9d";
+    version = "3.23.1";
   };
 
+  checkouts = fetchRebar3Deps {
+    inherit name version;
+    src = "${src}/rebar.lock";
+    sha256 = "046b1lb9rymndlvzmin3ppa3vkssjqspyfp98869k11s5avg76hd";
+  };
 }