diff options
| author | Matthieu Coudron <mattator@gmail.com> | 2019-02-06 00:54:37 +0900 |
|---|---|---|
| committer | Matthieu Coudron <mattator@gmail.com> | 2019-02-12 11:47:54 +0900 |
| commit | c01fe375ca192395af8ae8c575ff8eaa79ed03d8 (patch) | |
| tree | 3dd37f8d91410288d74d47722dd5051b75a5b3dd /pkgs | |
| parent | 84d4faf8d52111eb0fca02fd7c577034597db120 (diff) | |
| download | nixlib-c01fe375ca192395af8ae8c575ff8eaa79ed03d8.tar nixlib-c01fe375ca192395af8ae8c575ff8eaa79ed03d8.tar.gz nixlib-c01fe375ca192395af8ae8c575ff8eaa79ed03d8.tar.bz2 nixlib-c01fe375ca192395af8ae8c575ff8eaa79ed03d8.tar.lz nixlib-c01fe375ca192395af8ae8c575ff8eaa79ed03d8.tar.xz nixlib-c01fe375ca192395af8ae8c575ff8eaa79ed03d8.tar.zst nixlib-c01fe375ca192395af8ae8c575ff8eaa79ed03d8.zip | |
luaPackages.cqueues: move to generated
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/lua-modules/generated-packages.nix | 20 | ||||
| -rw-r--r-- | pkgs/development/lua-modules/overrides.nix | 13 | ||||
| -rw-r--r-- | pkgs/top-level/lua-packages.nix | 23 |
3 files changed, 33 insertions, 23 deletions
diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index e168d9fd53c6..e974bf42bee7 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -70,6 +70,26 @@ basexx = buildLuarocksPackage { }; }; }; +cqueues = buildLuarocksPackage { + pname = "cqueues"; + version = "20171014.52-0"; + + src = fetchurl { + url = https://luarocks.org/cqueues-20171014.52-0.src.rock; + sha256 = "0q3iy1ja20nq2sn2n6badzhjq5kni86pfc09n5g2c46q9ja3vfzx"; + }; + disabled = ( lua.luaversion != "5.2"); + propagatedBuildInputs = [lua ]; + buildType="make"; + + meta = { + homepage = "http://25thandclement.com/~william/projects/cqueues.html"; + description="Continuation Queues: Embeddable asynchronous networking, threading, and notification framework for Lua on Unix."; + license = { + fullName = "MIT/X11"; + }; + }; +}; dkjson = buildLuarocksPackage { pname = "dkjson"; version = "2.5-2"; diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 20a24681b6ae..41b395d885b1 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -5,6 +5,19 @@ with super; ##########################################3 #### manual fixes for generated packages ##########################################3 + cqueues = super.cqueues.override({ + nativeBuildInputs = [ pkgs.gnum4 ]; + buildInputs = [ pkgs.openssl ]; + extraConfig = with pkgs; '' + variables={ + CRYPTO_INCDIR="${openssl.dev}/include"; + CRYPTO_LIBDIR="${openssl.out}/lib"; + OPENSSL_INCDIR="${openssl.dev}/include"; + OPENSSL_LIBDIR="${openssl.out}/lib"; + } + ''; + }); + ltermbox = super.ltermbox.override( { disabled = !isLua51 || isLuaJIT; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 84918b1d8b57..8c039cbf3a2a 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -167,29 +167,6 @@ with self; { }; }; - cqueues = buildLuaPackage rec { - name = "cqueues-${version}"; - version = "20171014"; - - src = fetchurl { - url = "https://www.25thandclement.com/~william/projects/releases/${name}.tgz"; - sha256 = "1dabhpn6r0hlln8vx9hxm34pfcm46qzgpb2apmziwg5z51fi4ksb"; - }; - - preConfigure = ''export prefix=$out''; - - nativeBuildInputs = [ gnum4 ]; - buildInputs = [ openssl ]; - - meta = with stdenv.lib; { - description = "A type of event loop for Lua"; - homepage = "https://www.25thandclement.com/~william/projects/cqueues.html"; - license = licenses.mit; - maintainers = with maintainers; [ vcunat ]; - platforms = platforms.unix; - }; - }; - luabitop = buildLuaPackage rec { version = "1.0.2"; name = "bitop-${version}"; |