diff --git a/cabal-dev-scripts/cabal-dev-scripts.cabal b/cabal-dev-scripts/cabal-dev-scripts.cabal index a197dc33a25..05757586ba4 100644 --- a/cabal-dev-scripts/cabal-dev-scripts.cabal +++ b/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 diff --git a/cabal-dev-scripts/src/GenSPDX.hs b/cabal-dev-scripts/src/GenSPDX.hs index 0bbce81c6ef..e413488600a 100644 --- a/cabal-dev-scripts/src/GenSPDX.hs +++ b/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 diff --git a/cabal-dev-scripts/src/GenUtils.hs b/cabal-dev-scripts/src/GenUtils.hs index 3809eef64b9..c94c0447913 100644 --- a/cabal-dev-scripts/src/GenUtils.hs +++ b/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