From 0f63a624f746dae1ea0ea0338629ea0bb53a8f0c Mon Sep 17 00:00:00 2001
From: laMudri <lamudri@gmail.com>
Date: Tue, 7 Jul 2015 20:56:13 +0100
Subject: [PATCH 01/18] synaptics: fix to allow for more scrolling choices

---
 .../services/x11/hardware/synaptics.nix       | 27 ++++++++++++++++---
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/x11/hardware/synaptics.nix b/nixos/modules/services/x11/hardware/synaptics.nix
index 9e44ce811c3..e967dc91141 100644
--- a/nixos/modules/services/x11/hardware/synaptics.nix
+++ b/nixos/modules/services/x11/hardware/synaptics.nix
@@ -63,12 +63,30 @@ in {
       twoFingerScroll = mkOption {
         type = types.bool;
         default = false;
-        description = "Whether to enable two-finger drag-scrolling.";
+        description = "Whether to enable two-finger drag-scrolling. Overridden by horizTwoFingerScroll and vertTwoFingerScroll.";
+      };
+
+      horizTwoFingerScroll = mkOption {
+        type = types.bool;
+        default = cfg.twoFingerScroll;
+        description = "Whether to enable horizontal two-finger drag-scrolling.";
+      };
+
+      vertTwoFingerScroll = mkOption {
+        type = types.bool;
+        default = cfg.twoFingerScroll;
+        description = "Whether to enable vertical two-finger drag-scrolling.";
+      };
+
+      horizEdgeScroll = mkOption {
+        type = types.bool;
+        default = ! cfg.horizTwoFingerScroll;
+        description = "Whether to enable horizontal edge drag-scrolling.";
       };
 
       vertEdgeScroll = mkOption {
         type = types.bool;
-        default = ! cfg.twoFingerScroll;
+        default = ! cfg.vertTwoFingerScroll;
         description = "Whether to enable vertical edge drag-scrolling.";
       };
 
@@ -147,9 +165,10 @@ in {
           Option "ClickFinger1" "${builtins.elemAt cfg.buttonsMap 0}"
           Option "ClickFinger2" "${builtins.elemAt cfg.buttonsMap 1}"
           Option "ClickFinger3" "${builtins.elemAt cfg.buttonsMap 2}"
-          Option "VertTwoFingerScroll" "${if cfg.twoFingerScroll then "1" else "0"}"
-          Option "HorizTwoFingerScroll" "${if cfg.twoFingerScroll then "1" else "0"}"
+          Option "VertTwoFingerScroll" "${if cfg.vertTwoFingerScroll then "1" else "0"}"
+          Option "HorizTwoFingerScroll" "${if cfg.horizTwoFingerScroll then "1" else "0"}"
           Option "VertEdgeScroll" "${if cfg.vertEdgeScroll then "1" else "0"}"
+          Option "HorizEdgeScroll" "${if cfg.horizEdgeScroll then "1" else "0"}"
           ${if cfg.palmDetect then ''Option "PalmDetect" "1"'' else ""}
           ${if cfg.horizontalScroll then "" else ''Option "HorizScrollDelta" "0"''}
           ${cfg.additionalOptions}

From 664af7b909e262a458446495ba332502c4da0e45 Mon Sep 17 00:00:00 2001
From: Spencer Janssen <spencerjanssen@gmail.com>
Date: Thu, 16 Jul 2015 15:10:16 -0500
Subject: [PATCH 02/18] obs-studio: 0.10.0 -> 0.11.1

This version also adds a curl dependency.
---
 pkgs/applications/video/obs-studio/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix
index 953f0c3a8b2..b231aad07cc 100644
--- a/pkgs/applications/video/obs-studio/default.nix
+++ b/pkgs/applications/video/obs-studio/default.nix
@@ -7,6 +7,7 @@
 , qt5
 , libv4l
 , x264
+, curl
 
 , pulseaudioSupport ? false
 , libpulseaudio
@@ -16,14 +17,15 @@ let
   optional = stdenv.lib.optional;
 in stdenv.mkDerivation rec {
   name = "obs-studio-${version}";
-  version = "0.10.0";
+  version = "0.11.1";
 
   src = fetchurl {
     url = "https://github.com/jp9000/obs-studio/archive/${version}.tar.gz";
-    sha256 = "1xms48gl20pr9g8bv8ygykh6m99c3wjphsavr4hb1d5263r9f4in";
+    sha256 = "12g1y6y8ixvgvwk75x7qgq0j06d5khd0w3if6kahswlc58q65fm8";
   };
 
   buildInputs = [ cmake
+                  curl
                   ffmpeg
                   jansson
                   libv4l

From 5e7850f08838a7823d2a99c48f8f5f0acf61d9cb Mon Sep 17 00:00:00 2001
From: Robin Gloster <robin@loc-com.de>
Date: Fri, 17 Jul 2015 16:33:49 +0000
Subject: [PATCH 03/18] php70: init at 7.0beta1

The first beta of php7 has been released. This enables developers to
test their code for breakage in preparation for the stable release and
allows us to make sure we don't have any bugs in the packaging prior to
the stable release.
---
 pkgs/development/interpreters/php/7.0.nix     |  8 +++++++
 .../interpreters/php/fix-paths-php7.patch     | 23 +++++++++++++++++++
 pkgs/development/interpreters/php/generic.nix | 20 +++++++++++-----
 pkgs/top-level/all-packages.nix               |  2 ++
 4 files changed, 47 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/development/interpreters/php/7.0.nix
 create mode 100644 pkgs/development/interpreters/php/fix-paths-php7.patch

diff --git a/pkgs/development/interpreters/php/7.0.nix b/pkgs/development/interpreters/php/7.0.nix
new file mode 100644
index 00000000000..1369cf4a219
--- /dev/null
+++ b/pkgs/development/interpreters/php/7.0.nix
@@ -0,0 +1,8 @@
+{ callPackage, apacheHttpd  }:
+callPackage ./generic.nix {
+  phpVersion = "7.0.0beta1";
+  url = "https://downloads.php.net/~ab/php-7.0.0beta1.tar.bz2";
+  sha = "1pj3ysfhswg2r370ivp33fv9zbcl3yvhmxgnc731k08hv6hmd984";
+  apacheHttpd = apacheHttpd;
+  php7 = true;
+}
diff --git a/pkgs/development/interpreters/php/fix-paths-php7.patch b/pkgs/development/interpreters/php/fix-paths-php7.patch
new file mode 100644
index 00000000000..2b9e4ad0ebb
--- /dev/null
+++ b/pkgs/development/interpreters/php/fix-paths-php7.patch
@@ -0,0 +1,23 @@
+--- php-7.0.0beta1/configure	    2015-07-10 12:11:41.810045613 +0000
++++ php-7.0.0beta1-new/configure	2015-07-17 16:10:21.775528267 +0000
+@@ -6172,7 +6172,7 @@
+     as_fn_error $? "Please note that Apache version >= 2.0.44 is required" "$LINENO" 5
+   fi
+ 
+-  APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
++  APXS_LIBEXECDIR="$prefix/modules"
+   if test -z `$APXS -q SYSCONFDIR`; then
+     INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
+                  $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
+@@ -37303,9 +37303,7 @@
+ 
+ 
+ if test "$PHP_GETTEXT" != "no"; then
+-  for i in $PHP_GETTEXT /usr/local /usr; do
+-    test -r $i/include/libintl.h && GETTEXT_DIR=$i && break
+-  done
++  GETTEXT_DIR=$PHP_GETTEXT
+ 
+   if test -z "$GETTEXT_DIR"; then
+     as_fn_error $? "Cannot locate header file libintl.h" "$LINENO" 5
+
diff --git a/pkgs/development/interpreters/php/generic.nix b/pkgs/development/interpreters/php/generic.nix
index 33b5b0f9024..065ce21bf10 100644
--- a/pkgs/development/interpreters/php/generic.nix
+++ b/pkgs/development/interpreters/php/generic.nix
@@ -4,7 +4,8 @@
 , libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash, freetds
 , uwimap, pam, gmp
 
-, phpVersion, apacheHttpd, sha }:
+, phpVersion, apacheHttpd, sha
+, php7 ? false, url ? null }:
 
 let
   libmcryptOverride = libmcrypt.override { disablePosixThreads = true; };
@@ -212,7 +213,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
     imapSupport = config.php.imap or true;
     ldapSupport = config.php.ldap or true;
     mhashSupport = config.php.mhash or true;
-    mysqlSupport = config.php.mysql or true;
+    mysqlSupport = (!php7) && (config.php.mysql or true);
     mysqliSupport = config.php.mysqli or true;
     pdo_mysqlSupport = config.php.pdo_mysql or true;
     libxml2Support = config.php.libxml2 or true;
@@ -220,7 +221,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
     bcmathSupport = config.php.bcmath or true;
     socketsSupport = config.php.sockets or true;
     curlSupport = config.php.curl or true;
-    curlWrappersSupport = config.php.curlWrappers or true;
+    curlWrappersSupport = (!php7) && (config.php.curlWrappers or true);
     gettextSupport = config.php.gettext or true;
     pcntlSupport = config.php.pcntl or true;
     postgresqlSupport = config.php.postgresql or true;
@@ -241,7 +242,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
     ftpSupport = config.php.ftp or true;
     fpmSupport = config.php.fpm or true;
     gmpSupport = config.php.gmp or true;
-    mssqlSupport = config.php.mssql or (!stdenv.isDarwin);
+    mssqlSupport = (!php7) && (config.php.mssql or (!stdenv.isDarwin));
     ztsSupport = config.php.zts or false;
     calendarSupport = config.php.calendar or true;
   };
@@ -267,7 +268,10 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
   '';
 
   src = fetchurl {
-    url = "http://www.php.net/distributions/php-${version}.tar.bz2";
+    url = if url == null then
+      "http://www.php.net/distributions/php-${version}.tar.bz2"
+    else
+      url;
     sha256 = sha;
   };
 
@@ -278,6 +282,10 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
     maintainers = with maintainers; [ globin ];
   };
 
