git.iko.soy/typeable/stackage2nix
on master help sign in
Initial support for LTS-13.
commit80194259a7ce6f539b2858f83b75dd5d79e4eaa3 authorNick <nick_s@fastmail.jp> dateThu 2 Apr 2020, 12:52 (7 years ago) parent86f11b8
3 files changed+22−13
compare with master
unifiedsplit
src/Distribution/Nixpkgs/Haskell/Stack.hs+6−5 src/LtsHaskell.hs+2−2 stack.yaml+14−6
src/Distribution/Nixpkgs/Haskell/Stack.hs+6−5
@@ -30,11 +30,12 @@ data StackPackagesConfig = StackPackagesConfig
3030makeLenses ''StackPackagesConfig
3131
3232getStackPackageFromDb :: DB.HackageDB -> StackPackage -> IO Package
33−getStackPackageFromDb hackageDb stackPackage = do
34− PackageSourceSpec.getPackage'
35− False
36− (pure hackageDb)
37− (stackLocationToSource (stackPackage ^. spLocation) (stackPackage ^. spDir))
33+getStackPackageFromDb hackageDb stackPackage = PackageSourceSpec.getPackage' PackageYamlHpack
34+ False
35+ (pure hackageDb)
36+ source
37+ where
38+ source = stackLocationToSource (stackPackage ^. spLocation) (stackPackage ^. spDir)
3839
3940stackLocationToSource
4041 :: PackageLocation
src/LtsHaskell.hs+2−2
@@ -46,7 +46,7 @@ getPackageFromRepo allCabalHashesPath mSha1Hash pkgId = do
4646 tarballSHA256 = fromMaybe
4747 (error (display pkgId ++ ": meta data has no SHA256 hash for the tarball"))
4848 (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
5050 return $ Package source False pkgDesc
5151
5252getPackageFromDb :: DB.HackageDB -> PackageIdentifier -> IO Package
@@ -79,7 +79,7 @@ buildPackageSetConfig
7979 -> BuildPlan
8080 -> IO PackageSetConfig
8181buildPackageSetConfig hackageDb optAllCabalHashes optNixpkgsRepository buildPlan = do
82− nixpkgs <- readNixpkgPackageMap optNixpkgsRepository Nothing
82+ nixpkgs <- readNixpkgPackageMap [optNixpkgsRepository]
8383 let
8484 systemInfo = bpSystemInfo buildPlan
8585 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
22extra-deps:
3− - yaml-0.8.31.1
4− - git: https://github.com/fpco/stackage-curator.git
5− commit: 73c5ed06602990c33d3fec1711e27875f283b6bf
6− - git: https://github.com/jwiegley/gitlib.git
7− commit: 70c99759b8b9377f67492fe29afb32f05882409d
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
10+ - git: git://github.com/fpco/stackage-curator.git
11+ commit: a9bf9ef02976f7d29ff0d977d9e0c19bba22d2cd
12+ - git: git://github.com/jwiegley/gitlib.git
13+ commit: 6520ffcfdc33a0f53fdeeb01c9ef2d55f8d367fb
814 subdirs:
915 - gitlib
1016 - gitlib-libgit2
1117
18+nix:
19+ packages: [icu libgit2 openssl zlib]