Refactor: Move packages definition into main flake output attrset

diff --git a/flake.nix b/flake.nix
index 195cc33dac3dddd620869ba68e8e84c96d2a3354..4be7c77c6c506f3c4d2c900c63444dd6e45f3a7d 100644 (file)
--- a/flake.nix
+++ b/flake.nix
@@ -10,21 +10,20 @@
         ((import (nixpkgs + "/pkgs/top-level/release.nix")
           { }).stdenvBootstrapTools));
 
         ((import (nixpkgs + "/pkgs/top-level/release.nix")
           { }).stdenvBootstrapTools));
 

+    in {
+
+      overlay = final: prev: { git-cache = import ./. { pkgs = final; }; };
+      overlays = { git-cache = self.overlay; };
+

       packages = for-supported-systems (system: {
         inherit (nixpkgs.legacyPackages."${system}".appendOverlays
           [ self.overlay ])
           git-cache;
       });
 
       packages = for-supported-systems (system: {
         inherit (nixpkgs.legacyPackages."${system}".appendOverlays
           [ self.overlay ])
           git-cache;
       });
 

-    in {
-      inherit packages;
-
-      overlay = final: prev: { git-cache = import ./. { pkgs = final; }; };
-      overlays = { git-cache = self.overlay; };
-

       defaultApp = for-supported-systems (system: {
         type = "app";
       defaultApp = for-supported-systems (system: {
         type = "app";

-        program = "${packages."${system}".git-cache}/bin/git-cache";
+        program = "${self.packages."${system}".git-cache}/bin/git-cache";

       });
     };
 }
       });
     };
 }