Merge master into staging-next

2020-11-28 08:53:47 +01:00
parent b2a3891e12 8256fc2da5
commit 9e062723b2
112 changed files with 3712 additions and 2628 deletions
@@ -51,6 +51,6 @@ with stdenv;
    homepage = "https://irods.org";
    license = stdenv.lib.licenses.bsd3;
    maintainers = [ stdenv.lib.maintainers.bzizou ];
-    platforms = stdenv.lib.platforms.all;
+    platforms = stdenv.lib.platforms.linux;
  };
 }