git.iko.soy/typeable/cabal2nix
on master help sign in
Hackage4Nix.hs (discoverNixFiles): don't ignore paths that begin with a '.'
980335dPeter Simons
src/Hackage4Nix.hs+6−8
compare with master
unifiedsplit
@@ -65,14 +65,12 @@ readCabalFile name vers = do
65 return pkg
65 return pkg
66
66
67discoverNixFiles :: (FilePath -> Hackage4Nix ()) -> FilePath -> Hackage4Nix ()
67discoverNixFiles :: (FilePath -> Hackage4Nix ()) -> FilePath -> Hackage4Nix ()
68−discoverNixFiles yield dirOrFile
68+discoverNixFiles yield dirOrFile = do
69− | "." `isPrefixOf` takeFileName dirOrFile = return ()
70− | otherwise = do
71− isFile <- io (doesFileExist dirOrFile)
69+ isFile <- io (doesFileExist dirOrFile)
72− case (isFile, takeExtension dirOrFile) of
70+ case (isFile, takeExtension dirOrFile) of
73− (True,".nix") -> yield dirOrFile
71+ (True,".nix") -> yield dirOrFile
74− (True,_) -> return ()
72+ (True,_) -> return ()
75− (False,_) -> io (readDirectory dirOrFile) >>= mapM_ (discoverNixFiles yield . (dirOrFile </>))
73+ (False,_) -> io (readDirectory dirOrFile) >>= mapM_ (discoverNixFiles yield . (dirOrFile </>))
76
74
77regenerateDerivation :: Derivation -> String -> Bool
75regenerateDerivation :: Derivation -> String -> Bool
78regenerateDerivation deriv buf = not (pname deriv `elem` patchedPackages) &&
76regenerateDerivation deriv buf = not (pname deriv `elem` patchedPackages) &&