1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-15 06:52:43 +01:00
Commit graph

6410 commits

Author SHA1 Message Date
Eelco Dolstra
f573ea7464
Bump version 2018-09-05 21:24:04 +02:00
Eelco Dolstra
46c8fcca97
fetchurl: Respect unpack
Fixes #2393.

(cherry picked from commit 2d91012754)
2018-09-05 21:23:45 +02:00
Eelco Dolstra
b4441c9690
Release notes tweaks
(cherry picked from commit 4dd09210d7)
2018-09-02 21:47:53 +02:00
Graham Christensen
eb40c23dfd Create upgrade notes
(cherry picked from commit c42eaaf684)
2018-09-01 23:30:16 +02:00
Graham Christensen
7fe614b5c9 release notes: note that the multi-user installer is available but not selected for Linux with systemd, and the bug about selinux
(cherry picked from commit 4be7652dd3)
2018-09-01 23:30:16 +02:00
Graham Christensen
95ed61c990 Default to single-user install
(cherry picked from commit 51f9682a8b)
2018-09-01 23:30:16 +02:00
Graham Christensen
93cae69725 Document the multi-user installer some
Use sh <(...) syntax for installation to preserve stdin and prompting

also update installation docs to account for changes in multi-user selection

(cherry picked from commit c3e508d924)
2018-09-01 23:30:16 +02:00
Graham Christensen
a4a72c0152 We support aarch64 now
(cherry picked from commit f66fa7cd20)
2018-09-01 23:30:15 +02:00
Graham Christensen
348a2eb84a nix-build: Print stats even in failing builds
(cherry picked from commit 87702532d2)
2018-09-01 23:30:15 +02:00
Graham Christensen
958e037a08 nix-build: print stats on sucessful builds
(cherry picked from commit b7bb627f67)
2018-09-01 23:30:15 +02:00
Graham Christensen
75a041c36c Drop ssh://... as a required formatting for builtins.fetchGit
(cherry picked from commit 0b7568fb73)
2018-09-01 23:29:51 +02:00
Eelco Dolstra
6202ffdce9 fetchGit/fetchMercurial: Don't absolutize paths
This is already done by coerceToString(), provided that the argument
is a path (e.g. 'fetchGit ./bla'). It fixes the handling of URLs like
git@github.com:owner/repo.git. It breaks 'fetchGit "./bla"', but that
was never intended to work anyway and is inconsistent with other
builtin functions (e.g. 'readFile "./bla"' fails).

(cherry picked from commit 475a0a54a9)
2018-09-01 23:29:51 +02:00
Eelco Dolstra
d2339af44c nix path-info: Remove trailing spaces
Fixes #2390.

(cherry picked from commit b7409c5754)
2018-09-01 23:29:37 +02:00
Eelco Dolstra
b71789885a Add contributors
(cherry picked from commit 4095cd6438)
2018-09-01 23:29:37 +02:00
Graham Christensen
165743b8bf docs: Add IDs to important sections
(cherry picked from commit 149d10c308)
2018-09-01 23:29:37 +02:00
Graham Christensen
81028d5b87 docs: Add some examples to fetchGit
(cherry picked from commit 2df21b78b9)
2018-09-01 23:29:37 +02:00
Graham Christensen
d3088a64db manual: document why ~/.netrc doesn't work
Maybe there is a better place to document this, which is more generic?

(cherry picked from commit 33712fed38)
2018-09-01 23:29:01 +02:00
Niklas Hambüchen
d853b57991 manual: distributed-builds: Mention - as default
(cherry picked from commit 10ebcf8670)
2018-09-01 23:29:01 +02:00
Symphorien Gibol
1d619967ef add manual entries for disallowedRequisites and disallowedReferences
(cherry picked from commit 81d1385437)
2018-09-01 23:29:01 +02:00
Erik Arvstedt
8115c10e59
Docs: Fix install prefix
shell.nix defines the install prefix as $(pwd)/inst

