hackage2nix: the 'broken-packages' section now contains versioned pac…

…kage names
NixOS · Apr 15, 2019 · e08962a · e08962a
1 parent c57cbfc
commit e08962a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/hackage2nix/Main.hs b/hackage2nix/Main.hs
@@ -135,7 +135,7 @@ main = do
       let isInDefaultPackageSet, isHydraEnabled, isBroken :: Bool
           isInDefaultPackageSet = (== Just v) (Map.lookup name generatedDefaultPackageSet)
           isHydraEnabled = isInDefaultPackageSet && not (isBroken || name `Set.member` dontDistributePackages config)
-          isBroken = name `Set.member` brokenPackages config
+          isBroken = any (withinRange v) [ vr | Dependency pn vr <- brokenPackages config, pn == name ]
 
           droppedPlatforms :: Set Platform
           droppedPlatforms = Map.findWithDefault mempty name (unsupportedPlatforms config)

diff --git a/src/Distribution/Nixpkgs/Haskell/FromCabal/Configuration.hs b/src/Distribution/Nixpkgs/Haskell/FromCabal/Configuration.hs
@@ -9,8 +9,8 @@ module Distribution.Nixpkgs.Haskell.FromCabal.Configuration
   )
   where
 
-import Control.Exception ( throwIO )
 import Control.DeepSeq
+import Control.Exception ( throwIO )
 import Control.Lens
 import Control.Monad
 import Data.Aeson
@@ -57,7 +57,7 @@ data Configuration = Configuration
   -- |We know that these packages won't compile, so we mark them as broken and
   -- also disable their meta.hydraPlatforms attribute to avoid cluttering our
   -- Hydra job with lots of failure messages.
-  , brokenPackages :: Set PackageName
+  , brokenPackages :: [Constraint]
   }
   deriving (Show, Generic)
 
@@ -89,15 +89,13 @@ parseKey :: FromJSON k => Text -> k
 parseKey s = either error id (parseEither parseJSON (String s))
 
 readConfiguration :: FilePath -> IO Configuration
-readConfiguration path =
-  decodeFileEither path >>= either throwIO assertConsistency
+readConfiguration path = decodeFileEither path >>= either throwIO assertConsistency
 
 assertConsistency :: Monad m => Configuration -> m Configuration
 assertConsistency cfg@Configuration {..} = do
   let report msg = fail ("*** configuration error: " ++ msg)
-
       maintainedPackages = Set.unions (Map.elems packageMaintainers)
-      disabledPackages = dontDistributePackages `Set.union` brokenPackages
+      disabledPackages = dontDistributePackages `Set.union` Set.fromList (depPkgName <$> brokenPackages)
       disabledMaintainedPackages = maintainedPackages `Set.intersection` disabledPackages
   unless (Set.null disabledMaintainedPackages) $
     report ("disabled packages that have a maintainer: " ++ show disabledMaintainedPackages)

diff --git a/src/Distribution/Nixpkgs/Haskell/OrphanInstances.hs b/src/Distribution/Nixpkgs/Haskell/OrphanInstances.hs
@@ -49,6 +49,10 @@ instance FromJSON PackageIdentifier where
   parseJSON (String s) = return (fromString (T.unpack s))
   parseJSON s = fail ("parseJSON: " ++ show s ++ " is not a valid Haskell package identifier")
 
+instance FromJSON VersionRange where
+  parseJSON (String s) = return (fromString (T.unpack s))
+  parseJSON s = fail ("parseJSON: " ++ show s ++ " is not a valid Cabal VersionRange")
+
 instance FromJSON Dependency where
   parseJSON (String s) = return (fromString (T.unpack s))
   parseJSON s = fail ("parseJSON: " ++ show s ++ " is not a valid Haskell Dependency")