diff options
| author | Domen Kožar <domen@dev.si> | 2017-01-04 16:41:30 +0100 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2017-01-04 16:41:42 +0100 |
| commit | f10dfd692f51400e9661c461b49b36ac83f0228c (patch) | |
| tree | f4aa00e969e4ac510cd3a8c29e8d3cd49591cc25 /pkgs/development/haskell-modules | |
| parent | a4868509923aebd66b2aa9aa1d260d882e159b5e (diff) | |
| download | nixlib-f10dfd692f51400e9661c461b49b36ac83f0228c.tar nixlib-f10dfd692f51400e9661c461b49b36ac83f0228c.tar.gz nixlib-f10dfd692f51400e9661c461b49b36ac83f0228c.tar.bz2 nixlib-f10dfd692f51400e9661c461b49b36ac83f0228c.tar.lz nixlib-f10dfd692f51400e9661c461b49b36ac83f0228c.tar.xz nixlib-f10dfd692f51400e9661c461b49b36ac83f0228c.tar.zst nixlib-f10dfd692f51400e9661c461b49b36ac83f0228c.zip | |
haskellPackages.mysql: fix #19593
Diffstat (limited to 'pkgs/development/haskell-modules')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 3 | ||||
| -rw-r--r-- | pkgs/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 da95981c5e38..4c0cb349860d 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 06480f59f284..66b0a7f3db74 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 ] |