diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2023-05-06 00:16:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-06 00:16:26 +0200 |
| commit | cac19e02668e2c0e1ad2aa20db3041dbca00e739 (patch) | |
| tree | fe303c7fef0925144ee1fc911eeee0484dacd363 | |
| parent | 68eb0748577d20ba5209510a8e3f7debd30fd7a8 (diff) | |
| download | nixpkgs-cac19e02668e2c0e1ad2aa20db3041dbca00e739.tar nixpkgs-cac19e02668e2c0e1ad2aa20db3041dbca00e739.tar.gz nixpkgs-cac19e02668e2c0e1ad2aa20db3041dbca00e739.tar.bz2 nixpkgs-cac19e02668e2c0e1ad2aa20db3041dbca00e739.tar.lz nixpkgs-cac19e02668e2c0e1ad2aa20db3041dbca00e739.tar.xz nixpkgs-cac19e02668e2c0e1ad2aa20db3041dbca00e739.tar.zst nixpkgs-cac19e02668e2c0e1ad2aa20db3041dbca00e739.zip | |
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.
| -rw-r--r-- | pkgs/build-support/trivial-builders/default.nix (renamed from pkgs/build-support/trivial-builders.nix) | 0 | ||||
| -rw-r--r-- | pkgs/development/interpreters/lua-5/wrap-lua.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/interpreters/octave/wrap-octave.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/stage.nix | 2 |
4 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders/default.nix index e90d0a6d202..e90d0a6d202 100644 --- a/pkgs/build-support/trivial-builders.nix +++ b/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 43ececd1e79..b6e24a44ee6 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 2317a479f0e..1959ba6c492 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 b796b26307e..86535cad8f9 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; |