eldritch horrors
d8a293d61d
Merge pull request #9451 from kolloch/feature/git-ignore-ds-store
...
gitignore: Also ignore .DS_Store
(cherry picked from commit fdac6e3818
)
Change-Id: Ib04be12427ab6a6edca5f78ccb377d40aab562fd
2024-03-04 06:04:07 +01:00
eldritch horrors
cad1683048
Merge pull request #9398 from Qyriad/fixes/flake-not-found
...
flakes: bare minimum fix the error message for untracked flake.nix
(cherry picked from commit 7f626dba33
)
Change-Id: I470ac56a670a8c11e4164c6b059184a02344d491
2024-03-04 06:03:33 +01:00
eldritch horrors
cba87025f8
Merge pull request #9445 from NixOS/allow-input-in-git-commit
...
Allow user input in `git commit`
(cherry picked from commit 43fb39ca29
)
Change-Id: I13bd4c007234ee2133289c68ef8ab2eae4def78a
2024-03-04 06:01:09 +01:00
eldritch horrors
9981c714f6
Merge pull request #9425 from iFreilicht/fix-unbound-variable-errors
...
Fix "unbound variable" errors in bash
(cherry picked from commit 9ad9e988b8
)
Change-Id: Ib7c8cb303f34104b9785c9376225f93174f3dae7
2024-03-04 05:59:32 +01:00
eldritch horrors
340a6cf977
Merge pull request #9257 from Artturin/nixenvjsondrvpath
...
`nix-env --query`: fix `--json` ignoring `--drv-path`
(cherry picked from commit 516e7ddc41
)
Change-Id: I84b5bccea9d0383e2e74544743b703942e7be547
2024-03-04 05:59:15 +01:00
eldritch horrors
01069d8c46
Merge pull request #9400 from hercules-ci/refactors-from-5e3986f59cb
...
Refactors from 5e3986f59c
(cherry picked from commit e540d48c4f
)
Change-Id: I5b21b770a0c20ec2ec9845d3a97a524f1b0135ee
2024-03-04 05:58:02 +01:00
eldritch horrors
439f88b7d7
Merge pull request #9399 from edolstra/revert-vlas
...
Revert use of boost::container::small_vector in the evaluator
(cherry picked from commit 6832d18ac7
)
Change-Id: I7f10af0c8b8a8beb4b1e36424120995f4ed82738
2024-03-04 05:57:04 +01:00
eldritch horrors
3f3badffc9
Merge pull request #9395 from nbraud/buitlins
...
builtins.concatMap: Fix typo in error message
(cherry picked from commit 4292d99756
)
Change-Id: Ia33d1b02e41f699ef0c8c2d6487c9f70b2cc8cf4
2024-03-04 05:56:04 +01:00
eldritch horrors
2df9c2c00f
Merge pull request #9374 from hercules-ci/fix-nogc
...
Fix buildNoGc
(cherry picked from commit 7762335a9c
)
Change-Id: I3ad53c9c1dd9180a2abc3528e9437c28ac95b303
2024-03-04 05:54:10 +01:00
eldritch horrors
5d77afe0a4
Merge pull request #6469 from gbpdt/fix/skipped_build_locking
...
Unlock output paths when a derivation is already built
(cherry picked from commit 7ba4e073e8
)
Change-Id: I9de077679290d5141a610ac43d99d3a43acff87c
2024-03-04 05:53:17 +01:00
eldritch horrors
5e182235cb
Merge pull request #7348 from thufschmitt/dont-use-vlas
...
Remove the usage of VLAs in the code
(cherry picked from commit ac4431e9d0
)
Change-Id: Ifbf5fbfc2e27122362a2aaea4b62c7cf3ca46b1a
2024-03-04 05:51:23 +01:00
eldritch horrors
30f3298e9d
Merge pull request #9364 from edolstra/fix-coverage
...
Fix a broken generated header file dependency
(cherry picked from commit 57de482e00
)
Change-Id: I0580274bf51132fbeb34e8c0a91a7017071d2bb3
2024-03-04 05:48:04 +01:00
eldritch horrors
e3bf288180
Update scripts/nix-profile-daemon.fish.in
...
Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
(cherry picked from commits 867f894289
,
896013ec0c
,
150b5aba50
,
1362a0a55a
)
Change-Id: I0ba6a399d22cc5e927d9ef7046cc6f95856c1559
2024-03-04 05:46:35 +01:00
eldritch horrors
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 61d6fe059e
)
Change-Id: Idd671127a9c1ccc8b94e58e727632fcc064f3cbe
2024-03-04 05:39:12 +01:00
eldritch horrors
6cb215f63b
Merge pull request #9293 from ThinkChaos/ssh-misc-improvments
...
SSH small improvments
(cherry picked from commit dcc49744ed
)
Change-Id: Ie87910df3ab739d0ff983c085190da1d108e96e2
2024-03-04 05:38:09 +01:00
eldritch horrors
b7e7949035
Merge pull request #9299 from tfc/config-improvements
...
Improvements in src/libutil/config.*
(cherry picked from commit dea63bb810
)
Change-Id: I8090eb2ad393dd9964cf2d5254ec8c796b1bd367
2024-03-04 05:36:42 +01:00
eldritch horrors
8ed486ebe6
Merge pull request #9225 from drupol/nixpkgs-pr-107251/make-gnutar-reproducible
...
fix: make sure `tar` reproducibility flags are set
(cherry picked from commit 28dddde0ac
)
Change-Id: I57c4d4374f5195099e6d763827b6d7d05785b3a8
2024-03-04 05:34:19 +01:00
eldritch horrors
6e0dd9f673
Merge pull request #9289 from edolstra/fix-warnings
...
Fix gcc warnings
(cherry picked from commit 66cb364f58
)
Change-Id: I1474dbc18a4beaaf1bce16d4abbcc99806b79ff1
2024-03-04 05:27:35 +01:00
eldritch horrors
2633ca3f88
Merge pull request #9288 from edolstra/fix-nar-access-test
...
Fix nar-access test on macOS
(cherry picked from commit e9a857e418
)
Change-Id: I2fd2ec3e6ccb88350bdcd2ba15ccfd77275399c9
2024-03-04 05:27:18 +01:00
eldritch horrors
26e17eedef
Merge pull request #9277 from keszybz/file-permissions
...
Remove stray executable permissions on source files
(cherry picked from commit a80fb9fa39
)
Change-Id: I603b18ddda76041991101ef0597ec804c2b55dc0
2024-03-04 05:26:17 +01:00
eldritch horrors
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 8d66346293
)
Change-Id: Ifa2e65502de4000935549dde82ab1b5867e2f0ed
2024-03-04 05:26:02 +01:00
eldritch horrors
559a8c44c3
Merge pull request #6258 from obsidiansystems/gcc-bug-ergonomics
...
Remove bug-avoiding `StoreConfig *` casts for settings
(cherry picked from commit e3febfcd53
)
Change-Id: Ifeae276582fdbc781a38581df9de3da67a7e7bf9
2024-03-04 05:24:33 +01:00
eldritch horrors
7ff1dca1fa
Merge pull request #9247 from obsidiansystems/derivation-test-with-files
...
Turn derivation unit tests into unit characterization tests
(cherry picked from commit a6e587923c
)
Change-Id: Ia2a2e65aabfee8d5d52142b8fdaacbae4a27242c
2024-03-04 05:21:10 +01:00
eldritch horrors
4206441a12
Merge pull request #9246 from trofi/clarify-builder-uid-exhaustion
...
local-derivation-goal.cc: slightly clarify waiting message
(cherry picked from commit 232e236672
)
Change-Id: Idd271d6921caba203db9971f27e156e533664935
2024-03-04 05:19:38 +01:00
eldritch horrors
89e03988ec
Merge pull request #9238 from tfc/small-improvements2
...
Small improvements 2
(cherry picked from commit 1dc6a65d36
)
Change-Id: I8ed573c496068c4a92f53c1caafa49da59d75967
2024-03-04 05:18:05 +01:00
eldritch horrors
622b0e9428
Merge pull request #8965 from Artturin/bindfilesinchroot
...
Bindmount files instead of hardlinking or copying to chroot
(cherry picked from commit 622191c2b5
)
Change-Id: I278ec1baacdfa9044992b58fdec8f14d6d7d09ce
2024-03-04 05:17:31 +01:00
eldritch horrors
8abb20390e
Merge pull request #9229 from tfc/small-improvements
...
Remove warnings, small improvements
(cherry picked from commit 5ac87a75dd
)
Change-Id: I88349b6e954398dde83c845f42d41a9dd89ba9e0
2024-03-04 05:16:42 +01:00
eldritch horrors
ea10088703
Merge pull request #9216 from obsidiansystems/addDrvOutputDependencies-pre
...
Add `builtins.addDrvOutputDependencies`
(cherry picked from commit a58d7f143e
)
Change-Id: Ia5a1790bf29dfaf29287cc35cdae6b6d650e7a83
2024-03-04 05:06:56 +01:00
eldritch horrors
032eff7f69
Merge pull request #8470 from ncfavier/shebang-single-quotes
...
nix-shell: support single quotes in shebangs, fix whitespace parsing
(cherry picked from commit 3b99c62913
)
Change-Id: I2a431b21c3467eefa1ef95d5a36d672f45b6937a
2024-03-04 05:06:32 +01:00
eldritch horrors
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 8b68bbb777
)
Change-Id: Ia3d3b9fbaf9f0ae62ab225020b7d14790e793655
2024-03-04 04:59:31 +01:00
eldritch horrors
4d9dde15ef
Merge pull request #9191 from tfc/libutil-implementation
...
libutil: Small improvements
(cherry picked from commit edc07588ec
)
Change-Id: I01a481d872d859b372a4bade9bebd3dab2fb4efb
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 4d17c59d8d
)
Change-Id: I497af39deb792e50c157a1305d8c9e722798740b
2024-03-04 04:43:35 +01:00
eldritch horrors
5ddd1a9166
Merge pull request #9168 from obsidiansystems/fix-lang-tests-read-only
...
Fix language tests a bit
(cherry picked from commit e92cac789f
)
Change-Id: I527e94c5af0921ff2559ce5a4ac7635be791c22e
2024-03-04 04:42:21 +01:00
eldritch horrors
c0fa61340c
Merge pull request #9172 from tfc/bad-moves
...
Fix/remove some bad std::moves
(cherry picked from commit 8c049a9f04
)
Change-Id: I720273378d2506a13883acee28abd096d099b0d4
2024-03-04 04:41:52 +01:00
eldritch horrors
75fb953205
Merge pull request #9170 from tfc/fix-broken-move
...
Fix broken move
(cherry picked from commit aa4f41d796
)
Change-Id: I39d3f9f4f27328500de005c9205d905c55d6f9ea
2024-03-04 04:40:51 +01:00
eldritch horrors
d28a6618a8
Merge pull request #9167 from obsidiansystems/pre-overhaul-completions
...
Improve tests and docs prior to refactoring completions
(cherry picked from commit 5442d9b472
)
Change-Id: Ief99ac2cd9c92981a9a522d15b9c3daf99182c9d
2024-03-04 04:38:33 +01:00
eldritch horrors
7d8b34475a
Merge pull request #9152 from obsidiansystems/split-out-perl-nix
...
Factor out Perl bindings Nix package
(cherry picked from commit d12c614ac7
)
Change-Id: Ie75ccfec8cc815ea95ae9848cb03e33aa8cee5ae
2024-03-04 04:37:44 +01:00
eldritch horrors
e12e9f2452
Merge pull request #9137 from obsidiansystems/serve-protocol
...
Introduce separate Serve protocol serialisers
(cherry picked from commit d070d8b746
)
Change-Id: Ibcc8639e8997bcd07f7a5318330a147bcadc411b
2024-03-04 04:37:05 +01:00
eldritch horrors
aeb803de9a
Merge pull request #8047 from lovesegfault/always-allow-substitutes
...
feat: add always-allow-substitutes
(cherry picked from commit da2b59a088
)
Change-Id: I50481cd8fe643c673c610fec28bad84519a4d650
2024-03-04 04:37:03 +01:00
eldritch horrors
6897e238bd
Merge pull request #9099 from obsidiansystems/common-proto
...
Factor out bits of the worker protocol to use elsewhere
(cherry picked from commit 4b1a97338f
)
Change-Id: If93afa0f8b1cf9b0e705b34fa71e6fd708752758
2024-03-04 04:36:58 +01:00
eldritch horrors
da0aa66d98
Merge pull request #9131 from obsidiansystems/delete-bootstrap-script
...
Get rid of `bootstrap.sh`
(cherry picked from commit aaef47a08e
)
Change-Id: I1a74bed0c23d6fda06d5dfd8ecad443b9122da12
2024-03-04 04:36:52 +01:00
eldritch horrors
6feba52008
Merge pull request #8895 from hercules-ci/gc-before-stats
...
eval: Run a full GC before printing stats
(cherry picked from commit aeea49609b
)
Change-Id: I47a23d3a7a47ea61d9a2b5727b638f879f3aaf1e
2024-03-04 04:36:47 +01:00
eldritch horrors
fd1299cef3
Merge pull request #9106 from Ericson2314/positive-source-filtering
...
Use positive source filtering for the standalone functional tests job and Perl bindings
(cherry picked from commit 6b6bd90030
)
Change-Id: I896be67654f893d543ed6beb5d0d0d6c6d36e027
2024-03-04 04:36:42 +01:00
eldritch horrors
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 3dd4475826
)
Change-Id: I04a91277d1d9d09f5c1bf4a28fc99f0702b161e5
2024-03-04 04:36:38 +01:00
eldritch horrors
c36ba796dd
Merge pull request #9096 from NixOS/dont-rebuild-twice-on-ci
...
Don't run the tests that require building if we're not building
(cherry picked from commit 8cfa582f43
)
Change-Id: I6085ca6107349669407340d7a5e52639a2febc90
2024-03-04 04:36:33 +01:00
eldritch horrors
7e966819b5
Merge pull request #9098 from obsidiansystems/test-proto
...
Enable most of the third `BuildResult` worker protocol test
(cherry picked from commit d344c112f7
)
Change-Id: I7b2b72aa84c19a6069f9c12128d901262db6f91c
2024-03-04 04:36:28 +01:00
eldritch horrors
ea0008deea
Merge pull request #9094 from obsidiansystems/test-proto
...
Test the rest of the worker protocol serializers
(cherry picked from commit 2f1c16dfa2
)
Change-Id: Idfd72d32b21d14a260e02f65531d287cef7464d2
2024-03-04 04:36:23 +01:00
eldritch horrors
8867479b27
Merge pull request #9056 from aakropotkin/patch-1
...
Respect `NOCOLOR`
(cherry picked from commit 4b78a66bc5
)
Change-Id: I005a13dea6cb33133f7bc59926cbaf5cf51c561a
2024-03-04 04:36:19 +01:00
eldritch horrors
f17e7b1855
Merge pull request #8923 from obsidiansystems/test-proto
...
Unit test some worker protocol serializers
(cherry picked from commit c6faef61a6
)
Change-Id: I99e36f5f17eb7642211a4e42a16b143424f164b4
2024-03-04 04:36:14 +01:00
eldritch horrors
79dd9efe38
Merge pull request #9041 from trofi/profiles-sign
...
src/libstore/profiles.cc: fix comparison of sign difference
(cherry picked from commit 1da1642527
)
Change-Id: I8f23d32ad66b797ff58eb2bd15b2f7741f47cd99
2024-03-04 04:36:10 +01:00