Merge master into staging-next

2024-09-21 21:09:00 +02:00 · 2021-08-03 12:01:28 +00:00 · 2021-08-03 12:01:28 +00:00 · e3996d7839
parent 4625b9a0eb 04de1306ba
commit e3996d7839
38 changed files with 168 additions and 113 deletions
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@ -1412,6 +1412,12 @@
    githubId = 10221570;
    name = "Bo Bakker";
  };
+  bobby285271 = {
+    name = "Bobby Rong";
+    email = "rjl931189261@126.com";
+    github = "bobby285271";
+    githubId = 20080233;
+  };
  bobvanderlinden = {
    email = "bobvanderlinden@gmail.com";
    github = "bobvanderlinden";
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@ -167,6 +167,14 @@ with lib.maintainers; {
    scope = "Maintain the ecosystem around Matrix, a decentralized messenger.";
  };

+  pantheon = {
+    members = [
+      davidak
+      bobby285271
+    ];
+    scope = "Maintain Pantheon desktop environment and platform.";
+  };
+
  php = {
    members = [
      aanderse
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@ -251,6 +251,7 @@
  ./services/audio/mpd.nix
  ./services/audio/mpdscribble.nix
  ./services/audio/mopidy.nix
+  ./services/audio/roon-bridge.nix
  ./services/audio/roon-server.nix
  ./services/audio/slimserver.nix
  ./services/audio/snapserver.nix
--- a/nixos/modules/services/desktops/bamf.nix
+++ b/nixos/modules/services/desktops/bamf.nix
@ -5,8 +5,8 @@
 with lib;

 {
-  meta = {
-    maintainers = with maintainers; [ ];
+  meta = with lib; {
+    maintainers = with maintainers; [ ] ++ teams.pantheon.members;
  };

  ###### interface
--- a/nixos/modules/services/desktops/geoclue2.nix
+++ b/nixos/modules/services/desktops/geoclue2.nix
@ -266,5 +266,7 @@ in
      } // mapAttrs' appConfigToINICompatible cfg.appConfig);
  };

-  meta.maintainers = with lib.maintainers; [ ];
+  meta = with lib; {
+    maintainers = with maintainers; [ ] ++ teams.pantheon.members;
+  };
 }
--- a/nixos/modules/services/desktops/tumbler.nix
+++ b/nixos/modules/services/desktops/tumbler.nix
@ -18,8 +18,8 @@ in
      "")
  ];

