eisfunke/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity
15018 commits 2 branches 5 tags 79 MiB
Commit graph

15018 commits

This branch
This branch
All branches
Author SHA1 Message Date
John Ericson 7ad66cb3ef Allow dynamic derivation deps in inputDrvs 
We use the same nested map representation we used for goals, again in
order to save space. We might someday want to combine with `inputDrvs`,
by doing `V = bool` instead of `V = std::set<OutputName>`, but we are
not doing that yet for sake of a smaller diff.

The ATerm format for Derivations also needs to be extended, in addition
to the in-memory format. To accomodate this, we added a new basic
versioning scheme, so old versions of Nix will get nice errors. (And
going forward, if the ATerm format changes again the errors will be even
better.)

`parsedStrings`, an internal function used as part of parsing
derivations in A-Term format, used to consume the final `]` but expect
the initial `[` to already be consumed. This made for what looked like
unbalanced brackets at callsites, which was confusing. Now it consumes
both which is hopefully less confusing.

As part of testing, we also created a unit test for the A-Term format for
regular non-experimental derivations too.

Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>

Apply suggestions from code review

Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
 2023-09-07 10:39:37 -04:00
Valentin Gagarin 829d4d3e03 fix invalid anchor link 2023-09-07 15:13:22 +02:00
John Ericson b7edc2099f Improve derivation parsing 
- Don't assert: Derivation ATerms are not necessarily produced by Nix,
  and parsers should always throw graceful errors

- Improve error message from `static void except(..)`, shows both what
  we expected and what we actually got.

The intention is that we backport it, and then hopefully a few people
might get slightly better errors if they try out new experimental drv
files (for RFC 92) with an old version of Nix.
 2023-09-06 11:44:06 -04:00
John Ericson 3a62651bd6
Merge pull request #8933 from fricklerhandwerk/option-anchors 
Add anchors to option listings
 2023-09-06 09:39:33 -04:00
John Ericson 216c66ddcf
Merge pull request #8932 from fricklerhandwerk/formatting 
dedent common options listing; one sentence per line
 2023-09-06 09:30:25 -04:00
John Ericson 754528241a
Merge pull request #8927 from obsidiansystems/test-derivation-aterm 
Test and begin documentation of the ATerm format for derivations
 2023-09-06 09:24:52 -04:00
John Ericson 83f99a380b
Merge pull request #8928 from cafkafk/patch-2 
Fix globals.hh typo
 2023-09-06 08:46:06 -04:00
John Ericson d568877eab
Retitle section as Robert suggests 
Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
 2023-09-06 08:43:16 -04:00
Robert Hensing 964d186e5d
Merge pull request #8930 from fricklerhandwerk/output-path 
disambiguate output from output path
 2023-09-06 10:26:53 +02:00
Valentin Gagarin 391f18063c add anchors to option listings 2023-09-06 09:52:56 +02:00
Valentin Gagarin 02c2679f0e dedent common options listing; one sentence per line 
this is a pure reformatting, contents were not changed

one sentence per line makes reviewing diffs and making suggestions much
more convenient. the indentation was an artifat of the DocBook
migration.
 2023-09-06 09:49:00 +02:00
Valentin Gagarin 5c23d3a90c disambiguate output from output path 2023-09-06 09:09:02 +02:00
Christina Rust 2b3a17820f
Fix globals.hh typo 2023-09-06 04:19:40 +00:00
Robert Hensing acc50e1845
Merge pull request #8925 from NixOS/dependabot/github_actions/cachix/install-nix-action-23 
Bump cachix/install-nix-action from 22 to 23
 2023-09-05 20:37:26 +02:00
Robert Hensing bf020f6ed0
Merge pull request #8924 from NixOS/dependabot/github_actions/actions/checkout-4 
Bump actions/checkout from 3 to 4
 2023-09-05 20:36:50 +02:00
John Ericson 880d9cabed Test and begin documentation of the ATerm format for derivations 
Wanted to do this before the last dynamic derivations PR when I
introduce a variation, to make sure I wasn't changing the old version by
mistake.
 2023-09-05 11:16:39 -04:00
Valentin Gagarin f878b422b0
Merge pull request #8422 from fricklerhandwerk/remove-checklist 
move PR checklist to contributing guide
 2023-09-05 15:05:18 +02:00
Valentin Gagarin 3a9c1dc8a3 add checklist to contribution guide 2023-09-05 14:08:40 +02:00
Valentin Gagarin 4f2b949ba8 reorder list items 2023-09-05 14:08:40 +02:00
Valentin Gagarin cc388fbc3a remove maintainers checklist in PR template 
maintainers are not really using it, and it produces a lot of noise when opening PRs.
 2023-09-05 14:08:40 +02:00
Valentin Gagarin f34484d18a
Merge pull request #7592 from fricklerhandwerk/nix-store-realise 
reword description of how realisation works
 2023-09-05 11:55:01 +02:00
