about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRenaud <c0bw3b@users.noreply.github.com>2019-04-23 00:22:34 +0200
committerGitHub <noreply@github.com>2019-04-23 00:22:34 +0200
commit444f1ec6d596757cb6a70c0a99774a0a01cc774e (patch)
tree8ebecaf94b2d1c3f0fc22ceebf0291986daa463a
parent496d945a76cfc7d22e3444fd6d7aac738015ab42 (diff)
parentd41814dd00b094b121244e7d32ea7c21427a15fd (diff)
Merge pull request #59965 from FredeEB/seasocks-pkg
seasocks: init at 1.4.2
-rw-r--r--maintainers/maintainer-list.nix5
-rw-r--r--pkgs/development/libraries/seasocks/default.nix24
-rw-r--r--pkgs/top-level/all-packages.nix2
3 files changed, 31 insertions, 0 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index b9c5580ddb2ae..2bea24a5d86b6 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1687,6 +1687,11 @@
     github = "fps";
     name = "Florian Paul Schmidt";
   };
+  fredeb = {
+    email = "im@fredeb.dev";
+    github = "fredeeb";
+    name = "Frede Emil";
+  };
   freepotion = {
     email = "freepotion@protonmail.com";
     github = "freepotion";
diff --git a/pkgs/development/libraries/seasocks/default.nix b/pkgs/development/libraries/seasocks/default.nix
new file mode 100644
index 0000000000000..c6bb2afc2705b
--- /dev/null
+++ b/pkgs/development/libraries/seasocks/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchFromGitHub, cmake, python, zlib }:
+
+stdenv.mkDerivation rec {
+  pname = "seasocks";
+  version = "1.4.2";
+
+  src = fetchFromGitHub {
+    owner = "mattgodbolt";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1vzdhp61bq2bddz7kkpygdq5adxdspjw1q6a03j6qyyimapblrg8";
+  };
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ zlib python ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/mattgodbolt/seasocks;
+    description = "Tiny embeddable C++ HTTP and WebSocket server";
+    license = licenses.bsd2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ fredeb ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3953c1e4b43b0..34e3b55a7daf3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12804,6 +12804,8 @@ in
 
   selinux-sandbox = callPackage ../os-specific/linux/selinux-sandbox { };
 
+  seasocks = callPackage ../development/libraries/seasocks { };
+
   serd = callPackage ../development/libraries/serd {};
 
   serf = callPackage ../development/libraries/serf {};