diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 238f7c38bc13..b5868586f665 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -53,7 +53,7 @@ self: super: builtins.intersectAttrs super { # Use the default version of mysql to build this package (which is actually mariadb). # test phase requires networking - mysql = dontCheck (super.mysql.override { mysql = pkgs.libmysqlclient; }); + mysql = dontCheck super.mysql; # CUDA needs help finding the SDK headers and libraries. cuda = overrideCabal super.cuda (drv: { diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index cf40d4c78bac..44069b6a40c8 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -115325,7 +115325,7 @@ self: { , parsec, process, QuickCheck, random, regex-tdfa, resourcet , scientific, tagsoup, tasty, tasty-golden, tasty-hunit , tasty-quickcheck, template-haskell, text, time - , time-locale-compat, unordered-containers, utillinux, vector, wai + , time-locale-compat, unordered-containers, util-linux, vector, wai , wai-app-static, warp, yaml }: mkDerivation { @@ -115349,11 +115349,11 @@ self: { base bytestring containers filepath QuickCheck tasty tasty-golden tasty-hunit tasty-quickcheck text unordered-containers yaml ]; - testToolDepends = [ utillinux ]; + testToolDepends = [ util-linux ]; description = "A static website compiler library"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ erictapen ]; - }) {inherit (pkgs) utillinux;}; + }) {inherit (pkgs) util-linux;}; "hakyll-R" = callPackage ({ mkDerivation, base, directory, filepath, hakyll, pandoc, process @@ -182663,7 +182663,8 @@ self: { }) {}; "mysql" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, hspec, mysql + ({ mkDerivation, base, bytestring, Cabal, containers, hspec + , libmysqlclient }: mkDerivation { pname = "mysql"; @@ -182671,11 +182672,11 @@ self: { sha256 = "16m8hv9yy2nf4jwgqg6n9z53n2pzskbc3gwbp2i3kgff8wsmf8sd"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bytestring containers ]; - librarySystemDepends = [ mysql ]; + librarySystemDepends = [ libmysqlclient ]; testHaskellDepends = [ base bytestring hspec ]; description = "A low-level MySQL client library"; license = lib.licenses.bsd3; - }) {inherit (pkgs) mysql;}; + }) {inherit (pkgs) libmysqlclient;}; "mysql-effect" = callPackage ({ mkDerivation, base, bytestring, extensible-effects, mysql