-  patches = [ ./fix-paths.patch ];
+  patches = if !php7 then
+    [ ./fix-paths.patch ]
+  else
+    [ ./fix-paths-php7.patch ]
+  ;
 
 })
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 18aeb39ac4b..9fd664bd339 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5003,6 +5003,8 @@ let
 
   php56 = callPackage ../development/interpreters/php/5.6.nix { };
 
+  php70 = callPackage ../development/interpreters/php/7.0.nix { };
+
   picoc = callPackage ../development/interpreters/picoc {};
 
   picolisp = callPackage ../development/interpreters/picolisp {};

From 19d6b78cc53fac5f8a6145238e13384d178430fe Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sat, 18 Jul 2015 11:44:54 +0200
Subject: [PATCH 04/18] nano: 2.4.1 -> 2.4.2

---
 pkgs/applications/editors/nano/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix
index 11137d1a962..9fc223d81da 100644
--- a/pkgs/applications/editors/nano/default.nix
+++ b/pkgs/applications/editors/nano/default.nix
@@ -11,10 +11,10 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "nano-${version}";
-  version = "2.4.1";
+  version = "2.4.2";
   src = fetchurl {
     url = "mirror://gnu/nano/${name}.tar.gz";
-    sha256 = "1li99ycnva40hiavm9lf34gjny74mj469x6ismrfm6wv3dgfn33a";
+    sha256 = "1fb5gzdm3jdx1f2vyanjvdmppaz082lf4kinyffnssgmzhc7zkf8";
   };
   buildInputs = [ ncurses ] ++ optional enableNls gettext;
   configureFlags = ''

