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: bc7de5b5b14e
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ce16af3c0a8a
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Apr 5, 2019

  1. mosquitto: 1.5.5 -> 1.5.8 and add systemd support 

    (cherry picked from commit 5638a1c)
    @peterhoeg @globin
    peterhoeg authored and globin committed Apr 5, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ce16af3 View commit details
Showing with 18 additions and 10 deletions.
  1. +18 −10 pkgs/servers/mqtt/mosquitto/default.nix
28 changes: 18 additions & 10 deletions pkgs/servers/mqtt/mosquitto/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,29 @@
{ stdenv, fetchFromGitHub, fetchpatch, cmake, docbook_xsl, libxslt
, openssl, libuuid, libwebsockets, c-ares, libuv }:
{ stdenv, lib, fetchFromGitHub, fetchpatch, cmake, docbook_xsl, libxslt
, openssl, libuuid, libwebsockets, c-ares, libuv
, systemd ? null }:

stdenv.mkDerivation rec {
let
withSystemd = stdenv.isLinux;

in stdenv.mkDerivation rec {
name = "mosquitto-${version}";
version = "1.5.5";
version = "1.5.8";

src = fetchFromGitHub {
owner = "eclipse";
repo = "mosquitto";
rev = "v${version}";
sha256 = "1sfwmvrglfy5gqfk004kvbjldqr36dqz6xmppbgfhr47j5zs66xc";
sha256 = "1rf8g6fq7g1mhwsajsgvvlynasybgc51v0qg5j6ynsxfh8yi7s6r";
};

postPatch = ''
substituteInPlace man/manpage.xsl \
--replace /usr/share/xml/docbook/stylesheet/ ${docbook_xsl}/share/xml/
for f in html manpage ; do
substituteInPlace man/$f.xsl \
--replace http://docbook.sourceforge.net/release/xsl/current ${docbook_xsl}/share/xml/docbook-xsl
done
for f in {lib,lib/cpp,src}/CMakeLists.txt ; do
substituteInPlace $f --replace /sbin/ldconfig ldconfig
substituteInPlace $f --replace /sbin/ldconfig true
done
# the manpages are not generated when using cmake
@@ -26,7 +32,9 @@ stdenv.mkDerivation rec {
popd
'';

buildInputs = [ openssl libuuid libwebsockets c-ares libuv ];
buildInputs = [
openssl libuuid libwebsockets c-ares libuv
] ++ lib.optional withSystemd systemd;

nativeBuildInputs = [ cmake docbook_xsl libxslt ];

@@ -35,7 +43,7 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DWITH_THREADING=ON"
"-DWITH_WEBSOCKETS=ON"
];
] ++ lib.optional withSystemd "-DWITH_SYSTEMD=ON";

meta = with stdenv.lib; {
description = "An open source MQTT v3.1/3.1.1 broker";