Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions src/Distribution/Nixpkgs/Haskell/FromStack.hs
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,12 @@ import Control.Lens
import Data.Set.Lens
import Distribution.Compiler (CompilerInfo(..))
import Distribution.System (Platform(..))
import Distribution.Package (PackageName, PackageIdentifier(..), Dependency(..))
import Distribution.Package (PackageName, PackageIdentifier(..), Dependency(..), packageId)
import Distribution.PackageDescription
import Distribution.Nixpkgs.Haskell.FromStack.Package
import Distribution.Nixpkgs.Haskell.PackageSourceSpec
import Distribution.Nixpkgs.Haskell.FromCabal
import Distribution.Nixpkgs.Haskell.FromCabal.Flags (configureCabalFlags)
import Distribution.Nixpkgs.Haskell.Derivation
import Stackage.BuildPlan
import Stackage.Types (CabalFileInfo(..),PackageConstraints(..), DepInfo(..), SimpleDesc(..), TestState(..))
Expand Down Expand Up @@ -63,19 +64,20 @@ fromPackage conf pconf plan pkg =
configureBenches
| pcBenches constraints == Don'tBuild = removeBenches
| otherwise = id
flags = Map.toList (pcFlagOverrides constraints)
defaultFlags = configureCabalFlags (packageId (pkgCabal pkg))
flags = defaultFlags <> mkFlagAssignment (Map.toList $ pcFlagOverrides constraints)
(descr, missingDeps) = finalizeGenericPackageDescription
(haskellResolver conf)
(targetPlatform conf)
(targetCompiler conf)
(mkFlagAssignment flags)
flags
(planDependencies plan)
(configureBenches . configureTests $ pkgCabal pkg)
genericDrv = fromPackageDescription
(haskellResolver conf)
(nixpkgsResolver conf)
missingDeps
(mkFlagAssignment flags)
flags
descr
depName (Dependency name _) = name
testDeps = setOf
Expand Down
1 change: 1 addition & 0 deletions src/Distribution/Nixpkgs/Haskell/Stack.hs
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ makeLenses ''StackPackagesConfig
getStackPackageFromDb :: DB.HackageDB -> StackPackage -> IO Package
getStackPackageFromDb hackageDb stackPackage = do
PackageSourceSpec.getPackage'
False
False
(pure hackageDb)
(stackLocationToSource (stackPackage ^. spLocation) (stackPackage ^. spDir))
Expand Down
2 changes: 1 addition & 1 deletion src/LtsHaskell.hs
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ getPackageFromRepo allCabalHashesPath mSha1Hash pkgId = do
tarballSHA256 = fromMaybe
(error (display pkgId ++ ": meta data has no SHA256 hash for the tarball"))
(view (mHashes . at "SHA256") meta)
source = DerivationSource "url" ("mirror://hackage/" ++ display pkgId ++ ".tar.gz") "" tarballSHA256
source = DerivationSource "url" ("mirror://hackage/" ++ display pkgId ++ ".tar.gz") "" tarballSHA256 Nothing
return $ Package source False pkgDesc

getPackageFromDb :: DB.HackageDB -> PackageIdentifier -> IO Package
Expand Down
10 changes: 8 additions & 2 deletions stack.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
resolver: lts-12.2
resolver: lts-12.16
extra-deps:
- yaml-0.8.31.1
- cabal2nix-2.13
- hpack-0.31.1
- infer-license-0.2.0
- yaml-0.10.0
- git: https://github.com/fpco/stackage-curator.git
commit: 73c5ed06602990c33d3fec1711e27875f283b6bf
- git: https://github.com/jwiegley/gitlib.git
Expand All @@ -9,3 +12,6 @@ extra-deps:
- gitlib
- gitlib-libgit2

nix:
enable: false # run stack with --nix to enable
packages: [ icu, openssl, zlib ]
2 changes: 1 addition & 1 deletion stackage2nix.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ library
, QuickCheck
, aeson
, bytestring
, cabal2nix >= 2.7.2
, cabal2nix >= 2.11
, containers
, deepseq
, distribution-nixpkgs >= 1.1
Expand Down