summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatt McHenry <github@matt.mchenryfamily.org>2020-03-03 21:37:56 -0500
committerPeter Simons <simons@cryp.to>2020-03-13 20:24:52 +0100
commit7335de2dab15fe895d3f66c3fd50bfcbe9ee0c8f (patch)
tree555178bd3b4f236f8871d7df78dd528b9d74e34a
parent720d0c7803a488c55351d0030cc9563ed42b5704 (diff)
downloadnixpkgs-7335de2dab15fe895d3f66c3fd50bfcbe9ee0c8f.tar
nixpkgs-7335de2dab15fe895d3f66c3fd50bfcbe9ee0c8f.tar.gz
nixpkgs-7335de2dab15fe895d3f66c3fd50bfcbe9ee0c8f.tar.bz2
nixpkgs-7335de2dab15fe895d3f66c3fd50bfcbe9ee0c8f.tar.lz
nixpkgs-7335de2dab15fe895d3f66c3fd50bfcbe9ee0c8f.tar.xz
nixpkgs-7335de2dab15fe895d3f66c3fd50bfcbe9ee0c8f.tar.zst
nixpkgs-7335de2dab15fe895d3f66c3fd50bfcbe9ee0c8f.zip
persistent-mysql: fix build
tests need a running mysql instance, so disable them
-rw-r--r--pkgs/development/haskell-modules/configuration-common.nix2
-rw-r--r--pkgs/development/haskell-modules/configuration-hackage2nix.yaml1
-rw-r--r--pkgs/development/haskell-modules/hackage-packages.nix2
3 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 1fec29f2037..f113f520445 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1468,4 +1468,6 @@ self: super: {
   # haskell-ci-0.8 needs cabal-install-parsers ==0.1, but we have 0.2.
   haskell-ci = doJailbreak super.haskell-ci;
 
+  persistent-mysql = dontCheck super.persistent-mysql;
+
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index d16555a168b..d38bc186440 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -8156,7 +8156,6 @@ broken-packages:
   - persistent-map
   - persistent-migration
   - persistent-mongoDB
-  - persistent-mysql
   - persistent-mysql-haskell
   - persistent-protobuf
   - persistent-ratelimit
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index d2d3c343682..8f98455bcea 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -185286,8 +185286,6 @@ self: {
        ];
        description = "Backend for the persistent library using MySQL database server";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "persistent-mysql-haskell" = callPackage