git.iko.soy/typeable/cabal2nix
on master help sign in
Distribution/NixOS/Derivation/Cabal.hs: sort expression arguments alphabetically without distinguishing case
064c627Peter Simons
src/Distribution/NixOS/Derivation/Cabal.hs+4−1
compare with master
unifiedsplit
@@ -12,6 +12,7 @@ import Distribution.Package
12import Distribution.Text
12import Distribution.Text
13import Data.Version
13import Data.Version
14import Data.List
14import Data.List
15+import Data.Char
15import Text.PrettyPrint
16import Text.PrettyPrint
16import Text.ParserCombinators.ReadP ( readP_to_S )
17import Text.ParserCombinators.ReadP ( readP_to_S )
17import Text.Regex.Posix
18import Text.Regex.Posix
@@ -56,7 +57,9 @@ renderDerivation deriv = funargs (map text ("cabal" : inputs)) $$ vcat
56 , text ""
57 , text ""
57 ]
58 ]
58 where
59 where
60+ inputs = nub $ sortBy (\x y -> compare (map toLower x) (map toLower y)) $
61+ filter (/="cabal") $ filter (/="Cabal") $
59− inputs = nub $ sort $ filter (/="cabal") $ buildDepends deriv ++ buildTools deriv ++ extraLibs deriv ++ pkgConfDeps deriv
62+ buildDepends deriv ++ buildTools deriv ++ extraLibs deriv ++ pkgConfDeps deriv
60
63
61parseDerivation :: String -> Maybe Derivation
64parseDerivation :: String -> Maybe Derivation
62parseDerivation buf
65parseDerivation buf