From edffc6f071864c9342d82081889c0340ec0b7e08 Mon Sep 17 00:00:00 2001 From: Kirill Zaborsky Date: Wed, 5 Dec 2018 09:47:48 +0300 Subject: [PATCH] Hackage revisions support --- src/Stack2nix/External/Stack.hs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Stack2nix/External/Stack.hs b/src/Stack2nix/External/Stack.hs index 2a16f54..48fa40d 100644 --- a/src/Stack2nix/External/Stack.hs +++ b/src/Stack2nix/External/Stack.hs @@ -43,7 +43,7 @@ import Stack.Types.Package (PackageSource ( packageVersion) import Stack.Types.PackageIdentifier (PackageIdentifier (..), PackageIdentifierRevision (..), - packageIdentifierString) + packageIdentifierRevisionString) import Stack.Types.PackageName (PackageName) import Stack.Types.Runner import Stack.Types.Version (Version) @@ -72,8 +72,8 @@ genNixFile args ghcVersion baseDir uri argRev hackageDB pkgRef = do cwd <- getCurrentDirectory case pkgRef of NonHackagePackage _flags _ident PLArchive {} -> error "genNixFile: No support for archive package locations" - HackagePackage flags (PackageIdentifierRevision pkg _) -> - cabal2nix args ghcVersion ("cabal://" <> packageIdentifierString pkg) Nothing Nothing flags hackageDB + HackagePackage flags pir -> + cabal2nix args ghcVersion ("cabal://" <> packageIdentifierRevisionString pir) Nothing Nothing flags hackageDB NonHackagePackage flags _ident (PLRepo repo) -> cabal2nix args ghcVersion (unpack $ repoUrl repo) (Just $ repoCommit repo) (Just (repoSubdirs repo)) flags hackageDB NonHackagePackage flags _ident (PLFilePath path) -> do