beamPackages.buildHex: remove (#492919)

pkgs/development/beam-modules/build-hex.nix

@@ -1,31 +0,0 @@
-{
-  lib,
-  buildRebar3,
-  fetchHex,
-}:
-
-{
-  name,
-  version,
-  sha256,
-  builder ? buildRebar3,
-  hexPkg ? name,
-  ...
-}@attrs:
-
-let
-  pkg =
-    self:
-    builder (
-      attrs
-      // {
-
-        src = fetchHex {
-          pkg = hexPkg;
-          inherit version;
-          inherit sha256;
-        };
-      }
-    );
-in
-lib.fix pkg

pkgs/development/beam-modules/default.nix

@@ -40,7 +40,6 @@ let
       rebar3Relx = callPackage ./rebar3-release.nix { };
 
       buildRebar3 = callPackage ./build-rebar3.nix { };
-      buildHex = callPackage ./build-hex.nix { };
       buildErlangMk = callPackage ./build-erlang-mk.nix { };
       buildMix = callPackage ./build-mix.nix { };
       fetchMixDeps = callPackage ./fetch-mix-deps.nix { };
@@ -91,7 +90,7 @@ let
 
       elixir-ls = callPackage ./elixir-ls { inherit elixir; };
 
-      lfe = callPackage ../interpreters/lfe { inherit erlang buildRebar3 buildHex; };
+      lfe = callPackage ../interpreters/lfe { inherit erlang buildRebar3 fetchHex; };
 
       livebook = callPackage ./livebook { inherit beamPackages; };
 

pkgs/development/beam-modules/pc/default.nix

@@ -1,9 +1,18 @@
-{ lib, buildHex }:
+{
+  lib,
+  fetchHex,
+  buildRebar3,
+}:
 
-buildHex {
+buildRebar3 rec {
   name = "pc";
   version = "1.15.0";
-  sha256 = "sha256-TA+tT2Q3yuNT1RfaIY/ng0e4/6RLmBeIdJTKquVFlbM=";
+
+  src = fetchHex {
+    pkg = name;
+    inherit version;
+    sha256 = "sha256-TA+tT2Q3yuNT1RfaIY/ng0e4/6RLmBeIdJTKquVFlbM=";
+  };
 
   meta = {
     description = "Rebar3 port compiler for native code";

pkgs/development/beam-modules/rebar3-proper/default.nix

@@ -1,9 +1,18 @@
-{ lib, buildHex }:
+{
+  lib,
+  buildRebar3,
+  fetchHex,
+}:
 
-buildHex {
+buildRebar3 rec {
   name = "rebar3_proper";
   version = "0.12.1";
-  sha256 = "1f174fb6h2071wr7qbw9aqqvnglzsjlylmyi8215fhrmi38w94b6";
+
+  src = fetchHex {
+    pkg = name;
+    inherit version;
+    sha256 = "1f174fb6h2071wr7qbw9aqqvnglzsjlylmyi8215fhrmi38w94b6";
+  };
 
   meta = {
     description = "rebar3 proper plugin";

pkgs/development/interpreters/lfe/default.nix

@@ -1,6 +1,6 @@
 {
   bash,
-  buildHex,
+  fetchHex,
   buildRebar3,
   config,
   coreutils,
@@ -26,11 +26,15 @@ let
   mainVersion = versions.major (getVersion erlang);
   maxAssert = versionAtLeast maximumOTPVersion mainVersion;
 
-  proper = buildHex {
+  proper = buildRebar3 rec {
     name = "proper";
     version = "1.4.0";
 
-    sha256 = "sha256-GChYQhhb0z772pfRNKXLWgiEOE2zYRn+4OPPpIhWjLs=";
+    src = fetchHex {
+      pkg = name;
+      inherit version;
+      sha256 = "sha256-GChYQhhb0z772pfRNKXLWgiEOE2zYRn+4OPPpIhWjLs=";
+    };
   };
 
 in