From f2d22e13bec0e785c4de5eb9c6fdc369dd8f1694 Mon Sep 17 00:00:00 2001
From: Timothy DeHerrera <tim.deh@pm.me>
Date: Sun, 14 Feb 2021 19:03:51 -0700
Subject: [PATCH] ci: reformulate

---
 nix/ci.nix | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/nix/ci.nix b/nix/ci.nix
index 0fc1e7e7..58193ac4 100644
--- a/nix/ci.nix
+++ b/nix/ci.nix
@@ -2,24 +2,23 @@ let
   inherit (default.inputs.nixos.lib) recurseIntoAttrs;
 
   default = (import "${../.}/compat").defaultNix;
-
   packages = import ../default.nix;
-
-  shell = recurseIntoAttrs {
-    inherit (default.devShell)
-      i686-linux x86_64-linux aarch64-linux;
-  };
-
-  ci = recurseIntoAttrs {
-    nixos = default.nixosConfigurations.NixOS.config.system.build.ci;
-  };
 in
 {
-  inherit shell ci;
   # platforms supported by our hercules-ci agent
   inherit (packages)
+    aarch64-linux
     i686-linux
     x86_64-linux
-    aarch64-linux
     ;
+
+  devShell = recurseIntoAttrs {
+    inherit (default.devShell)
+      aarch64-linux
+      i686-linux
+      x86_64-linux
+      ;
+  };
+
+  nixos = default.nixosConfigurations.NixOS.config.system.build.ci;
 }