Eelco Dolstra
b1ab592f28
Use the StorePath-based cache interface
2023-11-22 11:44:02 +01:00
r-vdp
5292f36426
Fix compile warning due to unused variable binding.
...
We still need the check, since we don't have narinfo for locally built store paths.
2023-11-22 11:34:53 +01:00
Eelco Dolstra
61b76f5f34
Apply suggestion
...
Co-authored-by: John Ericson <git@JohnEricson.me>
2023-11-22 11:26:12 +01:00
John Ericson
7155df091f
Merge pull request #9431 from obsidiansystems/fix-rapidcheck-shared
...
Add missing `-lrapidcheck` fixing build with shared lib
2023-11-21 23:47:40 -05:00
John Ericson
46131567da
Add missing -lrapidcheck
fixing build with shared lib
...
https://github.com/NixOS/nixpkgs/pull/269064 makes rapidcheck be build
as a shared lib, but that broke Nix because the `-lrapidcheck` was
missing. This fixes that (and doesn't break Nix what the library is a
static archive as today).
2023-11-21 23:19:25 -05:00
Robert Hensing
4e790efade
Use boost::container::small_vector in place of VLAs
2023-11-21 20:52:27 +01:00
John Ericson
a6b315ae80
Merge pull request #7912 from mupdt/gcstore-add-perm-root
...
Mounted SSH Store
2023-11-21 14:04:45 -05:00
Matej Urbas
03c3af1bf9
mounted-ssh-ng store: integration tests
2023-11-21 13:35:12 -05:00
mupdt
b32b20a6d7
release note entry for the mounted-ssh-ng://
store
2023-11-21 13:35:07 -05:00
Matej Urbas
06b8902562
MountedSSHStore: stores on shared filesystems
2023-11-21 13:34:01 -05:00
Matej Urbas
226b0f3956
Extend the worker protocol with wopAddPermRoot
2023-11-21 13:26:55 -05:00
Matej Urbas
9796ebd7ef
Add --process-ops
flag to nix-daemon
2023-11-21 13:18:19 -05:00
John Ericson
949f5841f8
Add the MountedSSHStore
experimental feature
...
It will be implemented in the subsequent commits of this PR.
2023-11-21 13:16:46 -05:00
John Ericson
f880469173
Put canonicaliseTimestampAndPermissions
in its own header/file
...
It is not inherently tied to `LocalStore`, it could probably even go in
`libnixutil`. Functions not attached to `LocalStore` should not be
declared in `local-store.hh`.
I am moving it to facilitate experimenting for #9344 . If
canonicalisation should be done client-side in client-side builds, there
wouldn't be a `LocalStore` at all so having to include that header to
get this freestanding function is cumbersome and wrong.
Perhaps canonicalisation should still be done server-side for security
reasons --- I don't mean to make that judgement call now --- but even if
so, this freestanding function still isn't connected to `LocalStore` so
while less urgent it is still better to move out of this header.
2023-11-21 12:57:59 -05:00
Robert Hensing
9cd69e1c39
Merge pull request #9411 from edolstra/path-display
...
Improve SourceAccessor path display
2023-11-21 18:12:01 +01:00
Lin Jian
4d8decbd13
doc: fix number of template attributes
...
This number is not updated when welcomeText is added[1][2].
[1]: f3a2940e70
[2]: https://github.com/NixOS/nix/pull/6103
2023-11-21 16:52:25 +01:00
Théophane Hufschmitt
9ad9e988b8
Merge pull request #9425 from iFreilicht/fix-unbound-variable-errors
...
Fix "unbound variable" errors in bash
2023-11-21 15:12:32 +01:00
Felix Uhl
64827360be
Fix "unbound variable" errors in bash
...
Fixes #9414
2023-11-21 14:49:48 +01:00
Eelco Dolstra
c185e45ed7
Merge pull request #9410 from edolstra/shallow
...
Some shallow git fetching improvements
2023-11-21 12:58:01 +01:00
John Ericson
516e7ddc41
Merge pull request #9257 from Artturin/nixenvjsondrvpath
...
`nix-env --query`: fix `--json` ignoring `--drv-path`
2023-11-20 16:32:35 -05:00
Eelco Dolstra
99d5204baa
Persistently cache InputAccessor::fetchToStore()
...
This avoids repeated copying of the same source tree between Nix
invocations. It requires the accessor to have a "fingerprint" (e.g. a
Git revision) that uniquely determines its contents.
2023-11-20 20:04:37 +01:00
Eelco Dolstra
a0162d5732
Improve SourceAccessor path display
...
Backported from lazy-trees. This allows SourceAccessors to show the
origin of the accessor. E.g. we now get
copying '«git+https://github.com/blender/blender.git?ref=refs/heads/main&rev=4edc1389337dd3679ff66969c332d2aff52e1992»/ ' to the store
instead of
copying '/' to the store
2023-11-20 18:54:36 +01:00
Eelco Dolstra
071f14a0bb
Don't do shallow fetches over ssh
2023-11-20 17:25:40 +01:00
Eelco Dolstra
e4066c0444
Fetch specific Git revisions
...
This is more efficient, and necessary when using shallow=1 with a rev.
2023-11-20 17:25:40 +01:00
Eelco Dolstra
f450c8773c
Merge pull request #9408 from roblabla/fix-bad-format-string
...
Fix bad_format_string error when builder stdout contains %
2023-11-20 17:22:40 +01:00
Eelco Dolstra
e29e952a25
Merge pull request #9386 from hercules-ci/flake-update
...
flake.nix: Update nixpkgs: release-23.05 -> nixos-23.05-small
2023-11-20 16:51:20 +01:00
Eelco Dolstra
065cd5bed7
Merge pull request #9401 from NixOS/bump-2.20.0
...
Bump version
2023-11-20 15:42:53 +01:00
roblabla
e2b6821ca0
Fix bad_format_string error when builder stdout contains %
2023-11-20 15:41:38 +01:00
John Ericson
e540d48c4f
Merge pull request #9400 from hercules-ci/refactors-from-5e3986f59cb
...
Refactors from 5e3986f59c
2023-11-20 09:38:18 -05:00
Théophane Hufschmitt
cfc6494d57
Merge pull request #9390 from DavHau/git-shallow-docs
...
fetchTree: clarify docs for shallow flag
2023-11-20 15:15:25 +01:00
Eelco Dolstra
2a96445d75
Bump version
2023-11-20 15:06:28 +01:00
John Ericson
f9970fdc19
Merge pull request #9240 from edolstra/libgit2
...
Introduce libgit2
2023-11-20 09:00:27 -05:00
John Ericson
4ab27e5595
Merge remote-tracking branch 'upstream/master' into libgit2
2023-11-20 08:30:26 -05:00
Robert Hensing
6832d18ac7
Merge pull request #9399 from edolstra/revert-vlas
...
Revert use of boost::container::small_vector in the evaluator
2023-11-20 13:37:50 +01:00
Robert Hensing
a5e51a9e02
refactor Worker::childStarted/Terminated: use switch
...
Preparation for RFC 92 dynamic derivations.
2023-11-20 13:32:48 +01:00
Robert Hensing
7ac39ff05c
refactor Store::buildPaths: convert to string earlier
...
Preparation for RFC 92 dynamic derivations.
2023-11-20 13:11:58 +01:00
Eelco Dolstra
1d6abec993
Revert use of boost::container::small_vector in the evaluator
...
It caused random crashes (https://hydra.nixos.org/build/241514506 ,
https://hydra.nixos.org/build/241443330 ) because the heap allocation
done by small_vector in the not-small case is not scanned for GC
roots.
2023-11-20 12:35:35 +01:00
Qyriad
19993398a1
flakes: check for flake.nix before complaining that lstat on it fails
...
getFlake currently calls lstat (via isLink via canonPath) before it
performs the sanity check that a flake.nix exists in the first place.
This commit moves the check to before path canonicalization, so that
failed symlink check operations don't throw before the check does.
2023-11-20 03:37:02 -07:00
tomberek
fb68699456
Merge pull request #9370 from hercules-ci/add-value-types
...
refactor: Add `Value` types, use `std::span` for list iteration
2023-11-20 01:32:32 -05:00
Robert Hensing
4292d99756
Merge pull request #9395 from nbraud/buitlins
...
builtins.concatMap: Fix typo in error message
2023-11-20 00:25:03 +01:00
nicoo
d5928085d5
builtins.concatMap: Fix typo in error message
2023-11-19 19:57:07 +01:00
DavHau
796a7eb92d
fetchTree: clarify docs for shallow flag
2023-11-19 20:32:23 +07:00
Robert Hensing
fe4f573d49
flake.nix: Update nixpkgs: release-23.05 -> nixos-23.05-small
...
Flake lock file updates:
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/9eb24edd6a0027fed010ccfe300a9734d029983c' (2023-11-01)
→ 'github:NixOS/nixpkgs/decdf666c833a325cb4417041a90681499e06a41' (2023-11-18)
2023-11-19 11:38:58 +01:00
John Ericson
c4a74d6dcc
Merge pull request #9382 from tweag/filterSource-link
...
doc: Add link to filterSource from path
2023-11-19 00:06:18 -05:00
John Ericson
f739fc0729
Merge pull request #9379 from NixOS/shebang-virtual-dtor
...
Shebang parser: add virtual destructor
2023-11-19 00:05:34 -05:00
Silvan Mosberger
70ddf298e0
doc: Add link to filterSource from path
2023-11-19 04:09:14 +01:00
Robert Hensing
251fb23aea
Shebang parser: add virtual destructor
...
Fixes:
warning: destructor called on non-final 'nix::ParseUnquoted' that has virtual functions but non-virtual destructor [-Wdelete-non-abstract-non-virtual-dtor]
2023-11-19 01:48:08 +01:00
John Ericson
87ac33f29a
Merge branch 'master' into nixenvjsondrvpath
2023-11-18 13:47:14 -05:00
Robert Hensing
1d86bb4f70
Merge pull request #9373 from obsidiansystems/fix-make-check
...
Fix `make check`
2023-11-17 19:09:38 +01:00
Robert Hensing
7762335a9c
Merge pull request #9374 from hercules-ci/fix-nogc
...
Fix buildNoGc
2023-11-17 18:16:11 +01:00