aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-09-19Merge remote-tracking branch 'origin/master' into p/flake-updateEelco Dolstra
2023-09-14Merge pull request #7661 from henrik-ch/repl-docThéophane Hufschmitt
improved help command listing.
2023-09-13Merge pull request #8959 from maralorn/print-parentThéophane Hufschmitt
Print parent activity field in json log
2023-09-12docs: make the nix develop --command example unambiguous (#8952)Emil Nikolov
2023-09-11Merge pull request #8962 from mkenigs/dead-codeJohn Ericson
Drop dead code
2023-09-10Drop dead codeMatthew Kenigsberg
localPath is unused
2023-09-09Print parent activity field in json logmaralorn
2023-09-09docs: fixed the default priority of nix-env --install (#8945)Emil Nikolov
2023-09-07fix: `nix shell` multiple commands example (#8950)thenbe
The `-c` flag belongs to `sh` not `nix shell`. As it stands, the command errors with: ``` $ nix shell nixpkgs#gnumake --command sh --command "cd src && make" sh: --command: invalid option ``` https://github.com/NixOS/nix/pull/8276 was good for readability, but it missed this since that PR used a find/replace script.
2023-09-07Merge pull request #8944 from fricklerhandwerk/fix-anchorRobert Hensing
fix invalid anchor link
2023-09-07Merge pull request #4628 from obsidiansystems/dynamic-drvsRobert Hensing
Dynamic derivations RFC 92
2023-09-07Merge pull request #8938 from obsidiansystems/better-drv-parsingJohn Ericson
Improve derivation parsing
2023-09-07Special-case error message to add extra informationJohn Ericson
The Derivation parser and old ATerm unfortunately leaves few ways to get nice errors when an old version of Nix encounters a new version of the format. The most likely scenario for this to occur is with a new client making a derivation that the old daemon it is communicating with cannot understand. The extensions we just created for dynamic derivation deps will add a version field, solving the problem going forward, but there is still the issue of what to do about old versions of Nix up to now. The solution here is to carefully catch the bad error from the daemon that is likely to indicate this problem, and add some extra context to it. There is another "Ugly backwards compatibility hack" in `remote-store.cc` that also works by transforming an error. Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
2023-09-07Allow dynamic derivation deps in `inputDrvs`John Ericson
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-07fix invalid anchor linkValentin Gagarin
2023-09-06Improve derivation parsingJohn Ericson
- 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-06Merge pull request #8933 from fricklerhandwerk/option-anchorsJohn Ericson
Add anchors to option listings
2023-09-06Merge pull request #8932 from fricklerhandwerk/formattingJohn Ericson
dedent common options listing; one sentence per line
2023-09-06Merge pull request #8927 from obsidiansystems/test-derivation-atermJohn Ericson
Test and begin documentation of the ATerm format for derivations
2023-09-06Merge pull request #8928 from cafkafk/patch-2John Ericson
Fix globals.hh typo
2023-09-06Retitle section as Robert suggestsJohn Ericson
Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
2023-09-06Merge pull request #8930 from fricklerhandwerk/output-pathRobert Hensing
disambiguate output from output path
2023-09-06add anchors to option listingsValentin Gagarin
2023-09-06dedent common options listing; one sentence per lineValentin Gagarin
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-06disambiguate output from output pathValentin Gagarin
2023-09-06Fix globals.hh typoChristina Sørensen
2023-09-05Merge pull request #8925 from ↵Robert Hensing
NixOS/dependabot/github_actions/cachix/install-nix-action-23 Bump cachix/install-nix-action from 22 to 23
2023-09-05Merge pull request #8924 from NixOS/dependabot/github_actions/actions/checkout-4Robert Hensing
Bump actions/checkout from 3 to 4
2023-09-05Test and begin documentation of the ATerm format for derivationsJohn Ericson
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-05Merge pull request #8422 from fricklerhandwerk/remove-checklistValentin Gagarin
move PR checklist to contributing guide
2023-09-05add checklist to contribution guideValentin Gagarin
2023-09-05reorder list itemsValentin Gagarin
2023-09-05remove maintainers checklist in PR templateValentin Gagarin
maintainers are not really using it, and it produces a lot of noise when opening PRs.
2023-09-05Merge pull request #7592 from fricklerhandwerk/nix-store-realiseValentin Gagarin
reword description of how realisation works
2023-09-04Bump cachix/install-nix-action from 22 to 23dependabot[bot]
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-04Bump actions/checkout from 3 to 4dependabot[bot]
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-01Merge pull request #8898 from edolstra/fix-catch-polymorphic-by-valueEelco Dolstra
Fix warning 'catching polymorphic type by value'
2023-09-01Fix warning 'catching polymorphic type by value'Eelco Dolstra
2023-09-01Merge pull request #8863 from symphorien/valid_deriver_2Eelco Dolstra
add nix-store --query --valid-derivers command
2023-09-01flake: update nixpkgs: 22.11 -> 23.05Vladimír Čunát
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-01Merge branch 'master' into valid_deriver_2Eelco Dolstra
2023-09-01Merge pull request #8869 from hercules-ci/fix-issue-8838-pathExists-isDirEelco Dolstra
Fix #8838, pathExists: isDir when ends with `/ `
2023-08-31revert some random changeValentin Gagarin
2023-08-31make description open-ended, add TODOValentin Gagarin
Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
2023-08-31don't invent terms yetValentin Gagarin
2023-08-31more meaningful taglineValentin Gagarin
2023-08-31accommodate "do nothing" branchValentin Gagarin
2023-08-31be more precise about substituting store derivationsValentin Gagarin
Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
2023-08-31mention remote buildersValentin Gagarin
Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
2023-08-31add anchor to `builder`Valentin Gagarin