diff options
author | Maximilian Bosch <maximilian@mbosch.me> | 2020-04-08 20:08:29 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-08 20:08:29 +0200 |
commit | e8a4b9fe9b6e85b316d732ab90d7ec72d6551a23 (patch) | |
tree | 79ffcc47e6efbcba080f7b536900af53bc761b9e /pkgs | |
parent | b1aca4f66addad9dd03251e271fc7a447f9f4c81 (diff) | |
parent | 0f5c38feed3044845d3ab7378a6d81a1f34b93da (diff) | |
download | nixlib-e8a4b9fe9b6e85b316d732ab90d7ec72d6551a23.tar nixlib-e8a4b9fe9b6e85b316d732ab90d7ec72d6551a23.tar.gz nixlib-e8a4b9fe9b6e85b316d732ab90d7ec72d6551a23.tar.bz2 nixlib-e8a4b9fe9b6e85b316d732ab90d7ec72d6551a23.tar.lz nixlib-e8a4b9fe9b6e85b316d732ab90d7ec72d6551a23.tar.xz nixlib-e8a4b9fe9b6e85b316d732ab90d7ec72d6551a23.tar.zst nixlib-e8a4b9fe9b6e85b316d732ab90d7ec72d6551a23.zip |
Merge pull request #84501 from Ma27/bump-hydra
hydra: 2020-03-24 -> 2020-04-07
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/tools/misc/hydra/common.nix | 4 | ||||
-rw-r--r-- | pkgs/development/tools/misc/hydra/default.nix | 28 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 7 |
3 files changed, 20 insertions, 19 deletions
diff --git a/pkgs/development/tools/misc/hydra/common.nix b/pkgs/development/tools/misc/hydra/common.nix index 5aee5df847fc..52a91db67582 100644 --- a/pkgs/development/tools/misc/hydra/common.nix +++ b/pkgs/development/tools/misc/hydra/common.nix @@ -4,7 +4,7 @@ , guile, perl, postgresql, nukeReferences, git, boehmgc, nlohmann_json , docbook_xsl, openssh, gnused, coreutils, findutils, gzip, lzma, gnutar , rpm, dpkg, cdrkit, pixz, lib, boost, autoreconfHook, src ? null, version ? null -, migration ? false +, migration ? false, patches ? [] }: with stdenv; @@ -74,7 +74,7 @@ let in stdenv.mkDerivation rec { pname = "hydra"; - inherit stdenv src version; + inherit stdenv src version patches; buildInputs = [ makeWrapper autoconf automake libtool unzip nukeReferences sqlite libpqxx diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix index 35c069211b3f..9e14e16dbaaf 100644 --- a/pkgs/development/tools/misc/hydra/default.nix +++ b/pkgs/development/tools/misc/hydra/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, nixStable, nixUnstable, callPackage, nixFlakes }: +{ fetchFromGitHub, nixStable, callPackage, nixFlakes, fetchpatch }: { # Package for phase-1 of the db migration for Hydra. @@ -15,28 +15,24 @@ migration = true; }; - # Hydra from latest master (or flakes) branch. Contains breaking changes, + # 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-03-24"; + version = "2020-04-07"; src = fetchFromGitHub { owner = "NixOS"; repo = "hydra"; - rev = "12cc46cdb36321acd4c982429a86eb0f8f3cc969"; - sha256 = "10ipxzdxr47c8w5jg69mbax2ykc7lb5fs9bbdd3iai9wzyfz17ln"; - }; - nix = nixUnstable; - }; - - hydra-flakes = callPackage ./common.nix { - version = "2020-03-27"; - src = fetchFromGitHub { - owner = "NixOS"; - repo = "hydra"; - rev = "a7540b141d085a7e78c21fda8e8c05907c659b34"; - sha256 = "08fs7593w5zs8vh4c66gvrxk6s840pp6hj8nwf51wsa27kg5a943"; + rev = "4cabb37ebdeade1435ad8ebf1913cdd603b9c452"; + sha256 = "1ccy639x6yyrqqqqli7vlqm6pcvcq5dx1w3ckba77rl8pd5h31f7"; }; + patches = [ + # https://github.com/NixOS/hydra/pull/732 + (fetchpatch { + url = "https://github.com/NixOS/hydra/commit/2f9d422172235297759f2b224fe0636cad07b6fb.patch"; + sha256 = "0152nsqqc5d85qdygmwrsk88i9y6nk1b639fj2n042pjvr0kpz6k"; + }) + ]; nix = nixFlakes; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fcee1bb6ebe8..26a1b1015d92 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12097,7 +12097,12 @@ in hwloc = callPackage ../development/libraries/hwloc {}; inherit (callPackage ../development/tools/misc/hydra { }) - hydra-migration hydra-unstable hydra-flakes; + hydra-migration hydra-unstable; + + hydra-flakes = throw '' + Flakes support has been merged into Hydra's master. Please use + `pkgs.hydra-unstable` now. + ''; hydra-cli = callPackage ../development/tools/misc/hydra-cli { }; |