From b9895740ba3de2d4083f6e3aab3feb78d3f40866 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sat, 18 Jul 2015 20:31:18 +0200
Subject: [PATCH 05/18] dnscrypt-proxy: 1.5.0 -> 1.6.0

---
 pkgs/tools/networking/dnscrypt-proxy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/dnscrypt-proxy/default.nix b/pkgs/tools/networking/dnscrypt-proxy/default.nix
index e975cb1e738..94c74da3644 100644
--- a/pkgs/tools/networking/dnscrypt-proxy/default.nix
+++ b/pkgs/tools/networking/dnscrypt-proxy/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "dnscrypt-proxy-${version}";
-  version = "1.5.0";
+  version = "1.6.0";
 
   src = fetchurl {
     url = "http://download.dnscrypt.org/dnscrypt-proxy/${name}.tar.bz2";
-    sha256 = "1cp3ivxngrihil6i7b659d39v9v6iwjs16s2kj9wz1anzyx0j6nx";
+    sha256 = "0zfw9vi9qbsc55awncyigqfqp25v5adqk6jpg1jdfkmbqqfykk70";
   };
 
   buildInputs = [ libsodium ];

From d54659fe9628fc460b4b591fac84dfe4b1841231 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 19 Jul 2015 11:15:27 +0200
Subject: [PATCH 06/18] libreoffice: work around a build problem

