Revert "Update SPDX license Ids & exceptions to 3.20" (#9259)

haskell · Sep 19, 2023 · a1095e3 · a1095e3
1 parent 720b6b1
commit a1095e3
Show file tree

Hide file tree

Showing 14 changed files with 146 additions and 7,868 deletions.
diff --git a/Cabal-syntax/src/Distribution/SPDX/LicenseExceptionId.hs b/Cabal-syntax/src/Distribution/SPDX/LicenseExceptionId.hs
diff --git a/Cabal-syntax/src/Distribution/SPDX/LicenseId.hs b/Cabal-syntax/src/Distribution/SPDX/LicenseId.hs
diff --git a/Cabal-syntax/src/Distribution/SPDX/LicenseListVersion.hs b/Cabal-syntax/src/Distribution/SPDX/LicenseListVersion.hs
@@ -13,11 +13,10 @@ data LicenseListVersion
     | LicenseListVersion_3_9
     | LicenseListVersion_3_10
     | LicenseListVersion_3_16
-    | LicenseListVersion_3_20
   deriving (Eq, Ord, Show, Enum, Bounded)
 
 cabalSpecVersionToSPDXListVersion :: CabalSpecVersion -> LicenseListVersion
-cabalSpecVersionToSPDXListVersion CabalSpecV3_8 = LicenseListVersion_3_20
+cabalSpecVersionToSPDXListVersion CabalSpecV3_8 = LicenseListVersion_3_16
 cabalSpecVersionToSPDXListVersion CabalSpecV3_6 = LicenseListVersion_3_10
 cabalSpecVersionToSPDXListVersion CabalSpecV3_4 = LicenseListVersion_3_9
 cabalSpecVersionToSPDXListVersion CabalSpecV3_0 = LicenseListVersion_3_6

diff --git a/Makefile b/Makefile
@@ -32,12 +32,12 @@ SPDX_EXCEPTION_HS:=Cabal-syntax/src/Distribution/SPDX/LicenseExceptionId.hs
 
 spdx : $(SPDX_LICENSE_HS) $(SPDX_EXCEPTION_HS)
 
-SPDX_LICENSE_VERSIONS:=3.0 3.2 3.6 3.9 3.10 3.16 3.20
+SPDX_LICENSE_VERSIONS:=3.0 3.2 3.6 3.9 3.10 3.16
 
-$(SPDX_LICENSE_HS) : templates/SPDX.LicenseId.template.hs cabal-dev-scripts/src/GenUtils.hs cabal-dev-scripts/src/GenSPDX.hs license-list-data/licenses-3.20.json license-list-data/licenses-3.20.json
+$(SPDX_LICENSE_HS) : templates/SPDX.LicenseId.template.hs cabal-dev-scripts/src/GenUtils.hs cabal-dev-scripts/src/GenSPDX.hs license-list-data/licenses-3.0.json license-list-data/licenses-3.2.json
 	cabal v2-run --builddir=dist-newstyle-meta --project-file=cabal.project.meta gen-spdx -- templates/SPDX.LicenseId.template.hs $(SPDX_LICENSE_VERSIONS:%=license-list-data/licenses-%.json) $(SPDX_LICENSE_HS)
 
-$(SPDX_EXCEPTION_HS) : templates/SPDX.LicenseExceptionId.template.hs cabal-dev-scripts/src/GenUtils.hs cabal-dev-scripts/src/GenSPDXExc.hs license-list-data/exceptions-3.20.json license-list-data/exceptions-3.20.json
+$(SPDX_EXCEPTION_HS) : templates/SPDX.LicenseExceptionId.template.hs cabal-dev-scripts/src/GenUtils.hs cabal-dev-scripts/src/GenSPDXExc.hs license-list-data/exceptions-3.0.json license-list-data/exceptions-3.2.json
 	cabal v2-run --builddir=dist-newstyle-meta --project-file=cabal.project.meta gen-spdx-exc -- templates/SPDX.LicenseExceptionId.template.hs $(SPDX_LICENSE_VERSIONS:%=license-list-data/exceptions-%.json) $(SPDX_EXCEPTION_HS)
 
 # source generation: templates

diff --git a/cabal-dev-scripts/cabal-dev-scripts.cabal b/cabal-dev-scripts/cabal-dev-scripts.cabal
@@ -18,7 +18,7 @@ executable gen-spdx
   ghc-options:      -Wall
   build-depends:
     , aeson                 ^>=1.4.1.0 || ^>=1.5.2.0 || ^>=2.1.1.0
-    , base                  >=4.10     && <4.19
+    , base                  >=4.10     && <4.17
     , bytestring
     , containers
     , Diff                  ^>=0.4
@@ -35,7 +35,7 @@ executable gen-spdx-exc
   ghc-options:      -Wall
   build-depends:
     , aeson                 ^>=1.4.1.0 || ^>=1.5.2.0 || ^>=2.1.1.0
-    , base                  >=4.10     && <4.19
+    , base                  >=4.10     && <4.17
     , bytestring
     , containers
     , Diff                  ^>=0.4

diff --git a/cabal-dev-scripts/src/GenSPDX.hs b/cabal-dev-scripts/src/GenSPDX.hs
@@ -36,7 +36,6 @@ main = generate =<< O.execParser opts where
         <*> licenses "3.9"
         <*> licenses "3.10"
         <*> licenses "3.16"
-        <*> licenses "3.20"
 
     template = O.strArgument $ mconcat
         [ O.metavar "SPDX.LicenseId.template.hs"

diff --git a/cabal-dev-scripts/src/GenSPDXExc.hs b/cabal-dev-scripts/src/GenSPDXExc.hs
@@ -35,7 +35,6 @@ main = generate =<< O.execParser opts where
         <*> licenses "3.9"
         <*> licenses "3.10"
         <*> licenses "3.16"
-        <*> licenses "3.20"
 
     template = O.strArgument $ mconcat
         [ O.metavar "SPDX.LicenseExceptionId.template.hs"

diff --git a/cabal-dev-scripts/src/GenUtils.hs b/cabal-dev-scripts/src/GenUtils.hs
@@ -32,14 +32,12 @@ data SPDXLicenseListVersion
     | SPDXLicenseListVersion_3_9
     | SPDXLicenseListVersion_3_10
     | SPDXLicenseListVersion_3_16
-    | SPDXLicenseListVersion_3_20
   deriving (Eq, Ord, Show, Enum, Bounded)
 
 allVers :: Set.Set SPDXLicenseListVersion
 allVers =  Set.fromList [minBound .. maxBound]
 
 prettyVer :: SPDXLicenseListVersion -> Text
-prettyVer SPDXLicenseListVersion_3_20 = "SPDX License List 3.20"
 prettyVer SPDXLicenseListVersion_3_16 = "SPDX License List 3.16"
 prettyVer SPDXLicenseListVersion_3_10 = "SPDX License List 3.10"
 prettyVer SPDXLicenseListVersion_3_9  = "SPDX License List 3.9"
@@ -48,7 +46,6 @@ prettyVer SPDXLicenseListVersion_3_2  = "SPDX License List 3.2"
 prettyVer SPDXLicenseListVersion_3_0  = "SPDX License List 3.0"
 
 suffixVer :: SPDXLicenseListVersion -> String
-suffixVer SPDXLicenseListVersion_3_20 = "_3_20"
 suffixVer SPDXLicenseListVersion_3_16 = "_3_16"
 suffixVer SPDXLicenseListVersion_3_10 = "_3_10"
 suffixVer SPDXLicenseListVersion_3_9  = "_3_9"
@@ -60,21 +57,20 @@ suffixVer SPDXLicenseListVersion_3_0  = "_3_0"
 -- Per version
 -------------------------------------------------------------------------------
 
-data PerV a = PerV a a a a a a a
+data PerV a = PerV a a a a a a
   deriving (Show, Functor, Foldable, Traversable)
 
 class Functor f => Representable i f | f -> i where
     index    :: i -> f a -> a
     tabulate :: (i -> a) -> f a
 
 instance Representable SPDXLicenseListVersion PerV where
-    index SPDXLicenseListVersion_3_0  (PerV x _ _ _ _ _ _) = x
-    index SPDXLicenseListVersion_3_2  (PerV _ x _ _ _ _ _) = x
-    index SPDXLicenseListVersion_3_6  (PerV _ _ x _ _ _ _) = x
-    index SPDXLicenseListVersion_3_9  (PerV _ _ _ x _ _ _) = x
-    index SPDXLicenseListVersion_3_10 (PerV _ _ _ _ x _ _) = x
-    index SPDXLicenseListVersion_3_16 (PerV _ _ _ _ _ x _) = x
-    index SPDXLicenseListVersion_3_20 (PerV _ _ _ _ _ _ x) = x
+    index SPDXLicenseListVersion_3_0  (PerV x _ _ _ _ _) = x
+    index SPDXLicenseListVersion_3_2  (PerV _ x _ _ _ _) = x
+    index SPDXLicenseListVersion_3_6  (PerV _ _ x _ _ _) = x
+    index SPDXLicenseListVersion_3_9  (PerV _ _ _ x _ _) = x
+    index SPDXLicenseListVersion_3_10 (PerV _ _ _ _ x _) = x
+    index SPDXLicenseListVersion_3_16 (PerV _ _ _ _ _ x) = x
 
     tabulate f = PerV
         (f SPDXLicenseListVersion_3_0)
@@ -83,7 +79,6 @@ instance Representable SPDXLicenseListVersion PerV where
         (f SPDXLicenseListVersion_3_9)
         (f SPDXLicenseListVersion_3_10)
         (f SPDXLicenseListVersion_3_16)
-        (f SPDXLicenseListVersion_3_20)
 
 -------------------------------------------------------------------------------
 -- Sorting

diff --git a/changelog.d/pr-9028 b/changelog.d/pr-9028
diff --git a/fix-whitespace.yaml b/fix-whitespace.yaml
@@ -32,7 +32,6 @@ excluded-dirs:
   - .python-sphinx-virtualenv
   - .stack-work
   - .vscode
-  - license-list-data
 
 # Every matched filename is included unless it is matched by excluded-files.
 included-files: