From b8adacf7e2ee33553cd6d334cb32ce95605c8f4f Mon Sep 17 00:00:00 2001
From: Gleb Peregud <gleber.p@gmail.com>
Date: Sun, 10 Sep 2017 23:36:36 +0200
Subject: [PATCH] relx-exe: 3.18.0 -> 3.23.1

---
 pkgs/development/beam-modules/default.nix     | 18 +++++
 .../tools/erlang/relx-exe/default.nix         | 75 +++++++++++--------
 2 files changed, 61 insertions(+), 32 deletions(-)

diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix
index 5ff46014cb9..a57cbc4d508 100644
--- a/pkgs/development/beam-modules/default.nix
+++ b/pkgs/development/beam-modules/default.nix
@@ -62,6 +62,24 @@ let
         lfe = lfe_1_2;
         lfe_1_2 = lib.callLFE ../interpreters/lfe/1.2.nix { inherit erlang buildRebar3 buildHex; };
 
+        # We list all base hex packages for beam tooling explicitly to ensure
+        # tha the tooling does not break during hex-packages.nix updates.
+        erlware_commons_1_0_0 = buildHex {
+          name    = "erlware_commons";
+          version = "1.0.0";
+          sha256 = "0wkphbrjk19lxdwndy92v058qwcaz13bcgdzp33h21aa7vminzx7";
+          beamDeps = [ cf_0_2_2 ];
+        };
+        cf_0_2_2 = buildHex {
+          name = "cf";
+          version = "0.2.2";
+          sha256 = "08cvy7skn5d2k4manlx5k3anqgjdvajjhc5jwxbaszxw34q3na28";
+        };
+        getopt_0_8_2 = buildHex {
+          name = "getopt";
+          version = "0.8.2";
+          sha256 = "1xw30h59zbw957cyjd8n50hf9y09jnv9dyry6x3avfwzcyrnsvkk";
+        };
         # Non hex packages. Examples how to build Rebar/Mix packages with and
         # without helper functions buildRebar3 and buildMix.
         hex = callPackage ./hex {};
diff --git a/pkgs/development/tools/erlang/relx-exe/default.nix b/pkgs/development/tools/erlang/relx-exe/default.nix
index 7d505b20a05..df14c29c372 100644
--- a/pkgs/development/tools/erlang/relx-exe/default.nix
+++ b/pkgs/development/tools/erlang/relx-exe/default.nix
@@ -1,38 +1,49 @@
-{ stdenv, beamPackages, makeWrapper, fetchHex, erlang }:
-  beamPackages.buildRebar3 {
-    name = "relx-exe";
-    version = "3.18.0";
-    src = fetchHex {
-      pkg = "relx";
-      version = "3.18.0";
-      sha256 =
-        "e76e0446b8d1b113f2b7dcc713f032ccdf1dbda33d76edfeb19c2b6b686dcad7";
-    };
+{ stdenv, beamPackages, buildRebar3, buildHex, fetchHex
 
-    buildInputs = [ makeWrapper erlang ];
+, getopt_0_8_2, erlware_commons_1_0_0, cf_0_2_2 }:
 
-    beamDeps  = with beamPackages; [
-      providers_1_6_0
-      getopt_0_8_2
-      erlware_commons_0_19_0
-      cf_0_2_1
-      bbmustache_1_0_4
-    ];
+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";
+  };
 
-    postBuild = ''
-      HOME=. rebar3 escriptize
-    '';
+in
+buildHex rec {
+  name = "relx-exe";
+  version = "3.23.1";
+  hexPkg = "relx";
+  sha256 = "13j7wds2d7b8v3r9pwy3zhwhzywgwhn6l9gm3slqzyrs1jld0a9d";
 
-    postInstall = ''
-      mkdir -p "$out/bin"
-      cp -r "_build/default/bin/relx" "$out/bin/relx"
-    '';
+  beamDeps = [
+    providers_1_6_0
+    getopt_0_8_2
+    erlware_commons_1_0_0
+    cf_0_2_2
+    bbmustache_1_0_4
+  ];
 
-    meta = {
-      description = "Executable command for Relx";
-      license = stdenv.lib.licenses.asl20;
-      homepage = https://github.com/erlware/relx;
-      maintainers = with stdenv.lib.maintainers; [ ericbmerritt ];
-    };
+  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 ];
+  };
+
+}