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: 28a53c8a08a1
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6950da832df9
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Sep 19, 2017

  1. libwebsockets: 1.4 -> 2.3.0

    @Mic92
    volth authored and Mic92 committed Sep 19, 2017
    Copy the full SHA
    4916f64 View commit details

  2. mosquitto: 1.4 -> 1.4.14 

    fixes #29567
    @Mic92
    Volth authored and Mic92 committed Sep 19, 2017
    Copy the full SHA
    6950da8 View commit details
Showing with 16 additions and 14 deletions.
  1. +11 −8 pkgs/development/libraries/libwebsockets/default.nix
  2. +5 −6 pkgs/servers/mqtt/mosquitto/default.nix
19 changes: 11 additions & 8 deletions pkgs/development/libraries/libwebsockets/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@
{ fetchgit, stdenv, cmake, openssl, zlib }:
{ fetchFromGitHub, stdenv, cmake, openssl, zlib, libuv }:

stdenv.mkDerivation rec {
name = "libwebsockets-1.4";
name = "libwebsockets-${version}";
version = "2.3.0";

src = fetchgit {
url = "git://git.libwebsockets.org/libwebsockets";
rev = "16fb0132cec0fcced29bce6d86eaf94a9beb9785";
sha256 = "0gk4dgx125nz7wl59bx0kgxxg261r9kyxvdff5ld98slr9f08d0l";
src = fetchFromGitHub {
owner = "warmcat";
repo = "libwebsockets";
rev = "v${version}";
sha256 = "1hv2b5r6sg42xnqhm4ysjvyiz3cqpfmwaqm33vpbx0k7arj4ixvy";
};

buildInputs = [ cmake openssl zlib ];
propagatedBuildInputs = [ libuv ];
cmakeFlags = [ "-DLWS_WITH_PLUGINS=ON" ];

meta = {
description = "Light, portable C library for websockets";
@@ -19,8 +23,7 @@ stdenv.mkDerivation rec {
throughput in both directions.
'';
homepage = https://libwebsockets.org/trac/libwebsockets;
# See http://git.libwebsockets.org/cgi-bin/cgit/libwebsockets/tree/LICENSE
license = stdenv.lib.licenses.gpl2Plus;
license = stdenv.lib.licenses.lgpl;
maintainers = [ ];
platforms = stdenv.lib.platforms.all;
};
11 changes: 5 additions & 6 deletions pkgs/servers/mqtt/mosquitto/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{ stdenv, fetchurl, openssl, libuuid, cmake, libwebsockets }:
{ stdenv, fetchurl, openssl, libuuid, cmake, libwebsockets, c-ares }:

stdenv.mkDerivation rec {
pname = "mosquitto";
version = "1.4";
version = "1.4.14";

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

src = fetchurl {
url = http://mosquitto.org/files/source/mosquitto-1.4.tar.gz;
sha256 = "1imw5ps0cqda41b574k8hgz9gdr8yy58f76fg8gw14pdnvf3l7sr";
url = "http://mosquitto.org/files/source/mosquitto-${version}.tar.gz";
sha256 = "1la2577h7hcyj7lq26vizj0sh2zmi9m7nbxjp3aalayi66kiysqm";
};

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

makeFlags = [
@@ -24,7 +24,6 @@ stdenv.mkDerivation rec {
--replace "/usr/local" ""
substituteInPlace config.mk \
--replace "WITH_WEBSOCKETS:=no" "WITH_WEBSOCKETS:=yes"
'';

meta = {