Merge branch 'master' into staging-next

2020-03-31 21:32:15 +02:00
parent a803f716bd a8811cb82b
commit 3e0f4e202f
359 changed files with 9618 additions and 2647 deletions
@@ -18,7 +18,7 @@ let
  apparmor-version = apparmor-series + "." + apparmor-patchver;

  apparmor-meta = component: with stdenv.lib; {
-    homepage = http://apparmor.net/;
+    homepage = "https://apparmor.net/";
    description = "A mandatory access control system - ${component}";
    license = licenses.gpl2;
    maintainers = with maintainers; [ phreedom thoughtpolice joachifm ];