clan/clan-core
11
2
Fork 13
Code Issues 88 Pull Requests 4 Actions Packages Projects 1 Releases Wiki Activity

script-writers: add wrapping support (makeWrapperArgs)

Browse Source
This commit is contained in:
DavHau 2024-02-27 18:17:50 +07:00
parent 31722d9dc0
commit 45fd64a930
1 changed files with 74 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

120
pkgs/builders/script-writers.nix
View File

@ -1,4 +1,4 @@
{ pkgs, buildPackages, lib, stdenv, libiconv, mkNugetDeps, mkNugetSource, gixy }: { pkgs, buildPackages, lib, stdenv, libiconv, mkNugetDeps, mkNugetSource, gixy, makeWrapper, }:
let let
inherit (lib) inherit (lib)
concatMapStringsSep concatMapStringsSep
@ -18,7 +18,7 @@ rec {
# Examples: # Examples:
# writeBash = makeScriptWriter { interpreter = "${pkgs.bash}/bin/bash"; } # writeBash = makeScriptWriter { interpreter = "${pkgs.bash}/bin/bash"; }
# makeScriptWriter { interpreter = "${pkgs.dash}/bin/dash"; } "hello" "echo hello world" # makeScriptWriter { interpreter = "${pkgs.dash}/bin/dash"; } "hello" "echo hello world"
makeScriptWriter = { interpreter, check ? "" }: nameOrPath: content: makeScriptWriter = { interpreter, check ? "", makeWrapperArgs ? [], }: nameOrPath: content:
assert lib.or (types.path.check nameOrPath) (builtins.match "([0-9A-Za-z._])[0-9A-Za-z._-]*" nameOrPath != null); assert lib.or (types.path.check nameOrPath) (builtins.match "([0-9A-Za-z._])[0-9A-Za-z._-]*" nameOrPath != null);
assert lib.or (types.path.check content) (types.str.check content); assert lib.or (types.path.check content) (types.str.check content);
let let
@ -26,7 +26,13 @@ rec {
in in
pkgs.runCommandLocal name ( pkgs.runCommandLocal name (
lib.optionalAttrs (nameOrPath == "/bin/${name}") { {
inherit makeWrapperArgs;
nativeBuildInputs = [
makeWrapper
];
}
// lib.optionalAttrs (nameOrPath == "/bin/${name}") {
meta.mainProgram = name; meta.mainProgram = name;
} }
// ( // (
@ -69,10 +75,15 @@ rec {
${check} $out ${check} $out
''} ''}
chmod +x $out chmod +x $out
# Relocate executable if path was specified instead of name.
# Only in this case wrapProgram is applied, as it wouldn't work with a
# single executable file under $out.
${optionalString (types.path.check nameOrPath) '' ${optionalString (types.path.check nameOrPath) ''
mv $out tmp mv $out tmp
mkdir -p $out/$(dirname "${nameOrPath}") mkdir -p $out/$(dirname "${nameOrPath}")
mv tmp $out/${nameOrPath} mv tmp $out/${nameOrPath}
wrapProgram $out/${nameOrPath} ''${makeWrapperArgs[@]}
''} ''}
''; '';
@ -201,17 +212,20 @@ rec {
# makeRubyWriter takes ruby and compatible rubyPackages and produces ruby script writer, # makeRubyWriter takes ruby and compatible rubyPackages and produces ruby script writer,
# If any libraries are specified, ruby.withPackages is used as interpreter, otherwise the "bare" ruby is used. # If any libraries are specified, ruby.withPackages is used as interpreter, otherwise the "bare" ruby is used.
makeRubyWriter = ruby: rubyPackages: buildRubyPackages: name: { libraries ? [], }: makeRubyWriter = ruby: rubyPackages: buildRubyPackages: name: { libraries ? [], ... } @ args:
makeScriptWriter { makeScriptWriter (
interpreter = (builtins.reamoveAttrs args ["libraries"])
if libraries == [] // {
then "${ruby}/bin/ruby" interpreter =
else "${(ruby.withPackages (ps: libraries))}/bin/ruby"; if libraries == []
# Rubocop doesnt seem to like running in this fashion. then "${ruby}/bin/ruby"
#check = (writeDash "rubocop.sh" '' else "${(ruby.withPackages (ps: libraries))}/bin/ruby";
# exec ${lib.getExe buildRubyPackages.rubocop} "$1" # Rubocop doesnt seem to like running in this fashion.
#''); #check = (writeDash "rubocop.sh" ''
} name; # exec ${lib.getExe buildRubyPackages.rubocop} "$1"
#'');
}
) name;
# Like writeScript but the first line is a shebang to ruby # Like writeScript but the first line is a shebang to ruby
# #
@ -227,17 +241,20 @@ rec {
# makeLuaWriter takes lua and compatible luaPackages and produces lua script writer, # makeLuaWriter takes lua and compatible luaPackages and produces lua script writer,
# which validates the script with luacheck at build time. If any libraries are specified, # which validates the script with luacheck at build time. If any libraries are specified,
# lua.withPackages is used as interpreter, otherwise the "bare" lua is used. # lua.withPackages is used as interpreter, otherwise the "bare" lua is used.
makeLuaWriter = lua: luaPackages: buildLuaPackages: name: { libraries ? [], }: makeLuaWriter = lua: luaPackages: buildLuaPackages: name: { libraries ? [], ... } @ args:
makeScriptWriter { makeScriptWriter (
interpreter = lua.interpreter; (builtins.removeAttrs args ["libraries"])
# if libraries == [] // {
# then lua.interpreter interpreter = lua.interpreter;
# else (lua.withPackages (ps: libraries)).interpreter # if libraries == []
# This should support packages! I just cant figure out why some dependency collision happens whenever I try to run this. # then lua.interpreter
check = (writeDash "luacheck.sh" '' # else (lua.withPackages (ps: libraries)).interpreter
exec ${buildLuaPackages.luacheck}/bin/luacheck "$1" # This should support packages! I just cant figure out why some dependency collision happens whenever I try to run this.
''); check = (writeDash "luacheck.sh" ''
} name; exec ${buildLuaPackages.luacheck}/bin/luacheck "$1"
'');
}
) name;
# writeLua takes a name an attributeset with libraries and some lua source code and # writeLua takes a name an attributeset with libraries and some lua source code and
# returns an executable (should also work with luajit) # returns an executable (should also work with luajit)
@ -337,10 +354,13 @@ rec {
# use boolean; # use boolean;
# print "Howdy!\n" if true; # print "Howdy!\n" if true;
# '' # ''
writePerl = name: { libraries ? [] }: writePerl = name: { libraries ? [], ... } @ args:
makeScriptWriter { makeScriptWriter (
interpreter = "${lib.getExe (pkgs.perl.withPackages (p: libraries))}"; (builtins.removeAttrs args ["libraries"])
} name; // {
interpreter = "${lib.getExe (pkgs.perl.withPackages (p: libraries))}";
}
) name;
# writePerlBin takes the same arguments as writePerl but outputs a directory (like writeScriptBin) # writePerlBin takes the same arguments as writePerl but outputs a directory (like writeScriptBin)
writePerlBin = name: writePerlBin = name:
@ -349,22 +369,27 @@ rec {
# makePythonWriter takes python and compatible pythonPackages and produces python script writer, # makePythonWriter takes python and compatible pythonPackages and produces python script writer,
# which validates the script with flake8 at build time. If any libraries are specified, # which validates the script with flake8 at build time. If any libraries are specified,
# python.withPackages is used as interpreter, otherwise the "bare" python is used. # python.withPackages is used as interpreter, otherwise the "bare" python is used.
makePythonWriter = python: pythonPackages: buildPythonPackages: name: { libraries ? [], flakeIgnore ? [] }: makePythonWriter = python: pythonPackages: buildPythonPackages: name: { libraries ? [], flakeIgnore ? [], ... } @ args:
let let
ignoreAttribute = optionalString (flakeIgnore != []) "--ignore ${concatMapStringsSep "," escapeShellArg flakeIgnore}"; ignoreAttribute = optionalString (flakeIgnore != []) "--ignore ${concatMapStringsSep "," escapeShellArg flakeIgnore}";
in in
makeScriptWriter { makeScriptWriter
interpreter = (
if pythonPackages != pkgs.pypy2Packages || pythonPackages != pkgs.pypy3Packages then (builtins.removeAttrs args ["libraries" "flakeIgnore"])
if libraries == [] // {
then python.interpreter interpreter =
else (python.withPackages (ps: libraries)).interpreter if pythonPackages != pkgs.pypy2Packages || pythonPackages != pkgs.pypy3Packages then
else python.interpreter if libraries == []
; then python.interpreter
check = optionalString python.isPy3k (writeDash "pythoncheck.sh" '' else (python.withPackages (ps: libraries)).interpreter
exec ${buildPythonPackages.flake8}/bin/flake8 --show-source ${ignoreAttribute} "$1" else python.interpreter
''); ;
} name; check = optionalString python.isPy3k (writeDash "pythoncheck.sh" ''
exec ${buildPythonPackages.flake8}/bin/flake8 --show-source ${ignoreAttribute} "$1"
'');
}
)
name;
# writePyPy2 takes a name an attributeset with libraries and some pypy2 sourcecode and # writePyPy2 takes a name an attributeset with libraries and some pypy2 sourcecode and
# returns an executable # returns an executable
@ -421,7 +446,7 @@ rec {
writePyPy3 "/bin/${name}"; writePyPy3 "/bin/${name}";
makeFSharpWriter = { dotnet-sdk ? pkgs.dotnet-sdk, fsi-flags ? "", libraries ? _: [] }: nameOrPath: makeFSharpWriter = { dotnet-sdk ? pkgs.dotnet-sdk, fsi-flags ? "", libraries ? _: [], ... } @ args: nameOrPath:
let let
fname = last (builtins.split "/" nameOrPath); fname = last (builtins.split "/" nameOrPath);
path = if strings.hasSuffix ".fsx" nameOrPath then nameOrPath else "${nameOrPath}.fsx"; path = if strings.hasSuffix ".fsx" nameOrPath then nameOrPath else "${nameOrPath}.fsx";
@ -442,9 +467,12 @@ rec {
${lib.getExe dotnet-sdk} fsi --quiet --nologo --readline- ${fsi-flags} "$@" < "$script" ${lib.getExe dotnet-sdk} fsi --quiet --nologo --readline- ${fsi-flags} "$@" < "$script"
''; '';
in content: makeScriptWriter { in content: makeScriptWriter (
interpreter = fsi; (builtins.removeAttrs args ["dotnet-sdk" "fsi-flags" "libraries"])
} path // {
interpreter = fsi;
}
) path
'' ''
#i "nuget: ${nuget-source}/lib" #i "nuget: ${nuget-source}/lib"
${ content } ${ content }