git.iko.soy/typeable/stackage2nix
on master help sign in
Fix separate output attr
c67c0d8Dmitry Bushev
src/Distribution/Nixpkgs/Haskell/FromStack.hs+2
compare with master
unifiedsplit
@@ -89,3 +89,5 @@ fromPackage conf pconf plan pkg =
89 & doCheck .~ testsEnabled
89 & doCheck .~ testsEnabled
90 & runHaddock .~ haddocksEnabled
90 & runHaddock .~ haddocksEnabled
91 & metaSection . Nix.broken .~ brokenEnabled
91 & metaSection . Nix.broken .~ brokenEnabled
92+ -- TODO: remove after Nixos/Nixpkgs #27196 released
93+ & enableSeparateDataOutput .~ False
src/Distribution/Nixpkgs/Haskell/Stack.hs+5−1
@@ -74,7 +74,11 @@ packageDerivation
74 -> IO Derivation
74 -> IO Derivation
75packageDerivation conf optHackageDb stackPackage = do
75packageDerivation conf optHackageDb stackPackage = do
76 pkg <- getStackPackageFromDb optHackageDb stackPackage
76 pkg <- getStackPackageFromDb optHackageDb stackPackage
77+ let
77− let drv = genericPackageDerivation conf pkg & src .~ pkgSource pkg
78+ drv = genericPackageDerivation conf pkg
79+ & src .~ pkgSource pkg
80+ -- TODO: remove after Nixos/Nixpkgs #27196 released
81+ & enableSeparateDataOutput .~ False
78 return $ if stackPackage ^. spExtraDep
82 return $ if stackPackage ^. spExtraDep
79 then drv
83 then drv
80 & doCheck &&~ conf ^. spcDoCheckStackage
84 & doCheck &&~ conf ^. spcDoCheckStackage