From 869ecdce5b4f663085835a5127b56e725174e3bb Mon Sep 17 00:00:00 2001
From: ffaf1 <fa-ml@ariis.it>
Date: Fri, 17 Feb 2023 13:11:05 +0100
Subject: [PATCH] (cabal init) Suggest BSD-3-Clause as default (#8764)
* (cabal init) make BSD-3-Clause default
* Add changelog for #8757
* Modify test to incorporate new BDS-3 default
---------
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
---
.../src/Distribution/Client/Init/Interactive/Command.hs | 2 +-
cabal-testsuite/PackageTests/Init/init-interactive.test.hs | 2 +-
changelog.d/issue-8757 | 4 ++++
3 files changed, 6 insertions(+), 2 deletions(-)
create mode 100644 changelog.d/issue-8757
diff --git a/cabal-install/src/Distribution/Client/Init/Interactive/Command.hs b/cabal-install/src/Distribution/Client/Init/Interactive/Command.hs
index 8bef0f115d..d2073b399f 100644
--- a/cabal-install/src/Distribution/Client/Init/Interactive/Command.hs
+++ b/cabal-install/src/Distribution/Client/Init/Interactive/Command.hs
@@ -336,7 +336,7 @@ licensePrompt flags = getLicense flags $ do
let csv = fromFlagOrDefault defaultCabalVersion (cabalVersion flags)
l <- promptList "Please choose a license"
(licenses csv)
- MandatoryPrompt
+ (DefaultPrompt "BSD-3-Clause")
Nothing
True
diff --git a/cabal-testsuite/PackageTests/Init/init-interactive.test.hs b/cabal-testsuite/PackageTests/Init/init-interactive.test.hs
index 95ff4b3aae..86bda8b028 100644
--- a/cabal-testsuite/PackageTests/Init/init-interactive.test.hs
+++ b/cabal-testsuite/PackageTests/Init/init-interactive.test.hs
@@ -6,7 +6,7 @@ main = cabalTest $
buildOut <- withDirectory cwd $ do
cabalWithStdin "init" ["-i"]
- "2\n\n5\n\n\n2\n\n\n\n\n\n\n\n\n\n"
+ "2\n\n5\n\n\n\n\n\n\n\n\n\n\n\n\n"
setup "configure" []
setup' "build" ["app"]
diff --git a/changelog.d/issue-8757 b/changelog.d/issue-8757
new file mode 100644
index 0000000000..5b8512c576
--- /dev/null
+++ b/changelog.d/issue-8757
@@ -0,0 +1,4 @@
+synopsis: cabal init: suggest BSD-3 as default license
+packages: cabal-install
+prs: #8764
+issues: #8757
--
GitLab