git.iko.soy/typeable/cabal2nix
on master help sign in
Add support for the 'enableSplitObjs' attribute.
commit99bb7803279cc4c3592eb9ed1d8c4d5f80e8bea9 authorPeter Simons <simons@cryp.to> dateMon 11 Aug 2014, 15:08 (12 years ago) parent07ac27a
4 files changed+7
compare with master
unifiedsplit
src/Cabal2Nix/Flags.hs+1 src/Cabal2Nix/Generate.hs+1 src/Distribution/NixOS/Derivation/Cabal.hs+4 src/hackage4nix.hs+1
src/Cabal2Nix/Flags.hs+1
@@ -7,6 +7,7 @@ configureCabalFlags :: PackageIdentifier -> FlagAssignment
77configureCabalFlags (PackageIdentifier (PackageName name) _)
88 | name == "arithmoi" = [disable "llvm"]
99 | name == "accelerate-examples"= [disable "opencl"]
10+ | name == "folds" = [disable "test-hlint"]
1011 | name == "git-annex" = [ enable "S3", enable "WebDAV", enable "Inotify"
1112 , enable "Dbus", enable "Assistant", enable "Webapp"
1213 , enable "Pairing", enable "XMPP", enable "DNS"
src/Cabal2Nix/Generate.hs+1
@@ -33,6 +33,7 @@ cabal2nix cabal = normalize $ postProcess MkDerivation
3333 , doCheck = True
3434 , testTarget = ""
3535 , hyperlinkSource = True
36+ , enableSplitObjs = True
3637 , phaseOverrides = ""
3738 , metaSection = Meta
3839 { homepage = Cabal.homepage descr
src/Distribution/NixOS/Derivation/Cabal.hs+4
@@ -59,6 +59,7 @@ data Derivation = MkDerivation
5959 , doCheck :: Bool
6060 , testTarget :: String
6161 , hyperlinkSource :: Bool
62+ , enableSplitObjs :: Bool
6263 , phaseOverrides :: String
6364 , metaSection :: Meta
6465 }
@@ -90,6 +91,7 @@ renderDerivation deriv =
9091 , listattr "extraLibraries" empty (extraLibs deriv)
9192 , listattr "pkgconfigDepends" empty (pkgConfDeps deriv)
9293 , onlyIf renderedFlags $ attr "configureFlags" $ doubleQuotes (sep renderedFlags)
94+ , boolattr "enableSplitObjs" (not (enableSplitObjs deriv)) (enableSplitObjs deriv)
9395 , boolattr "noHaddock" (not (runHaddock deriv)) (not (runHaddock deriv))
9496 , boolattr "jailbreak" (jailbreak deriv) (jailbreak deriv)
9597 , boolattr "doCheck" (not (doCheck deriv)) (doCheck deriv)
@@ -125,6 +127,7 @@ parseDerivation buf
125127 , jailBreak <- buf `regsubmatch` "jailbreak *= *(true|false) *;"
126128 , docheck <- buf `regsubmatch` "doCheck *= *(true|false) *;"
127129 , hyperlSrc <- buf `regsubmatch` "hyperlinkSource *= *(true|false) *;"
130+ , splitObj <- buf `regsubmatch` "enableSplitObjs *= *(true|false) *;"
128131 = Just MkDerivation
129132 { pname = name
130133 , version = vers
@@ -144,6 +147,7 @@ parseDerivation buf
144147 , doCheck = docheck == ["true"] || null docheck
145148 , testTarget = ""
146149 , hyperlinkSource = hyperlSrc == ["true"] || null hyperlSrc
150+ , enableSplitObjs = splitObj /= ["false"]
147151 , phaseOverrides = ""
148152 , metaSection = Meta
149153 { homepage = ""
src/hackage4nix.hs+1
@@ -132,6 +132,7 @@ updateNixPkgs paths = do
132132 , doCheck = doCheck deriv
133133 , jailbreak = jailbreak deriv
134134 , hyperlinkSource = hyperlinkSource deriv
135+ , enableSplitObjs = enableSplitObjs deriv
135136 }
136137 meta = metaSection deriv'
137138 plats' = if null plats then platforms meta else plats