From 3e442fd0f9036fa5cbee829f927e73f91dcdf337 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 4 Mar 2019 12:36:23 +0100
Subject: [PATCH] Revert "luaPackages.cqueues: move to generated"

This reverts commit c01fe375ca192395af8ae8c575ff8eaa79ed03d8.
See the reverted commit on GitHub for discussion.  /cc PR #55305.
---
 maintainers/scripts/luarocks-packages.csv     |  1 -
 .../lua-modules/generated-packages.nix        | 20 ----------------
 pkgs/development/lua-modules/overrides.nix    | 13 -----------
 pkgs/top-level/lua-packages.nix               | 23 +++++++++++++++++++
 4 files changed, 23 insertions(+), 34 deletions(-)

diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv
index 0f3db834fc29..f5998f010d85 100644
--- a/maintainers/scripts/luarocks-packages.csv
+++ b/maintainers/scripts/luarocks-packages.csv
@@ -1,7 +1,6 @@
 ansicolors,
 argparse,
 basexx,
-cqueues
 dkjson
 fifo
 inspect
diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix
index 8a9618e1f1e1..b36eb02e6554 100644
--- a/pkgs/development/lua-modules/generated-packages.nix
+++ b/pkgs/development/lua-modules/generated-packages.nix
@@ -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";
diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix
index b78f7f9c0079..fa8fdfc22d7a 100644
--- a/pkgs/development/lua-modules/overrides.nix
+++ b/pkgs/development/lua-modules/overrides.nix
@@ -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];
diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index ed0b919fd690..2899e91ceb63 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -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}";