Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5f814bf9cc46
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ab0a10b39bc4
Choose a head ref
  • 4 commits
  • 3 files changed
  • 1 contributor

Commits on Apr 15, 2020

  1. hydra-unstable: 2020-04-07 -> 2020-04-16

    @Ma27
    Ma27 committed Apr 15, 2020
    Copy the full SHA
    6f6c08a View commit details

  2. hydra*: add passthru.tests to reference VM-tests

    @Ma27
    Ma27 committed Apr 15, 2020
    Copy the full SHA
    ef80b63 View commit details

Commits on Apr 16, 2020

  1. nixos/tests: fix inclusion of hydra test

    @Ma27
    Ma27 committed Apr 16, 2020
    Copy the full SHA
    5e124e5 View commit details

  2. Merge pull request #85341 from Ma27/bump-hydra 

    hydra: 2020-04-07 -> 2020-04-16
    @Ma27
    Ma27 authored Apr 16, 2020
    Copy the full SHA
    ab0a10b View commit details
Showing with 24 additions and 15 deletions.
  1. +9 −3 nixos/tests/hydra/db-migration.nix
  2. +2 −1 pkgs/development/tools/misc/hydra/common.nix
  3. +13 −11 pkgs/development/tools/misc/hydra/default.nix
12 changes: 9 additions & 3 deletions nixos/tests/hydra/db-migration.nix
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
{ system ? builtins.currentSystem, ... }:
{ system ? builtins.currentSystem
, pkgs ? import ../../.. { inherit system; }
, ...
}:

let inherit (import ./common.nix { inherit system; }) baseConfig; in

{ mig = import ../make-test-python.nix ({ pkgs, lib, ... }: {
with import ../../lib/testing-python.nix { inherit system pkgs; };
with pkgs.lib;

{ mig = makeTest {
name = "hydra-db-migration";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ ma27 ];
@@ -82,5 +88,5 @@ let inherit (import ./common.nix { inherit system; }) baseConfig; in
original.shutdown()
'';
});
};
}
3 changes: 2 additions & 1 deletion pkgs/development/tools/misc/hydra/common.nix
View file
Original file line number Diff line number Diff line change
@@ -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";
24 changes: 13 additions & 11 deletions pkgs/development/tools/misc/hydra/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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;
};
};
}