From a0796cf8f6aef2ac1e77926ad911a0ea12229fee Mon Sep 17 00:00:00 2001
From: John Lotoski <john.lotoski@iohk.io>
Date: Thu, 4 Aug 2022 19:58:15 -0500
Subject: [PATCH] fix: deprecated flake output warnings

---
 flake.nix              | 13 ++++---------
 lib/mk-bitte-stack.nix |  2 +-
 lib/mk-system.nix      |  2 +-
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/flake.nix b/flake.nix
index 2eeba3e0..87944433 100644
--- a/flake.nix
+++ b/flake.nix
@@ -153,13 +153,9 @@
         rec {
           inherit legacyPackages;
 
-          packages.bitte = unstablePackages.callPackage ./cli/package.nix {inherit toolchain;};
-          defaultPackage = packages.bitte;
-
-          devShell = unstablePackages.mkShell {
-            buildInputs = with unstablePackages; [
-              hello
-            ];
+          packages = rec {
+            bitte = unstablePackages.callPackage ./cli/package.nix {inherit toolchain;};
+            default = bitte;
           };
         }
         // tullia.fromSimple system {
@@ -169,10 +165,9 @@
       // {
         inherit lib;
         # eta reduce not possibe since flake check validates for "final" / "prev"
-        overlay = nixpkgs.lib.composeManyExtensions overlays;
+        overlays.default = nixpkgs.lib.composeManyExtensions overlays;
         profiles = lib.mkModules ./profiles;
         nixosModules = lib.mkModules ./modules;
-        nixosModule.imports = builtins.attrValues self.nixosModules;
         devshellModule = import ./devshellModule.nix;
       }
       // mkChecks defaultSystems [
diff --git a/lib/mk-bitte-stack.nix b/lib/mk-bitte-stack.nix
index 1fb318a1..09c43667 100644
--- a/lib/mk-bitte-stack.nix
+++ b/lib/mk-bitte-stack.nix
@@ -31,7 +31,7 @@ assert lib.asserts.assertMsg (pkgs == null) (lib.warn ''
 
   Please pass mkBitteStack { overlays } instead.
 '' "Gotta do that now. Sorry, my friend."); let
-  overlays' = overlays ++ [bitte.overlay];
+  overlays' = overlays ++ [bitte.overlays.default];
   pkgs = import nixpkgs {
     overlays = overlays';
     system = "x86_64-linux";
diff --git a/lib/mk-system.nix b/lib/mk-system.nix
index 7046a385..484ec1ef 100644
--- a/lib/mk-system.nix
+++ b/lib/mk-system.nix
@@ -20,7 +20,7 @@
         [
           ./mk-system/constants-module.nix
           ./mk-system/show-warnings-and-assertions-module.nix
-          bitte.nixosModule
+          { imports = builtins.attrValues bitte.nixosModules; }
           specializationModule
         ]
         ++ modules;