git.iko.soy/typeable/cabal2nix
on master help sign in
hackage2nix.hs: filter acme-everything because it generates invalid code
38bb5dbPeter Simons
src/hackage2nix.hs+4−2
compare with master
unifiedsplit
@@ -100,8 +100,10 @@ data Configuration = Configuration
100main :: IO ()
100main :: IO ()
101main = do
101main = do
102 hackage <- readHashedHackage
102 hackage <- readHashedHackage
103− nixpkgs <- readNixpkgPackageMap -- TODO: nix barfs at the generated "type" attribute for some reason.
103+ nixpkgs <- readNixpkgPackageMap
104+ let fixup = Map.delete "acme-everything" -- TODO: https://github.com/NixOS/cabal2nix/issues/164
105+ . Map.delete "type" -- TODO: https://github.com/NixOS/cabal2nix/issues/163
104− runParIO (generatePackageSet defaultConfiguration (Map.delete "type" hackage) nixpkgs)
106+ runParIO $ generatePackageSet defaultConfiguration (fixup hackage) nixpkgs
105
107
106generatePackageSet :: Configuration -> Hackage -> Nixpkgs -> ParIO ()
108generatePackageSet :: Configuration -> Hackage -> Nixpkgs -> ParIO ()
107generatePackageSet config hackage nixpkgs = do
109generatePackageSet config hackage nixpkgs = do