From 3a7d9d5057b41db1f6e7f65c52095ab7d33aca35 Mon Sep 17 00:00:00 2001 From: Lucy Cifferello <12953208+elvece@users.noreply.github.com> Date: Tue, 19 Sep 2023 10:46:42 -0400 Subject: [PATCH] fix typo --- src/Lib/Types/Manifest.hs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Lib/Types/Manifest.hs b/src/Lib/Types/Manifest.hs index ecd3ff4..14eb194 100644 --- a/src/Lib/Types/Manifest.hs +++ b/src/Lib/Types/Manifest.hs @@ -66,7 +66,7 @@ instance FromJSON PackageManifest where let packageManifestAlerts = HM.fromList a packageManifestDependencies <- o .: "dependencies" packageManifestEosVersion <- o .: "eos-version" - packageHardwareDevice <- o .:? "hardware-requirements" >>= maybe (pure Nothing) (.:? "devices") >>= parsePackageDevice + packageHardwareDevice <- o .:? "hardware-requirements" >>= maybe (pure Nothing) (.:? "device") >>= parsePackageDevice packageHardwareRam <- o .:? "hardware-requirements" >>= maybe (pure Nothing) (.:? "ram") packageHardwareArch <- o .:? "hardware-requirements" >>= maybe (pure Nothing) (.:? "arch") pure PackageManifest{..} @@ -121,7 +121,7 @@ data ServiceAlert = INSTALL | UNINSTALL | RESTORE | START | STOP -- >>> eitherDecodeStrict testManifest :: Either String PackageManifest --- Right (PackageManifest {packageManifestId = embassy-pages, packageManifestTitle = "Embassy Pages", packageManifestVersion = 0.1.3, packageManifestDescriptionLong = "Embassy Pages is a simple web server that uses directories inside File Browser to serve Tor websites.", packageManifestDescriptionShort = "Create Tor websites, hosted on your Embassy.", packageManifestReleaseNotes = "Upgrade to EmbassyOS v0.3.0", packageManifestIcon = Just "icon.png", packageManifestAlerts = fromList [(STOP,Nothing),(RESTORE,Nothing),(INSTALL,Nothing),(START,Nothing),(UNINSTALL,Nothing)], packageManifestDependencies = fromList [(filebrowser,PackageDependency {packageDependencyOptional = Nothing, packageDependencyVersion = >=2.14.1.1 <3.0.0, packageDependencyDescription = Just "Used to upload files to serve."})], packageManifestEosVersion = 0.3.0, packageHardwareDevice = Just (PackageDevice (fromList [("processor",RegexPattern "^[A-Za-z0-9]+$"),("display",RegexPattern "^[A-Za-z0-9]+$")])), packageHardwareRam = Just 8000000000, packageHardwareArch = Just [aarch64,x86_64]}) +-- Right (PackageManifest {packageManifestId = embassy-pages, packageManifestTitle = "Embassy Pages", packageManifestVersion = 0.1.3, packageManifestDescriptionLong = "Embassy Pages is a simple web server that uses directories inside File Browser to serve Tor websites.", packageManifestDescriptionShort = "Create Tor websites, hosted on your Embassy.", packageManifestReleaseNotes = "Upgrade to EmbassyOS v0.3.0", packageManifestIcon = Just "icon.png", packageManifestAlerts = fromList [(STOP,Nothing),(RESTORE,Nothing),(INSTALL,Nothing),(START,Nothing),(UNINSTALL,Nothing)], packageManifestDependencies = fromList [(filebrowser,PackageDependency {packageDependencyOptional = Nothing, packageDependencyVersion = >=2.14.1.1 <3.0.0, packageDependencyDescription = Just "Used to upload files to serve."})], packageManifestEosVersion = 0.3.0, packageHardwareDevice = Just (PackageDevice {unPackageDevice = fromList [("processor",RegexPattern "^[A-Za-z0-9]+$"),("display",RegexPattern "CometLake")]}), packageHardwareRam = Just 8000000000, packageHardwareArch = Just [aarch64,x86_64]}) testManifest :: ByteString testManifest = [i|{ @@ -136,7 +136,7 @@ testManifest = "hardware-requirements": { "device": { "processor": "^[A-Za-z0-9]+$", - "display": "^[A-Za-z0-9]+$" + "display": "CometLake" }, "ram": 8000000000, "arch": ["aarch64", "x86_64"]