1 files changed, 11 insertions, 20 deletions
diff --git a/nix/packages.nix b/nix/packages.nix
index 8722ad1..bc679c7 100644
--- a/nix/packages.nix
+++ b/nix/packages.nix
@@ -1,29 +1,20 @@
-{self, ...}: let
-  version = builtins.substring 0 8 self.lastModifiedDate or "dirty";
-  commonArgs = {inherit self version;};
-in {
+{self, ...}: {
   perSystem = {
+    lib,
     pkgs,
-    self',
     ...
-  }: {
+  }: let
+    pkgs' = lib.fix (final: self.overlays.default final pkgs);
+  in {
     packages = {
-      guzzle-api = pkgs.python311Packages.callPackage ./derivation.nix commonArgs;
-      guzzle-api-server = pkgs.python311Packages.callPackage ./server.nix {inherit (self'.packages) guzzle-api;};
-      default = self'.packages.guzzle-api;
+      inherit (pkgs') guzzle-api guzzle-api-server;
+      default = pkgs'.guzzle-api-server;
     };
   };
 
-  flake.overlays.default = final: prev: {
-    python = prev.python.override {
-      packageOverrides = _: prev': {
-        guzzle-api = prev'.callPackage ./derivation.nix commonArgs;
-      };
+  flake.overlays.default = final: prev:
+    with prev.python311Packages; {
+      guzzle-api = callPackage ./derivation.nix {inherit self;};
+      guzzle-api-server = callPackage ./server.nix {inherit (final) guzzle-api;};
     };
-
-    pythonPackages = final.python.pkgs;
-
-    guzzle-api = final.pythonPackages.callPackage ./derivation.nix commonArgs;
-    guzzle-api-server = final.pythonPackages.callPackage ./server.nix {};
-  };
 }