From 84d4faf8d52111eb0fca02fd7c577034597db120 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Wed, 6 Feb 2019 00:37:09 +0900 Subject: [PATCH] luaPackages.basexx: move to generated --- maintainers/scripts/luarocks-packages.csv | 1 + .../lua-modules/generated-packages.nix | 20 ++++++++++++++ pkgs/top-level/lua-packages.nix | 26 ------------------- 3 files changed, 21 insertions(+), 26 deletions(-) diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index a9aceb6cf07a..c0e89206328a 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -1,5 +1,6 @@ ansicolors, argparse, +basexx, dkjson fifo inspect diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 46b84403f8c6..e168d9fd53c6 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -50,6 +50,26 @@ argparse = buildLuarocksPackage { }; }; }; +basexx = buildLuarocksPackage { + pname = "basexx"; + version = "0.4.0-1"; + + src = fetchurl { + url = https://luarocks.org/basexx-0.4.0-1.src.rock; + sha256 = "1px8yrxg1qkk3kzdqj3siry742jdv4ysp2dmicxi15mkynqpjlzz"; + }; + disabled = ( luaOlder "5.1"); + propagatedBuildInputs = [lua ]; + buildType="builtin"; + + meta = { + homepage = "https://github.com/aiq/basexx"; + description="A base2, base16, base32, base64 and base85 library for Lua"; + license = { + fullName = "MIT"; + }; + }; +}; dkjson = buildLuarocksPackage { pname = "dkjson"; version = "2.5-2"; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 66a699db0f5a..84918b1d8b57 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -100,32 +100,6 @@ with self; { luarocks-nix = callPackage ../development/tools/misc/luarocks/luarocks-nix.nix { }; - basexx = buildLuaPackage rec { - version = "0.4.0"; - name = "basexx-${version}"; - - src = fetchFromGitHub { - owner = "aiq"; - repo = "basexx"; - rev = "v${version}"; - sha256 = "12y0ng9bp5b98iax35pnp0kc0mb42spv1cbywvfq6amik6l0ya7g"; - }; - - buildPhase = ":"; - installPhase = '' - install -Dt "$out/lib/lua/${lua.luaversion}/" \ - lib/basexx.lua - ''; - - meta = with stdenv.lib; { - description = "Lua library for base2, base16, base32, base64, base85"; - homepage = "https://github.com/aiq/basexx"; - license = licenses.mit; - maintainers = with maintainers; [ vcunat ]; - platforms = platforms.all; - }; - }; - bit32 = buildLuaPackage rec { version = "5.3.0"; name = "bit32-${version}";