aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-03-02Merge branch 'write-failure-fixes' of git://github.com/lheckemann/nixShea Levy
2018-03-02Merge pull request #1932 from mfiano/patch-1Eelco Dolstra
nix-channel grammar and punctuation
2018-03-02libexpr: Recognize newline in more places in lexerTuomas Tynkkynen
Flex's regexes have an annoying feature: the dot matches everything except a newline. This causes problems for expressions like: "${0}\ " where the backslash-newline combination matches this rule instead of the intended one mentioned in the comment: <STRING>\$|\\|\$\\ { /* This can only occur when we reach EOF, otherwise the above (...|\$[^\{\"\\]|\\.|\$\\.)+ would have triggered. This is technically invalid, but we leave the problem to the parser who fails with exact location. */ return STR; } However, the parser actually accepts the resulting token sequence ('"' DOLLAR_CURLY 0 '}' STR '"'), which is a problem because the lexer rule didn't assign anything to yylval. Ultimately this leads to a crash when dereferencing a NULL pointer in ExprConcatStrings::bindVars(). The fix does change the syntax of the language in some corner cases but I think it's only turning previously invalid (or crashing) syntax to valid syntax. E.g. "a\ b" and ''a''\ b'' were previously syntax errors but now both result in "a\nb". Found by afl-fuzz.
2018-03-02Fix error messageEelco Dolstra
2018-03-01tests/search.sh: simplify, don't rely on consistent orderingWill Dietz
2018-03-01nix-channel grammar and punctuationMichael Fiano
Minor changes to the nix-channel manpage for my first contribution
2018-02-28Merge pull request #1927 from dtzWill/fix/fetchgit-HEADShea Levy
fetchGit: use "HEAD" as default ref instead of "master"
2018-02-28fetchGit: use "HEAD" as default refWill Dietz
2018-02-28launchd: enable keepalive for the nix-daemon serviceDaiderd Jordan
Without this the daemon won't be restarted if the process ever dies, for example when sending a SIGHUP to reload nix.conf.
2018-02-28Actually fix nixDataDir in non-canonical pathShea Levy
2018-02-27Merge pull request #1912 from dezgeg/replacestrings-take-2Eelco Dolstra
libexpr: Fix prim_replaceStrings() to work on an empty source string, take 2
2018-02-26libexpr: Fix prim_replaceStrings() to work on an empty source stringTuomas Tynkkynen
Otherwise, running e.g. nix-instantiate --eval -E --strict 'builtins.replaceStrings [""] ["X"] "abc"' would just hang in an infinite loop. Found by afl-fuzz. First attempt of this was reverted in e2d71bd1862cdda because it caused another infinite loop, which is fixed now and a test added.
2018-02-26nix run: Fix segfault on macOSEelco Dolstra
Note that clearenv() is not available on macOS. Fixes #1907.
2018-02-25nix search: explicitly handle empty search string, fixes #1893Will Dietz
This is important since this is given as an example. Other patterns containing "empty search string" will still be handled differently on different platforms ("asdf|") but that's less of an issue.
2018-02-25nix search: fix bug where we wrote to cache when shouldn't, breakingWill Dietz
This is exposed by the tests added previously, and resolves the error reported in #1892: "expected JSON value".
2018-02-25tests: test nix search behaviorWill Dietz
2018-02-24Merge pull request #1901 from veprbl/patch-5Graham Christensen
Fix a small typo in the release notes
2018-02-24Merge pull request #1903 from primeos/release-notes-2.0-url-fixGraham Christensen
doc: Fix a URL in the release notes for Nix 2.0
2018-02-24doc: Fix a URL in the release notes for Nix 2.0Michael Weiss
2018-02-23Fix a small typo in the release notesDmitry Kalinkin
2018-02-23Fix downloadCached() with a chroot storeEelco Dolstra
E.g. nix run --store ~/my-nix -f channel:nixos-17.03 hello -c hello This problem was mentioned in #1897.
2018-02-22Fix example in release notesEelco Dolstra
2018-02-22DohEelco Dolstra
2018-02-22Release script tweaksEelco Dolstra
2018-02-22Merge branch 'data-dir-non-canon' of https://github.com/shlevy/nixEelco Dolstra
2018-02-22Revert "Enable sandbox builds on Linux by default"Eelco Dolstra
This reverts commit ddc58e789636e1b94149c342575d92583251fbf6. https://hydra.nixos.org/eval/1435322
2018-02-22Fix restricted mode when installing in non-canonical data dirShea Levy
2018-02-22Set release dateEelco Dolstra
2018-02-22Enable sandbox builds on Linux by defaultEelco Dolstra
The overhead of sandbox builds is a problem on NixOS (since building a NixOS configuration involves a lot of small derivations) but not for typical non-NixOS use cases. So outside of NixOS we can enable it. Issue #179.
2018-02-22Merge branch 'fix/sandbox-shell-features' of https://github.com/dtzWill/nixEelco Dolstra
2018-02-22Merge branch 'fix/dry-run-partially' of https://github.com/dtzWill/nixEelco Dolstra
2018-02-21Manual: Put configuration options in sorted orderEelco Dolstra
2018-02-21Manual: Update chapter on remote buildsEelco Dolstra
Alos add a command "nix ping-store" to make it easier to see if Nix can connect to a remote builder (e.g. 'nix ping-store --store ssh://mac').
2018-02-21Revert "libexpr: Fix prim_replaceStrings() to work on an empty source string"Eelco Dolstra
This reverts commit 4ea9707591beceacf9988b3c185faf50da238403. It causes an infinite loop in Nixpkgs evaluation, e.g. "nix-instantiate -A hello" hung. PR #1886.
2018-02-20Merge branch 'nix-copy' of git://github.com/Mic92/nix-1Shea Levy
2018-02-21nix-copy: fix examplesJörg Thalheim
maybe a left-over from nix-store -r ?
2018-02-20Merge remote-tracking branch 'dezgeg/afl-fixes'Shea Levy
2018-02-20Release notes: Add contributorsEelco Dolstra
2018-02-20Fix evaluation of binaryTarball.aarch64-linuxEelco Dolstra
2018-02-19libutil: Fix invalid assert on decoding base64 hashesTuomas Tynkkynen
The assertion is broken because there is no one-to-one mapping from length of a base64 string to the length of the output. E.g. "1q69lz7Empb06nzfkj651413n9icx0njmyr3xzq1j9q=" results in a 32-byte output. "1q69lz7Empb06nzfkj651413n9icx0njmyr3xzq1j9qy" results in a 33-byte output. To reproduce, evaluate: builtins.derivationStrict { name = "0"; builder = "0"; system = "0"; outputHashAlgo = "sha256"; outputHash = "1q69lz7Empb06nzfkj651413n9icx0njmyr3xzq1j9qy"; } Found by afl-fuzz.
2018-02-19libexpr: Fix prim_replaceStrings() to work on an empty source stringTuomas Tynkkynen
Otherwise, running e.g. nix-instantiate --eval -E --strict 'builtins.replaceStrings [""] ["X"] "abc"' would just hang in an infinite loop. Found by afl-fuzz.
2018-02-19libutil: Fix infinite loop in filterANSIEscapes on '\r'Tuomas Tynkkynen
E.g. nix-instantiate --eval -E 'abort "\r"' hangs. Found by afl-fuzz.
2018-02-19libexpr: Don't create lots of temporary strings in Bindings::lexicographicOrderTuomas Tynkkynen
Avoids ~180,000 string temporaries created when evaluating a headless NixOS system.
2018-02-19Fix incorrect (and unnecessary) format stringEelco Dolstra
https://hydra.nixos.org/eval/1434547#tabs-now-fail
2018-02-19Remove macOS multi-user instructionsEelco Dolstra
This is already handled by the installer.
2018-02-19Update release notesEelco Dolstra
Also add some examples to nix --help.
2018-02-19configure.ac: define HAVE_SECCOMP macro when using seccomp, fix build/testsWill Dietz
Happily the failing tests should prevent anyone from using such a Nix in situations where they expect sandboxing to be on, which would otherwise be a risk.
2018-02-19Merge pull request #1882 from shlevy/no-seccomp-no-filterSyscallsEelco Dolstra
Don't silently succeed seccomp setup when !HAVE_SECCOMP.
2018-02-19Merge branch 'perf-fixes' of git://github.com/dezgeg/nixShea Levy
2018-02-19Don't silently succeed seccomp setup when !HAVE_SECCOMP.Shea Levy
Running Nix with build users without seccomp on Linux is dangerous, and administrators should very explicitly opt-in to it.