switch to nixpkgs hydra
This commit is contained in:
parent
2fef027e61
commit
fe576c9a96
3 changed files with 2 additions and 15 deletions
|
@ -19,6 +19,7 @@
|
|||
../roles/remote-builder/aarch64-build04.nix
|
||||
|
||||
../services/hound
|
||||
../services/hydra
|
||||
../services/matterbridge.nix
|
||||
];
|
||||
|
||||
|
|
|
@ -12,7 +12,6 @@
|
|||
|
||||
inputs = {
|
||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable-small";
|
||||
nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-22.05-small";
|
||||
nixpkgs-update.url = "github:ryantm/nixpkgs-update";
|
||||
nixpkgs-update-github-releases.url = "github:ryantm/nixpkgs-update-github-releases";
|
||||
nixpkgs-update-github-releases.flake = false;
|
||||
|
@ -21,10 +20,6 @@
|
|||
sops-nix.url = "github:Mic92/sops-nix";
|
||||
sops-nix.inputs.nixpkgs.follows = "nixpkgs";
|
||||
hercules-ci-agent.url = "github:hercules-ci/hercules-ci-agent/master";
|
||||
hydra.url = "github:NixOS/hydra";
|
||||
# switch back to unstable when NixOS/nix moves to 22.11
|
||||
#hydra.inputs.nixpkgs.follows = "nixpkgs";
|
||||
hydra.inputs.nixpkgs.follows = "nixpkgs-stable";
|
||||
|
||||
flake-parts.url = "github:hercules-ci/flake-parts";
|
||||
flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs";
|
||||
|
@ -93,10 +88,6 @@
|
|||
modules =
|
||||
common
|
||||
++ [
|
||||
(import ./services/hydra {
|
||||
inherit (self.inputs) hydra;
|
||||
})
|
||||
|
||||
./build03/configuration.nix
|
||||
];
|
||||
};
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ hydra }: { lib, pkgs, config, ... }:
|
||||
{ lib, pkgs, config, ... }:
|
||||
with lib; let
|
||||
cfg = config;
|
||||
|
||||
|
@ -60,11 +60,6 @@ in {
|
|||
];
|
||||
};
|
||||
|
||||
services.hydra.package = hydra.packages.${pkgs.system}.default.overrideAttrs (old: {
|
||||
# FIXME: somehow tests are only broken when we build on our builder...
|
||||
doCheck = false;
|
||||
});
|
||||
|
||||
sops.secrets.nix-community-cachix.sopsFile = ../../roles/nix-community-cache.yaml;
|
||||
sops.secrets.id_buildfarm = {};
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue