From cd7b3d6c9a2e1b9164938d191825fa448f38f2b8 Mon Sep 17 00:00:00 2001 From: Andrea Bedini Date: Fri, 24 Nov 2023 19:37:52 +0800 Subject: [PATCH] Remove --cabal-file flag from v2 commands --- .../Distribution/Client/NixStyleOptions.hs | 7 ++-- .../Includes2/Includes2-fail/Includes2.cabal | 35 ++++++++++++++++ .../Backpack/Includes2/Includes2-fail/mylib | 1 + .../Backpack/Includes2/Includes2-fail/mysql | 1 + .../Includes2/Includes2-fail/postgresql | 1 + .../Backpack/Includes2/Includes2-fail/src | 1 + .../Includes2/Includes2/Includes2.cabal | 41 +++++++++++++++++++ .../Backpack/Includes2/Includes2/exe | 1 + .../Backpack/Includes2/Includes2/mylib | 1 + .../Backpack/Includes2/Includes2/mysql | 1 + .../Backpack/Includes2/Includes2/postgresql | 1 + .../Backpack/Includes2/Includes2/src | 1 + .../Backpack/Includes2/cabal.internal.project | 2 +- .../Includes2/setup-internal-fail.test.hs | 2 +- .../Backpack/Includes2/setup-internal.test.hs | 9 ++-- .../Includes2/setup-per-component.out | 12 +++--- .../Includes2/setup-per-component.test.hs | 25 +++++------ .../p.cabal} | 0 .../p.cabal} | 0 .../ReexportedModules/p-fail-other/Private.hs | 1 + .../ReexportedModules/p-fail-other/Public.hs | 1 + .../p.cabal} | 0 .../setup-fail-ambiguous.test.hs | 4 +- .../setup-fail-missing.test.hs | 4 +- .../setup-fail-other.test.hs | 4 +- .../ReexportedModules/setup.test.hs | 2 +- .../Regression/HadrianT634/setup.test.hs | 3 +- changelog.d/pr-9123 | 8 ++++ 28 files changed, 134 insertions(+), 35 deletions(-) create mode 100644 cabal-testsuite/PackageTests/Backpack/Includes2/Includes2-fail/Includes2.cabal create mode 120000 cabal-testsuite/PackageTests/Backpack/Includes2/Includes2-fail/mylib create mode 120000 cabal-testsuite/PackageTests/Backpack/Includes2/Includes2-fail/mysql create mode 120000 cabal-testsuite/PackageTests/Backpack/Includes2/Includes2-fail/postgresql create mode 120000 cabal-testsuite/PackageTests/Backpack/Includes2/Includes2-fail/src create mode 100644 cabal-testsuite/PackageTests/Backpack/Includes2/Includes2/Includes2.cabal create mode 120000 cabal-testsuite/PackageTests/Backpack/Includes2/Includes2/exe create mode 120000 cabal-testsuite/PackageTests/Backpack/Includes2/Includes2/mylib create mode 120000 cabal-testsuite/PackageTests/Backpack/Includes2/Includes2/mysql create mode 120000 cabal-testsuite/PackageTests/Backpack/Includes2/Includes2/postgresql create mode 120000 cabal-testsuite/PackageTests/Backpack/Includes2/Includes2/src rename cabal-testsuite/PackageTests/ReexportedModules/{p/p.cabal.fail-ambiguous => p-fail-ambiguous/p.cabal} (100%) rename cabal-testsuite/PackageTests/ReexportedModules/{p/p.cabal.fail-missing => p-fail-missing/p.cabal} (100%) create mode 120000 cabal-testsuite/PackageTests/ReexportedModules/p-fail-other/Private.hs create mode 120000 cabal-testsuite/PackageTests/ReexportedModules/p-fail-other/Public.hs rename cabal-testsuite/PackageTests/ReexportedModules/{p/p.cabal.fail-other => p-fail-other/p.cabal} (100%) create mode 100644 changelog.d/pr-9123 diff --git a/cabal-install/src/Distribution/Client/NixStyleOptions.hs b/cabal-install/src/Distribution/Client/NixStyleOptions.hs index 5237901bf80..7a047774b2b 100644 --- a/cabal-install/src/Distribution/Client/NixStyleOptions.hs +++ b/cabal-install/src/Distribution/Client/NixStyleOptions.hs @@ -55,11 +55,12 @@ nixStyleOptions commandOptions showOrParseArgs = configFlags set1 -- Note: [Hidden Flags] - -- hide "constraint", "dependency", "promised-dependency" and - -- "exact-configuration" from the configure options. + -- We reuse the configure options from v1 commands which on their turn + -- reuse the ones from Cabal) but we hide some of them in v2 commands. ( filter ( ( `notElem` - [ "constraint" + [ "cabal-file" + , "constraint" , "dependency" , "promised-dependency" , "exact-configuration" diff --git a/cabal-testsuite/PackageTests/Backpack/Includes2/Includes2-fail/Includes2.cabal b/cabal-testsuite/PackageTests/Backpack/Includes2/Includes2-fail/Includes2.cabal new file mode 100644 index 00000000000..102a48b97fe --- /dev/null +++ b/cabal-testsuite/PackageTests/Backpack/Includes2/Includes2-fail/Includes2.cabal @@ -0,0 +1,35 @@ +name: fail +version: 0.1.0.0 +license: BSD3 +author: Edward Z. Yang +maintainer: ezyang@cs.stanford.edu +build-type: Simple +cabal-version: 2.0 + +library mylib + build-depends: base + signatures: Database + exposed-modules: Mine + hs-source-dirs: mylib + default-language: Haskell2010 + +library mysql + build-depends: base + exposed-modules: Database.MySQL + hs-source-dirs: mysql + default-language: Haskell2010 + +library postgresql + build-depends: base + exposed-modules: Database.PostgreSQL + hs-source-dirs: postgresql + default-language: Haskell2010 + +library + build-depends: base, mysql, postgresql, mylib + mixins: + mysql (Database.MySQL as Database), + postgresql (Database.PostgreSQL as Database) + exposed-modules: App + hs-source-dirs: src + default-language: Haskell2010 diff --git a/cabal-testsuite/PackageTests/Backpack/Includes2/Includes2-fail/mylib b/cabal-testsuite/PackageTests/Backpack/Includes2/Includes2-fail/mylib new file mode 120000 index 00000000000..9b3246e6442 --- /dev/null +++ b/cabal-testsuite/PackageTests/Backpack/Includes2/Includes2-fail/mylib @@ -0,0 +1 @@ +../mylib \ No newline at end of file diff --git a/cabal-testsuite/PackageTests/Backpack/Includes2/Includes2-fail/mysql b/cabal-testsuite/PackageTests/Backpack/Includes2/Includes2-fail/mysql new file mode 120000 index 00000000000..057b59f7601 --- /dev/null +++ b/cabal-testsuite/PackageTests/Backpack/Includes2/Includes2-fail/mysql @@ -0,0 +1 @@ +../mysql \ No newline at end of file diff --git a/cabal-testsuite/PackageTests/Backpack/Includes2/Includes2-fail/postgresql b/cabal-testsuite/PackageTests/Backpack/Includes2/Includes2-fail/postgresql new file mode 120000 index 00000000000..d9c4a17c5cf --- /dev/null +++ b/cabal-testsuite/PackageTests/Backpack/Includes2/Includes2-fail/postgresql @@ -0,0 +1 @@ +../postgresql \ No newline at end of file diff --git a/cabal-testsuite/PackageTests/Backpack/Includes2/Includes2-fail/src b/cabal-testsuite/PackageTests/Backpack/Includes2/Includes2-fail/src new file mode 120000 index 00000000000..5cd551cf269 --- /dev/null +++ b/cabal-testsuite/PackageTests/Backpack/Includes2/Includes2-fail/src @@ -0,0 +1 @@ +../src \ No newline at end of file diff --git a/cabal-testsuite/PackageTests/Backpack/Includes2/Includes2/Includes2.cabal b/cabal-testsuite/PackageTests/Backpack/Includes2/Includes2/Includes2.cabal new file mode 100644 index 00000000000..7a02fcd961c --- /dev/null +++ b/cabal-testsuite/PackageTests/Backpack/Includes2/Includes2/Includes2.cabal @@ -0,0 +1,41 @@ +name: Includes2 +version: 0.1.0.0 +license: BSD3 +author: Edward Z. Yang +maintainer: ezyang@cs.stanford.edu +build-type: Simple +cabal-version: 2.0 + +library mylib + build-depends: base + signatures: Database + exposed-modules: Mine + hs-source-dirs: mylib + default-language: Haskell2010 + +library mysql + build-depends: base + exposed-modules: Database.MySQL + hs-source-dirs: mysql + default-language: Haskell2010 + +library postgresql + build-depends: base + exposed-modules: Database.PostgreSQL + hs-source-dirs: postgresql + default-language: Haskell2010 + +library + build-depends: base, mysql, postgresql, mylib + mixins: + mylib (Mine as Mine.MySQL) requires (Database as Database.MySQL), + mylib (Mine as Mine.PostgreSQL) requires (Database as Database.PostgreSQL) + exposed-modules: App + hs-source-dirs: src + default-language: Haskell2010 + +executable exe + build-depends: base, Includes2 + main-is: Main.hs + hs-source-dirs: exe + default-language: Haskell2010 diff --git a/cabal-testsuite/PackageTests/Backpack/Includes2/Includes2/exe b/cabal-testsuite/PackageTests/Backpack/Includes2/Includes2/exe new file mode 120000 index 00000000000..a94459effa2 --- /dev/null +++ b/cabal-testsuite/PackageTests/Backpack/Includes2/Includes2/exe @@ -0,0 +1 @@ +../exe \ No newline at end of file diff --git a/cabal-testsuite/PackageTests/Backpack/Includes2/Includes2/mylib b/cabal-testsuite/PackageTests/Backpack/Includes2/Includes2/mylib new file mode 120000 index 00000000000..9b3246e6442 --- /dev/null +++ b/cabal-testsuite/PackageTests/Backpack/Includes2/Includes2/mylib @@ -0,0 +1 @@ +../mylib \ No newline at end of file diff --git a/cabal-testsuite/PackageTests/Backpack/Includes2/Includes2/mysql b/cabal-testsuite/PackageTests/Backpack/Includes2/Includes2/mysql new file mode 120000 index 00000000000..057b59f7601 --- /dev/null +++ b/cabal-testsuite/PackageTests/Backpack/Includes2/Includes2/mysql @@ -0,0 +1 @@ +../mysql \ No newline at end of file diff --git a/cabal-testsuite/PackageTests/Backpack/Includes2/Includes2/postgresql b/cabal-testsuite/PackageTests/Backpack/Includes2/Includes2/postgresql new file mode 120000 index 00000000000..d9c4a17c5cf --- /dev/null +++ b/cabal-testsuite/PackageTests/Backpack/Includes2/Includes2/postgresql @@ -0,0 +1 @@ +../postgresql \ No newline at end of file diff --git a/cabal-testsuite/PackageTests/Backpack/Includes2/Includes2/src b/cabal-testsuite/PackageTests/Backpack/Includes2/Includes2/src new file mode 120000 index 00000000000..5cd551cf269 --- /dev/null +++ b/cabal-testsuite/PackageTests/Backpack/Includes2/Includes2/src @@ -0,0 +1 @@ +../src \ No newline at end of file diff --git a/cabal-testsuite/PackageTests/Backpack/Includes2/cabal.internal.project b/cabal-testsuite/PackageTests/Backpack/Includes2/cabal.internal.project index e6fdbadb439..acefc12cc2f 100644 --- a/cabal-testsuite/PackageTests/Backpack/Includes2/cabal.internal.project +++ b/cabal-testsuite/PackageTests/Backpack/Includes2/cabal.internal.project @@ -1 +1 @@ -packages: . +packages: ./Includes2 diff --git a/cabal-testsuite/PackageTests/Backpack/Includes2/setup-internal-fail.test.hs b/cabal-testsuite/PackageTests/Backpack/Includes2/setup-internal-fail.test.hs index d624dfcac06..7c8116ff62f 100644 --- a/cabal-testsuite/PackageTests/Backpack/Includes2/setup-internal-fail.test.hs +++ b/cabal-testsuite/PackageTests/Backpack/Includes2/setup-internal-fail.test.hs @@ -1,5 +1,5 @@ import Test.Cabal.Prelude main = setupAndCabalTest $ do skipUnlessGhcVersion ">= 8.1" - r <- fails $ setup' "configure" ["--cabal-file", "Includes2.cabal.fail"] + r <- fails $ withDirectory "Includes2-fail" $ setup' "configure" [] assertOutputContains "mysql" r diff --git a/cabal-testsuite/PackageTests/Backpack/Includes2/setup-internal.test.hs b/cabal-testsuite/PackageTests/Backpack/Includes2/setup-internal.test.hs index ab1853753e2..707dbbacced 100644 --- a/cabal-testsuite/PackageTests/Backpack/Includes2/setup-internal.test.hs +++ b/cabal-testsuite/PackageTests/Backpack/Includes2/setup-internal.test.hs @@ -1,7 +1,8 @@ import Test.Cabal.Prelude main = setupAndCabalTest $ do skipUnlessGhcVersion ">= 8.1" - withPackageDb $ do - setup_install ["--cabal-file", "Includes2.cabal"] - -- TODO: haddock for internal method doesn't work - runExe "exe" [] + withPackageDb $ + withDirectory "Includes2" $ do + setup_install [] + -- TODO: haddock for internal method doesn't work + runExe "exe" [] diff --git a/cabal-testsuite/PackageTests/Backpack/Includes2/setup-per-component.out b/cabal-testsuite/PackageTests/Backpack/Includes2/setup-per-component.out index 33ac75b0a99..01888faed97 100644 --- a/cabal-testsuite/PackageTests/Backpack/Includes2/setup-per-component.out +++ b/cabal-testsuite/PackageTests/Backpack/Includes2/setup-per-component.out @@ -8,7 +8,7 @@ for Includes2-0.1.0.0... Preprocessing library 'mylib' for Includes2-0.1.0.0... Running Haddock on library 'mylib' instantiated with Database = for Includes2-0.1.0.0... -Documentation created: setup-per-component.dist/work/dist/doc/html/Includes2/ +Documentation created: ../setup-per-component.dist/work/Includes2/dist/doc/html/Includes2/ # Setup copy Installing internal library mylib in # Setup register @@ -22,7 +22,7 @@ Building library 'mysql' for Includes2-0.1.0.0... # Setup haddock Preprocessing library 'mysql' for Includes2-0.1.0.0... Running Haddock on library 'mysql' for Includes2-0.1.0.0... -Documentation created: setup-per-component.dist/work/dist/doc/html/Includes2/ +Documentation created: ../setup-per-component.dist/work/Includes2/dist/doc/html/Includes2/ # Setup copy Installing internal library mysql in # Setup register @@ -35,7 +35,7 @@ Building library 'postgresql' for Includes2-0.1.0.0... # Setup haddock Preprocessing library 'postgresql' for Includes2-0.1.0.0... Running Haddock on library 'postgresql' for Includes2-0.1.0.0... -Documentation created: setup-per-component.dist/work/dist/doc/html/Includes2/ +Documentation created: ../setup-per-component.dist/work/Includes2/dist/doc/html/Includes2/ # Setup copy Installing internal library postgresql in # Setup register @@ -54,7 +54,7 @@ Preprocessing library 'mylib' for Includes2-0.1.0.0... Running Haddock on library 'mylib' instantiated with Database = mysql-0.1.0.0:Database.MySQL for Includes2-0.1.0.0... -Documentation created: setup-per-component.dist/work/dist/doc/html/Includes2/ +Documentation created: ../setup-per-component.dist/work/Includes2/dist/doc/html/Includes2/ # Setup copy Installing internal library mylib in # Setup register @@ -75,7 +75,7 @@ Preprocessing library 'mylib' for Includes2-0.1.0.0... Running Haddock on library 'mylib' instantiated with Database = postgresql-0.1.0.0:Database.PostgreSQL for Includes2-0.1.0.0... -Documentation created: setup-per-component.dist/work/dist/doc/html/Includes2/ +Documentation created: ../setup-per-component.dist/work/Includes2/dist/doc/html/Includes2/ # Setup copy Installing internal library mylib in # Setup register @@ -90,7 +90,7 @@ Building library for Includes2-0.1.0.0... # Setup haddock Preprocessing library for Includes2-0.1.0.0... Running Haddock on library for Includes2-0.1.0.0... -Documentation created: setup-per-component.dist/work/dist/doc/html/Includes2/ +Documentation created: ../setup-per-component.dist/work/Includes2/dist/doc/html/Includes2/ # Setup copy Installing library in # Setup register diff --git a/cabal-testsuite/PackageTests/Backpack/Includes2/setup-per-component.test.hs b/cabal-testsuite/PackageTests/Backpack/Includes2/setup-per-component.test.hs index 5196d404f65..e94d2018d7c 100644 --- a/cabal-testsuite/PackageTests/Backpack/Includes2/setup-per-component.test.hs +++ b/cabal-testsuite/PackageTests/Backpack/Includes2/setup-per-component.test.hs @@ -4,15 +4,16 @@ main = setupTest $ do skipUnlessGhcVersion ">= 8.1" ghc <- isGhcVersion "== 9.0.2 || == 9.2.* || == 9.4.* || == 9.6.*" expectBrokenIf ghc 7987 $ - withPackageDb $ do - let setup_install' args = setup_install_with_docs (["--cabal-file", "Includes2.cabal"] ++ args) - setup_install' ["mylib", "--cid", "mylib-0.1.0.0"] - setup_install' ["mysql", "--cid", "mysql-0.1.0.0"] - setup_install' ["postgresql", "--cid", "postgresql-0.1.0.0"] - setup_install' ["mylib", "--cid", "mylib-0.1.0.0", - "--instantiate-with", "Database=mysql-0.1.0.0:Database.MySQL"] - setup_install' ["mylib", "--cid", "mylib-0.1.0.0", - "--instantiate-with", "Database=postgresql-0.1.0.0:Database.PostgreSQL"] - setup_install' ["Includes2"] - setup_install' ["exe"] - runExe' "exe" [] >>= assertOutputContains "minemysql minepostgresql" + withPackageDb $ + withDirectory "Includes2" $ do + let setup_install' args = setup_install_with_docs args + setup_install' ["mylib", "--cid", "mylib-0.1.0.0"] + setup_install' ["mysql", "--cid", "mysql-0.1.0.0"] + setup_install' ["postgresql", "--cid", "postgresql-0.1.0.0"] + setup_install' ["mylib", "--cid", "mylib-0.1.0.0", + "--instantiate-with", "Database=mysql-0.1.0.0:Database.MySQL"] + setup_install' ["mylib", "--cid", "mylib-0.1.0.0", + "--instantiate-with", "Database=postgresql-0.1.0.0:Database.PostgreSQL"] + setup_install' ["Includes2"] + setup_install' ["exe"] + runExe' "exe" [] >>= assertOutputContains "minemysql minepostgresql" diff --git a/cabal-testsuite/PackageTests/ReexportedModules/p/p.cabal.fail-ambiguous b/cabal-testsuite/PackageTests/ReexportedModules/p-fail-ambiguous/p.cabal similarity index 100% rename from cabal-testsuite/PackageTests/ReexportedModules/p/p.cabal.fail-ambiguous rename to cabal-testsuite/PackageTests/ReexportedModules/p-fail-ambiguous/p.cabal diff --git a/cabal-testsuite/PackageTests/ReexportedModules/p/p.cabal.fail-missing b/cabal-testsuite/PackageTests/ReexportedModules/p-fail-missing/p.cabal similarity index 100% rename from cabal-testsuite/PackageTests/ReexportedModules/p/p.cabal.fail-missing rename to cabal-testsuite/PackageTests/ReexportedModules/p-fail-missing/p.cabal diff --git a/cabal-testsuite/PackageTests/ReexportedModules/p-fail-other/Private.hs b/cabal-testsuite/PackageTests/ReexportedModules/p-fail-other/Private.hs new file mode 120000 index 00000000000..58b599a697a --- /dev/null +++ b/cabal-testsuite/PackageTests/ReexportedModules/p-fail-other/Private.hs @@ -0,0 +1 @@ +../p/Private.hs \ No newline at end of file diff --git a/cabal-testsuite/PackageTests/ReexportedModules/p-fail-other/Public.hs b/cabal-testsuite/PackageTests/ReexportedModules/p-fail-other/Public.hs new file mode 120000 index 00000000000..23baea4b6ad --- /dev/null +++ b/cabal-testsuite/PackageTests/ReexportedModules/p-fail-other/Public.hs @@ -0,0 +1 @@ +../p/Public.hs \ No newline at end of file diff --git a/cabal-testsuite/PackageTests/ReexportedModules/p/p.cabal.fail-other b/cabal-testsuite/PackageTests/ReexportedModules/p-fail-other/p.cabal similarity index 100% rename from cabal-testsuite/PackageTests/ReexportedModules/p/p.cabal.fail-other rename to cabal-testsuite/PackageTests/ReexportedModules/p-fail-other/p.cabal diff --git a/cabal-testsuite/PackageTests/ReexportedModules/setup-fail-ambiguous.test.hs b/cabal-testsuite/PackageTests/ReexportedModules/setup-fail-ambiguous.test.hs index 232ca3b1395..c3e2d204564 100644 --- a/cabal-testsuite/PackageTests/ReexportedModules/setup-fail-ambiguous.test.hs +++ b/cabal-testsuite/PackageTests/ReexportedModules/setup-fail-ambiguous.test.hs @@ -4,6 +4,6 @@ main = setupAndCabalTest $ do withPackageDb $ do withDirectory "containers-dupe" $ setup_install [] - withDirectory "p" $ do - r <- fails $ setup' "configure" ["--cabal-file", "p.cabal.fail-ambiguous"] + withDirectory "p-fail-ambiguous" $ do + r <- fails $ setup' "configure" [] assertOutputContains "Data.Map" r diff --git a/cabal-testsuite/PackageTests/ReexportedModules/setup-fail-missing.test.hs b/cabal-testsuite/PackageTests/ReexportedModules/setup-fail-missing.test.hs index eb4d30f55e0..a7025e57ba7 100644 --- a/cabal-testsuite/PackageTests/ReexportedModules/setup-fail-missing.test.hs +++ b/cabal-testsuite/PackageTests/ReexportedModules/setup-fail-missing.test.hs @@ -1,6 +1,6 @@ import Test.Cabal.Prelude main = setupAndCabalTest $ do skipUnlessGhcVersion ">= 7.9" - withDirectory "p" $ do - r <- fails $ setup' "configure" ["--cabal-file", "p.cabal.fail-missing"] + withDirectory "p-fail-missing" $ do + r <- fails $ setup' "configure" [] assertOutputContains "Missing" r diff --git a/cabal-testsuite/PackageTests/ReexportedModules/setup-fail-other.test.hs b/cabal-testsuite/PackageTests/ReexportedModules/setup-fail-other.test.hs index 4c46fe76646..b3014d1589d 100644 --- a/cabal-testsuite/PackageTests/ReexportedModules/setup-fail-other.test.hs +++ b/cabal-testsuite/PackageTests/ReexportedModules/setup-fail-other.test.hs @@ -1,6 +1,6 @@ import Test.Cabal.Prelude main = setupAndCabalTest $ do skipUnlessGhcVersion ">= 7.9" - withDirectory "p" $ do - r <- fails $ setup' "configure" ["--cabal-file", "p.cabal.fail-other"] + withDirectory "p-fail-other" $ do + r <- fails $ setup' "configure" [] assertOutputContains "Private" r diff --git a/cabal-testsuite/PackageTests/ReexportedModules/setup.test.hs b/cabal-testsuite/PackageTests/ReexportedModules/setup.test.hs index c3ae77e43f6..4c769bbc010 100644 --- a/cabal-testsuite/PackageTests/ReexportedModules/setup.test.hs +++ b/cabal-testsuite/PackageTests/ReexportedModules/setup.test.hs @@ -3,5 +3,5 @@ import Test.Cabal.Prelude main = setupAndCabalTest $ do skipUnlessGhcVersion ">= 7.9" withPackageDb $ do - withDirectory "p" $ setup_install ["--cabal-file", "p.cabal"] + withDirectory "p" $ setup_install [] withDirectory "q" $ setup_build [] diff --git a/cabal-testsuite/PackageTests/Regression/HadrianT634/setup.test.hs b/cabal-testsuite/PackageTests/Regression/HadrianT634/setup.test.hs index 0cf02afb4c4..5f2c37f33bc 100644 --- a/cabal-testsuite/PackageTests/Regression/HadrianT634/setup.test.hs +++ b/cabal-testsuite/PackageTests/Regression/HadrianT634/setup.test.hs @@ -1,4 +1,5 @@ import Test.Cabal.Prelude import Test.Cabal.Script main = setupTest $ - void $ setup'' "pkg" "configure" ["--cabal-file", "pkg/a.cabal"] + withDirectory "pkg" $ + void $ setup' "configure" [] diff --git a/changelog.d/pr-9123 b/changelog.d/pr-9123 new file mode 100644 index 00000000000..17b3b2031c6 --- /dev/null +++ b/changelog.d/pr-9123 @@ -0,0 +1,8 @@ +synopsis: Remove --cabal-file flags from v2 commands +packages: cabal-install +prs: #9123 +issues: #8395 #7225 #6880 +description: { + The --cabal-file flag was never meant for public use but only for testing. To + avoid confusing the users any further we removed the flag from v2 commands. +}