Merge master into staging-next

2019-06-12 09:22:07 +02:00
parent 3df5b67ae4 9edf8f73f7
commit 7184efb40a
192 changed files with 2166 additions and 56222 deletions
@@ -438,6 +438,7 @@ in
      default =
        [ "aes" "aes_generic" "blowfish" "twofish"
          "serpent" "cbc" "xts" "lrw" "sha1" "sha256" "sha512"
+          "af_alg" "algif_skcipher"

          (if pkgs.stdenv.hostPlatform.system == "x86_64-linux" then "aes_x86_64" else "aes_i586")
        ];