Matthew Bauer
addf9f4ede
Call it aarch64-darwin instead of arm64-darwin
...
gnu-config standardized on aarch64 for machine name so host_cpu part
of $system will always be aarch64. That means system will be
aarch64-darwin too.
uname however could report either “aarch64” (if gnu coreutils) or
“arm64” (if apple’s uname). We should support both for compatiblity
here.
2020-12-02 19:05:02 -06:00
Matthew Bauer
b0de7b2016
Check for rosetta 2 support before installing
2020-12-02 18:35:48 -06:00
Eelco Dolstra
6ed09cb8c2
Merge pull request #4301 from imalsogreg/tokens-doc-fix
...
fix tokens documentation
2020-12-02 23:42:36 +01:00
Eelco Dolstra
e2efc63979
Put examples first in the manpages
2020-12-02 23:23:23 +01:00
Eelco Dolstra
72428e38d9
Generate separate manpages for each nix subcommand
2020-12-02 23:23:23 +01:00
Eelco Dolstra
df552a2645
nix eval: Add option to write a directory
...
This is useful for generating the nix manpages, but it may have other
applications (like generating configuration files without a Nix store).
2020-12-02 23:23:23 +01:00
Eelco Dolstra
148608ba6d
Add 'nix help'
2020-12-02 23:23:23 +01:00
Rok Garbas
44da19f73c
Adds Nix CLI Guideline to docs
...
As we are working towards Nix 3.0 we want to make sure that we make a
huge step forward in Nix's user experience. And once 3.0 is out of the
door we need to make sure that all future commands and features keep up
the standard of user experience.
This PR adds a CLI guideline document to the Nix documentation. Consider
this document a good starting point and a checklist when somebody will
be (re)implementing commands.
Clearly this guideline does nothing to improve user experience on its
own and can only be useful as long as it is going to be read and
cared for. But it is a first step into that direction.
2020-12-02 17:00:32 +01:00
Greg Hale
d8fc1bb7b0
fix tokens documentation
2020-12-02 10:15:18 -05:00
Eelco Dolstra
9daf713bcb
Merge pull request #4300 from tweag/remove-unknown-pragma-warning
...
Remove `unknown pragma` gcc warning
2020-12-02 15:22:00 +01:00
regnat
0d9e1af695
Remove an unknown pragma
gcc warning
2020-12-02 14:33:20 +01:00
regnat
a8a96dbaf8
Add forgotten override
annotation
2020-12-02 14:23:38 +01:00
Eelco Dolstra
1b79b5b983
read(): Use char * instead of unsigned char *
...
This gets rid of some pointless casts.
2020-12-02 14:17:27 +01:00
Eelco Dolstra
faa31f4084
Sink: Use std::string_view
2020-12-02 14:17:27 +01:00
Eelco Dolstra
aa68486112
writeFull/writeFile: Use std::string_view
2020-12-02 14:17:27 +01:00
Eelco Dolstra
e5cf501c77
Merge pull request #4284 from tweag/fixed-output-depending-on-ca
...
Allow fixed-output derivations to depend on (floating) content-addressed ones
2020-12-01 20:25:41 +01:00
Eelco Dolstra
5a6ddb3de1
Merge pull request #4297 from tweag/fix-clang-warnings
...
shut up clang warnings
2020-12-01 15:48:52 +01:00
regnat
438977731c
shut up clang warnings
...
- Fix some class/struct discrepancies
- Explicit the overloading of `run` in the `Cmd*` classes
- Ignore a warning in the generated lexer
2020-12-01 15:04:03 +01:00
Eelco Dolstra
88798613ee
replaceStrings(): Use std::string_view
2020-12-01 13:45:43 +01:00
Eelco Dolstra
c0d1354b7d
Macro hygiene
2020-12-01 13:45:06 +01:00
Eelco Dolstra
3b7e00ce22
Move primeCache() to Worker::run()
...
We need the missing path info to communicate the worker's remaining
goals to the progress bar.
2020-12-01 13:44:48 +01:00
Eelco Dolstra
5927624473
Lower verbosity for 'Failed to find a machine' message
2020-12-01 13:43:36 +01:00
Eelco Dolstra
e224c16d28
Macro hygiene
2020-12-01 13:43:33 +01:00
regnat
9bd8184f1f
Allow fixed-output derivations to depend on (floating) content-addressed ones
...
Fix an overlook of https://github.com/NixOS/nix/pull/4056
2020-11-27 15:39:24 +01:00
Eelco Dolstra
05d9442f68
builtins.fetchGit: Fix shortRev attribute for dirty trees
2020-11-26 21:45:28 +01:00
Eelco Dolstra
2458270b69
Merge pull request #4094 from martinetd/btrfs
...
preallocateContents option: disable by default
2020-11-26 15:01:43 +01:00
Dominique Martinet
1fd13d67e8
archive: disable preallocate-contents by default
...
using fallocate() to preallocate files space does more harm than good:
- breaks compression on btrfs
- has been called "not the right thing to do" by xfs developers
(because delayed allocation that most filesystems implement leads to smarter
allocation than what the filesystem needs to do if we upfront fallocate files)
2020-11-26 14:26:57 +01:00
Eelco Dolstra
8252a44e96
Move to separate file
2020-11-26 13:16:36 +01:00
Eelco Dolstra
9a586e34ac
Record trusted/untrusted settings in ~/.local/share/nix
2020-11-26 13:11:07 +01:00
Eelco Dolstra
0287f83057
Ask for confirmation before allowing flake Nix configuration settings
2020-11-26 12:37:23 +01:00
regnat
13c557fe82
fix the hash rewriting for ca-derivations
2020-11-25 11:33:00 +01:00
Eelco Dolstra
605bacdc92
Merge pull request #4276 from B4dM4n/macos-sandbox-build
...
Fix macOS sandbox build
2020-11-23 18:00:35 +01:00
Eelco Dolstra
eb6b9bd672
Merge pull request #4275 from lukegb/mercurialHGPLAIN
...
fetchMercurial: set HGPLAIN when invoking hg
2020-11-23 17:59:26 +01:00
Fabian Möller
5b0790355f
Fix macOS sandbox build
...
Since c4c3c15c19
(#4251 ) building Nix for
macOS with sandboxing fails:
```
getting status of /nix/var/nix/profiles/per-user/root/channels/nixpkgs: Operation not permitted
```
This happens, because `EvalSettings::getDefaultNixPath` tries to access
paths outside the sandbox. Since the state-dir is not required for
doc generation, it is set to the dummy folder. This needs to be done
for all nix invocations during doc generation, as
`EvalSettings::getDefaultNixPath` is called unconditionally.
2020-11-23 17:40:17 +01:00
Luke Granger-Brown
226116f482
fetchMercurial: set HGPLAIN when invoking hg
...
Without setting HGPLAIN, the user's environment leaks into
hg invocations, which means that the output may not be in the
expected format.
HGPLAIN is the Mercurial-recommended solution for this in that
it's intended for uses by scripts and programs which are looking
to parse Mercurial's output in a consistent manner.
2020-11-23 16:12:33 +00:00
Eelco Dolstra
1973669e86
Merge pull request #4271 from wiltaylor/IgnoreReferenceSwitch
...
Skip Reference Check on bundler
2020-11-23 12:48:07 +01:00
Wil Taylor
07603890d2
Removed reference check from bundler command
2020-11-23 21:19:40 +10:00
Eelco Dolstra
7827d95f6c
Merge pull request #4272 from kwohlfahrt/perl-sigs
...
Return derivation signatures in Perl bindings
2020-11-23 10:14:41 +01:00
Eelco Dolstra
56599bd282
Merge pull request #4224 from zimbatm/per-build-installer
...
installer: simplify the per-build installation
2020-11-22 00:06:23 +01:00
Kai Wohlfahrt
df83b6df68
Return signatures in Perl path info
2020-11-21 22:06:15 +00:00
zimbatm
233b61d3d6
installer: simplify the per-build installation
...
The goal is to allow the installation and testing of arbitrary Nix
versions. Extend the base installer to accept a `--tarball-url-prefix
<url>` to change where the Nix tarball is getting downloaded from.
Once this is merged it should allow to:
1. Pick an evaluation at https://hydra.nixos.org/jobset/nix/master that
looks healthy
2. Select the installedScript build and find the store path.
Now equipped with all of this, use an instance of nar-serve to fetch the
install script and release tarballs:
curl -sfL https://nar-serve.numtide.com/nix/store/rkv4yh7pym941bhj0849zqdkg2546bdv-installer-script/install \
| sh --tarball-url-prefix https://nar-serve.numtide.com/nix/store
Or with cachix, strip the /nix/store and derivation name and then:
curl -sfL https://mycache.cachix.org/serve/rkv4yh7pym941bhj0849zqdkg2546bdv/install \
| sh --tarball-url-prefix https://mycache.cachix.org/serve
Fixes #4047
2020-11-21 19:56:46 +01:00
Wil Taylor
c3bad73e27
Added switch
2020-11-21 14:28:49 +10:00
Eelco Dolstra
4dcb183af3
AttrCursor::getStringWithContext(): Force re-evaluation if the cached context is not valid
...
Fixes #4236 .
2020-11-19 20:59:36 +01:00
Eelco Dolstra
0327580e54
Fix assertion failure in LockFile::LockFile()
...
Fixes #4241 .
2020-11-19 20:31:30 +01:00
Eelco Dolstra
bc4df3394d
Merge pull request #4269 from obsidiansystems/sync-hash-derivation-modulo-cache
...
Make drv hash modulo memo table thread-safe
2020-11-19 20:03:06 +01:00
John Ericson
2113ae2d85
Make drv hash modulo memo table thread-safe
...
Let's get one step closer to the daemon not needing to fork.
2020-11-19 16:50:06 +00:00
Eelco Dolstra
79aa7d9518
Merge pull request #4268 from DavHau/patch-1
...
fix typo in comment in fetchurl.nix
2020-11-18 17:03:45 +01:00
DavHau
0fa6d380b2
fix typo in comment in fetchurl.nix
2020-11-18 11:20:50 +07:00
Eelco Dolstra
ae3191666f
Merge pull request #4171 from YorikSar/zsh-nix-profiles
...
Fix iterating over $NIX_PROFILES in Zsh
2020-11-17 15:53:44 +01:00
Eelco Dolstra
4dbd05e933
Merge pull request #4189 from edolstra/flake-config
...
Allow nix.conf options to be set in flake.nix
2020-11-17 15:39:14 +01:00