diff options
| author | Martin Weinelt <mweinelt@users.noreply.github.com> | 2021-09-02 13:00:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-02 13:00:35 +0200 |
| commit | 8db3d390365573831fed79d8e727616e8e2d420f (patch) | |
| tree | efbd28a73f190deb02679c779c31572368639aeb | |
| parent | Merge branch 'staging-next-21.05' into release-21.05 (diff) | |
| parent | mosquitto: 2.0.11 -> 2.0.12 (diff) | |
| download | nixpkgs-8db3d390365573831fed79d8e727616e8e2d420f.tar.gz | |
Merge pull request #136450 from LeSuisse/mosquitto-2.0.12-21.05
| -rw-r--r-- | pkgs/servers/mqtt/mosquitto/default.nix | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/pkgs/servers/mqtt/mosquitto/default.nix b/pkgs/servers/mqtt/mosquitto/default.nix index 9e251e1bc224..67200f5515a9 100644 --- a/pkgs/servers/mqtt/mosquitto/default.nix +++ b/pkgs/servers/mqtt/mosquitto/default.nix @@ -12,19 +12,29 @@ , openssl , withSystemd ? stdenv.isLinux , systemd +, fetchpatch }: stdenv.mkDerivation rec { pname = "mosquitto"; - version = "2.0.10"; + version = "2.0.12"; src = fetchFromGitHub { owner = "eclipse"; repo = pname; rev = "v${version}"; - sha256 = "144vw7b9ja4lci4mplbxs048x9aixd9c3s7rg6wc1k31w099rb12"; + sha256 = "0bn6vpk6gdxrnm3aw3j2g0ny6cx2arv8pmv4x8302pr6qcrz57s6"; }; + patches = lib.optionals stdenv.isDarwin [ + (fetchpatch { + name = "revert-cmake-shared-to-module.patch"; # See https://github.com/eclipse/mosquitto/issues/2277 + url = "https://github.com/eclipse/mosquitto/commit/e21eaeca37196439b3e89bb8fd2eb1903ef94845.patch"; + sha256 = "14syi2c1rks8sl2aw09my276w45yq1iasvzkqcrqwy4drdqrf069"; + revert = true; + }) + ]; + postPatch = '' for f in html manpage ; do substituteInPlace man/$f.xsl \ |