From 897519bb7135800033c05b437f5bb0ade0aa6e8f Mon Sep 17 00:00:00 2001
From: solomon <ssbothwell@gmail.com>
Date: Mon, 5 Feb 2024 19:23:30 -0800
Subject: [PATCH] Remove overlay.nix

---
 flake.nix   | 27 ++++++++++++++++++++-------
 overlay.nix | 19 -------------------
 2 files changed, 20 insertions(+), 26 deletions(-)
 delete mode 100644 overlay.nix

diff --git a/flake.nix b/flake.nix
index ed668d6..5433b16 100644
--- a/flake.nix
+++ b/flake.nix
@@ -10,13 +10,28 @@
     let
       ghcVersion = "963";
       compiler = "ghc${ghcVersion}";
-      overlay = import ./overlay.nix compiler;
-      overlays = [ overlay ];
     in
     flake-utils.lib.eachDefaultSystem
       (system:
         let
-          pkgs = import nixpkgs { inherit system overlays; };
+          pkgs = import nixpkgs { inherit system; };
+          hsPkgs = pkgs.haskell.packages.${compiler}.override (old: {
+            overrides = pkgs.lib.composeExtensions (old.overrides or (_: _: { }))
+              (hfinal: hprev: {
+                kindly-functors = hfinal.callCabal2nix "kindly-functors" (pkgs.fetchFromGitHub {
+                  owner = "solomon-b";
+                  repo = "kindly-functors";
+                  rev = "26fdb99ef92124241e38e6f4511961ad2f9fb920";
+                  sha256 = "sha256-nZHERb1QA3XtRZWEcIoq8P4atOBioE7cRrJqrjkw9m0=";
+                }) {};
+                monoidal-functors = (hfinal.callCabal2nix "monoidal-functors" ./. { }).overrideScope (hfinal': hprev': {
+                  bifunctors = hfinal.bifunctors_5_6_1;
+                  semigroupoids = hfinal.semigroupoids_6_0_0_1.overrideScope (hfinal': hprev': {
+                    bifunctors = hfinal.bifunctors_5_6_1;
+                  });
+                });
+              });
+          });
         in
         rec {
           devShell = pkgs.mkShell {
@@ -31,11 +46,9 @@
 
           formatter = pkgs.nixpkgs-fmt;
           packages = flake-utils.lib.flattenTree {
-            monoidal-functors = pkgs.haskellPackages.monoidal-functors;
+            monoidal-functors = hsPkgs.monoidal-functors;
           };
 
           defaultPackage = packages.monoidal-functors;
-        }) // {
-      overlays.default = overlay;
-    };
+        });
 }
diff --git a/overlay.nix b/overlay.nix
deleted file mode 100644
index aa9fce9..0000000
--- a/overlay.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-compiler: final: prev: {
-  haskellPackages = prev.haskell.packages.${compiler}.override (old: {
-    overrides = prev.lib.composeExtensions (old.overrides or (_: _: { }))
-      (hfinal: hprev: {
-        kindly-functors = hfinal.callCabal2nix "kindly-functors" (final.fetchFromGitHub {
-          owner = "solomon-b";
-          repo = "kindly-functors";
-          rev = "26fdb99ef92124241e38e6f4511961ad2f9fb920";
-          sha256 = "sha256-nZHERb1QA3XtRZWEcIoq8P4atOBioE7cRrJqrjkw9m0=";
-        }) {};
-        monoidal-functors = (hfinal.callCabal2nix "monoidal-functors" ./. { }).overrideScope (hfinal': hprev': {
-          bifunctors = hfinal.bifunctors_5_6_1;
-          semigroupoids = hfinal.semigroupoids_6_0_0_1.overrideScope (hfinal': hprev': {
-            bifunctors = hfinal.bifunctors_5_6_1;
-          });
-        });
-      });
-  });
-}