From 055f73407c9de91a7471a0d858c0044bac681b0b Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Sat, 21 Feb 2026 20:30:51 -0500 Subject: [PATCH] beamPackages.buildHex: remove This is a basic wrapper that has not gotten much use. It is just a wrapper around other builders for setting src. Given the limited number of uses I'm going to remove it completely. Verified unused in mix2nix, deps_nix, and rebar3_nix. (Some of these would be obvious in tree). --- pkgs/development/beam-modules/build-hex.nix | 31 ------------------- pkgs/development/beam-modules/default.nix | 3 +- pkgs/development/beam-modules/pc/default.nix | 15 +++++++-- .../beam-modules/rebar3-proper/default.nix | 15 +++++++-- pkgs/development/interpreters/lfe/default.nix | 10 ++++-- 5 files changed, 32 insertions(+), 42 deletions(-) delete mode 100644 pkgs/development/beam-modules/build-hex.nix diff --git a/pkgs/development/beam-modules/build-hex.nix b/pkgs/development/beam-modules/build-hex.nix deleted file mode 100644 index fa70b16ca659..000000000000 --- a/pkgs/development/beam-modules/build-hex.nix +++ /dev/null @@ -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 diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index 0fec22df3458..3982e43a1486 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/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; }; diff --git a/pkgs/development/beam-modules/pc/default.nix b/pkgs/development/beam-modules/pc/default.nix index 4f15fdfd4380..4d172824e929 100644 --- a/pkgs/development/beam-modules/pc/default.nix +++ b/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"; diff --git a/pkgs/development/beam-modules/rebar3-proper/default.nix b/pkgs/development/beam-modules/rebar3-proper/default.nix index 2955beeeb5b5..5960b8ee414a 100644 --- a/pkgs/development/beam-modules/rebar3-proper/default.nix +++ b/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"; diff --git a/pkgs/development/interpreters/lfe/default.nix b/pkgs/development/interpreters/lfe/default.nix index 353e3231a272..33ad3d90bae0 100644 --- a/pkgs/development/interpreters/lfe/default.nix +++ b/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