Skip to content

Commit e7ebafa

Browse files
FromCabal.Normalize: use toNixName in normalizeBuildInfo
1 parent 3cc36a5 commit e7ebafa

File tree

1 file changed

+3
-2
lines changed
  • cabal2nix/src/Distribution/Nixpkgs/Haskell/FromCabal

1 file changed

+3
-2
lines changed

cabal2nix/src/Distribution/Nixpkgs/Haskell/FromCabal/Normalize.hs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import Control.Lens
66
import qualified Data.Set as Set
77
import Data.String
88
import Distribution.Nixpkgs.Haskell
9+
import Distribution.Nixpkgs.Haskell.FromCabal.Name (toNixName)
910
import Distribution.Nixpkgs.Meta
1011
import Distribution.Package
1112
import Language.Nix hiding ( quote )
@@ -21,8 +22,8 @@ normalize drv = drv
2122

2223
normalizeBuildInfo :: PackageName -> BuildInfo -> BuildInfo
2324
normalizeBuildInfo pname bi = bi
24-
& haskell %~ Set.filter (\b -> view localName b /= fromString (unPackageName pname))
25-
& tool %~ Set.filter (\b -> view localName b /= fromString (unPackageName pname))
25+
& haskell %~ Set.filter (\b -> view localName b /= toNixName pname)
26+
& tool %~ Set.filter (\b -> view localName b /= toNixName pname)
2627

2728
normalizeMeta :: Meta -> Meta
2829
normalizeMeta meta = meta

0 commit comments

Comments
 (0)