(cherry picked from commit 8ad2defdf0)
2018-08-31 16:12:27 +02:00
Eelco Dolstra
b7a37ab5f2
nix upgrade-nix: Handle .nix-profile being a link to .../profiles/per-user/...
Also some cosmetic improvements.

(cherry picked from commit 39f1722f36)
2018-08-31 16:12:11 +02:00
Eelco Dolstra
f8fbab43f2
nix upgrade-nix: Improve error message if 'nix' is not in a profile
E.g.

  $ nix upgrade-nix
  error: directory '/home/eelco/Dev/nix/inst/bin' does not appear to be part of a Nix profile

instead of

  $ nix upgrade-nix
  error: '/home/eelco/Dev/nix/inst' is not a symlink

(cherry picked from commit f08b14c9d0)
2018-08-31 16:12:11 +02:00
Eelco Dolstra
d7b2c6c92f
Add simple test for nix upgrade-nix
(cherry picked from commit 264e66f696)
2018-08-31 16:12:11 +02:00
Michael Bishop
8b0761b172
fix error: unknown serve command 9
(cherry picked from commit 0767e402f1)
2018-08-31 16:12:11 +02:00
Daiderd Jordan
2b25ffbd49
upgrade-nix: resolve profile symlinks
The profile present in PATH is not necessarily the actual profile
location. User profiles are generally added as $HOME/.nix-profile
in which case the indirect profile link needs to be resolved first.

/home/user/.nix-profile -> /nix/var/nix/profiles/per-user/user/profile
/nix/var/nix/profiles/per-user/user/profile -> profile-15-link
/nix/var/nix/profiles/per-user/user/profile-14-link -> /nix/store/hyi4kkjh3bwi2z3wfljrkfymz9904h62-user-environment
/nix/var/nix/profiles/per-user/user/profile-15-link -> /nix/store/6njpl3qvihz46vj911pwx7hfcvwhifl9-user-environment

To upgrade nix here we want /nix/var/nix/profiles/per-user/user/profile-16-link
instead of /home/user/.nix-profile-1-link. The latter is not a gcroot
and would be garbage collected, resulting in a broken profile.

Fixes #2175

(cherry picked from commit d85bb4814f)
2018-08-31 16:12:11 +02:00
Daiderd Jordan
88d2e298f5
upgrade-nix: add --dry-run
(cherry picked from commit 414397759a)
2018-08-31 16:12:11 +02:00
Eelco Dolstra
1fceed528d
nix: Remove the -h flag
(cherry picked from commit 5e83b0227f)
2018-08-31 16:11:09 +02:00
Eelco Dolstra
b542267d18
Remove boost from the closure
This reduces the size of the closure by 45 MiB.

(cherry picked from commit 145db703e5)
2018-08-31 16:11:09 +02:00
Eelco Dolstra
e76eec86bd
Update release notes
(cherry picked from commit 64d7d1a884)
2018-08-31 16:11:06 +02:00
Eelco Dolstra
25af916eb4
Revert "Fix parser/lexer generation with parallel make"
This reverts commit d277442df5.

Make sucks.

(cherry picked from commit c651b7bdc9)
2018-08-30 12:48:48 +02:00
Tuomas Tynkkynen
0107a8f6d4
Drop all references to NIX_INDENT_MAKE
Dead code since 6669a3b477

(cherry picked from commit 2894197de7)
2018-08-30 12:48:32 +02:00
Tuomas Tynkkynen
c2dcc102e4
Drop all references to --disable-init-state
It's all dead code since 2014 (commit 0c6d62cf27).

(cherry picked from commit 458282be59)
2018-08-30 12:48:32 +02:00
Ivan Kozik
9280d11e54
repl: don't add trailing spaces to history lines
(cherry picked from commit ec49ea28dc)
2018-08-30 12:48:28 +02:00
Eelco Dolstra
954d1f4d0a
Disable the Ubuntu 17.10 build
Ubuntu 17.10 doesn't have libbrotli.

