aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-08-07Merge branch 'drv-outputs-map-allow-missing' of ↵John Ericson
github.com:obsidiansystems/nix into templated-daemon-protocol
2020-08-07Merge remote-tracking branch 'upstream/master' into ↵John Ericson
drv-outputs-map-allow-missing
2020-08-07Specialize `std::optional<StorePath>` so this is backwards compatibleJohn Ericson
While I am cautious to break parametricity, I think it's OK in this cases---we're not about to try to do some crazy polymorphic protocol anytime soon.
2020-08-07nix build (and others): Force re-evaluation of cached errorsEelco Dolstra
Fixes #3872. This is a bit hacky. Ideally we would automatically re-evaluate the failed attribute iff we need to print the error message (so in commands like 'nix search' we wouldn't re-evaluate because we're suppressing errors).
2020-08-07Make --no-eval-cache a global settingEelco Dolstra
2020-08-06Fix bug due to non-deterministic arg eval orderCarlo Nucera
2020-08-06Use template structs instead of phantomsCarlo Nucera
2020-08-06Remove leftover commented codeCarlo Nucera
2020-08-06Merge branch 'drv-outputs-map-allow-missing-namespace' of ↵Carlo Nucera
github.com:obsidiansystems/nix into templated-daemon-protocol
2020-08-06Merge pull request #3856 from obsidiansystems/buildable-variantEelco Dolstra
Make `Buildable` a `std::variant`
2020-08-06repl.cc: Check for HAVE_BOEHMGCEelco Dolstra
Fixes #3906.
2020-08-06Merge pull request #3897 from bburdette/error-2238Eelco Dolstra
error messages for issue 2238
2020-08-05Simplify the namespaceCarlo Nucera
2020-08-05Solve template deduction problemCarlo Nucera
We had to predeclare our template functions
2020-08-05WIP: Put the worker protocol `read` and `write` in a namespace to disambigJohn Ericson
2020-08-05Proxy -> Phantom to match RustJohn Ericson
Sorry, Haskell.
2020-08-05Merge remote-tracking branch 'obsidian/drv-outputs-map-allow-missing' into ↵John Ericson
templated-daemon-protocol
2020-08-05don't crash if there's no drvPathBen Burdette
2020-08-05add derivation path to hintBen Burdette
2020-08-05error messages for issue 2238Ben Burdette
2020-08-05Merge remote-tracking branch 'upstream/master' into ↵John Ericson
drv-outputs-map-allow-missing
2020-08-05Fix --profile with multiple opaque pathsJohn Ericson
2020-08-05Merge remote-tracking branch 'upstream/master' into buildable-variantJohn Ericson
2020-08-05Update src/libexpr/primops.ccJohn Ericson
Co-authored-by: Eelco Dolstra <edolstra@gmail.com>
2020-08-05Merge branch 'master' of github.com:NixOS/nix into ↵John Ericson
derivation-primop-floating-output
2020-08-05Merge remote-tracking branch 'obsidian/misc-ca' into ↵John Ericson
derivation-primop-floating-output
2020-08-05Style fixEelco Dolstra
2020-08-05Merge branch 'misc-ca' of https://github.com/obsidiansystems/nixEelco Dolstra
2020-08-05Sed some names to perhaps avoid conflictsJohn Ericson
2020-08-05Style fixEelco Dolstra
2020-08-05Reanme `DerivationType::Regular` defintion tooJohn Ericson
This is the one non-prefixed occurence
2020-08-05Make names more consistentJohn Ericson
2020-08-05Merge remote-tracking branch 'upstream/master' into misc-caJohn Ericson
2020-08-05Merge remote-tracking branch 'upstream/master' into misc-caJohn Ericson
2020-08-05Merge pull request #3730 from obsidiansystems/better-ca-parse-errorsEelco Dolstra
Improve hash parsing and errors
2020-08-05Merge pull request #3864 from obsidiansystems/more-topo-sortEelco Dolstra
Abstract out topo sorting logic
2020-08-05TypoEelco Dolstra
2020-08-04Merge branch 'drv-outputs-map-allow-missing' into templated-daemon-protocolJohn Ericson
2020-08-04Get rid of some unneeded temporariesJohn Ericson
2020-08-04Merge branch 'drv-outputs-map-allow-missing' into templated-daemon-protocolJohn Ericson
2020-08-04Organize and format code a bitJohn Ericson
2020-08-04Merge branch 'drv-outputs-map-allow-missing' into templated-daemon-protocolJohn Ericson
2020-08-04Remove unused functionsJohn Ericson
2020-08-04Remove unneeded definitionJohn Ericson
Template instantiations will cover this case fine.
2020-08-04WIP systematize more of the worker protocolJohn Ericson
This refactor should *not* change the wire protocol.
2020-08-04Merge remote-tracking branch 'upstream/master' into ↵John Ericson
drv-outputs-map-allow-missing
2020-08-04Merge remote-tracking branch 'upstream/master' into better-ca-parse-errorsJohn Ericson
2020-08-04Merge pull request #3894 from obsidiansystems/json-test-order-agnosticEelco Dolstra
Make JSON equality tests agnostic to ordering
2020-08-04Make JSON equality tests agnostic to orderingJohn Ericson
It is in fact more sorted than before, but I don't think we want to guarantee anything about the ordering.
2020-08-04S3BinaryCacheStore: Fix size determinationEelco Dolstra