Eelco Dolstra
5c2603d9c7
Improve subflake handling
...
Relative 'path:' inputs are now handled correctly in
call-flake.nix. This does require the lock file to record what the
'parent' is relative to which a node's source should be fetched.
2022-06-30 14:22:35 +02:00
Eelco Dolstra
0d14ffbcba
Merge remote-tracking branch 'origin/master' into lazy-trees
2022-06-28 16:29:42 +02:00
Eelco Dolstra
6cb41288ac
Merge pull request #6727 from symphorien/shallow-doc
...
fetchGit: document `shallow` argument
2022-06-27 14:11:37 +02:00
Guillaume Girol
e8109cf405
fetchGit: document shallow
argument
2022-06-26 12:00:00 +00:00
Eelco Dolstra
49c4a37efc
Merge pull request #6717 from edolstra/move-flake-registry
...
Fetch flake-registry.json from channels.nixos.org
2022-06-25 21:17:57 +02:00
Eelco Dolstra
586fa707fc
Merge pull request #6714 from edolstra/auto-chroot-store
...
Automatically use a chroot store if /nix doesn't exist
2022-06-25 00:03:35 +02:00
Eelco Dolstra
30d4aa5dd6
Only do the auto chroot store on Linux
2022-06-24 23:35:21 +02:00
Eelco Dolstra
749d914d10
Add reminder to remove nix-static testing hack
...
https://github.com/NixOS/nix/pull/6708#issuecomment-1165912951
2022-06-24 23:14:56 +02:00
Théophane Hufschmitt
f06b6fa4fa
Merge pull request #6698 from tweag/forbid-tilde-paths-in-pure-mode
...
Forbid the tilde expansion in pure eval mode
2022-06-24 10:02:40 +02:00
Eelco Dolstra
2ef6785d8e
Merge pull request #6716 from Mindavi/bugfix/cast
...
eval-cache: cast rowId to correct type
2022-06-24 00:28:38 +02:00
Eelco Dolstra
ae2a8c0737
Merge pull request #6715 from cole-h/drop-narinfo-system
...
libstore/nar-info: drop unused system field
2022-06-24 00:03:50 +02:00
Eelco Dolstra
4b6cc3da62
Fetch flake-registry.json from channels.nixos.org
...
Using fastly is slightly faster, provides some resilience due to a
high stale TTL, and allows some usage metrics.
2022-06-23 23:56:26 +02:00
Rick van Schijndel
2beb929753
eval-cache: cast rowId to correct type
...
Prevents errors when running with UBSan:
/nix/store/j5vhrywqmz1ixwhsmmjjxa85fpwryzh0-gcc-11.3.0/include/c++/11.3.0/bits/stl_pair.h:353:4: runtime error: load of value 229, which is not a valid value for type 'AttrType'
2022-06-23 21:11:08 +02:00
Cole Helbling
561a258f1d
libstore/nar-info: drop unused system field
...
This was unused everywhere (and even the official NixOS binary cache
did not produce .narinfo files containing a "System:" field).
2022-06-23 14:25:10 -04:00
Eelco Dolstra
04cb555aeb
Fix evaluation
2022-06-23 18:32:23 +02:00
Eelco Dolstra
03002203b7
Fix static build
2022-06-23 18:00:10 +02:00
Eelco Dolstra
f959ce3e03
Merge remote-tracking branch 'origin/master' into lazy-trees
2022-06-23 17:24:44 +02:00
Eelco Dolstra
1cb376d60e
Fix typo
...
Co-authored-by: Cole Helbling <cole.e.helbling@outlook.com>
2022-06-23 17:18:22 +02:00
Eelco Dolstra
2a9fddc0b1
Automatically use a chroot store if /nix doesn't exist
...
Specifically, if we're not root and the daemon socket does not exist,
then we use ~/.local/share/nix/root as a chroot store. This enables
non-root users to download nix-static and have it work out of the box,
e.g.
ubuntu@ip-10-13-1-146:~$ ~/nix run nixpkgs#hello
warning: '/nix' does not exists, so Nix will use '/home/ubuntu/.local/share/nix/root' as a chroot store
Hello, world!
2022-06-23 16:29:50 +02:00
Eelco Dolstra
3c57db1a0f
Merge pull request #6710 from edolstra/embedded-sandbox-shell
...
Embed the sandbox shell into the statically linked 'nix' binary
2022-06-23 15:34:16 +02:00
Eelco Dolstra
0b2ea0023c
Fix typo
2022-06-23 14:22:11 +02:00
Théophane Hufschmitt
027f6a735f
Merge pull request #6673 from asymmetric/warn
...
libstore: improve warning message on missing sig
2022-06-23 06:42:48 +02:00
Eelco Dolstra
925b975224
Embed the sandbox shell into the statically linked 'nix' binary
...
With this, Nix will write a copy of the sandbox shell to /bin/sh in
the sandbox rather than bind-mounting it from the host filesystem.
This makes /bin/sh work out of the box with nix-static, i.e. you no
longer get
/nix/store/qa36xhc5gpf42l3z1a8m1lysi40l9p7s-bootstrap-stage4-stdenv-linux/setup: ./configure: /bin/sh: bad interpreter: No such file or directory
2022-06-23 04:08:28 +02:00
Eelco Dolstra
eafa2721ca
Merge pull request #6709 from edolstra/fix-static-build-hook
...
Fix build-remote in nix-static
2022-06-23 02:12:55 +02:00
Eelco Dolstra
1e55ee2961
getSelfExe(): Support macOS
2022-06-23 01:32:46 +02:00
Eelco Dolstra
184f4e40de
Remove NIX_LIBEXEC_DIR
2022-06-23 01:32:46 +02:00
Eelco Dolstra
d3176ce076
Fix build-remote in nix-static
...
'build-remote' is now executed via /proc/self/exe so it always works.
2022-06-23 01:32:46 +02:00
Eelco Dolstra
3c48c4b4f7
Merge pull request #6708 from edolstra/run-static-tests
...
Enable tests for nix-static
2022-06-23 00:11:23 +02:00
Eelco Dolstra
958b8d1e35
Merge pull request #6707 from edolstra/fix-incremental-static
...
Fix incremental static builds
2022-06-22 23:50:24 +02:00
Eelco Dolstra
8bbbb6e737
Enable/fix tests in nix-static
...
pkgsStatic is apparently considered a cross environment, so checkPhase
and installCheckPhase are disabled even when we ask for them.
2022-06-22 23:33:15 +02:00
Eelco Dolstra
696121fe1d
Fix incremental static builds
...
$? refers to the object files that are newer, so the resulting file
would lack all the older object files.
2022-06-22 17:53:58 +02:00
Eelco Dolstra
f6cf644e5f
Style
2022-06-22 15:35:52 +02:00
Eelco Dolstra
bbe7187db9
Merge pull request #6695 from afishhh/search-fix-exclude
...
Fix arity of `--exclude` flag in `nix search`
2022-06-21 16:12:04 +02:00
Théophane Hufschmitt
983efdbde4
Forbid the tilde expansion in pure eval mode
...
Fix #6684
2022-06-21 14:08:18 +02:00
Théophane Hufschmitt
16c6c6c963
Merge pull request #6676 from virusdave/dnicponski/scratch/swap_homedir_check_master
...
Verify this if `$HOME` exists, it is owned by current user in `getHome()`
2022-06-20 21:17:22 +02:00
Fishhh
df21173b70
Add another test for --exclude
in nix search
2022-06-20 19:21:45 +02:00
Fishhh
4ade8a5f25
Fix arity of --exclude
flag in nix search
...
Due to incorrectly using the Handler(vector<string>*) constructor the
`--exclude` flag would swallow all proceeding arguments instead of just
one.
2022-06-20 18:00:32 +02:00
Dave Nicponski
ca2be509b9
Verify $HOME
is owned by current user in getHome()
, if it exists.
...
Useful because a default `sudo` on darwin doesn't clear `$HOME`, so things like `sudo nix-channel --list`
will surprisingly return the USER'S channels, rather than `root`'s.
Other counterintuitive outcomes can be seen in this PR description:
https://github.com/NixOS/nix/pull/6622
2022-06-17 17:42:08 -04:00
Eelco Dolstra
fd51cdcdd7
Merge remote-tracking branch 'origin/master' into lazy-trees
2022-06-17 13:39:03 +02:00
Théophane Hufschmitt
7e301fd74e
Merge pull request #6620 from maralorn/fix-print-missing
...
respect print-missing variable in new-style build command
2022-06-16 13:23:15 +02:00
Lorenzo Manacorda
475249db8a
libstore: improve warning message on missing sig
...
Clarifies that the substitute will be ignored/skipped.
2022-06-15 17:34:28 +02:00
Théophane Hufschmitt
63df0fda94
Merge pull request #6615 from WhyNotHugo/man-improvements
...
Add disambiguation to man page
2022-06-15 10:41:52 +02:00
Eelco Dolstra
3720a4f6cf
Merge pull request #6662 from tweag/stiky-non-flake-overrides
...
flake.cc: Make non-flake overrides sticky
2022-06-14 19:47:11 +02:00
Hugo Osvaldo Barrera
fd7f795750
Add disambiguation to man page
...
This should help future lost newcomers like myself understand where to
find the docs for both of these commands and how they differ.
2022-06-14 18:13:35 +02:00
Alexander Bantyev
d82a3dc70d
flake.cc: Make non-flake overrides sticky
...
Overrides for inputs with flake=false were non-sticky, since they
changed the `original` in `flake.lock`. This fixes it, by using the same
locked original for both flake and non-flake inputs.
2022-06-13 20:49:16 +04:00
Eelco Dolstra
9f58df4c91
Merge pull request #6619 from Jonpez2/patch-1
...
Add security.csm to ignored-acls
2022-06-13 16:23:13 +02:00
Eelco Dolstra
798efdf10b
Merge pull request #6027 from Ma27/pure-repl
...
repl: `--option pure-eval true` actually enables pure eval mode
2022-06-13 16:11:46 +02:00
Eelco Dolstra
2fef24f528
Merge pull request #6634 from lovesegfault/fix-getgrouplist
...
fix(libstore/lock): support users that belong to more than 10 groups
2022-06-13 15:45:09 +02:00
Eelco Dolstra
9a26a01475
Merge pull request #6639 from Artturin/checkse
...
install-multi-user: check if selinux is enabled and if it is then abort
2022-06-13 15:42:43 +02:00
Eelco Dolstra
95eccfd5db
Merge pull request #6648 from andersk/missing-rethrow
...
Add missing rethrows in conditional exception handlers
2022-06-13 15:37:38 +02:00