diff options
author | Matthieu Coudron <886074+teto@users.noreply.github.com> | 2023-10-15 02:14:56 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-10-15 02:14:56 +0200 |
commit | fff9bb34460d54e624e405c5a8d33e000534e509 (patch) | |
tree | 1e639845a97f5d1d1cbfcb34c872d44bb6d593e0 /pkgs/development/lua-modules | |
parent | aaf5e216af06f291f31d7c06801b5c09635b00b5 (diff) | |
parent | 0be613cb817c4a292080e2057d6fe1ab6e8c1193 (diff) |
Merge pull request #261108 from teto/introduce-lua-aliases
Diffstat (limited to 'pkgs/development/lua-modules')
-rw-r--r-- | pkgs/development/lua-modules/aliases.nix | 43 | ||||
-rw-r--r-- | pkgs/development/lua-modules/generated-packages.nix | 23 | ||||
-rw-r--r-- | pkgs/development/lua-modules/lib.nix | 6 | ||||
-rw-r--r-- | pkgs/development/lua-modules/overrides.nix | 4 |
4 files changed, 46 insertions, 30 deletions
diff --git a/pkgs/development/lua-modules/aliases.nix b/pkgs/development/lua-modules/aliases.nix new file mode 100644 index 0000000000000..47a097fd7f79f --- /dev/null +++ b/pkgs/development/lua-modules/aliases.nix @@ -0,0 +1,43 @@ + +lib: self: super: + +### Deprecated aliases - for backward compatibility +### +### !!! NOTE !!! +### Use `./remove-attr.py [attrname]` in this directory to remove your alias +### from the `luaPackages` set without regenerating the entire file. + +with self; + +let + # Removing recurseForDerivation prevents derivations of aliased attribute + # set to appear while listing all the packages available. + removeRecurseForDerivations = alias: with lib; + if alias.recurseForDerivations or false + then removeAttrs alias ["recurseForDerivations"] + else alias; + + # Disabling distribution prevents top-level aliases for non-recursed package + # sets from building on Hydra. + removeDistribute = alias: with lib; + if isDerivation alias then + dontDistribute alias + else alias; + + # Make sure that we are not shadowing something from node-packages.nix. + checkInPkgs = n: alias: + if builtins.hasAttr n super + then throw "Alias ${n} is still in generated.nix" + else alias; + + mapAliases = aliases: + lib.mapAttrs (n: alias: + removeDistribute + (removeRecurseForDerivations + (checkInPkgs n alias))) + aliases; +in + +mapAliases { + "lpty" = throw "lpy was removed because broken and unmaintained "; # added 2023-10-14 +} diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 7deb513b23124..636c411acca4d 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -942,29 +942,6 @@ buildLuarocksPackage { }; }) {}; -lpty = callPackage({ luaOlder, lua, fetchurl, buildLuarocksPackage }: -buildLuarocksPackage { - pname = "lpty"; - version = "1.2.2-1"; - knownRockspec = (fetchurl { - url = "mirror://luarocks/lpty-1.2.2-1.rockspec"; - sha256 = "04af4mhiqrw3br4qzz7yznw9zy2m50wddwzgvzkvhd99ng71fkzg"; - }).outPath; - src = fetchurl { - url = "http://www.tset.de/downloads/lpty-1.2.2-1.tar.gz"; - sha256 = "071mvz79wi9vr6hvrnb1rv19lqp1bh2fi742zkpv2sm1r9gy5rav"; - }; - - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; - - meta = { - homepage = "http://www.tset.de/lpty/"; - description = "A simple facility for lua to control other programs via PTYs."; - license.fullName = "MIT"; - }; -}) {}; - lrexlib-gnu = callPackage({ buildLuarocksPackage, luaOlder, lua, fetchgit }: buildLuarocksPackage { pname = "lrexlib-gnu"; diff --git a/pkgs/development/lua-modules/lib.nix b/pkgs/development/lua-modules/lib.nix index 7c7ffcccf2639..a07b23ff9cd2d 100644 --- a/pkgs/development/lua-modules/lib.nix +++ b/pkgs/development/lua-modules/lib.nix @@ -82,11 +82,11 @@ rec { }; */ generateLuarocksConfig = { - externalDeps + externalDeps ? [] # a list of lua derivations - , requiredLuaRocks + , requiredLuaRocks ? [] , extraVariables ? {} - , rocksSubdir + , rocksSubdir ? "rocks-subdir" }: let rocksTrees = lib.imap0 (i: dep: { diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index f8c77011c2c31..62d4e066e50b5 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -146,10 +146,6 @@ with prev; */ }); - lpty = prev.lpty.overrideAttrs (oa: { - meta.broken = luaOlder "5.1" || luaAtLeast "5.3"; - }); - ldbus = prev.ldbus.overrideAttrs (oa: { extraVariables = { DBUS_DIR = "${dbus.lib}"; |