From 0fcdd67bf0fcd38a61a2eda647b9b7342b558ff2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BChlbacher?= <tmuehlbacher@posteo.net>
Date: Wed, 22 May 2024 20:57:20 +0200
Subject: [PATCH] build(nix): rm nixpkgs overlay
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

it shouldn't really be our job to define an overlay. it doesn't do
anything for us, afaict, and is trivial to implement for downstream
users of the flake if they so desire.

also the overlay doesn't even overlay anything, there is no package
called `bcachefs` in nixpkgs.

Signed-off-by: Thomas Mühlbacher <tmuehlbacher@posteo.net>
---
 flake.nix | 25 ++++++-------------------
 1 file changed, 6 insertions(+), 19 deletions(-)

diff --git a/flake.nix b/flake.nix
index d903bea8..dba647fe 100644
--- a/flake.nix
+++ b/flake.nix
@@ -13,29 +13,16 @@
   };
 
   outputs =
-    {
-      self,
-      nixpkgs,
-      utils,
-      ...
-    }:
-    {
-      overlays.default = final: prev: { bcachefs = final.callPackage ./build.nix { }; };
-    }
-    // utils.lib.eachDefaultSystem (
+    { nixpkgs, utils, ... }:
+    utils.lib.eachDefaultSystem (
       system:
       let
-        pkgs = import nixpkgs {
-          inherit system;
-          overlays = [ self.overlays.default ];
-        };
+        pkgs = import nixpkgs { inherit system; };
       in
       rec {
-        packages = {
-          inherit (pkgs) bcachefs;
-          bcachefs-fuse = pkgs.bcachefs.override { fuseSupport = true; };
-          default = pkgs.bcachefs;
-        };
+        packages.default = packages.bcachefs-tools;
+        packages.bcachefs-tools = pkgs.callPackage ./build.nix { };
+        packages.bcachefs-tools-fuse = packages.bcachefs-tools.override { fuseSupport = true; };
 
         formatter = pkgs.nixfmt-rfc-style;