Skip to content

Commit 1c3b865

Browse files
Distribution.Nixpkgs.Haskell.Derivation: remove obsolete enableSplitObjs
See NixOS/nixpkgs@a62b24b
1 parent af1bc25 commit 1c3b865

File tree

3 files changed

+2
-6
lines changed

3 files changed

+2
-6
lines changed

cabal2nix/cabal2nix.cabal

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: cabal2nix
2-
version: 2.19.1
2+
version: 2.20.0
33
synopsis: Convert Cabal files into Nix build instructions.
44
description:
55
Convert Cabal files into Nix build instructions. Users of Nix can install the latest

cabal2nix/src/Distribution/Nixpkgs/Haskell/Derivation.hs

+1-4
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
module Distribution.Nixpkgs.Haskell.Derivation
77
( Derivation, nullDerivation, pkgid, revision, src, subpath, isLibrary, isExecutable
88
, extraFunctionArgs, libraryDepends, executableDepends, testDepends, configureFlags
9-
, cabalFlags, runHaddock, jailbreak, doCheck, doBenchmark, testTarget, hyperlinkSource, enableSplitObjs
9+
, cabalFlags, runHaddock, jailbreak, doCheck, doBenchmark, testTarget, hyperlinkSource
1010
, enableLibraryProfiling, enableExecutableProfiling, phaseOverrides, editedCabalFile, metaSection
1111
, dependencies, setupDepends, benchmarkDepends, enableSeparateDataOutput, extraAttributes
1212
)
@@ -60,7 +60,6 @@ data Derivation = MkDerivation
6060
, _hyperlinkSource :: Bool
6161
, _enableLibraryProfiling :: Bool
6262
, _enableExecutableProfiling :: Bool
63-
, _enableSplitObjs :: Bool
6463
, _phaseOverrides :: String
6564
, _editedCabalFile :: String
6665
, _enableSeparateDataOutput :: Bool
@@ -93,7 +92,6 @@ nullDerivation = MkDerivation
9392
, _hyperlinkSource = error "undefined Derivation.hyperlinkSource"
9493
, _enableLibraryProfiling = error "undefined Derivation.enableLibraryProfiling"
9594
, _enableExecutableProfiling = error "undefined Derivation.enableExecutableProfiling"
96-
, _enableSplitObjs = error "undefined Derivation.enableSplitObjs"
9795
, _phaseOverrides = error "undefined Derivation.phaseOverrides"
9896
, _editedCabalFile = error "undefined Derivation.editedCabalFile"
9997
, _enableSeparateDataOutput = error "undefined Derivation.enableSeparateDataOutput"
@@ -130,7 +128,6 @@ instance Pretty Derivation where
130128
, onlyIf (_benchmarkDepends /= mempty) $ pPrintBuildInfo "benchmark" _benchmarkDepends
131129
, boolattr "enableLibraryProfiling" _enableLibraryProfiling _enableLibraryProfiling
132130
, boolattr "enableExecutableProfiling" _enableExecutableProfiling _enableExecutableProfiling
133-
, boolattr "enableSplitObjs" (not _enableSplitObjs) _enableSplitObjs
134131
, boolattr "doHaddock" (not _runHaddock) _runHaddock
135132
, boolattr "jailbreak" _jailbreak _jailbreak
136133
, boolattr "doCheck" (not _doCheck) _doCheck

cabal2nix/src/Distribution/Nixpkgs/Haskell/FromCabal.hs

-1
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,6 @@ fromPackageDescription haskellResolver nixpkgsResolver missingDeps flags Package
114114
& doBenchmark .~ False
115115
& testTarget .~ mempty
116116
& hyperlinkSource .~ True
117-
& enableSplitObjs .~ True
118117
& enableLibraryProfiling .~ False
119118
& enableExecutableProfiling .~ False
120119
& enableSeparateDataOutput .~ not (null dataFiles)

0 commit comments

Comments
 (0)