From 3c65f3d84651fd1b120db0d26bc140f6275aafec Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Mon, 30 Dec 2024 19:42:51 +0000
Subject: [PATCH] flattenReferencesGraph: avoid `lib.fileset`
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

I am not sure `nix-gitignore.gitignoreSource` fares any better
with chroot stores, but so far it’s always been `lib.fileset`
that has caused issues with the installer ISO, and a blanket ban on
`lib.fileset` seems like the simplest remedy unless it turns out that
one of the other source filtering helpers causes issues.

This could probably be omitted entirely as it’s just an aid for
development convenience, anyway.

This reverts commit ba5a5fac7bb68edfb1de329ca037ebe0d4094560.
This reverts commit 9ae0f7757760d269c0f3865aed98a3dfaafd6d3d.
---
 pkgs/by-name/fl/flattenReferencesGraph/package.nix | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/fl/flattenReferencesGraph/package.nix b/pkgs/by-name/fl/flattenReferencesGraph/package.nix
index 9adb9a320e0c..c3c7edb17609 100644
--- a/pkgs/by-name/fl/flattenReferencesGraph/package.nix
+++ b/pkgs/by-name/fl/flattenReferencesGraph/package.nix
@@ -1,25 +1,19 @@
 {
   callPackage,
-  lib,
+  nix-gitignore,
   python3Packages,
 }:
 let
-  inherit (lib) fileset;
   helpers = callPackage ./helpers.nix { };
   pythonPackages = python3Packages;
+
 in
 pythonPackages.buildPythonApplication {
   version = "0.1.0";
   pname = "flatten-references-graph";
 
-  src = fileset.toSource {
-    root = ./src;
-    fileset = fileset.unions [
-      ./src/.flake8
-      ./src/flatten_references_graph
-      ./src/setup.py
-    ];
-  };
+  # Note: this uses only ./src/.gitignore
+  src = nix-gitignore.gitignoreSource [ ] ./src;
 
   propagatedBuildInputs = with pythonPackages; [
     igraph