Started on staging and just hidden by #7524, most likely.
Now it builds and runs for me. Only the "development build" tag is strange.

/cc #8844, maintainers @viric, @7c6f434c.
---
 pkgs/applications/office/libreoffice/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index b7511804d95..c053c886e92 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -111,7 +111,7 @@ stdenv.mkDerivation rec {
 
   postUnpack = ''
     mkdir -v $sourceRoot/src
-  '' + (stdenv.lib.concatMapStrings (f: "ln -sv ${f} $sourceRoot/src/${f.outputHash}-${f.name}\nln -sv ${f} $sourceRoot/src/${f.name}\n") srcs.third_party)
+  '' + (stdenv.lib.concatMapStrings (f: "ln -sfv ${f} $sourceRoot/src/${f.outputHash}-${f.name}\nln -sfv ${f} $sourceRoot/src/${f.name}\n") srcs.third_party)
   + ''
     ln -sv ${srcs.help} $sourceRoot/src/${srcs.help.name}
     ln -svf ${srcs.translations} $sourceRoot/src/${srcs.translations.name}

From 79dea486c1c93990da084677b2b05fd9493e9cb0 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Sun, 19 Jul 2015 12:43:05 +0200
Subject: [PATCH 07/18] mdp: 1.0.0 -> 1.0.1

---
 pkgs/applications/misc/mdp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/mdp/default.nix b/pkgs/applications/misc/mdp/default.nix
index aa2045cc8e8..a7617ec8358 100644
--- a/pkgs/applications/misc/mdp/default.nix
+++ b/pkgs/applications/misc/mdp/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ncurses }:
 
 stdenv.mkDerivation rec {
-  version = "1.0.0";
+  version = "1.0.1";
   name = "mdp-${version}";
 
   src = fetchurl {
     url = "https://github.com/visit1985/mdp/archive/${version}.tar.gz";
-    sha256 = "1xkmzcwa5ml1xfv92brwirnm00a44jkj7wpfimxbny98zgmad8vn";
+    sha256 = "0vmr0ymq06r50yags9nv6fk4f890b82a7bvxg697vrgs04i2x4dy";
   };
 
   makeFlags = "PREFIX=$(out)";

From cd46c76d1b58d1a7922179cca187fce013c3bdc9 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Sun, 19 Jul 2015 12:40:50 +0200
Subject: [PATCH 08/18] khard: 0.4.0 -> 0.4.1

---
 pkgs/applications/misc/khard/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix
index 2eda8acf4b8..4bf39860989 100644
--- a/pkgs/applications/misc/khard/default.nix
+++ b/pkgs/applications/misc/khard/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, pkgs, pythonPackages }:
 
 pythonPackages.buildPythonPackage rec {
-  version = "0.4.0";
+  version = "0.4.1";
   name = "khard-${version}";
   namePrefix = "";
 
   src = fetchurl {
     url = "https://github.com/scheibler/khard/archive/v${version}.tar.gz";
-    sha256 = "0xvg8725297faw5mk7ka4xjc968vq3ix7izd4vmsaqysl43gnh21";
+    sha256 = "09yibjzly711hwpg345n653rz47llvrj4shnlcxd8snzvg8m5gri";
   };
 
   propagatedBuildInputs = with pythonPackages; [

From 8fa00ad16e08243ac3a8126e4e8f5dfdbd7bbb5c Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Sun, 19 Jul 2015 13:09:51 +0200
Subject: [PATCH 09/18] pkginfo: init at 1.2.1

---
 pkgs/top-level/python-packages.nix | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ad08df9a874..08c0cfee510 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2272,6 +2272,33 @@ let
     };
   };
 
