Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d17ab805fd8d
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7354d9de1f46
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 25, 2018

  1. mosquitto: 1.4.15 -> 1.5.3 

    Use cmake on all platforms instead of only macos.
    @peterhoeg
    peterhoeg committed Oct 25, 2018
    Copy the full SHA
    a45fa35 View commit details

  2. Merge pull request #49088 from peterhoeg/u/mqtt 

    mosquitto: 1.4.15 -> 1.5.3
    @srhb
    srhb authored Oct 25, 2018
    Copy the full SHA
    7354d9d View commit details
Showing with 38 additions and 23 deletions.
  1. +38 −23 pkgs/servers/mqtt/mosquitto/default.nix
61 changes: 38 additions & 23 deletions pkgs/servers/mqtt/mosquitto/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,36 +1,51 @@
{ stdenv, fetchurl, openssl, libuuid, cmake, libwebsockets, c-ares, libuv }:
{ stdenv, fetchFromGitHub, fetchpatch, cmake, docbook_xsl, libxslt
, openssl, libuuid, libwebsockets, c-ares, libuv }:

stdenv.mkDerivation rec {
pname = "mosquitto";
version = "1.4.15";
name = "mosquitto-${version}";
version = "1.5.3";

name = "${pname}-${version}";

src = fetchurl {
url = "http://mosquitto.org/files/source/mosquitto-${version}.tar.gz";
sha256 = "10wsm1n4y61nz45zwk4zjhvrfd86r2cq33370m5wjkivb8j3wfvx";
src = fetchFromGitHub {
owner = "eclipse";
repo = "mosquitto";
rev = "v${version}";
sha256 = "0bknmnvssix7c1cps6mzjjnw9zxdlyfsy6ksqx4zfglcw41p8gnz";
};

buildInputs = [ openssl libuuid libwebsockets c-ares libuv ]
++ stdenv.lib.optional stdenv.isDarwin cmake;

makeFlags = stdenv.lib.optionals stdenv.isLinux [
"DESTDIR=$(out)"
"PREFIX="
patches = [
# https://github.com/eclipse/mosquitto/issues/983
(fetchpatch {
url = "https://github.com/eclipse/mosquitto/commit/7f1419e4de981f5cc38aa3a9684369b1de27ba46.patch";
sha256 = "05npr0h79mbaxzjyhdw78hi9gs1cwydf2fv67bqxm81jzj2yhx2s";
name = "fix_threading_on_cmake.patch";
})
];

postPatch = ''
substituteInPlace config.mk \
--replace "/usr/local" ""
substituteInPlace config.mk \
--replace "WITH_WEBSOCKETS:=no" "WITH_WEBSOCKETS:=yes"
substituteInPlace man/manpage.xsl \
--replace /usr/share/xml/docbook/stylesheet/ ${docbook_xsl}/share/xml/
# the manpages are not generated when using cmake
pushd man
make
popd
'';

meta = {
homepage = http://mosquitto.org/;
buildInputs = [ openssl libuuid libwebsockets c-ares libuv ];

nativeBuildInputs = [ cmake docbook_xsl libxslt ];

enableParallelBuilding = true;

cmakeFlags = [
"-DWITH_THREADING=ON"
];

meta = with stdenv.lib; {
description = "An open source MQTT v3.1/3.1.1 broker";
platforms = stdenv.lib.platforms.unix;
# http://www.eclipse.org/legal/epl-v10.html (free software, copyleft)
license = stdenv.lib.licenses.epl10;
homepage = http://mosquitto.org/;
license = licenses.epl10;
maintainers = with maintainers; [ peterhoeg ];
platforms = platforms.unix;
};
}