Synced cabal-install-solver's list & Simplify testcase

Author: Abastro

cabal-install-solver/src/Distribution/Solver/Modular/Solver.hs

@@ -162,7 +162,11 @@ solve sc cinfo idx pkgConfigDB userPrefs userConstraints userGoals =
     nonInstallable =
         L.map mkPackageName
              [ "base"
+             , "ghc-bignum"
              , "ghc-prim"
+             , "ghc-boot"
+             , "ghc"
+             , "ghci"
              , "integer-gmp"
              , "integer-simple"
              , "template-haskell"

cabal-install/tests/UnitTests/Distribution/Solver/Modular/Solver.hs

@@ -1130,13 +1130,10 @@ dbBase = [
     ]
 
 dbNonupgrade :: ExampleDb
-dbNonupgrade =
-  let base = exInst "base" 1 "base-1" []
-  in [
-    Left base
-  , Left $ exInst "ghc" 1 "ghc-1" [base]
-  , Left $ exInst "ghci" 1 "ghci-1" [base]
-  , Left $ exInst "ghc-boot" 1 "ghc-boot-1" [base]
+dbNonupgrade = [
+    Left $ exInst "ghc" 1 "ghc-1" []
+  , Left $ exInst "ghci" 1 "ghci-1" []
+  , Left $ exInst "ghc-boot" 1 "ghc-boot-1" []
   , Right $ exAv "ghc" 2 [ExFix "base" 1]
   , Right $ exAv "ghci" 2 [ExFix "base" 1]
   , Right $ exAv "ghc-boot" 2 [ExFix "base" 1]