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

haskellPackages.mysql: fix #19593

Browse Source
This commit is contained in:
Domen Kožar 2017-01-04 16:41:30 +01:00
parent a486850992
commit f10dfd692f
2 changed files with 2 additions and 2 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

@ -42,7 +42,8 @@ self: super: {
Lazy-Pbkdf2 = if pkgs.stdenv.isi686 then dontCheck super.Lazy-Pbkdf2 else super.Lazy-Pbkdf2; 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). # 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. # Link the proper version.
zeromq4-haskell = super.zeromq4-haskell.override { zeromq = pkgs.zeromq4; }; zeromq4-haskell = super.zeromq4-haskell.override { zeromq = pkgs.zeromq4; };

1
pkgs/development/haskell-modules/configuration-hackage2nix.yaml
View File

@ -5741,7 +5741,6 @@ dont-distribute-packages:
mysql-simple-quasi: [ i686-linux, x86_64-linux, x86_64-darwin ] mysql-simple-quasi: [ i686-linux, x86_64-linux, x86_64-darwin ]
mysql-simple-typed: [ 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-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 ] mystem: [ i686-linux, x86_64-linux, x86_64-darwin ]
myTestlll: [ 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 ] mywatch: [ i686-linux, x86_64-linux, x86_64-darwin ]