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/nixpkgs
base: fec445d9ba55
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 15e43d59cfc5
Choose a head ref
  • 4 commits
  • 2 files changed
  • 3 contributors

Commits on Feb 3, 2019

  1. hydra: 2018-08-07 -> 2019-02-01

    @lopsided98
    lopsided98 committed Feb 3, 2019
    Copy the full SHA
    8fb7706 View commit details
    Browse the repository at this point in the history

Commits on Feb 4, 2019

  1. hydra: don't support Nix 1.x 

    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 #55146.
    @Ma27
    Ma27 committed Feb 4, 2019
    Copy the full SHA
    acfc1c1 View commit details
    Browse the repository at this point in the history

Commits on Feb 7, 2019

  1. nixos/hydra: enhance test for multiple Nix versions 

    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.
    @Ma27
    Ma27 committed Feb 7, 2019
    Copy the full SHA
    1649b48 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #55101 from lopsided98/hydra-update 

    hydra: 2018-08-07 -> 2019-02-01
    @nlewo
    nlewo committed Feb 7, 2019
    Copy the full SHA
    15e43d5 View commit details
    Browse the repository at this point in the history