Skip to content

Commit 9013cfd

Browse files
authored
Merge pull request #1296 from hasufell/issue-1294
Make an exception for bzip2 licenses
2 parents 4796040 + 4f22c4d commit 9013cfd

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

src/Distribution/Server/Packages/Unpack.hs

+2
Original file line numberDiff line numberDiff line change
@@ -527,6 +527,8 @@ isAcceptableLicense = either goSpdx goLegacy . licenseRaw
527527
goSimple (SPDX.ELicenseRef _) = False -- don't allow referenced licenses
528528
goSimple (SPDX.ELicenseIdPlus _) = False -- don't allow + licenses (use GPL-3.0-or-later e.g.)
529529
goSimple (SPDX.ELicenseId SPDX.CC0_1_0) = True -- CC0 isn't OSI approved, but we allow it as "PublicDomain", this is eg. PublicDomain in http://hackage.haskell.org/package/string-qq-0.0.2/src/LICENSE
530+
goSimple (SPDX.ELicenseId SPDX.Bzip2_1_0_5) = True -- not OSI approved, but make an exception: https://github.com/haskell/hackage-server/issues/1294
531+
goSimple (SPDX.ELicenseId SPDX.Bzip2_1_0_6) = True -- same as above
530532
goSimple (SPDX.ELicenseId lid) = SPDX.licenseIsOsiApproved lid || SPDX.LId.licenseIsFsfLibre lid -- allow only OSI or FSF approved licenses.
531533

532534
-- pre `cabal-version: 2.2`

0 commit comments

Comments
 (0)