+  pkginfo = buildPythonPackage rec {
+    version = "1.2.1";
+    name = "pkginfo-${version}";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/p/pkginfo/${name}.tar.gz";
+      sha256 = "0g0g6avplfqw1adzqybbrh1a2z0kfjl8qn3annkrc7w3ibz6sgxd";
+    };
+
+    doCheck = false; # I don't know why, but with doCheck = true it fails.
+
+    meta = {
+      homepage = https://pypi.python.org/pypi/pkginfo;
+      license = licenses.mit;
+      description = "Query metadatdata from sdists / bdists / installed packages.";
+
+      longDescription = ''
+        This package provides an API for querying the distutils metadata
+        written in the PKG-INFO file inside a source distriubtion (an sdist)
+        or a binary distribution (e.g., created by running bdist_egg). It can
+        also query the EGG-INFO directory of an installed distribution, and the
+        *.egg-info stored in a “development checkout” (e.g, created by running
+        setup.py develop).
+      '';
+    };
+  };
+
   pretend = buildPythonPackage rec {
     name = "pretend-1.0.8";
 

From 20882964f518acb2aba364a25d03c96fd149821a Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Sun, 12 Jul 2015 12:26:31 +0200
Subject: [PATCH 10/18] zlog: init at 1.2.12
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[Bjørn: add name= to fetchzip, remove unneeded -r flag from sed.]
---
 pkgs/development/libraries/zlog/default.nix | 34 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/development/libraries/zlog/default.nix

diff --git a/pkgs/development/libraries/zlog/default.nix b/pkgs/development/libraries/zlog/default.nix
new file mode 100644
index 00000000000..d3dc41371de
--- /dev/null
+++ b/pkgs/development/libraries/zlog/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchzip }:
+
+stdenv.mkDerivation rec {
+  version = "1.2.12";
+  name = "zlog-${version}";
+
+  src = fetchzip {
+    name = "${name}-src";
+    url = "https://github.com/HardySimpson/zlog/archive/${version}.tar.gz";
+    sha256 = "1ychld0dcfdak2wnmkj941i0xav6ynlb3n6hz1kz03yy74ll2fqi";
+  };
+
+  configurePhase = ''
+    sed -i 's;-Werror;;' src/makefile
+  '';
+
+  buildPhase = ''
+    mkdir -p $out
+    make PREFIX=$out
+  '';
+
+  installPhase = ''
+    make PREFIX=$out install
+  '';
+
+  meta = with stdenv.lib; {
+    description= "Reliable, high-performance, thread safe, flexible, clear-model, pure C logging library";
+    homepage = http://hardysimpson.github.com/zlog;
+    license = licenses.lgpl21;
+    platforms = platforms.linux; # cannot test on something else
+    maintainers = [ maintainers.matthiasbeyer ];
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 14d256c277a..45921934073 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8396,6 +8396,8 @@ let
     fetchurl = fetchurlBoot;
   };
 
+  zlog = callPackage ../development/libraries/zlog { };
+
   zlibStatic = lowPrio (appendToName "static" (callPackage ../development/libraries/zlib {
     static = true;
   }));

From a296639b9e3e4ad3e9f8d54e7863425e8fa943a1 Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Sun, 19 Jul 2015 13:21:30 +0100
Subject: [PATCH 11/18] udevil: New package

---
 pkgs/applications/misc/udevil/default.nix | 30 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/applications/misc/udevil/default.nix

diff --git a/pkgs/applications/misc/udevil/default.nix b/pkgs/applications/misc/udevil/default.nix
new file mode 100644
index 00000000000..5ba80348d1f
--- /dev/null
+++ b/pkgs/applications/misc/udevil/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, intltool, glib, pkgconfig, udev, utillinux, acl }:
+stdenv.mkDerivation {
+  name = "udevil-0.4.4";
+  src = fetchurl {
+    url = https://github.com/IgnorantGuru/udevil/archive/0.4.4.tar.gz;
+    sha256 = "0z1bhaayambrcn7bgnrqk445k50ifabmw8q4i9qj49nnbcvxhbxd";
+  };
+  buildInputs = [ intltool glib pkgconfig udev ];
+  configurePhase = ''
+    substituteInPlace src/Makefile.am --replace "-o root -g root" ""
+    substituteInPlace src/Makefile.in --replace "-o root -g root" ""
+    ./configure \
+      --prefix=$out \
+      --with-mount-prog=${utillinux}/bin/mount \
+      --with-umount-prog=${utillinux}/bin/umount \
+      --with-losetup-prog=${utillinux}/bin/losetup \
+      --with-setfacl-prog=${acl}/bin/setfacl \
+      --sysconfdir=$prefix/etc
+  '';
+  preConfigure = ''
+    cat src/Makefile.am
+    exit 2
+  '';
+  meta = {
+    description = "A command line Linux program which mounts and unmounts removable devices without a password, shows device info, and monitors device changes";
+    homepage = https://ignorantguru.github.io/udevil/;
+    platforms = stdenv.lib.platforms.linux;
+    license = stdenv.lib.licenses.gpl3;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 45921934073..c81e7ad77a7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15107,4 +15107,6 @@ let
 
   hbase = callPackage ../servers/hbase {};
 
+  udevil = callPackage ../applications/misc/udevil {};
+
 }; in self; in pkgs

From 08c192a40b25c21144d690f3fb2d7fb4abff1bc3 Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Sun, 19 Jul 2015 13:22:04 +0100
Subject: [PATCH 12/18] devmon: New service

---
 nixos/modules/module-list.nix          |  1 +
 nixos/modules/services/misc/devmon.nix | 28 ++++++++++++++++++++++++++
 2 files changed, 29 insertions(+)
 create mode 100644 nixos/modules/services/misc/devmon.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index f74b16f678f..f771bced5ef 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -189,6 +189,7 @@
   ./services/misc/cpuminer-cryptonight.nix
   ./services/misc/cgminer.nix
   ./services/misc/confd.nix
+  ./services/misc/devmon.nix
   ./services/misc/dictd.nix
   ./services/misc/disnix.nix
   ./services/misc/docker-registry.nix
diff --git a/nixos/modules/services/misc/devmon.nix b/nixos/modules/services/misc/devmon.nix
new file mode 100644
index 00000000000..7a1f7c2e079
--- /dev/null
+++ b/nixos/modules/services/misc/devmon.nix
@@ -0,0 +1,28 @@
+{ pkgs, config, lib, ... }:
+
+with lib;
+
+let
+  cfg = config.services.devmon;
+
+in {
+  options = {
+    services.devmon = {
+      enable = mkOption {
+        default = false;
+        description = ''
+          Whether to enable devmon, an automatic device mounting daemon.
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    systemd.services.devmon = {
+      description = "devmon automatic device mounting daemon";
+      wantedBy = [ "multi-user.target" ];
+      path = [ pkgs.udevil ];
+      serviceConfig.ExecStart = "${pkgs.udevil}/bin/devmon";
+    };
+  };
+}

From 79d020de49ed3a963763893b06d205ca4a32225e Mon Sep 17 00:00:00 2001
From: Christian Theune <ct@flyingcircus.io>
Date: Sun, 19 Jul 2015 15:58:50 +0200
Subject: [PATCH 13/18] syncthing: 0.11.15 -> 0.11.16

---
 pkgs/applications/networking/syncthing/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix
index 449886a5de4..02a51a3cbad 100644
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/pkgs/applications/networking/syncthing/default.nix
@@ -4,12 +4,12 @@ with goPackages;
 
 buildGoPackage rec {
   name = "syncthing-${version}";
-  version = "0.11.15";
+  version = "0.11.16";
   goPackagePath = "github.com/syncthing/syncthing";
   src = fetchgit {
     url = "git://github.com/syncthing/syncthing.git";
     rev = "refs/tags/v${version}";
-    sha256 = "8afd0a0999c7d7d285f361589330421c00012da86ce91623c5ad6b96d8fb9695";
+    sha256 = "f9b5c2de7e2b6592cccb0222c48b9baa2497dce519824a75923d40cc722ab937";
   };
 
   subPackages = [ "cmd/syncthing" ];

From 88be5eb371fd9c7844fa4253c5597dc1b22cf2e3 Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Sun, 19 Jul 2015 16:45:10 +0200
Subject: [PATCH 14/18] gstreamer-vaapi: 0.5.10 -> 0.6.0

---
 pkgs/development/libraries/gstreamer/vaapi/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix
index a1f936e20af..349b5093a3b 100644
--- a/pkgs/development/libraries/gstreamer/vaapi/default.nix
+++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix
@@ -5,17 +5,17 @@
 
 stdenv.mkDerivation rec {
   name = "gst-vaapi-${version}";
-  version = "0.5.10";
+  version = "0.6.0";
 
   src = fetchurl {
     url = "${meta.homepage}/software/vaapi/releases/gstreamer-vaapi/gstreamer-vaapi-${version}.tar.bz2";
-    sha256 = "179wnz4c4gnw9ibfgjrad9b44icygadaknsgjfw24lr2pz3kdlhd";
+    sha256 = "1f3ji0h0x49w4wpqc0widraa9kvq0b47idrdxq4znjb8c1bwd97n";
   };
 
   nativeBuildInputs = with stdenv.lib; [ pkgconfig bzip2 ];
 
   buildInputs = with stdenv.lib; [ gstreamer gst-plugins-base gst-plugins-bad libva libdrm udev
-    xorg.libX11 xorg.libXext xorg.libXv xorg.libXrandr mesa nasm libvpx ];
+    xorg.libX11 xorg.libXext xorg.libXv xorg.libXrandr xorg.libSM xorg.libICE mesa nasm libvpx ];
 
   preConfigure = "
     export GST_PLUGIN_PATH_1_0=$out/lib/gstreamer-1.0

From f796345f6afa0b6027a8bc61206e7d338483a9e3 Mon Sep 17 00:00:00 2001
From: Rowan Blush <row@n.blu.sh>
Date: Wed, 15 Jul 2015 23:29:43 -0700
Subject: [PATCH 15/18] calcurse: init at 4.0.0

---
 pkgs/applications/misc/calcurse/default.nix | 27 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/applications/misc/calcurse/default.nix

diff --git a/pkgs/applications/misc/calcurse/default.nix b/pkgs/applications/misc/calcurse/default.nix
new file mode 100644
index 00000000000..9211ef0ab83
--- /dev/null
+++ b/pkgs/applications/misc/calcurse/default.nix
@@ -0,0 +1,27 @@
+{stdenv, fetchurl, ncurses, gettext}:
+
+stdenv.mkDerivation {
+  name = "calcurse-4.0.0";
+
+  src = fetchurl {
+    url = http://calcurse.org/files/calcurse-4.0.0.tar.gz;
+    sha256 = "0d33cpkbhyidvm3xx6iw9ljqdvl6477c2kcwix3bs63nj0ch06v2";
+  };
+
+  buildInputs = [ncurses gettext];
+
+  meta = {
+    description = "A calendar and scheduling application for the command line";
+    version = "4.0.0";
+    longDescription = ''
+      calcurse is a calendar and scheduling application for the command line. It helps
+      keep track of events, appointments and everyday tasks. A configurable notification
+      system reminds users of upcoming deadlines, the curses based interface can be
+      customized to suit user needs and a very powerful set of command line options can
+      be used to filter and format appointments, making it suitable for use in scripts.
+    '';
+    homepage = http://calcurse.org/;
+    license = stdenv.lib.licenses.bsd2;
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index aa4a59e54f7..b17e62fe486 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10797,6 +10797,8 @@ let
       inherit (gnome) libglade;
   };
 
+  calcurse = callPackage ../applications/misc/calcurse { };
+
   calibre = callPackage ../applications/misc/calibre {
     inherit (pythonPackages) pyqt5 sip_4_16;
   };

From 8734f01830613b8d8670e813236df180b40611b1 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 19 Jul 2015 12:09:14 -0700
Subject: [PATCH 16/18] sudo: 1.8.13 -> 1.8.14p1

---
 pkgs/tools/security/sudo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix
index b6ae48c5d83..69ef5328868 100644
--- a/pkgs/tools/security/sudo/default.nix
+++ b/pkgs/tools/security/sudo/default.nix
@@ -3,14 +3,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "sudo-1.8.13";
+  name = "sudo-1.8.14p1";
 
   src = fetchurl {
     urls =
       [ "ftp://ftp.sudo.ws/pub/sudo/${name}.tar.gz"
         "ftp://ftp.sudo.ws/pub/sudo/OLD/${name}.tar.gz"
       ];
-    sha256 = "09asw1hpxc39a6hhydr8n33m2pni1b5m37vaj7b00761ybnyax73";
+    sha256 = "1806kxnkjibky8y04s4f9mpj0403v4b6sqdnmyaa98mnq3qwsb5i";
   };
 
   configureFlags = [

From 70a1e7afd8b328fad1712bcb14a940962deaae73 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 19 Jul 2015 12:21:45 -0700
Subject: [PATCH 17/18] pam: 1.2.0 -> 1.2.1

Fixes CVE-2015-3238
---
 pkgs/os-specific/linux/pam/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix
index 29cfa64b22d..f7cadd469d7 100644
--- a/pkgs/os-specific/linux/pam/default.nix
+++ b/pkgs/os-specific/linux/pam/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "linux-pam-${version}";
-  version = "1.2.0";
+  version = "1.2.1";
 
   src = fetchurl {
     url = "http://www.linux-pam.org/library/Linux-PAM-${version}.tar.bz2";
-    sha256 = "192y2fgf24a5qsg7rl1mzgw5axs5lg8kqamkfff2x50yjv2ym2yd";
+    sha256 = "1n9lnf9gjs72kbj1g354v1xhi2j27aqaah15vykh7cnkq08i4arl";
   };
 
   nativeBuildInputs = [ flex ];

From d8a8ed12bb255bf891bd3e92611f2feee6f68eab Mon Sep 17 00:00:00 2001
From: devhell <^@regexmail.net>
Date: Sun, 19 Jul 2015 11:42:51 +0100
Subject: [PATCH 18/18] canto-{curses,daemon}: 0.9.{3,1} -> 0.9.{4,3}

Close #8884.
A very detailed changelog and discussion can be found here:

http://codezen.org/canto-ng/news/

This change was built locally and tested by me. There will be changes
noticable in the `canto-curses` interface since color support has been
reworked. For more details follow the hint in `canto-curses` or read the
changelog/manual liked to above. There also have been many
under-the-hood improvements which can also be found in the link above.
---
 .../networking/feedreaders/canto-curses/default.nix           | 4 ++--
 .../networking/feedreaders/canto-daemon/default.nix           | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/feedreaders/canto-curses/default.nix b/pkgs/applications/networking/feedreaders/canto-curses/default.nix
index 0a65f8dd70f..a73cf63e76b 100644
--- a/pkgs/applications/networking/feedreaders/canto-curses/default.nix
+++ b/pkgs/applications/networking/feedreaders/canto-curses/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, python34Packages, readline, ncurses, canto-daemon }:
 
 python34Packages.buildPythonPackage rec {
-  version = "0.9.3";
+  version = "0.9.4";
   name = "canto-curses-${version}";
 
   src = fetchFromGitHub {
     owner = "themoken";
     repo = "canto-curses";
     rev = "v${version}";
-    sha256 = "1k3rbniyfdbqhbkclgrrvfjgvfl5if4c2rbgpcb6l2l5v6i1y742";
+    sha256 = "0g1ckcb9xcfb0af17zssiqcrfry87agx578vd40nb6gbw90ql4fn";
   };
 
   buildInputs = [ readline ncurses canto-daemon ];
diff --git a/pkgs/applications/networking/feedreaders/canto-daemon/default.nix b/pkgs/applications/networking/feedreaders/canto-daemon/default.nix
index bf564dd4327..63fefae9dfe 100644
--- a/pkgs/applications/networking/feedreaders/canto-daemon/default.nix
+++ b/pkgs/applications/networking/feedreaders/canto-daemon/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, python34Packages, }:
 
 python34Packages.buildPythonPackage rec {
-  version = "0.9.1";
+  version = "0.9.3";
   name = "canto-daemon-${version}";
   namePrefix = "";
 
@@ -9,7 +9,7 @@ python34Packages.buildPythonPackage rec {
     owner = "themoken";
     repo = "canto-next";
     rev = "v${version}";
-    sha256 = "14lh6x0yz2asspwdi1ims01589r79q0dv77vq61gfjk5wiwfbdwa";
+    sha256 = "1x875qdyhab89nwwa2bzbfvcrkx34zwyy8dlbxm8wg3vz9b78l61";
   };
 
   propagatedBuildInputs = with python34Packages; [ feedparser ];