35f8328 · typeable/stackage2nix

git.iko.soy/typeable/stackage2nix

Update to latest cabal2nix

commit35f83287d13ed9afd8a507f47c7aaa9be0a535e0 authorDmitry Bushev <bushevdv@gmail.com> dateMon 7 Aug 2017, 18:40 (9 years ago) parent0d49276

3 files changed+11−9

compare with master

unifiedsplit

src/Distribution/Nixpkgs/Haskell/Stack/PrettyPrinting.hs+1−1 src/Runner.hs+3−3 stack.yaml+7−5

src/Distribution/Nixpkgs/Haskell/Stack/PrettyPrinting.hs+1−1

@@ -12,7 +12,7 @@ import Distribution.Nixpkgs.Haskell.Derivation

1212import Distribution.Nixpkgs.Haskell.Packages.PrettyPrinting as PP

1313import Distribution.Package

1414import Distribution.Text

15−import Distribution.Version (Version(..))

15+import Distribution.Version (Version)

1616import qualified Language.Nix.FilePath as Nix

1717import Language.Nix.PrettyPrinting as PP

1818

src/Runner.hs+3−3

@@ -7,9 +7,9 @@ import Distribution.Nixpkgs.Haskell.FromStack

77import Distribution.Nixpkgs.Haskell.FromStack.Package

88import Distribution.Nixpkgs.Haskell.Stack

99import Distribution.Nixpkgs.Haskell.Stack.PrettyPrinting as PP

10−import Distribution.Version (Version(..))

10+import Distribution.Version (Version)

1111import Distribution.Compiler (AbiTag(..), unknownCompilerInfo)

12−import Distribution.Package (PackageName(..), pkgName)

12+import Distribution.Package (mkPackageName, pkgName)

1313import Language.Nix as Nix

1414import Options.Applicative

1515import Runner.Cli

@@ -56,7 +56,7 @@ run = do

5656 hPutStrLn h ("# Generated by stack2nix from " ++ stackYaml ^. syFilePath)

5757 hPrint h out

5858 let

59− reachable = fmap PackageName

59+ reachable = fmap mkPackageName

6060 $ F.toList . F.foldr1 Set.union

6161 $ nodeDepends . mkNode <$> packages

6262 s2nLoader mHash pkgId =

stack.yaml+7−5

@@ -1,13 +1,15 @@

1−resolver: lts-8.15

1+resolver: lts-9.0

22packages:

33- '.'

44- location:

55 git: https://github.com/4e6/cabal2nix.git

6− commit: d4f48bd655e523dcef2cc3860cf1ab171ae4a225

6+ commit: 7993728ea70101036a3558acea58cc49a67ac569

7+ extra-dep: true

8+- location:

9+ git: https://github.com/fpco/stackage-curator.git

10+ commit: 3a3feeb6cc9e40bfbd7383c5e8975cd16420d822

711 extra-dep: true

812extra-deps:

9−- distribution-nixpkgs-1.1

10−- hopenssl-2.2

13+- Cabal-2.0.0.2

1114nix:

1215 packages: [icu openssl zlib]

13−