diff --git a/docs/package-sets.md b/docs/package-sets.md index 90d8e4080..e1354c584 100644 --- a/docs/package-sets.md +++ b/docs/package-sets.md @@ -24,10 +24,6 @@ Built on `nixos-unstable-small` for `aarch64-linux`, `x86_64-linux`: - [https://hydra.nix-community.org/jobset/nixpkgs/unfree-redist](https://hydra.nix-community.org/jobset/nixpkgs/unfree-redist) -Built on `nixpkgs-unstable` for `aarch64-darwin`, `x86_64-darwin`: - -- [https://hydra.nix-community.org/jobset/nixpkgs/unfree-redist-darwin](https://hydra.nix-community.org/jobset/nixpkgs/unfree-redist-darwin) - Built on `nixos-$RELEASE-small` for `aarch64-linux`, `x86_64-linux`: - [https://hydra.nix-community.org/jobset/nixpkgs/unfree-redist-stable](https://hydra.nix-community.org/jobset/nixpkgs/unfree-redist-stable) diff --git a/modules/nixos/hydra.nix b/modules/nixos/hydra.nix index 6b68af92d..65c29bc33 100644 --- a/modules/nixos/hydra.nix +++ b/modules/nixos/hydra.nix @@ -48,10 +48,9 @@ in environment.etc."nix/hydra/machines".source = pkgs.runCommand "machines" { machines = config.environment.etc."nix/machines".text; } '' - printf "$machines" > $out + printf "$machines" | grep -e bsd -e linux > $out substituteInPlace $out --replace-fail 'ssh-ng://' 'ssh://' substituteInPlace $out --replace-fail ' 80 ' ' 3 ' - substituteInPlace $out --replace-fail ' 10 ' ' 1 ' ''; services.hydra = { diff --git a/terraform/hydra-nixpkgs.tf b/terraform/hydra-nixpkgs.tf index f8701665d..1584dc393 100644 --- a/terraform/hydra-nixpkgs.tf +++ b/terraform/hydra-nixpkgs.tf @@ -76,15 +76,6 @@ locals { scheduling_shares = 5000 supported_systems = ["aarch64-linux", "x86_64-linux"] } - unfree_redist_darwin = { - name = "unfree-redist-darwin" - description = "nixpkgs-unstable darwin unfree+redistributable" - nixpkgs_channel = "https://github.com/NixOS/nixpkgs.git nixpkgs-unstable" - release_file = "pkgs/top-level/release-unfree-redistributable.nix" - check_interval = 1800 - scheduling_shares = 5000 - supported_systems = ["aarch64-darwin", "x86_64-darwin"] - } unfree_redist_full = { name = "unfree-redist-full" description = "nixos-unstable unfree+redistributable full"