Merge commit '83cbad92d73216bb0d9187c56cce0b91f9121d5a' into main

1 files changed, 3 insertions, 26 deletions

diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/hydra/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/hydra/default.nix
index a6b0383d54f7..7aa1e05a88e4 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/hydra/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/hydra/default.nix
@@ -1,40 +1,17 @@
 { fetchFromGitHub, nixStable, callPackage, nixFlakes, nixosTests }:
 
 {
-  # Package for phase-1 of the db migration for Hydra.
-  # https://github.com/NixOS/hydra/pull/711
-  hydra-migration = callPackage ./common.nix {
-    version = "2020-02-10";
-    src = fetchFromGitHub {
-      owner = "NixOS";
-      repo = "hydra";
-      rev = "add4f610ce6f206fb44702b5a894d877b3a30e3a";
-      sha256 = "1d8hdgjx2ys0zmixi2ydmimdq7ml20h1ji4amwawcyw59kssh6l3";
-    };
-    nix = nixStable;
-    migration = true;
-
-    tests = {
-      db-migration = nixosTests.hydra-db-migration.mig;
-      basic = nixosTests.hydra.hydra-migration;
-    };
-  };
-
-  # Hydra from latest master branch. Contains breaking changes,
-  # so when having an older version, `pkgs.hydra-migration` should be deployed first.
-
   hydra-unstable = callPackage ./common.nix {
-    version = "2020-09-02";
+    version = "2020-10-20";
     src = fetchFromGitHub {
       owner = "NixOS";
       repo = "hydra";
-      rev = "e707990e2d6afab203c7ef1d769d49c564eff151";
-      sha256 = "0iilf953f6s58szzyd1hzc9b2b2yw8lhbsb8xrb08szpfz7ifwqa";
+      rev = "79d34ed7c93af2daf32cf44ee0e3e0768f13f97c";
+      sha256 = "1lql899430137l6ghnhyz0ivkayy83fdr087ck2wq3gf1jv8pccj";
     };
     nix = nixFlakes;
 
     tests = {
-      db-migration = nixosTests.hydra-db-migration.mig;
       basic = nixosTests.hydra.hydra-unstable;
     };
   };