Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

mosquitto: 2.0.18 -> 2.0.20 #349233

Merged
merged 1 commit into from
Oct 23, 2024
Merged

mosquitto: 2.0.18 -> 2.0.20 #349233

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 2 additions & 12 deletions pkgs/servers/mqtt/mosquitto/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd
, systemd
, uthash
, fetchpatch
, nixosTests
}:

Expand All @@ -30,24 +29,15 @@ let
in
stdenv.mkDerivation rec {
pname = "mosquitto";
version = "2.0.18";
version = "2.0.20";

src = fetchFromGitHub {
owner = "eclipse";
repo = "mosquitto";
rev = "v${version}";
hash = "sha256-Vs0blV2IhnlEAm0WtOartz+0vLesJfp78FNJCivRxHk=";
hash = "sha256-oZo6J6mxMC05jJ8RXIunOMB3kptA6FElchKlg4qmuQ8=";
};

patches = lib.optionals stdenv.hostPlatform.isDarwin [
(fetchpatch {
datafoo marked this conversation as resolved.
Show resolved Hide resolved
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;
})
];

Comment on lines -42 to -50
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@LeSuisse you added the patch section in commit ded0f0e, do you have any inputs on removing it?

postPatch = ''
for f in html manpage ; do
substituteInPlace man/$f.xsl \
Expand Down