puck/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity
15284 commits 19 branches 0 tags 68 MiB
Commit graph

15284 commits

This branch
This branch
All branches
Author SHA1 Message Date
Eelco Dolstra 39ea46abb1 Merge remote-tracking branch 'origin/master' into libgit2 2023-11-02 16:16:37 +01:00
John Ericson 1e61c007be
Merge pull request #9234 from fricklerhandwerk/doc-style-examples 
styleguide: add note on highlighting examples and syntax definitions
 2023-11-02 09:49:38 -04:00
John Ericson 7f56ed8b90
Merge pull request #9207 from fricklerhandwerk/doc-store-path 
document store paths
 2023-11-02 09:48:18 -04:00
John Ericson 8c99d40cac
Merge pull request #9232 from fricklerhandwerk/doc-store-object 
document store objects in terms of their constituent parts
 2023-11-02 09:45:48 -04:00
John Ericson 90de958637
Merge pull request #9265 from obsidiansystems/better-parse-sink 
Make `ParseSink` a bit better
 2023-11-02 09:28:29 -04:00
Eelco Dolstra 5223114c93
Merge pull request #9269 from edolstra/unify-accessor 
Unify `FSAccessor` and `SourceAccessor`
 2023-11-02 14:23:10 +01:00
Eelco Dolstra d26c317b14
Use expect 
Co-authored-by: John Ericson <git@JohnEricson.me>
 2023-11-02 13:40:54 +01:00
Robert Hensing a80fb9fa39
Merge pull request #9277 from keszybz/file-permissions 
Remove stray executable permissions on source files
 2023-11-02 13:19:38 +01:00
Zbigniew Jędrzejewski-Szmek 55ed09c4f2 Remove stray executable permissions on source files 
Noticed because of a warning during an rpm build:
*** WARNING: ./usr/src/debug/nix-2.18.1-1.fc40.x86_64/src/nix-copy-closure/nix-copy-closure.cc is executable but has no shebang, removing executable bit
*** WARNING: ./usr/src/debug/nix-2.18.1-1.fc40.x86_64/src/nix-channel/nix-channel.cc is executable but has no shebang, removing executable bit
 2023-11-02 09:24:21 +01:00
Valentin Gagarin d7b7a79f3e document store paths 
update the glossary to point to the new page.

since this is a cross-cutting concern, it warrants its own section in
the manual.

Co-authored-by: John Ericson <git@JohnEricson.me>
 2023-11-02 06:01:51 +01:00
Valentin Gagarin 4ba8b182be document store objects in terms of their constituent parts 
this also rephrases the introductory sentence to be more general, in order to
avoid the same word being repeated in short succession.
 2023-11-02 06:01:30 +01:00
John Ericson 12f9719162
Merge pull request #9250 from fricklerhandwerk/fix-anchors 
fix anchor in conf-file
 2023-11-01 21:30:22 -04:00
John Ericson d7710a40be flake: Temporarily get Nixpkgs ahead of Hydra 
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/31ed632c692e6a36cfc18083b88ece892f863ed4' (2023-09-21)
  → 'github:NixOS/nixpkgs/9eb24edd6a0027fed010ccfe300a9734d029983c' (2023-11-01)
 2023-11-01 20:09:55 -04:00
Eelco Dolstra e47984ce0b
Fix whitespace 
Co-authored-by: John Ericson <git@JohnEricson.me>
 2023-11-01 20:19:08 +01:00
John Ericson 8d66346293
Merge pull request #9271 from keszybz/if-fix 
fix: gcc complains about if which doesn't guard the indented statement
 2023-11-01 14:02:33 -04:00
Zbigniew Jędrzejewski-Szmek eab9292738 fix: gcc complains about if which doesn't guard the indented statement 2023-11-01 18:10:06 +01:00
Eelco Dolstra 2f5c1a27dc LocalStoreAccessor: Reuse PosixSourceAccessor 2023-11-01 17:22:25 +01:00
Eelco Dolstra 1a902f5fa7 Merge FSAccessor into SourceAccessor 2023-11-01 17:09:28 +01:00
Eelco Dolstra 581693bdea fmt(): Handle std::string_view 2023-11-01 16:33:22 +01:00
Eelco Dolstra 50aae0a14c FSAccessor: Make the fileSize and narOffset fields optional 
The narOffset field only applies to NAR accessors. The fileSize field
may be too expensive to compute for certain accessors (e.g. libgit).
 2023-11-01 15:39:40 +01:00
Eelco Dolstra 5381123879 Unify DirEntries types 2023-11-01 15:33:35 +01:00
Eelco Dolstra cdb27c1519 SourceAccessor: Change the main interface from lstat() to maybeLstat() 2023-11-01 15:26:07 +01:00
Eelco Dolstra 8ffd1695ce Unify FSAccessor::Type and SourceAccessor::Type 2023-11-01 14:43:20 +01:00
John Ericson 6132ffd825
Merge pull request #9266 from hercules-ci/doc-hacking-clangd-fix-tests 
doc/hacking: Fix clangd for tests
 2023-11-01 09:38:43 -04:00
John Ericson 0707db2b1c
Merge pull request #9255 from NixOS/libfetcher-docs-json 
libfetcher doc automation
 2023-11-01 09:38:02 -04:00
Eelco Dolstra b2ac6fc040 Remove FSAccessor::Type::tMissing 
Instead stat() now returns std::nullopt to denote that the file
doesn't exist.
 2023-11-01 14:36:40 +01:00
Robert Hensing bc4a1695ac doc/hacking: Fix clangd for tests 2023-11-01 11:44:16 +01:00
John Ericson 1093d6585f Make ParseSink a bit better 
I wouldn't call it *good* yet, but this will do for now.

