diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-11-24 18:01:24 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-24 18:01:24 +0000 |
| commit | 9c362ea6019005051024244fd02171ccd72b7801 (patch) | |
| tree | 934c92144866efc929377d9ed98252a5ae1f9d2c /pkgs/servers | |
| parent | 4770ebe75cb932dd7f7941e0360e65832d05f6de (diff) | |
| parent | 8af08668463ac1bfa35d07ee9a161f841499bb0c (diff) | |
| download | nixlib-9c362ea6019005051024244fd02171ccd72b7801.tar nixlib-9c362ea6019005051024244fd02171ccd72b7801.tar.gz nixlib-9c362ea6019005051024244fd02171ccd72b7801.tar.bz2 nixlib-9c362ea6019005051024244fd02171ccd72b7801.tar.lz nixlib-9c362ea6019005051024244fd02171ccd72b7801.tar.xz nixlib-9c362ea6019005051024244fd02171ccd72b7801.tar.zst nixlib-9c362ea6019005051024244fd02171ccd72b7801.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/miniflux/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/servers/pulseaudio/qpaeq.nix | 2 |
2 files changed, 11 insertions, 2 deletions
diff --git a/pkgs/servers/miniflux/default.nix b/pkgs/servers/miniflux/default.nix index 88244b78e220..85038a616450 100644 --- a/pkgs/servers/miniflux/default.nix +++ b/pkgs/servers/miniflux/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGo121Module, fetchFromGitHub, installShellFiles, nixosTests }: +{ lib, buildGo121Module, fetchFromGitHub, fetchpatch, installShellFiles, nixosTests }: let pname = "miniflux"; @@ -14,6 +14,15 @@ in buildGo121Module { sha256 = "sha256-+oNF/Zwc1Z/cu3SQC/ZTekAW5Qef9RKrdszunLomGII="; }; + patches = [ + (fetchpatch { + # https://github.com/miniflux/v2/pull/2193, remove after 2.0.50 + name = "miniflux-user-agent-regression.patch"; + url = "https://github.com/miniflux/v2/commit/7a03291442a4e35572c73a2fcfe809fa8e03063e.patch"; + hash = "sha256-tJ1l5rqD0x0xtQs+tDwpFHOY+7k6X02bkwVJo6RAdb8="; + }) + ]; + vendorHash = "sha256-jLyjQ+w/QS9uA0pGWF2X6dEfOifcI2gC2sgi1STEzpU="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/servers/pulseaudio/qpaeq.nix b/pkgs/servers/pulseaudio/qpaeq.nix index 3761453f446b..843ca539daf8 100644 --- a/pkgs/servers/pulseaudio/qpaeq.nix +++ b/pkgs/servers/pulseaudio/qpaeq.nix @@ -48,7 +48,7 @@ mkDerivation rec { description = "An equalizer interface for pulseaudio's equalizer sinks"; homepage = "http://www.pulseaudio.org/"; license = lib.licenses.lgpl2Plus; - maintainers = with lib.maintainers; [ lovek323 mkg20001 ]; + maintainers = with lib.maintainers; [ lovek323 ]; platforms = lib.platforms.unix; }; } |