fix: deprecated flake output warnings

input-output-hk · Aug 8, 2022 · a0796cf · a0796cf
1 parent abda43b
commit a0796cf
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 11 deletions.
diff --git 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
@@ -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
@@ -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;