@@ -5,48 +5,63 @@
55{-# LANGUAGE MultiWayIf #-}
66{-# LANGUAGE OverloadedStrings #-}
77{-# LANGUAGE PatternGuards #-}
8−{-# LANGUAGE QuasiQuotes #-}
98{-# LANGUAGE ScopedTypeVariables #-}
109{-# LANGUAGE TypeApplications #-}
11−module Obelisk.Command.Thunk where
10+module Obelisk.Command.Thunk
11+ ( ThunkPtr (..)
12+ , ThunkRev (..)
13+ , ThunkSource (..)
14+ , ThunkData (..)
15+ , ReadThunkError (..)
16+ , GitHubSource (..)
17+ , getThunkGitBranch
18+ , getLatestRev
19+ , updateThunkToLatest
20+ , createThunk
21+ , createThunkWithLatest
22+ , nixBuildAttrWithCache
23+ , nixBuildThunkAttrWithCache
24+ , unpackThunk
25+ , packThunk
26+ , readThunk
27+ , updateThunk
28+ , getThunkPtr
29+ , getThunkPtr'
30+ , parseGitUri
31+ , uriThunkPtr
32+ , setThunk
33+ , setThunk'
34+ ) where
1235
1336import Control.Applicative
1437import Control.Exception (displayException, try)
15−import Control.Lens (ifor, ifor_, (.~))
38+import qualified Control.Lens as Lens
39+import Control.Lens.Indexed hiding ((<.>))
1640import Control.Monad
17−import Control.Monad.Extra (findM)
18−import Control.Monad.Catch (MonadCatch, handle)
41+import Control.Monad.Catch (handle)
1942import Control.Monad.Except
2043import Data.Aeson ((.=))
2144import qualified Data.Aeson as Aeson
2245import Data.Aeson.Encode.Pretty
2346import qualified Data.Aeson.Types as Aeson
24−import Data.Bifunctor (first)
2547import qualified Data.ByteString.Lazy as LBS
26−import Data.Containers.ListUtils (nubOrd)
2748import Data.Default
2849import Data.Either.Combinators (fromRight', rightToMaybe)
29−import Data.Foldable (toList)
30−import Data.Function ((&))
31−import Data.Functor ((<&>))
3250import Data.Git.Ref (Ref)
3351import qualified Data.Git.Ref as Ref
3452import qualified Data.List as L
35−import Data.List.NonEmpty (NonEmpty (..), nonEmpty)
53+import Data.List.NonEmpty (NonEmpty (..))
3654import qualified Data.List.NonEmpty as NonEmpty
3755import Data.Map (Map)
3856import qualified Data.Map as Map
3957import Data.Maybe
4058import Data.Set (Set)
4159import qualified Data.Set as Set
42−import Data.String.Here.Interpolated (i)
43−import Data.String.Here.Uninterpolated (here)
4460import Data.Text (Text)
4561import qualified Data.Text as T
4662import Data.Text.Encoding
4763import qualified Data.Text.IO as T
4864import Data.Time.Clock.POSIX (posixSecondsToUTCTime)
49−import Data.Traversable (for)
5065import Data.Yaml (parseMaybe)
5166import GitHub
5267import GitHub.Data.Name
@@ -56,8 +71,9 @@ import System.Exit
5671import System.FilePath
5772import System.IO.Error
5873import System.IO.Temp
59−import System.PosixCompat.Files (getSymbolicLinkStatus, modificationTime)
60−import qualified Text.URI as URI
74+import System.Posix (getSymbolicLinkStatus, modificationTime)
75+import System.Process (proc)
76+import Text.URI
6177
6278import Obelisk.App (MonadObelisk)
6379import Obelisk.CliApp
@@ -65,10 +81,11 @@ import Obelisk.Command.Utils
6581
6682--TODO: Support symlinked thunk data
6783data ThunkData
68− = ThunkData_Packed ThunkSpec ThunkPtr
84+ = ThunkData_Packed ThunkPtr
6985 -- ^ Packed thunk
70− | ThunkData_Checkout
86+ | ThunkData_Checkout (Maybe ThunkPtr)
7187 -- ^ Checked out thunk that was unpacked from this pointer
88+ deriving (Show, Eq, Ord)
7289
7390-- | A reference to the exact data that a thunk should translate into
7491data ThunkPtr = ThunkPtr
@@ -81,7 +98,7 @@ type NixSha256 = Text --TODO: Use a smart constructor and make this actually ver
8198
8299-- | A specific revision of data; it may be available from multiple sources
83100data ThunkRev = ThunkRev
84− { _thunkRev_commit :: Ref Ref.SHA1
101+ { _thunkRev_commit :: Ref
85102 , _thunkRev_nixSha256 :: NixSha256
86103 }
87104 deriving (Show, Eq, Ord)
@@ -94,72 +111,41 @@ data ThunkSource
94111 | ThunkSource_Git GitSource
95112 deriving (Show, Eq, Ord)
96113
97−thunkSourceToGitSource :: ThunkSource -> GitSource
98−thunkSourceToGitSource = \case
99− ThunkSource_GitHub s -> forgetGithub False s
100− ThunkSource_Git s -> s
101−
102114data GitHubSource = GitHubSource
103115 { _gitHubSource_owner :: Name Owner
104116 , _gitHubSource_repo :: Name Repo
105117 , _gitHubSource_branch :: Maybe (Name Branch)
106− , _gitHubSource_private :: Bool
107118 }
108119 deriving (Show, Eq, Ord)
109120
110−newtype GitUri = GitUri { unGitUri :: URI.URI } deriving (Eq, Ord, Show)
111−
112−gitUriToText :: GitUri -> Text
113−gitUriToText (GitUri uri)
114− | (T.toLower . URI.unRText <$> URI.uriScheme uri) == Just "file"
115− , Just (_, path) <- URI.uriPath uri
116− = "/" <> T.intercalate "/" (map URI.unRText $ NonEmpty.toList path)
117− | otherwise = URI.render uri
118−
119121data GitSource = GitSource
120− { _gitSource_url :: GitUri
122+ { _gitSource_url :: URI
121123 , _gitSource_branch :: Maybe (Name Branch)
122124 , _gitSource_fetchSubmodules :: Bool
123− , _gitSource_private :: Bool
124125 }
125126 deriving (Show, Eq, Ord)
126127
127−newtype ThunkConfig = ThunkConfig
128− { _thunkConfig_private :: Maybe Bool
129− } deriving Show
130−
131−data ThunkUpdateConfig = ThunkUpdateConfig
132− { _thunkUpdateConfig_branch :: Maybe String
133− , _thunkUpdateConfig_config :: ThunkConfig
134− } deriving Show
135−
136−data ThunkPackConfig = ThunkPackConfig
137− { _thunkPackConfig_force :: Bool
138− , _thunkPackConfig_config :: ThunkConfig
139− } deriving Show
140−
141128-- | Convert a GitHub source to a regular Git source. Assumes no submodules.
142129forgetGithub :: Bool -> GitHubSource -> GitSource
143130forgetGithub useSsh s = GitSource
144− { _gitSource_url = GitUri $ URI.URI
145− { URI.uriScheme = Just $ fromRight' $ URI.mkScheme $ if useSsh then "ssh" else "https"
146− , URI.uriAuthority = Right $ URI.Authority
147− { URI.authUserInfo = URI.UserInfo (fromRight' $ URI.mkUsername "git") Nothing
131+ { _gitSource_url = URI
132+ { uriScheme = Just $ fromRight' $ mkScheme $ if useSsh then "ssh" else "https"
133+ , uriAuthority = Right $ Authority
134+ { authUserInfo = UserInfo (fromRight' $ mkUsername "git") Nothing
148135 <$ guard useSsh
149− , URI.authHost = fromRight' $ URI.mkHost "github.com"
150− , URI.authPort = Nothing
136+ , authHost = fromRight' $ mkHost "github.com"
137+ , authPort = Nothing
151138 }
152− , URI.uriPath = Just ( False
153− , fromRight' . URI.mkPathPiece <$>
139+ , uriPath = Just ( False
140+ , fromRight' . mkPathPiece <$>
154141 untagName (_gitHubSource_owner s)
155142 :| [ untagName (_gitHubSource_repo s) <> ".git" ]
156143 )
157− , URI.uriQuery = []
158− , URI.uriFragment = Nothing
144+ , uriQuery = []
145+ , uriFragment = Nothing
159146 }
160147 , _gitSource_branch = _gitHubSource_branch s
161148 , _gitSource_fetchSubmodules = False
162− , _gitSource_private = _gitHubSource_private s
163149 }
164150
165151getThunkGitBranch :: ThunkPtr -> Maybe Text
@@ -167,26 +153,26 @@ getThunkGitBranch (ThunkPtr _ src) = fmap untagName $ case src of
167153 ThunkSource_GitHub s -> _gitHubSource_branch s
168154 ThunkSource_Git s -> _gitSource_branch s
169155
170−commitNameToRef :: Name Commit -> Ref Ref.SHA1
156+commitNameToRef :: Name Commit -> Ref
171157commitNameToRef (N c) = Ref.fromHex $ encodeUtf8 c
172158
173159-- TODO: Use spinner here.
174160getNixSha256ForUriUnpacked
175161 :: MonadObelisk m
176− => GitUri
162+ => URI
177163 -> m NixSha256
178164getNixSha256ForUriUnpacked uri =
179− withExitFailMessage ("nix-prefetch-url: Failed to determine sha256 hash of URL " <> gitUriToText uri) $ do
165+ withExitFailMessage ("nix-prefetch-url: Failed to determine sha256 hash of URL " <> render uri) $ do
180166 [hash] <- fmap T.lines $ readProcessAndLogOutput (Debug, Debug) $
181− proc nixPrefetchUrlPath ["--unpack", "--type", "sha256", T.unpack $ gitUriToText uri]
167+ proc "nix-prefetch-url" ["--unpack" , "--type" , "sha256" , T.unpack $ render uri]
182168 pure hash
183169
184−nixPrefetchGit :: MonadObelisk m => GitUri -> Text -> Bool -> m NixSha256
170+nixPrefetchGit :: MonadObelisk m => URI -> Text -> Bool -> m NixSha256
185171nixPrefetchGit uri rev fetchSubmodules =
186− withExitFailMessage ("nix-prefetch-git: Failed to determine sha256 hash of Git repo " <> gitUriToText uri <> " at " <> rev) $ do
172+ withExitFailMessage ("nix-prefetch-git: Failed to determine sha256 hash of Git repo " <> render uri <> " at " <> rev) $ do
187173 out <- readProcessAndLogStderr Debug $
188− proc nixPrefetchGitPath $ filter (/="")
189− [ "--url", T.unpack $ gitUriToText uri
174+ proc "nix-prefetch-git" $ filter (/="")
175+ [ "--url", T.unpack $ render uri
190176 , "--rev", T.unpack rev
191177 , if fetchSubmodules then "--fetch-submodules" else ""
192178 , "--quiet"
@@ -198,117 +184,93 @@ nixPrefetchGit uri rev fetchSubmodules =
198184
199185--TODO: Pretty print these
200186data ReadThunkError
201− = ReadThunkError_UnrecognizedThunk
202− | ReadThunkError_UnrecognizedPaths (NonEmpty FilePath)
203− | ReadThunkError_MissingPaths (NonEmpty FilePath)
204− | ReadThunkError_UnparseablePtr FilePath String
205− | ReadThunkError_FileError IOError
206− | ReadThunkError_FileDoesNotMatch FilePath Text
207− | ReadThunkError_UnrecognizedState String
208− | ReadThunkError_AmbiguousPackedState ThunkPtr ThunkPtr
209− deriving (Show)
210−
211−unpackedDirName :: FilePath
212−unpackedDirName = "."
213−
214−attrCacheFileName :: FilePath
215−attrCacheFileName = ".attr-cache"
216−
217−-- | Specification for how a file in a thunk version works.
218−data ThunkFileSpec
219− = ThunkFileSpec_Ptr (LBS.ByteString -> Either String ThunkPtr) -- ^ This file specifies 'ThunkPtr' data
220− | ThunkFileSpec_FileMatches Text -- ^ This file must match the given content exactly
221− | ThunkFileSpec_CheckoutIndicator -- ^ Existence of this directory indicates that the thunk is unpacked
222− | ThunkFileSpec_AttrCache -- ^ This directory is an attribute cache
223−
224−-- | Specification for how a set of files in a thunk version work.
225−data ThunkSpec = ThunkSpec
226− { _thunkSpec_name :: !Text
227− , _thunkSpec_files :: !(Map FilePath ThunkFileSpec)
187+ = ReadThunkError_UnrecognizedFiles
188+ | ReadThunkError_AmbiguousFiles
189+ | ReadThunkError_UnrecognizedLoader Text
190+ | ReadThunkError_UnparseablePtr LBS.ByteString
191+ deriving (Show)
192+
193+-- | Read a thunk and validate that it is only a thunk, either packed or unpacked.
194+-- If the thunk is packed and additional data is present, fail.
195+readThunk :: MonadObelisk m => FilePath -> m (Either ReadThunkError ThunkData)
196+readThunk thunkDir = do
197+ files <- liftIO $ listDirectory thunkDir
198+ case ".git" `elem` files of
199+ True -> fmap ThunkData_Checkout <$> do
200+ let origThunkPath = thunkDir </> ".git" </> "obelisk" </> "orig-thunk"
201+ liftIO $ doesDirectoryExist origThunkPath >>= \case
202+ True -> fmap Just <$> readPackedThunk origThunkPath
203+ False -> return $ return Nothing
204+ False -> liftIO $ fmap ThunkData_Packed <$> readPackedThunk thunkDir
205+
206+data ThunkType = ThunkType
207+ { _thunkType_loader :: FilePath
208+ , _thunkType_json :: FilePath
209+ , _thunkType_optional :: Set FilePath
210+ , _thunkType_loaderVersions :: NonEmpty Text
211+ , _thunkType_parser :: Aeson.Object -> Aeson.Parser ThunkPtr
228212 }
229213
230−thunkSpecTypes :: NonEmpty (NonEmpty ThunkSpec)
231−thunkSpecTypes = gitThunkSpecs :| [gitHubThunkSpecs]
232−
233−-- | Attempts to match a 'ThunkSpec' to a given directory.
234−matchThunkSpecToDir
235− :: (MonadError ReadThunkError m, MonadIO m, MonadCatch m)
236− => ThunkSpec -- ^ 'ThunkSpec' to match against the given files/directory
237− -> FilePath -- ^ Path to directory
238− -> Set FilePath -- ^ Set of file paths relative to the given directory
239− -> m ThunkData
240−matchThunkSpecToDir thunkSpec dir dirFiles = do
241− case nonEmpty (toList $ dirFiles `Set.difference` expectedPaths) of
242− Just fs -> throwError $ ReadThunkError_UnrecognizedPaths $ (dir </>) <$> fs
243− Nothing -> pure ()
244− case nonEmpty (toList $ requiredPaths `Set.difference` dirFiles) of
245− Just fs -> throwError $ ReadThunkError_MissingPaths $ (dir </>) <$> fs
246− Nothing -> pure ()
247− datas <- fmap toList $ flip Map.traverseMaybeWithKey (_thunkSpec_files thunkSpec) $ \expectedPath -> \case
248− ThunkFileSpec_AttrCache -> Nothing <$ dirMayExist expectedPath
249− ThunkFileSpec_CheckoutIndicator -> liftIO (doesDirectoryExist (dir </> expectedPath)) <&> \case
250− False -> Nothing
251− True -> Just ThunkData_Checkout
252− ThunkFileSpec_FileMatches expectedContents -> handle (\(e :: IOError) -> throwError $ ReadThunkError_FileError e) $ do
253− actualContents <- liftIO (T.readFile $ dir </> expectedPath)
254− case T.strip expectedContents == T.strip actualContents of
255− True -> pure Nothing
256− False -> throwError $ ReadThunkError_FileDoesNotMatch (dir </> expectedPath) expectedContents
257− ThunkFileSpec_Ptr parser -> handle (\(e :: IOError) -> throwError $ ReadThunkError_FileError e) $ do
258− let path = dir </> expectedPath
259− liftIO (doesFileExist path) >>= \case
260− False -> pure Nothing
261− True -> do
262− actualContents <- liftIO $ LBS.readFile path
263− case parser actualContents of
264− Right v -> pure $ Just (ThunkData_Packed thunkSpec v)
265− Left e -> throwError $ ReadThunkError_UnparseablePtr (dir </> expectedPath) e
266−
267− case nonEmpty datas of
268− Nothing -> throwError ReadThunkError_UnrecognizedThunk
269− Just xs -> fold1WithM xs $ \a b -> either throwError pure (mergeThunkData a b)
270− where
271− rootPathsOnly = Set.fromList . mapMaybe takeRootDir . Map.keys
272− takeRootDir = fmap NonEmpty.head . nonEmpty . splitPath
273−
274− expectedPaths = rootPathsOnly $ _thunkSpec_files thunkSpec
275−
276− requiredPaths = rootPathsOnly $ Map.filter isRequiredFileSpec $ _thunkSpec_files thunkSpec
277− isRequiredFileSpec = \case
278− ThunkFileSpec_FileMatches _ -> True
279− _ -> False
280−
281− dirMayExist expectedPath = liftIO (doesFileExist (dir </> expectedPath)) >>= \case
282− True -> throwError $ ReadThunkError_UnrecognizedPaths $ expectedPath :| []
283− False -> pure ()
284−
285− -- Combine 'ThunkData' from different files, preferring "Checkout" over "Packed"
286− mergeThunkData ThunkData_Checkout ThunkData_Checkout = Right ThunkData_Checkout
287− mergeThunkData ThunkData_Checkout ThunkData_Packed{} = Left bothPackedAndUnpacked
288− mergeThunkData ThunkData_Packed{} ThunkData_Checkout = Left bothPackedAndUnpacked
289− mergeThunkData a@(ThunkData_Packed _ ptrA) (ThunkData_Packed _ ptrB) =
290− if ptrA == ptrB then Right a else Left $ ReadThunkError_AmbiguousPackedState ptrA ptrB
291−
292− bothPackedAndUnpacked = ReadThunkError_UnrecognizedState "Both packed data and checkout present"
293−
294− fold1WithM (x :| xs) f = foldM f x xs
295−
296−readThunkWith
297− :: (MonadObelisk m)
298− => NonEmpty (NonEmpty ThunkSpec) -> FilePath -> m (Either ReadThunkError ThunkData)
299−readThunkWith specTypes dir = do
300− dirFiles <- Set.fromList <$> liftIO (listDirectory dir)
301− let specs = concatMap toList $ toList $ NonEmpty.transpose specTypes -- Interleave spec types so we try each one in a "fair" ordering
302− flip fix specs $ \loop -> \case
303− [] -> pure $ Left ReadThunkError_UnrecognizedThunk
304− spec:rest -> runExceptT (matchThunkSpecToDir spec dir dirFiles) >>= \case
305− Left e -> putLog Debug [i|Thunk specification ${_thunkSpec_name spec} did not match ${dir}: ${e}|] *> loop rest
306− x@(Right _) -> x <$ putLog Debug [i|Thunk specification ${_thunkSpec_name spec} matched ${dir}|]
214+gitHubThunkType :: ThunkType
215+gitHubThunkType = ThunkType
216+ { _thunkType_loader = "default.nix"
217+ , _thunkType_json = "github.json"
218+ , _thunkType_optional = Set.fromList [".attr-cache"]
219+ , _thunkType_loaderVersions = gitHubStandaloneLoaders
220+ , _thunkType_parser = parseThunkPtr $ \v ->
221+ ThunkSource_GitHub <$> parseGitHubSource v <|> ThunkSource_Git <$> parseGitSource v
222+ }
223+
224+gitThunkType :: ThunkType
225+gitThunkType = ThunkType
226+ { _thunkType_loader = "default.nix"
227+ , _thunkType_json = "git.json"
228+ , _thunkType_optional = Set.fromList [".attr-cache"]
229+ , _thunkType_loaderVersions = plainGitStandaloneLoaders
230+ , _thunkType_parser = parseThunkPtr $ fmap ThunkSource_Git . parseGitSource
231+ }
232+
233+thunkTypes :: [ThunkType]
234+thunkTypes = [gitThunkType, gitHubThunkType]
235+
236+findThunkType :: [ThunkType] -> FilePath -> IO (Either ReadThunkError ThunkType)
237+findThunkType types thunkDir = do
238+ matches <- fmap catMaybes $ forM types $ \thunkType -> do
239+ let
240+ expectedContents = Set.fromList $ (thunkDir </>) <$>
241+ [ _thunkType_loader thunkType
242+ , _thunkType_json thunkType
243+ ]
244+ optionalContents = Set.map (thunkDir </>) (_thunkType_optional thunkType)
245+
246+ -- Ensure that there aren't any other files in the thunk
247+ -- NB: System.Directory.listDirectory returns the contents without the directory path
248+ files <- liftIO $ Set.fromList . fmap (thunkDir </>) <$> listDirectory thunkDir
249+ let unexpectedContents = files `Set.difference` (expectedContents `Set.union` optionalContents)
250+ missingContents = expectedContents `Set.difference` files
251+ pure $ if Set.null unexpectedContents && Set.null missingContents
252+ then Just thunkType
253+ else Nothing
254+
255+ pure $ case matches of
256+ [singleMatch] -> Right singleMatch
257+ [] -> Left ReadThunkError_UnrecognizedFiles
258+ _ -> Left ReadThunkError_AmbiguousFiles
307259
308260-- | Read a thunk and validate that it is exactly a packed thunk.
309261-- If additional data is present, fail.
310−readThunk :: (MonadObelisk m) => FilePath -> m (Either ReadThunkError ThunkData)
311−readThunk = readThunkWith thunkSpecTypes
262+readPackedThunk :: FilePath -> IO (Either ReadThunkError ThunkPtr)
263+readPackedThunk thunkDir = runExceptT $ do
264+ thunkType <- ExceptT $ findThunkType thunkTypes thunkDir
265+ -- Ensure that we recognize the thunk loader
266+ loader <- liftIO $ T.readFile $ thunkDir </> _thunkType_loader thunkType
267+ unless (loader `elem` _thunkType_loaderVersions thunkType) $ do
268+ throwError $ ReadThunkError_UnrecognizedLoader loader
269+
270+ txt <- liftIO $ LBS.readFile $ thunkDir </> _thunkType_json thunkType
271+ case parseMaybe (_thunkType_parser thunkType) =<< Aeson.decode txt of
272+ Nothing -> throwError $ ReadThunkError_UnparseablePtr txt
273+ Just ptr -> return ptr
312274
313275parseThunkPtr :: (Aeson.Object -> Aeson.Parser ThunkSource) -> Aeson.Object -> Aeson.Parser ThunkPtr
314276parseThunkPtr parseSrc v = do
@@ -328,12 +290,10 @@ parseGitHubSource v = do
328290 owner <- v Aeson..: "owner"
329291 repo <- v Aeson..: "repo"
330292 branch <- v Aeson..:! "branch"
331− private <- v Aeson..:? "private"
332293 pure $ GitHubSource
333294 { _gitHubSource_owner = owner
334295 , _gitHubSource_repo = repo
335296 , _gitHubSource_branch = branch
336− , _gitHubSource_private = fromMaybe False private
337297 }
338298
339299parseGitSource :: Aeson.Object -> Aeson.Parser GitSource
@@ -341,29 +301,25 @@ parseGitSource v = do
341301 Just url <- parseGitUri <$> v Aeson..: "url"
342302 branch <- v Aeson..:! "branch"
343303 fetchSubmodules <- v Aeson..:! "fetchSubmodules"
344− private <- v Aeson..:? "private"
345304 pure $ GitSource
346305 { _gitSource_url = url
347306 , _gitSource_branch = branch
348307 , _gitSource_fetchSubmodules = fromMaybe False fetchSubmodules
349− , _gitSource_private = fromMaybe False private
350308 }
351309
352310overwriteThunk :: MonadObelisk m => FilePath -> ThunkPtr -> m ()
353311overwriteThunk target thunk = do
354312 -- Ensure that this directory is a valid thunk (i.e. so we aren't losing any data)
355− readThunk target >>= \case
356− Left e -> failWith [i|Invalid thunk at ${target}: ${e}|]
357− Right _ -> pure ()
313+ Right _ <- readThunk target
358314
359315 --TODO: Is there a safer way to do this overwriting?
360− liftIO $ removePathForcibly target
361− createThunk target $ Right thunk
316+ liftIO $ removeDirectoryRecursive target
317+ liftIO $ createThunk target thunk
362318
363−thunkPtrToSpec :: ThunkPtr -> ThunkSpec
364−thunkPtrToSpec thunk = case _thunkPtr_source thunk of
365− ThunkSource_GitHub _ -> NonEmpty.head gitHubThunkSpecs
366− ThunkSource_Git _ -> NonEmpty.head gitThunkSpecs
319+thunkPtrLoader :: ThunkPtr -> Text
320+thunkPtrLoader thunk = case _thunkPtr_source thunk of
321+ ThunkSource_GitHub _ -> NonEmpty.head gitHubStandaloneLoaders
322+ ThunkSource_Git _ -> NonEmpty.head plainGitStandaloneLoaders
367323
368324-- It's important that formatting be very consistent here, because
369325-- otherwise when people update thunks, their patches will be messy
@@ -375,15 +331,13 @@ encodeThunkPtrData (ThunkPtr rev src) = case src of
375331 , ("branch" .=) <$> _gitHubSource_branch s
376332 , Just $ "rev" .= Ref.toHexString (_thunkRev_commit rev)
377333 , Just $ "sha256" .= _thunkRev_nixSha256 rev
378− , Just $ "private" .= _gitHubSource_private s
379334 ]
380335 ThunkSource_Git s -> encodePretty' plainGitCfg $ Aeson.object $ catMaybes
381− [ Just $ "url" .= gitUriToText (_gitSource_url s)
336+ [ Just $ "url" .= render (_gitSource_url s)
382337 , Just $ "rev" .= Ref.toHexString (_thunkRev_commit rev)
383338 , ("branch" .=) <$> _gitSource_branch s
384339 , Just $ "sha256" .= _thunkRev_nixSha256 rev
385340 , Just $ "fetchSubmodules" .= _gitSource_fetchSubmodules s
386− , Just $ "private" .= _gitSource_private s
387341 ]
388342 where
389343 githubCfg = defConfig
@@ -404,84 +358,59 @@ encodeThunkPtrData (ThunkPtr rev src) = case src of
404358 [ "url"
405359 , "rev"
406360 , "sha256"
407− , "private"
408361 , "fetchSubmodules"
409362 ] <> compare
410363 , confTrailingNewline = True
411364 }
412365
413−createThunk :: MonadObelisk m => FilePath -> Either ThunkSpec ThunkPtr -> m ()
414−createThunk target ptrInfo =
415− ifor_ (_thunkSpec_files spec) $ \path -> \case
416− ThunkFileSpec_FileMatches content -> withReadyPath path $ \p -> liftIO $ T.writeFile p content
417− ThunkFileSpec_Ptr _ -> case ptrInfo of
418− Left _ -> pure () -- We can't write the ptr without it
419− Right ptr -> withReadyPath path $ \p -> liftIO $ LBS.writeFile p (encodeThunkPtrData ptr)
420− _ -> pure ()
421− where
422− spec = either id thunkPtrToSpec ptrInfo
423− withReadyPath path f = do
424− let fullPath = target </> path
425− putLog Debug $ "Writing thunk file " <> T.pack fullPath
426− liftIO $ createDirectoryIfMissing True $ takeDirectory fullPath
427− f fullPath
366+createThunk :: MonadIO m => FilePath -> ThunkPtr -> m ()
367+createThunk target thunk = liftIO $ do
368+ createDirectoryIfMissing True (target </> ".attr-cache")
369+ T.writeFile (target </> "default.nix") (thunkPtrLoader thunk)
370+ let
371+ jsonFileName = case _thunkPtr_source thunk of
372+ ThunkSource_GitHub _ -> "github"
373+ ThunkSource_Git _ -> "git"
374+ LBS.writeFile (target </> jsonFileName <.> "json") (encodeThunkPtrData thunk)
428375
429376createThunkWithLatest :: MonadObelisk m => FilePath -> ThunkSource -> m ()
430377createThunkWithLatest target s = do
431378 rev <- getLatestRev s
432− createThunk target $ Right $ ThunkPtr
379+ createThunk target $ ThunkPtr
433380 { _thunkPtr_source = s
434381 , _thunkPtr_rev = rev
435382 }
436383
437−updateThunkToLatest :: MonadObelisk m => ThunkUpdateConfig -> FilePath -> m ()
438−updateThunkToLatest (ThunkUpdateConfig mBranch thunkConfig) target = spinner $ do
439− checkThunkDirectory target
440− -- check to see if thunk should be updated to a specific branch or just update it's current branch
441− case mBranch of
442− Nothing -> do
443− (overwrite, ptr) <- readThunk target >>= \case
444− Left err -> failWith [i|Thunk update: ${err}|]
445− Right c -> case c of
446− ThunkData_Packed _ t -> return (target, t)
447− ThunkData_Checkout -> failWith "cannot update an unpacked thunk"
448− let src = _thunkPtr_source ptr
449− rev <- getLatestRev src
450− overwriteThunk overwrite $ modifyThunkPtrByConfig thunkConfig $ ThunkPtr
451− { _thunkPtr_source = src
452− , _thunkPtr_rev = rev
453− }
454− Just branch -> readThunk target >>= \case
455− Left err -> failWith [i|Thunk update: ${err}|]
456− Right c -> case c of
457− ThunkData_Packed _ t -> setThunk thunkConfig target (thunkSourceToGitSource $ _thunkPtr_source t) branch
458− ThunkData_Checkout -> failWith [i|Thunk located at ${target} is unpacked. Use 'ob thunk pack' on the desired directory and then try 'ob thunk update' again.|]
459− where
460− spinner = withSpinner' ("Updating thunk " <> T.pack target <> " to latest") (pure $ const $ "Thunk " <> T.pack target <> " updated to latest")
461−
462−setThunk :: MonadObelisk m => ThunkConfig -> FilePath -> GitSource -> String -> m ()
463−setThunk thunkConfig target gs branch = do
464− newThunkPtr <- uriThunkPtr (_gitSource_url gs) (_thunkConfig_private thunkConfig) (Just $ T.pack branch) Nothing
465− overwriteThunk target newThunkPtr
466− updateThunkToLatest (ThunkUpdateConfig Nothing thunkConfig) target
384+updateThunkToLatest :: MonadObelisk m => FilePath -> m ()
385+updateThunkToLatest target = withSpinner' ("Updating thunk " <> T.pack target <> " to latest") (pure $ const $ "Thunk " <> T.pack target <> " updated to latest") $ do
386+ (overwrite, ptr) <- readThunk target >>= \case
387+ Left err -> failWith $ T.pack $ "thunk update: " <> show err
388+ Right c -> case c of
389+ ThunkData_Packed t -> return (target, t)
390+ ThunkData_Checkout _ -> failWith "cannot update an unpacked thunk"
391+ let src = _thunkPtr_source ptr
392+ rev <- getLatestRev src
393+ overwriteThunk overwrite $ ThunkPtr
394+ { _thunkPtr_source = src
395+ , _thunkPtr_rev = rev
396+ }
467397
468398-- | All recognized github standalone loaders, ordered from newest to oldest.
469399-- This tool will only ever produce the newest one when it writes a thunk.
470−gitHubThunkSpecs :: NonEmpty ThunkSpec
471−gitHubThunkSpecs =
472− gitHubThunkSpecV5 :|
473− [ gitHubThunkSpecV4
474− , gitHubThunkSpecV3
475− , gitHubThunkSpecV2
476− , gitHubThunkSpecV1
400+gitHubStandaloneLoaders :: NonEmpty Text
401+gitHubStandaloneLoaders =
402+ gitHubStandaloneLoaderV2 :|
403+ [ gitHubStandaloneLoaderV3
404+ , gitHubStandaloneLoaderV1
477405 ]
478406
479−gitHubThunkSpecV1 :: ThunkSpec
480−gitHubThunkSpecV1 = legacyGitHubThunkSpec "github-v1"
481− "import ((import <nixpkgs> {}).fetchFromGitHub (builtins.fromJSON (builtins.readFile ./github.json)))"
407+gitHubStandaloneLoaderV1 :: Text
408+gitHubStandaloneLoaderV1 = T.unlines
409+ [ "import ((import <nixpkgs> {}).fetchFromGitHub (builtins.fromJSON (builtins.readFile ./github.json)))"
410+ ]
482411
483−gitHubThunkSpecV2 :: ThunkSpec
484−gitHubThunkSpecV2 = legacyGitHubThunkSpec "github-v2" $ T.unlines
412+gitHubStandaloneLoaderV2 :: Text
413+gitHubStandaloneLoaderV2 = T.unlines
485414 [ "# DO NOT HAND-EDIT THIS FILE" --TODO: Add something about how to get more info on Obelisk, etc.
486415 , "import ((import <nixpkgs> {}).fetchFromGitHub ("
487416 , " let json = builtins.fromJSON (builtins.readFile ./github.json);"
@@ -491,8 +420,8 @@ gitHubThunkSpecV2 = legacyGitHubThunkSpec "github-v2" $ T.unlines
491420 , "))"
492421 ]
493422
494−gitHubThunkSpecV3 :: ThunkSpec
495−gitHubThunkSpecV3 = legacyGitHubThunkSpec "github-v3" $ T.unlines
423+gitHubStandaloneLoaderV3 :: Text
424+gitHubStandaloneLoaderV3 = T.unlines
496425 [ "# DO NOT HAND-EDIT THIS FILE"
497426 , "let"
498427 , " fetch = { private ? false, ... }@args: if private && builtins.hasAttr \"fetchGit\" builtins"
@@ -511,62 +440,22 @@ gitHubThunkSpecV3 = legacyGitHubThunkSpec "github-v3" $ T.unlines
511440 , "in import (fetch (builtins.fromJSON (builtins.readFile ./github.json)))"
512441 ]
513442
514−gitHubThunkSpecV4 :: ThunkSpec
515−gitHubThunkSpecV4 = legacyGitHubThunkSpec "github-v4" $ T.unlines
516− [ "# DO NOT HAND-EDIT THIS FILE"
517− , "let fetch = { private ? false, fetchSubmodules ? false, owner, repo, rev, sha256, ... }:"
518− , " if !fetchSubmodules && !private then builtins.fetchTarball {"
519− , " url = \"https://github.com/${owner}/${repo}/archive/${rev}.tar.gz\"; inherit sha256;"
520− , " } else (import <nixpkgs> {}).fetchFromGitHub {"
521− , " inherit owner repo rev sha256 fetchSubmodules private;"
522− , " };"
523− , "in import (fetch (builtins.fromJSON (builtins.readFile ./github.json)))"
443+plainGitStandaloneLoaders :: NonEmpty Text
444+plainGitStandaloneLoaders =
445+ plainGitStandaloneLoaderV1 :|
446+ [ plainGitStandaloneLoaderV2
524447 ]
525448
526−legacyGitHubThunkSpec :: Text -> Text -> ThunkSpec
527−legacyGitHubThunkSpec name loader = ThunkSpec name $ Map.fromList
528− [ ("default.nix", ThunkFileSpec_FileMatches $ T.strip loader)
529− , ("github.json" , ThunkFileSpec_Ptr parseGitHubJsonBytes)
530− , (attrCacheFileName, ThunkFileSpec_AttrCache)
531− , (".git", ThunkFileSpec_CheckoutIndicator)
532− ]
533−
534−gitHubThunkSpecV5 :: ThunkSpec
535−gitHubThunkSpecV5 = mkThunkSpec "github-v5" "github.json" parseGitHubJsonBytes [here|
536−# DO NOT HAND-EDIT THIS FILE
537−let fetch = { private ? false, fetchSubmodules ? false, owner, repo, rev, sha256, ... }:
538− if !fetchSubmodules && !private then builtins.fetchTarball {
539− url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; inherit sha256;
540− } else (import <nixpkgs> {}).fetchFromGitHub {
541− inherit owner repo rev sha256 fetchSubmodules private;
542− };
543− json = builtins.fromJSON (builtins.readFile ./github.json);
544−in fetch json
545−|]
546−
547−parseGitHubJsonBytes :: LBS.ByteString -> Either String ThunkPtr
548−parseGitHubJsonBytes = parseJsonObject $ parseThunkPtr $ \v ->
549− ThunkSource_GitHub <$> parseGitHubSource v <|> ThunkSource_Git <$> parseGitSource v
550−
551−gitThunkSpecs :: NonEmpty ThunkSpec
552−gitThunkSpecs =
553− gitThunkSpecV5 :|
554− [ gitThunkSpecV4
555− , gitThunkSpecV3
556− , gitThunkSpecV2
557− , gitThunkSpecV1
558− ]
559−
560−gitThunkSpecV1 :: ThunkSpec
561−gitThunkSpecV1 = legacyGitThunkSpec "git-v1" $ T.unlines
449+plainGitStandaloneLoaderV1 :: Text
450+plainGitStandaloneLoaderV1 = T.unlines
562451 [ "# DO NOT HAND-EDIT THIS FILE"
563452 , "let fetchGit = {url, rev, ref ? null, branch ? null, sha256 ? null, fetchSubmodules ? null}:"
564453 , " assert !fetchSubmodules; (import <nixpkgs> {}).fetchgit { inherit url rev sha256; };"
565454 , "in import (fetchGit (builtins.fromJSON (builtins.readFile ./git.json)))"
566455 ]
567456
568−gitThunkSpecV2 :: ThunkSpec
569−gitThunkSpecV2 = legacyGitThunkSpec "git-v2" $ T.unlines
457+plainGitStandaloneLoaderV2 :: Text
458+plainGitStandaloneLoaderV2 = T.unlines
570459 [ "# DO NOT HAND-EDIT THIS FILE"
571460 , "let fetchGit = {url, rev, ref ? null, branch ? null, sha256 ? null, fetchSubmodules ? null}:"
572461 , " if builtins.hasAttr \"fetchGit\" builtins"
@@ -575,87 +464,10 @@ gitThunkSpecV2 = legacyGitThunkSpec "git-v2" $ T.unlines
575464 , "in import (fetchGit (builtins.fromJSON (builtins.readFile ./git.json)))"
576465 ]
577466
578−-- This loader has a bug because @builtins.fetchGit@ is not given a @ref@
579−-- and will fail to find commits without this because it does shallow clones.
580−gitThunkSpecV3 :: ThunkSpec
581−gitThunkSpecV3 = legacyGitThunkSpec "git-v3" $ T.unlines
582− [ "# DO NOT HAND-EDIT THIS FILE"
583− , "let fetch = {url, rev, ref ? null, sha256 ? null, fetchSubmodules ? false, private ? false, ...}:"
584− , " let realUrl = let firstChar = builtins.substring 0 1 url; in"
585− , " if firstChar == \"/\" then /. + url"
586− , " else if firstChar == \".\" then ./. + url"
587− , " else url;"
588− , " in if !fetchSubmodules && private then builtins.fetchGit {"
589− , " url = realUrl; inherit rev;"
590− , " } else (import <nixpkgs> {}).fetchgit {"
591− , " url = realUrl; inherit rev sha256;"
592− , " };"
593− , "in import (fetch (builtins.fromJSON (builtins.readFile ./git.json)))"
594− ]
595−
596−gitThunkSpecV4 :: ThunkSpec
597−gitThunkSpecV4 = legacyGitThunkSpec "git-v4" $ T.unlines
598− [ "# DO NOT HAND-EDIT THIS FILE"
599− , "let fetch = {url, rev, branch ? null, sha256 ? null, fetchSubmodules ? false, private ? false, ...}:"
600− , " let realUrl = let firstChar = builtins.substring 0 1 url; in"
601− , " if firstChar == \"/\" then /. + url"
602− , " else if firstChar == \".\" then ./. + url"
603− , " else url;"
604− , " in if !fetchSubmodules && private then builtins.fetchGit {"
605− , " url = realUrl; inherit rev;"
606− , " ${if branch == null then null else \"ref\"} = branch;"
607− , " } else (import <nixpkgs> {}).fetchgit {"
608− , " url = realUrl; inherit rev sha256;"
609− , " };"
610− , "in import (fetch (builtins.fromJSON (builtins.readFile ./git.json)))"
611− ]
612−
613−legacyGitThunkSpec :: Text -> Text -> ThunkSpec
614−legacyGitThunkSpec name loader = ThunkSpec name $ Map.fromList
615− [ ("default.nix", ThunkFileSpec_FileMatches $ T.strip loader)
616− , ("git.json" , ThunkFileSpec_Ptr parseGitJsonBytes)
617− , (attrCacheFileName, ThunkFileSpec_AttrCache)
618− , (".git", ThunkFileSpec_CheckoutIndicator)
619− ]
620−
621−gitThunkSpecV5 :: ThunkSpec
622−gitThunkSpecV5 = mkThunkSpec "git-v5" "git.json" parseGitJsonBytes [here|
623−# DO NOT HAND-EDIT THIS FILE
624−let fetch = {url, rev, branch ? null, sha256 ? null, fetchSubmodules ? false, private ? false, ...}:
625− let realUrl = let firstChar = builtins.substring 0 1 url; in
626− if firstChar == "/" then /. + url
627− else if firstChar == "." then ./. + url
628− else url;
629− in if !fetchSubmodules && private then builtins.fetchGit {
630− url = realUrl; inherit rev;
631− ${if branch == null then null else "ref"} = branch;
632− } else (import <nixpkgs> {}).fetchgit {
633− url = realUrl; inherit rev sha256;
634− };
635− json = builtins.fromJSON (builtins.readFile ./git.json);
636−in fetch json
637−|]
638−
639−parseGitJsonBytes :: LBS.ByteString -> Either String ThunkPtr
640−parseGitJsonBytes = parseJsonObject $ parseThunkPtr $ fmap ThunkSource_Git . parseGitSource
641−
642−mkThunkSpec :: Text -> FilePath -> (LBS.ByteString -> Either String ThunkPtr) -> Text -> ThunkSpec
643−mkThunkSpec name jsonFileName parser srcNix = ThunkSpec name $ Map.fromList
644− [ ("default.nix", ThunkFileSpec_FileMatches defaultNixViaSrc)
645− , ("thunk.nix", ThunkFileSpec_FileMatches srcNix)
646− , (jsonFileName, ThunkFileSpec_Ptr parser)
647− , (attrCacheFileName, ThunkFileSpec_AttrCache)
648− , (normalise $ unpackedDirName </> ".git", ThunkFileSpec_CheckoutIndicator)
649− ]
650− where
651− defaultNixViaSrc = [here|
652−# DO NOT HAND-EDIT THIS FILE
653−import (import ./thunk.nix)
654−|]
655−
467+thunkFileNames :: [FilePath]
468+thunkFileNames = ["default.nix", "github.json", "git.json"]
656469
657−parseJsonObject :: (Aeson.Object -> Aeson.Parser a) -> LBS.ByteString -> Either String a
658−parseJsonObject p bytes = Aeson.parseEither p =<< Aeson.eitherDecode bytes
470+--TODO: when checking something out, make a shallow clone
659471
660472-- | Checks a cache directory to see if there is a fresh symlink
661473-- to the result of building an attribute of a thunk.
@@ -663,49 +475,44 @@ parseJsonObject p bytes = Aeson.parseEither p =<< Aeson.eitherDecode bytes
663475-- and the result is symlinked into the cache.
664476nixBuildThunkAttrWithCache
665477 :: MonadObelisk m
666− => ThunkSpec
667− -> FilePath
478+ => FilePath
668479 -- ^ Path to directory containing Thunk
669480 -> String
670481 -- ^ Attribute to build
671− -> m (Maybe FilePath)
482+ -> m FilePath
672483 -- ^ Symlink to cached or built nix output
673484-- WARNING: If the thunk uses an impure reference such as '<nixpkgs>'
674485-- the caching mechanism will fail as it merely measures the modification
675486-- time of the cache link and the expression to build.
676−nixBuildThunkAttrWithCache thunkSpec thunkDir attr = do
487+nixBuildThunkAttrWithCache thunkDir attr = do
488+ --NB: Expects thunkDir to be normalised with no trailing path separator.
489+ --This should be guaranteed by the command argument parser.
490+ let cacheErrHandler e
491+ | isDoesNotExistError e = return Nothing -- expected from a cache miss
492+ | otherwise = putLog Error (T.pack $ displayException e) >> return Nothing
493+ cacheDir = thunkDir </> ".attr-cache"
494+ cachePath = cacheDir </> attr <.> "out"
677495 latestChange <- liftIO $ do
678− let
679− getModificationTimeMaybe = fmap rightToMaybe . try @IOError . getModificationTime
680− thunkFileNames = Map.keys $ _thunkSpec_files thunkSpec
681− maximum . catMaybes <$> traverse (getModificationTimeMaybe . (thunkDir </>)) thunkFileNames
682−
683− let cachePaths' = nonEmpty $ Map.keys $ Map.filter (\case ThunkFileSpec_AttrCache -> True; _ -> False) $
684− _thunkSpec_files thunkSpec
685− for cachePaths' $ \cachePaths ->
686− fmap NonEmpty.head $ for cachePaths $ \cacheDir -> do
687− let
688− cachePath = thunkDir </> cacheDir </> attr <.> "out"
689− cacheErrHandler e
690− | isDoesNotExistError e = pure Nothing -- expected from a cache miss
691− | otherwise = Nothing <$ putLog Error (T.pack $ displayException e)
692− cacheHit <- handle cacheErrHandler $ do
693− cacheTime <- liftIO $ posixSecondsToUTCTime . realToFrac . modificationTime <$> getSymbolicLinkStatus cachePath
694− pure $ if latestChange <= cacheTime
695− then Just cachePath
696− else Nothing
697− case cacheHit of
698− Just c -> pure c
699− Nothing -> do
700− putLog Warning $ T.pack $ mconcat [thunkDir, ": ", attr, " not cached, building ..."]
701− liftIO $ createDirectoryIfMissing True (takeDirectory cachePath)
702− (cachePath <$) $ nixCmd $ NixCmd_Build $ def
703− & nixBuildConfig_outLink .~ OutLink_IndirectRoot cachePath
704− & nixCmdConfig_target .~ Target
705− { _target_path = Just thunkDir
706− , _target_attr = Just attr
707− , _target_expr = Nothing
708− }
496+ createDirectoryIfMissing False cacheDir
497+ let getModificationTimeMaybe = fmap rightToMaybe . try @IOError . getModificationTime
498+ maximum . catMaybes <$> mapM (getModificationTimeMaybe . (thunkDir </>)) thunkFileNames
499+ cacheHit <- handle cacheErrHandler $ do
500+ cacheTime <- liftIO $ posixSecondsToUTCTime . realToFrac . modificationTime <$> getSymbolicLinkStatus cachePath
501+ return $ if latestChange <= cacheTime
502+ then Just cachePath
503+ else Nothing
504+ case cacheHit of
505+ Just c -> return c
506+ Nothing -> do
507+ putLog Warning $ T.pack $ mconcat [thunkDir, ": ", attr, " not cached, building ..."]
508+ _ <- nixCmd $ NixCmd_Build$ def
509+ Lens.& nixBuildConfig_outLink Lens..~ OutLink_IndirectRoot cachePath
510+ Lens.& nixCmdConfig_target Lens..~ Target
511+ { _target_path = Just thunkDir
512+ , _target_attr = Just attr
513+ , _target_expr = Nothing
514+ }
515+ return cachePath
709516
710517-- | Build a nix attribute, and cache the result if possible
711518nixBuildAttrWithCache
@@ -716,15 +523,13 @@ nixBuildAttrWithCache
716523 -- ^ Attribute to build
717524 -> m FilePath
718525 -- ^ Symlink to cached or built nix output
719−nixBuildAttrWithCache exprPath attr = readThunk exprPath >>= \case
720− -- Only packed thunks are cached. In particular, checkouts are not.
721− Right (ThunkData_Packed spec _) ->
722− maybe build pure =<< nixBuildThunkAttrWithCache spec exprPath attr
723− _ -> build
724− where
725− build = nixCmd $ NixCmd_Build $ def
726− & nixBuildConfig_outLink .~ OutLink_None
727− & nixCmdConfig_target .~ Target
526+nixBuildAttrWithCache exprPath attr = do
527+ readThunk exprPath >>= \case
528+ -- Only packed thunks are cached. in particular, checkouts are not
529+ Right (ThunkData_Packed _) -> nixBuildThunkAttrWithCache exprPath attr
530+ _ -> nixCmd $ NixCmd_Build $ def
531+ Lens.& nixBuildConfig_outLink Lens..~ OutLink_None
532+ Lens.& nixCmdConfig_target Lens..~ Target
728533 { _target_path = Just exprPath
729534 , _target_attr = Just attr
730535 , _target_expr = Nothing
@@ -745,153 +550,132 @@ updateThunk p f = withSystemTempDirectory "obelisk-thunkptr-" $ \tmpDir -> do
745550 where
746551 copyThunkToTmp tmpDir thunkDir = readThunk thunkDir >>= \case
747552 Left err -> failWith $ "withThunkUnpacked: " <> T.pack (show err)
748− Right ThunkData_Packed{} -> do
553+ Right (ThunkData_Packed _) -> do
749554 let tmpThunk = tmpDir </> "thunk"
750555 callProcessAndLogOutput (Notice, Error) $
751− proc cp ["-r", "-T", thunkDir, tmpThunk]
556+ proc "cp" ["-r", "-T", thunkDir, tmpThunk]
752557 return tmpThunk
753− Right _ -> failWith "Thunk is not packed"
558+ Right _ -> failWith $ "Thunk is not packed"
754559 updateThunkFromTmp p' = do
755− _ <- packThunk' True (ThunkPackConfig False (ThunkConfig Nothing)) p'
560+ _ <- packThunk' True p'
756561 callProcessAndLogOutput (Notice, Error) $
757− proc cp ["-r", "-T", p', p]
562+ proc "cp" ["-r", "-T", p', p]
758563
759564finalMsg :: Bool -> (a -> Text) -> Maybe (a -> Text)
760565finalMsg noTrail s = if noTrail then Nothing else Just s
761566
567+unpackThunk :: MonadObelisk m => FilePath -> m ()
568+unpackThunk = unpackThunk' False
569+
762570-- | Check that we are not somewhere inside the thunk directory
763571checkThunkDirectory :: MonadObelisk m => FilePath -> m ()
764572checkThunkDirectory thunkDir = do
765573 currentDir <- liftIO getCurrentDirectory
766574 thunkDir' <- liftIO $ canonicalizePath thunkDir
767575 when (thunkDir' `L.isInfixOf` currentDir) $
768− failWith [i|Can't perform thunk operations from within the thunk directory: ${thunkDir}|]
769−
770− -- Don't let thunk commands work when directly given an unpacked repo
771− when (takeFileName thunkDir == unpackedDirName) $
772− readThunk (takeDirectory thunkDir) >>= \case
773− Right _ -> failWith [i|Refusing to perform thunk operation on ${thunkDir} because it is a thunk's unpacked source|]
774− Left _ -> pure ()
775−
776−unpackThunk :: MonadObelisk m => FilePath -> m ()
777−unpackThunk = unpackThunk' False
576+ failWith "Can't pack/unpack from within the thunk directory"
778577
779578unpackThunk' :: MonadObelisk m => Bool -> FilePath -> m ()
780−unpackThunk' noTrail thunkDir = checkThunkDirectory thunkDir *> readThunk thunkDir >>= \case
781− Left err -> failWith [i|Invalid thunk at ${thunkDir}: ${err}|]
579+unpackThunk' noTrail thunkDir = checkThunkDirectory thunkDir >> readThunk thunkDir >>= \case
580+ Left err -> failWith $ "thunk unpack: " <> T.pack (show err)
782581 --TODO: Overwrite option that rechecks out thunk; force option to do so even if working directory is dirty
783− Right ThunkData_Checkout -> failWith [i|Thunk at ${thunkDir} is already unpacked|]
784− Right (ThunkData_Packed _ tptr) -> do
582+ Right (ThunkData_Checkout _) -> failWith "thunk unpack: thunk is already unpacked"
583+ Right (ThunkData_Packed tptr) -> do
785584 let (thunkParent, thunkName) = splitFileName thunkDir
786− withTempDirectory thunkParent thunkName $ \tmpThunk -> do
787− let
788− gitSrc = thunkSourceToGitSource $ _thunkPtr_source tptr
789− newSpec = case _thunkPtr_source tptr of
790− ThunkSource_GitHub _ -> NonEmpty.head gitHubThunkSpecs
791− ThunkSource_Git _ -> NonEmpty.head gitThunkSpecs
585+ withTempDirectory thunkParent thunkName $ \tmpRepo -> do
586+ let obGitDir = tmpRepo </> ".git" </> "obelisk"
587+ s = case _thunkPtr_source tptr of
588+ ThunkSource_GitHub s' -> forgetGithub False s'
589+ ThunkSource_Git s' -> s'
792590 withSpinner' ("Fetching thunk " <> T.pack thunkName)
793591 (finalMsg noTrail $ const $ "Fetched thunk " <> T.pack thunkName) $ do
794− let unpackedPath = tmpThunk </> unpackedDirName
795− gitCloneForThunkUnpack gitSrc (_thunkRev_commit $ _thunkPtr_rev tptr) unpackedPath
796−
797− let normalizeMore = dropTrailingPathSeparator . normalise
798− when (normalizeMore unpackedPath /= normalizeMore tmpThunk) $ -- Only write meta data if the checkout is not inplace
799− createThunk tmpThunk $ Left newSpec
800−
801− liftIO $ do
802− removePathForcibly thunkDir
803− renameDirectory tmpThunk thunkDir
804−
805−gitCloneForThunkUnpack
806− :: MonadObelisk m
807− => GitSource -- ^ Git source to use
808− -> Ref hash -- ^ Commit hash to reset to
809− -> FilePath -- ^ Directory to clone into
810− -> m ()
811−gitCloneForThunkUnpack gitSrc commit dir = do
812− let git = callProcessAndLogOutput (Notice, Notice) . gitProc dir
813− git $ [ "clone" ]
814− ++ ["--recursive" | _gitSource_fetchSubmodules gitSrc]
815− ++ [ T.unpack $ gitUriToText $ _gitSource_url gitSrc ]
816− ++ do branch <- maybeToList $ _gitSource_branch gitSrc
817− [ "--branch", T.unpack $ untagName branch ]
818− git ["reset", "--hard", Ref.toHexString commit]
819− when (_gitSource_fetchSubmodules gitSrc) $
820− git ["submodule", "update", "--recursive", "--init"]
592+ let git = callProcessAndLogOutput (Notice, Notice) . gitProc tmpRepo
593+ git $ [ "clone" ]
594+ ++ ("--recursive" <$ guard (_gitSource_fetchSubmodules s))
595+ ++ [ T.unpack $ render $ _gitSource_url s ]
596+ ++ do branch <- maybeToList $ _gitSource_branch s
597+ [ "--branch", T.unpack $ untagName branch ]
598+ git ["reset", "--hard", Ref.toHexString $ _thunkRev_commit $ _thunkPtr_rev tptr]
599+ when (_gitSource_fetchSubmodules s) $
600+ git ["submodule", "update", "--recursive", "--init"]
601+
602+ liftIO $ createDirectory obGitDir
603+ callProcessAndLogOutput (Notice, Error) $
604+ proc "cp" ["-r", "-T", thunkDir </> ".", obGitDir </> "orig-thunk"]
605+ callProcessAndLogOutput (Notice, Error) $
606+ proc "rm" ["-r", thunkDir]
607+ callProcessAndLogOutput (Notice, Error) $
608+ proc "mv" ["-T", tmpRepo, thunkDir]
821609
610+--TODO: add force mode to pack even if changes are present
822611--TODO: add a rollback mode to pack to the original thunk
823−packThunk :: MonadObelisk m => ThunkPackConfig -> FilePath -> m ThunkPtr
612+packThunk :: MonadObelisk m => FilePath -> m ThunkPtr
824613packThunk = packThunk' False
825614
826−packThunk' :: MonadObelisk m => Bool -> ThunkPackConfig -> FilePath -> m ThunkPtr
827−packThunk' noTrail (ThunkPackConfig force thunkConfig) thunkDir = checkThunkDirectory thunkDir *> readThunk thunkDir >>= \case
828− Right ThunkData_Packed{} -> failWith [i|Thunk at ${thunkDir} is is already packed|]
829− _ -> withSpinner'
830− ("Packing thunk " <> T.pack thunkDir)
831− (finalMsg noTrail $ const $ "Packed thunk " <> T.pack thunkDir) $
832− do
833− let checkClean = if force then CheckClean_NoCheck else CheckClean_FullCheck
834− thunkPtr <- modifyThunkPtrByConfig thunkConfig <$> getThunkPtr checkClean thunkDir (_thunkConfig_private thunkConfig)
835− liftIO $ removePathForcibly thunkDir
836− createThunk thunkDir $ Right thunkPtr
615+packThunk' :: MonadObelisk m => Bool -> FilePath -> m ThunkPtr
616+packThunk' noTrail thunkDir = checkThunkDirectory thunkDir >> readThunk thunkDir >>= \case
617+ Left err -> failWith $ T.pack $ "thunk pack: " <> show err
618+ Right (ThunkData_Packed _) -> failWith "pack: thunk is already packed"
619+ Right (ThunkData_Checkout _) -> do
620+ withSpinner' ("Packing thunk " <> T.pack thunkDir)
621+ (finalMsg noTrail $ const $ "Packed thunk " <> T.pack thunkDir) $ do
622+ thunkPtr <- getThunkPtr thunkDir
623+ callProcessAndLogOutput (Debug, Error) $ proc "rm" ["-rf", thunkDir]
624+ liftIO $ createThunk thunkDir thunkPtr
837625 pure thunkPtr
838626
839−modifyThunkPtrByConfig :: ThunkConfig -> ThunkPtr -> ThunkPtr
840−modifyThunkPtrByConfig (ThunkConfig markPrivate') ptr = case markPrivate' of
841− Nothing -> ptr
842− Just markPrivate -> ptr { _thunkPtr_source = case _thunkPtr_source ptr of
843− ThunkSource_Git s -> ThunkSource_Git $ s { _gitSource_private = markPrivate }
844− ThunkSource_GitHub s -> ThunkSource_GitHub $ s { _gitHubSource_private = markPrivate }
845− }
846−
847−data CheckClean
848− = CheckClean_FullCheck
849− -- ^ Check that the repo is clean, including .gitignored files
850− | CheckClean_NotIgnored
851− -- ^ Check that the repo is clean, not including .gitignored files
852− | CheckClean_NoCheck
853− -- ^ Don't check that the repo is clean
854−
855−getThunkPtr :: forall m. MonadObelisk m => CheckClean -> FilePath -> Maybe Bool -> m ThunkPtr
856−getThunkPtr gitCheckClean dir mPrivate = do
857− let repoLocations = nubOrd $ map (first normalise)
858− [(".git", "."), (unpackedDirName </> ".git", unpackedDirName)]
859− repoLocation' <- liftIO $ flip findM repoLocations $ doesDirectoryExist . (dir </>) . fst
860− thunkDir <- case repoLocation' of
861− Nothing -> failWith [i|Can't find an unpacked thunk in ${dir}|]
862− Just (_, path) -> pure $ normalise $ dir </> path
863−
864− let (checkClean, checkIgnored) = case gitCheckClean of
865− CheckClean_FullCheck -> (True, True)
866− CheckClean_NotIgnored -> (True, False)
867− CheckClean_NoCheck -> (False, False)
868− when checkClean $ ensureCleanGitRepo thunkDir checkIgnored
627+setThunk :: MonadObelisk m => String -> FilePath -> m ()
628+setThunk = setThunk' False
629+
630+setThunk' :: MonadObelisk m => Bool -> String -> FilePath -> m ()
631+setThunk' noTrail branch thunkDir = checkThunkDirectory thunkDir >> readThunk thunkDir >>= \case
632+ Left err -> failWith $ T.pack $ "thunk set : " <> show err
633+ Right (ThunkData_Packed thunkptr) -> do
634+ let thunkSrc = _thunkPtr_source thunkptr
635+ repository = case thunkSrc of
636+ ThunkSource_Git gitSource -> (T.unpack $ render $ _gitSource_url gitSource)
637+ ThunkSource_GitHub gitHubSource -> T.unpack $ "git@github.com:"
638+ <> (untagName $ _gitHubSource_owner gitHubSource)
639+ <> "/"
640+ <> (untagName $ _gitHubSource_repo gitHubSource)
641+ <> ".git"
642+ -- check to see if branch exists before modifying directory
643+ (exitCode, _) <- gitLsRemoteExitCode repository branch
644+ case exitCode of
645+ ExitSuccess -> do
646+ _ <- unpackThunk' noTrail thunkDir
647+ callProcessAndLogOutput (Debug, Error) $ gitProc thunkDir ["checkout", branch]
648+ _ <- packThunk' noTrail thunkDir
649+ updateThunkToLatest thunkDir
650+ ExitFailure errNum -> failWith $ T.pack $ if errNum == 2
651+ then "Error: branch not found"
652+ else ("Error Code: " <> show errNum <> "issue checking out the desired branch")
653+ Right (ThunkData_Checkout _) -> do
654+ callProcessAndLogOutput (Debug, Error) $ gitProc thunkDir ["checkout", branch]
655+ _ <- packThunk' noTrail thunkDir
656+ updateThunkToLatest thunkDir
657+
658+getThunkPtr :: MonadObelisk m => FilePath -> m ThunkPtr
659+getThunkPtr = getThunkPtr' True
660+
661+getThunkPtr' :: forall m. MonadObelisk m => Bool -> FilePath -> m ThunkPtr
662+getThunkPtr' checkClean thunkDir = do
663+ when checkClean $ ensureCleanGitRepo thunkDir True $
869664 "thunk pack: thunk checkout contains unsaved modifications"
870665
871666 -- Check whether there are any stashes
872− when checkClean $ do
873− stashOutput <- readGitProcess thunkDir ["stash", "list"]
874− unless (T.null stashOutput) $
667+ stashOutput <- readGitProcess thunkDir ["stash", "list"]
668+ when checkClean $ case T.null stashOutput of
669+ False -> do
875670 failWith $ T.unlines $
876671 [ "thunk pack: thunk checkout has stashes"
877672 , "git stash list:"
878673 ] ++ T.lines stashOutput
879−
880− -- Get current branch
881− (mCurrentBranch, mCurrentCommit) <- do
882− b <- listToMaybe . T.lines <$> readGitProcess thunkDir ["rev-parse", "--abbrev-ref", "HEAD"]
883− c <- listToMaybe . T.lines <$> readGitProcess thunkDir ["rev-parse", "HEAD"]
884− case b of
885− (Just "HEAD") -> failWith $ T.unlines
886− [ "thunk pack: You are in 'detached HEAD' state."
887− , "If you want to pack at the current ref \
888− \then please create a new branch with 'git checkout -b <new-branch-name>' and push this upstream."
889− ]
890− _ -> return (b, c)
674+ True -> return ()
891675
892676 -- Get information on all branches and their (optional) designated upstream
893677 -- correspondents
894− headDump :: [Text] <- T.lines <$> readGitProcess thunkDir
678+ (headDump :: [Text]) <- T.lines <$> readGitProcess thunkDir
895679 [ "for-each-ref"
896680 , "--format=%(refname:short) %(upstream:short) %(upstream:remotename)"
897681 , "refs/heads/"
@@ -937,7 +721,7 @@ getThunkPtr gitCheckClean dir mPrivate = do
937721 ]
938722
939723 -- loosely by https://stackoverflow.com/questions/7773939/show-git-ahead-and-behind-info-for-all-branches-including-remotes
940− stats <- ifor headUpstream $ \branch (upstream, _remote) -> do
724+ stats <- iforM headUpstream $ \branch (upstream, _remote) -> do
941725 (stat :: [Text]) <- T.lines <$> readGitProcess thunkDir
942726 [ "rev-list", "--left-right"
943727 , T.unpack branch <> "..." <> T.unpack upstream
@@ -954,16 +738,20 @@ getThunkPtr gitCheckClean dir mPrivate = do
954738 [ "thunk pack: Certain branches in the thunk have commits not yet pushed upstream:"
955739 , ""
956740 ] ++
957− flip map (Map.toList nonGood) (\(branch, (upstream, (ahead, behind))) -> mconcat
741+ (flip map (Map.toList nonGood) $ \(branch, (upstream, (ahead, behind))) -> mconcat
958742 [" ", branch, " ahead: ", T.pack (show ahead), " behind: ", T.pack (show behind), " remote branch ", upstream]) ++
959743 [ ""
960744 , "Please push these upstream and try again. (Or just fetch, if they are somehow \
961745 \pushed but this repo's remote tracking branches don't know it.)"
962746 ]
963747
964− when checkClean $ do
965− -- We assume it's safe to pack the thunk at this point
966− putLog Informational "All changes safe in git remotes. OK to pack thunk."
748+ -- We assume it's safe to pack the thunk at this point
749+ putLog Informational $ "All changes safe in git remotes. OK to pack thunk."
750+
751+ -- Get current branch ``
752+ mCurrentBranch <- listToMaybe
753+ <$> T.lines
754+ <$> readGitProcess thunkDir ["rev-parse", "--abbrev-ref", "HEAD"]
967755
968756 let remote = maybe "origin" snd $ flip Map.lookup headUpstream =<< mCurrentBranch
969757
@@ -976,12 +764,14 @@ getThunkPtr gitCheckClean dir mPrivate = do
976764 remoteUri <- case parseGitUri remoteUri' of
977765 Nothing -> failWith $ "Could not identify git remote: " <> remoteUri'
978766 Just uri -> pure uri
979− uriThunkPtr remoteUri mPrivate mCurrentBranch mCurrentCommit
767+ uriThunkPtr remoteUri mCurrentBranch
980768
981769-- | Get the latest revision available from the given source
982770getLatestRev :: MonadObelisk m => ThunkSource -> m ThunkRev
983771getLatestRev os = do
984− let gitS = thunkSourceToGitSource os
772+ let gitS = case os of
773+ ThunkSource_GitHub s -> forgetGithub False s
774+ ThunkSource_Git s -> s
985775 (_, commit) <- gitGetCommitBranch (_gitSource_url gitS) (untagName <$> _gitSource_branch gitS)
986776 case os of
987777 ThunkSource_GitHub s -> githubThunkRev s commit
@@ -993,18 +783,16 @@ getLatestRev os = do
993783-- performance. If that doesn't work (e.g. authentication issue), we fall back
994784-- on just doing things the normal way for git repos in general, and save it as
995785-- a regular git thunk.
996−uriThunkPtr :: MonadObelisk m => GitUri -> Maybe Bool -> Maybe Text -> Maybe Text -> m ThunkPtr
997−uriThunkPtr uri mPrivate mbranch mcommit = do
998− commit <- case mcommit of
999− Nothing -> gitGetCommitBranch uri mbranch >>= return . snd
1000− (Just c) -> return c
1001− (src, rev) <- uriToThunkSource uri mPrivate mbranch >>= \case
786+uriThunkPtr :: MonadObelisk m => URI -> Maybe Text -> m ThunkPtr
787+uriThunkPtr uri mbranch = do
788+ (_, commit) <- gitGetCommitBranch uri mbranch
789+ (src, rev) <- case uriToThunkSource uri mbranch of
1002790 ThunkSource_GitHub s -> do
1003791 rev <- runExceptT $ githubThunkRev s commit
1004792 case rev of
1005793 Right r -> pure (ThunkSource_GitHub s, r)
1006794 Left e -> do
1007− putLog Warning "\
795+ putLog Warning $ "\
1008796\Failed to fetch archive from GitHub. This is probably a private repo. \
1009797\Falling back on normal fetchgit. Original failure:"
1010798 errorToWarning e
@@ -1021,66 +809,34 @@ uriThunkPtr uri mPrivate mbranch mcommit = do
1021809-- If the thunk is a GitHub thunk and fails, we do *not* fall back like with
1022810-- `uriThunkPtr`. Unlike a plain URL, a thunk src explicitly states which method
1023811-- should be employed, and so we respect that.
1024−uriToThunkSource :: MonadObelisk m => GitUri -> Maybe Bool -> Maybe Text -> m ThunkSource
1025−uriToThunkSource (GitUri u) mPrivate
1026− | Right uriAuth <- URI.uriAuthority u
1027− , Just scheme <- URI.unRText <$> URI.uriScheme u
812+uriToThunkSource :: URI -> Maybe Text -> ThunkSource
813+uriToThunkSource u
814+ | Right uriAuth <- uriAuthority u
815+ , Just scheme <- unRText <$> uriScheme u
1028816 , case scheme of
1029− "ssh" -> uriAuth == URI.Authority
1030− { URI.authUserInfo = Just $ URI.UserInfo (fromRight' $ URI.mkUsername "git") Nothing
1031− , URI.authHost = fromRight' $ URI.mkHost "github.com"
1032− , URI.authPort = Nothing
817+ "ssh" -> uriAuth == Authority
818+ { authUserInfo = Just $ UserInfo (fromRight' $ mkUsername "git") Nothing
819+ , authHost = fromRight' $ mkHost "github.com"
820+ , authPort = Nothing
1033821 }
1034822 s -> s `L.elem` [ "git", "https", "http" ] -- "http:" just redirects to "https:"
1035− && URI.unRText (URI.authHost uriAuth) == "github.com"
1036− , Just (_, owner :| [repoish]) <- URI.uriPath u
1037− = \mbranch -> do
1038− isPrivate <- getIsPrivate
1039− pure $ ThunkSource_GitHub $ GitHubSource
1040− { _gitHubSource_owner = N $ URI.unRText owner
1041− , _gitHubSource_repo = N $ let
1042− repoish' = URI.unRText repoish
1043− in fromMaybe repoish' $ T.stripSuffix ".git" repoish'
1044− , _gitHubSource_branch = N <$> mbranch
1045− , _gitHubSource_private = isPrivate
1046− }
823+ && unRText (authHost uriAuth) == "github.com"
824+ , Just (_, owner :| [repoish]) <- uriPath u
825+ = \mbranch -> ThunkSource_GitHub $ GitHubSource
826+ { _gitHubSource_owner = N $ unRText owner
827+ , _gitHubSource_repo = N $ let
828+ repoish' = unRText repoish
829+ in case T.stripSuffix ".git" repoish' of
830+ Just repo -> repo
831+ Nothing -> repoish'
832+ , _gitHubSource_branch = N <$> mbranch
833+ }
1047834
1048− | otherwise = \mbranch -> do
1049− isPrivate <- getIsPrivate
1050− pure $ ThunkSource_Git $ GitSource
1051− { _gitSource_url = GitUri u
1052− , _gitSource_branch = N <$> mbranch
1053− , _gitSource_fetchSubmodules = False -- TODO: How do we determine if this should be true?
1054− , _gitSource_private = isPrivate
1055− }
1056− where
1057− getIsPrivate = maybe (guessGitRepoIsPrivate $ GitUri u) pure mPrivate
1058−
1059−guessGitRepoIsPrivate :: MonadObelisk m => GitUri -> m Bool
1060−guessGitRepoIsPrivate uri = flip fix urisToTry $ \loop -> \case
1061− [] -> pure True
1062− uriAttempt:xs -> do
1063− result <- readCreateProcessWithExitCode $
1064− isolateGitProc $
1065− gitProcNoRepo
1066− [ "ls-remote"
1067− , "--quiet"
1068− , "--exit-code"
1069− , "--symref"
1070− , T.unpack $ gitUriToText uriAttempt
1071− ]
1072− case result of
1073− (ExitSuccess, _, _) -> pure False -- Must be a public repo
1074− _ -> loop xs
1075− where
1076− urisToTry = nubOrd $
1077− -- Include the original URI if it isn't using SSH because SSH will certainly fail.
1078− [uri | fmap URI.unRText (URI.uriScheme (unGitUri uri)) /= Just "ssh"] <>
1079− [changeScheme "https" uri, changeScheme "http" uri]
1080− changeScheme scheme (GitUri u) = GitUri $ u
1081− { URI.uriScheme = URI.mkScheme scheme
1082− , URI.uriAuthority = (\x -> x { URI.authUserInfo = Nothing }) <$> URI.uriAuthority u
1083− }
835+ | otherwise = \mbranch -> ThunkSource_Git $ GitSource
836+ { _gitSource_url = u
837+ , _gitSource_branch = N <$> mbranch
838+ , _gitSource_fetchSubmodules = False -- TODO: How do we determine if this should be true?
839+ }
1084840
1085841-- Funny signature indicates no effects depend on the optional branch name.
1086842githubThunkRev
@@ -1092,19 +848,19 @@ githubThunkRev
1092848githubThunkRev s commit = do
1093849 owner <- forcePP $ _gitHubSource_owner s
1094850 repo <- forcePP $ _gitHubSource_repo s
1095− revTarball <- URI.mkPathPiece $ commit <> ".tar.gz"
1096− let archiveUri = GitUri $ URI.URI
1097− { URI.uriScheme = Just $ fromRight' $ URI.mkScheme "https"
1098− , URI.uriAuthority = Right $ URI.Authority
1099− { URI.authUserInfo = Nothing
1100− , URI.authHost = fromRight' $ URI.mkHost "github.com"
1101− , URI.authPort = Nothing
851+ revTarball <- mkPathPiece $ commit <> ".tar.gz"
852+ let archiveUri = URI
853+ { uriScheme = Just $ fromRight' $ mkScheme "https"
854+ , uriAuthority = Right $ Authority
855+ { authUserInfo = Nothing
856+ , authHost = fromRight' $ mkHost "github.com"
857+ , authPort = Nothing
1102858 }
1103− , URI.uriPath = Just ( False
1104− , owner :| [ repo, fromRight' $ URI.mkPathPiece "archive", revTarball ]
859+ , uriPath = Just ( False
860+ , owner :| [ repo, fromRight' $ mkPathPiece "archive", revTarball ]
1105861 )
1106− , URI.uriQuery = []
1107− , URI.uriFragment = Nothing
862+ , uriQuery = []
863+ , uriFragment = Nothing
1108864 }
1109865 hash <- getNixSha256ForUriUnpacked archiveUri
1110866 putLog Debug $ "Nix sha256 is " <> hash
@@ -1113,8 +869,8 @@ githubThunkRev s commit = do
1113869 , _thunkRev_nixSha256 = hash
1114870 }
1115871 where
1116− forcePP :: Name entity -> m (URI.RText 'URI.PathPiece)
1117− forcePP = URI.mkPathPiece . untagName
872+ forcePP :: Name entity -> m (RText 'PathPiece)
873+ forcePP = mkPathPiece . untagName
1118874
1119875gitThunkRev
1120876 :: MonadObelisk m
@@ -1123,11 +879,11 @@ gitThunkRev
1123879 -> m ThunkRev
1124880gitThunkRev s commit = do
1125881 let u = _gitSource_url s
1126− protocols = ["file", "https", "ssh", "git"]
1127− scheme = maybe "file" URI.unRText $ URI.uriScheme $ (\(GitUri x) -> x) u
882+ protocols = ["https", "ssh", "git"]
883+ Just scheme <- pure $ unRText <$> uriScheme u
1128884 unless (T.toLower scheme `elem` protocols) $
1129885 failWith $ "obelisk currently only supports "
1130− <> T.intercalate ", " protocols <> " protocols for plain Git remotes"
886+ <> T.intercalate ", " protocols <> " protocols for non-GitHub remotes"
1131887 hash <- nixPrefetchGit u commit $ _gitSource_fetchSubmodules s
1132888 putLog Informational $ "Nix sha256 is " <> hash
1133889 pure $ ThunkRev
@@ -1140,14 +896,12 @@ gitThunkRev s commit = do
1140896--
1141897-- If the branch name is passed in, it is returned exactly as-is. If it is not
1142898-- passed it, the default branch of the repo is used instead.
1143−
1144899gitGetCommitBranch
1145− :: MonadObelisk m => GitUri -> Maybe Text -> m (Text, CommitId)
900+ :: MonadObelisk m => URI -> Maybe Text -> m (Text, CommitId)
1146901gitGetCommitBranch uri mbranch = withExitFailMessage ("Failure for git remote " <> uriMsg) $ do
1147− (_, bothMaps) <- gitLsRemote
1148− (T.unpack $ gitUriToText uri)
902+ bothMaps <- gitLsRemote
903+ (T.unpack $ render uri)
1149904 (GitRef_Branch <$> mbranch)
1150− Nothing
1151905 branch <- case mbranch of
1152906 Nothing -> withExitFailMessage "Failed to find default branch" $ do
1153907 b <- rethrowE $ gitLookupDefaultBranch bothMaps
@@ -1161,21 +915,18 @@ gitGetCommitBranch uri mbranch = withExitFailMessage ("Failure for git remote "
1161915 pure (branch, commit)
1162916 where
1163917 rethrowE = either failWith pure
1164− uriMsg = gitUriToText uri
1165−
1166−parseGitUri :: Text -> Maybe GitUri
1167−parseGitUri x = GitUri <$> (parseFileURI x <|> parseAbsoluteURI x <|> parseSshShorthand x)
918+ uriMsg = render uri
1168919
1169−parseFileURI :: Text -> Maybe URI.URI
1170−parseFileURI uri = if "/" `T.isPrefixOf` uri then parseAbsoluteURI ("file://" <> uri) else Nothing
920+parseGitUri :: Text -> Maybe URI
921+parseGitUri x = parseAbsoluteURI x <|> parseSshShorthand x
1171922
1172−parseAbsoluteURI :: Text -> Maybe URI.URI
923+parseAbsoluteURI :: Text -> Maybe URI
1173924parseAbsoluteURI uri = do
1174− parsedUri <- URI.mkURI uri
1175− guard $ URI.isPathAbsolute parsedUri
1176− pure parsedUri
925+ parsedUri <- mkURI uri
926+ guard $ isPathAbsolute parsedUri
927+ pure $ parsedUri
1177928
1178−parseSshShorthand :: Text -> Maybe URI.URI
929+parseSshShorthand :: Text -> Maybe URI
1179930parseSshShorthand uri = do
1180931 -- This is what git does to check that the remote
1181932 -- is not a local file path when parsing shorthand.
@@ -1188,4 +939,4 @@ parseSshShorthand uri = do
1188939 -- This check is used to disambiguate a filepath containing a colon from shorthand
1189940 guard $ isNothing (T.findIndex (=='/') authAndHostname)
1190941 && not (T.null colonAndPath)
1191− URI.mkURI properUri
942+ mkURI properUri