Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ee9df2b79b35
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6f07d27625f2
Choose a head ref
  • 5 commits
  • 2 files changed
  • 5 contributors

Commits on Oct 26, 2018

  1. mosquitto: 1.4.14 -> 1.4.15 

    Semi-automatic update. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.4.15 with grep in /nix/store/7nifpbj16dlhljb2jwbwxyv4wx1zwa1y-mosquitto-1.4.15
- found 1.4.15 in filename of file in /nix/store/7nifpbj16dlhljb2jwbwxyv4wx1zwa1y-mosquitto-1.4.15

(cherry picked from commit a28a2e3)
    @ryantm @andir
    ryantm authored and andir committed Oct 26, 2018
    Copy the full SHA
    559a4a3 View commit details

  2. mosquitto: 1.4.15 -> 1.5.3 

    Use cmake on all platforms instead of only macos.

(cherry picked from commit a45fa35)
    @peterhoeg @andir
    peterhoeg authored and andir committed Oct 26, 2018
    Copy the full SHA
    c7d5cbc View commit details

  3. nixos/trezord: revised and updated udev rules 

    (cherry picked from commit a88e0ef)
    Ján Hrnko committed Oct 26, 2018
    Copy the full SHA
    4d6e4b9 View commit details

Commits on Oct 27, 2018

  1. Merge pull request #49187 from andir/18.03/mosquitto 

    [18.03] mosquitto: 1.4.14 ->1.5.3
    @andir
    andir authored Oct 27, 2018
    Copy the full SHA
    02fc3d3 View commit details

  2. Merge pull request #49157 from 1000101/backport-release-18.03 

    [18.03] nixos/trezord: revised and updated udev rules
    @infinisil
    infinisil authored Oct 27, 2018
    Copy the full SHA
    6f07d27 View commit details
Showing with 43 additions and 28 deletions.
  1. +5 −5 nixos/modules/services/hardware/trezord.nix
  2. +38 −23 pkgs/servers/mqtt/mosquitto/default.nix
10 changes: 5 additions & 5 deletions nixos/modules/services/hardware/trezord.nix
View file
Original file line number Diff line number Diff line change
@@ -27,13 +27,13 @@ in {
destination = "/etc/udev/rules.d/51-trezor.rules";
text = ''
# TREZOR v1 (One)
SUBSYSTEM=="usb", ATTR{idVendor}=="534c", ATTR{idProduct}=="0001", MODE="0666", GROUP="dialout", TAG+="uaccess", TAG+="udev-acl", SYMLINK+="trezor%n"
KERNEL=="hidraw*", ATTRS{idVendor}=="534c", ATTRS{idProduct}=="0001", MODE="0666", GROUP="dialout", TAG+="uaccess", TAG+="udev-acl"
SUBSYSTEM=="usb", ATTR{idVendor}=="534c", ATTR{idProduct}=="0001", MODE="0660", GROUP="trezord", TAG+="uaccess", SYMLINK+="trezor%n"
KERNEL=="hidraw*", ATTRS{idVendor}=="534c", ATTRS{idProduct}=="0001", MODE="0660", GROUP="trezord", TAG+="uaccess"
# TREZOR v2 (T)
SUBSYSTEM=="usb", ATTR{idVendor}=="1209", ATTR{idProduct}=="53c0", MODE="0661", GROUP="dialout", TAG+="uaccess", TAG+="udev-acl", SYMLINK+="trezor%n"
SUBSYSTEM=="usb", ATTR{idVendor}=="1209", ATTR{idProduct}=="53c1", MODE="0666", GROUP="dialout", TAG+="uaccess", TAG+="udev-acl", SYMLINK+="trezor%n"
KERNEL=="hidraw*", ATTRS{idVendor}=="1209", ATTRS{idProduct}=="53c1", MODE="0666", GROUP="dialout", TAG+="uaccess", TAG+="udev-acl"
SUBSYSTEM=="usb", ATTR{idVendor}=="1209", ATTR{idProduct}=="53c0", MODE="0660", GROUP="trezord", TAG+="uaccess", SYMLINK+="trezor%n"
SUBSYSTEM=="usb", ATTR{idVendor}=="1209", ATTR{idProduct}=="53c1", MODE="0660", GROUP="trezord", TAG+="uaccess", SYMLINK+="trezor%n"
KERNEL=="hidraw*", ATTRS{idVendor}=="1209", ATTRS{idProduct}=="53c1", MODE="0660", GROUP="trezord", TAG+="uaccess"
'';
});

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.14";
name = "mosquitto-${version}";
version = "1.5.3";

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

src = fetchurl {
url = "http://mosquitto.org/files/source/mosquitto-${version}.tar.gz";
sha256 = "1la2577h7hcyj7lq26vizj0sh2zmi9m7nbxjp3aalayi66kiysqm";
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;
};
}