diff options
| author | Bas van Dijk <v.dijk.bas@gmail.com> | 2018-07-24 03:11:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-24 03:11:28 +0200 |
| commit | cbbabf7c0875953049639ddc58c57aab878153d5 (patch) | |
| tree | a0b9e92d74862dcaf06290d65997388fb559827c | |
| parent | f30bfcd6235a34768aebd3244cb7c175af39a821 (diff) | |
| parent | b2be524e30f58f65595e76cc2cbecc6257c7dfc9 (diff) | |
| download | nixlib-cbbabf7c0875953049639ddc58c57aab878153d5.tar nixlib-cbbabf7c0875953049639ddc58c57aab878153d5.tar.gz nixlib-cbbabf7c0875953049639ddc58c57aab878153d5.tar.bz2 nixlib-cbbabf7c0875953049639ddc58c57aab878153d5.tar.lz nixlib-cbbabf7c0875953049639ddc58c57aab878153d5.tar.xz nixlib-cbbabf7c0875953049639ddc58c57aab878153d5.tar.zst nixlib-cbbabf7c0875953049639ddc58c57aab878153d5.zip | |
Merge pull request #44039 from endgame/move-blank-canvas-dontcheck
haskellPackages.blank-canvas: Move fixes to configuration-common.nix
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-nix.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 942d5fcd27d4..dcc2cc467916 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1128,4 +1128,8 @@ self: super: { url = "https://github.com/guillaume-nargeot/hpc-coveralls/pull/73/commits/344217f513b7adfb9037f73026f5d928be98d07f.patch"; sha256 = "056rk58v9h114mjx62f41x971xn9p3nhsazcf9zrcyxh1ymrdm8j"; }); + + # Tests require a browser: https://github.com/ku-fpg/blank-canvas/issues/73 + blank-canvas = dontCheck super.blank-canvas; + blank-canvas_0_6_2 = dontCheck super.blank-canvas_0_6_2; } diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 2ae35c0aa688..3e4b18d86b92 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -502,8 +502,4 @@ self: super: builtins.intersectAttrs super { LDAP = dontCheck (overrideCabal super.LDAP (drv: { librarySystemDepends = drv.librarySystemDepends or [] ++ [ pkgs.cyrus_sasl.dev ]; })); - - # Tests require a browser: https://github.com/ku-fpg/blank-canvas/issues/73 - blank-canvas = dontCheck super.blank-canvas; - blank-canvas_0_6_2 = dontCheck super.blank-canvas_0_6_2; } |