From a0e97fd8e75c440056c5b8f438d8f3241012247a Mon Sep 17 00:00:00 2001
From: Vincent Haupert <mail@vincent-haupert.de>
Date: Sat, 24 Apr 2021 12:32:10 +0200
Subject: [PATCH 1/2] flake.lock: Update

Flake input changes:

* Updated 'flake-utils': 'github:numtide/flake-utils/3cd06d3c1df6879c9e41cb2c33113df10566c760' -> 'github:numtide/flake-utils/eed214942bcfb3a8cc09eb3b28ca7d7221e44a94'
* Updated 'nixpkgs': 'github:NixOS/nixpkgs/7ff50a7f7b9a701228f870813fe58f01950f870b' -> 'path:/nix/store/z1rf17q0fxj935cmplzys4gg6nxj1as0-source?lastModified=1618628710&narHash=sha256-9xIoU+BrCpjs5nfWcd%2fGlU7XCVdnNKJPffoNTxgGfhs=&rev=7919518f0235106d050c77837df5e338fb94de5d'
---
 flake.lock | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/flake.lock b/flake.lock
index acbfc4a..c2e7536 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "flake-utils": {
       "locked": {
-        "lastModified": 1600209923,
-        "narHash": "sha256-zoOWauTliFEjI++esk6Jzk7QO5EKpddWXQm9yQK24iM=",
+        "lastModified": 1618868421,
+        "narHash": "sha256-vyoJhLV6cJ8/tWz+l9HZLIkb9Rd9esE7p+0RL6zDR6Y=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "3cd06d3c1df6879c9e41cb2c33113df10566c760",
+        "rev": "eed214942bcfb3a8cc09eb3b28ca7d7221e44a94",
         "type": "github"
       },
       "original": {
@@ -17,12 +17,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1599148892,
-        "narHash": "sha256-V76c6DlI0ZZffvbBpxGlpVSpXxZ14QpFHwAvEEujIsY=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "7ff50a7f7b9a701228f870813fe58f01950f870b",
-        "type": "github"
+        "lastModified": 1618628710,
+        "narHash": "sha256-9xIoU+BrCpjs5nfWcd/GlU7XCVdnNKJPffoNTxgGfhs=",
+        "path": "/nix/store/z1rf17q0fxj935cmplzys4gg6nxj1as0-source",
+        "rev": "7919518f0235106d050c77837df5e338fb94de5d",
+        "type": "path"
       },
       "original": {
         "id": "nixpkgs",

From 1ed5f6d3a910f4dcb06bc6f7ea3db8a002f0295b Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Sun, 9 May 2021 15:29:34 -0700
Subject: [PATCH 2/2] fix: flake show and flake check

remove flake-utils
---
 flake.lock | 16 ----------------
 flake.nix  | 38 +++++++++++++++++++++++++-------------
 2 files changed, 25 insertions(+), 29 deletions(-)

diff --git a/flake.lock b/flake.lock
index c2e7536..aea50c0 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,20 +1,5 @@
 {
   "nodes": {
-    "flake-utils": {
-      "locked": {
-        "lastModified": 1618868421,
-        "narHash": "sha256-vyoJhLV6cJ8/tWz+l9HZLIkb9Rd9esE7p+0RL6zDR6Y=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "eed214942bcfb3a8cc09eb3b28ca7d7221e44a94",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1618628710,
@@ -30,7 +15,6 @@
     },
     "root": {
       "inputs": {
-        "flake-utils": "flake-utils",
         "nixpkgs": "nixpkgs"
       }
     }
diff --git a/flake.nix b/flake.nix
index 08bd9a0..02221f1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,18 +1,30 @@
 {
   description = "Secret management with age";
 
-  inputs.flake-utils.url = "github:numtide/flake-utils";
+  outputs = { self, nixpkgs }:
+  let
+    agenix = system: nixpkgs.legacyPackages.${system}.callPackage ./pkgs/agenix.nix {};
+  in {
+
+    nixosModules.age = import ./modules/age.nix;
+
+    overlay = import ./overlay.nix;
+
+    packages."aarch64-linux".agenix = agenix "aarch64-linux";
+    defaultPackage."aarch64-linux" = self.packages."aarch64-linux".agenix;
+
+    packages."i686-linux".agenix = agenix "i686-linux";
+    defaultPackage."i686-linux" = self.packages."i686-linux".agenix;
+
+    packages."x86_64-darwin".agenix = agenix "x86_64-darwin";
+    defaultPackage."x86_64-darwin" = self.packages."x86_64-darwin".agenix;
+
+    packages."x86_64-linux".agenix = agenix "x86_64-linux";
+    defaultPackage."x86_64-linux" = self.packages."x86_64-linux".agenix;
+    checks."x86_64-linux".integration = import ./test/integration.nix {
+      inherit nixpkgs; pkgs = nixpkgs.legacyPackages."x86_64-linux"; system = "x86_64-linux";
+    };
+
+  };
 
-  outputs = { self, nixpkgs, flake-utils }:
-    let
-      exports = {
-        nixosModules.age = import ./modules/age.nix;
-        overlay = import ./overlay.nix;
-      };
-      outputs = flake-utils.lib.eachDefaultSystem (system: {
-        packages = nixpkgs.legacyPackages.${system}.callPackage ./default.nix { };
-        defaultPackage = self.packages.${system}.agenix;
-      });
-    in
-    exports // outputs;
 }