@@ -10,8 +10,10 @@ import Distribution.Nixpkgs.Haskell.Stack.PrettyPrinting as PP
10import Distribution.Version (Version)
10import Distribution.Version (Version)
11import Distribution.Compiler (AbiTag(..), unknownCompilerInfo)
11import Distribution.Compiler (AbiTag(..), unknownCompilerInfo)
12import Distribution.Package (mkPackageName, pkgName)
12import Distribution.Package (mkPackageName, pkgName)
13+import Distribution.Text as Text (display)
13import Language.Nix as Nix
14import Language.Nix as Nix
14import Options.Applicative
15import Options.Applicative
16+import Paths_stack2nix ( version )
15import Runner.Cli
17import Runner.Cli
16import Stack.Config
18import Stack.Config
17import Stack.Types
19import Stack.Types
@@ -45,7 +47,7 @@ run = do
45 $ stackConf ^. scPackages
47 $ stackConf ^. scPackages
46 let out = PP.overrideHaskellPackages overrideConfig packages
48 let out = PP.overrideHaskellPackages overrideConfig packages
47 withFile (opts ^. optOutDerivation) WriteMode $ \h -> do
49 withFile (opts ^. optOutDerivation) WriteMode $ \h -> do
48− hPutStrLn h ("# Generated by stack2nix from " ++ stackYaml ^. syFilePath)
50+ hPutStrLn h ("# Generated by stackage2nix " ++ Text.display version ++ " from " ++ stackYaml ^. syFilePath)
49 hPrint h out
51 hPrint h out
51 reachable = fmap mkPackageName
53 reachable = fmap mkPackageName
@@ -63,10 +65,10 @@ run = do
63 nodes <- traverse (uncurry (buildNodeM s2nPackageSetConfig s2nPackageConfig))
65 nodes <- traverse (uncurry (buildNodeM s2nPackageSetConfig s2nPackageConfig))
64 $ Map.toList (bpPackages buildPlan)
66 $ Map.toList (bpPackages buildPlan)
65 withFile (opts ^. optOutStackagePackages) WriteMode $ \h -> do
67 withFile (opts ^. optOutStackagePackages) WriteMode $ \h -> do
66− hPutStrLn h ("# Generated by stack2nix from " ++ buildPlanFile)
68+ hPutStrLn h ("# Generated by stackage2nix " ++ Text.display version ++ " from " ++ buildPlanFile)
67 hPutStrLn h $ render $ pPrintOutPackages (view nodeDerivation <$> nodes)
69 hPutStrLn h $ render $ pPrintOutPackages (view nodeDerivation <$> nodes)
68 withFile (opts ^. optOutStackageConfig) WriteMode $ \h -> do
70 withFile (opts ^. optOutStackageConfig) WriteMode $ \h -> do
69− hPutStrLn h ("# Generated by stack2nix from " ++ buildPlanFile)
71+ hPutStrLn h ("# Generated by stackage2nix " ++ Text.display version ++ " from " ++ buildPlanFile)
70 hPutStrLn h $ render $ pPrintOutConfig (bpSystemInfo buildPlan) nodes
72 hPutStrLn h $ render $ pPrintOutConfig (bpSystemInfo buildPlan) nodes
72mkOverrideConfig :: Options -> Version -> OverrideConfig
74mkOverrideConfig :: Options -> Version -> OverrideConfig