From 0d04c61cddd652856bfb69fa1c21ac66a56c7630 Mon Sep 17 00:00:00 2001
From: shimun <shimun@shimun.net>
Date: Thu, 31 Dec 2020 17:25:18 +0100
Subject: [PATCH] fully populate flake

---
 flake.lock | 40 ++++++++++++++++++++++++++++++++++++++++
 flake.nix  | 41 ++++++++++++++++++++++++-----------------
 2 files changed, 64 insertions(+), 17 deletions(-)
 create mode 100644 flake.lock

diff --git a/flake.lock b/flake.lock
new file mode 100644
index 0000000..d6ea972
--- /dev/null
+++ b/flake.lock
@@ -0,0 +1,40 @@
+{
+  "nodes": {
+    "flake-utils": {
+      "locked": {
+        "lastModified": 1609246779,
+        "narHash": "sha256-eq6ZXE/VWo3EMC65jmIT6H/rrUc9UWOWVujkzav025k=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "08c7ad4a0844adc4a7f9f5bb3beae482e789afa4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1609187327,
+        "narHash": "sha256-6lCwWpGpZxbSYclryv4ixsxxbISe7HuLyyQnGWCC8ZQ=",
+        "path": "/nix/store/dcmj4p477fgzxz33rxss9wnmslnsahgx-source",
+        "rev": "e065200fc90175a8f6e50e76ef10a48786126e1c",
+        "type": "path"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "type": "indirect"
+      }
+    },
+    "root": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}
diff --git a/flake.nix b/flake.nix
index b34ff2d..58ba3e3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,21 +1,28 @@
 {
   description = "Brownpaper pastebin";
 
-  outputs = { self, nixpkgs }: rec {
-    nixosModules.brownpaper = import ./mod.nix;
-    legacyPackages =
-      let
-        pkg = system:
-          let
-            pkgs = import nixpkgs { inherit system; };
-            bp = pkgs.callPackage ./default.nix { inherit pkgs; src = ./.; };
-          in
-          { brownpaper = bp.client; brownpaper-server = bp.server; };
-      in
-      {
-        "x86_64-linux" = pkg "x86_64-linux";
-        "aarch64-linux" = pkg "aarch64-linux";
-        "i686-linux" = pkg "i686-linux";
-      };
-  };
+  inputs.flake-utils.url = "github:numtide/flake-utils";
+
+  outputs = { self, nixpkgs, flake-utils }:
+    (flake-utils.lib.eachSystem [ "x86_64-linux" ]
+      (system:
+        let
+          pkgs = import nixpkgs { inherit system; };
+          bp = pkgs.callPackage ./default.nix { inherit pkgs; src = ./.; };
+        in
+        rec {
+          legacyPackages =
+            { brownpaper = bp.client; brownpaper-server = bp.server; };
+          apps = builtins.mapAttrs (_n: pkg: flake-utils.lib.mkApp { drv = pkg; }) legacyPackages;
+          defaultApp = apps.brownpaper;
+          packages = flake-utils.lib.flattenTree legacyPackages;
+          devShell = with pkgs; mkShell {
+            buildInputs = [ cargo rustfmt nettle llvmPackages_10.clang llvmPackages_10.libclang pkgconfig ];
+            LIBCLANG_PATH = "${llvmPackages_10.libclang}/lib";
+          };
+        }
+      ) // rec {
+      nixosModules.brownpaper = import ./mod.nix;
+      nixosModule = nixosModules.brownpaper;
+    });
 }