git.iko.soy/typeable/stackage2nix
on master help sign in
swap
a78e4331 ahead, 1 behind
4 files changed+14−23
since splitsnapshots
unifiedsplit
README.md+1−1 src/Distribution/Nixpkgs/Haskell/Stack.hs+5−6 src/LtsHaskell.hs+2−2 stack.yaml+6−14
README.md+1−1
@@ -1,4 +1,4 @@
1−# stackage2nix
1+# stackage2nix (DEPRECATED)
22
33[![Build Status](https://travis-ci.org/typeable/stackage2nix.svg?branch=master)](https://travis-ci.org/typeable/stackage2nix)
44
src/Distribution/Nixpkgs/Haskell/Stack.hs+5−6
@@ -30,12 +30,11 @@ data StackPackagesConfig = StackPackagesConfig
3030makeLenses ''StackPackagesConfig
3131
3232getStackPackageFromDb :: DB.HackageDB -> StackPackage -> IO Package
33−getStackPackageFromDb hackageDb stackPackage = PackageSourceSpec.getPackage' PackageYamlHpack
34− False
35− (pure hackageDb)
36− source
37− where
38− source = stackLocationToSource (stackPackage ^. spLocation) (stackPackage ^. spDir)
33+getStackPackageFromDb hackageDb stackPackage = do
34+ PackageSourceSpec.getPackage'
35+ False
36+ (pure hackageDb)
37+ (stackLocationToSource (stackPackage ^. spLocation) (stackPackage ^. spDir))
3938
4039stackLocationToSource
4140 :: 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 Nothing
49+ source = DerivationSource "url" ("mirror://hackage/" ++ display pkgId ++ ".tar.gz") "" tarballSHA256
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]
82+ nixpkgs <- readNixpkgPackageMap optNixpkgsRepository Nothing
8383 let
8484 systemInfo = bpSystemInfo buildPlan
8585 packageVersions = fmap ppVersion (bpPackages buildPlan) `Map.union` siCorePackages systemInfo
stack.yaml+6−14
@@ -1,19 +1,11 @@
1−resolver: lts-13.21
1+resolver: lts-12.2
22extra-deps:
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
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
148 subdirs:
159 - gitlib
1610 - gitlib-libgit2
1711
18−nix:
19− packages: [icu libgit2 openssl zlib]