diff --git a/Cabal/doc/installing-packages.rst b/Cabal/doc/installing-packages.rst index b0eaf0c1e2ef6b660e5603e1004a3394b3e9112a..2b26ed852247e98c26e1bbf8227abbe8804a8c03 100644 --- a/Cabal/doc/installing-packages.rst +++ b/Cabal/doc/installing-packages.rst @@ -1320,7 +1320,8 @@ Miscellaneous options # Setup.hs script of package foo. $ cabal install --constraint="foo:setup.bar == 1.0" - # Example use of the 'exe' (executable build tool) + .. TODO: Uncomment this example once we decide on a syntax for 'exe'. + .. # Example use of the 'exe' (executable build tool) # qualifier. This constraint applies to package baz when it # is a dependency of the build tool bar being used to # build package foo. diff --git a/cabal-install/Distribution/Client/Targets.hs b/cabal-install/Distribution/Client/Targets.hs index 6f4db0ff15b25fe3a025ad0e1db76d752e98ea50..758e28a3e4c8ca16a85715e559b0da3c77e933ac 100644 --- a/cabal-install/Distribution/Client/Targets.hs +++ b/cabal-install/Distribution/Client/Targets.hs @@ -746,12 +746,15 @@ instance Text UserConstraint where do _ <- Parse.string ":setup." pn2 <- parse return (UserSetup pn, pn2) - +++ - do _ <- Parse.string ":" - pn2 <- parse - _ <- Parse.string ":exe." - pn3 <- parse - return (UserExe pn pn2, pn3) + + -- -- TODO: Re-enable parsing of UserExe once we decide on a syntax. + -- + -- +++ + -- do _ <- Parse.string ":" + -- pn2 <- parse + -- _ <- Parse.string ":exe." + -- pn3 <- parse + -- return (UserExe pn pn2, pn3) -- Package property let keyword str x = Parse.skipSpaces1 >> Parse.string str >> return x diff --git a/cabal-install/tests/UnitTests/Distribution/Client/ProjectConfig.hs b/cabal-install/tests/UnitTests/Distribution/Client/ProjectConfig.hs index fbd9a8f86d6581ba0fda59ca2ca054baf41687ca..a5e93a6c384846bf53043acde824a1d6179bac68 100644 --- a/cabal-install/tests/UnitTests/Distribution/Client/ProjectConfig.hs +++ b/cabal-install/tests/UnitTests/Distribution/Client/ProjectConfig.hs @@ -568,7 +568,9 @@ instance Arbitrary RemoteRepo where instance Arbitrary UserQualifier where arbitrary = oneof [ pure UserToplevel , UserSetup <$> arbitrary - , UserExe <$> arbitrary <*> arbitrary + + -- -- TODO: Re-enable UserExe tests once we decide on a syntax. + -- , UserExe <$> arbitrary <*> arbitrary ] instance Arbitrary UserConstraint where diff --git a/cabal-install/tests/UnitTests/Distribution/Client/Targets.hs b/cabal-install/tests/UnitTests/Distribution/Client/Targets.hs index 9ace5ec74dfdfd7ced48c3ec693633dfb03d677f..e823835e1fb7623629b8a550f5f226c9a384e588 100644 --- a/cabal-install/tests/UnitTests/Distribution/Client/Targets.hs +++ b/cabal-install/tests/UnitTests/Distribution/Client/Targets.hs @@ -12,7 +12,6 @@ import Distribution.ParseUtils (parseCommaList) import Distribution.Text (parse) import Distribution.Solver.Types.PackageConstraint (PackageProperty(..)) -import Distribution.Solver.Types.OptionalStanza (OptionalStanza(..)) import Test.Tasty import Test.Tasty.HUnit @@ -63,9 +62,11 @@ exampleConstraints = (fn "bar", False), (fn "baz", True)])) - , ("foo:happy:exe.template-haskell test", - UserConstraint (UserExe (pn "foo") (pn "happy")) (pn "template-haskell") - (PackagePropertyStanzas [TestStanzas])) + -- -- TODO: Re-enable UserExe tests once we decide on a syntax. + -- + -- , ("foo:happy:exe.template-haskell test", + -- UserConstraint (UserExe (pn "foo") (pn "happy")) (pn "template-haskell") + -- (PackagePropertyStanzas [TestStanzas])) ] where pn = mkPackageName