Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

hydra: 2018-08-07 -> 2019-02-01 #55101

Merged
merged 3 commits into from Feb 7, 2019
Merged

hydra: 2018-08-07 -> 2019-02-01 #55101

merged 3 commits into from Feb 7, 2019

Conversation

lopsided98
Copy link
Contributor

Motivation for this change

The version of Hydra currently in nixpkgs does not build because it is incompatible with the latest version of Nix.

Things done

Updates Hydra to the latest revision.

  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@Ma27
Copy link
Member

Ma27 commented Feb 3, 2019

The change itself seems fine. I'll test it tonight against several Nix versions (and on my personal setup).

Also, I'm wondering if we want to enhance the NixOS Hydra to test whether it works with all currently supported Nix versions (I can implement that tonight as well).

The component `hydra-evaluator` requires `pool.hh` from Nix which isn't
provided by Nix 1.x and thus fails with the following error in this
case:

```
hydra-evaluator.cc:3:10: fatal error: pool.hh: No such file or directory
 #include "pool.hh"
          ^~~~~~~~~
compilation terminated.
make[3]: *** [Makefile:443: hydra_evaluator-hydra-evaluator.o] Error 1
```

As the commit is from 2016 and fairly hard to revert for Nix 1.x
support, it's easier to drop that.

This has been tested with fixed perl-bindings for Nix1 as done in NixOS#55146.
Copy link
Member

@Ma27 Ma27 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The change itself seems fine. I pushed two fixes to this branch to drop the support for Nix1 and to build the Hydra test against multiple Nix versions. Just to be sure, I'll request a review from some more folks.

Copy link
Member

@nlewo nlewo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would prefer to create two separated tests, one with Nix stable and one with Nix unstable instead of having to boot two VMs at the same time. In case of failure, it will also be easier to know which version of Nix failed.

@Ma27
Copy link
Member

Ma27 commented Feb 5, 2019

I updated the test accordingly: instead of a single test with multiple nodes and subtests, a dedicated testcase for each combination with Hydra and Nix is created.

@Ma27
Copy link
Member

Ma27 commented Feb 7, 2019

@nlewo would you mind having another look?

nixos/tests/hydra/default.nix Outdated Show resolved Hide resolved
Hydra should support multiple Nix versions (and currently contains fixes
to work with Nix 2.0 and higher).

Further Nix versions can be added to the `hydraPkgs` expression in the
test case which lists all supported Nix versions for Hydra.
@nlewo
Copy link
Member

nlewo commented Feb 7, 2019

@GrahamcOfBorg test hydra.nixStable hydra.nixUnstable

@nlewo nlewo merged commit 15e43d5 into NixOS:master Feb 7, 2019
@lopsided98 lopsided98 deleted the hydra-update branch February 15, 2019 17:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants