alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

trivial-builders: move into the directory named alike (#223429)

Browse source 
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.
This commit is contained in:
Sandro 2023-05-06 00:16:26 +02:00 committed by GitHub
parent 68eb074857
commit cac19e0266
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
pkgs/build-support/trivial-builders.nix → pkgs/build-support/trivial-builders/default.nix
View file

2
pkgs/development/interpreters/lua-5/wrap-lua.nix
View file

@ -4,7 +4,7 @@
, makeWrapper , 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 # imported as wrapLua in lua-packages.nix and passed to build-lua-derivation to be used as buildInput
makeSetupHook { makeSetupHook {
name = "wrap-lua-hook"; name = "wrap-lua-hook";

2
pkgs/development/interpreters/octave/wrap-octave.nix
View file

@ -4,7 +4,7 @@
, makeWrapper , makeWrapper
}: }:
# Defined in trivial-builders.nix # Defined in trivial-builders
# Imported as wrapOctave in octave/default.nix and passed to octave's buildEnv # Imported as wrapOctave in octave/default.nix and passed to octave's buildEnv
# as nativeBuildInput # as nativeBuildInput
# Each of the substitutions is available in the wrap.sh script as @thingSubstituted@ # Each of the substitutions is available in the wrap.sh script as @thingSubstituted@

2
pkgs/top-level/stage.nix
View file

@ -101,7 +101,7 @@ let
}; };
trivialBuilders = self: super: trivialBuilders = self: super:
import ../build-support/trivial-builders.nix { import ../build-support/trivial-builders {
inherit lib; inherit lib;
inherit (self) runtimeShell stdenv stdenvNoCC haskell; inherit (self) runtimeShell stdenv stdenvNoCC haskell;
inherit (self.pkgsBuildHost) shellcheck; inherit (self.pkgsBuildHost) shellcheck;