luaPackages: fennel -> luaPackages.fennel

7 files changed, 40 insertions, 36 deletions

diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv
index 650a7d94c4d..85edf354ad4 100644
--- a/maintainers/scripts/luarocks-packages.csv
+++ b/maintainers/scripts/luarocks-packages.csv
@@ -14,6 +14,7 @@ cqueues,,,,,,vcunat
 cyrussasl,https://github.com/JorjBauer/lua-cyrussasl.git,,,,,
 digestif,https://github.com/astoff/digestif.git,,,0.2-1,5.3,
 dkjson,,,,,,
+fennel,,,,,,misterio77
 fifo,,,,,,
 fluent,,,,,,alerque
 gitsigns.nvim,https://github.com/lewis6991/gitsigns.nvim.git,,,,5.1,
diff --git a/pkgs/development/compilers/fennel/default.nix b/pkgs/development/compilers/fennel/default.nix
deleted file mode 100644
index 9362c34808d..00000000000
--- a/pkgs/development/compilers/fennel/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ lib, stdenv, fetchFromSourcehut, installShellFiles, lua }:
-
-stdenv.mkDerivation rec {
-  pname = "fennel";
-  version = "1.2.0";
-
-  src = fetchFromSourcehut {
-    owner = "~technomancy";
-    repo = pname;
-    rev = version;
-    sha256 = "sha256-TXmqvhT7Ab+S0UdLgl4xWrVvE//eCbu6qNnoxB7smE4=";
-  };
-
-  nativeBuildInputs = [ installShellFiles ];
-
-  buildInputs = [ lua ];
-
-  makeFlags = [ "PREFIX=${placeholder "out"}" ];
-
-  postInstall = ''
-    installManPage fennel.1
-  '';
-
-  meta = with lib; {
-    description = "A Lua Lisp language";
-    homepage = "https://fennel-lang.org/";
-    license = licenses.mit;
-    platforms = lua.meta.platforms;
-    maintainers = [ maintainers.maaslalani ];
-  };
-}
diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix
index 2065c3ebd2d..263ffab64d0 100644
--- a/pkgs/development/lua-modules/generated-packages.nix
+++ b/pkgs/development/lua-modules/generated-packages.nix
@@ -453,6 +453,32 @@ buildLuarocksPackage {
   };
 }) {};
 
+fennel = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
+, fetchurl, lua
+}:
+buildLuarocksPackage {
+  pname = "fennel";
+  version = "1.2.0-1";
+  knownRockspec = (fetchurl {
+    url    = "mirror://luarocks/fennel-1.2.0-1.rockspec";
+    sha256 = "14qr0gldqgvzx3yzfjvy48inqn46xf0d92pcxp3hr1a17sf7xqmf";
+  }).outPath;
+  src = fetchurl {
+    url    = "https://fennel-lang.org/downloads/fennel-1.2.0.tar.gz";
+    sha256 = "0ymnsri27pj98jbwx7hxsn1w39rxns0i8ds1fl421spc13gx88gx";
+  };
+
+  disabled = with lua; (luaOlder "5.1");
+  propagatedBuildInputs = [ lua ];
+
+  meta = {
+    homepage = "https://fennel-lang.org/";
+    description = "A lisp that compiles to Lua";
+    maintainers = with lib.maintainers; [ misterio77 ];
+    license.fullName = "MIT";
+  };
+}) {};
+
 fifo = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
 , fetchzip, lua
 }:
diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix
index 556d0616ddb..56e23c73f5d 100644
--- a/pkgs/development/lua-modules/overrides.nix
+++ b/pkgs/development/lua-modules/overrides.nix
@@ -29,6 +29,15 @@ with prev;
     '';
   });
 
+  fennel = prev.fennel.overrideAttrs(oa: {
+    nativeBuildInputs = oa.nativeBuildInputs ++ [
+      pkgs.installShellFiles
+    ];
+    postInstall = ''
+      installManPage fennel.1
+    '';
+  });
+
   cqueues = (prev.lib.overrideLuarocks prev.cqueues (drv: {
     externalDeps = [
       { name = "CRYPTO"; dep = pkgs.openssl_1_1; }
diff --git a/pkgs/development/tools/fnlfmt/default.nix b/pkgs/development/tools/fnlfmt/default.nix
index f762e5453cf..702c90d36a5 100644
--- a/pkgs/development/tools/fnlfmt/default.nix
+++ b/pkgs/development/tools/fnlfmt/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromSourcehut, fennel, lua }:
+{ lib, stdenv, fetchFromSourcehut, luaPackages, lua }:
 
 stdenv.mkDerivation rec {
   pname = "fnlfmt";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-FKmr5Xihyk+ikYN8WXBq5UFJziwEb8xaUBswNt/JMBg=";
   };
 
-  nativeBuildInputs = [ fennel ];
+  nativeBuildInputs = [ luaPackages.fennel ];
 
   buildInputs = [ lua ];
 
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     runHook preBuild
 
     echo "#!${lua}/bin/lua" > fnlfmt
-    ${fennel}/bin/fennel --require-as-include --compile cli.fnl >> fnlfmt
+    ${luaPackages.fennel}/bin/fennel --require-as-include --compile cli.fnl >> fnlfmt
     chmod +x fnlfmt
 
     runHook postBuild
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 63ad3a03fc9..238b1a0c113 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -339,6 +339,7 @@ mapAliases ({
   fastnlo = throw "'fastnlo' has been renamed to/replaced by 'fastnlo_toolkit'"; # Converted to throw 2022-09-24
   fbreader = throw "fbreader has been removed, as the upstream project has been archived"; # Added 2022-05-26
   feedreader = throw "feedreader is no longer activily maintained since 2019. The developer is working on a spiritual successor called NewsFlash."; # Added 2022-05-03
+  inherit (luaPackages) fennel; # Added 2022-09-24
   fetchFromGithub = throw "You meant fetchFromGitHub, with a capital H"; # preserve
   ffadoFull = throw "'ffadoFull' has been renamed to/replaced by 'ffado'"; # Converted to throw 2022-02-22
   ffmpeg-sixel = throw "ffmpeg-sixel has been removed, because it was an outdated/unmaintained fork of ffmpeg"; # Added 2022-03-23";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index af157a6218a..85cafda6b28 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13394,8 +13394,6 @@ with pkgs;
 
   fasmg = callPackage ../development/compilers/fasmg { };
 
-  fennel = callPackage ../development/compilers/fennel { };
-
   firrtl = callPackage ../development/compilers/firrtl { };
 
   flasm = callPackage ../development/compilers/flasm { };