summary refs log tree commit diff
path: root/pkgs/servers/mqtt
diff options
context:
space:
mode:
authorRickard Nilsson <rickynils@gmail.com>2018-12-15 08:49:47 +0100
committerRickard Nilsson <rickynils@gmail.com>2018-12-15 08:49:47 +0100
commit2473754ad2337c0186169f1e2c935807461bcf32 (patch)
treed927a755f1c2a060844780ea38e95966d12e9f33 /pkgs/servers/mqtt
parentb20fcce1957a86d058af5c6cc12728e402f7188a (diff)
downloadnixpkgs-2473754ad2337c0186169f1e2c935807461bcf32.tar
nixpkgs-2473754ad2337c0186169f1e2c935807461bcf32.tar.gz
nixpkgs-2473754ad2337c0186169f1e2c935807461bcf32.tar.bz2
nixpkgs-2473754ad2337c0186169f1e2c935807461bcf32.tar.lz
nixpkgs-2473754ad2337c0186169f1e2c935807461bcf32.tar.xz
nixpkgs-2473754ad2337c0186169f1e2c935807461bcf32.tar.zst
nixpkgs-2473754ad2337c0186169f1e2c935807461bcf32.zip
mosquitto: 1.5.3 -> 1.5.4
Remove patch that has been merged upstrem.
Diffstat (limited to 'pkgs/servers/mqtt')
-rw-r--r--pkgs/servers/mqtt/mosquitto/default.nix13
1 files changed, 2 insertions, 11 deletions
diff --git a/pkgs/servers/mqtt/mosquitto/default.nix b/pkgs/servers/mqtt/mosquitto/default.nix
index 21fe01e8a34..c5ece477ced 100644
--- a/pkgs/servers/mqtt/mosquitto/default.nix
+++ b/pkgs/servers/mqtt/mosquitto/default.nix
@@ -3,24 +3,15 @@
 
 stdenv.mkDerivation rec {
   name = "mosquitto-${version}";
-  version = "1.5.3";
+  version = "1.5.4";
 
   src = fetchFromGitHub {
     owner  = "eclipse";
     repo   = "mosquitto";
     rev    = "v${version}";
-    sha256 = "0bknmnvssix7c1cps6mzjjnw9zxdlyfsy6ksqx4zfglcw41p8gnz";
+    sha256 = "0pb38y6m682xqrkzhp41mj54x5ic43761xzschgnw055mzksbgk2";
   };
 
-  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 man/manpage.xsl \
       --replace /usr/share/xml/docbook/stylesheet/ ${docbook_xsl}/share/xml/