Merge remote-tracking branch 'upstream/master' into staging

2018-05-10 12:04:17 -04:00
parent ad838f6f91 28b2f48ba9
commit 42f6e7c4e4
20 changed files with 225 additions and 33 deletions
--- a/pkgs/servers/sql/monetdb/default.nix
+++ b/pkgs/servers/sql/monetdb/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, pkgconfig, bison, openssl }:
+{ stdenv, fetchurl, pkgconfig
+, bison, openssl, readline
+}:

 let
  version = "11.29.3";
@@ -12,7 +14,7 @@ in stdenv.mkDerivation rec {
  };

  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ bison openssl ];
+  buildInputs = [ bison openssl readline ];

  meta = with stdenv.lib; {
    description = "An open source database system";