-  meta = {
-    maintainers = with maintainers; [ ];
+  meta = with lib; {
+    maintainers = with maintainers; [ ] ++ teams.pantheon.members;
  };

  ###### interface
--- a/nixos/modules/services/desktops/zeitgeist.nix
+++ b/nixos/modules/services/desktops/zeitgeist.nix
@ -6,8 +6,8 @@ with lib;

 {

-  meta = {
-    maintainers = with maintainers; [ ];
+  meta = with lib; {
+    maintainers = with maintainers; [ ] ++ teams.pantheon.members;
  };

  ###### interface
--- a/nixos/modules/services/x11/display-managers/account-service-util.nix
+++ b/nixos/modules/services/x11/display-managers/account-service-util.nix
@ -39,6 +39,6 @@ python3.pkgs.buildPythonApplication {
  '';

  meta = with lib; {
-    maintainers = with maintainers; [ ];
+    maintainers = with maintainers; [ ] ++ teams.pantheon.members;
  };
 }
--- a/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix
@ -10,8 +10,8 @@ let

 in
 {
-  meta = {
-    maintainers = with maintainers; [ ];
+  meta = with lib; {
+    maintainers = with maintainers; [ ] ++ teams.pantheon.members;
  };

  options = {
--- a/nixos/modules/services/x11/display-managers/lightdm.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm.nix
@ -69,8 +69,8 @@ let

 in
 {
-  meta = {
-    maintainers = with maintainers; [ ];
+  meta = with lib; {
+    maintainers = with maintainers; [ ] ++ teams.pantheon.members;
  };

  # Note: the order in which lightdm greeter modules are imported
--- a/nixos/modules/system/boot/binfmt.nix
+++ b/nixos/modules/system/boot/binfmt.nix
@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 let
-  inherit (lib) mkOption types optionalString;
+  inherit (lib) mkOption types optionalString stringAfter;

  cfg = config.boot.binfmt;

@ -270,7 +270,7 @@ in {

    environment.etc."binfmt.d/nixos.conf".source = builtins.toFile "binfmt_nixos.conf"
      (lib.concatStringsSep "\n" (lib.mapAttrsToList makeBinfmtLine config.boot.binfmt.registrations));
-    system.activationScripts.binfmt = ''
+    system.activationScripts.binfmt = stringAfter [ "specialfs" ] ''
      mkdir -p -m 0755 /run/binfmt
      ${lib.concatStringsSep "\n" (lib.mapAttrsToList activationSnippet config.boot.binfmt.registrations)}
    '';
--- a/pkgs/applications/audio/vocal/default.nix
+++ b/pkgs/applications/audio/vocal/default.nix
@ -86,7 +86,7 @@ stdenv.mkDerivation rec {
    '';
    homepage = "https://github.com/needle-and-thread/vocal";
    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = with maintainers; [ ] ++ teams.pantheon.members;
    platforms = platforms.linux;
  };
 }
--- a/pkgs/applications/blockchains/chia/default.nix
+++ b/pkgs/applications/blockchains/chia/default.nix
@ -1,4 +1,5 @@
 { lib
+, cacert
 , fetchFromGitHub
 , fetchpatch
 , python3Packages
@ -12,7 +13,8 @@ python3Packages.buildPythonApplication rec {
    owner = "Chia-Network";
    repo = "chia-blockchain";
    rev = version;
-    sha256 = "sha256-yS0/Fy2dj8VIbwv2J9sehP0VN0f/YDxu1k9WkaeEz8M=";
+    fetchSubmodules = true;
+    sha256 = "sha256-nK/Zk2zgIdrRtw3+VkUXQWfI9j29XFDOR95Dvbn07eA=";
  };

  patches = [
@ -73,6 +75,8 @@ python3Packages.buildPythonApplication rec {
      --replace "clvm_rs==0.1.8" "clvm_rs>=0.1.8" \
      --replace "clvm==0.9.7" "clvm>=0.9.7" \
      --replace "bitstring==3.1.7" "bitstring>=3.1.9" \
+
+    ln -sf ${cacert}/etc/ssl/certs/ca-bundle.crt mozilla-ca/cacert.pem
  '';

  preCheck = ''
--- a/pkgs/applications/display-managers/lightdm/default.nix
+++ b/pkgs/applications/display-managers/lightdm/default.nix
@ -142,6 +142,6 @@ stdenv.mkDerivation rec {
    description = "A cross-desktop display manager";
    platforms = platforms.linux;
    license = licenses.gpl3;
-    maintainers = with maintainers; [ ];
+    maintainers = with maintainers; [ ] ++ teams.pantheon.members;
  };
 }
--- a/pkgs/applications/graphics/fondo/default.nix
+++ b/pkgs/applications/graphics/fondo/default.nix
@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
    homepage = "https://github.com/calo001/fondo";
    description = "Find the most beautiful wallpapers for your desktop";
    license = licenses.agpl3Plus;
-    maintainers = with maintainers; [ AndersonTorres ];
+    maintainers = with maintainers; [ AndersonTorres ] ++ teams.pantheon.members;
    platforms = platforms.linux;
  };

--- a/pkgs/applications/misc/ikiwiki/default.nix
+++ b/pkgs/applications/misc/ikiwiki/default.nix
@ -1,39 +1,28 @@
 { lib, stdenv, fetchurl, perlPackages, gettext, makeWrapper, ImageMagick, which, highlight
-, gitSupport ? false, git ? null
-, docutilsSupport ? false, python ? null, docutils ? null
-, monotoneSupport ? false, monotone ? null
-, bazaarSupport ? false, breezy ? null
-, cvsSupport ? false, cvs ? null, cvsps ? null
-, subversionSupport ? false, subversion ? null
-, mercurialSupport ? false, mercurial ? null
+, gitSupport ? false, git
+, docutilsSupport ? false, python, docutils
+, monotoneSupport ? false, monotone
+, bazaarSupport ? false, breezy
+, cvsSupport ? false, cvs, cvsps
+, subversionSupport ? false, subversion
+, mercurialSupport ? false, mercurial
 , extraUtils ? []
 }:

-assert docutilsSupport -> (python != null && docutils != null);
-assert gitSupport -> (git != null);
-assert monotoneSupport -> (monotone != null);
-assert bazaarSupport -> (breezy != null);
-assert cvsSupport -> (cvs != null && cvsps != null && perlPackages.Filechdir != null);
-assert subversionSupport -> (subversion != null);
-assert mercurialSupport -> (mercurial != null);
-
-let
-  name = "ikiwiki";
+stdenv.mkDerivation rec {
+  pname = "ikiwiki";
  version = "3.20200202.3";
-in
-stdenv.mkDerivation {
-  name = "${name}-${version}";

  src = fetchurl {
-    url = "mirror://debian/pool/main/i/ikiwiki/${name}_${version}.orig.tar.xz";
+    url = "mirror://debian/pool/main/i/ikiwiki/ikiwiki_${version}.orig.tar.xz";
    sha256 = "0skrc8r4wh4mjfgw1c94awr5sacfb9nfsbm4frikanc9xsy16ksr";
  };

  buildInputs = [ which highlight ]
    ++ (with perlPackages; [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate
-          TimeDate gettext makeWrapper DBFile CGISession CGIFormBuilder LocaleGettext
-          RpcXML XMLSimple ImageMagick YAML YAMLLibYAML HTMLTree AuthenPassphrase
-          NetOpenIDConsumer LWPxParanoidAgent CryptSSLeay ])
+      TimeDate gettext makeWrapper DBFile CGISession CGIFormBuilder LocaleGettext
+      RpcXML XMLSimple ImageMagick YAML YAMLLibYAML HTMLTree AuthenPassphrase
+      NetOpenIDConsumer LWPxParanoidAgent CryptSSLeay ])
    ++ lib.optionals docutilsSupport [python docutils]
    ++ lib.optionals gitSupport [git]
    ++ lib.optionals monotoneSupport [monotone]
@ -80,11 +69,11 @@ stdenv.mkDerivation {
  checkTarget = "test";
  doCheck = true;

-  meta = {
+  meta = with lib; {
    description = "Wiki compiler, storing pages and history in a RCS";
    homepage = "http://ikiwiki.info/";
-    license = lib.licenses.gpl2Plus;
-    platforms = lib.platforms.linux;
-    maintainers = [ lib.maintainers.peti ];
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.peti ];
  };
 }
--- a/pkgs/applications/misc/notejot/default.nix
+++ b/pkgs/applications/misc/notejot/default.nix
@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
    homepage = "https://github.com/lainsce/notejot";
    description = "Stupidly-simple sticky notes applet";
    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ AndersonTorres ];
+    maintainers = with maintainers; [ AndersonTorres ] ++ teams.pantheon.members;
    platforms = platforms.linux;
  };

--- a/pkgs/applications/misc/olifant/default.nix
+++ b/pkgs/applications/misc/olifant/default.nix
@ -64,6 +64,6 @@ stdenv.mkDerivation rec {
    description = "A simple Mastodon client designed for elementary OS, originally developed by @bleakgrey";
    homepage = "https://github.com/cleac/olifant";
    license = licenses.gpl3;
-    maintainers = with maintainers; [ ];
+    maintainers = with maintainers; [ ] ++ teams.pantheon.members;
  };
 }
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.json
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json
@ -1,8 +1,8 @@
 {
  "stable": {
-    "version": "92.0.4515.107",
-    "sha256": "04khamgxwzgbm2rn7is53j5g55vm5qfyz7zwxqc51sd429jsqlbf",
-    "sha256bin64": "0vfg8wjf9i1yz8nlxsij8fmqq7qr4nsccaihppqm3axpk91mmdsj",
+    "version": "92.0.4515.131",
+    "sha256": "0fnfyh61w6dmavvfbf2x1zzrby0xpx4jd4ifjsgyc39rsl789b5n",
+    "sha256bin64": "04ykc7vgq47m595j0g0gl28n5rkki6aic7ck8xr08r5cia46gk3g",
    "deps": {
      "gn": {
        "version": "2021-05-07",
@ -12,9 +12,9 @@
      }
    },
    "chromedriver": {
-      "version": "92.0.4515.43",
-      "sha256_linux": "1s22y892py99kzcb2j3gafmbz9jrr2lfhhh8hp3ggn2i37yxs8bw",
-      "sha256_darwin": "1cjg4r4z5m74c2si4m25rj3z44n0iimhqzb1l3l3y0a3q024bi8f"
+      "version": "92.0.4515.107",
+      "sha256_linux": "12yckzjhlhxp14j7aphnvlw4xv713vllj44h5pba181ivxavmky3",
+      "sha256_darwin": "0gm0zazwy053rip9h0ma2s53rc65b8pzy57x48ch0fpq7rrsbycp"
    }
  },
  "beta": {
--- a/pkgs/applications/networking/ftp/taxi/default.nix
+++ b/pkgs/applications/networking/ftp/taxi/default.nix
@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
    homepage = "https://github.com/Alecaddd/taxi";
    description = "The FTP Client that drives you anywhere";
    license = licenses.lgpl3Plus;
-    maintainers = with maintainers; [ AndersonTorres ];
+    maintainers = with maintainers; [ AndersonTorres ] ++ teams.pantheon.members;
    platforms = platforms.linux;
  };

--- a/pkgs/applications/office/notes-up/default.nix
+++ b/pkgs/applications/office/notes-up/default.nix
@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
      + lib.optionalString withPantheon " - built with Contractor support";
    homepage = "https://github.com/Philip-Scott/Notes-up";
    license = licenses.gpl2Only;
-    maintainers = with maintainers; [ davidak ];
+    maintainers = with maintainers; [ ] ++ teams.pantheon.members;
    platforms = platforms.linux;
  };
 }
--- a/pkgs/data/fonts/open-sans/default.nix
+++ b/pkgs/data/fonts/open-sans/default.nix
@ -26,6 +26,6 @@ in fetchFromGitLab {
    homepage = "https://www.opensans.com";
    license = licenses.asl20;
    platforms = platforms.all;
-    maintainers = [ ];
+    maintainers = with maintainers; [ ] ++ teams.pantheon.members;
  };
 }
--- a/pkgs/desktops/pantheon/default.nix
+++ b/pkgs/desktops/pantheon/default.nix
@ -23,7 +23,7 @@ lib.makeScope pkgs.newScope (self: with self; {
    wingpanel-indicator-session wingpanel-indicator-sound
  ];

-  maintainers = with pkgs.lib.maintainers; [ ];
+  maintainers = lib.teams.pantheon.members;

  mutter = pkgs.gnome.mutter334;

--- a/pkgs/development/compilers/jwasm/default.nix
+++ b/pkgs/development/compilers/jwasm/default.nix
@ -1,33 +1,42 @@
-{ lib, stdenv, fetchFromGitHub
-, cmake }:
+{ lib
+, stdenv
+, fetchFromGitHub
+}:

-with lib;
 stdenv.mkDerivation rec {
  pname = "jwasm";
-  version = "2.13";
+  version = "2.14";

  src = fetchFromGitHub {
-    owner = "JWasm";
+    owner = "Baron-von-Riedesel";
    repo  = "JWasm";
-    rev = version;
-    sha256 = "0m972pc8vk8s9yv1pi85fsjgm6hj24gab7nalw2q04l0359nqi7w";
+    rev = "v${version}";
+    hash = "sha256-BUSsF73Q2vq6tF/YHMUyAmmFE/WWVQLRFJZkOD8T7f8=";
  };

-  nativeBuildInputs = [ cmake ];
+  outputs = [ "out" "doc" ];

-  installPhase = ''
-    install -Dpm755 jwasm -t $out/bin/
-    install -Dpm644 $src/History.txt  $src/Readme.txt \
-                    $src/Doc/enh.txt $src/Doc/fixes.txt \
-                    $src/Doc/gencode.txt $src/Doc/overview.txt \
-                    -t $out/share/doc/jwasm/
+  dontConfigure = true;
+
+  preBuild = ''
+    cp ${if stdenv.cc.isClang then "CLUnix.mak" else "GccUnix.mak"} Makefile
+    substituteInPlace Makefile \
+      --replace "/usr/local/bin" "${placeholder "out"}/bin"
  '';

-  meta = {
+  postInstall = ''
+    install -Dpm644 $src/Html/License.html \
+                    $src/Html/Manual.html \
+                    $src/Html/Readme.html \
+                    -t $doc/share/doc/jwasm/
+  '';
+
+  meta = with lib; {
+    homepage = "https://github.com/Baron-von-Riedesel/JWasm/";
    description = "A MASM-compatible x86 assembler";
-    homepage = "http://jwasm.github.io/";
    license = licenses.gpl2Plus;
    maintainers = with maintainers; [ AndersonTorres ];
-    platforms = platforms.darwin ++ platforms.linux;
+    platforms = platforms.unix;
  };
 }
+# TODO: generalize for Windows builds
--- a/pkgs/development/compilers/vala/default.nix
+++ b/pkgs/development/compilers/vala/default.nix
@ -100,7 +100,7 @@ let
      homepage = "https://wiki.gnome.org/Projects/Vala";
      license = licenses.lgpl21Plus;
      platforms = platforms.unix;
-      maintainers = with maintainers; [ antono jtojnar peterhoeg maxeaubrey ];
+      maintainers = with maintainers; [ antono jtojnar peterhoeg maxeaubrey ] ++ teams.pantheon.members;
    };
  });

--- a/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix
+++ b/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix
@ -22,7 +22,7 @@ buildPythonPackage rec {
  meta = with lib; {
    description = "Provides a Sphinx domain for embedding UML diagram with PlantUML";
    homepage = "https://github.com/sphinx-contrib/plantuml/";
+    maintainers = with maintainers; [ ];
    license = with licenses; [ bsd2 ];
  };
-
 }
--- a/pkgs/development/tools/buildah/default.nix
+++ b/pkgs/development/tools/buildah/default.nix
@ -14,13 +14,13 @@

 buildGoModule rec {
  pname = "buildah";
-  version = "1.21.4";
+  version = "1.22.0";

  src = fetchFromGitHub {
    owner = "containers";
    repo = "buildah";
    rev = "v${version}";
-    sha256 = "sha256-eVXNkQJ3/T4KFiGeE8o4kFBOONfHc6v+tNEOsOnEYRA=";
+    sha256 = "sha256-F2PUqqzW7e6wmme1rTEJ736Sy/SRR1XVf20j5zDI9/s=";
  };

  outputs = [ "out" "man" ];
--- a/pkgs/games/flare/default.nix
+++ b/pkgs/games/flare/default.nix
@ -1,7 +1,7 @@
 { lib, buildEnv, callPackage, makeWrapper, Cocoa }:

 buildEnv {
-  name = "flare-1.12rc2";
+  name = "flare-1.12";

  paths = [
    (callPackage ./engine.nix { inherit Cocoa; })
--- a/pkgs/games/flare/engine.nix
+++ b/pkgs/games/flare/engine.nix
@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  pname = "flare-engine";
-  version = "1.12rc2";
+  version = "1.12";

  src = fetchFromGitHub {
    owner = "flareteam";
    repo = pname;
    rev = "v${version}";
-    sha256 = "10il9dpbcka1w5glmhv48bqwww44csmhq426lvsc7z84444gvvgq";
+    sha256 = "0swav6fzz970wj4iic3b7y06haa05720s2wivc8w7wcw9nzcac7j";
  };

  patches = [ ./desktop.patch ];
--- a/pkgs/games/flare/game.nix
+++ b/pkgs/games/flare/game.nix
@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  pname = "flare-game";
-  version = "1.12rc2";
+  version = "1.12";

  src = fetchFromGitHub {
    owner = "flareteam";
    repo = pname;
    rev = "v${version}";
-    sha256 = "0k9fnbaqfgmih8bd0sh3kbk6f6v74i95wrbkij48gp48pq8yqbf9";
+    sha256 = "15k9r7w587pvkzrln0670hhq5fzif8k7xmrhb0nl3z3fi6dw3mmc";
  };

  nativeBuildInputs = [ cmake ];
--- a/pkgs/games/freeciv/default.nix
+++ b/pkgs/games/freeciv/default.nix
@ -1,7 +1,7 @@
 { lib, stdenv, fetchFromGitHub, autoreconfHook, lua5_3, pkg-config, python3
 , zlib, bzip2, curl, xz, gettext, libiconv
 , sdlClient ? true, SDL, SDL_mixer, SDL_image, SDL_ttf, SDL_gfx, freetype, fluidsynth
-, gtkClient ? false, gtk3
+, gtkClient ? stdenv.isLinux, gtk3
 , qtClient ? false, qt5
 , server ? true, readline
 , enableSqlite ? true, sqlite
@ -46,6 +46,7 @@ in stdenv.mkDerivation rec {
      "--enable-client=qt"
      "--with-qt5-includes=${qt5.qtbase.dev}/include"
    ]
+    ++ optionals gtkClient [ "--enable-client=gtk3.22" ]
    ++ optional enableSqlite "--enable-fcdb=sqlite3"
    ++ optional (!gtkClient) "--enable-fcmp=cli"
    ++ optional (!server)    "--disable-server";
--- a/pkgs/misc/vim-plugins/overrides.nix
+++ b/pkgs/misc/vim-plugins/overrides.nix
@ -298,8 +298,12 @@ self: super: {
  himalaya-vim = buildVimPluginFrom2Nix {
    pname = "himalaya-vim";
    inherit (himalaya) src version;
-    configurePhase = "cd vim/";
    dependencies = with self; [ himalaya ];
+    patchPhase = ''
+      rm -rf !"vim/"
+      cp -vaR vim/. .
+      rm -rf vim/
+    '';
    preFixup = ''
      substituteInPlace $out/share/vim-plugins/himalaya-vim/plugin/himalaya.vim \
        --replace 'if !executable("himalaya")' 'if v:false'
--- a/pkgs/servers/amqp/rabbitmq-server/default.nix
+++ b/pkgs/servers/amqp/rabbitmq-server/default.nix
@ -1,13 +1,32 @@
-{ lib, stdenv, fetchurl, erlang, elixir, python, libxml2, libxslt, xmlto
-, docbook_xml_dtd_45, docbook_xsl, zip, unzip, rsync, getconf, socat
-, procps, coreutils, gnused, systemd, glibcLocales
-, AppKit, Carbon, Cocoa
+{ lib
+, stdenv
+, fetchurl
+, erlang
+, elixir
+, python
+, libxml2
+, libxslt
+, xmlto
+, docbook_xml_dtd_45
+, docbook_xsl
+, zip
+, unzip
+, rsync
+, getconf
+, socat
+, procps
+, coreutils
+, gnused
+, systemd
+, glibcLocales
+, AppKit
+, Carbon
+, Cocoa
 , nixosTests
 }:

 stdenv.mkDerivation rec {
  pname = "rabbitmq-server";
-
  version = "3.9.1";

  # when updating, consider bumping elixir version in all-packages.nix
@ -17,8 +36,7 @@ stdenv.mkDerivation rec {
  };

  nativeBuildInputs = [ unzip xmlto docbook_xml_dtd_45 docbook_xsl zip rsync ];
-  buildInputs =
-    [ erlang elixir python libxml2 libxslt glibcLocales ]
+  buildInputs = [ erlang elixir python libxml2 libxslt glibcLocales ]
    ++ lib.optionals stdenv.isDarwin [ AppKit Carbon Cocoa ];

  outputs = [ "out" "man" "doc" ];
@ -33,9 +51,12 @@ stdenv.mkDerivation rec {
  runtimePath = lib.makeBinPath ([
    erlang
    getconf # for getting memory limits
-    socat procps
-    gnused coreutils # used by helper scripts
+    socat
+    procps
+    gnused
+    coreutils # used by helper scripts
  ] ++ lib.optionals stdenv.isLinux [ systemd ]); # for systemd unit activation check
+
  postInstall = ''
    # rabbitmq-env calls to sed/coreutils, so provide everything early
    sed -i $out/sbin/rabbitmq-env -e '2s|^|PATH=${runtimePath}\''${PATH:+:}\$PATH/\n|'
@ -53,15 +74,15 @@ stdenv.mkDerivation rec {
    rm $out/INSTALL
  '';

-  meta = {
-    homepage = "https://www.rabbitmq.com/";
-    description = "An implementation of the AMQP messaging protocol";
-    license = lib.licenses.mpl20;
-    platforms = lib.platforms.unix;
-    maintainers = with lib.maintainers; [ Profpatsch ];
-  };
-
  passthru.tests = {
    vm-test = nixosTests.rabbitmq;
  };
+
+  meta = with lib; {
+    homepage = "https://www.rabbitmq.com/";
+    description = "An implementation of the AMQP messaging protocol";
+    license = licenses.mpl20;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ Profpatsch ];
+  };
 }
--- a/pkgs/servers/roon-bridge/default.nix
+++ b/pkgs/servers/roon-bridge/default.nix
@ -7,7 +7,10 @@
 , stdenv
 , zlib
 }:
-
+let
+  inherit (stdenv.targetPlatform) system;
+  throwSystem = throw "Unsupported system: ${system}";
+in
 stdenv.mkDerivation rec {
  pname = "roon-bridge";
  version = "1.8-814";
@ -16,10 +19,16 @@ stdenv.mkDerivation rec {
  # they have ignored me. If this package fails to build for you, you may need
  # to update the version and sha256.
  # c.f. https://community.roonlabs.com/t/latest-roon-server-is-not-available-for-download-on-nixos/118129
-  src = fetchurl {
-    url = "https://web.archive.org/web/20210729154257/http://download.roonlabs.com/builds/RoonBridge_linuxx64.tar.bz2";
-    sha256 = "sha256-dersaP/8qkl9k81FrgMieB0P4nKmDwjLW5poqKhEn7A=";
-  };
+  src = {
+    x86_64-linux = fetchurl {
+      url = "https://web.archive.org/web/20210729154257/http://download.roonlabs.com/builds/RoonBridge_linuxx64.tar.bz2";
+      sha256 = "sha256-dersaP/8qkl9k81FrgMieB0P4nKmDwjLW5poqKhEn7A=";
+    };
+    aarch64-linux = fetchurl {
+      url = "https://web.archive.org/web/20210803071334/http://download.roonlabs.com/builds/RoonBridge_linuxarmv8.tar.bz2";
+      sha256 = "sha256-zZj7PkLUYYHo3dngqErv1RqynSXi6/D5VPZWfrppX5U=";
+    };
+  }.${system} or throwSystem;

  buildInputs = [
    alsa-lib
--- a/pkgs/tools/networking/slirp4netns/default.nix
+++ b/pkgs/tools/networking/slirp4netns/default.nix
@ -12,13 +12,13 @@

 stdenv.mkDerivation rec {
  pname = "slirp4netns";
-  version = "1.1.11";
+  version = "1.1.12";

  src = fetchFromGitHub {
    owner = "rootless-containers";
    repo = "slirp4netns";
    rev = "v${version}";
-    sha256 = "sha256-Gxcu9XlLPLcFUoCDrMeWJ6SGUSHU9ZKPHq1oBvmNoJ8=";
+    sha256 = "sha256-NhE5XxInNfGN6hTyZItc7+4HBjcyBLAFTpirEidcipk=";
  };

  nativeBuildInputs = [ autoreconfHook pkg-config ];
--- a/pkgs/tools/security/exploitdb/default.nix
+++ b/pkgs/tools/security/exploitdb/default.nix
@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  pname = "exploitdb";
-  version = "2021-07-30";
+  version = "2021-08-03";

  src = fetchFromGitHub {
    owner = "offensive-security";
    repo = pname;
    rev = version;
-    sha256 = "sha256-7gMhp5MR4RFPv8Ob9SR3XvapPIt5llf3CspW4Yu7Puo=";
+    sha256 = "sha256-cgd4J6d493uQRo079eq7CjjmhofPeuafS0mWAjVfOck=";
  };

  installPhase = ''
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@ -73,6 +73,7 @@ mapAliases ({
  setuptools_scm = setuptools-scm; # added 2021-06-03
  smart_open = smart-open; # added 2021-03-14
  smmap2 = throw "smmap2 has been deprecated, use smmap instead."; # added 2020-03-14
+  sphinxcontrib_plantuml = sphinxcontrib-plantuml;
  topydo = throw "python3Packages.topydo was moved to topydo"; # 2017-09-22
  tvnamer = throw "python3Packages.tvnamer was moved to tvnamer"; # 2021-07-05
  websocket_client = websocket-client;
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@ -8256,7 +8256,7 @@ in {

  sphinxcontrib-openapi = callPackage ../development/python-modules/sphinxcontrib-openapi { };

-  sphinxcontrib_plantuml = callPackage ../development/python-modules/sphinxcontrib_plantuml {
+  sphinxcontrib-plantuml = callPackage ../development/python-modules/sphinxcontrib-plantuml {
    inherit (pkgs) plantuml;
  };