aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-03-16Don't retry on CURLE_SSL_CACERT_BADFILEEelco Dolstra
The certificates won't get any better if we retry.
2018-03-15Filter ANSI colors when not writing to a terminalEelco Dolstra
Fixes https://github.com/NixOS/nixpkgs/issues/37114.
2018-03-15Merge pull request #1965 from masaeedu/masterEelco Dolstra
Wrap thread local in function for Cygwin
2018-03-14Catch more possible instances of passing NULL to memcpy.Shea Levy
Actually fixes #1976.
2018-03-14Merge branch 'fix/errno-sighandler' of git://github.com/dtzWill/nixShea Levy
2018-03-14concatLists: Don't pass NULL pointers to memcpy.Shea Levy
This is UB, even if the size is 0. See #1976. Fixes #1976.
2018-03-14nix-daemon: preserve errno in signal handler (thanks tsan)Will Dietz
2018-03-14Fix compatibility with latest boost::formatEelco Dolstra
2018-03-14Factor out commonality between release.nix and shell.nixEelco Dolstra
2018-03-14Use boost::format from the boost packageEelco Dolstra
Note that this only requires headers from boost so it doesn't add a runtime dependency. Also, use Nixpkgs 18.03.
2018-03-13Merge pull request #1906 from dtzWill/fix/nix-searchShea Levy
nix search: tests and fix #1893 and part of #1892
2018-03-13build-remote: Don't substitute the build resultEelco Dolstra
2018-03-13TypoEelco Dolstra
2018-03-13fetchGit: Fix debug messageGuillaume Maudoux
2018-03-12Wrap thread local in function for CygwinAsad Saeeduddin
Fixes #1826. See #1352 for a previous instance of a similar change.
2018-03-09Fix double free in Store::queryPathInfo()Eelco Dolstra
It was holding on to a Value* (i.e. a std::shared_ptr<ValidPathInfo>*) outside of the pathInfoCache lock, so the std::shared_ptr could be destroyed between the release of the lock and the decrement of the std::shared_ptr refcount. This can happen if more than 'path-info-cache-size' paths are added in the meantime, *or* if clearPathInfoCache() is called. The hydra-queue-runner queue monitor thread periodically calls the later, so is likely to trigger a crash. Fixes https://github.com/NixOS/hydra/issues/542.
2018-03-09Merge pull request #1959 from redfish64/masterEelco Dolstra
Modified MakeBinOp to no longer produce its name using concatenation …
2018-03-09Modified MakeBinOp to no longer produce its name using concatenation and "##".Tim Engler
Doing so prevents emacs tags from working, as well as makes the code extremely confusing for a newbie. In the prior state, if someone wants to find the definition of "ExprApp" for example, a grep through the code reveals nothing. Since the definition could be hiding in numerous ".h" files, it's really difficult to find. This personally took me several hours to figure out.
2018-03-07Fix #1957Eelco Dolstra
2018-03-07Merge pull request #1955 from dtzWill/fix/rand-randomEelco Dolstra
rand() -> random(), since we use srandom().
2018-03-06rand() -> random(), since we use srandom().Will Dietz
rand() requires we call srand() instead, but might as well use random().
2018-03-06logging: Don't throw from Activity destructorWill Dietz
Move definition of destructor to logging.cc for access to util.hh's ignoreException.
2018-03-05Merge pull request #1948 from shlevy/no-forwardEelco Dolstra
ssh-ng: Don't forward options to the daemon.
2018-03-05ssh-ng: Don't forward options to the daemon.Shea Levy
This can be iterated on and currently leaves out settings we know we want to forward, but it fixes #1713 and fixes #1935 and isn't fundamentally broken like the status quo. Future changes are suggested in a comment.
2018-03-03release.nix: don't try to use nix-2.0 branch, no longer existsWill Dietz
Probably should point at the 18.03 release branch once that's made.
2018-03-02Merge branch 'improve-search-algorithm' of git://github.com/Ma27/nixShea Levy
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-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