git.iko.soy/typeable/cabal2nix
on master help sign in
Distribution/NixOS/Derivation/Cabal.hs: sort expression arguments alphabetically without distinguishing case
commit064c627d673d94341c3411df50f3fe25984a576b authorPeter Simons <simons@cryp.to> dateMon 15 Aug 2011, 00:30 (15 years ago) parenta57216e
1 file changed+4−1
src/Distribution/NixOS/Derivation/Cabal.hs+4−1
src/Distribution/NixOS/Derivation/Cabal.hs+4−1
@@ -12,6 +12,7 @@ import Distribution.Package
1212import Distribution.Text
1313import Data.Version
1414import Data.List
15+import Data.Char
1516import Text.PrettyPrint
1617import Text.ParserCombinators.ReadP ( readP_to_S )
1718import Text.Regex.Posix
@@ -56,7 +57,9 @@ renderDerivation deriv = funargs (map text ("cabal" : inputs)) $$ vcat
5657 , text ""
5758 ]
5859 where
59− inputs = nub $ sort $ filter (/="cabal") $ buildDepends deriv ++ buildTools deriv ++ extraLibs deriv ++ pkgConfDeps deriv
60+ inputs = nub $ sortBy (\x y -> compare (map toLower x) (map toLower y)) $
61+ filter (/="cabal") $ filter (/="Cabal") $
62+ buildDepends deriv ++ buildTools deriv ++ extraLibs deriv ++ pkgConfDeps deriv
6063
6164parseDerivation :: String -> Maybe Derivation
6265parseDerivation buf