Revert "luaPackages.cqueues: move to generated"

This reverts commit c01fe375ca.
See the reverted commit on GitHub for discussion.  /cc PR #55305.
This commit is contained in:
Vladimír Čunát 2019-03-04 12:36:23 +01:00
parent 7bf4323082
commit 3e442fd0f9
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
4 changed files with 23 additions and 34 deletions

View file

@ -1,7 +1,6 @@
ansicolors,
argparse,
basexx,
cqueues
dkjson
fifo
inspect

1 ansicolors,
2 argparse,
3 basexx,
cqueues
4 dkjson
5 fifo
6 inspect

View file

@ -70,26 +70,6 @@ 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";

View file

@ -5,19 +5,6 @@ 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";
}
'';
});
lgi = super.lgi.overrideAttrs(oa: {
nativeBuildInputs = [ pkgs.pkgconfig ];
buildInputs = with pkgs; oa.buildInputs ++ [ glib gobjectIntrospection];

View file

@ -167,6 +167,29 @@ 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;
};
};
http = buildLuaPackage rec {
version = "0.2";
name = "http-${version}";