Merge master into staging-next

2021-01-16 18:51:05 +00:00
parent 2445824f40 afc9b7bb5f
commit f46cb85082
1010 changed files with 2951 additions and 2714 deletions
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
    license = lib.licenses.gpl3Plus;

    maintainers = with lib.maintainers; [ raskin ];
-    platforms = lib.platforms.gnu ++ stdenv.lib.platforms.linux;  # arbitrary choice
+    platforms = lib.platforms.gnu ++ lib.platforms.linux;  # arbitrary choice

    updateWalker = true;
    inherit version;