Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nix
base: 2886c92aefc3
Choose a base ref
...
head repository: NixOS/nix
compare: 424bb5819f73
Choose a head ref
  • 19 commits
  • 9 files changed
  • 6 contributors

Commits on Mar 25, 2020

  1. Extend Rust FFI 

    Do idiomatic C++ copy and move constructors for a few things, so
wrapping structs' defaults can work.
    @Ericson2314
    Ericson2314 committed Mar 25, 2020
    Copy the full SHA
    e433d4a View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2020

  1. Merge remote-tracking branch 'me/enum-FileIngestionMethod' into HEAD

    @Ericson2314
    Ericson2314 committed Mar 30, 2020
    Copy the full SHA
    f5494d9 View commit details
    Browse the repository at this point in the history

  2. Store parsed hashes in DerivationOutput 

    It's best to detect invalid data as soon as possible, with data types
that make storing it impossible.
    @Ericson2314
    Ericson2314 committed Mar 30, 2020
    Copy the full SHA
    832bd53 View commit details
    Browse the repository at this point in the history

Commits on May 26, 2020

  1. Update src/libutil/rust-ffi.hh 

    Co-authored-by: Cole Helbling <cole.e.helbling@outlook.com>
    @meditans @cole-h
    meditans and cole-h committed May 26, 2020
    Copy the full SHA
    c2f33ed View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/master' into more-rust-ffi

    @meditans
    meditans committed May 26, 2020
    Copy the full SHA
    0f3f901 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'john-ericson/enum-FileIngestionMethod' … 

    …into no-stringly-typed-derivation-output
    @meditans
    meditans committed May 26, 2020
    Copy the full SHA
    d49e65b View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'john-ericson/more-rust-ffi' into no-str… 

    …ingly-typed-derivation-output
    @meditans
    meditans committed May 26, 2020
    Copy the full SHA
    89a5ac9 View commit details
    Browse the repository at this point in the history

  5. Change syntax for CI

    @meditans
    meditans committed May 26, 2020
    Copy the full SHA
    f3f520c View commit details
    Browse the repository at this point in the history

Commits on May 28, 2020

  1. Merge remote-tracking branch 'upstream/master' into more-rust-ffi

    @Ericson2314
    Ericson2314 committed May 28, 2020
    Copy the full SHA
    ef71cab View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'me/more-rust-ffi' into no-stringly-type… 

    …d-derivation-output
    @Ericson2314
    Ericson2314 committed May 28, 2020
    Copy the full SHA
    5b4cd84 View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2020

  1. Remove file which shouldn't be committed

    @Ericson2314
    Ericson2314 committed Jun 4, 2020
    Copy the full SHA
    a7b82fd View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/master' into no-stringly-typed… 

    …-derivation-output
    @Ericson2314
    Ericson2314 committed Jun 4, 2020
    Copy the full SHA
    e5cc1eb View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2020

  1. Merge remote-tracking branch 'upstream/master' into no-stringly-typed… 

    …-derivation-output
    @Ericson2314
    Ericson2314 committed Jun 17, 2020
    Copy the full SHA
    517f598 View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2020

  1. FileSystemHash -> DerivationOutputHash

    @Ericson2314
    Ericson2314 committed Jun 19, 2020
    Copy the full SHA
    237d88c View commit details
    Browse the repository at this point in the history

  2. Use designated initializers for DerivationOutputHash

    @Ericson2314
    Ericson2314 committed Jun 19, 2020
    Copy the full SHA
    145d88c View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'upstream/master' into no-stringly-typed… 

    …-derivation-output
    @Ericson2314
    Ericson2314 committed Jun 19, 2020
    Copy the full SHA
    01dc8b0 View commit details
    Browse the repository at this point in the history

  4. Remove uneeded = default for Hash

    @Ericson2314
    Ericson2314 committed Jun 19, 2020
    Copy the full SHA
    b90cac3 View commit details
    Browse the repository at this point in the history

  5. Remove unneeded constructor for DerivationOutputHash

    @Ericson2314
    Ericson2314 committed Jun 19, 2020
    Copy the full SHA
    fb39a5e View commit details
    Browse the repository at this point in the history

  6. Merge pull request #3439 from Ericson2314/no-stringly-typed-derivatio… 

    …n-output

Store parsed hashes in `DerivationOutput`
    @edolstra
    edolstra committed Jun 19, 2020
    Copy the full SHA
    424bb58 View commit details
    Browse the repository at this point in the history