From 751e111a87aed2f547dfed04e01922235472ca07 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Mon, 23 Dec 2013 05:18:34 +0200
Subject: squids.latest: update from 3.2.2 to 3.2.13, potentially fixes
 CVE-2012-5643, CVE-2013-0189, CVE-2013-1839, CVE-2013-4123

---
 pkgs/servers/squid/squids.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/servers')

diff --git a/pkgs/servers/squid/squids.nix b/pkgs/servers/squid/squids.nix
index a94c05d5627e..a41343c0cf90 100644
--- a/pkgs/servers/squid/squids.nix
+++ b/pkgs/servers/squid/squids.nix
@@ -30,10 +30,10 @@ rec {
   };
 
   squid32 = squid30.merge rec {
-    name = "squid-3.2.2";
+    name = "squid-3.2.13";
     src = args.fetchurl {
       url = "http://www.squid-cache.org/Versions/v3/3.2/${name}.tar.bz2";
-      sha256 = "13jlx3d6rqq7ajxs8bgn8a0mh932jhq6aa8032q205nxnhqs0l4l";
+      sha256 = "0dafqv00dr3nyrm9k47d6r7gv2r3f9hjd1ykl3kkvjca11r4n54j";
     };
     buildInputs = [openldap pam db4 cyrus_sasl libcap expat libxml2
       libtool openssl];
-- 
cgit 1.4.1


From e2e923644fef2a419818a9f52095044fa4603fea Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Fri, 8 Nov 2013 23:45:57 +0100
Subject: add rethinkdb

---
 pkgs/servers/nosql/rethinkdb/default.nix | 35 ++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/servers/nosql/rethinkdb/default.nix

(limited to 'pkgs/servers')

diff --git a/pkgs/servers/nosql/rethinkdb/default.nix b/pkgs/servers/nosql/rethinkdb/default.nix
new file mode 100644
index 000000000000..9231310abd88
--- /dev/null
+++ b/pkgs/servers/nosql/rethinkdb/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchurl, which, protobuf, v8, ncurses, gperftools, boost, m4 }:
+
+stdenv.mkDerivation rec {
+  name = "rethinkdb-1.11.2";
+
+  src = fetchurl {
+    url = "http://download.rethinkdb.com/dist/${name}.tgz";
+    sha256 = "04wz07y891vygc5ksrvkk1ch05xj16nahv20bnxwcllkbl4gf9lj";
+  };
+
+  preConfigure = ''
+    export ALLOW_WARNINGS=1
+  '';
+
+  configureFlags = "--lib-path ${gperftools}/lib";
+
+  buildInputs = [ protobuf v8 ncurses boost ];
+
+  nativeBuildInputs = [ which m4 ];
+
+
+  meta = {
+    description = "An open-source distributed database built with love";
+    longDescription = ''
+      RethinkDB is built to store JSON documents, and scale to multiple machines with very little
+      effort. It has a pleasant query language that supports really useful queries like table joins
+      and group by, and is easy to setup and learn.
+    '';
+    homepage = http://www.rethinkdb.com;
+    license = "AGPLv3";
+
+    maintainers = [ stdenv.lib.maintainers.bluescreen303 ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2fc58874f77d..df683c3ad1c8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6429,6 +6429,8 @@ let
 
   restund = callPackage ../servers/restund {};
 
+  rethinkdb = callPackage ../servers/nosql/rethinkdb { };
+
   spamassassin = callPackage ../servers/mail/spamassassin {
     inherit (perlPackages) HTMLParser NetDNS NetAddrIP DBFile
       HTTPDate MailDKIM LWP IOSocketSSL;
-- 
cgit 1.4.1


From 82d02565fc83e0028394a6d5dc8b52334c822786 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Mon, 23 Dec 2013 11:59:46 +0100
Subject: rethinkdb: /usr/bin/env is not available in chroot builds

---
 pkgs/servers/nosql/rethinkdb/default.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'pkgs/servers')

diff --git a/pkgs/servers/nosql/rethinkdb/default.nix b/pkgs/servers/nosql/rethinkdb/default.nix
index 9231310abd88..e81ccb396322 100644
--- a/pkgs/servers/nosql/rethinkdb/default.nix
+++ b/pkgs/servers/nosql/rethinkdb/default.nix
@@ -10,6 +10,7 @@ stdenv.mkDerivation rec {
 
   preConfigure = ''
     export ALLOW_WARNINGS=1
+    patchShebangs .
   '';
 
   configureFlags = "--lib-path ${gperftools}/lib";
-- 
cgit 1.4.1