Merge pull request #6455 from phadej/zinza-0.2

Use zinza-0.2

Author: phadej

cabal-dev-scripts/cabal-dev-scripts.cabal

@@ -37,7 +37,7 @@ executable gen-spdx
     , lens                  ^>=4.18.1
     , optparse-applicative  ^>=0.15.1.0
     , text
-    , zinza                 ^>=0.1
+    , zinza                 ^>=0.2
 
 executable gen-spdx-exc
   default-language: Haskell2010
@@ -54,4 +54,4 @@ executable gen-spdx-exc
     , lens                  ^>=4.18.1
     , optparse-applicative  ^>=0.15.1.0
     , text
-    , zinza                 ^>=0.1
+    , zinza                 ^>=0.2

cabal-dev-scripts/src/GenSPDX.hs

@@ -8,7 +8,6 @@ import Data.List        (sortOn)
 import Data.Semigroup   ((<>))
 import Data.Text        (Text)
 import Data.Traversable (for)
-import GHC.Generics     (Generic)
 
 import qualified Data.ByteString.Lazy as LBS
 import qualified Data.Set             as Set

cabal-dev-scripts/src/GenUtils.hs

@@ -145,8 +145,9 @@ data Input = Input
   deriving (Show, Generic)
 
 instance Z.Zinza Input where
-    toType  = Z.genericToTypeSFP
-    toValue = Z.genericToValueSFP
+    toType    = Z.genericToTypeSFP
+    toValue   = Z.genericToValueSFP
+    fromValue = Z.genericFromValueSFP
 
 data InputLicense = InputLicense
     { ilConstructor   :: Text
@@ -157,5 +158,6 @@ data InputLicense = InputLicense
   deriving (Show, Generic)
 
 instance Z.Zinza InputLicense where
-    toType  = Z.genericToTypeSFP
-    toValue = Z.genericToValueSFP
+    toType    = Z.genericToTypeSFP
+    toValue   = Z.genericToValueSFP
+    fromValue = Z.genericFromValueSFP