diff options
| author | Peter Simons <simons@cryp.to> | 2018-01-11 12:45:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-11 12:45:07 +0100 |
| commit | db8a42963b07bb57005c538f6fcc70bd53c6f630 (patch) | |
| tree | 4c91e030af58b3fde2a315dc16f77448e28ec318 | |
| parent | 788c5195f36fe101ecbf016137e017655063bc6b (diff) | |
| parent | 84e4caacc5821a851c84e6aec11aec8d99ecf9a3 (diff) | |
| download | nixlib-db8a42963b07bb57005c538f6fcc70bd53c6f630.tar nixlib-db8a42963b07bb57005c538f6fcc70bd53c6f630.tar.gz nixlib-db8a42963b07bb57005c538f6fcc70bd53c6f630.tar.bz2 nixlib-db8a42963b07bb57005c538f6fcc70bd53c6f630.tar.lz nixlib-db8a42963b07bb57005c538f6fcc70bd53c6f630.tar.xz nixlib-db8a42963b07bb57005c538f6fcc70bd53c6f630.tar.zst nixlib-db8a42963b07bb57005c538f6fcc70bd53c6f630.zip | |
Merge pull request #33735 from dhess/swagger2-armv7l
haskell-modules: swagger2 still needs dontHaddock on armv7l-linux.
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 0b302c3d0c06..c7c42c1add7e 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -931,7 +931,7 @@ self: super: { hashable = if pkgs.stdenv.isArm then dontCheck super.hashable else super.hashable; # https://github.com/tibbe/hashable/issues/95 servant-docs = if pkgs.stdenv.isArm then dontCheck super.servant-docs else super.servant-docs; servant-swagger = if pkgs.stdenv.isArm then dontCheck super.servant-swagger else super.servant-swagger; - swagger2 = if pkgs.stdenv.isArm then dontCheck super.swagger2 else super.swagger2; + swagger2 = if pkgs.stdenv.isArm then dontHaddock (dontCheck super.swagger2) else super.swagger2; # Tries to read a file it is not allowed to in the test suite load-env = dontCheck super.load-env; |