@@ -17,6 +17,7 @@ import Distribution.PackageDescription ( GenericPackageDescription() )
1717import Distribution.Text
1818import System.Console.GetOpt ( OptDescr(..), ArgDescr(..), ArgOrder(..), usageInfo, getOpt )
1919import Cabal2Nix.Package
20+import Cabal2Nix.Normalize
2021import Distribution.NixOS.Derivation.Cabal
2122import Distribution.NixOS.Derivation.Meta
2223
@@ -116,22 +117,19 @@ updateNixPkgs paths = do
116117 let Pkg deriv path regenerate = nix
117118 maints = maintainers (metaSection deriv)
118119 plats = platforms (metaSection deriv)
119− when (null maints) (msgInfo ("no maintainers configured for " ++ path))
120120 modify $ \cfg -> cfg { _pkgset = Set.insert nix (_pkgset cfg) }
121121 when regenerate $ do
122122 msgDebug ("re-generate " ++ path)
123− let maints' = nub (sort (maints ++ ["self.stdenv.lib.maintainers.andres","self.stdenv.lib.maintainers.simons"]))
124− plats'
125− | null plats && not (null maints) = ["self.ghc.meta.platforms"]
126− | otherwise = plats
127123 pkg <- readCabalFile (pname deriv) (display (version deriv))
128124 let deriv' = (cabal2nix pkg) { sha256 = sha256 deriv, runHaddock = runHaddock deriv }
129− deriv'' = deriv' { metaSection = (metaSection deriv')
130− { maintainers = maints'
125+ meta = metaSection deriv'
126+ plats' = if null plats then platforms meta else plats
127+ deriv'' = deriv' { metaSection = meta
128+ { maintainers = maints ++ ["simons","andres"]
131129 , platforms = plats'
132130 }
133131 }
134− io $ writeFile path (show (disp deriv''))
132+ io $ writeFile path (show (disp (normalize (deriv''))))
135133 pkgset <- gets (selectLatestVersions . _pkgset)
136134 updates' <- flip mapM (Set.elems pkgset) $ \pkg -> do
137135 let Pkg deriv _ _ = pkg