From 93101b340bded560abdd6b72635c0845354933f0 Mon Sep 17 00:00:00 2001 From: DESPsyched Date: Mon, 8 Dec 2025 05:04:40 -0500 Subject: [PATCH] hydra: remove entry from all-packages The entry in `all-packages.nix` was left in while moving to `by-name` with a [reference to the docs]. This recommendation had [since changed] and this commit aligns the expression with the new recommendation. [reference to the docs]: https://github.com/NixOS/nixpkgs/pull/338097#discussion_r1735598200 [since changed]: https://github.com/NixOS/nixpkgs/commit/4664ae4470091fe7b74040ad730f8039fd737216 --- pkgs/by-name/hy/hydra/package.nix | 4 +++- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/hy/hydra/package.nix b/pkgs/by-name/hy/hydra/package.nix index 4dab94d9e0b5b..ce7fe38851f58 100644 --- a/pkgs/by-name/hy/hydra/package.nix +++ b/pkgs/by-name/hy/hydra/package.nix @@ -1,7 +1,7 @@ { stdenv, lib, - nix, + nixVersions, perlPackages, buildEnv, makeWrapper, @@ -50,6 +50,8 @@ }: let + nix = nixVersions.nix_2_32; + perlDeps = buildEnv { name = "hydra-perl-deps"; paths = diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4576fe48dc9db..a82c4e3af94e1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7414,8 +7414,6 @@ with pkgs; hunspell.withDicts (_: dicts); - hydra = callPackage ../by-name/hy/hydra/package.nix { nix = nixVersions.nix_2_32; }; - icu-versions = callPackages ../development/libraries/icu { }; inherit (icu-versions) icu60