Skip to content

Commit b90f7f5

Browse files
committed
Conform BSD-2-Clause and BSD-3-Clause text to SPDX
`cabal init` text for BSD-2-Clause and BSD-3-Clause licence differed slightly from the one published at SPDX. [1] [2] This caused some problems to users when dealing with licence-recognition software. [3] [1] https://spdx.org/licenses/BSD-2-Clause.html [2] https://spdx.org/licenses/BSD-3-Clause.html [3] https://discourse.haskell.org/t/non-standard-license-generated-by-stack-new/9059
1 parent aaf16c4 commit b90f7f5

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

cabal-install/src/Distribution/Client/Init/Licenses.hs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ bsd2 :: String -> String -> License
3030
bsd2 authors year =
3131
unlines
3232
[ "Copyright (c) " ++ year ++ ", " ++ authors
33-
, "All rights reserved."
3433
, ""
3534
, "Redistribution and use in source and binary forms, with or without"
3635
, "modification, are permitted provided that the following conditions are"
@@ -48,7 +47,7 @@ bsd2 authors year =
4847
, "\"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT"
4948
, "LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR"
5049
, "A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT"
51-
, "OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,"
50+
, "HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,"
5251
, "SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT"
5352
, "LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,"
5453
, "DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY"
@@ -62,7 +61,6 @@ bsd3 authors year =
6261
unlines
6362
[ "Copyright (c) " ++ year ++ ", " ++ authors
6463
, ""
65-
, "All rights reserved."
6664
, ""
6765
, "Redistribution and use in source and binary forms, with or without"
6866
, "modification, are permitted provided that the following conditions are met:"
@@ -75,15 +73,15 @@ bsd3 authors year =
7573
, " disclaimer in the documentation and/or other materials provided"
7674
, " with the distribution."
7775
, ""
78-
, " * Neither the name of " ++ authors ++ " nor the names of other"
76+
, " * Neither the name of the copyright holder nor the names of its"
7977
, " contributors may be used to endorse or promote products derived"
8078
, " from this software without specific prior written permission."
8179
, ""
8280
, "THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS"
8381
, "\"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT"
8482
, "LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR"
8583
, "A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT"
86-
, "OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,"
84+
, "HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,"
8785
, "SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT"
8886
, "LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,"
8987
, "DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY"

0 commit comments

Comments
 (0)