NixOS · Jun 28, 2018 · Jun 28, 2018 · Jun 28, 2018 · Jun 28, 2018 · Jun 28, 2018
diff --git a/pkgs/applications/audio/deadbeef/plugins/mpris2.nix b/pkgs/applications/audio/deadbeef/plugins/mpris2.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "deadbeef-mpris2-plugin-${version}";
-  version = "1.10";
+  version = "1.11";
 
   src = fetchurl {
     url = "https://github.com/Serranya/deadbeef-mpris2-plugin/releases/download/v${version}/${name}.tar.xz";
-    sha256 = "083fbvi06y85khr8hdm4rl5alxdanjbbyphizyr4hi93d7a0jg75";
+    sha256 = "1j631z34rwxf6wdjpsf8c2f1saq6qas1qmkgsg63m6zzpwqyizw0";
   };
 
   nativeBuildInputs = [ pkgconfig ];

diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
@@ -98,7 +98,7 @@ let
   fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];
 
   # Upstream source
-  version = "7.5.5";
+  version = "7.5.6";
 
   lang = "en-US";
 
@@ -108,15 +108,15 @@ let
         "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
         "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
       ];
-      sha256 = "0v8mxxfqfpwm2nqmb3jyi91rqvxm4n391ilnvxavi00pd5p0glfh";
+      sha256 = "07z7lg5firyah0897pr04wqnbgf4mvsnk3gq2zgsg1rrwladxz5s";
     };
 
     "i686-linux" = fetchurl {
       urls = [
         "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
         "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
       ];
-      sha256 = "1j1bhj50d0fqimcl10qfg076gp1wq42s6k9865jdvd3xfsgldnsj";
+      sha256 = "1s0k82ch7ypjyc5k5rb4skb9ylnp7b9ipvf8gb7pdhb8m4zjk461";
     };
   };
 in

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
@@ -598,7 +598,13 @@ self: super: {
   bustle = overrideCabal super.bustle (drv: {
     buildDepends = [ pkgs.libpcap ];
     buildTools = with pkgs; [ gettext perl help2man intltool ];
-    doCheck = false; # https://github.com/wjt/bustle/issues/6
+    patches = [
+      # Add missing gio-unix-2.0 dependency
+      (pkgs.fetchpatch {
+        url = https://github.com/wjt/bustle/commit/bcc3d56d367635c0dfdb4eab0d1265829aba6400.patch;
+        sha256 = "1ybviivfbs5janiyw01ww365vxckni6fk0j10609clxk4na2nvb9";
+      })
+    ];
     postInstall = ''
       make install PREFIX=$out
     '';

diff --git a/pkgs/development/node-packages/composition-v6.nix b/pkgs/development/node-packages/composition-v6.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.5.3. Do not edit!
+# This file has been generated by node2nix 1.6.0. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;

diff --git a/pkgs/development/node-packages/composition-v8.nix b/pkgs/development/node-packages/composition-v8.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.5.3. Do not edit!
+# This file has been generated by node2nix 1.6.0. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;

diff --git a/pkgs/development/node-packages/default-v6.nix b/pkgs/development/node-packages/default-v6.nix
@@ -6,27 +6,27 @@ let
   };
 in
 nodePackages // {
-  dat = nodePackages.dat.override (oldAttrs: {
-    buildInputs = oldAttrs.buildInputs ++ [ nodePackages.node-gyp-build ];
-  });
+  dat = nodePackages.dat.override {
+    buildInputs = [ nodePackages.node-gyp-build ];
+  };
 
-  dnschain =  nodePackages.dnschain.override (oldAttrs: {
-    buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper nodePackages.coffee-script ];
+  dnschain = nodePackages.dnschain.override {
+    buildInputs = [ pkgs.makeWrapper nodePackages.coffee-script ];
     postInstall = ''
       wrapProgram $out/bin/dnschain --suffix PATH : ${pkgs.openssl.bin}/bin
     '';
-  });
+  };
 
-  node-inspector = nodePackages.node-inspector.override (oldAttrs: {
-    buildInputs = oldAttrs.buildInputs ++ [ nodePackages.node-pre-gyp ];
-  });
+  node-inspector = nodePackages.node-inspector.override {
+    buildInputs = [ nodePackages.node-pre-gyp ];
+  };
 
-  phantomjs = nodePackages.phantomjs.override (oldAttrs: {
-    buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs2 ];
-  });
+  phantomjs = nodePackages.phantomjs.override {
+    buildInputs = [ pkgs.phantomjs2 ];
+  };
 
-  webdrvr = nodePackages.webdrvr.override (oldAttrs: {
-    buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs ];
+  webdrvr = nodePackages.webdrvr.override {
+    buildInputs = [ pkgs.phantomjs ];
 
     preRebuild = ''
       mkdir $TMPDIR/webdrvr
@@ -42,42 +42,42 @@ nodePackages // {
     '';
 
     dontNpmInstall = true; # We face an error with underscore not found, but the package will work fine if we ignore this.
-  });
+  };
 
   npm2nix = nodePackages."npm2nix-git://github.com/NixOS/npm2nix.git#5.12.0".override {
     postInstall = "npm run-script prepublish";
   };
 
-  bower2nix = nodePackages.bower2nix.override (oldAttrs: {
-    buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper ];
+  bower2nix = nodePackages.bower2nix.override {
+    buildInputs = [ pkgs.makeWrapper ];
     postInstall = ''
       for prog in bower2nix fetch-bower; do
         wrapProgram "$out/bin/$prog" --prefix PATH : ${stdenv.lib.makeBinPath [ pkgs.git pkgs.nix ]}
       done
     '';
-  });
+  };
 
