144c61c · typeable/cabal2nix

git.iko.soy/typeable/cabal2nix

Merge pull request #312 from ksaric/ksaric/add-hackage-snapshot

Added hackage snapshot time as an argument to cabal2nix.

commit144c61ca8a3d1fb85fe51541db5c5480b39fca34 authorPeter Simons <simons@cryp.to> dateTue 21 Nov 2017, 10:32 (9 years ago) parentea871b2 33163dd

2 files changed+39−12

compare with master

unifiedsplit

src/Cabal2nix.hs+12−1 src/Distribution/Nixpkgs/Haskell/PackageSourceSpec.hs+27−11

src/Cabal2nix.hs+12−1

@@ -12,6 +12,7 @@ import Data.Maybe ( fromMaybe )

1212import Data.Monoid ( (<>) )

1313import qualified Data.Set as Set

1414import Data.String

15+import Data.Time

1516import qualified Distribution.Compat.ReadP as P

1617import Distribution.Compiler

1718import Distribution.Nixpkgs.Fetch

@@ -52,6 +53,7 @@ data Options = Options

5253 , optCompiler :: CompilerId

5354 , optSystem :: Platform

5455 , optSubpath :: Maybe FilePath

56+ , optHackageSnapshot :: Maybe UTCTime

5557 , optUrl :: String

5658 }

5759 deriving (Show)

@@ -77,8 +79,17 @@ options = Options

7779 <*> option (readP parse) (long "compiler" <> help "compiler to use when evaluating the Cabal file" <> value buildCompilerId <> showDefaultWith display)

7880 <*> option (readP parsePlatform) (long "system" <> help "target system to use when evaluating the Cabal file" <> value buildPlatform <> showDefaultWith display)

7981 <*> optional (strOption $ long "subpath" <> metavar "PATH" <> help "Path to Cabal file's directory relative to the URI (default is root directory)")

82+ <*> optional (option utcTimeReader (long "hackage-snapshot" <> help "hackage snapshot time, ISO format"))

8083 <*> strArgument (metavar "URI")

8184

85+-- | A parser for the date. Hackage updates happen maybe once or twice a month.

86+-- Example: parseTime defaultTimeLocale "%FT%T%QZ" "2017-11-20T12:18:35Z" :: Maybe UTCTime

87+utcTimeReader :: ReadM UTCTime

88+utcTimeReader = eitherReader $ \arg ->

89+ case parseTimeM True defaultTimeLocale "%FT%T%QZ" arg of

90+ Nothing -> Left $ "Cannot parse date, ISO format used ('2017-11-20T12:18:35Z'): " ++ arg

91+ Just utcTime -> Right utcTime

92+

8293readP :: P.ReadP a a -> ReadM a

8394readP p = eitherReader $ \s -> case [ r' | (r',"") <- P.readP_to_S p s ] of

8495 (r:_) -> Right r

@@ -129,7 +140,7 @@ cabal2nix' :: [String] -> IO (Either Doc Derivation)

129140cabal2nix' args = do

130141 Options {..} <- handleParseResult $ execParserPure defaultPrefs pinfo args

131142

132− pkg <- getPackage optHpack optHackageDb $ Source optUrl (fromMaybe "" optRevision) (maybe UnknownHash Guess optSha256) (fromMaybe "" optSubpath)

143+ pkg <- getPackage optHpack optHackageDb optHackageSnapshot $ Source optUrl (fromMaybe "" optRevision) (maybe UnknownHash Guess optSha256) (fromMaybe "" optSubpath)

133144

134145 let

135146 withHpackOverrides :: Derivation -> Derivation

src/Distribution/Nixpkgs/Haskell/PackageSourceSpec.hs+27−11

@@ -9,6 +9,7 @@ import Control.Monad.Trans.Maybe

99import Data.List ( isSuffixOf, isPrefixOf )

1010import qualified Data.Map as DB

1111import Data.Maybe

12+import Data.Time

1213import Distribution.Nixpkgs.Fetch

1314import Distribution.Nixpkgs.Hashes

1415import qualified Distribution.Nixpkgs.Haskell.Hackage as DB

@@ -33,17 +34,29 @@ data Package = Package

3334 }

3435 deriving (Show)

3536

36−getPackage :: Bool -- ^ Whether hpack should regenerate the cabal file

37− -> Maybe FilePath -> Source -> IO Package

38−getPackage optHpack optHackageDB source = do

39− (derivSource, ranHpack, pkgDesc) <- fetchOrFromDB optHpack optHackageDB source

37+getPackage :: Bool

38+ -- ^ Whether hpack should regenerate the cabal file.

39+ -> Maybe FilePath

40+ -- ^ The path to the Hackage database.

41+ -> Maybe UTCTime

42+ -- ^ If we have hackage-snapshot time.

43+ -> Source

44+ -> IO Package

45+getPackage optHpack optHackageDB optHackageSnapshot source = do

46+ (derivSource, ranHpack, pkgDesc) <- fetchOrFromDB optHpack optHackageDB optHackageSnapshot source

4047 (\s -> Package s ranHpack pkgDesc) <$> maybe (sourceFromHackage (sourceHash source) (showPackageIdentifier pkgDesc) $ sourceCabalDir source) return derivSource

4148

42−fetchOrFromDB :: Bool -- ^ Whether hpack should regenerate the cabal file

43− -> Maybe FilePath -> Source -> IO (Maybe DerivationSource, Bool, Cabal.GenericPackageDescription)

44−fetchOrFromDB optHpack optHackageDB src

49+fetchOrFromDB :: Bool

50+ -- ^ Whether hpack should regenerate the cabal file

51+ -> Maybe FilePath

52+ -- ^ The path to the Hackage database.

53+ -> Maybe UTCTime

54+ -- ^ If we have hackage-snapshot time.

55+ -> Source

56+ -> IO (Maybe DerivationSource, Bool, Cabal.GenericPackageDescription)

57+fetchOrFromDB optHpack optHackageDB optHackageSnapshot src

4558 | "cabal://" `isPrefixOf` sourceUrl src = do

46− (msrc, pkgDesc) <- fromDB optHackageDB . drop (length "cabal://") $ sourceUrl src

59+ (msrc, pkgDesc) <- fromDB optHackageDB optHackageSnapshot . drop (length "cabal://") $ sourceUrl src

4760 return (msrc, False, pkgDesc)

4861 | otherwise = do

4962 r <- fetch (\dir -> cabalFromPath optHpack (dir </> sourceCabalDir src)) src

@@ -52,10 +65,13 @@ fetchOrFromDB optHpack optHackageDB src

5265 Just (derivSource, (externalSource, ranHpack, pkgDesc)) -> do

5366 return (derivSource <$ guard externalSource, ranHpack, pkgDesc)

5467

55−fromDB :: Maybe FilePath -> String -> IO (Maybe DerivationSource, Cabal.GenericPackageDescription)

56−fromDB optHackageDB pkg = do

68+fromDB :: Maybe FilePath

69+ -> Maybe UTCTime

70+ -> String

71+ -> IO (Maybe DerivationSource, Cabal.GenericPackageDescription)

72+fromDB optHackageDB optHackageSnapshot pkg = do

5773 dbPath <- maybe DB.hackageTarball return optHackageDB

58− db <- DB.readTarball Nothing dbPath

74+ db <- DB.readTarball optHackageSnapshot dbPath

5975 vd <- maybe unknownPackageError return (DB.lookup name db >>= lookupVersion)

6076 let ds = case DB.tarballSha256 vd of

6177 Nothing -> Nothing