diff --git a/pkgs/development/interpreters/php_configurable/default.nix b/pkgs/development/interpreters/php_configurable/default.nix index 9e80e741d20..d10efcec802 100644 --- a/pkgs/development/interpreters/php_configurable/default.nix +++ b/pkgs/development/interpreters/php_configurable/default.nix @@ -8,7 +8,7 @@ args: # much left to do here... - mandatory = { buildInputs = ["flex" "bison"]; }; + mandatory = { buildInputs = ["flex" "bison" "pkgconfig"]; }; # SAPI modules: @@ -74,6 +74,15 @@ args: buildInputs = ["gd"]; # <-- urgh, these strings are ugly }; + sockets = { + cfgOption = "--enable-sockets"; + }; + + openssl = { + cfgOption = "--with-openssl=${args.openssl}"; + buildInputs = ["openssl"]; + }; + /* Building xdebug withing php to be able to add the parameters to the ini file.. Ther should be a better way meta = { @@ -97,7 +106,7 @@ args: defaults = [ "mysql" "mysqli" "pdo_mysql" "libxml2" "apxs2" "bcmath" ]; - optionals = [ "libxml2" "gettext" "postgresql" "zlib"]; + optionals = [ "libxml2" "gettext" "postgresql" "zlib" "openssl" ]; extraAttrs = co: { name = "php_configurable-${version}"; diff --git a/pkgs/misc/ghc68extraLibs/default.nix b/pkgs/misc/ghc68extraLibs/default.nix index 5035a304ac8..b3191cd1fa9 100644 --- a/pkgs/misc/ghc68extraLibs/default.nix +++ b/pkgs/misc/ghc68extraLibs/default.nix @@ -45,6 +45,8 @@ rec { hxt = { name = "hxt-7.5"; src =fetchurl { url = http://hackage.haskell.org/packages/archive/hxt/7.5/hxt-7.5.tar.gz; sha256 ="00q6m90a4qm4d5cg1x9r6b7f0rszcf2y7ifzs9mvy9kmzfl5ga7n"; }; p_deps = [x.base x.haskell98 x.http_darcs x.hunit x.network x.parsec x.tagsoup ]; }; storableVector = { name = "storablevector-0.1.2.2"; src = fetchurl { url = http://hackage.haskell.org/packages/archive/storablevector/0.1.2.2/storablevector-0.1.2.2.tar.gz; sha256="1gf2a40mv8xxppdmg9l3svshww4sg0wwdqlwjl95nhacm0f6yrhb"; }; p_deps = [ x.base x.bytestring x.mtl x.quickcheck x.random ]; }; storableVectorDarcs = { name = "storablevector-darcs"; src = sourceByName "storableVector"; p_deps = [ x.base x.bytestring x.mtl x.quickcheck x.random ]; }; + typeInt = { name="type-int-0.4"; src = fetchurl { url = "/nix/store/cvnf71gxvk1lxnibigc2ang10hi4i5qi-type-int-0.4.tar.gz"; sha256="0h64cx2zpijaaxnzhal2m311q33drvynjbmxavh7z5b8fmaqmnws"; }; p_deps = [ x.base x.template_haskell ]; }; + typeLevel = {name="type-level-0.2.1"; src = fetchurl { url = http://hackage.haskell.org/packages/archive/type-level/0.2.1/type-level-0.2.1.tar.gz; sha256 = "077g6i9v1wvsk1narnxp9m0svlkz9lpf0adalhlw2m7268rpr148"; }; p_deps = [ x.base x.template_haskell ]; }; haskellnet = { name = "HaskellNet-0.2"; src = sourceByName "haskellnet"; p_deps = [ x.base x.haskell98 x.network x.crypto x.mtl x.parsec x.time x.haxml x.bytestring x.pretty x.array x.dataenc x.containers x.old_locale x.old_time ]; pass = { patchPhase = " diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ee296e2a21b..5d1fb4d9cc5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1978,10 +1978,10 @@ let inherit stdenv fetchurl lib mkDerivationByConfiguration autoconf automake flex bison apacheHttpd mysql libxml2 # gettext - zlib curl gd postgresql; + zlib curl gd postgresql openssl pkgconfig; flags = [ "xdebug" "mysql" "mysqli" "pdo_mysql" "libxml2" "apxs2" "curl" - "postgresql" "bcmath" "gd" + "postgresql" "bcmath" "gd" "sockets" "curl" ]; };