From 5703b77484db32068f050d55d89905ee4bce79ee Mon Sep 17 00:00:00 2001 From: Timothy DeHerrera Date: Tue, 2 Feb 2021 01:34:12 -0700 Subject: [PATCH] ci: fix nixos config --- hosts/default.nix | 1 - nix/ci.nix | 13 ++++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/hosts/default.nix b/hosts/default.nix index 788c218..849af9b 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -53,7 +53,6 @@ let nix.registry = { master.flake = master; - nixflk.flake = self; nixpkgs.flake = nixos; }; diff --git a/nix/ci.nix b/nix/ci.nix index 3a6ac1e..4d2a66f 100644 --- a/nix/ci.nix +++ b/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