diff --git a/cabal-install/Distribution/Client/Outdated.hs b/cabal-install/Distribution/Client/Outdated.hs index 091bc38066f..aa1320ee407 100644 --- a/cabal-install/Distribution/Client/Outdated.hs +++ b/cabal-install/Distribution/Client/Outdated.hs @@ -68,6 +68,8 @@ outdated verbosity0 outdatedFlags repoContext comp platform = do else if newFreezeFile then depsFromNewFreezeFile verbosity else depsFromPkgDesc verbosity comp platform + debug verbosity $ "Dependencies loaded: " + ++ (intercalate ", " $ map display deps) let outdatedDeps = listOutdated deps pkgIndex ignore minor when (not quiet) $ showResult verbosity outdatedDeps simpleOutput diff --git a/cabal-install/tests/IntegrationTests/outdated/outdated.sh b/cabal-install/tests/IntegrationTests/outdated/outdated.sh deleted file mode 100644 index 7d05bb9535b..00000000000 --- a/cabal-install/tests/IntegrationTests/outdated/outdated.sh +++ /dev/null @@ -1,27 +0,0 @@ -. ./common.sh - -OUTPUT=`cabal outdated` - -echo $OUTPUT | grep base || die "should have listed 'base' as outdated" -echo $OUTPUT | grep template-haskell \ - || die "should have listed 'template-haskell' as outdated" - -OUTPUT=`cabal outdated --ignore=base` -echo $OUTPUT | grep -v base || die "shouldn't have listed 'base' as outdated" -echo $OUTPUT | grep template-haskell \ - || die "should have listed 'template-haskell' as outdated" - -OUTPUT=`cabal outdated --ignore=base,template-haskell` -echo $OUTPUT | grep -v base || die "shouldn't have listed 'base' as outdated" -echo $OUTPUT | grep -v template-haskell \ - || die "shouldn't have listed 'template-haskell' as outdated" - -OUTPUT=`cabal outdated --minor=base` -echo $OUTPUT | grep -v base || die "shouldn't have listed 'base' as outdated" -echo $OUTPUT | grep template-haskell \ - || die "should have listed 'template-haskell' as outdated" - -OUTPUT=`cabal outdated --minor=base,template-haskell` -echo $OUTPUT | grep -v base || die "shouldn't have listed 'base' as outdated" -echo $OUTPUT | grep -v template-haskell \ - || die "shouldn't have listed 'template-haskell' as outdated" diff --git a/cabal-install/tests/IntegrationTests/outdated/outdated_freeze.sh b/cabal-install/tests/IntegrationTests/outdated/outdated_freeze.sh deleted file mode 100644 index 48ef9eb6019..00000000000 --- a/cabal-install/tests/IntegrationTests/outdated/outdated_freeze.sh +++ /dev/null @@ -1,18 +0,0 @@ -. ./common.sh - -OUTPUT=`cabal outdated --freeze-file` - -echo $OUTPUT | grep base || die "should have listed 'base' as outdated" -echo $OUTPUT | grep template-haskell \ - || die "should have listed 'base' as outdated" - -cabal outdated --freeze-file --ignore=base | grep -v base \ - || die "shouldn't have listed 'base' as outdated" -cabal outdated --freeze-file --minor=base | grep -v base \ - || die "shouldn't have listed 'base' as outdated" - -cabal outdated --freeze-file --ignore=template-haskell \ - | grep -v template-haskell \ - || die "shouldn't have listed template-haskell as outdated" -cabal outdated --freeze-file --minor=template-haskell | grep template-haskell \ - || die "should have listed template-haskell as outdated" diff --git a/cabal-install/tests/IntegrationTests/outdated/outdated_new_freeze.sh b/cabal-install/tests/IntegrationTests/outdated/outdated_new_freeze.sh deleted file mode 100644 index 00e4018d33f..00000000000 --- a/cabal-install/tests/IntegrationTests/outdated/outdated_new_freeze.sh +++ /dev/null @@ -1,19 +0,0 @@ -. ./common.sh - -OUTPUT=`cabal outdated --new-freeze-file` - -echo $OUTPUT | grep base || die "should have listed 'base' as outdated" -echo $OUTPUT | grep template-haskell \ - || die "should have listed 'base' as outdated" - -cabal outdated --new-freeze-file --ignore=base | grep -v base \ - || die "shouldn't have listed 'base' as outdated" -cabal outdated --new-freeze-file --minor=base | grep -v base \ - || die "shouldn't have listed 'base' as outdated" - -cabal outdated --new-freeze-file --ignore=template-haskell \ - | grep -v template-haskell \ - || die "shouldn't have listed template-haskell as outdated" -cabal outdated --new-freeze-file --minor=template-haskell \ - | grep template-haskell \ - || die "should have listed template-haskell as outdated" diff --git a/cabal-install/tests/IntegrationTests/outdated/cabal.project b/cabal-testsuite/PackageTests/Outdated/cabal.project similarity index 100% rename from cabal-install/tests/IntegrationTests/outdated/cabal.project rename to cabal-testsuite/PackageTests/Outdated/cabal.project diff --git a/cabal-install/tests/IntegrationTests/outdated/cabal.project.freeze b/cabal-testsuite/PackageTests/Outdated/cabal.project.freeze similarity index 100% rename from cabal-install/tests/IntegrationTests/outdated/cabal.project.freeze rename to cabal-testsuite/PackageTests/Outdated/cabal.project.freeze diff --git a/cabal-install/tests/IntegrationTests/outdated/my.cabal b/cabal-testsuite/PackageTests/Outdated/my.cabal similarity index 100% rename from cabal-install/tests/IntegrationTests/outdated/my.cabal rename to cabal-testsuite/PackageTests/Outdated/my.cabal diff --git a/cabal-testsuite/PackageTests/Outdated/outdated.test.hs b/cabal-testsuite/PackageTests/Outdated/outdated.test.hs new file mode 100644 index 00000000000..20ed2398980 --- /dev/null +++ b/cabal-testsuite/PackageTests/Outdated/outdated.test.hs @@ -0,0 +1,26 @@ +import Test.Cabal.Prelude +main = cabalTest $ withRepo "repo" $ do + cabal' "outdated" [] >>= + (\out -> do + assertOutputContains "base" out + assertOutputContains "template-haskell" out) + + cabal' "outdated" ["--ignore=base"] >>= + (\out -> do + assertOutputDoesNotContain "base" out + assertOutputContains "template-haskell" out) + + cabal' "outdated" ["--ignore=base,template-haskell"] >>= + (\out -> do + assertOutputDoesNotContain "base" out + assertOutputDoesNotContain "template-haskell" out) + + cabal' "outdated" ["--minor=base"] >>= + (\out -> do + assertOutputDoesNotContain "base" out + assertOutputContains "template-haskell" out) + + cabal' "outdated" ["--minor=base,template-haskell"] >>= + (\out -> do + assertOutputDoesNotContain "base" out + assertOutputDoesNotContain "template-haskell" out) diff --git a/cabal-testsuite/PackageTests/Outdated/outdated_freeze.test.hs b/cabal-testsuite/PackageTests/Outdated/outdated_freeze.test.hs new file mode 100644 index 00000000000..8a4bfafa30e --- /dev/null +++ b/cabal-testsuite/PackageTests/Outdated/outdated_freeze.test.hs @@ -0,0 +1,18 @@ +import Test.Cabal.Prelude +main = cabalTest $ withRepo "repo" + $ forM_ ["--new-freeze-file", "--freeze-file"] $ \arg -> do + + cabal' "outdated" [arg] >>= + (\out -> do + assertOutputContains "base" out + assertOutputContains "template-haskell" out) + + cabal' "outdated" [arg, "--ignore=base,template-haskell"] >>= + (\out -> do + assertOutputDoesNotContain "base" out + assertOutputDoesNotContain "template-haskell" out) + + cabal' "outdated" [arg, "--minor=base,template-haskell"] >>= + (\out -> do + assertOutputDoesNotContain "base" out + assertOutputContains "template-haskell" out) diff --git a/cabal-testsuite/PackageTests/Outdated/repo/base-3.0.3.1/base.cabal b/cabal-testsuite/PackageTests/Outdated/repo/base-3.0.3.1/base.cabal new file mode 100644 index 00000000000..3c7fb7a3000 --- /dev/null +++ b/cabal-testsuite/PackageTests/Outdated/repo/base-3.0.3.1/base.cabal @@ -0,0 +1,154 @@ +name: base +version: 3.0.3.1 +license: BSD3 +license-file: LICENSE +maintainer: libraries@haskell.org +synopsis: Basic libraries (backwards-compatibility version) +description: + This is a backwards-compatible version of the base package. + It depends on a later version of base, and was probably supplied + with your compiler when it was installed. + +cabal-version: >=1.2 +build-type: Simple + +Library { + build-depends: base >= 4.0 && < 4.2, + syb >= 0.1 && < 0.2 + extensions: PackageImports + + if impl(ghc < 6.9) { + buildable: False + } + + if impl(ghc) { + exposed-modules: + Data.Generics, + Data.Generics.Aliases, + Data.Generics.Basics, + Data.Generics.Instances, + Data.Generics.Schemes, + Data.Generics.Text, + Data.Generics.Twins, + Foreign.Concurrent, + GHC.Arr, + GHC.Base, + GHC.Conc, + GHC.ConsoleHandler, + GHC.Desugar, + GHC.Dotnet, + GHC.Enum, + GHC.Environment, + GHC.Err, + GHC.Exception, + GHC.Exts, + GHC.Float, + GHC.ForeignPtr, + GHC.Handle, + GHC.IO, + GHC.IOBase, + GHC.Int, + GHC.List, + GHC.Num, + GHC.PArr, + GHC.Pack, + GHC.Ptr, + GHC.Read, + GHC.Real, + GHC.ST, + GHC.STRef, + GHC.Show, + GHC.Stable, + GHC.Storable, + GHC.TopHandler, + GHC.Unicode, + GHC.Weak, + GHC.Word, + System.Timeout + } + exposed-modules: + Control.Applicative, + Control.Arrow, + Control.Category, + Control.Concurrent, + Control.Concurrent.Chan, + Control.Concurrent.MVar, + Control.Concurrent.QSem, + Control.Concurrent.QSemN, + Control.Concurrent.SampleVar, + Control.Exception, + Control.Monad, + Control.Monad.Fix, + Control.Monad.Instances, + Control.Monad.ST, + Control.Monad.ST.Lazy, + Control.Monad.ST.Strict, + Data.Bits, + Data.Bool, + Data.Char, + Data.Complex, + Data.Dynamic, + Data.Either, + Data.Eq, + Data.Fixed, + Data.Foldable + Data.Function, + Data.HashTable, + Data.IORef, + Data.Int, + Data.Ix, + Data.List, + Data.Maybe, + Data.Monoid, + Data.Ord, + Data.Ratio, + Data.STRef, + Data.STRef.Lazy, + Data.STRef.Strict, + Data.String, + Data.Traversable + Data.Tuple, + Data.Typeable, + Data.Unique, + Data.Version, + Data.Word, + Debug.Trace, + Foreign, + Foreign.C, + Foreign.C.Error, + Foreign.C.String, + Foreign.C.Types, + Foreign.ForeignPtr, + Foreign.Marshal, + Foreign.Marshal.Alloc, + Foreign.Marshal.Array, + Foreign.Marshal.Error, + Foreign.Marshal.Pool, + Foreign.Marshal.Utils, + Foreign.Ptr, + Foreign.StablePtr, + Foreign.Storable, + Numeric, + Prelude, + System.Console.GetOpt, + System.CPUTime, + System.Environment, + System.Exit, + System.IO, + System.IO.Error, + System.IO.Unsafe, + System.Info, + System.Mem, + System.Mem.StableName, + System.Mem.Weak, + System.Posix.Internals, + System.Posix.Types, + Text.ParserCombinators.ReadP, + Text.ParserCombinators.ReadPrec, + Text.Printf, + Text.Read, + Text.Read.Lex, + Text.Show, + Text.Show.Functions + Unsafe.Coerce +} diff --git a/cabal-testsuite/PackageTests/Outdated/repo/base-3.0.3.2/base.cabal b/cabal-testsuite/PackageTests/Outdated/repo/base-3.0.3.2/base.cabal new file mode 100644 index 00000000000..1edd58ea0ca --- /dev/null +++ b/cabal-testsuite/PackageTests/Outdated/repo/base-3.0.3.2/base.cabal @@ -0,0 +1,160 @@ +name: base +version: 3.0.3.2 +license: BSD3 +license-file: LICENSE +maintainer: libraries@haskell.org +bug-reports: http://hackage.haskell.org/trac/ghc/newticket?component=libraries/base +synopsis: Basic libraries (backwards-compatibility version) +description: + This is a backwards-compatible version of the base package. + It depends on a later version of base, and was probably supplied + with your compiler when it was installed. + +cabal-version: >=1.6 +build-type: Simple + +source-repository head + type: darcs + location: http://darcs.haskell.org/packages/base3-compat + +Library { + build-depends: base >= 4.0 && < 4.3, + syb >= 0.1 && < 0.2 + extensions: PackageImports,CPP + ghc-options: -fno-warn-deprecations + + if impl(ghc < 6.9) { + buildable: False + } + + if impl(ghc) { + exposed-modules: + Data.Generics, + Data.Generics.Aliases, + Data.Generics.Basics, + Data.Generics.Instances, + Data.Generics.Schemes, + Data.Generics.Text, + Data.Generics.Twins, + Foreign.Concurrent, + GHC.Arr, + GHC.Base, + GHC.Conc, + GHC.ConsoleHandler, + GHC.Desugar, + GHC.Dotnet, + GHC.Enum, + GHC.Environment, + GHC.Err, + GHC.Exception, + GHC.Exts, + GHC.Float, + GHC.ForeignPtr, + GHC.Handle, + GHC.IO, + GHC.IOBase, + GHC.Int, + GHC.List, + GHC.Num, + GHC.PArr, + GHC.Pack, + GHC.Ptr, + GHC.Read, + GHC.Real, + GHC.ST, + GHC.STRef, + GHC.Show, + GHC.Stable, + GHC.Storable, + GHC.TopHandler, + GHC.Unicode, + GHC.Weak, + GHC.Word, + System.Timeout + } + exposed-modules: + Control.Applicative, + Control.Arrow, + Control.Category, + Control.Concurrent, + Control.Concurrent.Chan, + Control.Concurrent.MVar, + Control.Concurrent.QSem, + Control.Concurrent.QSemN, + Control.Concurrent.SampleVar, + Control.Exception, + Control.Monad, + Control.Monad.Fix, + Control.Monad.Instances, + Control.Monad.ST, + Control.Monad.ST.Lazy, + Control.Monad.ST.Strict, + Data.Bits, + Data.Bool, + Data.Char, + Data.Complex, + Data.Dynamic, + Data.Either, + Data.Eq, + Data.Fixed, + Data.Foldable + Data.Function, + Data.HashTable, + Data.IORef, + Data.Int, + Data.Ix, + Data.List, + Data.Maybe, + Data.Monoid, + Data.Ord, + Data.Ratio, + Data.STRef, + Data.STRef.Lazy, + Data.STRef.Strict, + Data.String, + Data.Traversable + Data.Tuple, + Data.Typeable, + Data.Unique, + Data.Version, + Data.Word, + Debug.Trace, + Foreign, + Foreign.C, + Foreign.C.Error, + Foreign.C.String, + Foreign.C.Types, + Foreign.ForeignPtr, + Foreign.Marshal, + Foreign.Marshal.Alloc, + Foreign.Marshal.Array, + Foreign.Marshal.Error, + Foreign.Marshal.Pool, + Foreign.Marshal.Utils, + Foreign.Ptr, + Foreign.StablePtr, + Foreign.Storable, + Numeric, + Prelude, + System.Console.GetOpt, + System.CPUTime, + System.Environment, + System.Exit, + System.IO, + System.IO.Error, + System.IO.Unsafe, + System.Info, + System.Mem, + System.Mem.StableName, + System.Mem.Weak, + System.Posix.Internals, + System.Posix.Types, + Text.ParserCombinators.ReadP, + Text.ParserCombinators.ReadPrec, + Text.Printf, + Text.Read, + Text.Read.Lex, + Text.Show, + Text.Show.Functions + Unsafe.Coerce +} diff --git a/cabal-testsuite/PackageTests/Outdated/repo/base-4.0.0.0/base.cabal b/cabal-testsuite/PackageTests/Outdated/repo/base-4.0.0.0/base.cabal new file mode 100644 index 00000000000..1aa83333731 --- /dev/null +++ b/cabal-testsuite/PackageTests/Outdated/repo/base-4.0.0.0/base.cabal @@ -0,0 +1,174 @@ +name: base +version: 4.0.0.0 +license: BSD3 +license-file: LICENSE +maintainer: libraries@haskell.org +synopsis: Basic libraries +description: + This package contains the Prelude and its support libraries, + and a large collection of useful libraries ranging from data + structures to parsing combinators and debugging utilities. +cabal-version: >= 1.2.3 +build-type: Configure +extra-tmp-files: + config.log config.status autom4te.cache + include/HsBaseConfig.h +extra-source-files: + config.guess config.sub install-sh + aclocal.m4 configure.ac configure + include/CTypes.h + +Library { + if impl(ghc) { + build-depends: rts, ghc-prim, integer + exposed-modules: + Foreign.Concurrent, + GHC.Arr, + GHC.Base, + GHC.Classes, + GHC.Conc, + GHC.ConsoleHandler, + GHC.Desugar, + GHC.Enum, + GHC.Environment, + GHC.Err, + GHC.Exception, + GHC.Exts, + GHC.Float, + GHC.ForeignPtr, + GHC.Handle, + GHC.IO, + GHC.IOBase, + GHC.Int, + GHC.List, + GHC.Num, + GHC.PArr, + GHC.Pack, + GHC.Ptr, + GHC.Read, + GHC.Real, + GHC.ST, + GHC.STRef, + GHC.Show, + GHC.Stable, + GHC.Storable, + GHC.TopHandler, + GHC.Unicode, + GHC.Weak, + GHC.Word, + System.Timeout + extensions: MagicHash, ExistentialQuantification, Rank2Types, + ScopedTypeVariables, UnboxedTuples, + ForeignFunctionInterface, UnliftedFFITypes, + DeriveDataTypeable, GeneralizedNewtypeDeriving, + FlexibleInstances, PatternSignatures, StandaloneDeriving, + PatternGuards, EmptyDataDecls + } + exposed-modules: + Control.Applicative, + Control.Arrow, + Control.Category, + Control.Concurrent, + Control.Concurrent.Chan, + Control.Concurrent.MVar, + Control.Concurrent.QSem, + Control.Concurrent.QSemN, + Control.Concurrent.SampleVar, + Control.Exception, + Control.Exception.Base + Control.OldException, + Control.Monad, + Control.Monad.Fix, + Control.Monad.Instances, + Control.Monad.ST + Control.Monad.ST.Lazy + Control.Monad.ST.Strict + Data.Bits, + Data.Bool, + Data.Char, + Data.Complex, + Data.Dynamic, + Data.Either, + Data.Eq, + Data.Data, + Data.Fixed, + Data.Foldable + Data.Function, + Data.HashTable, + Data.IORef, + Data.Int, + Data.Ix, + Data.List, + Data.Maybe, + Data.Monoid, + Data.Ord, + Data.Ratio, + Data.STRef + Data.STRef.Lazy + Data.STRef.Strict + Data.String, + Data.Traversable + Data.Tuple, + Data.Typeable, + Data.Unique, + Data.Version, + Data.Word, + Debug.Trace, + Foreign, + Foreign.C, + Foreign.C.Error, + Foreign.C.String, + Foreign.C.Types, + Foreign.ForeignPtr, + Foreign.Marshal, + Foreign.Marshal.Alloc, + Foreign.Marshal.Array, + Foreign.Marshal.Error, + Foreign.Marshal.Pool, + Foreign.Marshal.Utils, + Foreign.Ptr, + Foreign.StablePtr, + Foreign.Storable, + Numeric, + Prelude, + System.Console.GetOpt + System.CPUTime, + System.Environment, + System.Exit, + System.IO, + System.IO.Error, + System.IO.Unsafe, + System.Info, + System.Mem, + System.Mem.StableName, + System.Mem.Weak, + System.Posix.Internals, + System.Posix.Types, + Text.ParserCombinators.ReadP, + Text.ParserCombinators.ReadPrec, + Text.Printf, + Text.Read, + Text.Read.Lex, + Text.Show, + Text.Show.Functions + Unsafe.Coerce + c-sources: + cbits/PrelIOUtils.c + cbits/WCsubst.c + cbits/Win32Utils.c + cbits/consUtils.c + cbits/dirUtils.c + cbits/inputReady.c + cbits/selectUtils.c + include-dirs: include + includes: HsBase.h + install-includes: HsBase.h HsBaseConfig.h WCsubst.h dirUtils.h consUtils.h Typeable.h + if os(windows) { + extra-libraries: wsock32, msvcrt, kernel32, user32, shell32 + } + extensions: CPP + -- We need to set the package name to base (without a version number) + -- as it's magic. + ghc-options: -package-name base + nhc98-options: -H4M -K3M +} diff --git a/cabal-testsuite/PackageTests/Outdated/repo/template-haskell-2.3.0.0/template-haskell.cabal b/cabal-testsuite/PackageTests/Outdated/repo/template-haskell-2.3.0.0/template-haskell.cabal new file mode 100644 index 00000000000..064cb9d51bd --- /dev/null +++ b/cabal-testsuite/PackageTests/Outdated/repo/template-haskell-2.3.0.0/template-haskell.cabal @@ -0,0 +1,22 @@ +name: template-haskell +version: 2.3.0.0 +x-revision: 1 +license: BSD3 +license-file: LICENSE +maintainer: libraries@haskell.org +description: + Facilities for manipulating Haskell source code using Template Haskell. +build-type: Simple +build-depends: base<4.3, pretty, packedstring, containers +exposed-modules: + Language.Haskell.TH.Syntax, + Language.Haskell.TH.PprLib, + Language.Haskell.TH.Ppr, + Language.Haskell.TH.Lib, + Language.Haskell.TH.Quote, + Language.Haskell.TH +extensions: MagicHash, PatternGuards, PolymorphicComponents, + DeriveDataTypeable, TypeSynonymInstances +-- We need to set the package name to template-haskell (without a +-- version number) as it's magic. +ghc-options: -package-name template-haskell diff --git a/cabal-testsuite/PackageTests/Outdated/repo/template-haskell-2.3.0.1/template-haskell.cabal b/cabal-testsuite/PackageTests/Outdated/repo/template-haskell-2.3.0.1/template-haskell.cabal new file mode 100644 index 00000000000..8fbe6b269ab --- /dev/null +++ b/cabal-testsuite/PackageTests/Outdated/repo/template-haskell-2.3.0.1/template-haskell.cabal @@ -0,0 +1,22 @@ +name: template-haskell +version: 2.3.0.1 +x-revision: 1 +license: BSD3 +license-file: LICENSE +maintainer: libraries@haskell.org +description: + Facilities for manipulating Haskell source code using Template Haskell. +build-type: Simple +build-depends: base <4.3, pretty, packedstring, containers +exposed-modules: + Language.Haskell.TH.Syntax, + Language.Haskell.TH.PprLib, + Language.Haskell.TH.Ppr, + Language.Haskell.TH.Lib, + Language.Haskell.TH.Quote, + Language.Haskell.TH +extensions: MagicHash, PatternGuards, PolymorphicComponents, + DeriveDataTypeable, TypeSynonymInstances +-- We need to set the package name to template-haskell (without a +-- version number) as it's magic. +ghc-options: -package-name template-haskell diff --git a/cabal-testsuite/PackageTests/Outdated/repo/template-haskell-2.4.0.0/template-haskell.cabal b/cabal-testsuite/PackageTests/Outdated/repo/template-haskell-2.4.0.0/template-haskell.cabal new file mode 100644 index 00000000000..4c5ee3cf3a3 --- /dev/null +++ b/cabal-testsuite/PackageTests/Outdated/repo/template-haskell-2.4.0.0/template-haskell.cabal @@ -0,0 +1,32 @@ +name: template-haskell +version: 2.4.0.0 +x-revision: 1 +license: BSD3 +license-file: LICENSE +maintainer: libraries@haskell.org +bug-reports: http://hackage.haskell.org/trac/ghc/newticket?component=Template%20Haskell +description: + Facilities for manipulating Haskell source code using Template Haskell. +build-type: Simple +Cabal-Version: >= 1.6 + +Library + build-depends: base >= 3 && < 4.3, + pretty, containers + exposed-modules: + Language.Haskell.TH.Syntax.Internals + Language.Haskell.TH.Syntax + Language.Haskell.TH.PprLib + Language.Haskell.TH.Ppr + Language.Haskell.TH.Lib + Language.Haskell.TH.Quote + Language.Haskell.TH + extensions: MagicHash, PatternGuards, PolymorphicComponents, + DeriveDataTypeable, TypeSynonymInstances + -- We need to set the package name to template-haskell (without a + -- version number) as it's magic. + ghc-options: -package-name template-haskell + +source-repository head + type: darcs + location: http://darcs.haskell.org/packages/template-haskell/ diff --git a/cabal-testsuite/Test/Cabal/Prelude.hs b/cabal-testsuite/Test/Cabal/Prelude.hs index 2bb5dfe042d..e623f4a5190 100644 --- a/cabal-testsuite/Test/Cabal/Prelude.hs +++ b/cabal-testsuite/Test/Cabal/Prelude.hs @@ -229,7 +229,7 @@ cabal' cmd args = do -- Sandboxes manage dist dir | testHaveSandbox env = [ ] - | cmd == "update" + | cmd == "update" || cmd == "outdated" = [ ] -- new-build commands are affected by testCabalProjectFile | "new-" `isPrefixOf` cmd