aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-06-22Merge remote-tracking branch 'origin/master' into substitute-other-storedirMatthew Bauer
2020-06-22Merge pull request #3649 from obsidiansystems/validPathInfo-ca-proper-datatypeEelco Dolstra
ValidPathInfo: make ca field a proper datatype
2020-06-19Update worker protocol to support sending storepath mapsMatthew Bauer
We need to also send the ca to daemon in addition to the path.
2020-06-19Replace error message in getDerivationCAMatthew Bauer
2020-06-19Return map of StorePaths in copyPathsMatthew Bauer
This allows the caller to know what values were actually added to the store.
2020-06-19Merge remote-tracking branch 'upstream/master' into ↵John Ericson
validPathInfo-ca-proper-datatype
2020-06-19Merge remote-tracking branch 'origin/master' into substitute-other-storedirMatthew Bauer
2020-06-19Merge pull request #3650 from obsidiansystems/no-hash-type-unknownEelco Dolstra
Remove `HashType::htUnknown`
2020-06-19Merge remote-tracking branch 'origin/master' into substitute-other-storedirMatthew Bauer
2020-06-19Merge remote-tracking branch 'upstream/master' into ↵John Ericson
validPathInfo-ca-proper-datatype
2020-06-19Merge remote-tracking branch 'upstream/master' into no-hash-type-unknownJohn Ericson
2020-06-19Merge remote-tracking branch 'upstream/master' into no-hash-type-unknownJohn Ericson
2020-06-19tabs -> spacesJohn Ericson
2020-06-19Merge pull request #3439 from Ericson2314/no-stringly-typed-derivation-outputEelco Dolstra
Store parsed hashes in `DerivationOutput`
2020-06-19More designated initializersJohn Ericson
2020-06-19Merge remote-tracking branch 'me/no-stringly-typed-derivation-output' into ↵John Ericson
validPathInfo-ca-proper-datatype
2020-06-19Remove unneeded constructor for `DerivationOutputHash`John Ericson
2020-06-19Remove uneeded `= default` for HashJohn Ericson
2020-06-19Merge remote-tracking branch 'upstream/master' into ↵John Ericson
no-stringly-typed-derivation-output
2020-06-19Use designated initializers for `DerivationOutputHash`John Ericson
2020-06-19FileSystemHash -> DerivationOutputHashJohn Ericson
2020-06-19Merge pull request #3669 from gilligan/add-compression-testsEelco Dolstra
Add compression unit tests
2020-06-19Remove some `Base::` that crept inJohn Ericson
2020-06-18Merge branch 'validPathInfo-temp' into validPathInfo-ca-proper-datatypeJohn Ericson
2020-06-18Merge branch 'no-hash-type-unknown' into validPathInfo-tempJohn Ericson
2020-06-18Revert the `enum struct` changeJohn Ericson
Not a regular git revert as there have been many merges and things.
2020-06-18Merge branch 'enum-class' into no-hash-type-unknownJohn Ericson
2020-06-18Merge remote-tracking branch 'upstream/master' into enum-classJohn Ericson
2020-06-18Merge pull request #3709 from expipiplus1/masterEelco Dolstra
Mention number of derivations to be build/fetched in output
2020-06-18Don't provide 'getFlake' if the 'flakes' feature is not enabledEelco Dolstra
(cherry picked from commit 0a1d3c1dd311f94e9d1f56e1aa7fe1ab34314ec1)
2020-06-18Some backports from the flakes branchEelco Dolstra
2020-06-18Make constant primops lazyEelco Dolstra
(cherry picked from commit aa0e2a2e70a3519a9dcb9b1da000a13c01aa6cc1)
2020-06-18Merge pull request #3716 from SamirTalwar/follow-redirects-when-installingEelco Dolstra
Instruct the user to follow redirects when installing Nix.
2020-06-18Instruct the user to follow redirects when installing Nix.Samir Talwar
Nix installation now requires following redirects using `curl -L`. This is currently represented on the [Nix download page][] but not in the manual. This change updates the manual to reflect this. Using `curl` without the `-L` flag results in an empty body, making installation a no-op. [Nix download page]: https://nixos.org/download.html
2020-06-18Merge pull request #3715 from tweag/ca-derivations_feature_flagEelco Dolstra
Rename content-addressed-paths into ca-derivations
2020-06-18Rename content-addressed-paths into ca-derivationsregnat
See <https://github.com/NixOS/nix/pull/3710#issuecomment-645480333>
2020-06-17Merge pull request #3713 from matthewbauer/cleanup-warningsEelco Dolstra
Cleanup class StorePath warning
2020-06-17Add StorePathCAMap for querySubstitutablePathInfosMatthew Bauer
I’m not 100% sure this is wanted since it kind of makes everything have to know about ca even if they don’t really want to. But it also make things easier in dealing with looking up ca.
2020-06-17Make sure references are empty for store path replacingMatthew Bauer
also copy info2 instead of casting
2020-06-17Add assert for replaced storePathMatthew Bauer
2020-06-17Merge pull request #3712 from ↵Eelco Dolstra
obsidiansystems/make-http-successful-states-coherent Make successful states coherent
2020-06-17Merge remote-tracking branch 'origin/master' into substitute-other-storedirMatthew Bauer
2020-06-17Remove unused narInfoFile in binary-cache-storeMatthew Bauer
2020-06-17Replace struct StorePath with class StorePathMatthew Bauer
also a similar case with struct Goal
2020-06-17Include review commentsCarlo Nucera
2020-06-17Update strings from review commentMatthew Bauer
2020-06-17Merge pull request #3710 from tweag/reserve_ca_derivationsEelco Dolstra
Reserve the `__contentAddressed` derivation parameter
2020-06-17Merge pull request #3707 from p01arst0rm/outdated-function-fixEelco Dolstra
replaced uncaught_exception with uncaught_exceptions
2020-06-17Merge pull request #3711 from obsidiansystems/dedup-escape-codesEelco Dolstra
Use `ansicolor.hh` in `nix repl` rather than duplicates
2020-06-17fixup! Reserve the `__contentAddressed` derivation parameterregnat