aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-09-16Properly filter the stores according to their declared uriSchemesregnat
When opening a store, only try the stores whose `uriSchemes()` include the current one
2020-09-16Correctly call all the parent contructors of the storesregnat
Using virtual inheritance means that only the default constructors of the parent classes will be called, which isn't what we want
2020-09-16fixup! Make the store plugins more introspectableregnat
2020-09-16Make `nix describe-stores` functionalregnat
Using the `*Config` class hierarchy
2020-09-16Separate store configs from the implemsregnat
Rework the `Store` hierarchy so that there's now one hierarchy for the store configs and one for the implementations (where each implementation extends the corresponding config). So a class hierarchy like ``` StoreConfig-------->Store | | v v SubStoreConfig----->SubStore | | v v SubSubStoreConfig-->SubSubStore ``` (with virtual inheritance to prevent DDD). The advantage of this architecture is that we can now introspect the configuration of a store without having to instantiate the store itself
2020-09-16fixup! Separate the instantiation and initialisation of the storesregnat
2020-09-16Add a default value for the settingsregnat
The default value is initialized when creating the setting and unchanged after that
2020-09-16Complete the `toJSON` instance for `Setting<T>`regnat
Don't let it just contain the value, but also the other fields of the setting (description, aliases, etc..)
2020-09-16Separate the instantiation and initialisation of the storesregnat
Add a new `init()` method to the `Store` class that is supposed to handle all the effectful initialisation needed to set-up the store. The constructor should remain side-effect free and just initialize the c++ data structure. The goal behind that is that we can create “dummy” instances of each store to query static properties about it (the parameters it accepts for example)
2020-09-16Fix the registration of storesregnat
2020-09-16Make the store plugins more introspectableregnat
Directly register the store classes rather than a function to build an instance of them. This gives the possibility to introspect static members of the class or choose different ways of instantiating them.
2020-09-16Merge branch 'single-ca-drv-build' of https://github.com/obsidiansystems/nixEelco Dolstra
2020-09-15Rename `Derivation::pathOpt` to `Derivation::path`John Ericson
We no longer need the `*Opt` to disambiguate.
2020-09-15Get rid of confusing `std::optional<bool>` for validityJohn Ericson
2020-09-15Don't link deriver until after any delayed exception is thrownJohn Ericson
Otherwise, we will associate fixed-output derivations with outputs that they did indeed produce, but which had the wrong hash. That's no good.
2020-09-15Merge remote-tracking branch 'upstream/master' into single-ca-drv-buildJohn Ericson
2020-09-15.gitignore: inst -> outputsEelco Dolstra
2020-09-15Merge pull request #4014 from tweag/fix-queryDrvOutputMaps-for-old-daemonsEelco Dolstra
gracefully handle old daemon versions
2020-09-15gracefully handle old daemon versionsregnat
Add a fallback path in `queryPartialDerivationOutputMap` for daemons that don't support it. Also upstreams a couple methods from `SSHStore` to `RemoteStore` as this is needed to handle the fallback path.
2020-09-14Merge pull request #4012 from tweag/3989-escape-dollar-in-manifestEelco Dolstra
Escape `${` in strings when printing Nix expressions
2020-09-14Escape `${` in strings when printing Nix expressionsregnat
Otherwise the result of the printing can't be parsed back correctly by Nix (because the unescaped `${` will be parsed as the begining of an anti-quotation). Fix #3989
2020-09-14nix-daemon: Lower verbosity of restricted setting warningEelco Dolstra
Fixes #3992.
2020-09-14Merge pull request #4005 from Infinisil/fix-autoArgsEelco Dolstra
Fix auto argument passing for more auto arguments than formals
2020-09-14Merge pull request #4010 from leungbk/cclsEelco Dolstra
Add ccls files to .gitignore
2020-09-14Merge pull request #4008 from aszlig/fix-ub-in-reading-ca-mapEelco Dolstra
Fix unspecified behaviour in readStorePathCAMap
2020-09-13Add ccls files to .gitignoreBrian Leung
2020-09-13Fix unspecified behaviour in readStorePathCAMapaszlig
When deploying a Hydra instance with current Nix master, most builds would not run because of errors like this: queue monitor: error: --- Error --- hydra-queue-runner error: --- UsageError --- nix-daemon not a content address because it is not in the form '<prefix>:<rest>': /nix/store/...-somedrv The last error message is from parseContentAddress, which expects a colon-separated string, however what we got here is a store path. Looking at the worker protocol, the following message sent to the Nix daemon caused the error above: 0x1E -> wopQuerySubstitutablePathInfos 0x01 -> Number of paths 0x16 -> Length of string "/nix/store/...-somedrv" 0x00 -> Length of string "" Looking at writeStorePathCAMap, the store path is indeed the first field that's transmitted. However, readStorePathCAMap expects it to be the *second* field *on my machine*, since expression evaluation order is a classic form of unspecified behaviour[1] in C++. This has been introduced in https://github.com/NixOS/nix/pull/3689, specifically in commit 66a62b3189c8c9b0965850e6b3c9b0fda0b50fd8. [1]: https://en.wikipedia.org/wiki/Unspecified_behavior#Order_of_evaluation_of_subexpressions Signed-off-by: aszlig <aszlig@nix.build>
2020-09-12docs+test: fix remaining installer downloads without -L (#4006)Jade
Co-authored-by: lf- <lf-@users.noreply.github.com>
2020-09-11Fix auto argument passing for more auto arguments than formalsSilvan Mosberger
The change in 626200713bb3cc844a9feb6af583c9b6b42c6dbc didn't account for when the number of auto arguments is bigger than the number of formal arguments. This causes the following: $ nix-instantiate --eval -E '{ ... }@args: args.foo' --argstr foo foo nix-instantiate: src/libexpr/attr-set.hh:55: void nix::Bindings::push_back(const nix::Attr&): Assertion `size_ < capacity_' failed. Aborted (core dumped)
2020-09-11Merge pull request #3988 from Gabriel439/gabriel/preserve_ps1Domen Kožar
Add `nix-shell` support for preserving PS1
2020-09-07Merge #3982: Minor docs updatesVladimír Čunát
2020-09-04Add `nix-shell` support for preserving PS1Gabriel Gonzalez
Fixes https://github.com/NixOS/nix/issues/1268 `nix-shell` will now preserve `PS1` if the `NIX_SHELL_PRESERVE_PROMPT` environment variable is set.
2020-09-04Document `mkOutputString`John Ericson
2020-09-04Fix some of the issues raised by @edolstraJohn Ericson
- More and better comments - The easier renames
2020-09-04Apply suggestions from code review John Ericson
Thanks! Co-authored-by: Eelco Dolstra <edolstra@gmail.com>
2020-09-04Don't chmod symlink before moving outputs aroundJohn Ericson
Co-authored-by: Théophane Hufschmitt <regnat@users.noreply.github.com>
2020-09-04Update tests/content-addressed.nixJohn Ericson
Co-authored-by: Théophane Hufschmitt <regnat@users.noreply.github.com>
2020-09-03Rename derivation in floating CA testJohn Ericson
2020-09-03Beef up floating CA derivations test a bitJohn Ericson
2020-09-03Merge remote-tracking branch 'upstream/master' into single-ca-drv-buildJohn Ericson
2020-09-03Remove gc-check-reachabilityEelco Dolstra
2020-09-03addPermRoot(): Remove indirect flagEelco Dolstra
2020-09-03Remove the --indirect flagEelco Dolstra
All GC roots are now indirect.
2020-09-03createGeneration(): Always create an indirect rootEelco Dolstra
This means profiles outside of /nix/var/nix/profiles don't get garbage-collected. It also means we don't need to scan /nix/var/nix/profiles for GC roots anymore, except for compatibility with previously existing generations.
2020-09-03createGeneration(): Take a StorePathEelco Dolstra
2020-09-02EvalCache: Fix caching of stringsEelco Dolstra
This was broken in 50f13b06fb1b2f50a97323c000d1094d090f08ea. Once again it turns out that putting a bool in a std::variant is a bad idea, since pointers get silently cast to them...
2020-09-02Merge pull request #3981 from domenkozar/http-binary-cache-allow-absolute-urlsEelco Dolstra
Allow HTTP binary cache to request absolute uris
2020-09-01Allow HTTP binary cache to request absolute urisDomen Kožar
2020-09-01hacking.md: add --prefix flag to configureCole Helbling
Otherwise, the steps advertised in this document won't actually work (e.g. `make install` will fail, trying to access /usr, and `./inst/bin/nix` won't exist).
2020-09-01README: update link to Hacking sectionCole Helbling
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 06:56:15 +0000