Eelco Dolstra
eb75bc5afb
Don't retry on CURLE_SSL_CACERT_BADFILE
...
The certificates won't get any better if we retry.
2018-03-16 12:03:18 +01:00
Eelco Dolstra
4868721506
Filter ANSI colors when not writing to a terminal
...
Fixes https://github.com/NixOS/nixpkgs/issues/37114 .
2018-03-15 16:08:07 +01:00
Eelco Dolstra
7b8914825a
Merge pull request #1965 from masaeedu/master
...
Wrap thread local in function for Cygwin
2018-03-15 14:56:21 +01:00
Shea Levy
cfdbfa6b2c
Catch more possible instances of passing NULL to memcpy.
...
Actually fixes #1976 .
2018-03-14 23:53:43 -04:00
Shea Levy
d25d9f7cec
Merge branch 'fix/errno-sighandler' of git://github.com/dtzWill/nix
2018-03-14 23:45:35 -04:00
Shea Levy
e2088febf3
concatLists: Don't pass NULL pointers to memcpy.
...
This is UB, even if the size is 0. See #1976 .
Fixes #1976 .
2018-03-14 23:44:02 -04:00
Will Dietz
d98755b0c2
nix-daemon: preserve errno in signal handler (thanks tsan)
2018-03-14 21:39:46 -05:00
Eelco Dolstra
55aa622fb1
Fix compatibility with latest boost::format
2018-03-14 19:25:09 +01:00
Eelco Dolstra
c04bca3401
Factor out commonality between release.nix and shell.nix
2018-03-14 19:25:09 +01:00
Eelco Dolstra
ca14b14200
Use boost::format from the boost package
...
Note that this only requires headers from boost so it doesn't add a
runtime dependency.
Also, use Nixpkgs 18.03.
2018-03-14 19:24:04 +01:00
Shea Levy
56f2ed0081
Merge pull request #1906 from dtzWill/fix/nix-search
...
nix search: tests and fix #1893 and part of #1892
2018-03-13 18:43:47 -06:00
Eelco Dolstra
7afdc8d4a1
build-remote: Don't substitute the build result
2018-03-13 17:56:51 +01:00
Eelco Dolstra
6e60141a80
Typo
2018-03-13 17:48:09 +01:00
Guillaume Maudoux
80735c4cc9
fetchGit: Fix debug message
2018-03-13 10:28:23 +01:00
Asad Saeeduddin
be54f4a0b6
Wrap thread local in function for Cygwin
...
Fixes #1826 . See #1352 for a previous instance of a similar change.
2018-03-12 00:56:41 -04:00
Eelco Dolstra
24b739817f
Fix double free in Store::queryPathInfo()
...
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 14:19:51 +01:00
Eelco Dolstra
dc83c8eea5
Merge pull request #1959 from redfish64/master
...
Modified MakeBinOp to no longer produce its name using concatenation …
2018-03-09 14:06:44 +01:00
Tim Engler
383afab9ad
Modified MakeBinOp to no longer produce its name using concatenation and "##".
...
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-09 03:16:33 +00:00
Eelco Dolstra
16551f54c9
Fix #1957
2018-03-07 11:40:50 +01:00
Eelco Dolstra
4452f6e855
Merge pull request #1955 from dtzWill/fix/rand-random
...
rand() -> random(), since we use srandom().
2018-03-07 11:00:08 +01:00
Will Dietz
56253bb08f
rand() -> random(), since we use srandom().
...
rand() requires we call srand() instead,
but might as well use random().
2018-03-06 17:44:25 -06:00
Will Dietz
e917c05628
logging: Don't throw from Activity destructor
...
Move definition of destructor to logging.cc for
access to util.hh's ignoreException.
2018-03-06 10:42:58 -06:00
Eelco Dolstra
70dbac7491
Merge pull request #1948 from shlevy/no-forward
...
ssh-ng: Don't forward options to the daemon.
2018-03-05 18:23:00 +01:00
Shea Levy
088ef81759
ssh-ng: Don't forward options to the daemon.
...
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-05 07:42:15 -05:00
Will Dietz
e9a5ce9b07
release.nix: don't try to use nix-2.0 branch, no longer exists
...
Probably should point at the 18.03 release branch once that's made.
2018-03-03 13:48:54 -06:00
Shea Levy
3748a0ca1e
Merge branch 'improve-search-algorithm' of git://github.com/Ma27/nix
2018-03-02 11:41:08 -05:00
Shea Levy
aa8bbbf69d
Merge branch 'write-failure-fixes' of git://github.com/lheckemann/nix
2018-03-02 10:59:59 -05:00
Eelco Dolstra
5c7a6d07de
Merge pull request #1932 from mfiano/patch-1
...
nix-channel grammar and punctuation
2018-03-02 16:58:00 +01:00
Eelco Dolstra
939cf4cceb
Fix error message
2018-03-02 14:32:00 +01:00
Will Dietz
c577186f59
tests/search.sh: simplify, don't rely on consistent ordering
2018-03-01 13:25:06 -06:00
Michael Fiano
ad97d1a786
nix-channel grammar and punctuation
...
Minor changes to the nix-channel manpage for my first contribution
2018-03-01 00:27:25 -05:00
Shea Levy
4a000cbb39
Merge pull request #1927 from dtzWill/fix/fetchgit-HEAD
...
fetchGit: use "HEAD" as default ref instead of "master"
2018-02-28 18:44:57 -05:00
Will Dietz
e89d02bf03
fetchGit: use "HEAD" as default ref
2018-02-28 16:34:34 -06:00
Daiderd Jordan
05cb8e5c5a
launchd: enable keepalive for the nix-daemon service
...
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 19:58:48 +01:00
Shea Levy
14ca85688c
Actually fix nixDataDir in non-canonical path
2018-02-28 06:19:40 -05:00
Eelco Dolstra
8a5da93841
Merge pull request #1912 from dezgeg/replacestrings-take-2
...
libexpr: Fix prim_replaceStrings() to work on an empty source string, take 2
2018-02-27 12:53:19 +01:00
Tuomas Tynkkynen
77e9e1ed91
libexpr: Fix prim_replaceStrings() to work on an empty source string
...
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 e2d71bd186
2018-02-26 19:49:13 +02:00
Eelco Dolstra
24ec750003
nix run: Fix segfault on macOS
...
Note that clearenv() is not available on macOS.
Fixes #1907 .
2018-02-26 18:29:40 +01:00
Will Dietz
009cf9cd23
nix search: explicitly handle empty search string, fixes #1893
...
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 16:40:56 -06:00
Will Dietz
3cac8734ac
nix search: fix bug where we wrote to cache when shouldn't, breaking
...
This is exposed by the tests added previously,
and resolves the error reported in #1892 :
"expected JSON value".
2018-02-25 16:40:05 -06:00
Will Dietz
8282c60d74
tests: test nix search behavior
2018-02-25 16:40:05 -06:00
Graham Christensen
9432f3fb7d
Merge pull request #1901 from veprbl/patch-5
...
Fix a small typo in the release notes
2018-02-24 10:26:14 -05:00
Graham Christensen
ab435463d0
Merge pull request #1903 from primeos/release-notes-2.0-url-fix
...
doc: Fix a URL in the release notes for Nix 2.0
2018-02-24 10:19:39 -05:00
Michael Weiss
bd94e63853
doc: Fix a URL in the release notes for Nix 2.0
2018-02-24 16:07:10 +01:00
Dmitry Kalinkin
d9d8a84a96
Fix a small typo in the release notes
2018-02-23 23:45:42 -05:00
Eelco Dolstra
64e486ab63
Fix downloadCached() with a chroot store
...
E.g.
nix run --store ~/my-nix -f channel:nixos-17.03 hello -c hello
This problem was mentioned in #1897 .
2018-02-23 13:00:42 +01:00
Eelco Dolstra
39b4177500
Fix example in release notes
2018-02-22 17:42:06 +01:00
Eelco Dolstra
2691d51a33
Doh
2018-02-22 17:14:35 +01:00
Eelco Dolstra
b6dec2f3ca
Release script tweaks
2018-02-22 17:11:17 +01:00
Eelco Dolstra
179b896acb
Merge branch 'data-dir-non-canon' of https://github.com/shlevy/nix
2018-02-22 14:20:43 +01:00
