Merge pull request #105 from domenkozar/issue-94

Fixes #94

Author: domenkozar

src/Stack2nix/External/Cabal2nix.hs

@@ -1,24 +1,29 @@
 {-# LANGUAGE RecordWildCards   #-}
+{-# LANGUAGE OverloadedStrings #-}
 
 module Stack2nix.External.Cabal2nix (
   cabal2nix
   ) where
 
-import           Cabal2nix                   (cabal2nixWithDB)
+import           Cabal2nix                   (cabal2nixWithDB, parseArgs, optNixpkgsIdentifier, Options)
+import           Control.Lens
 import           Data.Maybe                  (fromMaybe)
 import           Data.Text                   (Text, unpack)
+import qualified Distribution.Nixpkgs.Haskell.Hackage as DB
+import           Distribution.Nixpkgs.Haskell.Derivation (Derivation)
 import           Distribution.System         (Platform(..), Arch(..), OS(..))
+import           Language.Nix
 import           System.IO                   (hPutStrLn, stderr)
 import           Stack2nix.Types             (Args (..))
-import qualified Distribution.Nixpkgs.Haskell.Hackage as DB
-import           Distribution.Nixpkgs.Haskell.Derivation (Derivation)
+
 import           Text.PrettyPrint.HughesPJClass (Doc)
 
 cabal2nix :: Args -> FilePath -> Maybe Text -> Maybe FilePath -> DB.HackageDB -> IO (Either Doc Derivation)
 cabal2nix Args{..} uri commit subpath hackageDB = do
   let runCmdArgs = args $ fromMaybe "." subpath
   hPutStrLn stderr $ unwords ("+ cabal2nix":runCmdArgs)
-  cabal2nixWithDB hackageDB runCmdArgs
+  options <- parseArgs runCmdArgs
+  cabal2nixWithDB hackageDB $ cabalOptions options
 
   where
     args :: FilePath -> [String]
@@ -29,6 +34,13 @@ cabal2nix Args{..} uri commit subpath hackageDB = do
       , [uri]
       ]
 
+-- Override default nixpkgs resolver to do pkgs.attr instead of attr
+cabalOptions :: Options -> Options
+cabalOptions options =
+  options {
+    optNixpkgsIdentifier = \i -> Just (binding # (i, path # ["pkgs", i]))
+  }
+
 -- | Copied (and modified) from src/Distribution/Nixpkgs/Meta.hs
 fromCabalPlatform :: Platform -> String
 fromCabalPlatform (Platform I386 Linux)   = "i686-linux"

src/Stack2nix/External/Stack.hs

@@ -16,7 +16,6 @@ import           Data.Text                                      (pack, unpack)
 import           Distribution.Nixpkgs.Haskell.Derivation        (Derivation,
                                                                  configureFlags)
 import qualified Distribution.Nixpkgs.Haskell.Hackage           as DB
-import           Distribution.Nixpkgs.Haskell.PackageSourceSpec (loadHackageDB)
 import           Options.Applicative
 import           Path                                           (parseAbsFile)
 import           Stack.Build.Source                             (getGhcOptions, loadSourceMapFull)
@@ -48,6 +47,7 @@ import           Stack.Types.PackageIdentifier                  (PackageIdentifi
 import           Stack.Types.PackageName                        (PackageName)
 import           Stack.Types.Runner
 import           Stack2nix.External.Cabal2nix                   (cabal2nix)
+import           Stack2nix.Hackage                              (loadHackageDB)
 import           Stack2nix.Render                               (render)
 import           Stack2nix.Types                                (Args (..))
 import           Stack2nix.Util                                 (ensureExecutable,

src/Stack2nix/Hackage.hs

@@ -0,0 +1,42 @@
+-- | This module is needed to replace P.parseDB which would otherwise filter out
+--   deprecated packages, which may end up being in an LTS.
+module Stack2nix.Hackage
+  ( loadHackageDB
+  ) where
+
+import Control.Exception (SomeException, mapException)
+import qualified Data.Map as Map
+import Data.Time.Clock (UTCTime)
+import Distribution.Hackage.DB.Path               (hackageTarball)
+import qualified Distribution.Hackage.DB.Unparsed as U
+import qualified Distribution.Hackage.DB.Parsed   as P
+import Distribution.Package (PackageName)
+import Distribution.Hackage.DB.Errors (HackageDBPackageName(..))
+import qualified Distribution.Nixpkgs.Haskell.Hackage as H
+
+
+
+loadHackageDB :: Maybe FilePath
+              -- ^ The path to the Hackage database.
+              -> Maybe UTCTime
+              -- ^ If we have hackage-snapshot time.
+              -> IO H.HackageDB
+loadHackageDB optHackageDB optHackageSnapshot = do
+  dbPath <- maybe hackageTarball return optHackageDB
+  readTarball optHackageSnapshot dbPath
+
+
+readTarball :: Maybe UTCTime -> FilePath -> IO H.HackageDB
+readTarball ts p = do
+  dbu <- U.readTarball ts p
+  let dbp = parseDB dbu
+  return (Map.mapWithKey (H.parsePackageData dbu) dbp)
+
+
+parseDB :: U.HackageDB -> P.HackageDB
+parseDB = Map.mapWithKey parsePackageData
+
+parsePackageData :: PackageName -> U.PackageData -> P.PackageData
+parsePackageData pn (U.PackageData _ vs') =
+  mapException (\e -> HackageDBPackageName pn (e :: SomeException)) $
+   Map.mapWithKey (P.parseVersionData pn) $ vs'

stack.yaml

@@ -1,36 +1,13 @@
-resolver: lts-9.20
+resolver: lts-12.0
 
 packages:
 - '.'
-# https://github.com/peti/hackage-db/pull/7
-- location:
-   git: https://github.com/domenkozar/hackage-db
-   commit: 0b58f1062d0a87b06bbae343d3c5a2f86ba26537
-  extra-dep: true
-# https://github.com/NixOS/cabal2nix/pull/322
-- location:
-   git: https://github.com/NixOS/cabal2nix
-   commit: e72fbdfe57941627633006fa1fb4003e26619424
-  extra-dep: true
 
 extra-deps:
-- stack-1.6.3
-- Cabal-2.0.1.1
-- bindings-uname-0.1
-- path-0.6.1
-- path-io-1.3.3
-- ansi-terminal-0.7.1.1
-- ansi-wl-pprint-0.6.8.1
-- extra-1.6.2
-- hpack-0.21.2
-- unliftio-0.2.1.0
-
-flags: {}
+- cabal2nix-2.10.0
 
 nix:
   packages: [zlib,gmp,git,pcre,openssl]
 
-extra-package-dbs: []
-
 ghc-options:
   stack2nix: -Werror

stack2nix.cabal

@@ -19,24 +19,25 @@ source-repository head
 
 library
   hs-source-dirs:      src
-  build-depends:       base >=4.9 && <4.10
-                     , Cabal >= 2.0.0.2 && < 2.1
-                     , async >= 2.1.1.1 && < 2.2
-                     , cabal2nix >= 2.7 && < 2.8
+  build-depends:       base >=4.9 && <4.12
+                     , Cabal >= 2.0.0.2 && < 2.3
+                     , async >= 2.1.1.1 && < 2.3
+                     , cabal2nix >= 2.10 && < 2.11
                      , containers >= 0.5.7.1 && < 0.6
                      , directory >= 1.3 && < 1.4
                      , distribution-nixpkgs >= 1.1 && < 1.2
                      , filepath >= 1.4.1.1 && < 1.5
-                     , optparse-applicative >= 0.13.2 && < 0.14
+                     , hackage-db
+                     , optparse-applicative >= 0.13.2 && < 0.15
                      , pretty
                      , path
                      , language-nix
                      , lens
-                     , process >= 1.4.3 && < 1.5
+                     , process >= 1.4.3 && < 1.7
                      , regex-pcre >= 0.94.4 && < 0.95
                      , SafeSemaphore >= 0.10.1 && < 0.11
                      , stack >= 1.5.1
-                     , temporary >= 1.2.0.4 && < 1.3
+                     , temporary >= 1.2.0.4 && < 1.4
                      , text >= 1.2.2.1 && < 1.3
                      , time
   exposed-modules:     Stack2nix
@@ -48,16 +49,17 @@ library
                      , Stack2nix.External.Stack
                      , Stack2nix.External.VCS.Git
                      , Stack2nix.External.Util
+                     , Stack2nix.Hackage
                      , Paths_stack2nix
   ghc-options:         -Wall
   default-language:    Haskell2010
 
 executable stack2nix
   main-is:             Main.hs
-  build-depends:       base >=4.9 && <4.10
-                     , Cabal >= 2.0.0.2 && < 2.1
+  build-depends:       base
+                     , Cabal
                      , stack2nix
-                     , optparse-applicative >= 0.13.2 && < 0.14
+                     , optparse-applicative
                      , time
   hs-source-dirs:      stack2nix
   ghc-options:         -Wall -threaded -rtsopts -with-rtsopts=-N