stackage2nix 0.6.0 → 0.6.1

raw patch · 3 files changed

+8/−2 lines, 3 files

Files

CHANGELOG.md +4/−0
src/Distribution/Nixpkgs/Haskell/Stack/PrettyPrinting.hs +3/−1
stackage2nix.cabal +1/−1

CHANGELOG.md view

@@ -30,3 +30,7 @@  - Replace call to `<nixpkgs/pkgs/development/haskell-modules>` in generated   Haskell packages with `makePackageSet` library function++# 0.6.1++- Pass extra `buildHaskellPackages` argument to `makePackageSet` function

src/Distribution/Nixpkgs/Haskell/Stack/PrettyPrinting.hs view

@@ -109,6 +109,7 @@ pPrintHaskellPackages oc = vcat   [ funargs     [ "callPackage"+    , "buildPackages"     , "pkgs"     , "stdenv"     , "lib"@@ -125,7 +126,8 @@     , attr "haskellPackages" $ vcat       [ "pkgs.callPackage makePackageSet {"       , nest 2 $ vcat-        [ attr "ghc" ("pkgs.haskell.compiler." <> toNixGhcVersion (oc ^. ocGhc))+        [ attr "ghc" ("buildPackages.haskell.compiler." <> toNixGhcVersion (oc ^. ocGhc))+        , attr "buildHaskellPackages" ("buildPackages.haskell.packages." <> toNixGhcVersion (oc ^. ocGhc))         , attr "package-set" . importStackagePackages $ oc ^. ocStackagePackages         , "inherit stdenv haskellLib extensible-self;"         ]

stackage2nix.cabal view

@@ -1,5 +1,5 @@ name:                stackage2nix-version:             0.6.0+version:             0.6.1 synopsis:            Convert Stack files into Nix build instructions. homepage:            https://github.com/typeable/stackage2nix#readme license:             BSD3