Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use zinza-0.2 #6455

Merged
merged 1 commit into from
Dec 22, 2019
Merged

Use zinza-0.2 #6455

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cabal-dev-scripts/cabal-dev-scripts.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
1 change: 0 additions & 1 deletion cabal-dev-scripts/src/GenSPDX.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 6 additions & 4 deletions cabal-dev-scripts/src/GenUtils.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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