From cac19e02668e2c0e1ad2aa20db3041dbca00e739 Mon Sep 17 00:00:00 2001
From: Sandro <sandro.jaeckel@gmail.com>
Date: Sat, 6 May 2023 00:16:26 +0200
Subject: [PATCH] trivial-builders: move into the directory named alike
 (#223429)

While searching for something different I wondered why there is a
trivial-builders.nix file next to the trivial-builders directory where
only tests live. Lets fix that.
---
 .../{trivial-builders.nix => trivial-builders/default.nix}      | 0
 pkgs/development/interpreters/lua-5/wrap-lua.nix                | 2 +-
 pkgs/development/interpreters/octave/wrap-octave.nix            | 2 +-
 pkgs/top-level/stage.nix                                        | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename pkgs/build-support/{trivial-builders.nix => trivial-builders/default.nix} (100%)

diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders/default.nix
similarity index 100%
rename from pkgs/build-support/trivial-builders.nix
rename to pkgs/build-support/trivial-builders/default.nix
diff --git a/pkgs/development/interpreters/lua-5/wrap-lua.nix b/pkgs/development/interpreters/lua-5/wrap-lua.nix
index 43ececd1e794..b6e24a44ee65 100644
--- a/pkgs/development/interpreters/lua-5/wrap-lua.nix
+++ b/pkgs/development/interpreters/lua-5/wrap-lua.nix
@@ -4,7 +4,7 @@
 , makeWrapper
 }:
 
-# defined in trivial-builders.nix
+# defined in trivial-builders
 # imported as wrapLua in lua-packages.nix and passed to build-lua-derivation to be used as buildInput
 makeSetupHook {
   name = "wrap-lua-hook";
diff --git a/pkgs/development/interpreters/octave/wrap-octave.nix b/pkgs/development/interpreters/octave/wrap-octave.nix
index 2317a479f0e2..1959ba6c4925 100644
--- a/pkgs/development/interpreters/octave/wrap-octave.nix
+++ b/pkgs/development/interpreters/octave/wrap-octave.nix
@@ -4,7 +4,7 @@
 , makeWrapper
 }:
 
-# Defined in trivial-builders.nix
+# Defined in trivial-builders
 # Imported as wrapOctave in octave/default.nix and passed to octave's buildEnv
 # as nativeBuildInput
 # Each of the substitutions is available in the wrap.sh script as @thingSubstituted@
diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix
index b796b26307e7..86535cad8f9d 100644
--- a/pkgs/top-level/stage.nix
+++ b/pkgs/top-level/stage.nix
@@ -101,7 +101,7 @@ let
     };
 
   trivialBuilders = self: super:
-    import ../build-support/trivial-builders.nix {
+    import ../build-support/trivial-builders {
       inherit lib;
       inherit (self) runtimeShell stdenv stdenvNoCC haskell;
       inherit (self.pkgsBuildHost) shellcheck;