From 89153ceb44198bba7b6fc74451a7dbf38d0193dd Mon Sep 17 00:00:00 2001
From: Emery Hemingway <ehmry@posteo.net>
Date: Mon, 20 Nov 2023 09:59:45 +0200
Subject: [PATCH] nimPackages.nim_builder: move out to pkgs/by-name

---
 .../ni}/nim_builder/nim_builder.nim                        | 0
 .../default.nix => by-name/ni/nim_builder/package.nix}     | 0
 pkgs/top-level/nim-packages.nix                            | 7 ++-----
 3 files changed, 2 insertions(+), 5 deletions(-)
 rename pkgs/{development/nim-packages => by-name/ni}/nim_builder/nim_builder.nim (100%)
 rename pkgs/{development/nim-packages/nim_builder/default.nix => by-name/ni/nim_builder/package.nix} (100%)

diff --git a/pkgs/development/nim-packages/nim_builder/nim_builder.nim b/pkgs/by-name/ni/nim_builder/nim_builder.nim
similarity index 100%
rename from pkgs/development/nim-packages/nim_builder/nim_builder.nim
rename to pkgs/by-name/ni/nim_builder/nim_builder.nim
diff --git a/pkgs/development/nim-packages/nim_builder/default.nix b/pkgs/by-name/ni/nim_builder/package.nix
similarity index 100%
rename from pkgs/development/nim-packages/nim_builder/default.nix
rename to pkgs/by-name/ni/nim_builder/package.nix
diff --git a/pkgs/top-level/nim-packages.nix b/pkgs/top-level/nim-packages.nix
index 8c1375935ea6..7fc4a5f9ff87 100644
--- a/pkgs/top-level/nim-packages.nix
+++ b/pkgs/top-level/nim-packages.nix
@@ -1,14 +1,11 @@
-{ lib, pkgs, stdenv, newScope, nim, fetchFromGitHub, buildPackages }:
+{ lib, pkgs, stdenv, newScope, nim, fetchFromGitHub }:
 
 lib.makeScope newScope (self:
   let callPackage = self.callPackage;
   in {
     inherit nim;
-    nim_builder = callPackage ../development/nim-packages/nim_builder { };
     buildNimPackage =
-      callPackage ../development/nim-packages/build-nim-package {
-        inherit (buildPackages.buildPackages.nimPackages) nim_builder;
-      };
+      callPackage ../development/nim-packages/build-nim-package { };
 
     asciigraph = callPackage ../development/nim-packages/asciigraph { };