Eelco Dolstra
f217acd9e7
Merge pull request #1566 from FPtje/1.11-maintenance
...
scripts/nix-copy-closure.in: Automatically flush STDERR handle
2017-09-10 17:51:31 +02:00
Falco Peijnenburg
b3ad7c5052
scripts/nix-copy-closure.in: Automatically flush STDERR handle
...
Fixes https://github.com/NixOS/nixops/issues/455
2017-09-10 17:38:18 +02:00
Eelco Dolstra
e8235c4f3e
Bump version
2017-09-01 11:13:16 +02:00
Sergei Trofimovich
41352d50db
src/libmain/stack.cc: fix 'ucontext' usage on glibc-2.26
...
Build fails as:
$ make
CXX src/libmain/stack.o
src/libmain/stack.cc: In function 'void nix::sigsegvHandler(int, siginfo_t*, void*)':
src/libmain/stack.cc:21:21: error: 'ucontext' was not declared in this scope
sp = (char *) ((ucontext *) ctx)->uc_mcontext.gregs[REG_RSP];
^~~~~~~~
src/libmain/stack.cc:21:21: note: suggested alternative: 'ucontext_t'
sp = (char *) ((ucontext *) ctx)->uc_mcontext.gregs[REG_RSP];
^~~~~~~~
ucontext_t
It's caused by upstream rename:
https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=251287734e89a52da3db682a8241eb6bccc050c9
which basically changes
typedef struct ucontext {} ucontext_t;
to
typedef struct ucontext_t {} ucontext_t;
The change uses ucontext_t.
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
(cherry picked from commit c9857ef262
)
2017-09-01 11:12:49 +02:00
Eelco Dolstra
b3a616e860
Bump version
2017-08-30 20:03:33 +02:00
Eelco Dolstra
617dab1515
Merge pull request #1543 from matthewbauer/1.11-maintenance
...
OS X sandbox: Store .sb file in $TMPDIR rather than the Nix store
2017-08-30 19:50:40 +02:00
Eelco Dolstra
35f541a7a0
OS X sandbox: Store .sb file in $TMPDIR rather than the Nix store
...
The filename used was not unique and owned by the build user, so
builds could fail with
error: while setting up the build environment: cannot unlink ‘/nix/store/99i210ihnsjacajaw8r33fmgjvzpg6nr-bison-3.0.4.drv.sb’: Permission denied
2017-08-30 12:06:31 -05:00
Eelco Dolstra
23795d47fb
Merge pull request #1540 from grahamc/test-o
...
1.11: Replace stat / uid comparison with test -O
2017-08-30 15:43:47 +02:00
Graham Christensen
d07697de5f
Replace stat / uid comparison with test -O
2017-08-29 18:56:32 -04:00
Domen Kožar
3afb744185
Merge pull request #1313 from neilmayhew/topic/cores
...
Propagate NIX_BUILD_CORES to nix-shell environments
2017-08-02 15:02:25 +02:00
Eelco Dolstra
04532ee2c8
Fix test failure
...
(cherry picked from commit 46e36f9b73
)
Signed-off-by: Domen Kožar <domen@dev.si>
2017-07-25 11:50:31 +02:00
Eelco Dolstra
24883645a6
Merge pull request #1486 from grahamc/detect-already-running
...
Test to see if nix-daemon is running already
2017-07-25 09:24:06 +02:00
Graham Christensen
9a04bc6f5e
Test to see if nix-daemon is running already
...
A user had an install, uninstalled it via the instructions, and found their nix broken.
The issue was based around nix-daemon already running.
I tried to be very smart around searching their launchctl files:
$ grep -ri nix-daemon ~/Library/LaunchAgents /Library/LaunchAgents /Library/LaunchDaemons /System/Library/LaunchAgents /System/Library/LaunchDaemons
but then couldn't figure out how to write out (nicely) commands for uninstalling
or unloading them based on their name, and also couching the instrunctions in a
bit of doubt so we don't piss off some poor mac admin because their users just
deleted some important launchd files.
2017-07-24 22:37:22 -04:00
Eelco Dolstra
0ec723375b
Merge pull request #1469 from grahamc/domen-feedback-nix
...
Show users how to source the profile, to get a working Nix.
2017-07-17 15:05:17 +02:00
Graham Christensen
4b45f94b5c
Show users how to source the profile, to get a working Nix.
2017-07-17 08:39:14 -04:00
Eelco Dolstra
16daed49dc
Merge pull request #1463 from grahamc/fix-stdin-errors
...
Fix stdin errors
2017-07-14 15:07:57 +02:00
Graham Christensen
41f0a08a31
bump version to 1.11.13
2017-07-14 06:28:47 -04:00
Graham Christensen
e4831a4412
Rename PINCH_ME_IM_SILLY to ALLOW_PREEXISTING_INSTALLATION
2017-07-14 06:28:24 -04:00
Graham Christensen
6ba624f25a
If there is no TTY, also skip verbose sudo messages
2017-07-14 06:23:51 -04:00
Graham Christensen
6b6d4b69c1
Ensure PINCH_ME_IM_SILLY allows a /nix/store to stick around between builds
...
Also output in the status report that the user is very silly
2017-07-13 19:45:00 -04:00
Graham Christensen
b01eaa6114
Assume yes if we have no TTY
...
Starve the TTY of input to ensure this works, but provide yes to the
current installer to handle the current broken case.
2017-07-13 18:03:53 -04:00
Eelco Dolstra
04e071a5e4
Bump version
2017-07-13 15:10:09 +02:00
Domen Kožar
44f51a5dd2
Fix rpm build
2017-07-13 14:11:21 +02:00
Eelco Dolstra
e135db704f
Merge pull request #1453 from grahamc/multi-user-darwin
...
Multi user darwin installer
2017-07-13 13:03:28 +02:00
Graham Christensen
c82126790d
Cleanup and more specificity around set -e
2017-07-12 20:43:57 -04:00
Graham Christensen
85acfcd6bd
Only clean if the file exists
2017-07-12 20:31:33 -04:00
Graham Christensen
b2917c8246
Clean up nix hints from the old insstaller
2017-07-12 20:29:58 -04:00
Graham Christensen
a31347d6ec
release: don't build libseccomp if we're on darwin
2017-07-12 19:23:42 -04:00
Graham Christensen
c4f349d572
Run nix-build inside a fresh bash login
2017-07-12 17:10:14 -04:00
Graham Christensen
163d93125e
chmod
2017-07-12 12:58:37 -04:00
Graham Christensen
302e820660
Test the installer
2017-07-12 11:45:38 -04:00
Graham Christensen
2442c4684d
Address feedback around printf & exec
2017-07-12 11:45:35 -04:00
Graham Christensen
d4f128352e
Don't install a second nix after the initial installation, and the rsync change fixes a bug hidden by the nix replacement where the store files were being owned by the installing user due to rsync's -a implying -og.
2017-07-12 11:45:32 -04:00
Graham Christensen
0c13077d83
nix: build with libsodium on macOS
2017-07-12 11:45:28 -04:00
Graham Christensen
661daed683
Clean up issues around uninstall directions, and only show
...
relevant directions
2017-07-12 11:45:25 -04:00
Graham Christensen
262a08c0e2
Prompt for sudo before validating assumptions, and check ourselves for root-owned files instead of making a scary warning.
2017-07-12 11:45:22 -04:00
Graham Christensen
3ebd25a644
multi-user install: move the profile in to the nix etc/profiles.d output
2017-07-12 11:45:19 -04:00
Graham Christensen
218978154a
Switch to a fancy multi-user installer on Darwin
2017-07-12 11:45:13 -04:00
Graham Christensen
799f5adf79
Shellcheck the existing installer
2017-07-12 11:44:28 -04:00
Eelco Dolstra
84d10d248e
Fix build
2017-07-12 13:00:41 +02:00
Robert Vollmert
758a3044f1
Fix nix-instantiate manpage indentation
...
The second command variant is now its own cmdsynopsis, which ensures
it's not indented as was the case using sbrk.
(cherry picked from commit 60da5d2b8f
)
2017-07-12 11:31:24 +02:00
Matthew Bauer
5a7d00ced8
Don’t hardlink disallowed paths in OS X.
...
Fixes #1443
(cherry picked from commit 72e80c59b5
)
2017-07-12 11:31:17 +02:00
Eelco Dolstra
9943f98c35
Add X32 to the seccomp filter
...
Fixes #1432 .
(cherry picked from commit a3dc1e65ab
)
2017-07-12 11:30:28 +02:00
Eelco Dolstra
b59788fc48
fetchTarball: Prevent concurrent downloads of the same file
...
Fixes #849 .
(cherry picked from commit 8e8caf7f3e
)
2017-07-12 11:28:59 +02:00
Eelco Dolstra
7577d35895
replaceSymlink(): Handle the case where the temporary file already exists
...
Not really necessary anymore for #849 , but still nice to have.
(cherry picked from commit 2965d40612
)
2017-07-12 11:28:05 +02:00
Shea Levy
2a0112a370
Merge branch 'add-nix-profile-daemon' of git://github.com/grahamc/nix into 1.11-maintenance
2017-07-09 16:03:15 -04:00
Graham Christensen
3e0a503bf7
Create a profile suitable for multi-user installs
2017-07-09 14:52:33 -04:00
Eelco Dolstra
026f4f9ae8
macOS: Remove flags
...
In particular, UF_IMMUTABLE (uchg) needs to be cleared to allow the
path to be garbage-collected or optimised.
See https://github.com/NixOS/nixpkgs/issues/25819 .
+ the file from being garbage-collected.
(cherry picked from commit b5bdfdef73
)
2017-06-19 14:32:38 +02:00
Eelco Dolstra
11dd08f02e
macOS: Ugly hack to make the tests succeed
...
Sandboxes cannot be nested, so if Nix's build runs inside a sandbox,
it cannot use a sandbox itself. I don't see a clean way to detect
whether we're in a sandbox, so use a test-specific hack.
https://github.com/NixOS/nix/issues/1413
(cherry picked from commit 1888f7889b
)
2017-06-19 14:28:04 +02:00
Shea Levy
3e574c3691
Merge branch '1.11-maintenance' of git://github.com/cyraxjoe/nix into 1.11-maintenance
2017-06-14 07:52:36 -04:00