From 4fcb3e00b510b976c9b96a73f936332bef90f2f9 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Wed, 8 Oct 2025 09:12:28 -0400
Subject: [PATCH] lfe: simplify to single version support

---
 pkgs/development/beam-modules/default.nix     |  3 +-
 pkgs/development/interpreters/lfe/2.1.nix     |  7 --
 .../lfe/{generic-builder.nix => default.nix}  | 84 +++++++------------
 pkgs/top-level/all-packages.nix               |  1 -
 pkgs/top-level/beam-packages.nix              |  1 -
 5 files changed, 32 insertions(+), 64 deletions(-)
 delete mode 100644 pkgs/development/interpreters/lfe/2.1.nix
 rename pkgs/development/interpreters/lfe/{generic-builder.nix => default.nix} (66%)

diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix
index 2c6dd9cc15dc..145c6cc97dba 100644
--- a/pkgs/development/beam-modules/default.nix
+++ b/pkgs/development/beam-modules/default.nix
@@ -90,8 +90,7 @@ let
 
       elixir-ls = callPackage ./elixir-ls { inherit elixir; };
 
-      lfe = lfe_2_1;
-      lfe_2_1 = lib'.callLFE ../interpreters/lfe/2.1.nix { inherit erlang buildRebar3 buildHex; };
+      lfe = callPackage ../interpreters/lfe { inherit erlang buildRebar3 buildHex; };
 
       livebook = callPackage ./livebook { };
 
diff --git a/pkgs/development/interpreters/lfe/2.1.nix b/pkgs/development/interpreters/lfe/2.1.nix
deleted file mode 100644
index 7ac2d6eef2b5..000000000000
--- a/pkgs/development/interpreters/lfe/2.1.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ mkDerivation }:
-
-mkDerivation {
-  version = "2.1.4";
-  hash = "sha256-mDavRI2it0SrSR0iBItm2MfjI+F/zCy38YSd2KpE0Hs=";
-  maximumOTPVersion = "27";
-}
diff --git a/pkgs/development/interpreters/lfe/generic-builder.nix b/pkgs/development/interpreters/lfe/default.nix
similarity index 66%
rename from pkgs/development/interpreters/lfe/generic-builder.nix
rename to pkgs/development/interpreters/lfe/default.nix
index 46ce5daa801c..0baba8f8e374 100644
--- a/pkgs/development/interpreters/lfe/generic-builder.nix
+++ b/pkgs/development/interpreters/lfe/default.nix
@@ -1,43 +1,29 @@
 {
-  config,
-  lib,
-  fetchFromGitHub,
-  erlang,
-  makeWrapper,
-  coreutils,
   bash,
-  buildRebar3,
   buildHex,
-}:
-
-{
-  baseName ? "lfe",
-  version,
-  maximumOTPVersion,
-  sha256 ? "",
-  hash ? "",
-  rev ? version,
-  src ? fetchFromGitHub {
-    inherit hash rev sha256;
-    owner = "lfe";
-    repo = "lfe";
-  },
-  patches ? [ ],
+  buildRebar3,
+  config,
+  coreutils,
+  erlang,
+  fetchFromGitHub,
+  lib,
+  makeWrapper,
 }:
 
 let
   inherit (lib)
     assertMsg
     makeBinPath
-    optionalString
     getVersion
     versionAtLeast
-    versionOlder
     versions
     ;
 
-  mainVersion = versions.major (getVersion erlang);
+  version = "2.1.4";
+  hash = "sha256-mDavRI2it0SrSR0iBItm2MfjI+F/zCy38YSd2KpE0Hs=";
 
+  maximumOTPVersion = "27";
+  mainVersion = versions.major (getVersion erlang);
   maxAssert = versionAtLeast maximumOTPVersion mainVersion;
 
   proper = buildHex {
@@ -56,22 +42,27 @@ else
     LFE ${version} is supported on OTP <=${maximumOTPVersion}, not ${mainVersion}.
   '';
   buildRebar3 {
-    name = baseName;
+    name = "lfe";
+    inherit version;
 
-    inherit src version;
+    src = fetchFromGitHub {
+      owner = "lfe";
+      repo = "lfe";
+      tag = "v${version}";
+      inherit hash;
+    };
+
+    patches = [
+      ./fix-rebar-config.patch
+      ./dedup-ebins.patch
+    ];
 
     nativeBuildInputs = [
       makeWrapper
       erlang
     ];
+
     beamDeps = [ proper ];
-    patches = [
-      ./fix-rebar-config.patch
-      ./dedup-ebins.patch
-    ]
-    ++ patches;
-    doCheck = true;
-    checkTarget = "travis";
 
     makeFlags = [
       "-e"
@@ -79,26 +70,12 @@ else
       "PREFIX=$$out"
     ];
 
-    # These installPhase tricks are based on Elixir's Makefile.
-    # TODO: Make, upload, and apply a patch.
-    installPhase = optionalString (versionOlder version "1.3") ''
-      local libdir=$out/lib/lfe
-      local ebindir=$libdir/ebin
-      local bindir=$libdir/bin
+    # override buildRebar3's install to let the builder use make install
+    installPhase = "";
 
-      rm -Rf $ebindir
-      install -m755 -d $ebindir
-      install -m644 _build/default/lib/lfe/ebin/* $ebindir
+    doCheck = true;
+    checkTarget = "travis";
 
-      install -m755 -d $bindir
-
-      for bin in bin/lfe{,c,doc,script}; do install -m755 $bin $bindir; done
-
-      install -m755 -d $out/bin
-      for file in $bindir/*; do ln -sf $file $out/bin/; done
-    '';
-
-    # Thanks again, Elixir.
     postFixup = ''
       # LFE binaries are shell scripts which run erl and lfe.
       # Add some stuff to PATH so the scripts can run without problems.
@@ -124,7 +101,8 @@ else
       '';
 
       homepage = "https://lfe.io";
-      downloadPage = "https://github.com/rvirding/lfe/releases";
+      downloadPage = "https://github.com/lfe/lfe/releases";
+      changelog = "https://github.com/lfe/lfe/releases/tag/v${version}";
 
       license = licenses.asl20;
       teams = [ teams.beam ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ed44f7e1808b..6be98d492acf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5755,7 +5755,6 @@ with pkgs;
     rebar3WithPlugins
     fetchHex
     lfe
-    lfe_2_1
     ;
 
   beamPackages = dontRecurseIntoAttrs beam27Packages;
diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix
index e61045c98bcd..73546d459eec 100644
--- a/pkgs/top-level/beam-packages.nix
+++ b/pkgs/top-level/beam-packages.nix
@@ -52,7 +52,6 @@ in
       elixir_1_14
       elixir-ls
       lfe
-      lfe_2_1
       ;
   };