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/nixops
base: 1ce9aff239d3
Choose a base ref
...
head repository: NixOS/nixops
compare: af1a6a575cf8
Choose a head ref
  • 5 commits
  • 3 files changed
  • 2 contributors

Commits on Dec 9, 2016

  1. Configuration menu
    Copy the full SHA
    8ce1ccc View commit details
    Browse the repository at this point in the history

Commits on Jan 2, 2017

  1. Merge pull request #564 from grahamc/fix-certs

    This bundles ca-certs with hetzner-bootstrap.nix, so it should fix #356
    where @manveru reported that binary cache substititions didn't work
    because of certificate errors.
    
    Although the change is quite trivial I usually try to test things on a
    real machine before actually merging it, but I currently don't have a
    free Hetzner machine available for testing.
    
    I'm merging this based on @grahamc's assertion "This patch has worked on
    provisioning several boxes" and testing this by building and manually
    verifying the bootstrap installer and also running the "hetzner" VM test
    on x86_64-linux.
    
    So I think the worst thing that could happen is that #356 isn't fixed
    after all.
    
    Fixes: #356
    aszlig committed Jan 2, 2017
    Configuration menu
    Copy the full SHA
    b09e618 View commit details
    Browse the repository at this point in the history
  2. tests/hetzner: Make getting GPG key ID more robust

    GnuPG has a --with-colons flag, so we don't need to use a complicated
    sed expression to extract the key ID.
    
    Signed-off-by: aszlig <aszlig@redmoonstudios.org>
    aszlig committed Jan 2, 2017
    Configuration menu
    Copy the full SHA
    9c3aecb View commit details
    Browse the repository at this point in the history
  3. tests/hetzner/repos: Pin GnuPG version to v2.0

    I ran into this while trying to run tests prior to merging #564 (merge
    commit b09e618).
    
    The default GnuPG version in <nixpkgs> is 2.1, but the Debian version
    used while building the Debian repository is GnuPG version 2.0, so we
    need to make sure both versions match at least in major and minor.
    
    The test for the Hetzner backend now still fails, but at least it
    doesn't fail anymore because one of its dependencies are failing.
    
    Signed-off-by: aszlig <aszlig@redmoonstudios.org>
    aszlig committed Jan 2, 2017
    Configuration menu
    Copy the full SHA
    a29d334 View commit details
    Browse the repository at this point in the history
  4. tests/hetzner: Fix up coordinator dependencies

    As we don't have networking access within tests, we also need to add
    pkgs.lib{xml2,xslt}.dev or pkgs.lib{xml2,xslt} as fallback.
    
    I'm using .dev here, because it references all of the other outputs of
    the corresponding library as well so we don't need to list all the
    possible outputs.
    
    Unfortunately, I'm not quite sure what has led to this requirement,
    because I don't want to bisect a whole lot of changes since NixOS
    release 16.03 just to find out the origin of this.
    
    Adding these dependencies now causes the test to succeed with NixOS
    unstable and release-16.09.
    
    Signed-off-by: aszlig <aszlig@redmoonstudios.org>
    aszlig committed Jan 2, 2017
    Configuration menu
    Copy the full SHA
    af1a6a5 View commit details
    Browse the repository at this point in the history