diff options
| author | Vladimír Čunát <v@cunat.cz> | 2020-04-18 07:42:26 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2020-04-18 07:42:26 +0200 |
| commit | d96487b9cadb27aba64cb05c2e4962fb3c9e1890 (patch) | |
| tree | 901e2d0a53fd23b7579ca3dddfbd8b533c46d39c /pkgs/development/tools/misc | |
| parent | 312e9037f49bf0b163d071dc68fe76c2b5d77319 (diff) | |
| parent | eb4acb6ca9c4482e7a65d4b1aaf4ec7c48ea6641 (diff) | |
| download | nixlib-d96487b9cadb27aba64cb05c2e4962fb3c9e1890.tar nixlib-d96487b9cadb27aba64cb05c2e4962fb3c9e1890.tar.gz nixlib-d96487b9cadb27aba64cb05c2e4962fb3c9e1890.tar.bz2 nixlib-d96487b9cadb27aba64cb05c2e4962fb3c9e1890.tar.lz nixlib-d96487b9cadb27aba64cb05c2e4962fb3c9e1890.tar.xz nixlib-d96487b9cadb27aba64cb05c2e4962fb3c9e1890.tar.zst nixlib-d96487b9cadb27aba64cb05c2e4962fb3c9e1890.zip | |
Merge branch 'master' into staging-next
Hydra nixpkgs: ?compare=1582510
Diffstat (limited to 'pkgs/development/tools/misc')
| -rw-r--r-- | pkgs/development/tools/misc/hydra/common.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/tools/misc/hydra/default.nix | 24 |
2 files changed, 15 insertions, 12 deletions
diff --git a/pkgs/development/tools/misc/hydra/common.nix b/pkgs/development/tools/misc/hydra/common.nix index 52a91db67582..75a9689267a1 100644 --- a/pkgs/development/tools/misc/hydra/common.nix +++ b/pkgs/development/tools/misc/hydra/common.nix @@ -5,6 +5,7 @@ , docbook_xsl, openssh, gnused, coreutils, findutils, gzip, lzma, gnutar , rpm, dpkg, cdrkit, pixz, lib, boost, autoreconfHook, src ? null, version ? null , migration ? false, patches ? [] +, tests ? {} }: with stdenv; @@ -124,7 +125,7 @@ in stdenv.mkDerivation rec { dontStrip = true; - passthru = { inherit perlDeps migration; }; + passthru = { inherit perlDeps migration tests; }; meta = with stdenv.lib; { description = "Nix-based continuous build system"; diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix index 9e14e16dbaaf..f9a50dd0ea0e 100644 --- a/pkgs/development/tools/misc/hydra/default.nix +++ b/pkgs/development/tools/misc/hydra/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, nixStable, callPackage, nixFlakes, fetchpatch }: +{ fetchFromGitHub, nixStable, callPackage, nixFlakes, fetchpatch, nixosTests }: { # Package for phase-1 of the db migration for Hydra. @@ -13,26 +13,28 @@ }; 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-04-07"; + version = "2020-04-16"; src = fetchFromGitHub { owner = "NixOS"; repo = "hydra"; - rev = "4cabb37ebdeade1435ad8ebf1913cdd603b9c452"; - sha256 = "1ccy639x6yyrqqqqli7vlqm6pcvcq5dx1w3ckba77rl8pd5h31f7"; + rev = "87837f1d82904bf48e11b5641258b6be2f663c3b"; + sha256 = "1vs3lyfyafsl7wbpmycv7c3n9n2rkrswp65msb6q1iskgpvr96d5"; }; - patches = [ - # https://github.com/NixOS/hydra/pull/732 - (fetchpatch { - url = "https://github.com/NixOS/hydra/commit/2f9d422172235297759f2b224fe0636cad07b6fb.patch"; - sha256 = "0152nsqqc5d85qdygmwrsk88i9y6nk1b639fj2n042pjvr0kpz6k"; - }) - ]; nix = nixFlakes; + tests = { + db-migration = nixosTests.hydra-db-migration.mig; + basic = nixosTests.hydra.hydra-unstable; + }; }; } |