ci: fix nixos config
This commit is contained in:
parent
4514ea7687
commit
5703b77484
@ -53,7 +53,6 @@ let
|
||||
|
||||
nix.registry = {
|
||||
master.flake = master;
|
||||
nixflk.flake = self;
|
||||
nixpkgs.flake = nixos;
|
||||
};
|
||||
|
||||
|
13
nix/ci.nix
13
nix/ci.nix
@ -5,14 +5,17 @@ let
|
||||
|
||||
packages = import ../default.nix;
|
||||
|
||||
shell = recurseIntoAttrs default.devShell.x86_64-linux;
|
||||
shell = recurseIntoAttrs {
|
||||
inherit (default.devShell)
|
||||
i686-linux x86_64-linux;
|
||||
};
|
||||
|
||||
# failing on hercules-ci, probably until nix is updated
|
||||
# ci = recurseIntoAttrs
|
||||
# default.nixosConfigurations.ci.config.system.build.toplevel;
|
||||
ci = recurseIntoAttrs {
|
||||
nixos = default.nixosConfigurations.ci.config.system.build.toplevel;
|
||||
};
|
||||
in
|
||||
{
|
||||
inherit shell;
|
||||
inherit shell ci;
|
||||
# platforms supported by our hercules-ci agent
|
||||
inherit (packages)
|
||||
i686-linux
|
||||
|
Loading…
Reference in New Issue
Block a user