Merge master into staging-next

This commit is contained in:
github-actions[bot]
2021-05-22 12:27:09 +00:00
committed by GitHub
22 changed files with 550 additions and 26 deletions
+4 -1
View File
@@ -407,6 +407,8 @@ in
etBook = callPackage ../data/fonts/et-book { };
fetchutils = callPackage ../tools/misc/fetchutils { };
fet-sh = callPackage ../tools/misc/fet-sh { };
fetchbower = callPackage ../build-support/fetchbower {
@@ -23641,6 +23643,7 @@ in
boost
matplotlib
pivy
ply
pycollada
pyside2
pyside2-tools
@@ -26157,7 +26160,7 @@ in
rofi-systemd = callPackage ../tools/system/rofi-systemd { };
rofimoji = callPackage ../applications/misc/rofimoji {
inherit (python3Packages) buildPythonApplication ConfigArgParse pyxdg;
inherit (python3Packages) buildPythonApplication ConfigArgParse;
};
rootlesskit = callPackage ../tools/virtualization/rootlesskit {};