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.

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

Make #!nix-shell arguments and options relative to script #11058

Merged
merged 29 commits into from
Jul 17, 2024
Merged
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
0402336
Evaluate nix-shell -i args relative to script
matthewbauer Aug 3, 2021
9a46411
tests: ensure nix-shell uses relative paths for expressions
tomberek Nov 26, 2023
f66f498
notes: document change in nix-shell behavior
tomberek Nov 26, 2023
1318135
Refactor: rename runEnv -> isNixShell
roberth Jul 6, 2024
5c367ec
Refactor: rename left -> remainingArgs
roberth Jul 6, 2024
e9479b2
nix-build.cc: Refactor: extract baseDir variable
roberth Jul 6, 2024
76245ff
nix-build.cc: Refactor: extract sourcePath, resolvedPath variables
roberth Jul 6, 2024
32fb127
Add legacy setting: nix-shell-always-looks-for-shell-nix
roberth Jul 6, 2024
a22f8b5
rl-next: Add note about shell.nix lookups
roberth Jul 6, 2024
b865625
nix-shell: Look for shell.nix when directory is specified
roberth Jul 6, 2024
afbe7c3
rl-next: Enter PR
roberth Jul 6, 2024
8838f5c
Merge remote-tracking branch 'matthewbauer/nix-shell-relative-shebang…
roberth Jul 6, 2024
d5854f3
rl-next: Typo
roberth Jul 6, 2024
f5b59fb
Fix and extend nix-shell baseDir test
roberth Jul 6, 2024
6c6d526
Add legacy setting: nix-shell-always-looks-for-shell-nix
roberth Jul 6, 2024
6959ac1
rl-next: Add note about shell.nix lookups
roberth Jul 6, 2024
4c59d6e
Merge branch 'nix-shell-lookup-shell-nix' into more-nix-shell
roberth Jul 6, 2024
63262e7
Add opt-out: nix-shell-shebang-arguments-relative-to-script
roberth Jul 6, 2024
73602a7
nix-shell: Look for shell.nix when directory is specified
roberth Jul 6, 2024
2f1fada
Add legacy setting: nix-shell-always-looks-for-shell-nix
roberth Jul 6, 2024
c4a20a4
rl-next: Add note about shell.nix lookups
roberth Jul 6, 2024
0f8a655
tests/functional/shell.nix: Implement runHook for dummy stdenv
roberth Jul 7, 2024
e1106b4
tests/functional/nix-shell.sh: Fix Polo test for VM test
roberth Jul 7, 2024
3e424b1
Merge branch 'nix-shell-lookup-shell-nix' into more-nix-shell
roberth Jul 7, 2024
193dd5d
Fixup: add missing test file
roberth Jul 7, 2024
d942d50
Merge remote-tracking branch 'upstream/master' into more-nix-shell
roberth Jul 10, 2024
c4e3e2d
Soft-deprecate the compatibility settings
roberth Jul 10, 2024
6f5f741
doc/rl-next/shebang-relative: Update with example
roberth Jul 11, 2024
bb312a7
Edit CompatibilitySettings
roberth Jul 11, 2024
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
Prev Previous commit
Next Next commit
tests/functional/shell.nix: Implement runHook for dummy stdenv
  • Loading branch information
roberth committed Jul 7, 2024
commit 0f8a655023be204499c6360e072b36f58f6f194c
3 changes: 3 additions & 0 deletions tests/functional/shell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ let pkgs = rec {
fun() {
echo blabla
}
runHook() {
eval "''${!1}"
}
'';

stdenv = mkDerivation {
Expand Down