https://hydra.nixos.org/build/79867741
2018-08-21 15:33:29 +02:00
Eelco Dolstra
ebe3d2d370 Improve 'coroutine has finished' error message 2018-08-21 15:22:04 +02:00
Eelco Dolstra
6317c65937 Fix warnings in compression.cc 2018-08-21 15:20:23 +02:00
Eelco Dolstra
17a92dfb7d Fix another 'coroutine has finished' during decompression
https://hydra.nixos.org/build/79867739
2018-08-21 15:19:20 +02:00
Eelco Dolstra
cc7b4386b1
nix run: Restore CPU affinity
Fixes #2359.
2018-08-19 12:05:08 +02:00
Eelco Dolstra
9b1bdf2db8
FIx floating point evaluation
Fixes #2361.
2018-08-19 11:59:49 +02:00
Eelco Dolstra
d277442df5
Fix parser/lexer generation with parallel make
Fun fact: rules with multiple targets don't work properly with 'make
-j'. For example, a rule like

  a b: c
    touch a b

is equivalent to

  a: c
    touch a b

  b: c
    touch a b

so with 'make -j', the 'touch' command will be run twice. See
e.g. https://stackoverflow.com/questions/2973445/gnu-makefile-rule-generating-a-few-targets-from-a-single-source-file.
2018-08-17 12:59:23 +02:00
Eelco Dolstra
19265ed26c
Merge pull request #2351 from volth/update-config
update config/config.{sub,guess}
2018-08-13 22:24:22 +02:00
Eelco Dolstra
746cf2d27e
Merge pull request #2350 from symphorien/xattr-cifs
ignore when listxattr fails with ENODATA
2018-08-13 22:20:04 +02:00
volth
bad27dc475 update config/config.{sub,guess}
Just
curl 'http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD'   > config/config.sub
curl 'http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD' > config/config.guess

Those files are 5 years old and failed to guess new archs ("ppc64-linux")
2018-08-13 20:00:17 +00:00
Symphorien Gibol
5b19a6663b ignore when listxattr fails with ENODATA
This happens on CIFS and means the remote filesystem has no extended
attributes.
2018-08-13 21:11:36 +02:00
Eelco Dolstra
f72c907ad8
Slightly questionable workaround for #2342 2018-08-10 11:34:41 +02:00
Eelco Dolstra
ada4e90267
S3BinaryCacheStore: Share TransferManager
TransferManager allocates a lot of memory (50 MiB by default), and it
might leak but I'm not sure about that. In any case it was causing
OOMs in hydra-queue-runner. So allocate only one TransferManager per
S3BinaryCacheStore.

Hopefully fixes https://github.com/NixOS/hydra/issues/586.
2018-08-09 20:48:45 +02:00
Eelco Dolstra
c87f4b9324
nix run: Respect propagated-user-env-packages
Also, add $path/bin to $PATH even if it doesn't exist. This makes
'man' work properly (since it looks for ../share/man relative to $PATH
entries).
2018-08-09 13:01:03 +02:00
Eelco Dolstra
a0b971dd9c
S3BinaryCacheStore: Don't use the transfer status callback
This callback is executed on a different thread, so exceptions thrown
from the callback are not caught:

  Aug 08 16:25:48 chef hydra-queue-runner[11967]: terminate called after throwing an instance of 'nix::Error'
  Aug 08 16:25:48 chef hydra-queue-runner[11967]:   what():  AWS error: failed to upload 's3://nix-cache/19dbddlfb0vp68g68y19p9fswrgl0bg7.ls'

Therefore, just check the transfer status after it completes. Also
include the S3 error message in the exception.
2018-08-08 21:39:11 +02:00
Eelco Dolstra
103ad1598c
Merge pull request #2334 from dtzWill/fix/revert-progress-bar-refresh-for-now
Revert "progress-bar: re-draw last update if nothing new for 1sec."
2018-08-06 19:01:08 +02:00
Eelco Dolstra
ed6c646f44
Doh 2018-08-06 17:27:08 +02:00