From b4047ae649ebbe217a9f5923865c303dc3a158d6 Mon Sep 17 00:00:00 2001 From: Matthias Fischmann Date: Mon, 21 Aug 2023 10:59:26 +0200 Subject: [PATCH 1/2] Remove unneeded -Wwarn (re-enabeling -Werror in those modules). --- libs/wire-api/test/unit/Test/Wire/API/Roundtrip/MLS.hs | 2 +- services/cannon/src/Cannon/Run.hs | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/libs/wire-api/test/unit/Test/Wire/API/Roundtrip/MLS.hs b/libs/wire-api/test/unit/Test/Wire/API/Roundtrip/MLS.hs index c6f14ce135..8a4ab10fd7 100644 --- a/libs/wire-api/test/unit/Test/Wire/API/Roundtrip/MLS.hs +++ b/libs/wire-api/test/unit/Test/Wire/API/Roundtrip/MLS.hs @@ -1,4 +1,5 @@ {-# LANGUAGE GeneralizedNewtypeDeriving #-} + -- This file is part of the Wire Server implementation. -- -- Copyright (C) 2022 Wire Swiss GmbH @@ -15,7 +16,6 @@ -- -- You should have received a copy of the GNU Affero General Public License along -- with this program. If not, see . -{-# OPTIONS_GHC -Wwarn #-} module Test.Wire.API.Roundtrip.MLS (tests) where diff --git a/services/cannon/src/Cannon/Run.hs b/services/cannon/src/Cannon/Run.hs index 49b3d4edb6..df5f6e06a6 100644 --- a/services/cannon/src/Cannon/Run.hs +++ b/services/cannon/src/Cannon/Run.hs @@ -15,8 +15,6 @@ -- You should have received a copy of the GNU Affero General Public License along -- with this program. If not, see . -{-# OPTIONS -Wwarn #-} - module Cannon.Run ( run, CombinedAPI, From 5bc168ab751cc89a304fe739a79b5a54f47053f6 Mon Sep 17 00:00:00 2001 From: Matthias Fischmann Date: Mon, 21 Aug 2023 11:19:09 +0200 Subject: [PATCH 2/2] Makefile: fix hspec_options overloading in .envrc.local. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 91a31e617e..d013fde404 100644 --- a/Makefile +++ b/Makefile @@ -35,7 +35,7 @@ EXE_SCHEMA := ./dist/$(package)-schema # Additionally, if stack is being used with nix, environment variables do not # make it into the shell where hspec is run, to tackle that this variable is # also exported in stack-deps.nix. -export HSPEC_OPTIONS = --fail-on-focused +export HSPEC_OPTIONS ?= --fail-on-focused default: install