Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixops
  Commit: 8ce1ccc33bc3a9d25ff969bdc658d11187276f29
      
https://github.com/NixOS/nixops/commit/8ce1ccc33bc3a9d25ff969bdc658d11187276f29
  Author: Graham Christensen <gra...@grahamc.com>
  Date:   2016-12-08 (Thu, 08 Dec 2016)

  Changed paths:
    M nix/hetzner-bootstrap.nix

  Log Message:
  -----------
  Bundle ca-certs with hetzner bootstrap, fixes #356


  Commit: b09e618ed63142e1f4babb3d7f5aeb9d63e2b744
      
https://github.com/NixOS/nixops/commit/b09e618ed63142e1f4babb3d7f5aeb9d63e2b744
  Author: aszlig <asz...@redmoonstudios.org>
  Date:   2017-01-02 (Mon, 02 Jan 2017)

  Changed paths:
    M nix/hetzner-bootstrap.nix

  Log Message:
  -----------
  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


  Commit: 9c3aecba84208438736538f4c9fd6914bed05b90
      
https://github.com/NixOS/nixops/commit/9c3aecba84208438736538f4c9fd6914bed05b90
  Author: aszlig <asz...@redmoonstudios.org>
  Date:   2017-01-02 (Mon, 02 Jan 2017)

  Changed paths:
    M tests/hetzner-backend/repository.nix

  Log Message:
  -----------
  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 <asz...@redmoonstudios.org>


  Commit: a29d3344065ab83c151ad119f076473ebdecad0d
      
https://github.com/NixOS/nixops/commit/a29d3344065ab83c151ad119f076473ebdecad0d
  Author: aszlig <asz...@redmoonstudios.org>
  Date:   2017-01-02 (Mon, 02 Jan 2017)

  Changed paths:
    M tests/hetzner-backend/repository.nix

  Log Message:
  -----------
  tests/hetzner/repos: Pin GnuPG version to v2.0

I ran into this while trying to run tests prior to merging #564 (merge
commit b09e618ed63142e1f4babb3d7f5aeb9d63e2b744).

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 <asz...@redmoonstudios.org>


  Commit: af1a6a575cf828b942804ef99970493dfc3ac094
      
https://github.com/NixOS/nixops/commit/af1a6a575cf828b942804ef99970493dfc3ac094
  Author: aszlig <asz...@redmoonstudios.org>
  Date:   2017-01-02 (Mon, 02 Jan 2017)

  Changed paths:
    M tests/hetzner-backend/default.nix

  Log Message:
  -----------
  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 <asz...@redmoonstudios.org>


Compare: https://github.com/NixOS/nixops/compare/1ce9aff239d3...af1a6a575cf8
_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits

Reply via email to