maralorn/nixos-config
1
0
Fork 0
Code Wiki Activity

Try another nix-jobs fix

Browse source
This commit is contained in:
Malte Brandy 2021-01-13 20:11:46 +01:00
parent ac32c4a6c4
commit c0730c50e7
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
nixos/roles/laminar/nix-jobs.hs
View file

@ -17,7 +17,6 @@ import Control.Concurrent.Async ( forConcurrently_
) )
import Control.Concurrent.STM ( check import Control.Concurrent.STM ( check
, retry , retry
, swapTVar
) )
import Control.Exception ( bracket import Control.Exception ( bracket
, catch , catch
@ -104,6 +103,7 @@ instance ExecArg Text where
asArg = asArg . toString asArg = asArg . toString
asArgFromList = asArgFromList . fmap toString asArgFromList = asArgFromList . fmap toString
drvBasename :: Text -> Text
drvBasename derivationName = drvBasename derivationName =
fromMaybe derivationName . viaNonEmpty last $ splitOn "/" derivationName fromMaybe derivationName . viaNonEmpty last $ splitOn "/" derivationName
@ -371,7 +371,7 @@ main = do
sayErr [i|Missing executables #{show x}|] sayErr [i|Missing executables #{show x}|]
exitFailure exitFailure
args <- fmap toText <$> getArgs args <- fmap toText <$> getArgs
case args of handle (\(JobException e) -> sayErr e >> exitFailure) $ case args of
["realise-here", derivationName] -> job derivationName ["realise-here", derivationName] -> job derivationName
["realise" , derivationName] -> do ["realise" , derivationName] -> do
jobId <- getEnv "JOB" jobId <- getEnv "JOB"