Merge staging-next into staging

This commit is contained in:
github-actions[bot]
2021-03-21 06:17:18 +00:00
committed by GitHub
144 changed files with 3925 additions and 1297 deletions
+2 -2
View File
@@ -3,7 +3,7 @@
{ name ? "debian-build"
, diskImage
, src, lib, stdenv, vmTools, checkinstall
, src, stdenv, vmTools, checkinstall
, fsTranslation ? false
, # Features provided by this package.
debProvides ? []
@@ -21,7 +21,7 @@ vmTools.runInLinuxImage (stdenv.mkDerivation (
prePhases = "installExtraDebsPhase sysInfoPhase";
}
// removeAttrs args ["vmTools"] //
// removeAttrs args ["vmTools" "lib"] //
{
name = name + "-" + diskImage.name + (if src ? version then "-" + src.version else "");