cabal-flatpak 0.1.0.2 → 0.1.0.3
raw patch · 2 files changed
+14/−13 lines, 2 filesdep ~aesondep ~bytestringdep ~optparse-applicative
Dependency ranges changed: aeson, bytestring, optparse-applicative, text
Files
- cabal-flatpak.cabal +9/−9
- src/Flatpak.hs +5/−4
cabal-flatpak.cabal view
@@ -1,11 +1,11 @@ Cabal-Version: 2.2 Name: cabal-flatpak-Version: 0.1.0.2+Version: 0.1.0.3 License: BSD-3-Clause License-File: LICENSE Author: Henning Thielemann <haskell@henning-thielemann.de> Maintainer: Henning Thielemann <haskell@henning-thielemann.de>-Homepage: http://hub.darcs.net/thielema/cabal-flatpak/+Homepage: https://hub.darcs.net/thielema/cabal-flatpak/ Category: Distribution Synopsis: Generate a FlatPak manifest from a Cabal package description Description:@@ -25,13 +25,13 @@ flatpak.cabal.json Source-Repository this- Tag: 0.1.0.2+ Tag: 0.1.0.3 Type: darcs- Location: http://hub.darcs.net/thielema/cabal-flatpak/+ Location: https://hub.darcs.net/thielema/cabal-flatpak/ Source-Repository head Type: darcs- Location: http://hub.darcs.net/thielema/cabal-flatpak/+ Location: https://hub.darcs.net/thielema/cabal-flatpak/ Executable cabal-flatpak Build-Depends:@@ -40,15 +40,15 @@ zlib >=0.5.3 && <0.7, tar >=0.5.0.3 && <0.6, http-client-tls >=0.3.5.3 && <0.4,- http-client >=0.5.12 && <0.7,+ http-client >=0.5.12 && <0.8, http-types >=0.10 && <0.13, aeson-pretty >=0.8.7 && <0.9,- aeson >=1.2 && <1.6,+ aeson >=2.0 && <2.1, shell-utility >=0.1 && <0.2,- optparse-applicative >=0.11 && <0.16,+ optparse-applicative >=0.11 && <0.17, pathtype >=0.8 && <0.9, text >=1.2 && <1.3,- bytestring >=0.9 && <0.11,+ bytestring >=0.9 && <0.12, containers >=0.5 && <0.7, utility-ht >=0.0.12 && <0.1, base >=4.5 && <5
src/Flatpak.hs view
@@ -9,6 +9,7 @@ import qualified Cabal.Plan as Plan +import qualified Data.Aeson.Key as Key import qualified Data.Aeson as Json import qualified Data.Text as Text import qualified Data.Monoid.HT as Mn@@ -26,10 +27,10 @@ infixr 8 .:, .:?, .:* (.:) :: FromJSON a => Json.Object -> String -> Parser a-o .: field = o Json..: Text.pack field+o .: field = o Json..: Key.fromString field (.:?) :: FromJSON a => Json.Object -> (String, a) -> Parser a-o .:? (field, deflt) = o Json..:? Text.pack field Json..!= deflt+o .:? (field, deflt) = o Json..:? Key.fromString field Json..!= deflt (.:*) :: FromJSON a => Json.Object -> String -> Parser [a] o .:* field = o .:? (field, [])@@ -38,7 +39,7 @@ infixr 8 .=, .=?, .=* (.=) :: ToJSON a => String -> (object -> a) -> object -> [Pair]-(field .= a) obj = [Text.pack field Json..= a obj]+(field .= a) obj = [Key.fromString field Json..= a obj] (.=?) :: (ToJSON a, Eq a) => String -> (object -> a, a) -> object -> [Pair] (field .=? (a, deflt)) obj = Mn.when (a obj /= deflt) ((field .= a) obj)@@ -72,7 +73,7 @@ pairsFromSourceType :: SourceType -> [Pair] pairsFromSourceType t = let simple str = [("type", Json.toJSON str)]- in map (mapFst Text.pack) $+ in map (mapFst Key.fromString) $ case t of Archive {stripComponents = strip} -> simple "archive" ++