From 74002e1e1af7767af4d492cbb85453c69ea43943 Mon Sep 17 00:00:00 2001
From: Emery Hemingway <ehmry@posteo.net>
Date: Sun, 22 Dec 2019 05:30:34 +0000
Subject: [PATCH] Apply system structure to Nix flake outputs

---
 flake.nix | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/flake.nix b/flake.nix
index 3143bd0..e9b05b7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,35 +4,32 @@
   description = "The non-repetitive alternative to YAML";
 
   inputs = {
-
     nixpkgs = {
       uri =
         "git+https://github.com/nixos/nixpkgs.git?ref=18.09-beta&rev=1d4de0d552ae9aa66a5b8dee5fb0650a4372d148";
       flake = false;
     };
-
     nixpkgsStaticLinux = {
       uri =
         "git+https://github.com/nh2/nixpkgs.git?ref=static-haskell-nix-stack-dhall-working";
       flake = false;
     };
-
   };
 
   outputs = { self, nixpkgs, nixpkgsStaticLinux }: {
-    hydraJobs = import ./release.nix {
+    hydraJobs.x86_64-linux = import ./release.nix {
       inherit nixpkgs nixpkgsStaticLinux;
       system = "x86_64-linux";
     };
-    packages = with self.hydraJobs; {
+    packages.x86_64-linux = with self.hydraJobs.x86_64-linux; {
       dhall = linux-dhall;
       dhall-bash = linux-dhall-bash;
       dhall-json = linux-dhall-json;
       dhall-lsp-server = linux-dhall-lsp-server;
       dhall-nix = linux-dhall-nix;
     };
-    defaultPackage = self.packages.dhall;
-    checks = { inherit (self.hydraJobs) coverage-dhall; };
+    defaultPackage.x86_64-linux = self.packages.x86_64-linux.dhall;
+    checks.x86_64-linux = { inherit (self.hydraJobs.x86_64-linux) coverage-dhall; };
   };
 
 }