git.iko.soy/typeable/stackage2nix
on master help sign in
Update to latest cabal2nix
35f8328Dmitry Bushev
src/Distribution/Nixpkgs/Haskell/Stack/PrettyPrinting.hs+1−1
compare with master
unifiedsplit
@@ -12,7 +12,7 @@ import Distribution.Nixpkgs.Haskell.Derivation
12import Distribution.Nixpkgs.Haskell.Packages.PrettyPrinting as PP
12import Distribution.Nixpkgs.Haskell.Packages.PrettyPrinting as PP
13import Distribution.Package
13import Distribution.Package
14import Distribution.Text
14import Distribution.Text
15−import Distribution.Version (Version(..))
15+import Distribution.Version (Version)
16import qualified Language.Nix.FilePath as Nix
16import qualified Language.Nix.FilePath as Nix
17import Language.Nix.PrettyPrinting as PP
17import Language.Nix.PrettyPrinting as PP
18
18
src/Runner.hs+3−3
@@ -7,9 +7,9 @@ import Distribution.Nixpkgs.Haskell.FromStack
7import Distribution.Nixpkgs.Haskell.FromStack.Package
7import Distribution.Nixpkgs.Haskell.FromStack.Package
8import Distribution.Nixpkgs.Haskell.Stack
8import Distribution.Nixpkgs.Haskell.Stack
9import Distribution.Nixpkgs.Haskell.Stack.PrettyPrinting as PP
9import Distribution.Nixpkgs.Haskell.Stack.PrettyPrinting as PP
10−import Distribution.Version (Version(..))
10+import Distribution.Version (Version)
11import Distribution.Compiler (AbiTag(..), unknownCompilerInfo)
11import Distribution.Compiler (AbiTag(..), unknownCompilerInfo)
12−import Distribution.Package (PackageName(..), pkgName)
12+import Distribution.Package (mkPackageName, pkgName)
13import Language.Nix as Nix
13import Language.Nix as Nix
14import Options.Applicative
14import Options.Applicative
15import Runner.Cli
15import Runner.Cli
@@ -56,7 +56,7 @@ run = do
56 hPutStrLn h ("# Generated by stack2nix from " ++ stackYaml ^. syFilePath)
56 hPutStrLn h ("# Generated by stack2nix from " ++ stackYaml ^. syFilePath)
57 hPrint h out
57 hPrint h out
58 let
58 let
59− reachable = fmap PackageName
59+ reachable = fmap mkPackageName
60 $ F.toList . F.foldr1 Set.union
60 $ F.toList . F.foldr1 Set.union
61 $ nodeDepends . mkNode <$> packages
61 $ nodeDepends . mkNode <$> packages
62 s2nLoader mHash pkgId =
62 s2nLoader mHash pkgId =
stack.yaml+7−5
@@ -1,13 +1,15 @@
1−resolver: lts-8.15
1+resolver: lts-9.0
2packages:
2packages:
3- '.'
3- '.'
4- location:
4- location:
5 git: https://github.com/4e6/cabal2nix.git
5 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
7 extra-dep: true
11 extra-dep: true
8extra-deps:
12extra-deps:
9−- distribution-nixpkgs-1.1
13+- Cabal-2.0.0.2
10−- hopenssl-2.2
11nix:
14nix:
12 packages: [icu openssl zlib]
15 packages: [icu openssl zlib]
13−