Merge master into staging

2018-08-09 18:28:15 +02:00
parent 8b83460562 8c7fa1e836
commit d9fa74ba78
353 changed files with 13577 additions and 11052 deletions
@@ -160,6 +160,13 @@ let
    buildInputs = with pkgs; [ cyrus_sasl zlib ];
  };

+  oci8 = buildPecl rec {
+    name = "oci8-2.1.8";
+    sha256 = "1bp6fss2f2qmd5bdk7x22j8vx5qivrdhz4x7csf29vjgj6gvchxy";
+    buildInputs = [ pkgs.re2c pkgs.oracle-instantclient ];
+    configureFlags = [ "--with-oci8=shared,instantclient,${pkgs.oracle-instantclient}/lib" ];
+  };
+
  pcs = buildPecl rec {
    name = "pcs-1.3.3";