public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #98973 from Ma27/bump-hydra

Browse Source 
hydra-unstable: 2020-09-02 -> 2020-10-20
This commit is contained in:
Eelco Dolstra
2020-10-22 12:01:13 +02:00
committed by GitHub
parent d82e6359bd 1308817e05
commit 05bdfd6f2f
7 changed files with 8 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/development/tools/misc/hydra/common.nix
View File

@@ -66,6 +66,7 @@ let
TextDiff
TextTable
XMLSimple
YAML
nix
nix.perl-bindings
git

29
pkgs/development/tools/misc/hydra/default.nix
View File

@@ -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;
};
};