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: 57b935a8931f
Choose a base ref
...
head repository: NixOS/nix
compare: f3aba8873724
Choose a head ref
  • 19 commits
  • 8 files changed
  • 3 contributors

Commits on Aug 4, 2020

  1. WIP systematize more of the worker protocol 

    This refactor should *not* change the wire protocol.
    @Ericson2314
    Ericson2314 committed Aug 4, 2020
    Copy the full SHA
    2f2ae99 View commit details
    Browse the repository at this point in the history

  2. Remove unneeded definition 

    Template instantiations will cover this case fine.
    @Ericson2314
    Ericson2314 committed Aug 4, 2020
    Copy the full SHA
    1bab8a3 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'drv-outputs-map-allow-missing' into templated-daemon-pr… 

    …otocol
    @Ericson2314
    Ericson2314 committed Aug 4, 2020
    Copy the full SHA
    46cafb1 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'drv-outputs-map-allow-missing' into templated-daemon-pr… 

    …otocol
    @Ericson2314
    Ericson2314 committed Aug 4, 2020
    Copy the full SHA
    89bda7f View commit details
    Browse the repository at this point in the history

  5. Merge branch 'drv-outputs-map-allow-missing' into templated-daemon-pr… 

    …otocol
    @Ericson2314
    Ericson2314 committed Aug 4, 2020
    Copy the full SHA
    6d003d8 View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2020

  1. Merge remote-tracking branch 'obsidian/drv-outputs-map-allow-missing'… 

    … into templated-daemon-protocol
    @Ericson2314
    Ericson2314 committed Aug 5, 2020
    Copy the full SHA
    7302761 View commit details
    Browse the repository at this point in the history

Commits on Aug 6, 2020

  1. Merge branch 'drv-outputs-map-allow-missing-namespace' of github.com:… 

    …obsidiansystems/nix into templated-daemon-protocol
    @meditans
    meditans committed Aug 6, 2020
    Copy the full SHA
    f795f0f View commit details
    Browse the repository at this point in the history

  2. Remove leftover commented code

    @meditans
    meditans committed Aug 6, 2020
    Copy the full SHA
    3d8240c View commit details
    Browse the repository at this point in the history

  3. Use template structs instead of phantoms

    @meditans
    meditans committed Aug 6, 2020
    Copy the full SHA
    9ab07e9 View commit details
    Browse the repository at this point in the history

  4. Fix bug due to non-deterministic arg eval order

    @meditans
    meditans committed Aug 6, 2020
    Copy the full SHA
    46f9dd5 View commit details
    Browse the repository at this point in the history

Commits on Aug 7, 2020

  1. Merge branch 'drv-outputs-map-allow-missing' of github.com:obsidiansy… 

    …stems/nix into templated-daemon-protocol
    @Ericson2314
    Ericson2314 committed Aug 7, 2020
    Copy the full SHA
    8f92bb5 View commit details
    Browse the repository at this point in the history

Commits on Aug 19, 2020

  1. Merge branch 'master' of github.com:NixOS/nix into templated-daemon-p… 

    …rotocol
    @Ericson2314
    Ericson2314 committed Aug 19, 2020
    Copy the full SHA
    be0d429 View commit details
    Browse the repository at this point in the history

Commits on Aug 20, 2020

  1. Merge remote-tracking branch 'upstream/master' into templated-daemon-… 

    …protocol
    @Ericson2314
    Ericson2314 committed Aug 20, 2020
    Copy the full SHA
    c265e0e View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2020

  1. Merge remote-tracking branch 'upstream/master' into templated-daemon-… 

    …protocol
    @Ericson2314
    Ericson2314 committed Sep 22, 2020
    Copy the full SHA
    b92d3b2 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/master' into templated-daemon-… 

    …protocol
    @Ericson2314
    Ericson2314 committed Sep 22, 2020
    Copy the full SHA
    e9fc203 View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2020

  1. Revert "Use template structs instead of phantoms" 

    This reverts commit 9ab07e9.
    @Ericson2314
    Ericson2314 committed Sep 30, 2020
    Copy the full SHA
    45a0ed8 View commit details
    Browse the repository at this point in the history

  2. nix::worker_proto -> worker_proto

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

  3. Merge remote-tracking branch 'upstream/master' into templated-daemon-… 

    …protocol
    @Ericson2314
    Ericson2314 committed Sep 30, 2020
    Copy the full SHA
    69afaea View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2020

  1. Merge pull request #3895 from obsidiansystems/templated-daemon-protocol 

    More templated STL support for the daemon protocol
    @edolstra
    edolstra committed Oct 5, 2020
    Copy the full SHA
    f3aba88 View commit details
    Browse the repository at this point in the history