git.iko.soy/typeable/cabal2nix
on master help sign in
re-factoring: switch [String] to Set String in Derivation type
2ebe4dcPeter Simons
src/Cabal2Nix/Generate.hs+8−7
compare with master
unifiedsplit
@@ -11,6 +11,7 @@ import qualified Distribution.Package as Cabal
11import qualified Distribution.PackageDescription as Cabal
11import qualified Distribution.PackageDescription as Cabal
12import Distribution.PackageDescription.Configuration
12import Distribution.PackageDescription.Configuration
13import Distribution.System
13import Distribution.System
14+import qualified Data.Set as Set
14
15
15cabal2nix :: Cabal.FlagAssignment -> Cabal.GenericPackageDescription -> Derivation
16cabal2nix :: Cabal.FlagAssignment -> Cabal.GenericPackageDescription -> Derivation
16cabal2nix flags' cabal = drv { cabalFlags = flags }
17cabal2nix flags' cabal = drv { cabalFlags = flags }
@@ -32,13 +33,13 @@ cabal2nix' tpkg = normalize $ postProcess $ normalize $ MkDerivation
32 , src = error "cabal2nix left the src field undefined"
33 , src = error "cabal2nix left the src field undefined"
33 , isLibrary = isJust (Cabal.library tpkg)
34 , isLibrary = isJust (Cabal.library tpkg)
34 , isExecutable = not (null (Cabal.executables tpkg))
35 , isExecutable = not (null (Cabal.executables tpkg))
35− , extraFunctionArgs = []
36+ , extraFunctionArgs = Set.empty
36− , buildDepends = map unDep deps
37+ , buildDepends = Set.fromList $ map unDep deps
37− , testDepends = map unDep tstDeps ++ concatMap Cabal.extraLibs tests
38+ , testDepends = Set.fromList $ map unDep tstDeps ++ concatMap Cabal.extraLibs tests
38− , buildTools = map unDep tools
39+ , buildTools = Set.fromList $ map unDep tools
39− , extraLibs = libs
40+ , extraLibs = Set.fromList libs
40− , pkgConfDeps = pcs
41+ , pkgConfDeps = Set.fromList pcs
41− , configureFlags = []
42+ , configureFlags = Set.empty
42 , cabalFlags = configureCabalFlags pkg
43 , cabalFlags = configureCabalFlags pkg
43 , runHaddock = True
44 , runHaddock = True
44 , jailbreak = False
45 , jailbreak = False
src/Cabal2Nix/Normalize.hs+16−11
@@ -1,10 +1,12 @@
1{-# LANGUAGE RecordWildCards #-}
1{-# LANGUAGE RecordWildCards #-}
2
2
3−module Cabal2Nix.Normalize ( normalize, normalizeList, normalizeCabalFlags ) where
3+module Cabal2Nix.Normalize ( normalize, normalizeList, normalizeSet, normalizeCabalFlags ) where
4
4
5import Cabal2Nix.CorePackages
5import Cabal2Nix.CorePackages
6import Cabal2Nix.Name
6import Cabal2Nix.Name
7import Data.Char
7import Data.Char
8+import Data.Set ( Set )
9+import qualified Data.Set as Set
8import Data.Function
10import Data.Function
9import Data.List
11import Data.List
10import Distribution.NixOS.Derivation.Cabal
12import Distribution.NixOS.Derivation.Cabal
@@ -14,12 +16,12 @@ import Distribution.Simple.Utils ( lowercase )
14
16
15normalize :: Derivation -> Derivation
17normalize :: Derivation -> Derivation
16normalize deriv@(MkDerivation {..}) = deriv
18normalize deriv@(MkDerivation {..}) = deriv
17− { buildDepends = normalizeNixNames (filter (`notElem` (pname : corePackages)) buildDepends)
19+ { buildDepends = normalizeNixNames (Set.delete pname buildDepends)
18− , testDepends = normalizeNixNames (filter (`notElem` (pname : corePackages)) testDepends)
20+ , testDepends = normalizeNixNames (Set.delete pname testDepends)
19− , buildTools = normalizeNixBuildTools (filter (`notElem` coreBuildTools) buildTools)
21+ , buildTools = normalizeNixBuildTools (Set.filter (`notElem` coreBuildTools) buildTools)
20 , extraLibs = normalizeNixLibs extraLibs
22 , extraLibs = normalizeNixLibs extraLibs
21 , pkgConfDeps = normalizeNixLibs pkgConfDeps
23 , pkgConfDeps = normalizeNixLibs pkgConfDeps
22− , configureFlags = normalizeList configureFlags
24+ , configureFlags = normalizeSet configureFlags
23 , cabalFlags = normalizeCabalFlags cabalFlags
25 , cabalFlags = normalizeCabalFlags cabalFlags
24 , metaSection = normalizeMeta metaSection
26 , metaSection = normalizeMeta metaSection
25 }
27 }
@@ -46,14 +48,17 @@ quote [] = []
46normalizeList :: [String] -> [String]
48normalizeList :: [String] -> [String]
47normalizeList = nub . sortBy (compare `on` map toLower) . filter (not . null)
49normalizeList = nub . sortBy (compare `on` map toLower) . filter (not . null)
48
50
49−normalizeNixNames :: [String] -> [String]
51+normalizeSet :: Set String -> Set String
50−normalizeNixNames = normalizeList . map toNixName
52+normalizeSet = Set.filter (not . null)
51
53
52−normalizeNixLibs :: [String] -> [String]
54+normalizeNixNames :: Set String -> Set String
53−normalizeNixLibs = normalizeList . concatMap libNixName
55+normalizeNixNames = normalizeSet . Set.map toNixName
54
56
57+normalizeNixLibs :: Set String -> Set String
58+normalizeNixLibs = normalizeSet . Set.fromList . concatMap libNixName . Set.toList
59+
55−normalizeNixBuildTools :: [String] -> [String]
60+normalizeNixBuildTools :: Set String -> Set String
56−normalizeNixBuildTools = normalizeList . concatMap buildToolNixName
61+normalizeNixBuildTools = normalizeSet . Set.fromList . concatMap buildToolNixName . Set.toList
57
62
58-- |Strip any kind of path prefix from maintainer names, filter duplicates, and
63-- |Strip any kind of path prefix from maintainer names, filter duplicates, and
59-- sort the resulting list alphabetically.
64-- sort the resulting list alphabetically.
src/Cabal2Nix/PostProcess.hs+82−71
@@ -2,7 +2,7 @@
2
2
3module Cabal2Nix.PostProcess ( postProcess ) where
3module Cabal2Nix.PostProcess ( postProcess ) where
4
4
5−import Data.List
5+import qualified Data.Set as Set
6import Distribution.NixOS.Derivation.Cabal
6import Distribution.NixOS.Derivation.Cabal
7import Distribution.Text ( display )
7import Distribution.Text ( display )
8
8
@@ -10,105 +10,116 @@ postProcess :: Derivation -> Derivation
10postProcess = postProcess' . fixGtkBuilds
10postProcess = postProcess' . fixGtkBuilds
11
11
12fixGtkBuilds :: Derivation -> Derivation
12fixGtkBuilds :: Derivation -> Derivation
13−fixGtkBuilds deriv@(MkDerivation {..}) = deriv { pkgConfDeps = pkgConfDeps \\ buildDepends }
13+fixGtkBuilds deriv@(MkDerivation {..}) = deriv { pkgConfDeps = pkgConfDeps `Set.difference` buildDepends }
14
14
15postProcess' :: Derivation -> Derivation
15postProcess' :: Derivation -> Derivation
16postProcess' deriv@(MkDerivation {..})
16postProcess' deriv@(MkDerivation {..})
17 | pname == "aeson" && version > Version [0,7] []
17 | pname == "aeson" && version > Version [0,7] []
18− = deriv { buildDepends = "blaze-builder":buildDepends }
18+ = deriv { buildDepends = Set.insert "blaze-builder" buildDepends }
19− | pname == "Agda" = deriv { buildTools = "emacs":buildTools, phaseOverrides = agdaPostInstall }
19+ | pname == "Agda" = deriv { buildTools = Set.insert "emacs" buildTools, phaseOverrides = agdaPostInstall }
20 | pname == "alex" && version < Version [3,1] []
20 | pname == "alex" && version < Version [3,1] []
21− = deriv { buildTools = "perl":buildTools }
21+ = deriv { buildTools = Set.insert "perl" buildTools }
22 | pname == "alex" && version >= Version [3,1] []
22 | pname == "alex" && version >= Version [3,1] []
23− = deriv { buildTools = "perl":"happy":buildTools }
23+ = deriv { buildTools = Set.insert "perl" (Set.insert "happy" buildTools) }
24− | pname == "apache-md5" = deriv { testDepends = delete "crypto" testDepends }
24+ | pname == "apache-md5" = deriv { testDepends = Set.delete "crypto" testDepends }
25− | pname == "bindings-GLFW" = deriv { extraLibs = "libXext":"libXfixes":extraLibs }
25+ | pname == "bindings-GLFW" = deriv { extraLibs = Set.insert "libXext" (Set.insert "libXfixes" extraLibs) }
26− | pname == "bits-extras" = deriv { configureFlags = "--ghc-option=-lgcc_s":configureFlags, extraLibs = filter (/= "gcc_s") extraLibs }
26+ | pname == "bits-extras" = deriv { configureFlags = Set.insert "--ghc-option=-lgcc_s" configureFlags
27+ , extraLibs = Set.filter (/= "gcc_s") extraLibs
28+ }
27 | pname == "Cabal" = deriv { phaseOverrides = "preCheck = \"unset GHC_PACKAGE_PATH; export HOME=$NIX_BUILD_TOP\";" }
29 | pname == "Cabal" = deriv { phaseOverrides = "preCheck = \"unset GHC_PACKAGE_PATH; export HOME=$NIX_BUILD_TOP\";" }
28− | pname == "cabal-bounds" = deriv { buildTools = "cabal-install":buildTools }
30+ | pname == "cabal-bounds" = deriv { buildTools = Set.insert "cabal-install" buildTools }
29 | pname == "cabal-install" && version >= Version [0,14] []
31 | pname == "cabal-install" && version >= Version [0,14] []
30 = deriv { phaseOverrides = cabalInstallPostInstall }
32 = deriv { phaseOverrides = cabalInstallPostInstall }
31 | pname == "darcs" = deriv { phaseOverrides = darcsInstallPostInstall }
33 | pname == "darcs" = deriv { phaseOverrides = darcsInstallPostInstall }
32 | pname == "dns" = deriv { testTarget = "spec" }
34 | pname == "dns" = deriv { testTarget = "spec" }
33− | pname == "editline" = deriv { extraLibs = "libedit":extraLibs }
35+ | pname == "editline" = deriv { extraLibs = Set.insert "libedit" extraLibs }
34− | pname == "epic" = deriv { extraLibs = "gmp":"boehmgc":extraLibs, buildTools = "happy":buildTools }
36+ | pname == "epic" = deriv { extraLibs = Set.insert "gmp" (Set.insert "boehmgc" extraLibs)
37+ , buildTools = Set.insert "happy" buildTools
38+ }
35 | pname == "ghc-heap-view" = deriv { phaseOverrides = ghciPostInstall }
39 | pname == "ghc-heap-view" = deriv { phaseOverrides = ghciPostInstall }
36− | pname == "ghc-mod" = deriv { phaseOverrides = ghcModPostInstall pname version, buildTools = "emacs":"makeWrapper":buildTools }
40+ | pname == "ghc-mod" = deriv { phaseOverrides = ghcModPostInstall pname version
41+ , buildTools = Set.insert "emacs" (Set.insert "makeWrapper" buildTools) }
37− | pname == "ghc-parser" = deriv { buildTools = "cpphs":"happy":buildTools, phaseOverrides = ghcParserPatchPhase }
42+ | pname == "ghc-parser" = deriv { buildTools = Set.insert "cpphs" (Set.insert "happy" buildTools)
43+ , phaseOverrides = ghcParserPatchPhase }
38 | pname == "ghc-paths" = deriv { phaseOverrides = ghcPathsPatches }
44 | pname == "ghc-paths" = deriv { phaseOverrides = ghcPathsPatches }
39 | pname == "ghc-vis" = deriv { phaseOverrides = ghciPostInstall }
45 | pname == "ghc-vis" = deriv { phaseOverrides = ghciPostInstall }
46+ | pname == "git-annex" = deriv { phaseOverrides = gitAnnexOverrides
40− | pname == "git-annex" = deriv { phaseOverrides = gitAnnexOverrides, buildTools = "git":"rsync":"gnupg1":"curl":"wget":"lsof":"openssh":"which":"bup":"perl":buildTools }
47+ , buildTools = Set.fromList ["git","rsync","gnupg1","curl","wget","lsof","openssh","which","bup","perl"] `Set.union` buildTools }
41− | pname == "github-backup" = deriv { buildTools = "git":buildTools }
48+ | pname == "github-backup" = deriv { buildTools = Set.insert "git" buildTools }
42− | pname == "gloss-raster" = deriv { extraLibs = "llvm":extraLibs }
49+ | pname == "gloss-raster" = deriv { extraLibs = Set.insert "llvm" extraLibs }
43− | pname == "GLUT" = deriv { extraLibs = "glut":"libSM":"libICE":"libXmu":"libXi":"mesa":extraLibs }
50+ | pname == "GLUT" = deriv { extraLibs = Set.fromList ["glut","libSM","libICE","libXmu","libXi","mesa"] `Set.union` extraLibs }
44− | pname == "gtkglext" = deriv { pkgConfDeps = "pangox_compat":pkgConfDeps }
51+ | pname == "gtkglext" = deriv { pkgConfDeps = Set.insert "pangox_compat" pkgConfDeps }
45− | pname == "gtk2hs-buildtools"= deriv { buildDepends = "hashtables":buildDepends }
52+ | pname == "gtk2hs-buildtools"= deriv { buildDepends = Set.insert "hashtables" buildDepends }
46 | pname == "haddock" && version < Version [2,14] []
53 | pname == "haddock" && version < Version [2,14] []
47− = deriv { buildTools = "alex":"happy":buildTools }
54+ = deriv { buildTools = Set.insert "alex" (Set.insert "happy" buildTools) }
48 | pname == "haddock" = deriv { phaseOverrides = haddockPreCheck }
55 | pname == "haddock" = deriv { phaseOverrides = haddockPreCheck }
49− | pname == "happy" = deriv { buildTools = "perl":buildTools }
56+ | pname == "happy" = deriv { buildTools = Set.insert "perl" buildTools }
50− | pname == "haskeline" = deriv { buildDepends = "utf8-string":buildDepends }
57+ | pname == "haskeline" = deriv { buildDepends = Set.insert "utf8-string" buildDepends }
51− | pname == "haskell-src" = deriv { buildTools = "happy":buildTools }
58+ | pname == "haskell-src" = deriv { buildTools = Set.insert "happy" buildTools }
52− | pname == "haskell-src-meta" = deriv { buildDepends = "uniplate":buildDepends }
59+ | pname == "haskell-src-meta" = deriv { buildDepends = Set.insert "uniplate" buildDepends }
53 | pname == "HFuse" = deriv { phaseOverrides = hfusePreConfigure }
60 | pname == "HFuse" = deriv { phaseOverrides = hfusePreConfigure }
54 | pname == "highlighting-kate"= highlightingKatePostProcessing deriv
61 | pname == "highlighting-kate"= highlightingKatePostProcessing deriv
55− | pname == "hlibgit2" = deriv { buildTools = "git":buildTools }
62+ | pname == "hlibgit2" = deriv { buildTools = Set.insert "git" buildTools }
56− | pname == "HList" = deriv { buildTools = "diffutils":buildTools }
63+ | pname == "HList" = deriv { buildTools = Set.insert "diffutils" buildTools }
57− | pname == "hmatrix" = deriv { extraLibs = "liblapack":"blas": filter (/= "lapack") extraLibs }
64+ | pname == "hmatrix" = deriv { extraLibs = Set.insert "liblapack" (Set.insert "blas" (Set.filter (/= "lapack") extraLibs)) }
58− | pname == "hmatrix-special" = deriv { extraLibs = "gsl":extraLibs }
65+ | pname == "hmatrix-special" = deriv { extraLibs = Set.insert "gsl" extraLibs }
59 | pname == "hoogle" = deriv { testTarget = "--test-option=--no-net" }
66 | pname == "hoogle" = deriv { testTarget = "--test-option=--no-net" }
60 | pname == "hspec" = deriv { doCheck = False }
67 | pname == "hspec" = deriv { doCheck = False }
61− | pname == "GlomeVec" = deriv { buildTools = "llvm":buildTools }
68+ | pname == "GlomeVec" = deriv { buildTools = Set.insert "llvm" buildTools }
62− | pname == "idris" = deriv { buildTools = "happy":buildTools, extraLibs = "gmp":"boehmgc":extraLibs }
69+ | pname == "idris" = deriv { buildTools = Set.insert "happy" buildTools, extraLibs = Set.insert "gmp" (Set.insert "boehmgc" extraLibs) }
63− | pname == "language-c-quote" = deriv { buildTools = "alex":"happy":buildTools }
70+ | pname == "language-c-quote" = deriv { buildTools = Set.insert "alex" (Set.insert "happy" buildTools) }
64− | pname == "language-java" = deriv { buildDepends = "syb":buildDepends }
71+ | pname == "language-java" = deriv { buildDepends = Set.insert "syb" buildDepends }
65− | pname == "leksah-server" = deriv { buildDepends = "process-leksah":buildDepends }
72+ | pname == "leksah-server" = deriv { buildDepends = Set.insert "process-leksah" buildDepends }
66− | pname == "lhs2tex" = deriv { extraLibs = "texLive":extraLibs, phaseOverrides = lhs2texPostInstall }
73+ | pname == "lhs2tex" = deriv { extraLibs = Set.insert "texLive" extraLibs, phaseOverrides = lhs2texPostInstall }
67− | pname == "libffi" = deriv { extraLibs = delete "ffi" extraLibs }
74+ | pname == "libffi" = deriv { extraLibs = Set.delete "ffi" extraLibs }
68− | pname == "liquid-fixpoint" = deriv { buildTools = "ocaml":buildTools }
75+ | pname == "liquid-fixpoint" = deriv { buildTools = Set.insert "ocaml" buildTools }
69− | pname == "llvm-base" = deriv { extraLibs = "llvm":extraLibs }
76+ | pname == "llvm-base" = deriv { extraLibs = Set.insert "llvm" extraLibs }
70 | pname == "llvm-general" = deriv { doCheck = False }
77 | pname == "llvm-general" = deriv { doCheck = False }
71 | pname == "llvm-general-pure"= deriv { doCheck = False }
78 | pname == "llvm-general-pure"= deriv { doCheck = False }
72− | pname == "MFlow" = deriv { buildTools = "cpphs":buildTools }
79+ | pname == "MFlow" = deriv { buildTools = Set.insert "cpphs" buildTools }
73− | pname == "multiarg" = deriv { buildDepends = "utf8-string":buildDepends }
80+ | pname == "multiarg" = deriv { buildDepends = Set.insert "utf8-string" buildDepends }
74− | pname == "mysql" = deriv { buildTools = "mysqlConfig":buildTools, extraLibs = "zlib":extraLibs }
81+ | pname == "mysql" = deriv { buildTools = Set.insert "mysqlConfig" buildTools, extraLibs = Set.insert "zlib" extraLibs }
75 | pname == "ncurses" = deriv { phaseOverrides = ncursesPatchPhase }
82 | pname == "ncurses" = deriv { phaseOverrides = ncursesPatchPhase }
76− | pname == "Omega" = deriv { testDepends = delete "stdc++" testDepends }
83+ | pname == "Omega" = deriv { testDepends = Set.delete "stdc++" testDepends }
77− | pname == "OpenAL" = deriv { extraLibs = "openal":extraLibs }
84+ | pname == "OpenAL" = deriv { extraLibs = Set.insert "openal" extraLibs }
78− | pname == "OpenGL" = deriv { extraLibs = "mesa":"libX11":extraLibs }
85+ | pname == "OpenGL" = deriv { extraLibs = Set.insert "mesa" (Set.insert "libX11" extraLibs) }
79− | pname == "pandoc" = deriv { buildDepends = "alex":"happy":buildDepends }
86+ | pname == "pandoc" = deriv { buildDepends = Set.insert "alex" (Set.insert "happy" buildDepends) }
80− | pname == "pcap" = deriv { extraLibs = "libpcap":extraLibs }
87+ | pname == "pcap" = deriv { extraLibs = Set.insert "libpcap" extraLibs }
81− | pname == "persistent" = deriv { extraLibs = "sqlite3":extraLibs }
88+ | pname == "persistent" = deriv { extraLibs = Set.insert "sqlite3" extraLibs }
82− | pname == "purescript" = deriv { buildTools = "nodejs":buildTools }
89+ | pname == "purescript" = deriv { buildTools = Set.insert "nodejs" buildTools }
83− | pname == "repa-algorithms" = deriv { extraLibs = "llvm":extraLibs }
90+ | pname == "repa-algorithms" = deriv { extraLibs = Set.insert "llvm" extraLibs }
84− | pname == "repa-examples" = deriv { extraLibs = "llvm":extraLibs }
91+ | pname == "repa-examples" = deriv { extraLibs = Set.insert "llvm" extraLibs }
85− | pname == "saltine" = deriv { extraLibs = map (\x -> if x == "sodium" then "libsodium" else x) extraLibs }
92+ | pname == "saltine" = deriv { extraLibs = Set.map (\x -> if x == "sodium" then "libsodium" else x) extraLibs }
86− | pname == "SDL-image" = deriv { extraLibs = "SDL_image":extraLibs }
93+ | pname == "SDL-image" = deriv { extraLibs = Set.insert "SDL_image" extraLibs }
87− | pname == "SDL-mixer" = deriv { extraLibs = "SDL_mixer":extraLibs }
94+ | pname == "SDL-mixer" = deriv { extraLibs = Set.insert "SDL_mixer" extraLibs }
88− | pname == "SDL-ttf" = deriv { extraLibs = "SDL_ttf":extraLibs }
95+ | pname == "SDL-ttf" = deriv { extraLibs = Set.insert "SDL_ttf" extraLibs }
89 | pname == "sloane" = deriv { phaseOverrides = sloanePostInstall }
96 | pname == "sloane" = deriv { phaseOverrides = sloanePostInstall }
90− | pname == "structured-haskell-mode" = deriv { buildTools = "emacs":buildTools, phaseOverrides = structuredHaskellModePostInstall }
97+ | pname == "structured-haskell-mode" = deriv { buildTools = Set.insert "emacs" buildTools
98+ , phaseOverrides = structuredHaskellModePostInstall
99+ }
91− | pname == "terminfo" = deriv { extraLibs = "ncurses":extraLibs }
100+ | pname == "terminfo" = deriv { extraLibs = Set.insert "ncurses" extraLibs }
92− | pname == "threadscope" = deriv { configureFlags = "--ghc-options=-rtsopts":configureFlags }
101+ | pname == "threadscope" = deriv { configureFlags = Set.insert "--ghc-options=-rtsopts" configureFlags }
93− | pname == "thyme" = deriv { buildTools = "cpphs":buildTools }
102+ | pname == "thyme" = deriv { buildTools = Set.insert "cpphs" buildTools }
94− | pname == "vacuum" = deriv { extraLibs = "ghc-paths":extraLibs }
103+ | pname == "vacuum" = deriv { extraLibs = Set.insert "ghc-paths" extraLibs }
95− | pname == "wxc" = deriv { extraLibs = "wxGTK":"mesa":"libX11":extraLibs, phaseOverrides = wxcPostInstall version }
104+ | pname == "wxc" = deriv { extraLibs = Set.fromList ["wxGTK","mesa","libX11"] `Set.union` extraLibs
105+ , phaseOverrides = wxcPostInstall version
106+ }
96− | pname == "wxcore" = deriv { extraLibs = "wxGTK":"mesa":"libX11":extraLibs }
107+ | pname == "wxcore" = deriv { extraLibs = Set.fromList ["wxGTK","mesa","libX11"] `Set.union` extraLibs }
97 | pname == "X11" && version >= Version [1,6] []
108 | pname == "X11" && version >= Version [1,6] []
98− = deriv { extraLibs = "libXinerama":"libXext":"libXrender":extraLibs }
109+ = deriv { extraLibs = Set.fromList ["libXinerama","libXext","libXrender"] `Set.union` extraLibs }
99− | pname == "X11" = deriv { extraLibs = "libXinerama":"libXext":extraLibs }
110+ | pname == "X11" = deriv { extraLibs = Set.insert "libXinerama" (Set.insert "libXext" extraLibs) }
100− | pname == "X11-xft" = deriv { extraLibs = "pkgconfig":"freetype":"fontconfig":extraLibs
111+ | pname == "X11-xft" = deriv { extraLibs = Set.fromList ["pkgconfig","freetype","fontconfig"] `Set.union` extraLibs
101− , configureFlags = "--extra-include-dirs=${freetype}/include/freetype2":configureFlags
112+ , configureFlags = Set.insert "--extra-include-dirs=${freetype}/include/freetype2" configureFlags
102 }
113 }
103 | pname == "xmonad" = deriv { phaseOverrides = xmonadPostInstall }
114 | pname == "xmonad" = deriv { phaseOverrides = xmonadPostInstall }
104
115
105-- Unbreak packages during hackage2nix generation:
116-- Unbreak packages during hackage2nix generation:
106
117
107− | pname == "hnetcdf" = deriv { testDepends = delete "netcdf" testDepends }
118+ | pname == "hnetcdf" = deriv { testDepends = Set.delete "netcdf" testDepends }
108− | pname == "SDL2-ttf" = deriv { buildDepends = delete "SDL2" buildDepends }
119+ | pname == "SDL2-ttf" = deriv { buildDepends = Set.delete "SDL2" buildDepends }
109− | pname == "jsaddle" = deriv { buildDepends = delete "ghcjs-base" buildDepends, testDepends = delete "ghcjs-base" testDepends }
120+ | pname == "jsaddle" = deriv { buildDepends = Set.delete "ghcjs-base" buildDepends, testDepends = Set.delete "ghcjs-base" testDepends }
110− | pname == "hzk" = deriv { testDepends = delete "zookeeper_mt" testDepends, buildTools = "zookeeper_mt":buildTools }
121+ | pname == "hzk" = deriv { testDepends = Set.delete "zookeeper_mt" testDepends, buildTools = Set.insert "zookeeper_mt" buildTools }
111− | pname == "zip-archive" = deriv { testDepends = delete "zip" testDepends, buildTools = "zip":buildTools }
122+ | pname == "zip-archive" = deriv { testDepends = Set.delete "zip" testDepends, buildTools = Set.insert "zip" buildTools }
112 | otherwise = deriv
123 | otherwise = deriv
113
124
114ghcModPostInstall :: String -> Version -> String
125ghcModPostInstall :: String -> Version -> String
@@ -150,7 +161,7 @@ darcsInstallPostInstall = unlines
150highlightingKatePostProcessing :: Derivation -> Derivation
161highlightingKatePostProcessing :: Derivation -> Derivation
151highlightingKatePostProcessing deriv@(MkDerivation {..}) = deriv
162highlightingKatePostProcessing deriv@(MkDerivation {..}) = deriv
152 { phaseOverrides = "prePatch = \"sed -i -e 's|regex-pcre-builtin >= .*|regex-pcre|' highlighting-kate.cabal\";"
163 { phaseOverrides = "prePatch = \"sed -i -e 's|regex-pcre-builtin >= .*|regex-pcre|' highlighting-kate.cabal\";"
153− , buildDepends = "regex-pcre" : filter (/="regex-pcre-builtin") buildDepends
164+ , buildDepends = Set.insert "regex-pcre" (Set.delete "regex-pcre-builtin" buildDepends)
154 }
165 }
155
166
156xmonadPostInstall :: String
167xmonadPostInstall :: String
src/Distribution/NixOS/Derivation/Cabal.hs+39−34
@@ -23,6 +23,8 @@ module Distribution.NixOS.Derivation.Cabal
23
23
24import Control.DeepSeq.Generics
24import Control.DeepSeq.Generics
25import Data.Char
25import Data.Char
26+import Data.Set ( Set )
27+import qualified Data.Set as Set
26import Data.Function
28import Data.Function
27import Data.List
29import Data.List
28import Data.Version
30import Data.Version
@@ -33,6 +35,9 @@ import Distribution.Package
33import Distribution.PackageDescription ( FlagAssignment, FlagName(..) )
35import Distribution.PackageDescription ( FlagAssignment, FlagName(..) )
34import GHC.Generics ( Generic )
36import GHC.Generics ( Generic )
35
37
38+toAscList :: Set String -> [String]
39+toAscList = sortBy (compare `on` map toLower) . Set.toList
40+
36-- | A represtation of Nix expressions for building Haskell packages.
41-- | A represtation of Nix expressions for building Haskell packages.
37-- The data type correspond closely to the definition of
42-- The data type correspond closely to the definition of
38-- 'PackageDescription' from Cabal.
43-- 'PackageDescription' from Cabal.
@@ -46,13 +51,13 @@ data Derivation = MkDerivation
46 , src :: DerivationSource
51 , src :: DerivationSource
47 , isLibrary :: Bool
52 , isLibrary :: Bool
48 , isExecutable :: Bool
53 , isExecutable :: Bool
49− , extraFunctionArgs :: [String]
54+ , extraFunctionArgs :: Set String
50− , buildDepends :: [String]
55+ , buildDepends :: Set String
51− , testDepends :: [String]
56+ , testDepends :: Set String
52− , buildTools :: [String]
57+ , buildTools :: Set String
53− , extraLibs :: [String]
58+ , extraLibs :: Set String
54− , pkgConfDeps :: [String]
59+ , pkgConfDeps :: Set String
55− , configureFlags :: [String]
60+ , configureFlags :: Set String
56 , cabalFlags :: FlagAssignment
61 , cabalFlags :: FlagAssignment
57 , runHaddock :: Bool
62 , runHaddock :: Bool
58 , jailbreak :: Bool
63 , jailbreak :: Bool
@@ -78,40 +83,40 @@ deriving instance Generic FlagName
78instance NFData FlagName where rnf = genericRnf
83instance NFData FlagName where rnf = genericRnf
79
84
80renderDerivation :: Derivation -> Doc
85renderDerivation :: Derivation -> Doc
81−renderDerivation deriv =
86+renderDerivation (MkDerivation {..}) =
82− funargs (map text ("mkDerivation":inputs)) $$ vcat
87+ funargs (map text ("mkDerivation" : toAscList inputs)) $$ vcat
83 [ text "mkDerivation" <+> lbrace
88 [ text "mkDerivation" <+> lbrace
84 , nest 2 $ vcat
89 , nest 2 $ vcat
85− [ attr "pname" $ string (pname deriv)
90+ [ attr "pname" $ string pname
86− , attr "version" $ doubleQuotes (disp (version deriv))
91+ , attr "version" $ doubleQuotes (disp version)
87− , sourceAttr (src deriv)
92+ , sourceAttr src
88− , onlyIf (not (null (editedCabalFile deriv))) $ attr "editedCabalFile" $ string (editedCabalFile deriv)
93+ , onlyIf (not (null editedCabalFile)) $ attr "editedCabalFile" $ string editedCabalFile
89− , boolattr "isLibrary" (not (isLibrary deriv) || isExecutable deriv) (isLibrary deriv)
94+ , boolattr "isLibrary" ((not isLibrary) || isExecutable) isLibrary
90− , boolattr "isExecutable" (not (isLibrary deriv) || isExecutable deriv) (isExecutable deriv)
95+ , boolattr "isExecutable" ((not isLibrary) || isExecutable) isExecutable
91− , listattr "buildDepends" empty (buildDepends deriv)
96+ , listattr "buildDepends" empty (toAscList buildDepends)
92− , listattr "testDepends" empty (testDepends deriv)
97+ , listattr "testDepends" empty (toAscList testDepends)
93− , listattr "buildTools" empty (buildTools deriv)
98+ , listattr "buildTools" empty (toAscList buildTools)
94− , listattr "extraLibraries" empty (extraLibs deriv)
99+ , listattr "extraLibraries" empty (toAscList extraLibs)
95− , listattr "pkgconfigDepends" empty (pkgConfDeps deriv)
100+ , listattr "pkgconfigDepends" empty (toAscList pkgConfDeps)
96 , listattr "configureFlags" empty (map (show . show) renderedFlags)
101 , listattr "configureFlags" empty (map (show . show) renderedFlags)
97− , boolattr "enableSplitObjs" (not (enableSplitObjs deriv)) (enableSplitObjs deriv)
102+ , boolattr "enableSplitObjs" (not enableSplitObjs) enableSplitObjs
98− , boolattr "doHaddock" (not (runHaddock deriv)) (runHaddock deriv)
103+ , boolattr "doHaddock" (not runHaddock) runHaddock
99− , boolattr "jailbreak" (jailbreak deriv) (jailbreak deriv)
104+ , boolattr "jailbreak" jailbreak jailbreak
100− , boolattr "doCheck" (not (doCheck deriv)) (doCheck deriv)
105+ , boolattr "doCheck" (not doCheck) doCheck
101− , onlyIf (not (null (testTarget deriv))) $ attr "testTarget" $ string (testTarget deriv)
106+ , onlyIf (not (null testTarget)) $ attr "testTarget" $ string testTarget
102− , boolattr "hyperlinkSource" (not (hyperlinkSource deriv)) (hyperlinkSource deriv)
107+ , boolattr "hyperlinkSource" (not hyperlinkSource) hyperlinkSource
103− , onlyIf (not (null (phaseOverrides deriv))) $ vcat ((map text . lines) (phaseOverrides deriv))
108+ , onlyIf (not (null phaseOverrides)) $ vcat ((map text . lines) phaseOverrides)
104− , pPrint (metaSection deriv)
109+ , pPrint metaSection
105 ]
110 ]
106 , rbrace
111 , rbrace
107 ]
112 ]
108 where
113 where
109− inputs = nub $ sortBy (compare `on` map toLower) $
110− buildDepends deriv ++ testDepends deriv ++ buildTools deriv ++ extraLibs deriv ++ pkgConfDeps deriv
114+ inputs = Set.unions [ buildDepends, testDepends, buildTools, extraLibs, pkgConfDeps
111− ++ ["fetch" ++ derivKind (src deriv) | derivKind (src deriv) /= "" && not isHackagePackage]
115+ , Set.fromList ["fetch" ++ derivKind src | derivKind src /= "" && not isHackagePackage]
116+ ]
112− renderedFlags = [ text "-f" <> (if enable then empty else char '-') <> text f | (FlagName f, enable) <- cabalFlags deriv ]
117+ renderedFlags = [ text "-f" <> (if enable then empty else char '-') <> text f | (FlagName f, enable) <- cabalFlags ]
113− ++ map text (configureFlags deriv)
118+ ++ map text (toAscList configureFlags)
114− isHackagePackage = "mirror://hackage/" `isPrefixOf` derivUrl (src deriv)
119+ isHackagePackage = "mirror://hackage/" `isPrefixOf` derivUrl src
115 sourceAttr (DerivationSource{..})
120 sourceAttr (DerivationSource{..})
116 | isHackagePackage = attr "sha256" $ string derivHash
121 | isHackagePackage = attr "sha256" $ string derivHash
117 | derivKind /= "" = vcat
122 | derivKind /= "" = vcat
src/cabal2nix.hs+2−1
@@ -15,6 +15,7 @@ import System.Environment ( getArgs )
15import System.Exit ( exitFailure, exitSuccess )
15import System.Exit ( exitFailure, exitSuccess )
16import System.IO ( hPutStrLn, hFlush, stdout, stderr )
16import System.IO ( hPutStrLn, hFlush, stdout, stderr )
17import Distribution.Simple.Utils ( lowercase )
17import Distribution.Simple.Utils ( lowercase )
18+import qualified Data.Set as Set
18
19
19data Configuration = Configuration
20data Configuration = Configuration
20 { optPrintHelp :: Bool
21 { optPrintHelp :: Bool
@@ -113,7 +114,7 @@ main = bracket (return ()) (\() -> hFlush stdout >> hFlush stderr) $ \() -> do
113 , platforms = optPlatform cfg
114 , platforms = optPlatform cfg
114 }
115 }
115 , doCheck = doCheck deriv && optDoCheck cfg
116 , doCheck = doCheck deriv && optDoCheck cfg
116− , extraFunctionArgs = "stdenv" : extraFunctionArgs deriv
117+ , extraFunctionArgs = Set.insert "stdenv" (extraFunctionArgs deriv)
117 }
118 }
118
119
119 deriv'' :: Doc
120 deriv'' :: Doc
src/hackage2nix.hs+3−3
@@ -146,13 +146,13 @@ generatePackageSet config hackage nixpkgs = do
146 }
146 }
147
147
148 missing :: Set String
148 missing :: Set String
149− missing = Set.fromList $ filter (`Set.notMember` knownAttributesSet) (buildDepends drv ++ testDepends drv)
149+ missing = Set.filter (`Set.notMember` knownAttributesSet) (buildDepends drv `Set.union` testDepends drv)
150
150
151 buildInputs :: Map Attribute (Maybe Path)
151 buildInputs :: Map Attribute (Maybe Path)
152 buildInputs = Map.unions
152 buildInputs = Map.unions
153 [ Map.fromList [ (n, Nothing) | n <- Set.toList missing ]
153 [ Map.fromList [ (n, Nothing) | n <- Set.toList missing ]
154− , Map.fromList [ (n, resolveNixpkgsAttribute nixpkgs n) | n <- Set.toAscList (Set.fromList (extraLibs drv ++ pkgConfDeps drv)) ]
154+ , Map.fromList [ (n, resolveNixpkgsAttribute nixpkgs n) | n <- Set.toAscList (extraLibs drv `Set.union` pkgConfDeps drv) ]
155− , Map.fromList [ (n, resolveNixpkgsOrHackageAttribute nixpkgs hackage n) | n <- Set.toAscList (Set.fromList (buildTools drv)) ]
155+ , Map.fromList [ (n, resolveNixpkgsOrHackageAttribute nixpkgs hackage n) | n <- Set.toAscList (buildTools drv) ]
156 ]
156 ]
157
157
158 systemOverrides :: Doc
158 systemOverrides :: Doc