summary refs log tree commit diff
path: root/pkgs/stdenv
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2022-09-28 18:05:53 +0000
committerGitHub <noreply@github.com>2022-09-28 18:05:53 +0000
commitf18d801779602b884f219f9370bdbba692f3fd4c (patch)
tree916c938586e9d37e9e314122741b0c55076cf4ea /pkgs/stdenv
parent8aa2f637e6daa164f9a803427b4d474027a67cbf (diff)
parentd2b7f4ad5f78a0f9989cb30f1f8f595dbc0dbb27 (diff)
downloadnixpkgs-f18d801779602b884f219f9370bdbba692f3fd4c.tar
nixpkgs-f18d801779602b884f219f9370bdbba692f3fd4c.tar.gz
nixpkgs-f18d801779602b884f219f9370bdbba692f3fd4c.tar.bz2
nixpkgs-f18d801779602b884f219f9370bdbba692f3fd4c.tar.lz
nixpkgs-f18d801779602b884f219f9370bdbba692f3fd4c.tar.xz
nixpkgs-f18d801779602b884f219f9370bdbba692f3fd4c.tar.zst
nixpkgs-f18d801779602b884f219f9370bdbba692f3fd4c.zip
Merge staging-next into staging
Diffstat (limited to 'pkgs/stdenv')
-rw-r--r--pkgs/stdenv/generic/check-meta.nix4
1 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix
index 85a9c9c4d41..7b06692ac8c 100644
--- a/pkgs/stdenv/generic/check-meta.nix
+++ b/pkgs/stdenv/generic/check-meta.nix
@@ -285,6 +285,10 @@ let
     });
     timeout = int;
 
+    # Needed for Hydra to expose channel tarballs:
+    # https://github.com/NixOS/hydra/blob/53335323ae79ca1a42643f58e520b376898ce641/doc/manual/src/jobs.md#meta-fields
+    isHydraChannel = bool;
+
     # Weirder stuff that doesn't appear in the documentation?
     maxSilent = int;
     knownVulnerabilities = listOf str;