From f10dfd692f51400e9661c461b49b36ac83f0228c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 4 Jan 2017 16:41:30 +0100 Subject: [PATCH] haskellPackages.mysql: fix #19593 --- pkgs/development/haskell-modules/configuration-common.nix | 3 ++- .../development/haskell-modules/configuration-hackage2nix.yaml | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index da95981c5e3..4c0cb349860 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -42,7 +42,8 @@ self: super: { Lazy-Pbkdf2 = if pkgs.stdenv.isi686 then dontCheck super.Lazy-Pbkdf2 else super.Lazy-Pbkdf2; # Use the default version of mysql to build this package (which is actually mariadb). - mysql = super.mysql.override { mysql = pkgs.mysql.lib; }; + # test phase requires networking + mysql = dontCheck (super.mysql.override { mysql = pkgs.mysql.lib; }); # Link the proper version. zeromq4-haskell = super.zeromq4-haskell.override { zeromq = pkgs.zeromq4; }; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 06480f59f28..66b0a7f3db7 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -5741,7 +5741,6 @@ dont-distribute-packages: mysql-simple-quasi: [ i686-linux, x86_64-linux, x86_64-darwin ] mysql-simple-typed: [ i686-linux, x86_64-linux, x86_64-darwin ] mysql-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] - mysql: [ i686-linux, x86_64-linux, x86_64-darwin ] mystem: [ i686-linux, x86_64-linux, x86_64-darwin ] myTestlll: [ i686-linux, x86_64-linux, x86_64-darwin ] mywatch: [ i686-linux, x86_64-linux, x86_64-darwin ]