git.iko.soy/typeable/cabal2nix
on master help sign in
Improve error reporting when cabal2nix is called with a syntactically bogus package id.

$ cabal2nix cabal://ses-html.cabal cabal2nix.hs: invalid Haskell package id "ses-html.cabal" This patch fixes https://github.com/NixOS/cabal2nix/issues/172.

commitcd396728630aa777f22c194f587c47942f2555dd authorPeter Simons <simons@cryp.to> dateThu 4 Jun 2015, 12:25 (11 years ago) parent1decba9
1 file changed+2−2
compare with master
unifiedsplit
src/Cabal2Nix/Package.hs+2−2
src/Cabal2Nix/Package.hs+2−2
@@ -7,7 +7,7 @@ import Control.Monad
77import Control.Monad.IO.Class
88import Control.Monad.Trans.Maybe
99import Data.List ( isSuffixOf, isPrefixOf )
10−import Data.Maybe ( listToMaybe )
10+import Data.Maybe
1111import Data.Version
1212import Distribution.Nixpkgs.Fetch
1313import qualified Distribution.Package as Cabal
@@ -50,7 +50,7 @@ fromDB optHackageDB pkg = do
5050 Just r -> return r
5151 Nothing -> hPutStrLn stderr "*** no such package in the cabal database (did you run cabal update?). " >> exitFailure
5252 where
53− Just pkgId = simpleParse pkg
53+ pkgId = fromMaybe (error ("invalid Haskell package id " ++ show pkg)) (simpleParse pkg)
5454 Cabal.PackageName name = Cabal.pkgName pkgId
5555 version = Cabal.pkgVersion pkgId
5656