cb2615cf47
Merge remote-tracking branch 'upstream/master' into source-path
2023-04-17 11:41:50 +02:00
Robert Hensing
9af9c260fc
Merge pull request #8193 from hercules-ci/dry-strings
...
Deduplicate string literal rendering, fix 4909
2023-04-17 11:19:40 +02:00
b6125772d7
libexpr: Move identifier-like printing to print.cc
2023-04-16 14:07:35 +02:00
28a5cdde02
libexpr/value/print.* -> libexpr/print.*
...
Generalizes the file to sensibly allow printing any part of the
language syntax.
2023-04-16 13:10:45 +02:00
1e2dd669bc
printLiteral: Do not overload
2023-04-16 13:04:35 +02:00
Robert Hensing
9c74df5bb4
Format
...
Co-authored-by: Eelco Dolstra <edolstra@gmail.com>
Co-authored-by: John Ericson <git@JohnEricson.me>
2023-04-15 20:56:51 +02:00
Eelco Dolstra
162c3f5f7c
Merge pull request #8170 from tweag/fix-aarch64-build
...
Explicitely define `LockFile::operator!=`
2023-04-11 12:35:23 +02:00
4e0804c920
Deduplicate string literal rendering, fix 4909
2023-04-09 22:42:20 +02:00
Robert Hensing
4411c7d7e0
Merge pull request #8179 from tweag/disable-gc-on-coroutine
...
disable gc on coroutine
2023-04-07 18:21:11 +02:00
John Ericson
0746951be1
Finish converting existing comments for internal API docs ( #8146 )
...
* Finish converting existing comments for internal API docs
99% of this was just reformatting existing comments. Only two exceptions:
- Expanded upon `BuildResult::status` compat note
- Split up file-level `symbol-table.hh` doc comments to get
per-definition docs
Also fixed a few whitespace goofs, turning leading tabs to spaces and
removing trailing spaces.
Picking up from #8133
* Fix two things from comments
* Use triple-backtick not indent for `dumpPath`
* Convert GNU-style `\`..'` quotes to markdown style in API docs
This will render correctly.
2023-04-07 13:55:28 +00:00
62ddd8633c
Add talkative msg for coro gc debug
2023-04-07 14:54:50 +02:00
58d24a4cb6
Always disable GC in a coroutine unless the patch is applied
2023-04-07 14:54:38 +02:00
00bc34430b
DisableGC: replace by CoroutineContext, std::shared_ptr<void>
2023-04-07 14:53:40 +02:00
2c53ef1bfe
Disable GC inside coroutines on mac OS
2023-04-07 14:52:59 +02:00
Eelco Dolstra
6960de73af
Typo
2023-04-07 13:08:32 +02:00
Eelco Dolstra
a9759407e5
Origin: Use SourcePath
2023-04-06 15:25:06 +02:00
Eelco Dolstra
94812cca98
Backport SourcePath from the lazy-trees branch
...
This introduces the SourcePath type from lazy-trees as an abstraction
for accessing files from inputs that may not be materialized in the
real filesystem (e.g. Git repositories). Currently, however, it's just
a wrapper around CanonPath, so it shouldn't change any behaviour. (On
lazy-trees, SourcePath is a <InputAccessor, CanonPath> tuple.)
2023-04-06 13:15:50 +02:00
Théophane Hufschmitt
faefaac875
Explicitely define LockFile::operator!=
...
It should be syntethised in terms of `operator==`, but the GCC version
used on aarch64-linux doesn't implement that (see
https://hydra.nixos.org/build/214848896= . So explicitely define it.
Fix https://github.com/NixOS/nix/issues/8159
2023-04-05 17:20:04 +02:00
Théophane Hufschmitt
523c3f7225
Merge pull request #8157 from hercules-ci/switch-bugs
...
Fix current and future `switch` bugs
2023-04-03 20:43:02 +02:00
Eelco Dolstra
81491e1379
Merge pull request #8042 from lheckemann/alt-lockfiles
...
Allow specifying alternative paths for reading/writing flake locks
2023-04-03 19:28:09 +02:00
fba7be80eb
Enable -Werror=switch-enum
...
switch statements must now match all enum values or disable the
warning.
Explicit is good. This has helped us find two bugs, after solving
another one by debugging.
From now on, adding to an enum will raise errors where they are
not explicitly handled, which is good for productivity, and helps
us decide the correct behavior in all usages.
Notably still excluded from this though are the cases where the
warning is disabled by local pragmas.
fromTOML.cc did not build despite a top-level pragma, so I've had
to resort to a makefile solution for that.
2023-04-03 18:45:20 +02:00
9470ee877d
Allow open switch-enum in 5 places
2023-04-03 18:45:20 +02:00
3dac4c7874
Add explicit case statements where -Wswitch-enum would report them
2023-04-03 18:17:32 +02:00
Robert Hensing
f3a6de6ba9
Merge pull request #8148 from hercules-ci/fix-issue-8119-printValue-tBlackhole-abort
...
eval: Fix crash on missing printValue tBlackhole case
2023-04-03 16:05:55 +02:00
1c55544a42
eval: Fix crash on missing printValue tBlackhole case
...
Fixes #8119
2023-04-03 15:32:42 +02:00
John Ericson
f4ab297b31
Ensure all headers have #pragma once and are in API docs
...
`///@file` makes them show up in the internal API dos. A tiny few were
missing `#pragma once`.
2023-03-31 23:19:44 -04:00
Eelco Dolstra
02050bd055
Typo
2023-03-30 10:49:21 +02:00
Joachim Breitner
1b6cfe6fa1
More precise wording
2023-03-30 10:40:04 +02:00
Joachim Breitner
2e6b95dac7
Update src/libexpr/primops.cc
...
Co-authored-by: Eelco Dolstra <edolstra@gmail.com>
2023-03-29 13:19:51 +02:00
Joachim Breitner
3ce6d72b2b
Update src/libexpr/primops.cc
...
Co-authored-by: asymmetric <lorenzo@mailbox.org>
2023-03-28 14:38:39 +02:00
Joachim Breitner
605c8f7789
Docs: Explain why import nixpkgs works in flakes
2023-03-28 09:35:49 +02:00
John Ericson
1d539aa287
Merge pull request #8073 from tweag/fix-root-channels-location
...
Fix root channels location
2023-03-27 09:37:53 -04:00
John Ericson
570829d67e
Merge pull request #7609 from obsidiansystems/hide-experimental-settings
...
Hide experimental settings
2023-03-27 09:19:29 -04:00
Théophane Hufschmitt
fb67c1a1fb
Factor out the generation of the profile/channel directory
...
Make sure that all the code paths use the same one, and that the
backwards-compatibility measures are probably in place when needed
2023-03-23 10:22:42 +01:00
Eelco Dolstra
16cb9b9f04
Fix rendering of fetchGit documentation
...
stripIndentation() doesn't support tabs, so the entire markdown ended
up indented and thus rendered as a code block.
2023-03-21 14:48:15 +01:00
John Ericson
296831f641
Move enabled experimental feature to libutil struct
...
This is needed in subsequent commits to allow the settings and CLI args
infrastructure itself to read this setting.
2023-03-20 11:05:22 -04:00
f1c9d83697
Only allow reference lock files when allow-dirty is set
2023-03-19 14:12:49 +01:00
3a1de4c3fe
Apply review suggestions
...
Co-authored-by: Eelco Dolstra <edolstra@gmail.com>
2023-03-14 12:02:03 +01:00
e91596eb69
Allow specifying alternative paths for reading/writing flake locks
...
This allows having multiple separate lockfiles for a single
project, which can be useful for testing against different versions of
nixpkgs; it also allows tracking custom input overrides for remote
flakes without requiring local clones of these flakes.
For example, if I want to build Nix against my locally pinned nixpkgs,
and have a lock file tracking this override independently of future
updates to said nixpkgs:
nix flake lock --output-lock-file /tmp/nix-flake.lock --override-input nixpkgs flake:nixpkgs
nix build --reference-lock-file /tmp/nix-flake.lock
Co-Authored-By: Will Fancher <elvishjerricco@gmail.com>
2023-03-13 21:08:52 +01:00
Théophane Hufschmitt
39700c5cbe
Revert "Disable GC during coroutine execution + test"
2023-03-08 20:47:52 +01:00
Théophane Hufschmitt
4a6244dcf7
Merge pull request #7725 from yorickvP/check-coro-gc
...
Disable GC during coroutine execution + test
2023-03-08 09:51:46 +01:00
Valentin Gagarin
f69d453c3e
remove indentation in fetchGit attribute listing
...
also reword a confusing sentence and add links to Git terminology
2023-03-05 04:44:11 +01:00
2683734936
Add talkative msg for coro gc debug
2023-03-03 11:43:47 +01:00
Eelco Dolstra
29abc8e764
Remove FormatOrString and remaining uses of format()
2023-03-02 15:57:54 +01:00
176005749c
Always disable GC in a coroutine unless the patch is applied
2023-03-01 15:07:00 +01:00
4c73eab923
DisableGC: replace by CoroutineContext, std::shared_ptr<void>
2023-03-01 13:55:41 +01:00
53bb4a5327
tests/coro-gc: refactor and split into 3 tests
2023-03-01 13:55:41 +01:00
eaeb994d8b
Disable GC inside coroutines on mac OS
2023-03-01 13:55:41 +01:00
0fd8f542a8
tests/coro-gc: create test for boehm stack patch
...
Regression test for #7679
2023-03-01 13:55:37 +01:00
Eelco Dolstra
3d15dbadc2
Merge pull request #7911 from edolstra/revert-7689
...
Revert #7689
2023-02-28 08:46:55 +01:00
