lunaphied/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity
14955 commits 2 branches 3 tags 72 MiB
Commit graph

14955 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Valentin Gagarin b11ae93581 remove incorrect reference 
the semantics are not explained in the referenced section any more, they
have been moved to the documentation for common options in the new CLI [0].

[0]: 703d863a48
 2023-04-05 14:03:11 +02:00
Valentin Gagarin bbdb5a58c7
Merge pull request #7849 from milahu/fix-man-nix-shell 
docs: fix nix-shell commands
 2023-04-05 13:06:59 +02:00
milahu 1ac10808ba docs: fix nix-shell commands 2023-04-05 12:38:36 +02:00
Valentin Gagarin 3586e97e23
Merge pull request #8167 from fricklerhandwerk/doc-nix-database 
glossary: Nix database
 2023-04-05 11:17:35 +02:00
Mike (stew) O'Connor cab5266092 add a definition of the nix database to the glossary 
Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
 2023-04-05 10:50:34 +02:00
Valentin Gagarin ed5d0c1362 add anchor to 'local store' 2023-04-05 10:48:59 +02:00
John Ericson 53d0836347 Assemble experimental feature docs outside of Nix itself 
Instead of constructing a markdown list in C++ (which involved all sorts
of nasty string literals), export some JSON and assemble it with the
manual build system.

Besides following the precedent set with other dumped data, this is a
better separate of content and presentation; if we decide for example we
want to display this information in a different way, or in a different
section of the manual, it will become much easier to do so.
 2023-04-04 22:57:11 -04:00
John Ericson 3f98353f19 Merge remote-tracking branch 'upstream/master' into list-experimental-features 2023-04-04 21:34:20 -04:00
Théophane Hufschmitt 1707e7ea5f
Merge pull request #7579 from fricklerhandwerk/review-process 
review process: all PRs must be triaged
 2023-04-05 01:57:17 +02:00
Valentin Gagarin f912ab89cc only triage non-trivial pull requests 
the team perceives triaging literally everything as too much overhead,
and there is a desire to allow for more parallel action.
 2023-04-05 01:27:15 +02:00
John Ericson bdeeffff96
Apply suggestions from code review 
Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
 2023-04-04 19:16:10 -04:00
Théophane Hufschmitt d93c1514eb
Merge pull request #7944 from yorickvP/fix-curRepl 
NixRepl::mainLoop: restore old curRepl on function exit
 2023-04-04 09:44:47 +02:00
Théophane Hufschmitt 7076d37047 Fix the flaky nix-profile test 
Exclude the `error (ignored)` from the message that is checked by the
install conflict test.

Fix https://github.com/NixOS/nix/issues/8140
 2023-04-03 20:47:21 +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
Robert Hensing bf2c5c3958 nix-store.cc: Refactor, remove qDefault 2023-04-03 18:45:20 +02:00
Robert Hensing 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
Robert Hensing 9470ee877d Allow open switch-enum in 5 places 2023-04-03 18:45:20 +02:00
John Ericson acc3314376
Merge pull request #7611 from obsidiansystems/structured-command-stabilization 
Stuctured command stability
 2023-04-03 12:22:10 -04:00
Robert Hensing 3dac4c7874 Add explicit case statements where -Wswitch-enum would report them 2023-04-03 18:17:32 +02:00
Robert Hensing ed7885017c Fix systemd logging for lvlNotice: eqv to lvlInfo, not lvlVomit 2023-04-03 18:17:32 +02:00
Robert Hensing 62cacc371f Fix BuildResult.toString() for NoSubstituters 2023-04-03 18:17:30 +02:00
John Ericson 4a0b893d5e Stuctured command stability 
Prior to this, there was an ad-hoc whitelist in `main.cc`. Now, every
command states its stability.

