diff options
Diffstat (limited to 'modules')
| -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 |