aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-10-18fix manual defaultsPatrick Jackson
2022-10-14Merge pull request #7168 from NixOS/rosetta-testEelco Dolstra
Improve Rosetta detection
2022-10-14Merge pull request #7172 from hercules-ci/libmain-extraStackOverflowHandlerEelco Dolstra
libmain: Make stack overflow handler configurable
2022-10-14libmain: Make the entire stack overflow handler pluggableRobert Hensing
2022-10-14libmain: Add extraStackOverflowHandlerRobert Hensing
2022-10-14Remove useless debug statementsEelco Dolstra
We haven't parsed the '-v' command line flags yet when this code executes, so we can't actually get debug output here.
2022-10-14Use /usr/bin/trueEelco Dolstra
2022-10-14Merge pull request #7169 from edolstra/fix-execve-error-msgEelco Dolstra
Fix error display if execve() in the builder fails
2022-10-13Fix error display if execve() in the builder failsEelco Dolstra
After we've send "\2\n" to the parent, we can't send a serialized exception anymore. It will show up garbled like $ nix-build --store /tmp/nix --expr 'derivation { name = "foo"; system = "x86_64-linux"; builder = "/foo/bar"; }' this derivation will be built: /nix/store/xmdip0z5x1zqpp6gnxld3vqng7zbpapp-foo.drv building '/nix/store/xmdip0z5x1zqpp6gnxld3vqng7zbpapp-foo.drv'... ErrorErrorEexecuting '/foo/bar': No such file or directory error: builder for '/nix/store/xmdip0z5x1zqpp6gnxld3vqng7zbpapp-foo.drv' failed with exit code 1
2022-10-13Improve Rosetta detectionEelco Dolstra
Turns out that one of those *.plist files can exist even if Rosetta is not installed. So let's just try to run an x86_64-darwin binary directly.
2022-10-13Fix clang warningsEelco Dolstra
2022-10-13Merge pull request #7140 from crawford/chroot-storeEelco Dolstra
Make warning about chroot store location more accurate
2022-10-12Make warning about chroot store location more accurateSteam Deck User
While trying to use an alternate directory for my Nix installation, I noticed that nix's output didn't reflect the updated state directory. This patch corrects that and now prints the warning before attempting to create the directory (if the directory creation fails, it wouldn't have been obvious why nix was attempting to create the directory in the first place). With this patch, I now get the following warning: warning: '/home/deck/.var/app/org.nixos.nix/var/nix' does not exist, so Nix will use '/home/deck/.local/share/nix/root' as a chroot store
2022-10-12Merge pull request #7163 from edolstra/misc-categoryEelco Dolstra
Move some options into a misc category
2022-10-12Move some options into a misc categoryEelco Dolstra
This unclutters the per-command options a bit by moving out some global options.
2022-10-12Merge branch 'print-common-flags' of github.com:Hoverbear/nixEelco Dolstra
2022-10-12Merge pull request #7149 from amjoseph-nixpkgs/pr/intersectAttrs/valuesEelco Dolstra
parseDrvName: remove doc/impl discrepancy, add test covering the gap
2022-10-08tests/lang/eval-okay-versions.nix: add test for previous commitAdam Joseph
This commit adds a test covering the discrepancy between parseDrvName's implementation and documentation (the discrepancy was eliminated in the previous commit).
2022-10-08src/libexpr/primops.cc: parseDrvName: make documentation follow implementationAdam Joseph
The documentation for `parseDrvName` does not agree with the implementation when the derivation name contains a dash which is followed by something that is neither a letter nor a digit. This commit corrects the documentation to agree with the implementation.
2022-10-07Print common flags in --helpAna Hobden
2022-10-05Merge pull request #6652 from abathur/doc_install_testsValentin Gagarin
2022-10-05Apply suggestions from code reviewTravis A. Everett
Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
2022-10-05Merge pull request #6870 from ↵Valentin Gagarin
amjoseph-nixpkgs/pr/doc/explain-local-remote-binary-substituter
2022-10-03Merge pull request #6969 from fricklerhandwerk/refactor-generate-manpageThéophane Hufschmitt
refactor rendering command documentation to markdown
2022-09-30Merge pull request #7080 from squalus/nar-close-fileEelco Dolstra
archive: check close errors when extracting nars
2022-09-30Merge pull request #7108 from rapenne-s/wordingEelco Dolstra
nix-copy-closure: improve wording
2022-09-30bring back lost newlineValentin Gagarin
2022-09-30use more self-explanatory namesValentin Gagarin
2022-09-30move final template to the topValentin Gagarin
this allows readers to enter the code starting with what is visible from the outside, instead of working themselves up from purely technical details.
2022-09-30remove superfluous let-in pairValentin Gagarin
2022-09-30refactor showOptionsValentin Gagarin
it was quite a pain to manipulate strings just with `builtins`
2022-09-30refactor rendering command documentation to markdownValentin Gagarin
idea: - make document structure visible, like in a template - order functions by descending abstraction - avoid nested let bindings
2022-09-30use indented strings where appropriateValentin Gagarin
2022-09-29Merge pull request #7114 from rapenne-s/reenable_testThéophane Hufschmitt
tests/build-dry: re-enable some test
2022-09-28tests/build-dry: re-enable some testSolene Rapenne
2022-09-28nix-copy-closure: improve wordingSolene Rapenne
2022-09-27Merge pull request #7105 from SquidDev/hotfix/fish-returnEelco Dolstra
Use exit instead of return in /etc/profile.d/nix-daemon.fish
2022-09-27Use exit instead of return in fish profileJonathan Coates
Older versions of Fish (such as those bundled with Ubuntu LTS 22.04) do not support return outside of functions. We need to use the equivalent exit instead.
2022-09-27Merge pull request #7103 from lheckemann/remove-add-rootEelco Dolstra
nix-build: remove unused --add-root arg
2022-09-27nix-build: remove unused --add-root argLinus Heckemann
Fixes #1982
2022-09-26Merge pull request #7043 from edolstra/installer-testEelco Dolstra
Add an installer test
2022-09-26Quote URLsEelco Dolstra
2022-09-26Remove FIXMEEelco Dolstra
2022-09-26Merge pull request #7089 from NixOS/mention-accept-flake-config-in-warningEelco Dolstra
Mention `--accept-flake-config` in the related warning
2022-09-26Merge pull request #7093 from amjoseph-nixpkgs/pr/intersectAttrs/valuesEelco Dolstra
src/libexpr/primops.cc: correct definition for intersectAttrs
2022-09-24src/libexpr/primops.cc: correct definition for intersectAttrsAdam Joseph
The current definition of `intersectAttrs` is incorrect: > Return a set consisting of the attributes in the set e2 that also exist in the > set e1. Recall that (Nix manual, section 5.1): > An attribute set is a collection of name-value-pairs (called attributes) According to the existing description of `intersectAttrs`, the following should evaluate to the empty set, since no key-value *pair* (i.e. attribute) exists in both sets: ``` builtins.intersectAttrs { x=3; } {x="foo";} ``` And yet: ``` nix-repl> builtins.intersectAttrs { x=3; } {x="foo";} { x = "foo"; } ``` Clearly the intent here was for the *names* of the resulting attribute set to be the intersection of the *names* of the two arguments, and for the values of the resulting attribute set to be the values from the second argument. This commit corrects the definition, making it match the implementation and intent.
2022-09-24Merge pull request #7010 from edolstra/ignore-shellThéophane Hufschmitt
nix develop: Ignore stdenv's $SHELL
2022-09-24Merge pull request #7046 from mkenigs/fix-root-SHELLThéophane Hufschmitt
dockerImage: fix root shell
2022-09-24Merge pull request #7078 from obsidiansystems/trustworthy-signatureThéophane Hufschmitt
"valid signature" -> "signature by a trusted key"
2022-09-24Merge pull request #7079 from matthewbauer/allow-untrusted-settingsThéophane Hufschmitt
Allow pass max-silent-time and build-poll-interval to daemon untrusted