public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

haskell-mysql: fix build

Browse Source
This commit is contained in:
Peter Simons 2015-03-18 11:36:24 +01:00
parent fe8d65c9a6
commit 25f4f78c92
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -25,6 +25,9 @@ self: super: {
# Doesn't compile with lua 5.2. # Doesn't compile with lua 5.2.
hslua = super.hslua.override { lua = pkgs.lua5_1; }; hslua = super.hslua.override { lua = pkgs.lua5_1; };
# Use the default version of mysql to build this package (which is actually mariadb).
mysql = super.mysql.override { inherit (pkgs) mysql; };
# Please also remove optparse-applicative special case from # Please also remove optparse-applicative special case from
# cabal2nix/hackage2nix.hs when removing the following. # cabal2nix/hackage2nix.hs when removing the following.
elm-make = super.elm-make.override { optparse-applicative = self.optparse-applicative_0_10_0; }; elm-make = super.elm-make.override { optparse-applicative = self.optparse-applicative_0_10_0; };

7
pkgs/development/haskell-modules/hackage-packages.nix
View File

@ -84955,18 +84955,19 @@ self: {
}) {}; }) {};
"mysql" = callPackage "mysql" = callPackage
({ mkDerivation, base, bytestring, containers, mysql, zlib }: ({ mkDerivation, base, bytestring, containers, mysql, openssl, zlib
}:
mkDerivation { mkDerivation {
pname = "mysql"; pname = "mysql";
version = "0.1.1.7"; version = "0.1.1.7";
sha256 = "0hl8z8ynadvvhn4garjrax2b59iqddj884mv3s6804lcjjyc49d0"; sha256 = "0hl8z8ynadvvhn4garjrax2b59iqddj884mv3s6804lcjjyc49d0";
buildDepends = [ base bytestring containers ]; buildDepends = [ base bytestring containers ];
buildTools = [ mysql ]; buildTools = [ mysql ];
extraLibraries = [ zlib ]; extraLibraries = [ openssl zlib ];
homepage = "https://github.com/bos/mysql"; homepage = "https://github.com/bos/mysql";
description = "A low-level MySQL client library"; description = "A low-level MySQL client library";
license = stdenv.lib.licenses.bsd3; license = stdenv.lib.licenses.bsd3;
}) { mysql = null; inherit (pkgs) zlib;}; }) { mysql = null; inherit (pkgs) openssl; inherit (pkgs) zlib;};
"mysql-effect" = callPackage "mysql-effect" = callPackage
({ mkDerivation, base, bytestring, extensible-effects, mysql ({ mkDerivation, base, bytestring, extensible-effects, mysql