- `RetrieveRegularNARSink` renamed to `RegularFileSink` and moved
  accordingly because it actually has nothing to do with NARs in
  particular.

  - its `fd` field is also marked private

- `copyRecursive` introduced to dump a `SourceAccessor` into a
  `ParseSink`.

- `NullParseSink` made so `ParseSink` no longer has sketchy default
  methods.

This was done while updating #8918 to work with the new
`SourceAccessor`.
 2023-11-01 02:36:43 -04:00
John Ericson e3febfcd53
Merge pull request #6258 from obsidiansystems/gcc-bug-ergonomics 
Remove bug-avoiding `StoreConfig *` casts for settings
 2023-10-31 12:48:27 -04:00
John Ericson b2cae33aef Remove bug-avoiding StoreConfig * casts for settings 
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80431 has been fixed, and
per the previous commit we now check that is the case at build time.
 2023-10-31 12:09:46 -04:00
John Ericson 1f4525531e Add configure test to ensure GCC bug is fixed 
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80431

(test is adapted from issue, test does not test for GCC-specific
behavior but rather absence of bug, so test is good with other compilers
too.)
 2023-10-31 12:09:46 -04:00
Théophane Hufschmitt 12a0ae73db
Merge pull request #8817 from iFreilicht/flake-update-lock-overhaul 
Overhaul `nix flake update` and `nix flake lock` UX
 2023-10-31 16:19:05 +01:00
Eelco Dolstra f8da50644c
Merge pull request #9256 from NixOS/dependabot/github_actions/zeebe-io/backport-action-2.0.0 
build(deps): bump zeebe-io/backport-action from 1.4.0 to 2.0.0
 2023-10-31 16:07:25 +01:00
Eelco Dolstra 0c5eac9c45 Git fetcher: Handle submodules for workdirs 2023-10-31 15:59:25 +01:00
Felix Uhl f282ef5a56 fix: segfault in positional arg completion 
Adding the inputPath as a positional feature uncovered this bug.
As positional argument forms were discarded from the `expectedArgs`
list, their closures were not. When the `.completer` closure was then
called, part of the surrounding object did not exist anymore.

This didn't cause an issue before, but with the new call to
`getEvalState()` in the "inputs" completer in nix/flake.cc, a segfault
was triggered reproducibly on invalid memory access to the `this`
pointer, which was always 0.

The solution of splicing the argument forms into a new list to extend
their lifetime is a bit of a hack, but I was unable to get the "nicer"
iterator-based solution to work.
 2023-10-31 15:33:57 +01:00
Felix Uhl c7dcdb8325 Overhaul nix flake update and lock commands 
Closes #5110
 2023-10-31 15:33:57 +01:00
Felix Uhl c762b65dc5 Fix documentation of flake command output 2023-10-31 15:33:57 +01:00
Felix Uhl 1fd0867389 Fix missing output when creating lockfile 2023-10-31 15:33:50 +01:00
Eelco Dolstra 669b074f51 Cleanup 2023-10-31 14:52:21 +01:00
Eelco Dolstra d88106df24 Git fetcher: Improve submodule handling 
Instead of making a complete copy of the repo, fetching the
submodules, and writing the result to the store (which is all
superexpensive), we now fetch the submodules recursively using the Git
fetcher, and return a union accessor that "mounts" the accessors for
the submodules on top of the root accessor.
 2023-10-31 14:52:21 +01:00
Eelco Dolstra ee36a44bf2 GitInputScheme: Use libgit2 
This replaces most calls to the "git" binary with libgit2.
 2023-10-31 14:52:21 +01:00
Eelco Dolstra 1d0e3d84b6 Provide a InputScheme::fetch() built on top of InputScheme::getAccessor() 
This is for graceful migration to lazy-trees fetchers (which are all
accessor-based). Eventually fetch() will be removed.
 2023-10-31 14:52:17 +01:00
Eelco Dolstra e1b8442fa1 Fetcher cache: Add support for caching facts not related to store paths 2023-10-31 14:51:39 +01:00
Eelco Dolstra fa6bc33604
Merge pull request #9239 from edolstra/putFile 
Input: Replace markFileChanged() by putFile()
 2023-10-31 14:49:42 +01:00
dependabot[bot] 95f3f9eac9
build(deps): bump zeebe-io/backport-action from 1.4.0 to 2.0.0 
Bumps [zeebe-io/backport-action](https://github.com/zeebe-io/backport-action) from 1.4.0 to 2.0.0.
- [Release notes](https://github.com/zeebe-io/backport-action/releases)
- [Commits](https://github.com/zeebe-io/backport-action/compare/v1.4.0...v2.0.0)

---
updated-dependencies:
- dependency-name: zeebe-io/backport-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-30 22:21:34 +00:00
Eelco Dolstra 05316d401f Cleanup 2023-10-30 17:03:06 +01:00
John Ericson 077de2968e Include fetcher input scheme info in the CLI dump 
Leverages the previous commit.
 2023-10-30 10:30:59 -04:00
John Ericson 8381eeda6f Systematize fetcher input attribute validation 
We now have `schemeName` and `allowedAttrs` functions for this purpose.
We look up the schema with the former; we restrict the set of input
attributes with the latter.
 2023-10-30 10:17:24 -04:00
Valentin Gagarin 325db01d26 fix anchor in conf-file 
I inadvertently switched it to `opt-` when refactoring, but it should
have been `conf` to begin with.
 2023-10-27 07:30:24 +02:00
John Ericson a6e587923c
Merge pull request #9247 from obsidiansystems/derivation-test-with-files 
Turn derivation unit tests into unit characterization tests
 2023-10-26 18:39:00 -04:00