From 586a9c0d9ced543c5d2f958792b5f7adcdc1792b Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Thu, 23 Jun 2016 01:05:25 -0700
Subject: [PATCH 01/22] gnumake: Allow guile extension language as an optional
 feature

---
 .../tools/build-managers/gnumake/4.2/default.nix  | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix
index a3c8327655e..c484bf95297 100644
--- a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix
+++ b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, guileSupport ? false, pkgconfig ? null , guile ? null }:
+
+assert guileSupport -> ( pkgconfig != null && guile != null );
 
 let
   version = "4.2";
@@ -19,12 +21,16 @@ stdenv.mkDerivation {
     ./impure-dirs.patch
   ];
 
+  buildInputs = stdenv.lib.optional guileSupport [ guile pkgconfig ];
+
+  configureFlags = stdenv.lib.optional guileSupport [ "--with-guile" ];
+
   outputs = [ "out" "doc" ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://www.gnu.org/software/make/;
     description = "A tool to control the generation of non-source files from sources";
-    license = stdenv.lib.licenses.gpl3Plus;
+    license = licenses.gpl3Plus;
 
     longDescription = ''
       Make is a tool which controls the generation of executables and
@@ -37,6 +43,7 @@ stdenv.mkDerivation {
       to build and install the program.
     '';
 
-    platforms = stdenv.lib.platforms.all;
+    platforms = platforms.all;
+    maintainers = [ maintainers.vrthra ];
   };
 }

From df029f65179ff3cece6ea11740f244500c2251a3 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Fri, 8 Jul 2016 20:15:01 +0200
Subject: [PATCH 02/22] geolite-legacy: 2016-07-04 -> 2016-07-08

---
 pkgs/data/misc/geolite-legacy/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix
