Skip to content

Revert "terraform/hydra-nixpkgs: add unfree-redist-darwin" #1934

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zowoq merged 2 commits into from
Aug 26, 2025
Merged

Revert "terraform/hydra-nixpkgs: add unfree-redist-darwin" #1934

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1ccdfde
Revert "terraform/hydra-nixpkgs: add unfree-redist-darwin"
zowoq Aug 15, 2025
bcf6c48
modules/nixos/hydra: remove darwin builder
zowoq Aug 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions docs/package-sets.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 1 addition & 2 deletions modules/nixos/hydra.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down
9 changes: 0 additions & 9 deletions terraform/hydra-nixpkgs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down