axeman/pub-solar-os
1
0
Fork 0
forked from pub-solar/os
Code Issues Pull requests Packages Projects Releases Wiki Activity

ci: fix nixos config

Browse source
This commit is contained in:
Timothy DeHerrera 2021-02-02 01:34:12 -07:00
parent 4514ea7687
commit 5703b77484
No known key found for this signature in database
GPG key ID: 8985725DB5B0C122
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
hosts/default.nix
View file

@ -53,7 +53,6 @@ let
nix.registry = { nix.registry = {
master.flake = master; master.flake = master;
nixflk.flake = self;
nixpkgs.flake = nixos; nixpkgs.flake = nixos;
}; };

13
nix/ci.nix
View file

@ -5,14 +5,17 @@ let
packages = import ../default.nix; 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 {
# ci = recurseIntoAttrs nixos = default.nixosConfigurations.ci.config.system.build.toplevel;
# default.nixosConfigurations.ci.config.system.build.toplevel; };
in in
{ {
inherit shell; inherit shell ci;
# platforms supported by our hercules-ci agent # platforms supported by our hercules-ci agent
inherit (packages) inherit (packages)
i686-linux i686-linux