Remove previous try

Author: wismill

Cabal-syntax/src/Distribution/Types/GenericPackageDescription.hs

@@ -93,18 +93,10 @@ traverseCondTreeBuildInfo
 traverseCondTreeBuildInfo g = node where
     mkCondNode :: comp -> [CondBranch v [Dependency] comp] -> CondTree v [Dependency] comp
     mkCondNode comp = CondNode comp (view L.targetBuildDepends comp)
-    -- mkCondNode
-    --   :: comp
-    --   -> [Dependency]
-    --   -> [CondBranch v [Dependency] comp]
-    --   -> CondTree v [Dependency] comp
-    -- mkCondNode comp deps = CondNode comp (view L.targetBuildDepends comp <> deps)
 
-    node (CondNode comp _deps branches) = mkCondNode
-      <$> L.buildInfo g comp
-      -- -- [HACK] we cannot operate on dependencies directly
-      -- <*> fmap (view L.targetBuildDepends) (g (set L.targetBuildDepends deps mempty))
-      <*> traverse branch branches
+    node (CondNode comp _ branches) = mkCondNode
+        <$> L.buildInfo g comp
+        <*> traverse branch branches
 
     branch (CondBranch v x y) = CondBranch v
         <$> node x

cabal-install/src/Distribution/Client/CmdRepl.hs

@@ -338,8 +338,6 @@ addDepsToProjectTarget deps pkgId ctx =
       | packageId pkg /= pkgId = SpecificSourcePackage pkg
       | SourcePackage{..} <- pkg =
         SpecificSourcePackage $ pkg { srcpkgDescription =
-          -- srcpkgDescription & (\f -> L.allCondTrees $ traverseCondTreeC f)
-          --                   %~ (deps ++)
           srcpkgDescription & L.traverseBuildInfos
                             %~ over L.targetBuildDepends (deps ++)
         }

cabal-testsuite/PackageTests/ReplBuildDepends/cabal.test.hs

@@ -5,18 +5,18 @@ main = do
   let imports = "import qualified Data.ByteString as BS"
   cabalTest' "normal" $ do
     cabal' "clean" []
-    res <- cabalWithStdin 
-        "repl" 
-        ["-v2", "--build-depends", "bytestring"] 
+    res <- cabalWithStdin
+        "repl"
+        ["-v2", "--build-depends", "bytestring"]
         imports
     assertOutputContains "Ok, one module loaded." res
     -- Ensure we can load ‘bytestring’
     assertOutputDoesNotContain "Could not load" res
   cabalTest' "allow-newer" $ do
     cabal' "clean" []
     res <- cabalWithStdin
-        "repl" 
-        ["-v2", "--build-depends", "bytestring", "--allow-newer"] 
+        "repl"
+        ["-v2", "--build-depends", "bytestring", "--allow-newer"]
         imports
     assertOutputContains "Ok, one module loaded." res
     -- Ensure we can load ‘bytestring’
@@ -25,8 +25,8 @@ main = do
   cabalTest' "allow-older" $ do
     cabal' "clean" []
     res <- cabalWithStdin
-        "repl" 
-        ["-v2", "--build-depends", "bytestring", "--allow-older"] 
+        "repl"
+        ["-v2", "--build-depends", "bytestring", "--allow-older"]
         imports
     assertOutputContains "Ok, one module loaded." res
     -- Ensure we can load ‘bytestring’