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: 596b601dfa8e
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 4d226bad77f0
Choose a head ref
  • 2 commits
  • 9 files changed
  • 2 contributors

Commits on Mar 28, 2020

  1. hydra: 2020-02-06 -> 2020-03-{24,27} 

    Upgrades Hydra to the latest master/flake branch. To perform this
upgrade, it's needed to do a non-trivial db-migration which provides a
massive performance-improvement[1].

The basic ideas behind multi-step upgrades of services between NixOS versions
have been gathered already[2]. For further context it's recommended to
read this first.

Basically, the following steps are needed:

* Upgrade to a non-breaking version of Hydra with the db-changes
  (columns are still nullable here). If `system.stateVersion` is set to
  something older than 20.03, the package will be selected
  automatically, otherwise `pkgs.hydra-migration` needs to be used.

* Run `hydra-backfill-ids` on the server.

* Deploy either `pkgs.hydra-unstable` (for Hydra master) or
  `pkgs.hydra-flakes` (for flakes-support) to activate the optimization.

The steps are also documented in the release-notes and in the module
using `warnings`.

`pkgs.hydra` has been removed as latest Hydra doesn't compile with
`pkgs.nixStable` and to ensure a graceful migration using the newly
introduced packages.

To verify the approach, a simple vm-test has been added which verifies
the migration steps.

[1] NixOS/hydra#711
[2] #82353 (comment)
    @Ma27
    Ma27 committed Mar 28, 2020
    Copy the full SHA
    bd5324c View commit details
    Browse the repository at this point in the history

  2. Merge pull request #83600 from Ma27/hydra-two-stage-deploy 

    hydra: 2020-02-06 -> 2020-03-{24,27}
    @grahamc
    grahamc committed Mar 28, 2020
    Copy the full SHA
    4d226ba View commit details
    Browse the repository at this point in the history