Eelco Dolstra
cf2a751a93
In restricted eval mode, allow access to the closure of store paths
...
E.g. this makes
nix eval --restrict-eval -I /nix/store/foo '(builtins.readFile "/nix/store/foo/symlink/bla")'
(where /nix/store/foo/symlink is a symlink to another path in the
closure of /nix/store/foo) succeed.
This fixes a regression in Hydra compared to Nix 1.x (where there were
no restrictions at all on access to the Nix store).
(cherry picked from commit a91c4ca01f
2018-05-29 14:18:42 +02:00
Eelco Dolstra
e96b498791
Bump version
2018-05-29 14:17:23 +02:00
Eelco Dolstra
4c1c40b4c8
Merge pull request #2183 from grahamc/omnibus-backport
...
Omnibus backport: #2178 : doc fix for --check, #2181 : MITM HTTPS proxy fix at install time
2018-05-29 13:54:48 +02:00
Graham Christensen
5f7b9243f1
Document NIX_SSL_CERT_FILE for installation
2018-05-26 12:42:54 -04:00
Graham Christensen
3d81ad8835
multi-user profile: borrow single user profiles' NIX_SSL_CERT_FILE finding logic
2018-05-26 12:42:54 -04:00
Graham Christensen
7102f8060d
install-multi-user: don't force NIX_SSL_CERT_FILE
...
Following the lead of the single user installer, if NIX_SSL_CERT_FILE is explicitly set prior to running, accept the user-provided version.
2018-05-26 12:29:05 -04:00
Alexandre Esteves
bfcfc978b7
Fix docs on --check suffix
2018-05-26 12:29:02 -04:00
Eelco Dolstra
9d13ba6dc1
Bump version
2018-05-04 12:33:35 +02:00
Eelco Dolstra
f97e3a24ff
Don't set a CA assertion for paths with references
...
Really fixes #2133 .
(cherry picked from commit c717d8e3bd
2018-05-03 14:50:28 +02:00
Will Dietz
686241825c
build.cc: fix bind-mount of /dev/{pts,ptmx} fallback
...
Don't bind-mount these to themselves,
mount them into the chroot directory.
Fixes pty issues when using sandbox on CentOS 7.4.
(build of perlPackages.IOTty fails before this change)
(cherry picked from commit 6d9129014d
2018-05-03 13:59:24 +02:00
Eelco Dolstra
8eceb32e0a
LocalStore::addValidPath(): Throw error when the CA assertion is wrong
...
Closes #2133 .
(cherry picked from commit 80a7b16593
2018-05-03 13:59:04 +02:00
Danylo Hlynskyi
3c6dd39750
nix-collect-garbage: little doc fix
...
This removes confusing documentation. It's better to remove doc than add implementation, because Nix 1.12 will surely have new GC interface anyway.
Fixes https://github.com/NixOS/nix/issues/641
(cherry picked from commit ac22d77fd1
2018-05-03 13:58:53 +02:00
Eelco Dolstra
1a67d4155f
Fix bzip2 compression of files > 4 GiB
...
Bzip2's 'avail_in' parameter is declared as an unsigned int, so
assigning a size_t length to it led to silent truncation.
Fixes #2111 .
(cherry picked from commit 4a2c948943
2018-05-03 13:27:56 +02:00
Eelco Dolstra
444b921fcb
Fix #1921
...
(cherry picked from commit d34fa2bcc3
2018-04-20 12:47:14 +01:00
Shea Levy
dab3a9d37b
Export required C++ version in pkgconfig.
...
(cherry picked from commit a38fe5c1a8
2018-04-20 11:13:56 +02:00
Shea Levy
51415f1004
Make prim_exec and prim_importNative available to plugins
...
(cherry picked from commit fd98fca7bb
2018-04-20 11:13:56 +02:00
Eelco Dolstra
338a3cc0cb
Merge pull request #2093 from grahamc/re-backport-multi-user-linux
...
Re backport multi user linux, but default to no daemon on Linux
2018-04-20 00:37:22 +02:00
Graham Christensen
572192ec52
installer: allow opting in / out to the daemon installer
...
By passing --daemon or --no-daemon, the installer can be forced to
select one or the other installation options, despite what the
automatic detection can provide.
This commit can be backported to 2.0-maintenance because it explicitly
turns off the daemon installation for Linux under systemd.
(cherry picked from commit 17b158af85
2018-04-19 13:56:00 -04:00
Graham Christensen
fa44fa36d1
Revert "Revert "Merge pull request #2027 from grahamc/backport-linux-multi-user""
...
This reverts commit 4a7b3d1f4c
2018-04-19 13:55:37 -04:00
Shea Levy
0ccf36be35
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.
(cherry picked from commit 088ef81759
2018-04-19 11:46:25 -04:00
Eelco Dolstra
c67476fb7a
Bump version to 2.0.1
2018-04-19 16:28:28 +02:00
Asad Saeeduddin
e30bd3502e
Wrap thread local in function for Cygwin
...
Fixes #1826 . See #1352 for a previous instance of a similar change.
(cherry picked from commit be54f4a0b6
2018-04-19 16:28:07 +02:00
Eelco Dolstra
5a01ff6b47
Fix tests.evalNixOS
...
This failed because NixOS' release.nix calls builtins.fetchGit.
(cherry picked from commit a99027d587
2018-04-19 16:18:59 +02:00
Eelco Dolstra
f7454db452
Remove Fedora / Ubuntu releases that are no longer in Nixpkgs
...
(cherry picked from commit ed87fd17dd
2018-04-19 14:49:58 +02:00
Eelco Dolstra
497325a75d
Remove some release-critical jobs
...
The release does not in fact depend on Ubuntu/Fedora builds (we don't
publish the build results).
(cherry picked from commit 92aee1b7d6
2018-04-19 14:49:49 +02:00
Shea Levy
b61ea7b24e
initPlugins: Fix dlopen error message.
...
(cherry picked from commit dc0a542c9f
2018-04-18 17:47:59 +02:00
Eelco Dolstra
b1ade66815
Handle arguments in $EDITOR
...
Fixes #2079 .
(cherry picked from commit a4aac7f88c
2018-04-18 17:47:33 +02:00
Félix Baylac-Jacqué
5be4f48c2d
nix repl: Fix multiline SIGINT handling.
...
Fixes #2076
(cherry picked from commit a91fb422fe
2018-04-18 17:47:21 +02:00
Eelco Dolstra
effbbca812
Fix #2057
...
(cherry picked from commit 1839a5542a
2018-04-11 11:47:43 +02:00
Shea Levy
f226d56d25
nix-daemon: Exit successfully when interrupted.
...
Fixes #2058 .
(cherry picked from commit 346c0ac361
2018-04-11 11:47:43 +02:00
Andrew Dunham
2463b4eb07
Fix missing $DESTDIR when installing programs
...
(cherry picked from commit f8ab9cef6c
2018-04-11 11:47:43 +02:00
Samuel Dionne-Riel
b8a5acc203
nix-shell: Fixes use with ruby shebangs.
...
The ported code in 80ebc553ec399f43c3d5
2018-04-11 11:47:43 +02:00
zimbatm
1e17079915
nix copy: add an example with S3
...
I couldn't find a good example how to use it with non-us-east-1 buckets.
(cherry picked from commit 865ca2402f
2018-04-11 11:47:43 +02:00
Eelco Dolstra
3556a7c254
Remove reference to non-existent manpages
...
(cherry picked from commit 446bb88f13
2018-04-11 11:47:43 +02:00
Eelco Dolstra
d0699defd6
Process --option use-case-hack properly
...
Fixes https://github.com/NixOS/nix/issues/2009 .
(cherry picked from commit 2b61c74922
2018-04-11 11:47:43 +02:00
Eelco Dolstra
247630287b
ValidPathInfo::isContentAddressed(): Ensure there are no references
...
(cherry picked from commit 9d1220a01d
2018-04-11 11:47:43 +02:00
Tuomas Tynkkynen
59c54f877c
release.nix: Use pkgs.closureInfo for binaryTarball
...
pathsFromGraph is legacy since Nix 2.0.
(cherry picked from commit cc6712ae90
2018-04-11 11:47:43 +02:00
Eelco Dolstra
4a7b3d1f4c
Revert "Merge pull request #2027 from grahamc/backport-linux-multi-user"
...
This reverts commit a198670ab2a1cc741d9c
2018-04-11 11:47:43 +02:00
Shea Levy
33dc83821d
Document fetchGit.
...
Fixes #1981 .
(cherry picked from commit 6856fe62b0
2018-04-11 11:47:43 +02:00
Dmitry Kalinkin
26bc4b9557
doc: don't mention obsolete ssh-substituter-hosts
...
#1840
(cherry picked from commit e2f56c1333
2018-04-11 11:47:42 +02:00
Corey O'Connor
7a35b10ade
manual: correct repeated "--deriver". Add missing single char option aliases.
...
(cherry picked from commit 22b144fea6
2018-04-11 11:47:42 +02:00
Eelco Dolstra
ccb81b2622
Remove unused channel-cache directory
...
(cherry picked from commit 03d8136b02
2018-04-11 11:47:42 +02:00
Eelco Dolstra
073dac149b
Don't retry on CURLE_SSL_CACERT_BADFILE
...
The certificates won't get any better if we retry.
(cherry picked from commit eb75bc5afb
2018-04-11 11:47:42 +02:00
Eelco Dolstra
225ae5b62a
Filter ANSI colors when not writing to a terminal
...
Fixes https://github.com/NixOS/nixpkgs/issues/37114 .
(cherry picked from commit 4868721506
2018-04-11 11:47:42 +02:00
Will Dietz
434cdab511
nix-daemon: preserve errno in signal handler (thanks tsan)
...
(cherry picked from commit d98755b0c2
2018-04-11 11:47:42 +02:00
Eelco Dolstra
ac5a36c2f3
build-remote: Don't substitute the build result
...
(cherry picked from commit 7afdc8d4a1
2018-04-11 11:47:42 +02:00
Eelco Dolstra
25b24a5542
Typo
...
(cherry picked from commit 6e60141a80
2018-04-11 11:47:42 +02:00
Guillaume Maudoux
4c737abe3e
fetchGit: Fix debug message
...
(cherry picked from commit 80735c4cc9
2018-04-11 11:47:42 +02:00
Eelco Dolstra
dd214bb087
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 .
(cherry picked from commit 24b739817f
2018-04-11 11:47:42 +02:00
Eelco Dolstra
d306287abd
Fix #1957
...
(cherry picked from commit 16551f54c9
2018-04-11 11:47:41 +02:00
