darkkirb/nix-packages
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix hydra build
All checks were successful
Hydra hydra Hydra build #21518 of nix-packages:aarch64-linux-master-pr75:hydra
Details

Browse source
This commit is contained in:
Charlotte 🦝 Delenk 2023-04-22 08:06:10 +01:00
parent 9431fa9030
commit 9e752f66d6
Signed by: darkkirb
GPG key ID: AB2BD8DAF2E37122
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
flake.nix
View file

@ -25,7 +25,6 @@
}; };
hydra = { hydra = {
url = "github:NixOS/hydra"; url = "github:NixOS/hydra";
inputs.flake-utils.follows = "flake-utils";
}; };
}; };
@ -108,15 +107,6 @@
woodpecker-cli = pkgs.callPackage ./ci/woodpecker/cli.nix {}; woodpecker-cli = pkgs.callPackage ./ci/woodpecker/cli.nix {};
woodpecker-frontend = pkgs.callPackage ./ci/woodpecker/frontend.nix {}; woodpecker-frontend = pkgs.callPackage ./ci/woodpecker/frontend.nix {};
woodpecker-server = pkgs.callPackage ./ci/woodpecker/server.nix {}; woodpecker-server = pkgs.callPackage ./ci/woodpecker/server.nix {};
hydra = hydra.overrideAttrs (super: {
doCheck = false;
patches = (super.patches or []) ++ [
./ci/hydra/add-ca-support.patch
./ci/hydra/add-gitea-push-hook.patch
./ci/hydra/jobset-inputs-for-flakes.patch
./ci/hydra/remove-hydra-size-limit.patch
];
});
} }
// ( // (
if system == "riscv64-linux" if system == "riscv64-linux"
@ -125,7 +115,17 @@
vf2KernelPackages = pkgs.linuxPackagesFor vf2Kernel; vf2KernelPackages = pkgs.linuxPackagesFor vf2Kernel;
} }
else {} else {}
); ) // (if system == "aarch64-linux" || system == "x86_64-linux" then {
hydra = hydra.packages.${system}.hydra.overrideAttrs (super: {
doCheck = false;
patches = (super.patches or []) ++ [
./ci/hydra/add-ca-support.patch
./ci/hydra/add-gitea-push-hook.patch
./ci/hydra/jobset-inputs-for-flakes.patch
./ci/hydra/remove-hydra-size-limit.patch
];
});
} else {});
overlays = import ./overlays; overlays = import ./overlays;
modules = import ./modules; modules = import ./modules;