From 39290777e40636700a6a2d7906bacb506d8600b1 Mon Sep 17 00:00:00 2001 From: Daniel Gröber Date: Wed, 21 Aug 2019 03:42:27 +0200 Subject: Fix some warnings --- lib/Distribution/Helper.hs | 2 -- lib/Distribution/Helper/Discover.hs | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'lib/Distribution') diff --git a/lib/Distribution/Helper.hs b/lib/Distribution/Helper.hs index 386d86e..a440587 100644 --- a/lib/Distribution/Helper.hs +++ b/lib/Distribution/Helper.hs @@ -159,8 +159,6 @@ import CabalHelper.Runtime.HelperMain (helper_main) import CabalHelper.Compiletime.Compat.Version import qualified CabalHelper.Compiletime.Compat.ProgramDb as ProgDb ( defaultProgramDb, programPath, lookupProgram, ghcProgram, ghcPkgProgram ) -import Distribution.Package - ( packageName ) import Distribution.System (buildPlatform) import Distribution.Text (display) import Distribution.Verbosity (Verbosity, silent, normal, verbose, deafening) diff --git a/lib/Distribution/Helper/Discover.hs b/lib/Distribution/Helper/Discover.hs index 93346f5..07eb7fc 100644 --- a/lib/Distribution/Helper/Discover.hs +++ b/lib/Distribution/Helper/Discover.hs @@ -74,7 +74,7 @@ getDefaultDistDir (ProjLocV1CabalFile _cabal_file pkgdir) = DistDirCabal SCV1 $ pkgdir "dist" getDefaultDistDir (ProjLocV1Dir pkgdir) = DistDirCabal SCV1 $ pkgdir "dist" -getDefaultDistDir (ProjLocV2File cabal_project projdir) = +getDefaultDistDir (ProjLocV2File _cabal_project projdir) = DistDirCabal SCV2 $ projdir "dist-newstyle" getDefaultDistDir (ProjLocV2Dir projdir) = DistDirCabal SCV2 $ projdir "dist-newstyle" -- cgit v1.2.3