git.iko.soy/typeable/stackage2nix
on master help sign in
Fix separate output attr
commitc67c0d8d10d619762b4cd85451da588b4fd06c1c authorDmitry Bushev <bushevdv@gmail.com> dateMon 21 Aug 2017, 17:52 (9 years ago) parentb5c8918
2 files changed+7−1
compare with master
unifiedsplit
src/Distribution/Nixpkgs/Haskell/FromStack.hs+2 src/Distribution/Nixpkgs/Haskell/Stack.hs+5−1
src/Distribution/Nixpkgs/Haskell/FromStack.hs+2
@@ -89,3 +89,5 @@ fromPackage conf pconf plan pkg =
8989 & doCheck .~ testsEnabled
9090 & runHaddock .~ haddocksEnabled
9191 & 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
7474 -> IO Derivation
7575packageDerivation conf optHackageDb stackPackage = do
7676 pkg <- getStackPackageFromDb optHackageDb stackPackage
77− let drv = genericPackageDerivation conf pkg & src .~ pkgSource pkg
77+ let
78+ drv = genericPackageDerivation conf pkg
79+ & src .~ pkgSource pkg
80+ -- TODO: remove after Nixos/Nixpkgs #27196 released
81+ & enableSeparateDataOutput .~ False
7882 return $ if stackPackage ^. spExtraDep
7983 then drv
8084 & doCheck &&~ conf ^. spcDoCheckStackage