git.iko.soy/typeable/stackage2nix
on master help sign in
Upd: switch to dev cabal2nix version
cbc9f89Dmitry Bushev
src/Distribution/Nixpkgs/Haskell/Stack.hs+7−3
compare with master
unifiedsplit
@@ -58,15 +58,19 @@ stackLocationToSource = \case
58 HackagePackage p -> Source
58 HackagePackage p -> Source
59 { sourceUrl = "cabal://" ++ T.unpack p
59 { sourceUrl = "cabal://" ++ T.unpack p
60 , sourceRevision = mempty
60 , sourceRevision = mempty
61− , sourceHash = UnknownHash }
61+ , sourceHash = UnknownHash
62+ , sourceCabalDir = mempty }
62 StackPath p -> Source
63 StackPath p -> Source
63 { sourceUrl = T.unpack p
64 { sourceUrl = T.unpack p
64 , sourceRevision = mempty
65 , sourceRevision = mempty
65− , sourceHash = UnknownHash }
66+ , sourceHash = UnknownHash
67+ , sourceCabalDir = mempty }
68+
66 StackRepoGit rg -> Source
69 StackRepoGit rg -> Source
67 { sourceUrl = T.unpack $ rg ^. rgUri
70 { sourceUrl = T.unpack $ rg ^. rgUri
68 , sourceRevision = T.unpack $ rg ^. rgCommit
71 , sourceRevision = T.unpack $ rg ^. rgCommit
69− , sourceHash = UnknownHash }
72+ , sourceHash = UnknownHash
73+ , sourceCabalDir = mempty }
70
74
71packageDerivation
75packageDerivation
72 :: PackageConfig
76 :: PackageConfig
stack.yaml+6−2
@@ -1,6 +1,10 @@
1resolver: lts-8.15
1resolver: lts-8.15
2packages:
2packages:
3- '.'
3- '.'
4+- location:
5+ git: https://github.com/4e6/cabal2nix.git
6+ commit: 94a709c1d01e2c5ad2680be918566f24ab0b1099
7+ extra-dep: true
4extra-deps:
8extra-deps:
5−- list-t-1
9+- distribution-nixpkgs-1.1
6−- type-fun-0.1.1
10+- hopenssl-2.2
stack2nix.cabal+13−13
@@ -23,20 +23,20 @@ library
23 , Stack.Config.Yaml
23 , Stack.Config.Yaml
24 , Stack.Types
24 , Stack.Types
25 build-depends: base > 4.7 && < 5
25 build-depends: base > 4.7 && < 5
26− , Cabal > 1.24 && < 1.25
26+ , Cabal > 1.24
27− , QuickCheck > 2.9 && < 2.10
27+ , QuickCheck
28− , aeson > 1.0 && < 1.1
28+ , aeson
29− , bytestring > 0.10 && < 0.11
29+ , bytestring
30− , cabal2nix > 2.0 && < 2.1
30+ , cabal2nix >= 2.3
31− , deepseq > 1.4 && < 1.5
31+ , deepseq
32− , distribution-nixpkgs > 1 && < 1.1
32+ , distribution-nixpkgs >= 1.1
33 , filepath
33 , filepath
34− , language-nix > 2.1 && < 2.2
34+ , language-nix
35− , lens > 4.15 && < 4.16
35+ , lens
36− , optparse-applicative > 0.13 && < 0.14
36+ , optparse-applicative
37− , pretty > 1.1 && < 1.2
37+ , pretty
38− , text > 1.2 && < 1.3
38+ , text
39− , yaml > 0.8 && < 0.9
39+ , yaml
40 default-language: Haskell2010
40 default-language: Haskell2010
41 ghc-options: -Wall
41 ghc-options: -Wall
42
42