John Ericson
eeecfacb43
Merge branch 'path-info' into ca-drv-exotic
2023-04-01 16:40:32 -04:00
John Ericson
f7f44f7c96
Merge commit 'aa99005004bccc9be506a2a2f162f78bad4bcb41' into ca-drv-exotic
2023-04-01 15:15:32 -04:00
John Ericson
aa99005004
Merge remote-tracking branch 'upstream/master' into path-info
...
Also improve content-address.hh API docs.
2023-03-30 16:28:53 -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
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
Yorick van Pelt
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
Yorick van Pelt
176005749c
Always disable GC in a coroutine unless the patch is applied
2023-03-01 15:07:00 +01:00
Yorick van Pelt
4c73eab923
DisableGC: replace by CoroutineContext, std::shared_ptr<void>
2023-03-01 13:55:41 +01:00
Yorick van Pelt
53bb4a5327
tests/coro-gc: refactor and split into 3 tests
2023-03-01 13:55:41 +01:00
Yorick van Pelt
eaeb994d8b
Disable GC inside coroutines on mac OS
2023-03-01 13:55:41 +01:00
Yorick van Pelt
0fd8f542a8
tests/coro-gc: create test for boehm stack patch
...
Regression test for #7679
2023-03-01 13:55:37 +01:00
John Ericson
5abd643c6d
Merge branch 'path-info' into ca-drv-exotic
2023-02-28 12:46:00 -05:00
John Ericson
d381248ec0
No inheritance for TextInfo
and FixedOutputInfo
2023-02-28 12:14:11 -05:00
John Ericson
85bb865d20
Revert "Remove some designated initializers"
...
This reverts commit ee9eb83a84
.
2023-02-28 11:57:20 -05:00
John Ericson
d12f57c2c0
Merge remote-tracking branch 'upstream/master' into path-info
2023-02-28 11:34:34 -05:00
Eelco Dolstra
3d15dbadc2
Merge pull request #7911 from edolstra/revert-7689
...
Revert #7689
2023-02-28 08:46:55 +01:00
Théophane Hufschmitt
eae89aca1b
Merge pull request #7776 from yorickvP/fix-path-escapes-7707
...
Properly escape local paths into URLs in fetchTree
2023-02-27 21:10:25 +01:00
Yorick van Pelt
2c0866fc3f
fetchTree: convert fs path to url via ParsedURL::to_string
2023-02-27 15:30:04 +01:00
Eelco Dolstra
dd93c12c6a
Revert "getDefaultNixPath: actually respect {restrict,pure}-eval
"
...
This reverts commit 1cba5984a6
.
2023-02-27 15:11:36 +01:00
Eelco Dolstra
e928c72cf9
Revert "Document default nix-path
value"
...
This reverts commit dba9173a1d
.
2023-02-27 14:16:49 +01:00
Robert Hensing
5d834c40d0
flakes: Differentiate self.outPath
and self.sourceInfo.outPath
...
It would be incorrect to say that the `sourceInfo` has an `outPath`
that isn't the root. `sourceInfo` is about the root, whereas only
the flake may not be about the root. Thanks Eelco for pointing that
out.
2023-02-22 03:31:24 +01:00
Robert Hensing
904a107d16
flakes: Ensure that self.outPath == ./.
...
Users expect `self` to refer to the directory where the `flake.nix`
file resides.
2023-02-22 03:30:47 +01:00
Valentin Gagarin
dda83a59c1
Merge pull request #7158 from sternenseemann/foldl-strict-accumulation-value
2023-02-19 23:54:14 +01:00
Et7f3
cec23f5dda
ExprOpHasAttr,ExprSelect,stripIndentation,binds,formals: delete losts objects
...
We are looking for *$ because it indicate that it was constructed with a new but
not release. De-referencing shallow copy so deleting as whole might create
dangling pointer that's why we move it so we delete a empty containers + the
nice perf boost.
2023-02-16 19:53:55 +01:00
Et7f3
fa89d317b7
ExprString: Avoid copy of string
2023-02-12 05:49:45 +01:00
Et7f3
3d16f2a281
parser: use implicit rule
2023-02-12 05:49:45 +01:00
Eelco Dolstra
5978ceb271
Fix building with GCC 9
...
Nixpkgs on aarch64-linux is currently stuck on GCC 9
(https://github.com/NixOS/nixpkgs/issues/208412 ) and using gcc11Stdenv
doesn't work either.
So use c++2a instead of c++20 for now. Unfortunately this means we
can't use some C++20 features for now (like std::span).
2023-02-10 18:38:57 +01:00
Théophane Hufschmitt
9ebbe35817
Merge pull request #5588 from tweag/balsoft/xdg
...
Follow XDG Base Directory standard
2023-02-10 18:05:50 +01:00
Alexander Bantyev
2384d36083
A setting to follow XDG Base Directory standard
...
XDG Base Directory is a standard for locations for storing various
files. Nix has a few files which seem to fit in the standard, but
currently use a custom location directly in the user's ~, polluting
it:
- ~/.nix-profile
- ~/.nix-defexpr
- ~/.nix-channels
This commit adds a config option (use-xdg-base-directories) to follow
the XDG spec and instead use the following locations:
- $XDG_STATE_HOME/nix/profile
- $XDG_STATE_HOME/nix/defexpr
- $XDG_STATE_HOME/nix/channels
If $XDG_STATE_HOME is not set, it is assumed to be ~/.local/state.
Co-authored-by: Théophane Hufschmitt <7226587+thufschmitt@users.noreply.github.com>
Co-authored-by: Tim Fenney <kodekata@gmail.com>
Co-authored-by: pasqui23 <pasqui23@users.noreply.github.com>
Co-authored-by: Artturin <Artturin@artturin.com>
Co-authored-by: John Ericson <Ericson2314@Yahoo.com>
2023-02-10 20:14:06 +04:00
Joachim Breitner
e4a2a5c074
Documentation: builtins.fetchGit when used on a local path ( #7706 )
...
* Documentation: builtins.fetchGit when used on a local path
Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
2023-02-08 11:53:28 +00:00
John Ericson
87ca46263d
Merge branch 'master' into path-info
2023-02-02 09:55:07 -05:00
Eelco Dolstra
e8ca49f6ef
Fix clang compilation
2023-02-01 20:34:44 +01:00
John Ericson
ee9eb83a84
Remove some designated initializers
...
With the switch to C++20, the rules became more strict, and we can no
longer initialize base classes. Make them comments instead.
(BTW
https://www.open-std.org/jtc1/sc22/wg21/docs/papers/2021/p2287r1.html
this offers some new syntax for this use-case. Hopefully this will be
adopted and we can eventually use it.)
2023-02-01 11:25:56 -05:00
John Ericson
43414738a0
Merge remote-tracking branch 'upstream/master' into path-info
2023-02-01 10:02:30 -05:00
Eelco Dolstra
14b0b9ea5a
Merge pull request #7203 from graham33/feature/cpp20
...
Proposal: Use C++20
2023-02-01 15:41:04 +01:00
John Ericson
b6c98752f6
Merge remote-tracking branch 'upstream/master' into path-info
2023-01-30 18:04:54 -05:00
Robert Hensing
c9b9260f34
Merge pull request #7713 from obsidiansystems/more-rapid-check
...
Add more property tests
2023-01-30 18:54:53 +01:00
John Ericson
560142fec0
Make per-variant Arbitrary impls too
...
This is a nice idea that @roberth requested. If we could factor our a
generic `std::variant` impl as a follow-up it would be even better!
2023-01-30 10:56:00 -05:00