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

Merge staging-next into staging

parents 6debf763 14c85cbf

maintainers/maintainer-list.nix

+0 −11
Original line number Diff line number Diff line
@@ -279,12 +279,6 @@ 
    githubId = 43320117;

    name = "Sebastian Marquardt";

  };

  _8aed = {

    email = "8aed@riseup.net";

    github = "8aed";

    githubId = 140662578;

    name = "Huit Aed";

  };

  _9999years = {

    email = "rbt@fastmail.com";

    github = "9999years";
@@ -25566,11 +25560,6 @@ 
    github = "tfkhdyt";

    githubId = 47195537;

  };

  tfmoraes = {

    name = "Thiago Franco de Moraes";

    github = "tfmoraes";

    githubId = 351108;

  };

  tg-x = {

    email = "*@tg-x.net";

    github = "tg-x";

nixos/modules/services/web-apps/onlyoffice.nix

+1 −1
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ in 
              '';

            "~* ^(\\/cache\\/files.*)(\\/.*)".extraConfig = ''

              alias /var/lib/onlyoffice/documentserver/App_Data$1;

              more_set_headers Content-Disposition "attachment; filename*=UTF-8''$arg_filename";

              more_set_headers "Content-Disposition: attachment; filename*=UTF-8''$arg_filename";



              set $secure_link_secret verysecretstring;

              secure_link $arg_md5,$arg_expires;

pkgs/by-name/ba/bash_unit/package.nix

+3 −3
Original line number Diff line number Diff line
@@ -6,13 +6,13 @@ 


stdenv.mkDerivation rec {

  pname = "bash_unit";

  version = "2.3.2";

  version = "2.3.3";



  src = fetchFromGitHub {

    owner = "pgrange";

    owner = "bash-unit";

    repo = "bash_unit";

    rev = "v${version}";

    sha256 = "sha256-n5ehN7NrWID72xP7EYOk/mpnQJaDn71esIugWrLbZr0=";

    hash = "sha256-uRUqa6sXaXXDes9JjyTsMlA+nYdTGdioM0/y2XDIiEw=";

  };



  patchPhase = ''

pkgs/by-name/ch/chatterino2/common.nix

+6 −1
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ 
  libnotify,

  libavif,

  kdePackages,

  autoPatchelfHook,

  libpulseaudio,

}:



stdenv.mkDerivation {
@@ -17,7 +19,8 @@ stdenv.mkDerivation { 
    cmake

    pkg-config

    kdePackages.wrapQtAppsHook

  ];

  ]

  ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];



  buildInputs =

    (with kdePackages; [
@@ -38,6 +41,8 @@ stdenv.mkDerivation { 
    ]

    ++ lib.optional enableAvifSupport libavif;



  runtimeDependencies = lib.optionals stdenv.hostPlatform.isLinux [ libpulseaudio ];



  preConfigure = ''

    if [[ -f "$src/GIT_HASH" ]]; then

      export GIT_HASH="$(cat $src/GIT_HASH)"

pkgs/by-name/el/element-desktop/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -112,8 +112,8 @@ stdenv.mkDerivation ( 
      ln -s $out/share/element/electron/lib/i18n/strings/en{-us,}.json



      # icon

      mkdir -p "$out/share/icons/hicolor/icon/apps"

      ln -s "$out/share/element/electron/build/icon.png" "$out/share/icons/hicolor/icon/apps/element.png"

      mkdir -p "$out/share/icons/hicolor/512x512/apps"

      ln -s "$out/share/element/electron/build/icon.png" "$out/share/icons/hicolor/512x512/apps/element.png"



      # desktop item

      mkdir -p "$out/share"