lorri: unstable-2019-10-30 -> unstable-2020-01-09
`rustfmt` is now a compile time dependency because the varlink generated code is formatted with it.
This commit is contained in:
@@ -1,9 +1,13 @@
|
||||
{
|
||||
# Plumbing tools:
|
||||
closureInfo, runCommand, writeText, buildEnv,
|
||||
|
||||
# Actual dependencies to propagate:
|
||||
bash, coreutils }:
|
||||
closureInfo
|
||||
, runCommand
|
||||
, writeText
|
||||
, buildEnv
|
||||
, # Actual dependencies to propagate:
|
||||
bash
|
||||
, coreutils
|
||||
}:
|
||||
let
|
||||
tools = buildEnv {
|
||||
name = "lorri-runtime-tools";
|
||||
@@ -15,19 +19,20 @@ let
|
||||
};
|
||||
|
||||
closureToNix = runCommand "closure.nix" {}
|
||||
''
|
||||
(
|
||||
echo '{ dep, ... }: ['
|
||||
sed -E 's/^(.*)$/ (dep \1)/' ${runtimeClosureInfo}/store-paths
|
||||
echo ']'
|
||||
) > $out
|
||||
'';
|
||||
''
|
||||
(
|
||||
echo '{ dep, ... }: ['
|
||||
sed -E 's/^(.*)$/ (dep \1)/' ${runtimeClosureInfo}/store-paths
|
||||
echo ']'
|
||||
) > $out
|
||||
'';
|
||||
|
||||
runtimeClosureInfoAsNix = runCommand "runtime-closure.nix" {
|
||||
runtime_closure_list = closureToNix;
|
||||
tools_build_host = tools;
|
||||
}
|
||||
''
|
||||
substituteAll ${./runtime-closure.nix.template} $out
|
||||
'';
|
||||
in runtimeClosureInfoAsNix
|
||||
''
|
||||
substituteAll ${./runtime-closure.nix.template} $out
|
||||
'';
|
||||
in
|
||||
runtimeClosureInfoAsNix
|
||||
|
||||
Reference in New Issue
Block a user