Skip to content

Generate --subpath for local targets #107

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Generate --subpath for local targets #107

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 20 additions & 9 deletions src/Stack2nix/External/Stack.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import Distribution.Nixpkgs.Haskell.PackageSourceSpec (loadHackageDB)
import Options.Applicative
import Path (parseAbsFile)
import Stack.Build.Source (getGhcOptions, loadSourceMapFull)
import Stack.Build.Target (NeedTargets (..))
import Stack.Build.Target (NeedTargets (..), Target)
import Stack.Config
import Stack.Options.BuildParser
import Stack.Options.GlobalParser
Expand All @@ -37,7 +37,8 @@ import Stack.Types.Compiler (CVType (..),
import Stack.Types.Config
import Stack.Types.Config.Build (BuildCommand (..))
import Stack.Types.Nix
import Stack.Types.Package (PackageSource (..),
import Stack.Types.Package (LocalPackage (..),
PackageSource (..),
lpLocation,
lpPackage,
packageName,
Expand All @@ -64,6 +65,7 @@ import Text.PrettyPrint.HughesPJClass (Doc)
data PackageRef
= HackagePackage PackageIdentifierRevision
| NonHackagePackage PackageIdentifier (PackageLocation FilePath)
| TargetPackage PackageIdentifier FilePath
deriving (Eq, Show)

genNixFile :: Args -> FilePath -> Maybe String -> Maybe String -> DB.HackageDB -> PackageRef -> IO (Either Doc Derivation)
Expand All @@ -80,14 +82,22 @@ genNixFile args baseDir uri argRev hackageDB pkgRef = do
projRoot <- canonicalizePath $ cwd </> baseDir
let defDir = baseDir </> makeRelative projRoot path
cabal2nix args (fromMaybe defDir uri) (pack <$> argRev) (const relPath <$> uri) hackageDB
TargetPackage _ident path -> do
projRoot <- canonicalizePath $ cwd </> baseDir
let relPath = makeRelative projRoot path
cabal2nix args baseDir (pack <$> argRev) (Just relPath) hackageDB

-- TODO: remove once we use flags, options
sourceMapToPackages :: Map PackageName PackageSource -> [PackageRef]
sourceMapToPackages = map sourceToPackage . M.elems
sourceMapToPackages :: Map PackageName Target -> Map PackageName PackageSource -> [PackageRef]
sourceMapToPackages targets = map sourceToPackage . M.toList
where
sourceToPackage :: PackageSource -> PackageRef
sourceToPackage (PSIndex _ _flags _options pir) = HackagePackage pir
sourceToPackage (PSFiles lp _) =
sourceToPackage :: (PackageName, PackageSource) -> PackageRef
sourceToPackage (_, (PSIndex _ _flags _options pir)) = HackagePackage pir
sourceToPackage (name, (PSFiles lp@(LocalPackage { lpLocation = PLFilePath fp }) _)) | name `M.member` targets =
let pkg = lpPackage lp
ident = PackageIdentifier (packageName pkg) (packageVersion pkg)
in TargetPackage ident fp
sourceToPackage (_, (PSFiles lp _)) =
let pkg = lpPackage lp
ident = PackageIdentifier (packageName pkg) (packageVersion pkg)
in NonHackagePackage ident (lpLocation lp)
Expand All @@ -102,10 +112,10 @@ planAndGenerate
-> String
-> RIO env ()
planAndGenerate boptsCli baseDir remoteUri args@Args {..} ghcnixversion = do
(_targets, _mbp, _locals, _extraToBuild, sourceMap) <- loadSourceMapFull
(targets, _mbp, _locals, _extraToBuild, sourceMap) <- loadSourceMapFull
NeedTargets
boptsCli
let pkgs = sourceMapToPackages sourceMap
let pkgs = sourceMapToPackages targets sourceMap
liftIO $ logDebug args $ "plan:\n" ++ show pkgs

hackageDB <- liftIO $ loadHackageDB Nothing argHackageSnapshot
Expand Down Expand Up @@ -138,6 +148,7 @@ addGhcOptions buildConf pkgRef drv =
pkgName = case pkgRef of
HackagePackage (PackageIdentifierRevision (PackageIdentifier n _) _) -> n
NonHackagePackage (PackageIdentifier n _) _ -> n
TargetPackage (PackageIdentifier n _) _ -> n

runPlan :: FilePath
-> Maybe String
Expand Down