diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2016-11-18 14:42:54 +0300 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2016-11-18 14:42:57 +0300 |
| commit | f145b1b1fbd392dd9f539744c76142b142cce4e9 (patch) | |
| tree | 8681d17a2906516a5dc45c399cbf0bbf0365aaea | |
| parent | 7c370412257c6ad1b432d00ae6a0700b0b04f7fa (diff) | |
| download | nixsap-f145b1b1fbd392dd9f539744c76142b142cce4e9.tar.gz | |
Override haskell mysql to disable tests
mysql and mysql-simple try to connect to local mysql
See https://github.com/NixOS/nixpkgs/issues/20478
| -rw-r--r-- | modules/pkgs/juandelacosa/default.nix | 12 | ||||
| -rw-r--r-- | modules/pkgs/juandelacosa/main.nix (renamed from modules/pkgs/juandelacosa/cabal2nix.nix) | 0 | ||||
| -rw-r--r-- | modules/pkgs/mywatch/default.nix | 11 | ||||
| -rw-r--r-- | modules/pkgs/mywatch/main.nix (renamed from modules/pkgs/mywatch/cabal2nix.nix) | 0 |
4 files changed, 19 insertions, 4 deletions
diff --git a/modules/pkgs/juandelacosa/default.nix b/modules/pkgs/juandelacosa/default.nix index b37e598..673ac17 100644 --- a/modules/pkgs/juandelacosa/default.nix +++ b/modules/pkgs/juandelacosa/default.nix @@ -1,3 +1,11 @@ -{ haskellPackages }: -haskellPackages.callPackage ./cabal2nix.nix {} +{ haskell, haskellPackages }: + +let myHaskellPkgs = haskellPackages.override { + overrides = self: super: { + mysql = haskell.lib.dontCheck super.mysql; + mysql-simple = haskell.lib.dontCheck super.mysql-simple; + }; +}; + +in myHaskellPkgs.callPackage ./main.nix { } diff --git a/modules/pkgs/juandelacosa/cabal2nix.nix b/modules/pkgs/juandelacosa/main.nix index ddb6af7..ddb6af7 100644 --- a/modules/pkgs/juandelacosa/cabal2nix.nix +++ b/modules/pkgs/juandelacosa/main.nix diff --git a/modules/pkgs/mywatch/default.nix b/modules/pkgs/mywatch/default.nix index 4afc645..673ac17 100644 --- a/modules/pkgs/mywatch/default.nix +++ b/modules/pkgs/mywatch/default.nix @@ -1,4 +1,11 @@ -{ stdenv, haskellPackages }: +{ haskell, haskellPackages }: -haskellPackages.callPackage ./cabal2nix.nix {} +let myHaskellPkgs = haskellPackages.override { + overrides = self: super: { + mysql = haskell.lib.dontCheck super.mysql; + mysql-simple = haskell.lib.dontCheck super.mysql-simple; + }; +}; + +in myHaskellPkgs.callPackage ./main.nix { } diff --git a/modules/pkgs/mywatch/cabal2nix.nix b/modules/pkgs/mywatch/main.nix index 7f72b5f..7f72b5f 100644 --- a/modules/pkgs/mywatch/cabal2nix.nix +++ b/modules/pkgs/mywatch/main.nix |