From ce63fd43818e7296b632844f2e2e1156837ff314 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Wed, 6 Feb 2019 01:30:52 +0900 Subject: [PATCH] luaPackages.luabitop: generated --- maintainers/scripts/luarocks-packages.csv | 1 + .../lua-modules/generated-packages.nix | 30 +++++++++++++++ pkgs/top-level/lua-packages.nix | 37 ------------------- 3 files changed, 31 insertions(+), 37 deletions(-) diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index fbd358e1b2db..c257eae10d37 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -13,6 +13,7 @@ ltermbox, lua-cmsgpack, lua_cliargs, lua-term, +luabitop, luaevent, luacheck luaffi,http://luarocks.org/dev, diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index defff849a2be..5ce21c36f52c 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -346,6 +346,36 @@ luaevent = buildLuarocksPackage { }; }; }; +luabitop = buildLuarocksPackage { + pname = "luabitop"; + version = "1.0.2-3"; + + knownRockspec = ( fetchurl { + url = https://luarocks.org/luabitop-1.0.2-3.rockspec; + sha256 = "07y2h11hbxmby7kyhy3mda64w83p4a6p7y7rzrjqgc0r56yjxhcc"; + }).outPath; + + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "git://github.com/LuaDist/luabitop.git", + "rev": "81bb23b0e737805442033535de8e6d204d0e5381", + "date": "2013-02-18T16:36:42+01:00", + "sha256": "0lsc556hlkddjbmcdbg7wc2g55bfy743p8ywdzl8x7kk847r043q", + "fetchSubmodules": true +} + '') ["date"]) ; + + disabled = ( luaOlder "5.1") || ( luaAtLeast "5.3"); + propagatedBuildInputs = [lua ]; + buildType="builtin"; + + meta = { + homepage = "http://bitop.luajit.org/"; + description="Lua Bit Operations Module"; + license = { + fullName = "MIT/X license"; + }; + }; +}; luacheck = buildLuarocksPackage { pname = "luacheck"; version = "0.23.0-1"; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 4e890662477a..81c07c5d15ca 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -167,43 +167,6 @@ with self; { }; }; - luabitop = buildLuaPackage rec { - version = "1.0.2"; - name = "bitop-${version}"; - - src = fetchurl { - url = "http://bitop.luajit.org/download/LuaBitOp-${version}.tar.gz"; - sha256 = "16fffbrgfcw40kskh2bn9q7m3gajffwd2f35rafynlnd7llwj1qj"; - }; - - buildFlags = stdenv.lib.optionalString stdenv.isDarwin "macosx"; - - disabled = isLua53; - - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' - substituteInPlace Makefile --replace 10.4 10.5 - ''; - - preBuild = '' - makeFlagsArray=( - ${stdenv.lib.optionalString stdenv.cc.isClang "CC=$CC"} - INCLUDES="-I${lua}/include" - LUA="${lua}/bin/lua"); - ''; - - installPhase = '' - mkdir -p $out/lib/lua/${lua.luaversion} - install -p bit.so $out/lib/lua/${lua.luaversion} - ''; - - meta = with stdenv.lib; { - description = "C extension module for Lua which adds bitwise operations on numbers"; - homepage = "http://bitop.luajit.org"; - license = licenses.mit; - maintainers = with maintainers; [ ]; - }; - }; - http = buildLuaPackage rec { version = "0.2"; name = "http-${version}";