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

Merge master into staging-next

parents 07f01fb4 dbe57759

maintainers/maintainer-list.nix

+6 −0
Original line number Diff line number Diff line
@@ -16183,6 +16183,12 @@ 
    githubId = 39039420;

    name = "Quinn Dougherty";

  };

  qusic = {

    email = "qusicx@gmail.com";

    github = "Qusic";

    githubId = 2141853;

    name = "Bang Lee";

  };

  qyliss = {

    email = "hi@alyssa.is";

    github = "alyssais";

nixos/modules/services/misc/libreddit.nix

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ in 
        after = [ "network.target" ];

        serviceConfig = {

          DynamicUser = true;

          ExecStart = "${cfg.package}/bin/libreddit ${args}";

          ExecStart = "${lib.getExe cfg.package} ${args}";

          AmbientCapabilities = lib.mkIf (cfg.port < 1024) [ "CAP_NET_BIND_SERVICE" ];

          Restart = "on-failure";

          RestartSec = "2s";

pkgs/applications/blockchains/trezor-suite/default.nix

+0 −3
Original line number Diff line number Diff line
@@ -53,9 +53,6 @@ appimageTools.wrapType2 rec { 
  '';



  meta = with lib; {

    # trezor-suite fails to detect a connected hardware wallet

    # ref: https://github.com/NixOS/nixpkgs/issues/281975

    broken = true;

    description = "Trezor Suite - Desktop App for managing crypto";

    homepage = "https://suite.trezor.io";

    changelog = "https://github.com/trezor/trezor-suite/releases/tag/v${version}";

pkgs/applications/emulators/mame/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -38,14 +38,14 @@ let 
in

stdenv.mkDerivation rec {

  pname = "mame";

  version = "0.263";

  version = "0.264";

  srcVersion = builtins.replaceStrings [ "." ] [ "" ] version;



  src = fetchFromGitHub {

    owner = "mamedev";

    repo = "mame";

    rev = "mame${srcVersion}";

    hash = "sha256-6MH4dMGOekiiq4yE68dIAiWWfvQvFcvqKtT/Z1SQ1aY=";

    hash = "sha256-0UWMBKM//XWm8PFl60JvTLGaDBMVZFnVrbX4omy2F4I=";

  };



  outputs = [ "out" "tools" ];

pkgs/applications/graphics/komikku/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 


python3.pkgs.buildPythonApplication rec {

  pname = "komikku";

  version = "1.38.1";

  version = "1.39.0";



  format = "other";
@@ -28,7 +28,7 @@ python3.pkgs.buildPythonApplication rec { 
    owner = "valos";

    repo = "Komikku";

    rev = "v${version}";

    hash = "sha256-eVNW8Iuhee9WBbiXP7ijvd0K44/IpwdrdiT4RkBNcxI=";

    hash = "sha256-bAk+F81q0sPSgU8LkpniVJyKaQt6cxUaUzNSZ3f5v0Q=";

  };



  nativeBuildInputs = [