cba87025f8
Merge pull request #9445 from NixOS/allow-input-in-git-commit
...
Allow user input in `git commit`
(cherry picked from commit 43fb39ca29I13bd4c007234ee2133289c68ef8ab2eae4def78a
2024-03-04 06:01:09 +01:00
340a6cf977
Merge pull request #9257 from Artturin/nixenvjsondrvpath
...
`nix-env --query`: fix `--json` ignoring `--drv-path`
(cherry picked from commit 516e7ddc41I84b5bccea9d0383e2e74544743b703942e7be547
2024-03-04 05:59:15 +01:00
01069d8c46
Merge pull request #9400 from hercules-ci/refactors-from-5e3986f59cb
...
Refactors from 5e3986f59ce540d48c4fI5b21b770a0c20ec2ec9845d3a97a524f1b0135ee
2024-03-04 05:58:02 +01:00
439f88b7d7
Merge pull request #9399 from edolstra/revert-vlas
...
Revert use of boost::container::small_vector in the evaluator
(cherry picked from commit 6832d18ac7I7f10af0c8b8a8beb4b1e36424120995f4ed82738
2024-03-04 05:57:04 +01:00
3f3badffc9
Merge pull request #9395 from nbraud/buitlins
...
builtins.concatMap: Fix typo in error message
(cherry picked from commit 4292d99756Ia33d1b02e41f699ef0c8c2d6487c9f70b2cc8cf4
2024-03-04 05:56:04 +01:00
2df9c2c00f
Merge pull request #9374 from hercules-ci/fix-nogc
...
Fix buildNoGc
(cherry picked from commit 7762335a9cI3ad53c9c1dd9180a2abc3528e9437c28ac95b303
2024-03-04 05:54:10 +01:00
5d77afe0a4
Merge pull request #6469 from gbpdt/fix/skipped_build_locking
...
Unlock output paths when a derivation is already built
(cherry picked from commit 7ba4e073e8I9de077679290d5141a610ac43d99d3a43acff87c
2024-03-04 05:53:17 +01:00
5e182235cb
Merge pull request #7348 from thufschmitt/dont-use-vlas
...
Remove the usage of VLAs in the code
(cherry picked from commit ac4431e9d0Ifbf5fbfc2e27122362a2aaea4b62c7cf3ca46b1a
2024-03-04 05:51:23 +01:00
30f3298e9d
Merge pull request #9364 from edolstra/fix-coverage
...
Fix a broken generated header file dependency
(cherry picked from commit 57de482e00I0580274bf51132fbeb34e8c0a91a7017071d2bb3
2024-03-04 05:48:04 +01:00
1b135e6e7b
Fix boost::bad_format_string exception in builtins.addErrorContext ( #9291 )
...
* Fix boost::bad_format_string exception in builtins.addErrorContext
The message passed to addTrace was incorrectly being used as a format
string and this this would cause an exception when the string contained
a '%', which can be hit in places where arbitrary file paths are
interpolated.
* add test
(cherry picked from commit 61d6fe059eIdd671127a9c1ccc8b94e58e727632fcc064f3cbe
2024-03-04 05:39:12 +01:00
6cb215f63b
Merge pull request #9293 from ThinkChaos/ssh-misc-improvments
...
SSH small improvments
(cherry picked from commit dcc49744edIe87910df3ab739d0ff983c085190da1d108e96e2
2024-03-04 05:38:09 +01:00
b7e7949035
Merge pull request #9299 from tfc/config-improvements
...
Improvements in src/libutil/config.*
(cherry picked from commit dea63bb810I8090eb2ad393dd9964cf2d5254ec8c796b1bd367
2024-03-04 05:36:42 +01:00
6e0dd9f673
Merge pull request #9289 from edolstra/fix-warnings
...
Fix gcc warnings
(cherry picked from commit 66cb364f58I1474dbc18a4beaaf1bce16d4abbcc99806b79ff1
2024-03-04 05:27:35 +01:00
26e17eedef
Merge pull request #9277 from keszybz/file-permissions
...
Remove stray executable permissions on source files
(cherry picked from commit a80fb9fa39I603b18ddda76041991101ef0597ec804c2b55dc0
2024-03-04 05:26:17 +01:00
6211e5e284
Merge pull request #9271 from keszybz/if-fix
...
fix: gcc complains about if which doesn't guard the indented statement
(cherry picked from commit 8d66346293Ifa2e65502de4000935549dde82ab1b5867e2f0ed
2024-03-04 05:26:02 +01:00
559a8c44c3
Merge pull request #6258 from obsidiansystems/gcc-bug-ergonomics
...
Remove bug-avoiding `StoreConfig *` casts for settings
(cherry picked from commit e3febfcd53Ifeae276582fdbc781a38581df9de3da67a7e7bf9
2024-03-04 05:24:33 +01:00
4206441a12
Merge pull request #9246 from trofi/clarify-builder-uid-exhaustion
...
local-derivation-goal.cc: slightly clarify waiting message
(cherry picked from commit 232e236672Idd271d6921caba203db9971f27e156e533664935
2024-03-04 05:19:38 +01:00
89e03988ec
Merge pull request #9238 from tfc/small-improvements2
...
Small improvements 2
(cherry picked from commit 1dc6a65d36I8ed573c496068c4a92f53c1caafa49da59d75967
2024-03-04 05:18:05 +01:00
622b0e9428
Merge pull request #8965 from Artturin/bindfilesinchroot
...
Bindmount files instead of hardlinking or copying to chroot
(cherry picked from commit 622191c2b5I278ec1baacdfa9044992b58fdec8f14d6d7d09ce
2024-03-04 05:17:31 +01:00
8abb20390e
Merge pull request #9229 from tfc/small-improvements
...
Remove warnings, small improvements
(cherry picked from commit 5ac87a75ddI88349b6e954398dde83c845f42d41a9dd89ba9e0
2024-03-04 05:16:42 +01:00
ea10088703
Merge pull request #9216 from obsidiansystems/addDrvOutputDependencies-pre
...
Add `builtins.addDrvOutputDependencies`
(cherry picked from commit a58d7f143eIa5a1790bf29dfaf29287cc35cdae6b6d650e7a83
2024-03-04 05:06:56 +01:00
032eff7f69
Merge pull request #8470 from ncfavier/shebang-single-quotes
...
nix-shell: support single quotes in shebangs, fix whitespace parsing
(cherry picked from commit 3b99c62913I2a431b21c3467eefa1ef95d5a36d672f45b6937a
2024-03-04 05:06:32 +01:00
7f590ea709
Merge pull request #6223 from obsidiansystems/worker-proto-with-version
...
Give `nix daemon` and `nix-store --serve` protocols separate serializers with version info
(cherry picked from commit 8b68bbb777Ia3d3b9fbaf9f0ae62ab225020b7d14790e793655
2024-03-04 04:59:31 +01:00
4d9dde15ef
Merge pull request #9191 from tfc/libutil-implementation
...
libutil: Small improvements
(cherry picked from commit edc07588ecI01a481d872d859b372a4bade9bebd3dab2fb4efb
2024-03-04 04:47:18 +01:00
Robert Hensing
ab40b2c5d0
Merge pull request #9157 from obsidiansystems/protocol-versions
...
Add protocol versions to `{Worker,Serve}Proto::*Conn`
(cherry picked from commit 4d17c59d8dI497af39deb792e50c157a1305d8c9e722798740b
2024-03-04 04:43:35 +01:00
c0fa61340c
Merge pull request #9172 from tfc/bad-moves
...
Fix/remove some bad std::moves
(cherry picked from commit 8c049a9f04I720273378d2506a13883acee28abd096d099b0d4
2024-03-04 04:41:52 +01:00
75fb953205
Merge pull request #9170 from tfc/fix-broken-move
...
Fix broken move
(cherry picked from commit aa4f41d796I39d3f9f4f27328500de005c9205d905c55d6f9ea
2024-03-04 04:40:51 +01:00
d28a6618a8
Merge pull request #9167 from obsidiansystems/pre-overhaul-completions
...
Improve tests and docs prior to refactoring completions
(cherry picked from commit 5442d9b472Ief99ac2cd9c92981a9a522d15b9c3daf99182c9d
2024-03-04 04:38:33 +01:00
e12e9f2452
Merge pull request #9137 from obsidiansystems/serve-protocol
...
Introduce separate Serve protocol serialisers
(cherry picked from commit d070d8b746Ibcc8639e8997bcd07f7a5318330a147bcadc411b
2024-03-04 04:37:05 +01:00
aeb803de9a
Merge pull request #8047 from lovesegfault/always-allow-substitutes
...
feat: add always-allow-substitutes
(cherry picked from commit da2b59a088I50481cd8fe643c673c610fec28bad84519a4d650
2024-03-04 04:37:03 +01:00
6897e238bd
Merge pull request #9099 from obsidiansystems/common-proto
...
Factor out bits of the worker protocol to use elsewhere
(cherry picked from commit 4b1a97338fIf93afa0f8b1cf9b0e705b34fa71e6fd708752758
2024-03-04 04:36:58 +01:00
6feba52008
Merge pull request #8895 from hercules-ci/gc-before-stats
...
eval: Run a full GC before printing stats
(cherry picked from commit aeea49609bI47a23d3a7a47ea61d9a2b5727b638f879f3aaf1e
2024-03-04 04:36:47 +01:00
4517de00cb
Merge pull request #8905 from hercules-ci/no-unknown-location
...
Don't print unknown locations unless requested for dev purposes
(cherry picked from commit 3dd4475826I04a91277d1d9d09f5c1bf4a28fc99f0702b161e5
2024-03-04 04:36:38 +01:00
ea0008deea
Merge pull request #9094 from obsidiansystems/test-proto
...
Test the rest of the worker protocol serializers
(cherry picked from commit 2f1c16dfa2Idfd72d32b21d14a260e02f65531d287cef7464d2
2024-03-04 04:36:23 +01:00
8867479b27
Merge pull request #9056 from aakropotkin/patch-1
...
Respect `NOCOLOR`
(cherry picked from commit 4b78a66bc5I005a13dea6cb33133f7bc59926cbaf5cf51c561a
2024-03-04 04:36:19 +01:00
f17e7b1855
Merge pull request #8923 from obsidiansystems/test-proto
...
Unit test some worker protocol serializers
(cherry picked from commit c6faef61a6I99e36f5f17eb7642211a4e42a16b143424f164b4
2024-03-04 04:36:14 +01:00
79dd9efe38
Merge pull request #9041 from trofi/profiles-sign
...
src/libstore/profiles.cc: fix comparison of sign difference
(cherry picked from commit 1da1642527I8f23d32ad66b797ff58eb2bd15b2f7741f47cd99
2024-03-04 04:36:10 +01:00
John Ericson
bc4aa3d5db
Merge pull request #8887 from obsidiansystems/bsd-cross-ci
...
Support cross compiling to BSD and CI it
(cherry picked from commit 1f3fc08c59I415e92952afc661cfb5ef91a76c0637678a04a19
2024-03-04 04:36:04 +01:00
Eelco Dolstra
2442a40393
Merge pull request #9029 from inclyc/users/lyc/pass-value-2
...
libexpr: const rvalue reference -> value for nix::Expr nodes
(cherry picked from commit de99647b9cI96baf96b0a17e401548a926a7015f85e11d7c459
2024-03-04 04:35:59 +01:00
Théophane Hufschmitt
68ba44c518
Merge pull request #8931 from fricklerhandwerk/nix3-config-options
...
do not show configuration override flags for each command
(cherry picked from commit f89b84919cIb98b739bd6c9a1e94f94a78a47d84d72e435e7c0
2024-03-04 04:35:54 +01:00
github-actions[bot]
afb55f36df
Fix bad_format_string error when builder stdout contains % ( #10063 )
...
(cherry picked from commit e2b6821ca0
2024-02-22 23:12:29 +01:00
Théophane Hufschmitt
f36d4aefd3
Fix the build
...
bef68e53b931ebc6028b
2024-02-15 09:50:12 +01:00
Eelco Dolstra
bef68e53b9
Fix symlink handling
...
This restores the symlink handling behaviour prior to
94812cca98Fixes #9298 .
(cherry picked from commit 31ebc6028b
2024-01-21 20:53:30 +00:00
Shea Levy
ba48ab4b95
Merge branch '2.18-maintenance' into ifd-buildStore-2.18
2024-01-11 07:21:16 -05:00
Shea Levy
e7c2b35827
Build IFD in the build store when using eval-store.
...
Previously, IFDs would be built within the eval store, even though one
is typically using `--eval-store` precisely to *avoid* local builds.
Because the resulting Nix expression must be copied back to the eval
store in order to be imported, this requires the eval store to trust
the build store's signatures.
(cherry picked from commit c3942ef85f
2024-01-11 06:34:27 -05:00
John Ericson
f7f37035c8
Move tests to separate directories, and document
...
Today, with the tests inside a `tests` intermingled with the
corresponding library's source code, we have a few problems:
- We have to be careful that wildcards don't end up with tests being
built as part of Nix proper, or test headers being installed as part
of Nix proper.
- Tests in libraries but not executables is not right:
- It means each executable runs the previous unit tests again, because
it needs the libraries.
- It doesn't work right on Windows, which doesn't want you to load a
DLL just for the side global variable . It could be made to work
with the dlopen equivalent, but that's gross!
This reorg solves these problems.
There is a remaining problem which is that sibbling headers (like
`hash.hh` the test header vs `hash.hh` the main `libnixutil` header) end
up shadowing each other. This PR doesn't solve that. That is left as
future work for a future PR.
Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
(cherry picked from commit 91b6833686
2023-12-01 13:05:03 -05:00
John Ericson
30dcc19d1f
Put functional tests in tests/functional
...
I think it is bad for these reasons when `tests/` contains a mix of
functional and integration tests
- Concepts is harder to understand, the documentation makes a good
unit vs functional vs integration distinction, but when the
integration tests are just two subdirs within `tests/` this is not
clear.
- Source filtering in the `flake.nix` is more complex. We need to
filter out some of the dirs from `tests/`, rather than simply pick
the dirs we want and take all of them. This is a good sign the
structure of what we are trying to do is not matching the structure
of the files.
With this change we have a clean:
```shell-session
$ git show 'HEAD:tests'
tree HEAD:tests
functional/
installer/
nixos/
```
(cherry picked from commit 68c81c7375
2023-12-01 12:06:43 -05:00
John Ericson
89a66633b7
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).
(cherry picked from commit 46131567da
2023-11-22 04:48:11 +00:00
DavHau
23775b7364
fetchTree: clarify docs for shallow flag
...
(cherry picked from commit 796a7eb92d
2023-11-20 14:16:03 +00:00
af21431140
libstore: Add apple-virt to system features when available
...
I'm sure that we'll adjust the implementation over time, but this
at least discerns between an apple silicon bare metal machine and
a tart VM.
(cherry picked from commit 9277eb276b
2023-11-16 18:59:06 +01:00
