about summary refs log tree commit diff
AgeCommit message (Collapse)AuthorFilesLines
2018-03-13 Merge pull request #1906 from dtzWill/fix/nix-searchShea Levy4-2/+71
nix search: tests and fix #1893 and part of #1892
2018-03-13 build-remote: Don't substitute the build resultEelco Dolstra1-1/+1
2018-03-13 TypoEelco Dolstra1-1/+1
2018-03-13 fetchGit: Fix debug messageGuillaume Maudoux1-1/+1
2018-03-09 Fix double free in Store::queryPathInfo()Eelco Dolstra1-4/+4
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-09 Merge pull request #1959 from redfish64/masterEelco Dolstra1-11/+11
Modified MakeBinOp to no longer produce its name using concatenation …
2018-03-09 Modified MakeBinOp to no longer produce its name using concatenation and "##".Tim Engler1-11/+11
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-07 Fix #1957Eelco Dolstra1-1/+1
2018-03-07 Merge pull request #1955 from dtzWill/fix/rand-randomEelco Dolstra3-3/+3
rand() -> random(), since we use srandom().
2018-03-06 rand() -> random(), since we use srandom().Will Dietz3-3/+3
rand() requires we call srand() instead, but might as well use random().
2018-03-06 logging: Don't throw from Activity destructorWill Dietz2-2/+9
Move definition of destructor to logging.cc for access to util.hh's ignoreException.
2018-03-05 Merge pull request #1948 from shlevy/no-forwardEelco Dolstra2-1/+12
ssh-ng: Don't forward options to the daemon.
2018-03-05 ssh-ng: Don't forward options to the daemon.Shea Levy2-1/+12
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-03 release.nix: don't try to use nix-2.0 branch, no longer existsWill Dietz1-1/+1
Probably should point at the 18.03 release branch once that's made.
2018-03-02 Merge branch 'improve-search-algorithm' of git://github.com/Ma27/nixShea Levy1-6/+6
2018-03-02 Merge branch 'write-failure-fixes' of git://github.com/lheckemann/nixShea Levy5-1/+16
2018-03-02 Merge pull request #1932 from mfiano/patch-1Eelco Dolstra1-4/+4
nix-channel grammar and punctuation
2018-03-02 Fix error messageEelco Dolstra1-2/+2
2018-03-01 tests/search.sh: simplify, don't rely on consistent orderingWill Dietz1-7/+3
2018-03-01 nix-channel grammar and punctuationMichael Fiano1-4/+4
Minor changes to the nix-channel manpage for my first contribution
2018-02-28 Merge pull request #1927 from dtzWill/fix/fetchgit-HEADShea Levy1-1/+1
fetchGit: use "HEAD" as default ref instead of "master"
2018-02-28 fetchGit: use "HEAD" as default refWill Dietz1-1/+1
2018-02-28 launchd: enable keepalive for the nix-daemon serviceDaiderd Jordan1-0/+2
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-28 Actually fix nixDataDir in non-canonical pathShea Levy2-2/+2
2018-02-27 Merge pull request #1912 from dezgeg/replacestrings-take-2Eelco Dolstra3-4/+18
libexpr: Fix prim_replaceStrings() to work on an empty source string, take 2
2018-02-26 libexpr: Fix prim_replaceStrings() to work on an empty source stringTuomas Tynkkynen3-4/+18
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-26 nix run: Fix segfault on macOSEelco Dolstra3-3/+11
Note that clearenv() is not available on macOS. Fixes #1907.
2018-02-25 nix search: explicitly handle empty search string, fixes #1893Will Dietz1-0/+5
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-25 nix search: fix bug where we wrote to cache when shouldn't, breakingWill Dietz1-1/+1
This is exposed by the tests added previously, and resolves the error reported in #1892: "expected JSON value".
2018-02-25 tests: test nix search behaviorWill Dietz3-1/+69
2018-02-24 Merge pull request #1901 from veprbl/patch-5Graham Christensen1-1/+1
Fix a small typo in the release notes
2018-02-24 Merge pull request #1903 from primeos/release-notes-2.0-url-fixGraham Christensen1-1/+1
doc: Fix a URL in the release notes for Nix 2.0
2018-02-24 doc: Fix a URL in the release notes for Nix 2.0Michael Weiss1-1/+1
2018-02-23 Fix a small typo in the release notesDmitry Kalinkin1-1/+1
2018-02-23 Fix downloadCached() with a chroot storeEelco Dolstra1-2/+2
E.g. nix run --store ~/my-nix -f channel:nixos-17.03 hello -c hello This problem was mentioned in #1897.
2018-02-22 Fix example in release notesEelco Dolstra1-1/+1
2018-02-22 DohEelco Dolstra1-6/+4
2018-02-22 Release script tweaksEelco Dolstra1-4/+9
2018-02-22 Merge branch 'data-dir-non-canon' of https://github.com/shlevy/nixEelco Dolstra1-1/+1
2018-02-22 Revert "Enable sandbox builds on Linux by default"Eelco Dolstra2-11/+1
This reverts commit ddc58e789636e1b94149c342575d92583251fbf6. https://hydra.nixos.org/eval/1435322
2018-02-22 Fix restricted mode when installing in non-canonical data dirShea Levy1-1/+1
2018-02-22 Set release dateEelco Dolstra1-1/+1
2018-02-22 Enable sandbox builds on Linux by defaultEelco Dolstra3-4/+12
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-22 Merge branch 'fix/sandbox-shell-features' of https://github.com/dtzWill/nixEelco Dolstra1-1/+13
2018-02-22 Merge branch 'fix/dry-run-partially' of https://github.com/dtzWill/nixEelco Dolstra3-0/+55
2018-02-21 Manual: Put configuration options in sorted orderEelco Dolstra1-427/+412
2018-02-21 Manual: Update chapter on remote buildsEelco Dolstra3-70/+191
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-21 Revert "libexpr: Fix prim_replaceStrings() to work on an empty source string"Eelco Dolstra3-11/+4
This reverts commit 4ea9707591beceacf9988b3c185faf50da238403. It causes an infinite loop in Nixpkgs evaluation, e.g. "nix-instantiate -A hello" hung. PR #1886.
2018-02-20 Merge branch 'nix-copy' of git://github.com/Mic92/nix-1Shea Levy1-3/+3
2018-02-21 nix-copy: fix examplesJörg Thalheim1-3/+3
maybe a left-over from nix-store -r ?