@@ -7,7 +7,7 @@ import Control.Monad
7import Control.Monad.IO.Class
7import Control.Monad.IO.Class
8import Control.Monad.Trans.Maybe
8import Control.Monad.Trans.Maybe
9import Data.List ( isSuffixOf, isPrefixOf )
9import Data.List ( isSuffixOf, isPrefixOf )
10−import Data.Maybe ( listToMaybe )
10+import Data.Maybe
11import Data.Version
11import Data.Version
12import Distribution.Nixpkgs.Fetch
12import Distribution.Nixpkgs.Fetch
13import qualified Distribution.Package as Cabal
13import qualified Distribution.Package as Cabal
@@ -50,7 +50,7 @@ fromDB optHackageDB pkg = do
50 Just r -> return r
50 Just r -> return r
51 Nothing -> hPutStrLn stderr "*** no such package in the cabal database (did you run cabal update?). " >> exitFailure
51 Nothing -> hPutStrLn stderr "*** no such package in the cabal database (did you run cabal update?). " >> exitFailure
53− Just pkgId = simpleParse pkg
53+ pkgId = fromMaybe (error ("invalid Haskell package id " ++ show pkg)) (simpleParse pkg)
54 Cabal.PackageName name = Cabal.pkgName pkgId
54 Cabal.PackageName name = Cabal.pkgName pkgId
55 version = Cabal.pkgVersion pkgId
55 version = Cabal.pkgVersion pkgId