In a future PR, we will adjust the manual to take advantage of this new
information in the JSON.
(It will be easier to do that once we have some experimental feature
docs to link too; see #5930 and #7798.)
 2023-04-03 11:48:21 -04: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
Eelco Dolstra ac4318a1b9
Merge pull request #8152 from obsidiansystems/move-querySubstitutablePathInfos 
Move `querySubstitutablePathInfos` from `LocalStore` to `Store`
 2023-04-03 15:36:33 +02:00
Robert Hensing 1c55544a42 eval: Fix crash on missing printValue tBlackhole case 
Fixes #8119
 2023-04-03 15:32:42 +02:00
Théophane Hufschmitt 70bb7b7289
Merge pull request #7610 from obsidiansystems/gate-default-settings 
Punt on improper global flags for now
 2023-04-03 14:02:45 +02:00
Théophane Hufschmitt a06ea8db77
Merge pull request #8039 from obsidiansystems/prioritize-testing 
Prioritize testing in the maintainers process docs
 2023-04-03 13:46:31 +02:00
Eelco Dolstra 5256ba6d87
Merge pull request #8151 from obsidiansystems/internal-api-docs-pr-template 
Mention internal API docs in PR template
 2023-04-03 10:49:48 +02:00
John Ericson 7963d0c68d Try auto-labeling a few more things 2023-04-02 23:11:21 -04:00
John Ericson 9383520b75 Move querySubstitutablePathInfos from LocalStore to Store 
The code is not local-store-specific, so we should share it with all
stores. More uniform behavior is better, and a less store-specific
functionality is more maintainable.

This fixes a FIXME added in f73d911628 by @edolstra himself.
 2023-04-02 20:32:01 -04:00
John Ericson ca3937fb82 Mention internal API docs in PR template 
I think we want to ensure that all new items in headers are documented,
and the documentation on modified items is kept up to date.

It will take a while to document the backlog of undocumented things, but
we can at least ensure that new items don't extend that backlog.
 2023-04-02 19:44:44 -04:00
John Ericson 32d72b1696 Add more API docs to experimental-features.hh 2023-04-02 18:57:46 -04:00
John Ericson 2585bcaa50 Rework a few things with the experimental features list 
- Use struct not `std::pair`, designated initializers

- Use `constexpr` array that we can index by enum tag

- It no longer segfaults; not sure why.
 2023-04-02 18:17:45 -04:00
John Ericson b2c9315bf2 Merge remote-tracking branch 'upstream/master' into list-experimental-features 2023-04-02 16:21:38 -04:00
John Ericson 1fcd49dbbd Merge branch 'path-info' into ca-drv-exotic 2023-04-01 16:54:46 -04:00
John Ericson 5d56e2daf7 Add comparison methods for content addresses 2023-04-01 16:52:23 -04:00
John Ericson eeecfacb43 Merge branch 'path-info' into ca-drv-exotic 2023-04-01 16:40:32 -04:00
John Ericson 1f8e1edba9 Merge commit 'a6d00a7bfb18e7ec461ac1d54203cc628aca5c66' into ca-drv-exotic 2023-04-01 15:15:38 -04:00
John Ericson f7f44f7c96 Merge commit 'aa99005004bccc9be506a2a2f162f78bad4bcb41' into ca-drv-exotic 2023-04-01 15:15:32 -04:00
John Ericson 2ef99cd104
Merge pull request #8122 from bjornfor/use-nix-store-l-unless-experimental-enabled 
Don't recommend 'nix log' unless experimental feature is enabled
 2023-04-01 14:50:16 -04:00
John Ericson ea1cbc3df5
Merge pull request #8133 from obsidiansystems/improve-internal-api-docs 
Extend internal API docs, part 2
 2023-04-01 12:42:03 -04: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
John Ericson abd5e7dec0 Extend internal API docs, part 2 
Picking up from #8111.

Co-authored-by: Eelco Dolstra <edolstra@gmail.com>
 2023-03-31 23:01:40 -04:00
John Ericson 8ae9d66940
Merge pull request #8142 from patricksjackson/atomic-sync 
Replace unnecessary Sync<uint64_t> with std::atomic<uint64_t>
 2023-03-31 21:49:20 -04:00
Patrick Jackson 2b905d1d35 Replace unnecessary Sync<uint64_t> with std::atomic<uint64_t> 2023-03-31 17:56:25 -07:00
Eelco Dolstra cf76b38e27
Merge pull request #8137 from edolstra/lazy-trees-cherrypicks 
Add CanonPath::makeRelative()
 2023-03-31 18:26:08 +02:00
Eelco Dolstra 936e7c66eb Indentation 2023-03-31 17:15:03 +02:00