Unverified Commit 3ab7eb53 authored by nixpkgs-ci[bot]'s avatar nixpkgs-ci[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents a0befb49 839a7d6d
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ The manpages must have a section suffix, and may optionally be compressed (with
{
  nativeBuildInputs = [ installShellFiles ];

  # Sometimes the manpage file has an undersirable name; e.g., it conflicts with
  # Sometimes the manpage file has an undesirable name; e.g., it conflicts with
  # another software with an equal name. To install it with a different name,
  # the installed name must be provided before the path to the file.
  #
+0 −6
Original line number Diff line number Diff line
@@ -2088,12 +2088,6 @@
    githubId = 8049011;
    name = "Arik Grahl";
  };
  aristid = {
    email = "aristidb@gmail.com";
    github = "aristidb";
    githubId = 30712;
    name = "Aristid Breitkreuz";
  };
  ariutta = {
    email = "anders.riutta@gmail.com";
    github = "ariutta";
+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ in
  config = mkIf cfg.enable {
    environment.systemPackages = [ cfg.package ];
    systemd.packages = [ cfg.package ];
    systemd.user.services.orca.wantedBy = [ "graphical-session.target" ];
    services.speechd.enable = true;
  };
}
+0 −1
Original line number Diff line number Diff line
@@ -226,7 +226,6 @@ in
            gnome-menus
            adwaita-icon-theme
            gtk3.out # for gtk-launch program
            onboard
            sound-theme-freedesktop
            xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/
          ])
+0 −1
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ in
  name = "containers-bridge";
  meta = {
    maintainers = with lib.maintainers; [
      aristid
      aszlig
    ];
  };
Loading