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: 770d3ca49109
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e542fc2c94db
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 1, 2019

  1. mosquitto: 1.5.4 -> 1.5.5 

    Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/mosquitto/versions

(cherry picked from commit 9496a0e)
    @r-ryantm @peterhoeg
    r-ryantm authored and peterhoeg committed Mar 1, 2019
    Copy the full SHA
    64ebd78 View commit details

  2. mosquitto: 1.5.5 -> 1.5.8 

    (cherry picked from commit 5638a1c)
    @peterhoeg
    peterhoeg committed Mar 1, 2019
    Copy the full SHA
    0ab7392 View commit details

Commits on Mar 4, 2019

  1. Merge pull request #56572 from peterhoeg/u/mqtt_stable 

    mosquitto: 1.5.4 -> 1.5.8
    @peterhoeg
    peterhoeg authored Mar 4, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e542fc2 View commit details
Showing with 17 additions and 7 deletions.
  1. +17 −7 pkgs/servers/mqtt/mosquitto/default.nix
24 changes: 17 additions & 7 deletions pkgs/servers/mqtt/mosquitto/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,35 +1,45 @@
{ 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 {
name = "mosquitto-${version}";
version = "1.5.4";
version = "1.5.8";

src = fetchFromGitHub {
owner = "eclipse";
repo = "mosquitto";
rev = "v${version}";
sha256 = "0pb38y6m682xqrkzhp41mj54x5ic43761xzschgnw055mzksbgk2";
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 true
done
# the manpages are not generated when using cmake
pushd man
make
popd
'';

buildInputs = [ openssl libuuid libwebsockets c-ares libuv ];
buildInputs = [
openssl libuuid libwebsockets c-ares libuv
];

nativeBuildInputs = [ cmake docbook_xsl libxslt ];

enableParallelBuilding = true;

cmakeFlags = [
"-DWITH_THREADING=ON"
"-DWITH_WEBSOCKETS=ON"
];

meta = with stdenv.lib; {