Unverified Commit 862c972c authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge staging-next into staging

parents 757bec77 665b0409

maintainers/maintainer-list.nix

+6 −0
Original line number Diff line number Diff line
@@ -10330,6 +10330,12 @@ 
    githubId = 3073833;

    name = "Massimo Redaelli";

  };

  mrene = {

    email = "mathieu.rene@gmail.com";

    github = "mrene";

    githubId = 254443;

    name = "Mathieu Rene";

  };

  mrfreezeex = {

    email = "arthur@cri.epita.fr";

    github = "MrFreezeex";

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

+1 −1
Original line number Diff line number Diff line
@@ -1112,7 +1112,7 @@ in { 
          ${optionalString (cfg.nginx.recommendedHttpHeaders) ''

            add_header X-Content-Type-Options nosniff;

            add_header X-XSS-Protection "1; mode=block";

            add_header X-Robots-Tag none;

            add_header X-Robots-Tag "noindex, nofollow";

            add_header X-Download-Options noopen;

            add_header X-Permitted-Cross-Domain-Policies none;

            add_header X-Frame-Options sameorigin;

pkgs/applications/audio/minidsp/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -35,6 +35,6 @@ rustPlatform.buildRustPackage rec { 
    homepage = "https://github.com/mrene/minidsp-rs";

    license = licenses.asl20;

    platforms = platforms.linux ++ platforms.darwin;

    maintainers = [maintainers.adamcstephens];

    maintainers = [maintainers.adamcstephens maintainers.mrene];

  };

}

pkgs/applications/file-managers/portfolio-filemanager/default.nix

+10 −3
Original line number Diff line number Diff line
@@ -13,11 +13,12 @@ 
, ninja

, pkg-config

, wrapGAppsHook

, nix-update-script

}:



python3.pkgs.buildPythonApplication rec {

  pname = "portfolio";

  version = "0.9.14";

  version = "0.9.15";



  format = "other";
@@ -25,7 +26,7 @@ python3.pkgs.buildPythonApplication rec { 
    owner = "tchx84";

    repo = "Portfolio";

    rev = "v${version}";

    hash = "sha256-mrb202ON0B6VlY+U+jN0jJmbT36jQ8krNnuODynaCUA=";

    hash = "sha256-/OwHeeUjpjm35O7mySoAfKt7Rsp1EK2WE+tfiV3oiQg=";

  };



  postPatch = ''
@@ -65,12 +66,18 @@ python3.pkgs.buildPythonApplication rec { 
    ln -s dev.tchx84.Portfolio "$out/bin/portfolio"

  '';



  passthru = {

    updateScript = nix-update-script {

      attrPath = "portfolio-filemanager";

    };

  };



  meta = with lib; {

    description = "A minimalist file manager for those who want to use Linux mobile devices";

    homepage = "https://github.com/tchx84/Portfolio";

    changelog = "https://github.com/tchx84/Portfolio/blob/v${version}/CHANGELOG.md";

    license = licenses.gpl3Plus;

    platforms = platforms.linux;

    maintainers = with maintainers; [ dotlambda ];

    maintainers = with maintainers; [ dotlambda chuangzhu ];

  };

}

pkgs/applications/graphics/jpegoptim/default.nix

+3 −11
Original line number Diff line number Diff line 
{ lib, stdenv, fetchFromGitHub, fetchpatch, libjpeg }:

{ lib, stdenv, fetchFromGitHub, libjpeg }:



stdenv.mkDerivation rec {

  version = "1.5.2";

  version = "1.5.3";

  pname = "jpegoptim";



  src = fetchFromGitHub {

    owner = "tjko";

    repo = pname;

    rev = "v${version}";

    sha256 = "sha256-PROQvOqsis8we58OOZ/kuY+L/CoV7XfnY9wvrpsTJu8=";

    sha256 = "sha256-vNjXY/Qz6IT7rV+as2EBkSWd4O98slcXLNgAO9Dkc9E=";

  };



  patches = [

    (fetchpatch {

      name = "CVE-2023-27781.patch";

      url = "https://github.com/tjko/jpegoptim/commit/29a073ad297a0954f5e865264e24755d0ffe53ed.patch";

      hash = "sha256-YUjVg0cvElhzMG3b4t5bqcqnHAuzDoNvSqe0yvlgX4E=";

    })

  ];



  # There are no checks, it seems.

  doCheck = false;