diff options
| author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2022-09-25 21:36:31 +0200 |
|---|---|---|
| committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2022-09-25 21:36:31 +0200 |
| commit | 68c0ca4416f0d36d37fc2dd0659ccd1ca152f593 (patch) | |
| tree | 41cf60fbd3ed13ca6827f589f369f4e9b49b3919 /pkgs/development/lua-modules | |
| parent | 86afd1c57926318e3299a9cae2cd0130eb694614 (diff) | |
| parent | 5fa1488e2b0effad849125784310f17b16f59004 (diff) | |
Merge remote-tracking branch 'origin/master' into staging-next
Diffstat (limited to 'pkgs/development/lua-modules')
| -rw-r--r-- | pkgs/development/lua-modules/generated-packages.nix | 26 | ||||
| -rw-r--r-- | pkgs/development/lua-modules/overrides.nix | 9 |
2 files changed, 35 insertions, 0 deletions
diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 2065c3ebd2d5b..263ffab64d061 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 3bec727b67786..32492cbd0f3f8 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -112,6 +112,15 @@ with prev; ]; }); + fennel = prev.fennel.overrideAttrs(oa: { + nativeBuildInputs = oa.nativeBuildInputs ++ [ + pkgs.installShellFiles + ]; + postInstall = '' + installManPage fennel.1 + ''; + }); + http = prev.http.overrideAttrs (oa: { patches = [ (fetchpatch { |