Merge branch 'rm-otherlinux'

haskell · Nov 20, 2024 · 0e0451f · 0e0451f
2 parents 6afbc4f + 119c300
commit 0e0451f
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 19,320 deletions.
diff --git a/lib/GHCup/Platform.hs b/lib/GHCup/Platform.hs
@@ -158,7 +158,7 @@ getLinuxDistro = do
         | hasWord ["rocky", "Rocky Linux"] -> Rocky
         -- https://github.com/void-linux/void-packages/blob/master/srcpkgs/base-files/files/os-release
         | hasWord ["void", "Void Linux"] -> Void
-        | otherwise -> OtherLinux (T.unpack $ fromMaybe name mid)
+        | otherwise -> UnknownLinux
   pure (distro, parsedVer)
  where
   regex x = makeRegexOpts compIgnoreCase execBlank ([s|\<|] ++ x ++ [s|\>|])

diff --git a/lib/GHCup/Types.hs b/lib/GHCup/Types.hs
@@ -258,8 +258,6 @@ data LinuxDistro = Debian
                  | OpenSUSE
                  -- not known
                  | UnknownLinux
-                 -- ^ must exit
-                 | OtherLinux String
   deriving (Eq, GHC.Generic, Ord, Show)
 
 instance Enum LinuxDistro where
@@ -293,7 +291,6 @@ instance Enum LinuxDistro where
   fromEnum Exherbo = 11
   fromEnum OpenSUSE = 12
   fromEnum UnknownLinux = 13
-  fromEnum (OtherLinux _) = error "fromEnum: OtherLinux"
 
 instance Bounded LinuxDistro where
   minBound = Debian
@@ -319,7 +316,6 @@ distroToString Gentoo = "gentoo"
 distroToString Exherbo = "exherbo"
 distroToString OpenSUSE = "opensuse"
 distroToString UnknownLinux = "unknown"
-distroToString (OtherLinux str) = str
 
 instance Pretty LinuxDistro where
   pPrint = text . distroToString

diff --git a/lib/GHCup/Types/JSON.hs b/lib/GHCup/Types/JSON.hs
@@ -50,8 +50,7 @@ import qualified Text.Megaparsec               as MP
 import qualified Text.Megaparsec.Char          as MPC
 
 instance ToJSON LinuxDistro where
-  toJSON (OtherLinux x) = String (T.pack x)
-  toJSON x = String . T.pack . show $ x
+  toJSON = String . T.pack . show
 
 instance FromJSON LinuxDistro where
   parseJSON = withText "LinuxDistro" $ \t -> case T.unpack (T.toLower t) of
@@ -69,7 +68,7 @@ instance FromJSON LinuxDistro where
     "exherbo"  -> pure Exherbo
     "opensuse" -> pure OpenSUSE
     "unknownlinux" -> pure UnknownLinux
-    _          -> pure (OtherLinux $ T.unpack t)
+    _ -> fail "Unknown Linux distro"
 
 deriveJSON defaultOptions { fieldLabelModifier = removeLensFieldLabel } ''MetaMode
 deriveJSON defaultOptions { fieldLabelModifier = removeLensFieldLabel } ''Architecture
@@ -142,7 +141,6 @@ instance ToJSONKey Platform where
   toJSONKey = toJSONKeyText $ \case
     Darwin  -> T.pack "Darwin"
     FreeBSD -> T.pack "FreeBSD"
-    Linux (OtherLinux s) -> T.pack ("Linux_" <> s)
     Linux d -> T.pack ("Linux_" <> show d)
     Windows -> T.pack "Windows"
 

diff --git a/test/ghcup-test/GHCup/ArbitraryTypes.hs b/test/ghcup-test/GHCup/ArbitraryTypes.hs
@@ -136,9 +136,8 @@ instance Arbitrary DownloadInfo where
   shrink    = genericShrink
 
 instance Arbitrary LinuxDistro where
