diff options
author | Maximilian Bosch <maximilian@mbosch.me> | 2020-04-06 01:13:07 +0200 |
---|---|---|
committer | Maximilian Bosch <maximilian@mbosch.me> | 2020-04-07 14:11:12 +0200 |
commit | 0f5c38feed3044845d3ab7378a6d81a1f34b93da (patch) | |
tree | 5263b694b3b8dbe80fbde5195634c5897577cf5e /nixos | |
parent | e2b327cd4e84dfaa8b77a612ae22c7998f0bc084 (diff) | |
download | nixpkgs-0f5c38feed3044845d3ab7378a6d81a1f34b93da.tar nixpkgs-0f5c38feed3044845d3ab7378a6d81a1f34b93da.tar.gz nixpkgs-0f5c38feed3044845d3ab7378a6d81a1f34b93da.tar.bz2 nixpkgs-0f5c38feed3044845d3ab7378a6d81a1f34b93da.tar.lz nixpkgs-0f5c38feed3044845d3ab7378a6d81a1f34b93da.tar.xz nixpkgs-0f5c38feed3044845d3ab7378a6d81a1f34b93da.tar.zst nixpkgs-0f5c38feed3044845d3ab7378a6d81a1f34b93da.zip |
hydra: 2020-03-24 -> 2020-04-07
Also removed `pkgs.hydra-flakes` since flake-support has been merged into master[1]. Because of that, `pkgs.hydra-unstable` is now compiled against `pkgs.nixFlakes` and currently requires a patch since Hydra's master doesn't compile[2] atm. [1] https://github.com/NixOS/hydra/pull/730 [2] https://github.com/NixOS/hydra/pull/732
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/doc/manual/release-notes/rl-2003.xml | 8 | ||||
-rw-r--r-- | nixos/modules/services/continuous-integration/hydra/default.nix | 6 | ||||
-rw-r--r-- | nixos/tests/hydra/default.nix | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml index 64a56d9197f..fb4ab1d26e8 100644 --- a/nixos/doc/manual/release-notes/rl-2003.xml +++ b/nixos/doc/manual/release-notes/rl-2003.xml @@ -748,10 +748,10 @@ auth required pam_succeed_if.so uid >= 1000 quiet </listitem> <listitem> <para> - Deploy a newer version of Hydra to activate the DB optimizations. You can choose from - either <package>hydra-unstable</package> (latest <literal>master</literal> compiled - against <package>nixUnstable</package>) and <package>hydra-flakes</package> (latest - version with flake-support). + Deploy a newer version of Hydra to activate the DB optimizations. This can be done by + using <package>hydra-unstable</package>. This package already includes + <link xlink:href="https://github.com/nixos/rfcs/pull/49">flake-support</link> and is + therefore compiled against <package>pkgs.nixFlakes</package>. <warning> <para> If your <link linkend="opt-system.stateVersion">stateVersion</link> is set to diff --git a/nixos/modules/services/continuous-integration/hydra/default.nix b/nixos/modules/services/continuous-integration/hydra/default.nix index 0c335f14f78..52e4a3aed33 100644 --- a/nixos/modules/services/continuous-integration/hydra/default.nix +++ b/nixos/modules/services/continuous-integration/hydra/default.nix @@ -198,8 +198,8 @@ in warnings = optional (cfg.package.migration or false) '' You're currently deploying an older version of Hydra which is needed to make some required database changes[1]. As soon as this is done, it's recommended - to run `hydra-backfill-ids` and set `services.hydra.package` to either `pkgs.hydra-unstable` - or `pkgs.hydra-flakes` after that. + to run `hydra-backfill-ids` and set `services.hydra.package` to `pkgs.hydra-unstable` + after that. [1] https://github.com/NixOS/hydra/pull/711 ''; @@ -212,7 +212,7 @@ in due to an overlay. To upgrade Hydra, you need to take two steps as some bigger changes in the database schema were implemented recently[1]. You first need to deploy `pkgs.hydra-migration`, run `hydra-backfill-ids` on the server - and then deploy either `pkgs.hydra-unstable` or `pkgs.hydra-flakes`. + and then deploy `pkgs.hydra-unstable`. If you want to use `pkgs.hydra` from your overlay, please set `services.hydra.package` explicitly to `pkgs.hydra` and make sure you know what you're doing. diff --git a/nixos/tests/hydra/default.nix b/nixos/tests/hydra/default.nix index 5d94eb91bf5..2336e4033d6 100644 --- a/nixos/tests/hydra/default.nix +++ b/nixos/tests/hydra/default.nix @@ -11,7 +11,7 @@ let inherit (import ./common.nix { inherit system; }) baseConfig; hydraPkgs = { - inherit (pkgs) hydra-migration hydra-unstable hydra-flakes; + inherit (pkgs) hydra-migration hydra-unstable; }; makeHydraTest = with pkgs.lib; name: package: makeTest { |