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: a013b8401f34
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 2bf8a722d557
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Apr 8, 2020

  1. nixos/release-combined.nix: fix tested/supportedSystems 

    This properly supports the `supportedSystems` and
`limitedSupportedSystems` arguments of `release-combined.nix`.
Previously, evaluation would fail if `x86_64-linux` was not part either
of those, since the tested job always referenced the `x86_64-linux`
nixos tests (which won't exist in an aarch64-only eval).

Since the hydra configuration for the jobset`trunk-combined` has both
`aarch64-linux` and `x86_64-linux` as supported systems, this will make
aarch64 be part of the tested job on that jobset.
    @bennofs
    bennofs committed Apr 8, 2020
    Copy the full SHA
    bb44abe View commit details
    Browse the repository at this point in the history

  2. nixos/release-combined.nix: test hibernate only on x86_64

    @bennofs
    bennofs committed Apr 8, 2020
    Copy the full SHA
    918cb88 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #83249 from bennofs/fix-nixos-aarch64-eval-master 

    nixos/release-combined.nix: fix tested/supportedSystems (master version of #82886)
    @grahamc
    grahamc committed Apr 8, 2020
    Copy the full SHA
    2bf8a72 View commit details
    Browse the repository at this point in the history