diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-01-10 07:13:44 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-01-12 14:07:16 +0000 |
commit | e2698550456abba83c6dcd5d5e5a9990a0b96f8a (patch) | |
tree | 79a56f0df3fa55e470d84b4dff6059fbf487ec18 /nixpkgs/pkgs/development/tools/misc/hydra/default.nix | |
parent | 1cdc42df888dc98c347e03bd942ed9825a55bcb3 (diff) | |
parent | 84d74ae9c9cbed73274b8e4e00be14688ffc93fe (diff) | |
download | nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.tar nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.tar.gz nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.tar.bz2 nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.tar.lz nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.tar.xz nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.tar.zst nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.zip |
Merge commit '84d74ae9c9cbed73274b8e4e00be14688ffc93fe'
Diffstat (limited to 'nixpkgs/pkgs/development/tools/misc/hydra/default.nix')
-rw-r--r-- | nixpkgs/pkgs/development/tools/misc/hydra/default.nix | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/nixpkgs/pkgs/development/tools/misc/hydra/default.nix b/nixpkgs/pkgs/development/tools/misc/hydra/default.nix index fb884c8ffac5..a6b0383d54f7 100644 --- a/nixpkgs/pkgs/development/tools/misc/hydra/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/hydra/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, nixStable, callPackage, nixFlakes, fetchpatch, nixosTests }: +{ fetchFromGitHub, nixStable, callPackage, nixFlakes, nixosTests }: { # Package for phase-1 of the db migration for Hydra. @@ -24,22 +24,15 @@ # so when having an older version, `pkgs.hydra-migration` should be deployed first. hydra-unstable = callPackage ./common.nix { - version = "2020-06-01"; + version = "2020-09-02"; src = fetchFromGitHub { owner = "NixOS"; repo = "hydra"; - rev = "750e2e618ac6d3df02c57a2cf8758bc66a27c40a"; - sha256 = "1szfzf9kw5cj6yn57gfxrffbdkdf8v3xy9914924blpn5qll31g4"; + rev = "e707990e2d6afab203c7ef1d769d49c564eff151"; + sha256 = "0iilf953f6s58szzyd1hzc9b2b2yw8lhbsb8xrb08szpfz7ifwqa"; }; nix = nixFlakes; - patches = [ - (fetchpatch { - url = "https://github.com/NixOS/hydra/commit/d4822a5f4b57dff26bdbf436723a87dd62bbcf30.patch"; - sha256 = "1n6hyjz1hzvka4wi78d4wg0sg2wanrdmizqy23vmp7pmv8s3gz8w"; - }) - ]; - tests = { db-migration = nixosTests.hydra-db-migration.mig; basic = nixosTests.hydra.hydra-unstable; |