index 309d88e4f17..07c5828a9e7 100644
--- a/pkgs/data/misc/geolite-legacy/default.nix
+++ b/pkgs/data/misc/geolite-legacy/default.nix
@@ -8,20 +8,20 @@ let
 in
 stdenv.mkDerivation rec {
   name = "geolite-legacy-${version}";
-  version = "2016-07-04";
+  version = "2016-07-08";
 
   srcGeoIP = fetchDB
     "GeoLiteCountry/GeoIP.dat.gz" "GeoIP.dat.gz"
-    "1msm12a6m7rszvdbfldaq3d2hpq0rmpb0af678xwk1m6ff1rinm6";
+    "03rp862snj4pxpz272az2mjp0vdw9a6rzbzcml9bzwvsi1ap5sl7";
   srcGeoIPv6 = fetchDB
     "GeoIPv6.dat.gz" "GeoIPv6.dat.gz"
-    "0sjh77cawlv5jix148r0kg5hy5xymgwsw1lf02dhn1mwqy9k4j9p";
+    "1s5y6r4ji1ljsl1d3w9mcqppxy2kvxjk5aq5lldbj616rbcp2v72";
   srcGeoLiteCity = fetchDB
     "GeoLiteCity.dat.xz" "GeoIPCity.dat.xz"
-    "02g7qhjk1mh4gnplyry3nashkl3whlr4mv1lr56fh7qmi2fhjpk3";
+    "07dp3wf5b6g62y6zgm9f1zfc7gn2wnss7fjdips879373kj3lgbr";
   srcGeoLiteCityv6 = fetchDB
     "GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz" "GeoIPCityv6.dat.gz"
-    "0dq5rh08xgwsrmkniww001b2dpd1d7db4sd385p70hkbbry496l3";
+    "1y7c8f84x99dbrqij124bylddc7bmcld1xp4h3qxvmmp8ch5hcxz";
   srcGeoIPASNum = fetchDB
     "asnum/GeoIPASNum.dat.gz" "GeoIPASNum.dat.gz"
     "168z6j6adrn80sl3ip41fa0jfv2p26lfa8qil6w17sqhg8f61rnp";

From 276448a477f4fa7ae3bd4e4d74acda301d2a84ee Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Thu, 7 Jul 2016 23:51:00 +0200
Subject: [PATCH 03/22] borgbackup: 1.0.3 -> 1.0.4

Take Pypi's hint and switch to GitHub.
---
 pkgs/tools/backup/borg/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix
index a43a678cd7a..bcba8363f7a 100644
--- a/pkgs/tools/backup/borg/default.nix
+++ b/pkgs/tools/backup/borg/default.nix
@@ -2,14 +2,13 @@
 
 python3Packages.buildPythonApplication rec {
   name = "borgbackup-${version}";
-  version = "1.0.3";
+  version = "1.0.4";
   namePrefix = "";
 
   src = fetchurl {
-    url = "https://pypi.python.org/packages/"
-      + "c9/c6/1efc338724b054d4d264dfeadfcba11cefa6c3c50f474cec91b8f0c21d3a/"
-      + "${name}.tar.gz";
-    sha256 = "0kzr0xa00yjfxx27aipli67qg5ffj52yrnqhpf3sdy6k5wzwaybs";
+    url = "https://github.com/borgbackup/borg/releases/download/"
+      + "${version}/${name}.tar.gz";
+    sha256 = "0768fh6b426a7wqx3m6pg4l9xkh7lhfjij1lq1iv4bm3x8a5k9ni";
   };
 
   nativeBuildInputs = with python3Packages; [

From 3970c6da5ec9ca4c93184423ef7e1699b7248714 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Fri, 8 Jul 2016 20:52:39 +0200
Subject: [PATCH 04/22] borgbackup: 1.0.4 -> 1.0.5

This update slipped in between 1.0.4 and me pushing 276448a. Upstream says:

This is a critical bugfix release - upgrading to it is strongly recommended!
Please read https://github.com/borgbackup/borg/blob/1.0.5/docs/changes.rst.
---
 pkgs/tools/backup/borg/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix
index bcba8363f7a..f4af6e5682c 100644
--- a/pkgs/tools/backup/borg/default.nix
+++ b/pkgs/tools/backup/borg/default.nix
@@ -2,13 +2,13 @@
 
 python3Packages.buildPythonApplication rec {
   name = "borgbackup-${version}";
-  version = "1.0.4";
+  version = "1.0.5";
   namePrefix = "";
 
   src = fetchurl {
     url = "https://github.com/borgbackup/borg/releases/download/"
       + "${version}/${name}.tar.gz";
-    sha256 = "0768fh6b426a7wqx3m6pg4l9xkh7lhfjij1lq1iv4bm3x8a5k9ni";
+    sha256 = "0xr7w57pb3z8vyn4jrwb61g9hkgfabikxv3lbwk0a94n8rwbxkx5";
   };
 
   nativeBuildInputs = with python3Packages; [

From 599cf0fe504c6d46457f558468152994576661a7 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Fri, 8 Jul 2016 22:09:43 +0200
Subject: [PATCH 05/22] zstd: 0.7.2 -> 0.7.3

New:
- compression format specification zstd_compression_format.md
- -- separator, stating that all following arguments are file names
- ZSTD_getDecompressedSize()

Fixes:
- dictBuilder using HC levels
- legacy support from ZSTD_decompress_usingDDict()
- multi-blocks decoding with intermediate uncompressed blocks
---
 pkgs/tools/compression/zstd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix
index b65583b452e..0488fec4591 100644
--- a/pkgs/tools/compression/zstd/default.nix
+++ b/pkgs/tools/compression/zstd/default.nix
@@ -3,10 +3,10 @@
 
 stdenv.mkDerivation rec {
   name = "zstd-${version}";
-  version = "0.7.2";
+  version = "0.7.3";
 
   src = fetchFromGitHub {
-    sha256 = "1n88hb7a1x5xq4asq31yr92nkjylzdp21q0mxnrc6sd4kibcmbcs";
+    sha256 = "1kdz1mk2lgf46dc7afjzdyzpdxng2cwirhpm1wsj8dy929hi3687";
     rev = "v${version}";
     repo = "zstd";
     owner = "Cyan4973";

From 5148c6c5c0978f6fea6b00df6efa33fb44ce561e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 9 Jul 2016 11:32:00 +0200
Subject: [PATCH 06/22] gnutls: fix on Darwin

nettools is only used during checkPhase, and we don't do that on Darwin
anyway. Close #16783; we don't change hashes on Linux contrary to the PR.
---
 pkgs/development/libraries/gnutls/generic.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix
index 709da27e797..72337475ddf 100644
--- a/pkgs/development/libraries/gnutls/generic.nix
+++ b/pkgs/development/libraries/gnutls/generic.nix
@@ -4,11 +4,11 @@
 
 # Version dependent args
 , version, src, patches ? [], postPatch ? "", nativeBuildInputs ? []
-, ...}:
+, ...}@args:
 
 assert guileBindings -> guile != null;
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "gnutls-${version}";
 
   inherit src patches;
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
   postPatch = ''
     sed '2iecho "name constraints tests skipped due to datefudge problems"\nexit 0' \
       -i tests/cert-tests/name-constraints
-  '' + postPatch;
+  '' + args.postPatch;
 
   preConfigure = "patchShebangs .";
   configureFlags =
@@ -35,13 +35,14 @@ stdenv.mkDerivation {
   # for the actual fix.
   enableParallelBuilding = !guileBindings;
 
-  buildInputs = [ lzo lzip nettle libtasn1 libidn p11_kit zlib gmp autogen nettools ]
+  buildInputs = [ lzo lzip nettle libtasn1 libidn p11_kit zlib gmp autogen ]
+    ++ lib.optional doCheck nettools
     ++ lib.optional (stdenv.isFreeBSD || stdenv.isDarwin) libiconv
     ++ lib.optional (tpmSupport && stdenv.isLinux) trousers
     ++ [ unbound ]
     ++ lib.optional guileBindings guile;
 
-  nativeBuildInputs = [ perl pkgconfig ] ++ nativeBuildInputs;
+  nativeBuildInputs = [ perl pkgconfig ] ++ args.nativeBuildInputs;
 
   # XXX: Gnulib's `test-select' fails on FreeBSD:
   # http://hydra.nixos.org/build/2962084/nixlog/1/raw .

From 4d4a8092942f1cd6ab9470fae6f7955e54a20eed Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 9 Jul 2016 11:40:39 +0200
Subject: [PATCH 07/22] pythonPackages.prompt_toolkit_52: disable tests

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7fe5dfa5dcb..cf669c98899 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17064,6 +17064,9 @@ in modules // {
       url = "mirror://pypi/p/prompt_toolkit/${name}.tar.gz";
     };
 
+    # No tests included in archive
+    doCheck = false;
+
     #Only <3.4 expressly supported.
     disabled = isPy35;
 

From b571a1a3732027983c4e00ea1dc5736f3ad9680c Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 9 Jul 2016 12:49:04 +0200
Subject: [PATCH 08/22] smcroute: init at 2.1.0

---
 pkgs/servers/smcroute/default.nix | 23 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix   |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/servers/smcroute/default.nix

diff --git a/pkgs/servers/smcroute/default.nix b/pkgs/servers/smcroute/default.nix
new file mode 100644
index 00000000000..9a6423652b6
--- /dev/null
+++ b/pkgs/servers/smcroute/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchFromGitHub, autoreconfHook }:
+
+stdenv.mkDerivation rec {
+  name = "smcroute-${version}";
+  version = "2.1.0";
+
+  src = fetchFromGitHub {
+    owner = "troglobit";
+    repo = "smcroute";
+    rev = version;
+    sha256 = "0mmwvjqbzhzwii4g6rz3ms9fhzppnhbsrhr4jqpih2y95cz039gg";
+  };
+
+  nativeBuildInputs = [ autoreconfHook ];
+
+  meta = with stdenv.lib; {
+    description = "Static multicast routing daemon";
+    homepage = "http://troglobit.com/smcroute.html";
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ fpletz ];
+    platforms = with platforms; (linux ++ freebsd ++ netbsd ++ openbsd);
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5721858537f..9b620268a30 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10443,6 +10443,8 @@ in
 
   sipwitch = callPackage ../servers/sip/sipwitch { };
 
+  smcroute = callPackage ../servers/smcroute { };
+
   spawn_fcgi = callPackage ../servers/http/spawn-fcgi { };
 
   squid = callPackage ../servers/squid { };

From 02600dacf8b55f0e1735a984a12904c7d671a470 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sat, 9 Jul 2016 13:04:32 +0200
Subject: [PATCH 09/22] brasero: depend on hicolor_icon_theme

This avoids conflicts on `share/icons/hicolor/icon-theme.cache`.
---
 pkgs/tools/cd-dvd/brasero/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/cd-dvd/brasero/default.nix b/pkgs/tools/cd-dvd/brasero/default.nix
index e903601c81d..d033371cbcd 100644
--- a/pkgs/tools/cd-dvd/brasero/default.nix
+++ b/pkgs/tools/cd-dvd/brasero/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, fetchurl, pkgconfig, gtk3, itstool, gst_all_1, libxml2, libnotify
 , libcanberra_gtk3, intltool, makeWrapper, dvdauthor, libburn, libisofs
-, vcdimager, wrapGAppsHook }:
+, vcdimager, wrapGAppsHook, hicolor_icon_theme }:
 
 # libdvdcss is "too old" (in fast "too new"), see https://bugs.launchpad.net/ubuntu/+source/brasero/+bug/611590
 
@@ -21,6 +21,7 @@ in stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig itstool intltool wrapGAppsHook ];
 
   buildInputs = [ gtk3 libxml2 libnotify libcanberra_gtk3 libburn libisofs
+                  hicolor_icon_theme
                   gst_all_1.gstreamer gst_all_1.gst-plugins-base
                   gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad
                   gst_all_1.gst-plugins-ugly gst_all_1.gst-libav ];

From c071831b8b8685bbd395eeba86d0040360d2473d Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sat, 9 Jul 2016 13:06:14 +0200
Subject: [PATCH 10/22] handbrake: depend on hicolor_icon_theme

This avoids conflicts on `share/icons/hicolor/icon-theme.cache`.
---
 pkgs/applications/video/handbrake/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix
index d0cd82039f2..351cf5c5211 100644
--- a/pkgs/applications/video/handbrake/default.nix
+++ b/pkgs/applications/video/handbrake/default.nix
@@ -20,7 +20,7 @@
   libogg, libtheora, libvorbis, libdvdcss, a52dec, fdk_aac,
   lame, faac, ffmpeg, libdvdread, libdvdnav, libbluray,
   mp4v2, mpeg2dec, x264, libmkv,
-  fontconfig, freetype,
+  fontconfig, freetype, hicolor_icon_theme,
   glib, gtk, webkitgtk, intltool, libnotify,
   gst_all_1, dbus_glib, udev, libgudev,
   useGtk ? true,
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ python pkgconfig yasm autoconf automake libtool m4 ];
   buildInputs = [
-    fribidi fontconfig freetype
+    fribidi fontconfig freetype hicolor_icon_theme
     libass libsamplerate libxml2 bzip2
     libogg libtheora libvorbis libdvdcss a52dec libmkv fdk_aac
     lame ffmpeg libdvdread libdvdnav libbluray mp4v2 mpeg2dec x264

From 5e7fb05a8ccfefbd592e46f9d770663da6ecc670 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 9 Jul 2016 13:10:04 +0200
Subject: [PATCH 11/22] pythonPackages.backports_shutil_get_terminal_size: init
 at 1.0.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index cf669c98899..51f5d3d0dd2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1638,6 +1638,22 @@ in modules // {
     };
   };
 
