Eelco Dolstra
9747ea84b4
Remove CPU locking
...
This was already accidentally disabled in ba87b08
. It also no longer
appears to be beneficial, and in fact slow things down, e.g. when
evaluating a NixOS system configuration:
elapsed time: median = 3.8170 mean = 3.8202 stddev = 0.0195 min = 3.7894 max = 3.8600 [rejected, p=0.00000, Δ=0.36929±0.02513]
2021-12-22 15:56:25 +01:00
Eelco Dolstra
89faff93e2
Merge pull request #5807 from NixOS/5805-ca-ifd
...
Fix IFD with CA derivations
2021-12-21 18:47:34 +01:00
Eelco Dolstra
25cea2b737
Merge branch 'nm-toml11' of https://github.com/nmattia/nix
2021-12-21 14:18:04 +01:00
Eelco Dolstra
3228a38e1c
Merge branch 'why-depends-completion' of https://github.com/ncfavier/nix
2021-12-21 11:38:07 +01:00
regnat
d90f9d4b99
Fix IFD with CA derivations
...
Rewrite the string taken by the IFD-like primops to contain the actual
output paths of the derivations rather than the placeholders
Fix #5805
2021-12-21 09:36:50 +01:00
regnat
cbbd21ec07
Factor out the path realisation bit of IFD
2021-12-21 09:36:19 +01:00
pennae
09b245690a
bulk-allocate Value instances in the evaluator
...
calling GC_malloc for each value is significantly more expensive than
allocating a bunch of values at once with GC_malloc_many. "a bunch" here
is a GC block size, ie 16KiB or less.
this gives a 1.5% performance boost when evaluating our nixos system.
tested with
nix eval --raw --impure --expr 'with import <nixpkgs/nixos> {}; system'
# on master
Time (mean ± σ): 3.335 s ± 0.007 s [User: 2.774 s, System: 0.293 s]
Range (min … max): 3.315 s … 3.347 s 50 runs
# with this change
Time (mean ± σ): 3.288 s ± 0.006 s [User: 2.728 s, System: 0.292 s]
Range (min … max): 3.274 s … 3.307 s 50 runs
2021-12-20 23:01:28 +01:00
Nicolas Mattia
9dea5768ef
Clean up toml parsing code
2021-12-20 21:39:37 +01:00
Naïm Favier
1827cf5a9b
Add shell completion for why-depends
...
Fixes #5806
2021-12-20 19:58:30 +01:00
Nicolas Mattia
5d06836b9f
Use long in fromTOML
2021-12-17 23:15:26 +01:00
Nicolas Mattia
10a8b5d3ae
Update primops/fromTOML.cc to use toml11
2021-12-17 22:13:04 +01:00
Nicolas Mattia
c3f68b5db7
Replace cpptoml with toml11
2021-12-17 22:03:33 +01:00
Eelco Dolstra
6e6e998930
Merge pull request #5787 from edolstra/unshare-fs
...
Ignore EPERM when unsharing FS state
2021-12-17 12:00:09 +01:00
Théophane Hufschmitt
23ea1e46cc
Merge pull request #5047 from symphorien/fix-nix-channel
...
nix-channel: use nix-env -i --remove-all to upgrade
2021-12-17 10:05:48 +01:00
Eelco Dolstra
ec8f24ed3a
Ignore EPERM when unsharing FS state
...
On Docker (but not podman), unshare(CLONE_FS) fails with EPERM. So
let's ignore it and hope nothing bad happens.
Attempted fix for #5777 .
2021-12-16 22:02:50 +01:00
Noah Snelson
c3f9344cae
Fix typo in src/nix/shell.md
...
Changed `If not command` to `If no command`, also specified that the
default shell launched in `nix shell` can be specified with `$SHELL`.
2021-12-15 23:40:37 -08:00
Eelco Dolstra
18e4851752
Merge pull request #5769 from NixOS/ca/get-build-stats
...
Add a crude tracing mechansim for the build results
2021-12-14 10:53:51 +01:00
Théophane Hufschmitt
8868da45a8
Merge pull request #5623 from yorickvP/fix-5621
...
flakes: fix boolean and int nixConfig values
2021-12-14 10:35:37 +01:00
Théophane Hufschmitt
99d617bcde
Merge pull request #5771 from edolstra/single-file-flake-inputs
...
Re-allow inputs.x.url = "/path/to/file"
2021-12-14 09:17:24 +01:00
Théophane Hufschmitt
6234e1c811
Merge pull request #5702 from baloo/baloo/hide-non-reproducible-settings
...
reproducibility: hide non-reproducible settings from manual
2021-12-14 09:14:25 +01:00
Théophane Hufschmitt
3fc8042f77
Merge pull request #5366 from trofi/speedup-ca-query
...
ca-specific-schema.sql: add index on RealisationsRefs(referrer)
2021-12-14 09:08:17 +01:00
Eelco Dolstra
95bd5da341
queryMissing(): Use a bigger thread pool
...
This is a temporary hack until we make queryMissing() async.
Closes #5324 .
2021-12-13 21:11:37 +01:00
Eelco Dolstra
ade870764a
Merge pull request #5725 from ConnorBaker/master
...
Add support for .tar.gz shorthand (.tgz) to TarballInputScheme
2021-12-13 21:08:06 +01:00
Eelco Dolstra
32a62b0d25
Re-allow inputs.x.url = "/path/to/file"
2021-12-13 20:59:33 +01:00
Eelco Dolstra
46d86e06ba
Simplify
2021-12-13 20:28:53 +01:00
Eelco Dolstra
9529de2eed
Merge branch 'arm32-personality' of https://github.com/cleverca22/nix
2021-12-13 19:58:40 +01:00
Eelco Dolstra
6ae5f39ea0
Merge pull request #5770 from edolstra/gc-fixes
...
Fix macOS GC failures
2021-12-13 19:55:32 +01:00
Eelco Dolstra
e2e5f3a78f
Respect /etc/hosts
...
https://hydra.nixos.org/build/161439329
2021-12-13 19:37:30 +01:00
Eelco Dolstra
cc6406cc59
Merge branch 'better-interpolation-error-location' of https://github.com/greedy/nix
2021-12-13 19:20:48 +01:00
Eelco Dolstra
2567b74c66
nix run: Tweak docs
2021-12-13 19:14:32 +01:00
Eelco Dolstra
775bdc0d9e
Merge branch 'pname-main-program' of https://github.com/figsoda/nix
2021-12-13 19:09:36 +01:00
Eelco Dolstra
d17d46cfc2
More debug info
2021-12-13 19:03:08 +01:00
Eelco Dolstra
05fcc681ac
Retry on ECONNREFUSED
...
https://hydra.nixos.org/build/161439235
2021-12-13 19:00:19 +01:00
Eelco Dolstra
6d30f9e6fe
Explicitly make GC roots client sockets blocking
...
On macOS / BSD, these sockets inherit the non-blocking flag of the
server soocket, which is not what we want.
https://github.com/dotnet/runtime/issues/25069
https://bugs.python.org/issue7995
https://hydra.nixos.org/build/161439304
2021-12-13 18:59:50 +01:00
regnat
2eec2f765a
Add a crude tracing mechansim for the build results
...
Add a `_NIX_TRACE_BUILT_OUTPUTS` environment variable that can be set to
a filename in which the result of each build will be logged.
This is intentionally crude and undocumented as it’s only meant to be a
temporary thing to assess the usefulness of CA derivations.
Any other use would need a cleaner re-implementation first.
2021-12-13 17:02:14 +01:00
regnat
55dbb7f1cc
More properly track the status of CA builds
...
Make the build of unresolved derivations return the same status as the
resolved one, except in the case of an `AlreadyValid` in which case it
will return `ResolvesToAlreadyValid` to mean that the outputs of the unresolved
derivation weren’t known, but the resolved one is.
2021-12-13 17:02:13 +01:00
Eelco Dolstra
84497119ad
Merge pull request #5761 from yorickvP/fix-5741
...
extract_archive: fix "Hard-link target '...'" error
2021-12-13 13:37:40 +01:00
Yorick
33e96820d5
EvalCommand::getEvalState: use gc tracable allocator for EvalState
2021-12-11 16:02:08 +01:00
Yorick
0e0de90b35
extract_archive: fix "Hard-link target '...'" error
...
Fixes #5741
2021-12-10 17:03:51 +01:00
Yorick
be1055f2cc
extract_archive: use copy_pathname instead of set_pathname.
...
Libarchive documentation mentions that archive_entry_set_pathname
expects us to keep the passed string alive, which we don't.
2021-12-10 17:00:32 +01:00
Eelco Dolstra
20b1290103
Ignore system.nfs4_acl
...
Closes #1584 .
2021-12-10 15:12:55 +01:00
Eelco Dolstra
f9437b4f18
Merge branch 'master' of https://github.com/MagicRB/nix
2021-12-10 14:49:25 +01:00
regnat
55e3a1108c
Properly take the last assignment in the REPL
...
When a variable is assigned in the REPL, make sure to remove any possible reference to the old one so that we correctly pick the new one afterwards
Fix #5706
2021-12-09 16:35:27 +01:00
Eelco Dolstra
bc57b3854e
Merge pull request #5695 from obsidiansystems/tidy-logging
...
Tidy up the logging
2021-12-09 15:31:08 +01:00
Eelco Dolstra
92ff5b4254
Tweak warning
2021-12-07 22:22:02 +01:00
Eelco Dolstra
21206caf13
Merge remote-tracking branch 'origin/5712-ca-drvs-with-old-daemon'
2021-12-07 22:06:22 +01:00
Eelco Dolstra
8b5088b62f
Merge branch 'balsoft/nix-repl-log' of https://github.com/tweag/nix
2021-12-07 21:33:32 +01:00
Jan Tojnar
ae21aab456
Update manual links
...
Fixes: https://github.com/NixOS/nixos-homepage/issues/762
2021-12-06 16:42:57 +01:00
Alexander Bantyev
33926ed1e7
nix repl: add :log
...
Add a :log command that shows logs for a derivation.
Closes https://github.com/NixOS/nix/issues/3504
Co-authored-by: Taeer Bar-Yam <taeer@bar-yam.me>
2021-12-06 16:52:50 +03:00
Alexander Bantyev
0a2fa2d684
RunPager: restore stdout upon pager exit
...
Before this change, stdout was closed after the pager exits. This is
fine for non-interactive commands where we want to exit right after
the pager exits anyways, but for interactive things (e.g. nix repl)
this breaks the output after we quit the pager.
Keep the initial stdout fd as part of RunPager, and restore it in
RunPager::~RunPager using dup2.
2021-12-06 16:51:55 +03:00