BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

hydra-unstable -> hydra_unstable

Browse source
This commit is contained in:
Rick van Schijndel 2022-05-10 21:52:13 +02:00
parent 292c63a5d6
commit 3a7f7c1153
7 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
maintainers/scripts/haskell/hydra-report.hs
View file

@ -1,6 +1,6 @@
#! /usr/bin/env nix-shell
#! nix-shell -p "haskellPackages.ghcWithPackages (p: [p.aeson p.req])"
#! nix-shell -p hydra-unstable
#! nix-shell -p hydra_unstable
#! nix-shell -i runhaskell
{-

4
nixos/modules/services/continuous-integration/hydra/default.nix
View file

@ -99,8 +99,8 @@ in
package = mkOption {
type = types.package;
default = pkgs.hydra-unstable;
defaultText = literalExpression "pkgs.hydra-unstable";
default = pkgs.hydra_unstable;
defaultText = literalExpression "pkgs.hydra_unstable";
description = "The Hydra package.";
};

2
nixos/tests/hydra/default.nix
View file

@ -11,7 +11,7 @@ let
inherit (import ./common.nix { inherit system; }) baseConfig;
hydraPkgs = {
inherit (pkgs) hydra-unstable;
inherit (pkgs) hydra_unstable;
};
makeHydraTest = with pkgs.lib; name: package: makeTest {

2
pkgs/development/tools/misc/hydra/unstable.nix
View file

@ -173,7 +173,7 @@ in stdenv.mkDerivation rec {
passthru = {
inherit perlDeps;
tests.basic = nixosTests.hydra.hydra-unstable;
tests.basic = nixosTests.hydra.hydra_unstable;
};
meta = with lib; {

3
pkgs/top-level/aliases.nix
View file

@ -549,7 +549,8 @@ mapAliases ({
holochain-go = throw "holochain-go was abandoned by upstream"; # Added 2022-01-01
htmlTidy = throw "'htmlTidy' has been renamed to/replaced by 'html-tidy'"; # Converted to throw 2022-02-22
ht-rust = xh; # Added 2021-02-13
hydra-flakes = throw "hydra-flakes: Flakes support has been merged into Hydra's master. Please use `hydra-unstable` now"; # Added 2020-04-06
hydra-flakes = throw "hydra-flakes: Flakes support has been merged into Hydra's master. Please use `hydra_unstable` now"; # Added 2020-04-06
hydra-unstable = hydra_unstable; # added 2022-05-10
### I ###

2
pkgs/top-level/all-packages.nix
View file

@ -17830,7 +17830,7 @@ with pkgs;
hwloc = callPackage ../development/libraries/hwloc {};
hydra-unstable = callPackage ../development/tools/misc/hydra/unstable.nix { nix = nixVersions.nix_2_6; };
hydra_unstable = callPackage ../development/tools/misc/hydra/unstable.nix { nix = nixVersions.nix_2_6; };
hydra-cli = callPackage ../development/tools/misc/hydra-cli { };

2
pkgs/top-level/release-haskell.nix
View file

@ -4,7 +4,7 @@
https://hydra.nixos.org/jobset/nixpkgs/haskell-updates.
To debug this expression you can use `hydra-eval-jobs` from
`pkgs.hydra-unstable` which prints the jobset description
`pkgs.hydra_unstable` which prints the jobset description
to `stdout`:
$ hydra-eval-jobs -I . pkgs/top-level/release-haskell.nix