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: 9fb24ca156df
Choose a base ref
...
head repository: NixOS/nix
compare: 93b5a59b674c
Choose a head ref
  • 10 commits
  • 22 files changed
  • 4 contributors

Commits on Feb 25, 2021

  1. distributed builds: load remote builder host key from the machines file 

    This is already used by Hydra, and is very useful when materializing
a remote builder list from service discovery. This allows the service
discovery tool to only sync one file instead of two.
    @grahamc
    grahamc committed Feb 25, 2021
    Copy the full SHA
    1130b28 View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2021

  1. mk: add support for CPPFLAGS

    @puckipedia
    puckipedia committed Feb 26, 2021
    Copy the full SHA
    bd0b0f9 View commit details
    Browse the repository at this point in the history

  2. Revert "Add support for building JARs from Java sources" 

    This reverts commit 259086d.
    @puckipedia
    puckipedia committed Feb 26, 2021
    Copy the full SHA
    2d7917f View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2021

  1. Merge pull request #4583 from puckipedia/revert-jar-support 

    Revert "Add support for building JARs from Java sources"
    @edolstra
    edolstra committed Mar 1, 2021
    Copy the full SHA
    7d578aa View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/ca/move-tests-to-their-own-direc… 

    …tory'
    @edolstra
    edolstra committed Mar 1, 2021
    Copy the full SHA
    c32a7c3 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #4582 from puckipedia/cppflags 

    mk: add support for CPPFLAGS
    @edolstra
    edolstra committed Mar 1, 2021
    Copy the full SHA
    99b9377 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #4574 from grahamc/libstore-ssh-host-key 

    libstore: support passing a builder's public SSH host key
    @edolstra
    edolstra committed Mar 1, 2021
    Copy the full SHA
    e64cf8e View commit details
    Browse the repository at this point in the history

  5. SubstitutionGoal -> PathSubstitutionGoal 

    To prepare for the upcoming DrvOutputSubstitutionGoal
    @thufschmitt
    thufschmitt committed Mar 1, 2021
    Copy the full SHA
    5d1c05b View commit details
    Browse the repository at this point in the history

  6. Allow substituting drv outputs when building

    @thufschmitt
    thufschmitt committed Mar 1, 2021
    Copy the full SHA
    df9d4f8 View commit details
    Browse the repository at this point in the history

  7. Add a test for the remote caching of CA derivations

    @thufschmitt
    thufschmitt committed Mar 1, 2021
    Copy the full SHA
    93b5a59 View commit details
    Browse the repository at this point in the history