-  arbitrary = do
-    let other = OtherLinux <$> listOf (elements ['a' .. 'z'])
-    oneof (other:(pure <$> allDistros))
+  arbitrary =
+    oneof (pure <$> allDistros)
 
 instance Arbitrary Platform where
   arbitrary = genericArbitrary

diff --git a/test/ghcup-test/GHCup/Types/JSONSpec.hs b/test/ghcup-test/GHCup/Types/JSONSpec.hs
@@ -7,6 +7,7 @@ import           GHCup.Types hiding ( defaultSettings )
 import           GHCup.Types.JSON ()
 import           GHCup.Prelude
 
+import           Control.Monad (when)
 import           Test.Aeson.GenericSpecs
 import           Test.Hspec
 
@@ -15,9 +16,6 @@ import           Test.Hspec
 spec :: Spec
 spec = do
   roundtripSpecs (Proxy @LinuxDistro)
-  roundtripAndGoldenSpecsWithSettings (defaultSettings { goldenDirectoryOption = CustomDirectoryName goldenDir, sampleSize = 2 }) (Proxy @GHCupInfo)
- where
-  goldenDir
-    | isWindows = "test/ghcup-test/golden/windows"
-    | otherwise = "test/ghcup-test/golden/unix"
+  when (not isWindows) $
+    roundtripAndGoldenSpecsWithSettings (defaultSettings { goldenDirectoryOption = CustomDirectoryName "test/ghcup-test/golden/unix", sampleSize = 2 }) (Proxy @GHCupInfo)
 
diff --git a/test/ghcup-test/golden/unix/GHCupInfo.json b/test/ghcup-test/golden/unix/GHCupInfo.json
@@ -4335,63 +4335,6 @@
                                 "notes": "rfiwf"
                             }
                         },
-                        "Linux_dazt": {
-                            "( < 4.1.1 && >= 4.4.4 && > 2.3.3 && > 4.2.3 && == 3.4.4 && > 5.1.3 && < 2.4.1 )": {
-                                "distroPKGs": [
-                                    "eisz",
-                                    "abh",
-                                    "",
-                                    "quyvc"
-                                ],
-                                "notes": "lrghnn"
-                            },
-                            "( <= 2.3.4 && < 3.2.2 && == 5.4.2 ) || ( > 4.4.1 && < 1.2.2 && <= 1.1.1 && == 1.2.1 && <= 3.3.3 )": {
-                                "distroPKGs": [
-                                    "ztsizdt",
-                                    "vph",
-                                    "jlrzip",
-                                    "qnlpqz",
-                                    "fy"
-                                ],
-                                "notes": "dfscy"
-                            },
-                            "( <= 5.4.5 && > 5.1.3 && > 1.4.1 ) || ( == 3.3.2 && == 3.1.4 )": {
-                                "distroPKGs": [
-                                    "fzsz",
-                                    "ldrkfg",
-                                    "lae",
-                                    "weqtzc",
-                                    "uxs",
-                                    "jszlviv",
-                                    "pfw"
-                                ],
-                                "notes": ""
-                            },
-                            "( > 1.5.4 && > 4.6.4 && == 2.2.5 && > 2.1.5 )": {
-                                "distroPKGs": [
-                                    "zlthy",
-                                    "cdqww"
-                                ],
-                                "notes": ""
-                            },
-                            "( > 3.2.3 && > 1.2.1 && <= 5.5.1 )": {
-                                "distroPKGs": [
-                                    "",
-                                    "n",
-                                    "",
-                                    "qhyjus",
-                                    ""
-                                ],
-                                "notes": "zxe"
-                            },
-                            "unknown_versioning": {
-                                "distroPKGs": [
-                                    "fd",
-                                    "e"
-                                ],
-                                "notes": "veu"
-                            }
-                        },
                         "Windows": {
                             "( < 3.3.1 && < 5.1.3 && > 2.3.4 && > 3.3.2 ) || ( == 1.4.1 )": {
                                 "distroPKGs": [