Merge master into staging-next

2021-04-18 18:10:37 +00:00
parent 9e804db1da 528b3af306
commit b57b2b362c
31 changed files with 2856 additions and 410 deletions
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
  meta = {
    description = "Free Open-Source filesystem on-the-fly encryption";
    homepage = "https://www.veracrypt.fr/";
-    license = [ licenses.asl20 /* or */ "TrueCrypt License version 3.0" ];
+    license = with licenses; [ asl20 /* and */ unfree /* TrueCrypt License version 3.0 */ ];
    maintainers = with maintainers; [ dsferruzza ];
    platforms = platforms.linux;
  };