-  ios-deploy = nodePackages.ios-deploy.override (oldAttrs: {
+  ios-deploy = nodePackages.ios-deploy.override {
     preRebuild = ''
       LD=$CC
       tmp=$(mktemp -d)
       ln -s /usr/bin/xcodebuild $tmp
       export PATH="$PATH:$tmp"
     '';
-  });
+  };
 
-  fast-cli = nodePackages."fast-cli-1.x".override (oldAttrs: {
+  fast-cli = nodePackages."fast-cli-1.x".override {
     preRebuild = ''
       # Simply ignore the phantomjs --version check. It seems to need a display but it is safe to ignore
       sed -i -e "s|console.error('Error verifying phantomjs, continuing', err)|console.error('Error verifying phantomjs, continuing', err); return true;|" node_modules/phantomjs-prebuilt/lib/util.js
     '';
-    buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs2 ];
-  });
+    buildInputs = [ pkgs.phantomjs2 ];
+  };
 
-  node2nix =  nodePackages.node2nix.override (oldAttrs: {
-    buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper ];
+  node2nix =  nodePackages.node2nix.override {
+    buildInputs = [ pkgs.makeWrapper ];
     postInstall = ''
       wrapProgram "$out/bin/node2nix" --prefix PATH : ${stdenv.lib.makeBinPath [ pkgs.nix ]}
     '';
-  });
+  };
 }
diff --git a/pkgs/development/node-packages/default-v8.nix b/pkgs/development/node-packages/default-v8.nix
@@ -6,27 +6,27 @@ let
   };
 in
 nodePackages // {
-  dat = nodePackages.dat.override (oldAttrs: {
-    buildInputs = oldAttrs.buildInputs ++ [ nodePackages.node-gyp-build ];
-  });
+  dat = nodePackages.dat.override {
+    buildInputs = [ nodePackages.node-gyp-build ];
+  };
 
-  dnschain =  nodePackages.dnschain.override (oldAttrs: {
-    buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper nodePackages.coffee-script ];
+  dnschain =  nodePackages.dnschain.override {
+    buildInputs = [ pkgs.makeWrapper nodePackages.coffee-script ];
     postInstall = ''
       wrapProgram $out/bin/dnschain --suffix PATH : ${pkgs.openssl.bin}/bin
     '';
-  });
+  };
 
-  node-inspector = nodePackages.node-inspector.override (oldAttrs: {
-    buildInputs = oldAttrs.buildInputs ++ [ nodePackages.node-pre-gyp ];
-  });
+  node-inspector = nodePackages.node-inspector.override {
+    buildInputs = [ nodePackages.node-pre-gyp ];
+  };
 
-  phantomjs = nodePackages.phantomjs.override (oldAttrs: {
-    buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs2 ];
-  });
+  phantomjs = nodePackages.phantomjs.override {
+    buildInputs = [ pkgs.phantomjs2 ];
+  };
 
-  webdrvr = nodePackages.webdrvr.override (oldAttrs: {
-    buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs ];
+  webdrvr = nodePackages.webdrvr.override {
+    buildInputs = [ pkgs.phantomjs ];
 
     preRebuild = ''
       mkdir $TMPDIR/webdrvr
@@ -42,32 +42,32 @@ nodePackages // {
     '';
 
     dontNpmInstall = true; # We face an error with underscore not found, but the package will work fine if we ignore this.
-  });
+  };
 
   npm2nix = nodePackages."npm2nix-git://github.com/NixOS/npm2nix.git#5.12.0".override {
     postInstall = "npm run-script prepublish";
   };
 
-  bower2nix = nodePackages.bower2nix.override (oldAttrs: {
-    buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper ];
+  bower2nix = nodePackages.bower2nix.override {
+    buildInputs = [ pkgs.makeWrapper ];
     postInstall = ''
       for prog in bower2nix fetch-bower; do
         wrapProgram "$out/bin/$prog" --prefix PATH : ${stdenv.lib.makeBinPath [ pkgs.git pkgs.nix ]}
       done
     '';
-  });
+  };
 
-  ios-deploy = nodePackages.ios-deploy.override (oldAttrs: {
+  ios-deploy = nodePackages.ios-deploy.override {
     preRebuild = ''
       LD=$CC
       tmp=$(mktemp -d)
       ln -s /usr/bin/xcodebuild $tmp
       export PATH="$PATH:$tmp"
     '';
-  });
+  };
 
-  pnpm = nodePackages.pnpm.override (oldAttrs: {
-    nativeBuildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper ];
+  pnpm = nodePackages.pnpm.override {
+    nativeBuildInputs = [ pkgs.makeWrapper ];
     postInstall = let
       pnpmLibPath = stdenv.lib.makeBinPath [
         nodejs.passthru.python
@@ -78,13 +78,13 @@ nodePackages // {
         wrapProgram "$prog" --prefix PATH : ${pnpmLibPath}
       done
     '';
-  });
+  };
 
-  fast-cli = nodePackages."fast-cli-1.x".override (oldAttrs: {
+  fast-cli = nodePackages."fast-cli-1.x".override {
     preRebuild = ''
       # Simply ignore the phantomjs --version check. It seems to need a display but it is safe to ignore
       sed -i -e "s|console.error('Error verifying phantomjs, continuing', err)|console.error('Error verifying phantomjs, continuing', err); return true;|" node_modules/phantomjs-prebuilt/lib/util.js
     '';
-    buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs2 ];
-  });
+    buildInputs = [ pkgs.phantomjs2 ];
+  };
 }