dependabot[bot] 87508b1065
Bump cachix/install-nix-action from 22 to 23 
Bumps [cachix/install-nix-action](https://github.com/cachix/install-nix-action) from 22 to 23.
- [Release notes](https://github.com/cachix/install-nix-action/releases)
- [Commits](https://github.com/cachix/install-nix-action/compare/v22...v23)

---
updated-dependencies:
- dependency-name: cachix/install-nix-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-09-04 22:52:40 +00:00
dependabot[bot] 73f6407eea
Bump actions/checkout from 3 to 4 
Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-09-04 22:52:37 +00:00
Eelco Dolstra 4a8c9bb9aa
Merge pull request #8898 from edolstra/fix-catch-polymorphic-by-value 
Fix warning 'catching polymorphic type by value'
 2023-09-01 15:33:56 +02:00
Eelco Dolstra 5c95b32c46 Fix warning 'catching polymorphic type by value' 2023-09-01 14:49:49 +02:00
Eelco Dolstra 3420b60b39
Merge pull request #8863 from symphorien/valid_deriver_2 
add nix-store --query --valid-derivers command
 2023-09-01 14:16:06 +02:00
Vladimír Čunát 539cc5e5f0 flake: update nixpkgs: 22.11 -> 23.05 
The lowdown input can't be updated; `nix build` would fail to find it.

Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
 2023-09-01 14:07:25 +02:00
Eelco Dolstra 919781cacc
Merge branch 'master' into valid_deriver_2 2023-09-01 13:35:05 +02:00
Eelco Dolstra b88784278f
Merge pull request #8869 from hercules-ci/fix-issue-8838-pathExists-isDir 
Fix #8838, pathExists: isDir when ends with `/ `
 2023-09-01 13:15:54 +02:00
Valentin Gagarin 1ac181759d revert some random change 2023-08-31 21:27:13 +02:00
Valentin Gagarin d38a539437 make description open-ended, add TODO 
Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
 2023-08-31 21:27:11 +02:00
Valentin Gagarin 894cbe43bc don't invent terms yet 2023-08-31 21:26:46 +02:00
Valentin Gagarin b951e862d0 more meaningful tagline 2023-08-31 21:26:46 +02:00
Valentin Gagarin cf4e14d58d accommodate "do nothing" branch 2023-08-31 21:26:46 +02:00
Valentin Gagarin d460dbdd30 be more precise about substituting store derivations 
Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
 2023-08-31 21:26:46 +02:00
Valentin Gagarin 6b3320ab05 mention remote builders 
Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
 2023-08-31 21:26:44 +02:00
Valentin Gagarin 0cd8f36644 add anchor to builder 2023-08-31 21:26:15 +02:00
Valentin Gagarin d50f116421 add reference link 2023-08-31 21:25:39 +02:00
Valentin Gagarin b7e9e29605 remove abstract description 2023-08-31 21:25:39 +02:00
Valentin Gagarin a57e0e8c5c reword introductory sentence 2023-08-31 21:25:39 +02:00
Valentin Gagarin 315a11bcc9 remove superfluous word 2023-08-31 21:25:39 +02:00
Valentin Gagarin 1bc9257d7c reword description of how realisation works 2023-08-31 21:25:39 +02:00
Robert Hensing be3362e747 Fix nix-copy test 2023-08-30 19:35:02 -04:00
Robert Hensing 3384f70a3d nixpkgsLibTests: Only test our Nix 
Interface has changed upstream.
It *should* be fine to test 23.05's other Nix versions as those
*should* succeed, but that's not the case and it's obfuscating
our terrible CI setup's log.
 2023-08-30 19:34:35 -04:00
Cole Helbling 46478b44ff
docs/testing: point out the existence of GTEST_FILTER (#8883) 2023-08-29 22:13:35 +00:00
Eelco Dolstra 5b5f56a9d4
Merge pull request #8859 from edolstra/tarball-last-modified 
Tarball trees: Propagate lastModified
 2023-08-29 17:02:06 +02:00
Eelco Dolstra 56763ff918 Document that redirected tarball flakerefs can specify lastModified 2023-08-29 16:08:29 +02:00
Silvan Mosberger 151120a1ae
Document nix-prefetch-url defaults (#8878) 2023-08-28 22:14:01 +02:00
Bryan Honof 736b9cede7
Port the flags of nix-daemon to nix daemon (#8788) 
The new `nix daemon` command didn't accept the same flags that `nix-daemon` did.

* docs(daemon): clarify the daemon trust override flags
* fix: change declaration order
* docs: add examples of nix daemon usage
* Apply suggestions from code review

---------

Co-authored-by: Eelco Dolstra <edolstra@gmail.com>
Co-authored-by: John Ericson <git@JohnEricson.me>
Co-authored-by: tomberek <tomberek@users.noreply.github.com>
 2023-08-28 13:43:34 +00:00
Robert Hensing 1e08e12d81 pathExists: isDir when endswith / 
Fixes https://github.com/NixOS/nix/issues/8838
 2023-08-25 17:18:37 +02:00