4dc767f · typeable/stackage2nix

git.iko.soy/typeable/stackage2nix

Do not check extra-deps

commit4dc767f2a7acbe1f3e90ae24bdd194ded632f5cf authorDmitry Bushev <bushevdv@gmail.com> dateThu 26 Jul 2018, 15:38 (8 years ago) parent835e292

2 files changed+5−1

unifiedsplit

src/Distribution/Nixpkgs/Haskell/FromStack.hs+1

@@ -97,4 +97,5 @@ finalizePackage :: Package -> PackageConfig -> Derivation -> Derivation

9797finalizePackage pkg pconf drv = drv

9898 & src .~ pkgSource pkg

9999 & doCheck &&~ enableCheck pconf

100+ & testDepends %~ (if enableCheck pconf then id else const mempty)

100101 & runHaddock &&~ enableHaddock pconf

src/Runner.hs+4−1

@@ -50,9 +50,12 @@ run = do

5050 let

5151 stackResolver = stackConf ^. scResolver

5252 stackPackagesConfig = mkStackPackagesConfig opts

53+ stackExtraDepsConfig = stackPackagesConfig

54+ & spcDoCheckPackages .~ False

55+ & spcDoHaddockPackages .~ False

5356 stackConfPackages <- traverse (fmap mkNode . packageDerivation stackPackagesConfig hackageDb)

5457 $ stackConf ^. scPackages

55− stackConfExtraDeps <- traverse (fmap mkNode . packageDerivation stackPackagesConfig hackageDb)

58+ stackConfExtraDeps <- traverse (fmap mkNode . packageDerivation stackExtraDepsConfig hackageDb)

5659 $ stackConf ^. scExtraDeps

5760 let

5861 stackConfAllPackages = maybe stackConfPackages ((<>) stackConfPackages)