+  backports_shutil_get_terminal_size = if !(pythonOlder "3.3") then null else buildPythonPackage rec {
+    name = "backports.shutil_get_terminal_size-${version}";
+    version = "1.0.0";
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/b/backports.shutil_get_terminal_size/${name}.tar.gz";
+      sha256 = "713e7a8228ae80341c70586d1cc0a8caa5207346927e23d09dcbcaf18eadec80";
+    };
+
+    meta = {
+      description = "A backport of the get_terminal_size function from Python 3.3’s shutil.";
+      homepage = https://github.com/chrippa/backports.shutil_get_terminal_size;
+      license = with licenses; [ mit ];
+    };
+  };
+
   backports_ssl_match_hostname_3_4_0_2 = self.buildPythonPackage rec {
     name = "backports.ssl_match_hostname-3.4.0.2";
 

From d472995b78387425bf114f6a2721badaec714ec4 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 9 Jul 2016 13:10:19 +0200
Subject: [PATCH 12/22] pythonPackages.pathlib2: init at 2.1.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 51f5d3d0dd2..7d694558f42 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16253,6 +16253,25 @@ in modules // {
     };
   };
 
+  pathlib2 = if !(pythonOlder "3.4") then null else buildPythonPackage rec {
+    name = "pathlib2-${version}";
+    version = "2.1.0";
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/p/pathlib2/${name}.tar.gz";
+      sha256 = "deb3a960c1d55868dfbcac98432358b92ba89d95029cddd4040db1f27405055c";
+    };
+
+    propagatedBuildInputs = with self; [ six ];
+
+    meta = {
+      description = "This module offers classes representing filesystem paths with semantics appropriate for different operating systems.";
+      homepage = https://pypi.python.org/pypi/pathlib2/;
+      license = with licenses; [ mit ];
+    };
+
+  };
+
   pathpy = buildPythonPackage rec {
     version = "8.1.2";
     name = "path.py-${version}";

From 6665092e4deab088f9f995d91de214be28ba56b9 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 9 Jul 2016 13:10:35 +0200
Subject: [PATCH 13/22] pythonPackages.ipython: fix python 2.7

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7d694558f42..f14dbfaea47 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11379,7 +11379,8 @@ in modules // {
     buildInputs = with self; [ nose pkgs.glibcLocales pygments ] ++ optionals isPy27 [mock];
 
     propagatedBuildInputs = with self;
-      [decorator pickleshare prompt_toolkit simplegeneric traitlets requests2 pexpect sqlite3]
+      [ backports_shutil_get_terminal_size decorator pickleshare prompt_toolkit
+      simplegeneric traitlets requests2 pathlib2 pexpect sqlite3 ]
       ++ optionals stdenv.isDarwin [appnope];
 
     LC_ALL="en_US.UTF-8";

From 57e1a6c48d3be856ec5877dfbabaf5e9073e1f27 Mon Sep 17 00:00:00 2001
From: Miguel Madrid <mimadrid@ucm.es>
Date: Sat, 9 Jul 2016 14:40:14 +0200
Subject: [PATCH 14/22] traceroute: 2.0.21 -> 2.1.0 (#16809)

---
 pkgs/tools/networking/traceroute/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/traceroute/default.nix b/pkgs/tools/networking/traceroute/default.nix
index d98c9996882..3d3be5d4532 100644
--- a/pkgs/tools/networking/traceroute/default.nix
+++ b/pkgs/tools/networking/traceroute/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   name = "traceroute-${version}";
-  version = "2.0.21";
+  version = "2.1.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/traceroute/${name}.tar.gz";
-    sha256 = "1q4n9s42nfcc4fmnwmrsiabvqrcaagiagmmqj9r5hfmi63pr7b7p";
+    sha256 = "3669d22a34d3f38ed50caba18cd525ba55c5c00d5465f2d20d7472e5d81603b6";
   };
 
-  makeFlags = "prefix=$(out)";
+  makeFlags = "prefix=$(out) LDFLAGS=-lm";
 
   preConfigure = ''
     sed -i 's@LIBS := \(.*\) -lm \(.*\)@LIBS := \1 \2@' Make.rules

From 781cd33f3b9e7681b1846ee39c025a227838abb8 Mon Sep 17 00:00:00 2001
From: Ram Kromberg <ramkromberg@mail.com>
Date: Sat, 9 Jul 2016 15:50:24 +0300
Subject: [PATCH 15/22] glmark2: 2014.03 -> 2015-06-11 (#16812)

---
 pkgs/tools/graphics/glmark2/default.nix | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/graphics/glmark2/default.nix b/pkgs/tools/graphics/glmark2/default.nix
index 12ae9b6d89b..b794d7ffbef 100644
--- a/pkgs/tools/graphics/glmark2/default.nix
+++ b/pkgs/tools/graphics/glmark2/default.nix
@@ -1,19 +1,22 @@
-{ stdenv, fetchurl, pkgconfig, libjpeg, libpng12, xorg, libX11, mesa, libdrm, python27 }:
+{ stdenv, fetchFromGitHub, pkgconfig, libjpeg, libpng, xorg, libX11, mesa, libdrm, python27, wayland }:
+
 stdenv.mkDerivation rec {
   name = "glmark2-${version}";
-  version = "2014.03";
+  version = "2015-06-11";
 
-  src = fetchurl {
-    url = "https://launchpad.net/glmark2/trunk/${version}/+download/${name}.tar.gz";
-    sha256 = "1dgn7ln115ivk13d1yagpj06lgllpv2jrr41kcnhdkhqz6m43vdx";
+  src = fetchFromGitHub {
+    owner = "glmark2";
+    repo = "glmark2";
+    rev = "fa71af2dfab711fac87b9504b6fc9862f44bf72a";
+    sha256 = "1razwrmwk94wf8y7rnqpas9520gidixzcwa65pg946n823105znw";
   };
 
   buildInputs = [
-    pkgconfig libjpeg libpng12 xorg.libxcb libX11 mesa libdrm python27
+    pkgconfig libjpeg libpng xorg.libxcb libX11 mesa libdrm python27 wayland
   ];
 
   buildPhase = ''
-    python ./waf configure --prefix=$out --with-flavors x11-gl,x11-glesv2
+    python ./waf configure --prefix=$out --with-flavors x11-gl,x11-glesv2,drm-gl,drm-glesv2,wayland-gl,wayland-glesv2
     python2 ./waf
   '';
 
@@ -23,7 +26,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "OpenGL (ES) 2.0 benchmark";
-    homepage = https://launchpad.net/glmark2;
+    homepage = https://github.com/glmark2/glmark2;
     license = licenses.gpl3Plus;
     longDescription = ''
       glmark2 is a benchmark for OpenGL (ES) 2.0. It uses only the subset of
@@ -33,4 +36,3 @@ stdenv.mkDerivation rec {
     maintainers = [ maintainers.wmertens ];
   };
 }
-

From 9f4775dbb509602b3a65f26aac708c1dabf79a4f Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sun, 19 Jun 2016 21:51:05 +0200
Subject: [PATCH 16/22] ddclient service: use `environment.etc`

The ddclient daemon requires that the configuration file is only
accessible by the ddclient user. This since it typically contains login
information.
---
 .../modules/services/networking/ddclient.nix  | 36 +++++++++++--------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/nixos/modules/services/networking/ddclient.nix b/nixos/modules/services/networking/ddclient.nix
index c5dd1e71c18..633ceaebfa4 100644
--- a/nixos/modules/services/networking/ddclient.nix
+++ b/nixos/modules/services/networking/ddclient.nix
@@ -7,22 +7,8 @@ let
 
   stateDir = "/var/spool/ddclient";
   ddclientUser = "ddclient";
-  ddclientFlags = "-foreground -verbose -noquiet -file ${ddclientCfg}";
+  ddclientFlags = "-foreground -verbose -noquiet -file /etc/ddclient.conf";
   ddclientPIDFile = "${stateDir}/ddclient.pid";
-  ddclientCfg = pkgs.writeText "ddclient.conf" ''
-    daemon=600
-    cache=${stateDir}/ddclient.cache
-    pid=${ddclientPIDFile}
-    use=${config.services.ddclient.use}
-    login=${config.services.ddclient.username}
-    password=${config.services.ddclient.password}
-    protocol=${config.services.ddclient.protocol}
-    server=${config.services.ddclient.server}
-    ssl=${if config.services.ddclient.ssl then "yes" else "no"}
-    wildcard=YES
-    ${config.services.ddclient.domain}
-    ${config.services.ddclient.extraConfig}
-  '';
 
 in
 
@@ -122,10 +108,30 @@ in
       home = stateDir;
     };
 
+    environment.etc."ddclient.conf" = {
+      uid = config.ids.uids.ddclient;
+      mode = "0600";
+      text = ''
+        daemon=600
+        cache=${stateDir}/ddclient.cache
+        pid=${ddclientPIDFile}
+        use=${config.services.ddclient.use}
+        login=${config.services.ddclient.username}
+        password=${config.services.ddclient.password}
+        protocol=${config.services.ddclient.protocol}
+        server=${config.services.ddclient.server}
+        ssl=${if config.services.ddclient.ssl then "yes" else "no"}
+        wildcard=YES
+        ${config.services.ddclient.domain}
+        ${config.services.ddclient.extraConfig}
+      '';
+    };
+
     systemd.services.ddclient = {
       description = "Dynamic DNS Client";
       wantedBy = [ "multi-user.target" ];
       after = [ "network.target" ];
+      restartTriggers = [ config.environment.etc."ddclient.conf".source ];
 
       serviceConfig = {
         # Uncomment this if too many problems occur:

From 86809b838f731e287e30770889290619e4c70d4c Mon Sep 17 00:00:00 2001
From: Christian Richter <mail@christian-richter.info>
Date: Tue, 5 Jul 2016 14:29:20 +0200
Subject: [PATCH 17/22] mop: init at 0.2.0

Fixes #16728.
---
 pkgs/applications/misc/mop/default.nix | 30 ++++++++++++++++++++++++++
 pkgs/applications/misc/mop/deps.json   |  8 +++++++
 pkgs/top-level/all-packages.nix        |  2 ++
 3 files changed, 40 insertions(+)
 create mode 100644 pkgs/applications/misc/mop/default.nix
 create mode 100644 pkgs/applications/misc/mop/deps.json

diff --git a/pkgs/applications/misc/mop/default.nix b/pkgs/applications/misc/mop/default.nix
new file mode 100644
index 00000000000..ccdb47c4b60
--- /dev/null
+++ b/pkgs/applications/misc/mop/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, lib, buildGoPackage, fetchgit }:
+
+buildGoPackage rec {
+  name = "mop-${version}";
+  version = "0.2.0";
+  rev = "bc666ec165d08b43134f7ec0bf29083ad5466243";
+
+  goPackagePath = "github.com/michaeldv/mop";
+  goDeps = ./deps.json;
+
+  preConfigure = ''
+    for i in $(find . -type f);do
+        substituteInPlace $i --replace michaeldv/termbox-go nsf/termbox-go
+    done
+    substituteInPlace Makefile --replace mop/cmd mop/mop
+    mv cmd mop
+  '';
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/mop-tracker/mop";
+    sha256 = "0zp51g9i8rw6acs4vnrxclbxa5z1v0a0m1xx27szszp0rphcczkx";
+  };
+
+  meta = {
+    description = "Simple stock tracker implemented in go";
+    homepage =  https://github.com/mop-tracker/mop;
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/applications/misc/mop/deps.json b/pkgs/applications/misc/mop/deps.json
new file mode 100644
index 00000000000..e1b40df8310
--- /dev/null
+++ b/pkgs/applications/misc/mop/deps.json
@@ -0,0 +1,8 @@
+[
+  {
+    "include": "../../libs.json",
+    "packages": [
+      "github.com/nsf/termbox-go"
+    ]
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9b620268a30..b7c8549faf8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13655,6 +13655,8 @@ in
     inherit (gnome) libgnomecanvas glib;
   };
 
+  mop = callPackage ../applications/misc/mop { };
+
   mopidy = callPackage ../applications/audio/mopidy { };
 
   mopidy-gmusic = callPackage ../applications/audio/mopidy-gmusic { };

From 340a5d6fbf15deed0cd219f9f835707205a531a3 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Mon, 30 May 2016 23:13:59 +0200
Subject: [PATCH 18/22] openvpn: 2.3.10 -> 2.3.11

Taken from #15856.
---
 pkgs/tools/networking/openvpn/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix
index 6f7b72c1f1c..e666cf7f605 100644
--- a/pkgs/tools/networking/openvpn/default.nix
+++ b/pkgs/tools/networking/openvpn/default.nix
@@ -3,11 +3,11 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "openvpn-2.3.10";
+  name = "openvpn-2.3.11";
 
   src = fetchurl {
     url = "http://swupdate.openvpn.net/community/releases/${name}.tar.gz";
-    sha256 = "1xn8kv4v4h4v8mhd9k4s9rilb7k30jgb9rm7n4fwmfrm5swvbc7q";
+    sha256 = "0qv1flcz4q4mb7zpkxsnlmpvrv3s9gw7xvprjk7n2pnk9x1s85wi";
   };
 
   patches = optional stdenv.isLinux ./systemd-notify.patch;

From 66500f64db3aeb8c6dfc71ad92f172e982c6b171 Mon Sep 17 00:00:00 2001
From: Ram Kromberg <ramkromberg@mail.com>
Date: Sat, 9 Jul 2016 16:13:27 +0300
Subject: [PATCH 19/22] libxcomp: update libpng dependency from 1.2 to 1.6
 branch

---
 pkgs/development/libraries/libxcomp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libxcomp/default.nix b/pkgs/development/libraries/libxcomp/default.nix
index b19706c2c37..4ed3014fbe9 100644
--- a/pkgs/development/libraries/libxcomp/default.nix
+++ b/pkgs/development/libraries/libxcomp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoreconfHook, libjpeg, libpng12, libX11, zlib }:
+{ stdenv, fetchurl, autoreconfHook, libjpeg, libpng, libX11, zlib }:
 
 stdenv.mkDerivation rec {
   name = "libxcomp-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     url = "http://code.x2go.org/releases/source/nx-libs/nx-libs-${version}-lite.tar.gz";
   };
 
-  buildInputs = [ libjpeg libpng12 libX11 zlib ];
+  buildInputs = [ libjpeg libpng libX11 zlib ];
   nativeBuildInputs = [ autoreconfHook ];
 
   preAutoreconf = ''

From 7d94f57309a44d10e1009544734ce80a06a5a827 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 9 Jul 2016 15:15:42 +0200
Subject: [PATCH 20/22] gnutls: fixup evaluation after 5148c6c5c09

Noticed on: https://github.com/NixOS/nixpkgs/commit/5148c6c5c0#commitcomment-18184261
---
 pkgs/development/libraries/gnutls/generic.nix | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix
index 72337475ddf..7cd8267192b 100644
--- a/pkgs/development/libraries/gnutls/generic.nix
+++ b/pkgs/development/libraries/gnutls/generic.nix
@@ -4,11 +4,15 @@
 
 # Version dependent args
 , version, src, patches ? [], postPatch ? "", nativeBuildInputs ? []
-, ...}@args:
+, ...}:
 
 assert guileBindings -> guile != null;
-
-stdenv.mkDerivation rec {
+let
+  # XXX: Gnulib's `test-select' fails on FreeBSD:
+  # http://hydra.nixos.org/build/2962084/nixlog/1/raw .
+  doCheck = (!stdenv.isFreeBSD && !stdenv.isDarwin);
+in
+stdenv.mkDerivation {
   name = "gnutls-${version}";
 
   inherit src patches;
@@ -19,7 +23,7 @@ stdenv.mkDerivation rec {
   postPatch = ''
     sed '2iecho "name constraints tests skipped due to datefudge problems"\nexit 0' \
       -i tests/cert-tests/name-constraints
-  '' + args.postPatch;
+  '' + postPatch;
 
   preConfigure = "patchShebangs .";
   configureFlags =
@@ -35,18 +39,15 @@ stdenv.mkDerivation rec {
   # for the actual fix.
   enableParallelBuilding = !guileBindings;
 
-  buildInputs = [ lzo lzip nettle libtasn1 libidn p11_kit zlib gmp autogen ]
-    ++ lib.optional doCheck nettools
+  buildInputs = [ lzo lzip nettle libtasn1 libidn p11_kit zlib gmp autogen nettools ]
     ++ lib.optional (stdenv.isFreeBSD || stdenv.isDarwin) libiconv
     ++ lib.optional (tpmSupport && stdenv.isLinux) trousers
     ++ [ unbound ]
     ++ lib.optional guileBindings guile;
 
-  nativeBuildInputs = [ perl pkgconfig ] ++ args.nativeBuildInputs;
+  nativeBuildInputs = [ perl pkgconfig ] ++ nativeBuildInputs;
 
-  # XXX: Gnulib's `test-select' fails on FreeBSD:
-  # http://hydra.nixos.org/build/2962084/nixlog/1/raw .
-  doCheck = (!stdenv.isFreeBSD && !stdenv.isDarwin);
+  inherit doCheck;
 
   # Fixup broken libtool and pkgconfig files
   preFixup = lib.optionalString (!stdenv.isDarwin) ''

From 644d4e9ac9b5e53fe298daa6544ff4d900cc9131 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sat, 9 Jul 2016 17:19:18 +0300
Subject: [PATCH 21/22] Revert "Revert "make-bootstrap-tools: try again to fix
 on Darwin""

This reverts commit debd401b0f8bedae10c368abd0cacf75ef7f6350.

We must not use a single-binary build for the bootstrap since the common
binary gains a dynamic linkage to gmp (due to 'factor' and 'expr'
handling arbitrary-precision arithmetic).
---
 pkgs/stdenv/darwin/make-bootstrap-tools.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix
index 09b7769dc45..78da24f9c09 100644
--- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix
@@ -6,8 +6,8 @@ rec {
   coreutils_ = coreutils.override (args: {
     # We want coreutils without ACL support.
     aclSupport = false;
-    # Our tooling currently can't handle scripts in bin/, only ELFs and symlinks.
-    singleBinary = "symlinks";
+    # Problems otherwise, unlike Linux even with "symlinks".
+    singleBinary = false;
   });
 
   # Avoid debugging larger changes for now.

From 0cdf89276952e00083846dd85c7cc6291861f986 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sat, 9 Jul 2016 17:23:43 +0300
Subject: [PATCH 22/22] darwin make-bootstrap-tools: Document reason for
 special coreutils

Discussion:
https://github.com/NixOS/nixpkgs/commit/ac4958efc33322c9
---
 pkgs/stdenv/darwin/make-bootstrap-tools.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix
index 78da24f9c09..deefb6bbad2 100644
--- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix
@@ -6,7 +6,7 @@ rec {
   coreutils_ = coreutils.override (args: {
     # We want coreutils without ACL support.
     aclSupport = false;
-    # Problems otherwise, unlike Linux even with "symlinks".
+    # Cannot use a single binary build, or it gets dynamically linked against gmp.
     singleBinary = false;
   });