git.iko.soy/typeable/stackage2nix
on 8019425 help sign in
a78e433
swap
1 ahead, 1 behind
src/Distribution/Nixpkgs/Haskell/Stack.hs+6−5
since splitsnapshots
unifiedsplit
@@ -30,11 +30,12 @@ data StackPackagesConfig = StackPackagesConfig
30makeLenses ''StackPackagesConfig
30makeLenses ''StackPackagesConfig
31
31
32getStackPackageFromDb :: DB.HackageDB -> StackPackage -> IO Package
32getStackPackageFromDb :: DB.HackageDB -> StackPackage -> IO Package
33−getStackPackageFromDb hackageDb stackPackage = do
33+getStackPackageFromDb hackageDb stackPackage = PackageSourceSpec.getPackage' PackageYamlHpack
34− PackageSourceSpec.getPackage'
35− False
34+ False
36− (pure hackageDb)
35+ (pure hackageDb)
36+ source
37+ where
37− (stackLocationToSource (stackPackage ^. spLocation) (stackPackage ^. spDir))
38+ source = stackLocationToSource (stackPackage ^. spLocation) (stackPackage ^. spDir)
38
39
39stackLocationToSource
40stackLocationToSource
40 :: PackageLocation
41 :: PackageLocation
src/LtsHaskell.hs+2−2
@@ -46,7 +46,7 @@ getPackageFromRepo allCabalHashesPath mSha1Hash pkgId = do
46 tarballSHA256 = fromMaybe
46 tarballSHA256 = fromMaybe
47 (error (display pkgId ++ ": meta data has no SHA256 hash for the tarball"))
47 (error (display pkgId ++ ": meta data has no SHA256 hash for the tarball"))
48 (view (mHashes . at "SHA256") meta)
48 (view (mHashes . at "SHA256") meta)
49− source = DerivationSource "url" ("mirror://hackage/" ++ display pkgId ++ ".tar.gz") "" tarballSHA256
49+ source = DerivationSource "url" ("mirror://hackage/" ++ display pkgId ++ ".tar.gz") "" tarballSHA256 Nothing
50 return $ Package source False pkgDesc
50 return $ Package source False pkgDesc
51
51
52getPackageFromDb :: DB.HackageDB -> PackageIdentifier -> IO Package
52getPackageFromDb :: DB.HackageDB -> PackageIdentifier -> IO Package
@@ -79,7 +79,7 @@ buildPackageSetConfig
79 -> BuildPlan
79 -> BuildPlan
80 -> IO PackageSetConfig
80 -> IO PackageSetConfig
81buildPackageSetConfig hackageDb optAllCabalHashes optNixpkgsRepository buildPlan = do
81buildPackageSetConfig hackageDb optAllCabalHashes optNixpkgsRepository buildPlan = do
82− nixpkgs <- readNixpkgPackageMap optNixpkgsRepository Nothing
82+ nixpkgs <- readNixpkgPackageMap [optNixpkgsRepository]
83 let
83 let
84 systemInfo = bpSystemInfo buildPlan
84 systemInfo = bpSystemInfo buildPlan
85 packageVersions = fmap ppVersion (bpPackages buildPlan) `Map.union` siCorePackages systemInfo
85 packageVersions = fmap ppVersion (bpPackages buildPlan) `Map.union` siCorePackages systemInfo
stack.yaml+14−6
@@ -1,11 +1,19 @@
1−resolver: lts-12.2
1+resolver: lts-13.21
2extra-deps:
2extra-deps:
3− - yaml-0.8.31.1
3+ - git: https://github.com/typeable/cabal2nix.git
4+ commit: d88a8fac1ad5766e73c0426f13eef086be022973
5+ - distribution-nixpkgs-1.3.1
6+ - hpack-0.31.2
7+ - store-0.7.2
8+ - store-core-0.4.4.2
9+ - th-utilities-0.2.4.0
4− - git: https://github.com/fpco/stackage-curator.git
10+ - git: git://github.com/fpco/stackage-curator.git
5− commit: 73c5ed06602990c33d3fec1711e27875f283b6bf
11+ commit: a9bf9ef02976f7d29ff0d977d9e0c19bba22d2cd
6− - git: https://github.com/jwiegley/gitlib.git
12+ - git: git://github.com/jwiegley/gitlib.git
7− commit: 70c99759b8b9377f67492fe29afb32f05882409d
13+ commit: 6520ffcfdc33a0f53fdeeb01c9ef2d55f8d367fb
8 subdirs:
14 subdirs:
9 - gitlib
15 - gitlib
10 - gitlib-libgit2
16 - gitlib-libgit2
11
17
18+nix:
19+ packages: [icu libgit2 openssl zlib]