Merge staging-next into staging

2021-05-16 18:32:44 +00:00
parent 21541fc97c 8c6d819143
commit 6cdac75d25
77 changed files with 796 additions and 1799 deletions
@@ -15,7 +15,7 @@
    propagatedBuildInputs = with python3Packages; [
      pyqt5
      lxml
-      sip
+      sip_4
    ];
    preBuild = ''
      make qt5py3