summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorShea Levy <shea@shealevy.com>2014-03-31 21:50:42 -0400
committerShea Levy <shea@shealevy.com>2014-03-31 21:50:42 -0400
commit304fd16d95ba1cc18697784c31fb332418d03b11 (patch)
treef244ea893a7d66666f3413fc4256f01cc0a717a2 /pkgs
parentc37bbda4a3b3ebe9ebe91b0eda78253878151e55 (diff)
parent92192847fc955a4b1542589639ee369c01e4b1ce (diff)
downloadnixlib-304fd16d95ba1cc18697784c31fb332418d03b11.tar
nixlib-304fd16d95ba1cc18697784c31fb332418d03b11.tar.gz
nixlib-304fd16d95ba1cc18697784c31fb332418d03b11.tar.bz2
nixlib-304fd16d95ba1cc18697784c31fb332418d03b11.tar.lz
nixlib-304fd16d95ba1cc18697784c31fb332418d03b11.tar.xz
nixlib-304fd16d95ba1cc18697784c31fb332418d03b11.tar.zst
nixlib-304fd16d95ba1cc18697784c31fb332418d03b11.zip
Merge branch 'concurrencykit' of git://github.com/thoughtpolice/nixpkgs
concurrencykit: version 0.4.1
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/libraries/concurrencykit/default.nix19
-rw-r--r--pkgs/top-level/all-packages.nix2
2 files changed, 21 insertions, 0 deletions
diff --git a/pkgs/development/libraries/concurrencykit/default.nix b/pkgs/development/libraries/concurrencykit/default.nix
new file mode 100644
index 000000000000..59de923ad43d
--- /dev/null
+++ b/pkgs/development/libraries/concurrencykit/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name    = "concurrencykit-${version}";
+  version = "0.4.1";
+
+  src = fetchurl {
+    url    = "http://concurrencykit.org/releases/ck-${version}.tar.gz";
+    sha256 = "1gi5gpkxvbb6vkhjm9kab7dz1av2i11f1pggxp001rqq2mi3i6aq";
+  };
+
+  meta = {
+    description = "A library of safe, high-performance concurrent data structures";
+    homepage    = "http://concurrencykit.org";
+    license     = stdenv.lib.licenses.bsd2;
+    platforms   = stdenv.lib.platforms.unix;
+    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cc83d0ea4d4c..e2bb49f63b0d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -711,6 +711,8 @@ let
 
   colordiff = callPackage ../tools/text/colordiff { };
 
+  concurrencykit = callPackage ../development/libraries/concurrencykit { };
+
   connect = callPackage ../tools/networking/connect { };
 
   conspy = callPackage ../os-specific/linux/conspy {};