Eelco Dolstra
4806f2f6b0
Allow builtins.{path,filterSource} on paths with a context
...
We now build the context (so this has the side-effect of making
builtins.{path,filterSource} work on derivations outputs, if IFD is
enabled) and then check that the path has no references (which is what
we really care about).
2021-10-07 13:43:17 +02:00
Eelco Dolstra
66c4b20d8b
Typo
2021-10-07 13:34:04 +02:00
Eelco Dolstra
7c50568788
Remove unnecessary call to queryMissing()
...
Worker::run() already does this.
2021-10-07 13:15:01 +02:00
Eelco Dolstra
302c3a052a
Merge pull request #5346 from edolstra/allow-path
...
Allow access to path copied to the store
2021-10-07 12:53:21 +02:00
Eelco Dolstra
972405edf5
Allow access to path copied to the store
...
Fixes https://github.com/NixOS/nix/pull/5163#issuecomment-931733912 .
2021-10-07 12:15:22 +02:00
Eelco Dolstra
cfaad7168e
Refactoring: Add allowPath() method
2021-10-07 12:11:00 +02:00
Eelco Dolstra
c9ee634f75
Merge pull request #5341 from andir/libexpr-formals
...
libexpr: remove matchAttrs boolean from ExprLambda
2021-10-07 11:58:56 +02:00
Eelco Dolstra
53e4794289
Merge pull request #5286 from ilkecan/add-a-warning-to-filterSource
...
Warn about the usage of filterSource with Nix store paths
2021-10-06 21:02:39 +02:00
Eelco Dolstra
dcb3bc614c
Add a test for builtins.path in a flake
2021-10-06 20:53:29 +02:00
Eelco Dolstra
faeab0d5d5
Make Mercurial optional for the flakes tests
2021-10-06 18:29:20 +02:00
ilkecan
a4a6ef4fb2
Add a warning to filterSource
...
Warn about the usage of `filterSource` with Nix store paths
2021-10-06 19:25:33 +03:00
Eelco Dolstra
0dc8172458
Remove no-op call to realiseContext()
2021-10-06 18:08:37 +02:00
Eelco Dolstra
c497fce011
Merge branch 'flakes_filterSource' of https://github.com/tomberek/nix
2021-10-06 18:08:18 +02:00
Eelco Dolstra
57a8eb4c01
fetchTree(): Parse type attribute first
...
The 'url' attribute depends on whether type == 'git', so this is needed for
builtins.fetchTree {url = "git@github.com:NixOS/nix.git"; type = "git";}
2021-10-06 17:39:02 +02:00
Eelco Dolstra
83d86cc1b0
Cleanup
2021-10-06 17:30:10 +02:00
Andreas Rammhold
cae41eebff
libexpr: remove matchAttrs boolean from ExprLambda
...
The boolean is only used to determine if the formals are set to a
non-null pointer in all our cases. We can get rid of that allocation and
instead just compare the pointer value with NULL. Saving up to
sizeof(bool) + platform specific alignment per ExprLambda instace.
Probably not a lot of memory but perhaps a few kilobyte with nixpkgs?
This also gets rid of a potential issue with dereferencing formals based on
the value of the boolean that didn't have to be aligned with the formals
pointer but was in all our cases.
2021-10-06 17:24:06 +02:00
Eelco Dolstra
46753b5e9c
Merge branch 'considerate/scp-like-urls' of https://github.com/considerate/nix
2021-10-06 17:19:27 +02:00
Eelco Dolstra
f45b30de2f
Revert "docs: add troubleshooting session in remote builds"
...
This reverts commit 0574c1850a
.
2021-10-06 17:12:52 +02:00
Domen Kožar
d0cc6a192a
Merge pull request #5095 from happysalada/update_remote_builds_docs
...
docs: add troubleshooting session in remote builds
2021-10-06 08:10:53 -05:00
happysalada
0574c1850a
docs: add troubleshooting session in remote builds
2021-10-06 21:47:53 +09:00
Eelco Dolstra
bedd12ec14
Merge pull request #5339 from edolstra/fix-daemon-logging
...
Don't reset the logger in a vfork
2021-10-06 14:38:46 +02:00
Eelco Dolstra
987ca62cd5
Merge pull request #5340 from edolstra/disable-current-unstable-macos
...
Disable testing against nixUnstable on macOS
2021-10-06 14:34:25 +02:00
Eelco Dolstra
c6718a9d95
Don't reset the logger in a vfork
...
9c766a40cb
broke logging from the
daemon, because commonChildInit is called when starting the build hook
in a vfork, so it ends up resetting the parent's logger. So don't
vfork.
It might be best to get rid of vfork altogether, but that may cause
problems, e.g. when we call an external program like git from the
evaluator.
2021-10-06 13:54:59 +02:00
Eelco Dolstra
ce9823d9b7
Merge pull request #5338 from edolstra/remove-markdown-links
...
Remove links to .md files in help output
2021-10-06 13:43:58 +02:00
Eelco Dolstra
4d28cf836a
Disable testing against nixUnstable on macOS
...
This is failing randomly at the moment which isn't very helpful.
2021-10-06 13:17:39 +02:00
Eelco Dolstra
08aa7daee0
Remove links to .md files in help output
...
Fixes #5337 .
2021-10-06 13:01:18 +02:00
Eelco Dolstra
d12bf8eff0
flake.lock: Update
...
Flake lock file changes:
• Updated input 'lowdown-src':
'github:kristapsdz/lowdown/6bd668af3fd098bdd07a1bedd399564141e275da' (2021-09-24)
→ 'github:kristapsdz/lowdown/d2c2b44ff6c27b936ec27358a2653caaef8f73b8' (2021-10-06)
2021-10-06 12:41:23 +02:00
Eelco Dolstra
fd57e7074f
Merge pull request #5335 from edolstra/socket-paths
...
Support arbitrary-length socket paths
2021-10-05 17:36:07 +02:00
Eelco Dolstra
223ab254c2
Compatibility
2021-10-05 14:50:55 +02:00
Eelco Dolstra
b14bc06955
Don't ignore SIGCHLD in createUnixDomainSocket()
2021-10-05 13:23:16 +02:00
Eelco Dolstra
e4a5d64a81
Show failing PID
2021-10-05 13:19:55 +02:00
Eelco Dolstra
b299560872
Typo
2021-10-05 11:24:09 +02:00
Eelco Dolstra
3b7f4c7d9d
Add FIXME about ptsname
2021-10-05 11:04:46 +02:00
Eelco Dolstra
43d4d75e22
Connect/bind Unix domain sockets in a child process
...
In the child process, we can do a chdir() and avoid the problem of the
path not fitting into sockaddr_un.
2021-10-05 10:44:59 +02:00
Eelco Dolstra
08cc572f89
Revert "Shorten the test drv name"
...
This reverts commit 5ec873b127
.
2021-10-05 10:41:17 +02:00
Eelco Dolstra
d8a2f7f81d
Merge pull request #5331 from edolstra/references
...
Add a test for RefScanSink and clean up the code
2021-10-04 15:06:01 +02:00
Eelco Dolstra
77ebbc9f54
Add a test for RefScanSink and clean up the code
...
Issue #5322 .
2021-10-04 14:29:42 +02:00
Eelco Dolstra
ef34fd0656
scanForReferences(): Use a StorePathSet
2021-10-04 13:47:38 +02:00
Eelco Dolstra
172b7f266c
Merge pull request #5321 from trofi/document-check-targets
...
mk/tests.mk: document 'check' and 'installcheck' in 'make help'
2021-10-04 11:11:05 +02:00
Eelco Dolstra
6fadb5df05
Merge pull request #5310 from trofi/drop-spammy-rewrite
...
local-derivation-goal.cc: drop spammy "warning: rewriting hashes in..…
2021-10-03 19:53:06 +02:00
Eelco Dolstra
6a2887c750
Merge pull request #5323 from kvtb/patch-6
...
fix creation of NAR files >4GB on 32-bit platforms
2021-10-03 19:52:27 +02:00
Domen Kožar
0be708b38c
Merge pull request #5325 from 3Rafal/3rafal/env-var-typo
...
Fix typo
2021-10-03 07:57:08 -05:00
Rafal Gwozdzinski
a73f855bd4
Fix typo
2021-10-03 12:19:59 +02:00
kvtb
638c73776a
fix creation of NAR files >4GB on 32-bit platforms
...
`size_t` is 32-bit on 32-bit platforms, while the file size can be bigger
2021-10-02 21:04:01 +00:00
Domen Kožar
aade43ffca
Merge pull request #5317 from matklad/patch-1
...
Fix typo
2021-10-02 15:07:24 -05:00
Sergei Trofimovich
1e6faa7d06
mk/tests.mk: document 'check' and 'installcheck' in 'make help'
2021-10-02 11:09:55 +01:00
Alex Kladov
3e884aa002
Fix typo
2021-10-02 10:17:45 +03:00
John Ericson
13b6b64589
Merge remote-tracking branch 'upstream/master' into path-info
2021-10-01 17:12:54 +00:00
Sergei Trofimovich
621aa65325
local-derivation-goal.cc: downgrade "warning: rewriting hashes in..." down to debug
...
Before the changes when building the whole system with
`contentAddressedByDefault = true;` we get many noninformative messages:
$ nix build -f nixos system --keep-going
...
warning: rewriting hashes in '/nix/store/...-clang-11.1.0.drv.chroot/nix/store/...-11.1.0'; cross fingers
warning: rewriting hashes in '/nix/store/...-clang-11.1.0.drv.chroot/nix/store/...-11.1.0-dev'; cross fingers
warning: rewriting hashes in '/nix/store/...-clang-11.1.0.drv.chroot/nix/store/...-11.1.0-python'; cross fingers
error: 2 dependencies of derivation '/nix/store/...-hub-2.14.2.drv' failed to build
warning: rewriting hashes in '/nix/store/...-subversion-1.14.1.drv.chroot/nix/store/...-subversion-1.14.1-dev'; cross fingers
warning: rewriting hashes in '/nix/store/...-subversion-1.14.1.drv.chroot/nix/store/...-subversion-1.14.1-man'; cross fingers
...
Let's downgrade these messages down to debug().
2021-10-01 17:41:44 +01:00
Eelco Dolstra
4f496150eb
Merge pull request #5308 from edolstra/release-notes
...
Nix 2.4 release notes
2021-10-01 16:35:35 +02:00