cbc9f89 · typeable/stackage2nix

git.iko.soy/typeable/stackage2nix

Upd: switch to dev cabal2nix version

commitcbc9f89bbcb20fb21d358c5f58cdde5006dace0b authorDmitry Bushev <bushevdv@gmail.com> dateMon 29 May 2017, 22:30 (9 years ago) parent9e02554

3 files changed+26−18

compare with master

unifiedsplit

src/Distribution/Nixpkgs/Haskell/Stack.hs+7−3 stack.yaml+6−2 stack2nix.cabal+13−13

src/Distribution/Nixpkgs/Haskell/Stack.hs+7−3

@@ -58,15 +58,19 @@ stackLocationToSource = \case

5858 HackagePackage p -> Source

5959 { sourceUrl = "cabal://" ++ T.unpack p

6060 , sourceRevision = mempty

61− , sourceHash = UnknownHash }

61+ , sourceHash = UnknownHash

62+ , sourceCabalDir = mempty }

6263 StackPath p -> Source

6364 { sourceUrl = T.unpack p

6465 , sourceRevision = mempty

65− , sourceHash = UnknownHash }

66+ , sourceHash = UnknownHash

67+ , sourceCabalDir = mempty }

68+

6669 StackRepoGit rg -> Source

6770 { sourceUrl = T.unpack $ rg ^. rgUri

6871 , sourceRevision = T.unpack $ rg ^. rgCommit

69− , sourceHash = UnknownHash }

72+ , sourceHash = UnknownHash

73+ , sourceCabalDir = mempty }

7074

7175packageDerivation

7276 :: PackageConfig

stack.yaml+6−2

@@ -1,6 +1,10 @@

11resolver: lts-8.15

22packages:

33- '.'

4+- location:

5+ git: https://github.com/4e6/cabal2nix.git

6+ commit: 94a709c1d01e2c5ad2680be918566f24ab0b1099

7+ extra-dep: true

48extra-deps:

5−- list-t-1

6−- type-fun-0.1.1

9+- distribution-nixpkgs-1.1

10+- hopenssl-2.2

stack2nix.cabal+13−13

@@ -23,20 +23,20 @@ library

2323 , Stack.Config.Yaml

2424 , Stack.Types

2525 build-depends: base > 4.7 && < 5

26− , Cabal > 1.24 && < 1.25

27− , QuickCheck > 2.9 && < 2.10

28− , aeson > 1.0 && < 1.1

29− , bytestring > 0.10 && < 0.11

30− , cabal2nix > 2.0 && < 2.1

31− , deepseq > 1.4 && < 1.5

32− , distribution-nixpkgs > 1 && < 1.1

26+ , Cabal > 1.24

27+ , QuickCheck

28+ , aeson

29+ , bytestring

30+ , cabal2nix >= 2.3

31+ , deepseq

32+ , distribution-nixpkgs >= 1.1

3333 , filepath

34− , language-nix > 2.1 && < 2.2

35− , lens > 4.15 && < 4.16

36− , optparse-applicative > 0.13 && < 0.14

37− , pretty > 1.1 && < 1.2

38− , text > 1.2 && < 1.3

39− , yaml > 0.8 && < 0.9

34+ , language-nix

35+ , lens

36+ , optparse-applicative

37+ , pretty

38+ , text

39+ , yaml

4040 default-language: Haskell2010

4141 ghc-options: -Wall

4242