Skip to content

invoke nix directly when --help is mentioned #294

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
maralorn merged 1 commit into from
Jul 10, 2026
Merged

invoke nix directly when --help is mentioned #294

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions exe/Main.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import System.Console.ANSI qualified as Terminal
import System.Console.Terminal.Size (Window)
import System.Environment qualified as Environment
import System.IO.Error qualified as IOError
import System.Posix qualified as System
import System.Posix.Signals qualified as Signals
import System.Process.Typed (proc, runProcess)
import System.Process.Typed qualified as Process
Expand Down Expand Up @@ -81,18 +82,22 @@ runApp = \cases
_ ["--version"] -> do
hPutStrLn stderr ("nix-output-monitor " <> fromString (showVersion version))
exitWith =<< runProcess (proc "nix" ["--version"])
"nom-build" args | "--help" `elem` args -> runNixHelpCommand "nix-build" args
"nom-build" args -> exitWith =<< runMonitoredCommand defaultConfig (proc "nix-build" (withJSON args))
"nom-shell" args -> do
exitOnFailure =<< runMonitoredCommand defaultConfig{silent = True} (proc "nix-shell" (withJSON args <> ["--run", "exit"]))
exitWith =<< runProcess (proc "nix-shell" args)
"nom" ("build" : args) | "--help" `elem` args -> runNixHelpCommand "nix" ("build" : args)
"nom" ("build" : args) -> exitWith =<< runMonitoredCommand defaultConfig (proc "nix" ("build" : withJSON args))
"nom" ("copy" : args) | "--help" `elem` args -> runNixHelpCommand "nix" ("copy" : args)
"nom" ("copy" : args) -> exitWith =<< runMonitoredCommand defaultConfig (proc "nix" ("copy" : withJSON args))
"nom" ("shell" : args) -> do
exitOnFailure =<< runMonitoredCommand defaultConfig{silent = True} (proc "nix" ("shell" : withJSON (replaceCommandWithExit args)))
exitWith =<< runProcess (proc "nix" ("shell" : args))
"nom" ("develop" : args) -> do
exitOnFailure =<< runMonitoredCommand defaultConfig{silent = True} (proc "nix" ("develop" : withJSON (replaceCommandWithExit args)))
exitWith =<< runProcess (proc "nix" ("develop" : args))
"nom" ("flake" : args) | "--help" `elem` args -> runNixHelpCommand "nix" ("flake" : args)
"nom" ("flake" : args) -> exitWith =<< runMonitoredCommand defaultConfig (proc "nix" ("flake" : withJSON args))
"nom" [] -> do
finalState <- monitorHandle OldStyleInput defaultConfig{piping = True} stdin
Expand Down Expand Up @@ -153,6 +158,9 @@ printIOException io_exception = do
_ -> show io_exception
hPutStrLn stderr $ markup red ("nix-output-monitor: " <> error_msg)

runNixHelpCommand :: String -> [String] -> IO Void
runNixHelpCommand cmd args = System.executeFile cmd True args Nothing

runMonitoredCommand :: Config -> Process.ProcessConfig () () () -> IO Process.ExitCode
runMonitoredCommand config process_config = do
let process_config_with_handles =
Expand Down