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

Merge master into staging-next

parents 3a6265b8 b00f1962

maintainers/maintainer-list.nix

+12 −0
Original line number Diff line number Diff line
@@ -2034,6 +2034,12 @@ 
    githubId = 687218;

    name = "averelld";

  };

  avery = {

    email = "nixpkgs@avery.cafe";

    github = "coolavery";

    githubId = 76545554;

    name = "Avery";

  };

  avh4 = {

    email = "gruen0aermel@gmail.com";

    github = "avh4";
@@ -7213,6 +7219,12 @@ 
    githubId = 40209356;

    name = "Gabriel Doriath Döhler";

  };

  gdifolco = {

    email = "gautier.difolco@gmail.com";

    github = "blackheaven";

    githubId = 1362807;

    name = "Gautier Di Folco";

  };

  gdinh = {

    email = "nix@contact.dinh.ai";

    github = "gdinh";

nixos/modules/services/networking/sunshine.nix

+8 −1
Original line number Diff line number Diff line
@@ -32,6 +32,13 @@ in 
        Whether to give the Sunshine binary CAP_SYS_ADMIN, required for DRM/KMS screen capture.

      '';

    };

    autoStart = mkOption {

      type = bool;

      default = true;

      description = ''

        Whether sunshine should be started automatically.

      '';

    };

    settings = mkOption {

      default = { };

      description = ''
@@ -135,7 +142,7 @@ in 
    systemd.user.services.sunshine = {

      description = "Self-hosted game stream host for Moonlight";



      wantedBy = [ "graphical-session.target" ];

      wantedBy = mkIf cfg.autoStart [ "graphical-session.target" ];

      partOf = [ "graphical-session.target" ];

      wants = [ "graphical-session.target" ];

      after = [ "graphical-session.target" ];

pkgs/applications/file-managers/nnn/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: { 
  meta = with lib; {

    description = "Small ncurses-based file browser forked from noice";

    homepage = "https://github.com/jarun/nnn";

    changelog = "https://github.com/jarun/nnn/blob/v${version}/CHANGELOG";

    changelog = "https://github.com/jarun/nnn/blob/v${finalAttrs.version}/CHANGELOG";

    license = licenses.bsd2;

    platforms = platforms.all;

    maintainers = with maintainers; [ Br1ght0ne ];

pkgs/applications/graphics/pdfcpu/default.nix

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


buildGoModule rec {

  pname = "pdfcpu";

  version = "0.7.0";

  version = "0.8.0";



  src = fetchFromGitHub {

    owner = "pdfcpu";

    repo = pname;

    rev = "v${version}";

    hash = "sha256-FzlukSQSKeQY6H53UfWXwL8bXkOXRhaA92/Kgxh4oms=";

    hash = "sha256-E1D2DvwwrtlY06kvCZkoAO5VcdtkBJYLcxuqGsulFUA=";

    # Apparently upstream requires that the compiled executable will know the

    # commit hash and the date of the commit. This information is also presented

    # in the output of `pdfcpu version` which we use as a sanity check in the
@@ -31,7 +31,7 @@ buildGoModule rec { 
    '';

  };



  vendorHash = "sha256-jVX/CFf9dd9qD3gyGVDjbfINtPLCsgdjWFix4BCpDZ0=";

  vendorHash = "sha256-4k4aZnQ9SjcGr/ziCacfcVfVk7w4Qhli2rOeYE76Qs0=";



  ldflags = [

    "-s"

pkgs/applications/graphics/upscayl/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -4,11 +4,11 @@ 
  lib,

}: let

  pname = "upscayl";

  version = "2.10.0";

  version = "2.11.0";



  src = fetchurl {

    url = "https://github.com/upscayl/upscayl/releases/download/v${version}/upscayl-${version}-linux.AppImage";

    hash = "sha256-nRYNYNHIkbvvQZd1zRDCCsCadgRgV/yn9WfaKjt44O8=";

    hash = "sha256-XhvOzARP8Ytlf23vNMYZ5x1UKvKOlM/69yhysasW3dA=";

  };



  appimageContents = appimageTools.extractType2 {