From f145b1b1fbd392dd9f539744c76142b142cce4e9 Mon Sep 17 00:00:00 2001
From: Igor Pashev <pashev.igor@gmail.com>
Date: Fri, 18 Nov 2016 14:42:54 +0300
Subject: Override haskell mysql to disable tests

mysql and mysql-simple try to connect to local mysql

See https://github.com/NixOS/nixpkgs/issues/20478
---
 modules/pkgs/juandelacosa/cabal2nix.nix | 25 -------------------------
 modules/pkgs/juandelacosa/default.nix   | 12 ++++++++++--
 modules/pkgs/juandelacosa/main.nix      | 25 +++++++++++++++++++++++++
 modules/pkgs/mywatch/cabal2nix.nix      | 25 -------------------------
 modules/pkgs/mywatch/default.nix        | 11 +++++++++--
 modules/pkgs/mywatch/main.nix           | 25 +++++++++++++++++++++++++
 6 files changed, 69 insertions(+), 54 deletions(-)
 delete mode 100644 modules/pkgs/juandelacosa/cabal2nix.nix
 create mode 100644 modules/pkgs/juandelacosa/main.nix
 delete mode 100644 modules/pkgs/mywatch/cabal2nix.nix
 create mode 100644 modules/pkgs/mywatch/main.nix

(limited to 'modules')

diff --git a/modules/pkgs/juandelacosa/cabal2nix.nix b/modules/pkgs/juandelacosa/cabal2nix.nix
deleted file mode 100644
index ddb6af7..0000000
--- a/modules/pkgs/juandelacosa/cabal2nix.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ mkDerivation, base, base64-bytestring, bytestring
-, data-default-class, docopt, entropy, fast-logger, fetchgit
-, http-types, interpolatedstring-perl6, mtl, mysql, mysql-simple
-, network, resource-pool, scotty, stdenv, text, unix, wai
-, wai-extra, wai-middleware-static, warp
-}:
-mkDerivation {
-  pname = "juandelacosa";
-  version = "0.1.1";
-  src = fetchgit {
-    url = "https://github.com/zalora/juandelacosa.git";
-    sha256 = "c260feae989f518484881e7dc7ebcd51d5b25fcda92412445942a5e34c1f9459";
-    rev = "0940da0cdfb1201768d35c58433891feacbaedd5";
-  };
-  isLibrary = false;
-  isExecutable = true;
-  executableHaskellDepends = [
-    base base64-bytestring bytestring data-default-class docopt entropy
-    fast-logger http-types interpolatedstring-perl6 mtl mysql
-    mysql-simple network resource-pool scotty text unix wai wai-extra
-    wai-middleware-static warp
-  ];
-  description = "Manage users in MariaDB >= 10.1.1";
-  license = stdenv.lib.licenses.mit;
-}
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/main.nix b/modules/pkgs/juandelacosa/main.nix
new file mode 100644
index 0000000..ddb6af7
--- /dev/null
+++ b/modules/pkgs/juandelacosa/main.nix
@@ -0,0 +1,25 @@
+{ mkDerivation, base, base64-bytestring, bytestring
+, data-default-class, docopt, entropy, fast-logger, fetchgit
+, http-types, interpolatedstring-perl6, mtl, mysql, mysql-simple
+, network, resource-pool, scotty, stdenv, text, unix, wai
+, wai-extra, wai-middleware-static, warp
+}:
+mkDerivation {
+  pname = "juandelacosa";
+  version = "0.1.1";
+  src = fetchgit {
+    url = "https://github.com/zalora/juandelacosa.git";
+    sha256 = "c260feae989f518484881e7dc7ebcd51d5b25fcda92412445942a5e34c1f9459";
+    rev = "0940da0cdfb1201768d35c58433891feacbaedd5";
+  };
+  isLibrary = false;
+  isExecutable = true;
+  executableHaskellDepends = [
+    base base64-bytestring bytestring data-default-class docopt entropy
+    fast-logger http-types interpolatedstring-perl6 mtl mysql
+    mysql-simple network resource-pool scotty text unix wai wai-extra
+    wai-middleware-static warp
+  ];
+  description = "Manage users in MariaDB >= 10.1.1";
+  license = stdenv.lib.licenses.mit;
+}
diff --git a/modules/pkgs/mywatch/cabal2nix.nix b/modules/pkgs/mywatch/cabal2nix.nix
deleted file mode 100644
index 7f72b5f..0000000
--- a/modules/pkgs/mywatch/cabal2nix.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ mkDerivation, aeson, base, bytestring, ConfigFile
-, data-default-class, docopt, fast-logger, fetchgit, http-types
-, interpolatedstring-perl6, MissingH, mtl, mysql, mysql-simple
-, network, resource-pool, scotty, stdenv, text, unix
-, unordered-containers, wai, wai-extra, wai-middleware-static, warp
-}:
-mkDerivation {
-  pname = "mywatch";
-  version = "0.2.1";
-  src = fetchgit {
-    url = "https://github.com/zalora/mywatch.git";
-    sha256 = "7c646cb69958fd1010682873c193afad0f5d93a4abb8f5ce728c0500fb43912b";
-    rev = "523b6029eb4b8569504086dfb5b8538330e5f522";
-  };
-  isLibrary = false;
-  isExecutable = true;
-  executableHaskellDepends = [
-    aeson base bytestring ConfigFile data-default-class docopt
-    fast-logger http-types interpolatedstring-perl6 MissingH mtl mysql
-    mysql-simple network resource-pool scotty text unix
-    unordered-containers wai wai-extra wai-middleware-static warp
-  ];
-  description = "Web application to view and kill MySQL queries";
-  license = stdenv.lib.licenses.mit;
-}
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/main.nix b/modules/pkgs/mywatch/main.nix
new file mode 100644
index 0000000..7f72b5f
--- /dev/null
+++ b/modules/pkgs/mywatch/main.nix
@@ -0,0 +1,25 @@
+{ mkDerivation, aeson, base, bytestring, ConfigFile
+, data-default-class, docopt, fast-logger, fetchgit, http-types
+, interpolatedstring-perl6, MissingH, mtl, mysql, mysql-simple
+, network, resource-pool, scotty, stdenv, text, unix
+, unordered-containers, wai, wai-extra, wai-middleware-static, warp
+}:
+mkDerivation {
+  pname = "mywatch";
+  version = "0.2.1";
+  src = fetchgit {
+    url = "https://github.com/zalora/mywatch.git";
+    sha256 = "7c646cb69958fd1010682873c193afad0f5d93a4abb8f5ce728c0500fb43912b";
+    rev = "523b6029eb4b8569504086dfb5b8538330e5f522";
+  };
+  isLibrary = false;
+  isExecutable = true;
+  executableHaskellDepends = [
+    aeson base bytestring ConfigFile data-default-class docopt
+    fast-logger http-types interpolatedstring-perl6 MissingH mtl mysql
+    mysql-simple network resource-pool scotty text unix
+    unordered-containers wai wai-extra wai-middleware-static warp
+  ];
+  description = "Web application to view and kill MySQL queries";
+  license = stdenv.lib.licenses.mit;
+}
-- 
cgit v1.2.3