packages feed

cabal-debian 4.38 → 4.38.1

raw patch · 7 files changed

+22/−15 lines, 7 files

Files

cabal-debian.cabal view
@@ -1,5 +1,5 @@ Name:           cabal-debian-Version:        4.38+Version:        4.38.1 Copyright:      Copyright (c) 2007-2014, David Fox, Jeremy Shaw License:        BSD3 License-File:   LICENSE
src/Debian/Debianize/BuildDependencies.hs view
@@ -17,6 +17,7 @@ import Data.List as List (filter, groupBy, intercalate, map, minimumBy, nub, sortBy) import Data.Map as Map (lookup, Map) import Data.Maybe (catMaybes, fromMaybe, isJust, isNothing, listToMaybe, mapMaybe)+import Data.Monoid ((<>)) import Data.Set as Set (empty, fold, fromList, map, member, Set, singleton, toList, union) import Debian.Debianize.Prelude import Debian.Debianize.BasicInfo (buildEnv, compilerFlavor, EnvSet(dependOS))@@ -122,6 +123,14 @@ debianBuildDeps :: (MonadIO m, Functor m) => PackageDescription -> CabalT m D.Relations debianBuildDeps pkgDesc =     do hflavor <- use (A.debInfo . D.flags . compilerFlavor)+       prof <- not <$> use (A.debInfo . D.noProfilingLibrary)+       let hcPackageTypes :: CompilerFlavor -> Set B.PackageType+           hcPackageTypes GHC = fromList ([B.Development] <> if prof then [B.Profiling] else [])+#if MIN_VERSION_Cabal(1,22,0)+           hcPackageTypes GHCJS = fromList [B.Development]+#endif+           hcPackageTypes hc = error $ "Unsupported compiler flavor: " ++ show hc+        let hcs = singleton hflavor -- vestigial        let hcTypePairs =                fold union empty $@@ -145,7 +154,6 @@             ]         bDeps <- use (A.debInfo . D.control . S.buildDepends)-       prof <- not <$> use (A.debInfo . D.noProfilingLibrary)        official <- use (A.debInfo . D.official)        compat <- use (A.debInfo . D.compat)        let ghcdev = compilerPackageName hflavor B.Development@@ -166,13 +174,6 @@                        cDeps        filterMissing xs     where-      hcPackageTypes :: CompilerFlavor -> Set B.PackageType-      hcPackageTypes GHC = fromList [B.Development, B.Profiling]-#if MIN_VERSION_Cabal(1,22,0)-      hcPackageTypes GHCJS = fromList [B.Development]-#endif-      hcPackageTypes hc = error $ "Unsupported compiler flavor: " ++ show hc-       -- No point in installing profiling packages for the       -- dependencies of binaries and test suites.  (I take it back,       -- some executable builds fail if the profiling library isn't
src/Debian/Debianize/Details.hs view
@@ -41,10 +41,13 @@        mapM_ (\name -> (A.debInfo . D.execMap) %= Map.insert name [[Rel (BinPkgName name) Nothing Nothing]])             ["ghc", "happy", "alex", "hsx2hs"]        -- The parsec debs are suffixed with either "2" or "3"+#if !MIN_VERSION_base(4,11,1)+-- The deb of ghc-8.4.3 changes the libghc-parsec3-dev name to libghc-parsec-deb #if MIN_VERSION_Cabal(2,0,0)        mapCabal (mkPackageName "parsec") (DebBase "parsec3") #else        mapCabal (PackageName "parsec") (DebBase "parsec3")+#endif #endif        -- Similar split for quickcheck #if MIN_VERSION_Cabal(2,0,0)
src/Debian/Debianize/ExecAtoms.hs view
@@ -1,7 +1,7 @@ -- | Things that seem like they could be clients of this library, but -- are instead included as part of the library. {-# LANGUAGE CPP, FlexibleContexts, OverloadedStrings #-}-{-# OPTIONS_GHC -Wall -fno-warn-unused-do-bind -ddump-minimal-imports #-}+{-# OPTIONS_GHC -Wall -fno-warn-unused-do-bind #-} module Debian.Debianize.ExecAtoms     ( execAtoms     ) where
src/Debian/Debianize/Goodies.hs view
@@ -4,8 +4,8 @@ {-# OPTIONS_GHC -fno-warn-unused-do-bind #-} module Debian.Debianize.Goodies     ( tightDependencyFixup-    , expandWebsite, doServer-    , expandServer, doWebsite+    , expandWebsite, doWebsite+    , expandServer, doServer     , expandBackups, doBackups     , doExecutable     , oldClckwrksSiteFlags
src/Debian/Debianize/InputCabal.hs view
@@ -28,7 +28,7 @@ import Distribution.Package (Package(packageId)) import Distribution.PackageDescription as Cabal (PackageDescription) import Distribution.PackageDescription.Configuration (finalizePackageDescription)-import Distribution.PackageDescription.Parse (readPackageDescription)+import Distribution.PackageDescription.Parse (readGenericPackageDescription) import Distribution.Simple.Utils (defaultPackageDesc, die, setupMessage) import Distribution.System as Cabal (buildArch, Platform(..)) import qualified Distribution.System as Cabal (buildOS)@@ -57,7 +57,7 @@         -- Load a GenericPackageDescription from the current directory         -- and from that create a finalized PackageDescription for the         -- given CompilerId.-        genPkgDesc <- liftIO $ defaultPackageDesc vb >>= readPackageDescription vb+        genPkgDesc <- liftIO $ defaultPackageDesc vb >>= readGenericPackageDescription vb         let finalized = finalizePackageDescription (toList fs) (const True) (Platform buildArch Cabal.buildOS) cinfo [] genPkgDesc         ePkgDesc <- either (return . Left)                            (\ (pkgDesc, _) -> do liftIO $ bracket (setFileCreationMask 0o022) setFileCreationMask $ \ _ -> autoreconf vb pkgDesc
src/Debian/Debianize/Optparse.hs view
@@ -499,7 +499,10 @@ profilingP = O.flag ProfilingEnabled ProfilingDisabled m where   m = O.help helpMsg       <> O.long "disable-profiling"-  helpMsg = "Do not generate profiling (-prof) library package."+  helpMsg = unlines [+    "Do not generate profiling (-prof) library package, do not",+    "add -prof packages to the build dependency list."+     ]  haddockP :: O.Parser [HaddockStatus] haddockP = (: []) <$> (O.flag HaddockEnabled HaddockDisabled m) where