aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-06-04Use `readString` rather than `>> temporary`John Ericson
Fixed the rest of these before, but this one slipped through.
2020-06-04Merge branch 'master' of github.com:NixOS/nix into ↵John Ericson
validPathInfo-ca-proper-datatype
2020-06-04Flip booleanJohn Ericson
Thanks Matt!
2020-06-04Use some `std::optional::has_value` for clarityJohn Ericson
2020-06-04Make sure info.ca tag bit is set in `nix add-to-store`John Ericson
2020-06-04Make 'nix dev-shell' a deprecated alias for 'nix develop'Eelco Dolstra
2020-06-04Rename 'nix dev-shell' to 'nix develop'Eelco Dolstra
Fixes #3648.
2020-06-03No C++ designated initializers yet with Clang 7John Ericson
2020-06-03Missing `#include <cassert>` in `lru-cache.hh` (#3654)John Ericson
This was a latent bug that just appeared because of the tests that were added. Remember to wait for CI! :)
2020-06-03Merge remote-tracking branch 'obsidian/no-hash-type-unknown' into ↵John Ericson
validPathInfo-ca-proper-datatype
2020-06-02Merge remote-tracking branch 'obsidian/missing-include-0' into ↵John Ericson
validPathInfo-ca-proper-datatype
2020-06-02Missing `#include <cassert>` in `lru-cache.hh`John Ericson
This was a latent bug that just appeared because of the tests that were added. Remember to wait for CI! :)
2020-06-02`outputHashAlgo` can be blank so parse accordinglyJohn Ericson
It is blank for SRI hashes.
2020-06-02Fix hashesJohn Ericson
2020-06-02TypoCarlo Nucera
2020-06-02Validate text version instead, throw ErrorsCarlo Nucera
2020-06-02Add assertions for SHA256 in fixed caseCarlo Nucera
2020-06-02Move file-hash to content-addressCarlo Nucera
2020-06-02WIP Completed implementationCarlo Nucera
2020-06-02Fix to-base --type handler to correctly set std::optional flagJohn Ericson
Now that we have a separate flag function, also describe why it is optional.
2020-06-02WIPCarlo Nucera
2020-06-02to-base supports parsing SRI hashes, so make type flag optionalJohn Ericson
2020-06-02Clean up `ValidPathInfo::isContentAddressed` with `std::visit`John Ericson
2020-06-02Apply suggestions from code reviewJohn Ericson
Co-authored-by: Matthew Bauer <mjbauer95@gmail.com>
2020-06-02Remove `hashingWithUnknownAlgoExits`John Ericson
A valid hash type must be provided now. The hash itself can still be invalid, but that doesn't cause an `abort()`.
2020-06-02Merge remote-tracking branch 'upstream/master' into no-hash-type-unknownJohn Ericson
2020-06-02Remove `HashType::Unknown`John Ericson
Instead, `Hash` uses `std::optional<HashType>`. In the future, we may also make `Hash` itself require a known hash type, encoraging people to use `std::optional<Hash>` instead.
2020-06-02Change parseCa(Opt) to parseContentAddress(Opt)Carlo Nucera
2020-06-02Merge remote-tracking branch 'upstream/master' into ↵John Ericson
validPathInfo-ca-proper-datatype
2020-06-02Merge pull request #3639 from obsidiansystems/do-fixme-store-removesEelco Dolstra
Remove `addToStore` variant as requested by `FIXME`
2020-06-02Merge branch 'lru-tests' of https://github.com/gilligan/nixEelco Dolstra
2020-06-02src/libutil/tests/lru-cache.cc: Check erase()Eelco Dolstra
Co-authored-by: James Lee <jbit@jbit.net>
2020-06-02Merge pull request #3642 from knl/improve-ref-validity-checking-in-fetchgitEelco Dolstra
Improve ref validity checking in fetchgit
2020-06-02WIPJohn Ericson
2020-06-01WIP more progressJohn Ericson
2020-06-01WIPCarlo Nucera
2020-06-01Create new file-hash filesCarlo Nucera
2020-06-01Merge branch 'derivation-header-include-order' of github.com:Ericson2314/nix ↵Carlo Nucera
into validPathInfo-ca-proper-datatype
2020-06-01Merge branch 'no-stringly-typed-derivation-output' of ↵Carlo Nucera
github.com:Ericson2314/nix into validPathInfo-ca-proper-datatype
2020-05-31Add tests for lru-cache.hhTobias Pflug
2020-05-30Ensure we restrict refspec interpretation while fetchingNikola Knezevic
As `git fetch` may chose to interpret refspec to it's liking, ensure that we only pass refs that begin with `refs/` as is, otherwise, prepend them with `refs/heads`. Otherwise, branches named `heads/foo` (I know it's bad, but it's allowed), would be fetched as `foo`, instead of `heads/foo`.
2020-05-30Improve ref validity checking in fetchGitNikola Knezevic
The previous regex was too strict and did not match what git was allowing. It could lead to `fetchGit` not accepting valid branch names, even though they exist in a repository (for example, branch names containing `/`, which are pretty standard, like `release/1.0` branches). The new regex defines what a branch name should **NOT** contain. It takes the definitions from `refs.c` in https://github.com/git/git and `git help check-ref-format` pages. This change also introduces a test for ref name validity checking, which compares the result from Nix with the result of `git check-ref-format --branch`.
2020-05-29Remove addToStore variant as requested by `FIXME`John Ericson
The idea is it's always more flexible to consumer a `Source` than a plain string, and it might even reduce memory consumption. I also looked at `addToStoreFromDump` with its `// FIXME: remove?`, but the worked needed for that is far more up for interpretation, so I punted for now.
2020-05-28Fixing the result of mergeCarlo Nucera
2020-05-28Merge branch 'master' of github.com:NixOS/nix into enum-classCarlo Nucera
2020-05-28Merge remote-tracking branch 'me/more-rust-ffi' into ↵John Ericson
no-stringly-typed-derivation-output
2020-05-28Merge remote-tracking branch 'upstream/master' into more-rust-ffiJohn Ericson
2020-05-28Merge pull request #3631 from andir/libutil-config-testsEelco Dolstra
Add unit tests for config.cc
2020-05-28Merge pull request #3455 from Ericson2314/enum-FileIngestionMethodEelco Dolstra
Replace some `bool recursive` with a new `FileIngestionMethod` enum
2020-05-28Merge pull request #3632 from LnL7/darwin-xzEelco Dolstra
installer: don't require xz on darwin