Skip to content
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

Fix nom support #59

Merged
merged 1 commit into from
Mar 15, 2024
Merged

Fix nom support #59

Show file tree
Hide file tree
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
369 changes: 16 additions & 353 deletions src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ mod shell;
use shell::Shell;
use shell::ShellKind;

mod nix;

/// Environment variable that indicates that the Nix profile has already been sourced.
///
/// This is set when a Nix profile script is sourced:
Expand Down Expand Up @@ -143,7 +145,7 @@ fn main() -> eyre::Result<()> {
}

Command::NixShell { args } => {
let new_args = transform_nix_shell(args, shell.path.as_str());
let new_args = nix::transform_nix_shell(args, shell.path.as_str());
let prog = if opts.nom { "nom-shell" } else { "nix-shell" };
tracing::debug!(
command = shell_words::join(
Expand All @@ -159,16 +161,25 @@ fn main() -> eyre::Result<()> {
}

Command::Nix { args } => {
let new_args = transform_nix(args, shell.path.as_str());
let prog = if opts.nom { "nom" } else { "nix" };
let new_args = nix::transform_nix(args, shell.path.as_str());
let prog = if opts.nom
&& new_args
.subcommand
.map(|subcommand| ["shell", "build", "develop"].contains(&subcommand.as_str()))
.unwrap_or(false)
{
"nom"
} else {
"nix"
};
tracing::debug!(
command = shell_words::join(
std::iter::once(prog).chain(new_args.iter().map(|s| s.as_str()))
std::iter::once(prog).chain(new_args.args.iter().map(|s| s.as_str()))
),
"Launching nix"
);
Err(process::Command::new(prog)
.args(new_args)
.args(new_args.args)
.env(NIX_SOURCED_VAR, "1")
.exec()
.into())
Expand Down Expand Up @@ -211,351 +222,3 @@ fn executable_is_on_path(executable: &Utf8Path) -> eyre::Result<bool> {
.map(Utf8Path::new)
.any(|component| component == directory))
}

/// Transform arguments to a `nix` invocation to run the specified `command`.
///
/// Only modifies `nix develop` and `nix shell` commands.
fn transform_nix(args: Vec<String>, command: &str) -> Vec<String> {
let mut ret = Vec::with_capacity(args.len() + 2);

let mut subcommand = None;

let mut i = 0;
while i < args.len() {
ret.push(args[i].clone());

match args[i].as_str() {
"--help" | "--version"
| "-c" | "--command"
=> {
// We already have a command to run.
return args;
}

// Two arguments
"--option"
| "--redirect"
| "--override-flake"
| "--arg"
| "--argstr"
| "--override-input"
=> {
ret.push(args[i + 1].clone());
ret.push(args[i + 2].clone());
i += 2;
}

// One argument
"--log-format"
| "--access-tokens"
| "--allowed-impure-host-deps"
| "--allowed-uris"
| "--allowed-users"
| "--bash-prompt"
| "--bash-prompt-prefix"
| "--bash-prompt-suffix"
| "--build-hook"
| "--build-poll-interval"
| "--build-users-group"
| "--builders"
| "--commit-lockfile-summary"
| "--connect-timeout"
| "--cores"
| "--diff-hook"
| "--download-attempts"
| "--download-speed"
| "--experimental-features"
| "--extra-access-tokens"
| "--extra-allowed-impure-host-deps"
| "--extra-allowed-uris"
| "--extra-allowed-users"
| "--extra-experimental-features"
| "--extra-extra-platforms"
| "--extra-hashed-mirrors"
| "--extra-nix-path"
| "--extra-platforms"
| "--extra-plugin-files"
| "--extra-sandbox-paths"
| "--extra-secret-key-files"
| "--extra-substituters"
| "--extra-system-features"
| "--extra-trusted-public-keys"
| "--extra-trusted-substituters"
| "--extra-trusted-users"
| "--flake-registry"
| "--gc-reserved-space"
| "--hashed-mirrors"
| "--http-connections"
| "--log-lines"
| "--max-build-log-size"
| "--max-free"
| "--max-jobs"
| "--max-silent-time"
| "--min-free"
| "--min-free-check-interval"
| "--nar-buffer-size"
| "--narinfo-cache-negative-ttl"
| "--narinfo-cache-positive-ttl"
| "--netrc-file"
| "--nix-path"
| "--plugin-files"
| "--post-build-hook"
| "--pre-build-hook"
| "--repeat"
| "--sandbox-paths"
| "--secret-key-files"
| "--stalled-download-timeout"
| "--store"
| "--substituters"
| "--system"
| "--system-features"
| "--tarball-ttl"
| "--timeout"
| "--trusted-public-keys"
| "--trusted-substituters"
| "--trusted-users"
| "--user-agent-suffix"
// `nix develop` options
| "-k" | "--keep"
| "--phase"
|"--profile"
| "--unset"
| "--eval-store"
| "-I" | "--include"
| "--inputs-from"
| "--update-input"
| "--expr"
| "-f" | "--file"
=> {
ret.push(args[i + 1].clone());
i += 1;
}

// Zero arguments
"--offline"
| "--refresh"
| "--debug"
| "-L"
| "--print-build-logs"
| "--quiet"
| "-v"
| "--verbose"
| "--accept-flake-config"
| "--no-accept-flake-config"
| "--allow-dirty"
| "--no-allow-dirty"
| "--allow-import-from-derivation"
| "--no-allow-import-from-derivation"
| "--allow-symlinked-store"
| "--no-allow-symlinked-store"
| "--allow-unsafe-native-code-during-evaluation"
| "--no-allow-unsafe-native-code-during-evaluation"
| "--auto-optimise-store"
| "--no-auto-optimise-store"
| "--builders-use-substitutes"
| "--no-builders-use-substitutes"
| "--compress-build-log"
| "--no-compress-build-log"
| "--darwin-log-sandbox-violations"
| "--no-darwin-log-sandbox-violations"
| "--enforce-determinism"
| "--no-enforce-determinism"
| "--eval-cache"
| "--no-eval-cache"
| "--fallback"
| "--no-fallback"
| "--fsync-metadata"
| "--no-fsync-metadata"
| "--http2"
| "--no-http2"
| "--ignore-try"
| "--no-ignore-try"
| "--impersonate-linux-26"
| "--no-impersonate-linux-26"
| "--keep-build-log"
| "--no-keep-build-log"
| "--keep-derivations"
| "--no-keep-derivations"
| "--keep-env-derivations"
| "--no-keep-env-derivations"
| "--keep-failed"
| "--no-keep-failed"
| "--keep-going"
| "--no-keep-going"
| "--keep-outputs"
| "--no-keep-outputs"
| "--preallocate-contents"
| "--no-preallocate-contents"
| "--print-missing"
| "--no-print-missing"
| "--pure-eval"
| "--no-pure-eval"
| "--require-sigs"
| "--no-require-sigs"
| "--restrict-eval"
| "--no-restrict-eval"
| "--run-diff-hook"
| "--no-run-diff-hook"
| "--sandbox"
| "--no-sandbox"
| "--sandbox-fallback"
| "--no-sandbox-fallback"
| "--show-trace"
| "--no-show-trace"
| "--substitute"
| "--no-substitute"
| "--sync-before-registering"
| "--no-sync-before-registering"
| "--trace-function-calls"
| "--no-trace-function-calls"
| "--trace-verbose"
| "--no-trace-verbose"
| "--use-case-hack"
| "--no-use-case-hack"
| "--use-registries"
| "--no-use-registries"
| "--use-sqlite-wal"
| "--no-use-sqlite-wal"
| "--warn-dirty"
| "--no-warn-dirty"
| "--relaxed-sandbox"
// `nix develop` options
| "--build"
| "--check"
| "--configure"
| "--debugger"
| "-i" | "--ignore-environment"
| "--install"
| "--installcheck"
| "--unpack"
| "--impure"
| "--commit-lock-file"
| "--no-registries"
| "--no-update-lock-file"
| "--no-write-lock-file"
| "--recreate-lock-file"
| "--derivation"
=> {}

"build" | "develop" | "flake" | "help" | "profile" | "repl" | "run" | "search"
| "shell" | "bundle" | "copy" | "edit" | "eval" | "fmt" | "log" | "path-info"
| "registry" | "why-depends" | "daemon" | "describe-stores" | "hash" | "key"
| "nar" | "print-dev-env" | "realisation" | "show-config" | "show-derivation"
| "store" | "doctor" | "upgrade-nix" => {
// Top-level subcommand.

// Replace `subcommand` unless it already has a value.
if subcommand.is_none() {
subcommand = Some(args[i].clone());
}
}

_ => {
// Unknown argument, ignore.
}
}

i += 1;
}

// We want to add our `--command` flag right at the end, because `--command` makes *all the
// rest of the positional arguments* get parsed as arguments to the command.
//
// Note that this behavior is unlike `nix-shell`, where the `--command` flag takes one argument
// that may include spaces...
match subcommand.as_deref() {
Some("develop") | Some("shell") => {
ret.push("--command".into());
ret.push(command.into());
}

_ => {}
}

ret
}

/// Transform arguments to a `nix-shell` invocation to run the specified `command`.
fn transform_nix_shell(args: Vec<String>, command: &str) -> Vec<String> {
let mut ret = Vec::with_capacity(args.len() + 2);
ret.push("--command".into());
ret.push(command.into());

let mut i = 0;
while i < args.len() {
ret.push(args[i].clone());
match args[i].as_str() {
// Two arguments
"--arg" | "--argstr"
// `nix-store`
| "--option"
// From `nix-build` source...
| "--override-flake"
=> {
ret.push(args[i + 1].clone());
ret.push(args[i + 2].clone());
i += 2;
}

// One argument
"--attr" | "-A" | "--exclude" | "--keep"
| "-i" // Interpreter, shebang only
// `nix-store`
| "--add-root"
// From `nix-build` source...
| "--cores"
| "--max-silent-time"
| "--timeout"
| "--store-uri"
| "-I" | "--include"
| "--eval-store"
| "-o" | "--out-link"
=> {
ret.push(args[i + 1].clone());
i += 1;
}

// Zero arguments
"--pure" | "--impure"
// `--packages` changes the meaning of positional arguments, so we effectively
// ignore it.
| "-p" | "--packages"
// Also changes meaning of positional arguments.
| "-E" | "--expr"
// `nix-store`
| "--dry-run" | "--ignore-unknown" | "--check"
// From `nix-build` source...
| "-Q" | "--no-build-output"
| "-K" | "--keep-failed"
| "-k" | "--keep-going"
| "--fallback"
| "--readonly-mode"
| "--no-gc-warning"
| "--add-drv-link" | "--indirect"
| "--no-out-link" | "--no-link"
| "--drv-link"
| "--repair"
| "--run-env"
=> {
// Nothing to skip.
}

"--command" | "--run"
| "--help"
| "--version"
=> {
// We already have a command to run; don't add our own `--command {command}`
// arguments.
return args;
}

_ => {
// Unknown argument, ignore.
}
}

i += 1;
}

ret
}
Loading
Loading