Merge remote-tracking branch 'origin/master' into flake

[?]
Nov 7, 2019, 5:42 PM
6WN4GM2H3XME7GF3JFWCWVCF5WSDYYFTKMZFDSYAGXTLKNZ7S4PAC

Dependencies

  • [2] P3M6UFMP Merge remote-tracking branch 'origin/master' into flake
  • [3] TF5HAPRD export a /prometheus endpoint
  • [4] VEXG3QPK hydra: upgrade nixpkgs to 19.09
  • [5] YQWH4POV * Simplify.
  • [6] P33UMMOO Use nixUnstable
  • [7] FJ5H26J6 Fix building against nix master
  • [8] R5V57UKM flake.nix improvements
  • [9] EQ3F427Z also add CatalystXRoleApplicator
  • [10] IE6AMEHD fix hydra build on nixpkgs master
  • [11] T4LLYESZ * Nix expression for building Hydra.
  • [12] ICYJNJWH Revert "Move build logic for the core hydra package into its own default.nix."
  • [13] QPDG4NEU release.nix: Use fetchGit to get Nixpkgs
  • [14] BGMBEXS6 Gradually increase maxHeapSize
  • [15] AVGER75N release: bump to 19.03

Change contents

  • edit in flake.nix at line 80
    [2.3212]
    [2.3212]
    NetPrometheus
  • edit in flake.nix at line 343
    [5.35][4.0:114](),[5.35][4.0:114](),[5.1793][3.0:26](),[5.1793][3.0:26]()
    , nixpkgs ? builtins.fetchGit { url = https://github.com/NixOS/nixpkgs-channels.git; ref = "nixos-19.09-small"; }
    NetPrometheus
  • resolve order conflict in flake.nix at line 343
    [2.10590]