From ce4ff6b4f453addb2403b20ad386702ff131eab9 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Wed, 12 Apr 2017 00:43:52 +0200
Subject: [PATCH 01/79] lib/tests.nix: add section headers

---
 lib/tests.nix | 159 ++++++++++++++++++++++++++------------------------
 1 file changed, 84 insertions(+), 75 deletions(-)

diff --git a/lib/tests.nix b/lib/tests.nix
index d93cadf2533..c7214738787 100644
--- a/lib/tests.nix
+++ b/lib/tests.nix
@@ -6,6 +6,9 @@ with import ./default.nix;
 
 runTests {
 
+
+# TRIVIAL
+
   testId = {
     expr = id 1;
     expected = 1;
@@ -33,6 +36,18 @@ runTests {
     expected = {a = "a";};
   };
 
+  testComposeExtensions = {
+    expr = let obj = makeExtensible (self: { foo = self.bar; });
+               f = self: super: { bar = false; baz = true; };
+               g = self: super: { bar = super.baz or false; };
+               f_o_g = composeExtensions f g;
+               composed = obj.extend f_o_g;
+           in composed.foo;
+    expected = true;
+  };
+
+# STRINGS
+
   testConcatMapStrings = {
     expr = concatMapStrings (x: x + ";") ["a" "b" "c"];
     expected = "a;b;c;";
@@ -43,6 +58,38 @@ runTests {
     expected = "a,b,c";
   };
 
+  testSplitStringsSimple = {
+    expr = strings.splitString "." "a.b.c.d";
+    expected = [ "a" "b" "c" "d" ];
+  };
+
+  testSplitStringsEmpty = {
+    expr = strings.splitString "." "a..b";
+    expected = [ "a" "" "b" ];
+  };
+
+  testSplitStringsOne = {
+    expr = strings.splitString ":" "a.b";
+    expected = [ "a.b" ];
+  };
+
+  testSplitStringsNone = {
+    expr = strings.splitString "." "";
+    expected = [ "" ];
+  };
+
+  testSplitStringsFirstEmpty = {
+    expr = strings.splitString "/" "/a/b/c";
+    expected = [ "" "a" "b" "c" ];
+  };
+
+  testSplitStringsLastEmpty = {
+    expr = strings.splitString ":" "2001:db8:0:0042::8a2e:370:";
+    expected = [ "2001" "db8" "0" "0042" "" "8a2e" "370" "" ];
+  };
+
+# LISTS
+
   testFilter = {
     expr = filter (x: x != "a") ["a" "b" "c" "a"];
     expected = ["b" "c"];
@@ -93,45 +140,6 @@ runTests {
     expected = { a = [ 2 3 ]; b = [7]; c = [8];};
   };
 
-  testOverridableDelayableArgsTest = {
-    expr =
-      let res1 = defaultOverridableDelayableArgs id {};
-          res2 = defaultOverridableDelayableArgs id { a = 7; };
-          res3 = let x = defaultOverridableDelayableArgs id { a = 7; };
-                 in (x.merge) { b = 10; };
-          res4 = let x = defaultOverridableDelayableArgs id { a = 7; };
-                in (x.merge) ( x: { b = 10; });
-          res5 = let x = defaultOverridableDelayableArgs id { a = 7; };
-                in (x.merge) ( x: { a = add x.a 3; });
-          res6 = let x = defaultOverridableDelayableArgs id { a = 7; mergeAttrBy = { a = add; }; };
-                     y = x.merge {};
-                in (y.merge) { a = 10; };
-
-          resRem7 = res6.replace (a: removeAttrs a ["a"]);
-
-          resReplace6 = let x = defaultOverridableDelayableArgs id { a = 7; mergeAttrBy = { a = add; }; };
-                            x2 = x.merge { a = 20; }; # now we have 27
-                        in (x2.replace) { a = 10; }; # and override the value by 10
-
-          # fixed tests (delayed args): (when using them add some comments, please)
-          resFixed1 =
-                let x = defaultOverridableDelayableArgs id ( x: { a = 7; c = x.fixed.b; });
-                    y = x.merge (x: { name = "name-${builtins.toString x.fixed.c}"; });
-                in (y.merge) { b = 10; };
-          strip = attrs: removeAttrs attrs ["merge" "replace"];
-      in all id
-        [ ((strip res1) == { })
-          ((strip res2) == { a = 7; })
-          ((strip res3) == { a = 7; b = 10; })
-          ((strip res4) == { a = 7; b = 10; })
-          ((strip res5) == { a = 10; })
-          ((strip res6) == { a = 17; })
-          ((strip resRem7) == {})
-          ((strip resFixed1) == { a = 7; b = 10; c =10; name = "name-10"; })
-        ];
-    expected = true;
-  };
-
   testSort = {
     expr = sort builtins.lessThan [ 40 2 30 42 ];
     expected = [2 30 40 42];
@@ -158,9 +166,9 @@ runTests {
   };
 
 
-  /* Generator tests */
-  # these tests assume attributes are converted to lists
-  # in alphabetical order
+# GENERATORS
+# these tests assume attributes are converted to lists
+# in alphabetical order
 
   testMkKeyValueDefault = {
     expr = generators.mkKeyValueDefault ":" "f:oo" "bar";
@@ -247,43 +255,44 @@ runTests {
       expected = builtins.toJSON val;
   };
 
-  testSplitStringsSimple = {
-    expr = strings.splitString "." "a.b.c.d";
-    expected = [ "a" "b" "c" "d" ];
-  };
+# MISC
 
-  testSplitStringsEmpty = {
-    expr = strings.splitString "." "a..b";
-    expected = [ "a" "" "b" ];
-  };
+  testOverridableDelayableArgsTest = {
+    expr =
+      let res1 = defaultOverridableDelayableArgs id {};
+          res2 = defaultOverridableDelayableArgs id { a = 7; };
+          res3 = let x = defaultOverridableDelayableArgs id { a = 7; };
+                 in (x.merge) { b = 10; };
+          res4 = let x = defaultOverridableDelayableArgs id { a = 7; };
+                in (x.merge) ( x: { b = 10; });
+          res5 = let x = defaultOverridableDelayableArgs id { a = 7; };
+                in (x.merge) ( x: { a = add x.a 3; });
+          res6 = let x = defaultOverridableDelayableArgs id { a = 7; mergeAttrBy = { a = add; }; };
+                     y = x.merge {};
+                in (y.merge) { a = 10; };
 
-  testSplitStringsOne = {
-    expr = strings.splitString ":" "a.b";
-    expected = [ "a.b" ];
-  };
+          resRem7 = res6.replace (a: removeAttrs a ["a"]);
 
-  testSplitStringsNone = {
-    expr = strings.splitString "." "";
-    expected = [ "" ];
-  };
+          resReplace6 = let x = defaultOverridableDelayableArgs id { a = 7; mergeAttrBy = { a = add; }; };
+                            x2 = x.merge { a = 20; }; # now we have 27
+                        in (x2.replace) { a = 10; }; # and override the value by 10
 
-  testSplitStringsFirstEmpty = {
-    expr = strings.splitString "/" "/a/b/c";
-    expected = [ "" "a" "b" "c" ];
-  };
-
-  testSplitStringsLastEmpty = {
-    expr = strings.splitString ":" "2001:db8:0:0042::8a2e:370:";
-    expected = [ "2001" "db8" "0" "0042" "" "8a2e" "370" "" ];
-  };
-
-  testComposeExtensions = {
-    expr = let obj = makeExtensible (self: { foo = self.bar; });
-               f = self: super: { bar = false; baz = true; };
-               g = self: super: { bar = super.baz or false; };
-               f_o_g = composeExtensions f g;
-               composed = obj.extend f_o_g;
-           in composed.foo;
+          # fixed tests (delayed args): (when using them add some comments, please)
+          resFixed1 =
+                let x = defaultOverridableDelayableArgs id ( x: { a = 7; c = x.fixed.b; });
+                    y = x.merge (x: { name = "name-${builtins.toString x.fixed.c}"; });
+                in (y.merge) { b = 10; };
+          strip = attrs: removeAttrs attrs ["merge" "replace"];
+      in all id
+        [ ((strip res1) == { })
+          ((strip res2) == { a = 7; })
+          ((strip res3) == { a = 7; b = 10; })
+          ((strip res4) == { a = 7; b = 10; })
+          ((strip res5) == { a = 10; })
+          ((strip res6) == { a = 17; })
+          ((strip resRem7) == {})
+          ((strip resFixed1) == { a = 7; b = 10; c =10; name = "name-10"; })
+        ];
     expected = true;
   };
 

From 46a36d82eea3679176d77399cc292e5877eea50a Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Wed, 12 Apr 2017 01:46:32 +0200
Subject: [PATCH 02/79] lib/trivial.nix: add type for fix

---
 lib/trivial.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/trivial.nix b/lib/trivial.nix
index 735aa55e0dc..cc9665a6131 100644
--- a/lib/trivial.nix
+++ b/lib/trivial.nix
@@ -56,6 +56,8 @@ rec {
   #     nix-repl> fix f
   #     { bar = "bar"; foo = "foo"; foobar = "foobar"; }
   #
+  #  Type: fix :: (a -> a) -> a
+  #
   # See https://en.wikipedia.org/wiki/Fixed-point_combinator for further
   # details.
   fix = f: let x = f x; in x;

From f5bed28db87a65d05137dabefa02792249939dd1 Mon Sep 17 00:00:00 2001
From: Alexey Shmalko <rasen.dubi@gmail.com>
Date: Mon, 1 May 2017 15:38:11 +0300
Subject: [PATCH 03/79] github issue template: add sandboxing info

---
 .github/ISSUE_TEMPLATE.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 5d99147051f..756a2a30f0c 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -11,3 +11,4 @@
 * System: (NixOS: `nixos-version`, Ubuntu/Fedora: `lsb_release -a`, ...)
 * Nix version: (run `nix-env --version`)
 * Nixpkgs version: (run `nix-instantiate --eval '<nixpkgs>' -A lib.nixpkgsVersion`)
+* Sandboxing enabled: (run `grep build-use-sandbox /etc/nix/nix.conf`)

From 94d909adaf828079ec8ea673d7de8f34f1554a1a Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@avnik.info>
Date: Mon, 1 May 2017 17:52:29 +0300
Subject: [PATCH 04/79] gimp: fix all plugins build

---
 .../graphics/gimp/plugins/default.nix         | 34 ++++++++++---------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix
index cf36ac4a382..91a408833a4 100644
--- a/pkgs/applications/graphics/gimp/plugins/default.nix
+++ b/pkgs/applications/graphics/gimp/plugins/default.nix
@@ -23,7 +23,10 @@ let
   }
   // a
     # don't call this gimp-* unless you want nix replace gimp by a plugin :-)
-  // { name = "${a.name}-${gimp.name}-plugin"; }
+  // {
+      name = "${a.name}-${gimp.name}-plugin";
+      buildInputs = [ gimp gimp.gtk glib pkgconfig ] ++ (a.buildInputs or []);
+    }
   );
 
   scriptDerivation = {name, src} : pluginDerivation {
@@ -34,7 +37,6 @@ let
  libLQR = pluginDerivation {
     name = "liblqr-1-0.4.1";
     # required by lqrPlugin, you don't havet to install this lib explicitely
-    buildInputs = [ gimp ] ++ gimp.nativeBuildInputs;
     src = fetchurl {
       url = http://registry.gimp.org/files/liblqr-1-0.4.1.tar.bz2;
       sha256 = "02g90wag7xi5rjlmwq8h0qs666b1i2sa90s4303hmym40il33nlz";
@@ -73,7 +75,7 @@ rec {
        Filters/Generic/FFT Inverse
     */
     name = "fourier-0.4.1";
-    buildInputs = [ gimp pkgs.fftw  pkgconfig glib] ++ gimp.nativeBuildInputs;
+    buildInputs = with pkgs; [ fftw  glib];
     postInstall = "fail";
     installPhase = "installPlugins fourier";
     src = fetchurl {
@@ -87,7 +89,7 @@ rec {
        Blur/Focus Blur
     */
     name = "focusblur-3.2.6";
-    buildInputs = [ gimp pkgconfig pkgs.fftwSinglePrec ] ++ gimp.nativeBuildInputs;
+    buildInputs = with pkgs; [ intltool fftwSinglePrec ];
     patches = [ ./patches/focusblur-glib.patch ];
     postInstall = "fail";
     installPhase = "installPlugins src/focusblur";
@@ -105,7 +107,7 @@ rec {
       Filters/Enhance/Smart remove selection
     */
     name = "resynthesizer-0.16";
-    buildInputs = [ gimp pkgs.fftw pkgs.pkgconfig pkgs.gtk2 ] ++ gimp.nativeBuildInputs;
+    buildInputs = with pkgs; [ fftw ];
     src = fetchurl {
       url = http://www.logarithmic.net/pfh-files/resynthesizer/resynthesizer-0.16.tar.gz;
       sha256 = "1k90a1jzswxmajn56rdxa4r60v9v34fmqsiwfdxqcvx3yf4yq96x";
@@ -125,10 +127,11 @@ rec {
       Filters/Enhance/Smart remove selection
     */
     name = "resynthesizer-2.0.1";
-    buildInputs = [ gimp pkgs.fftw pkgs.autoreconfHook pkgs.pkgconfig pkgs.gtk2
-      pkgs.intltool
-    ]
-      ++ gimp.nativeBuildInputs;
+    buildInputs = with pkgs; [ 
+      fftw 
+      autoreconfHook
+      intltool
+    ];
     makeFlags = "GIMP_LIBDIR=$out/lib/gimp/2.0/";
     src = fetchFromGitHub {
       owner = "bootchk";
@@ -140,11 +143,11 @@ rec {
 
   texturize = pluginDerivation {
     name = "texturize-2.1";
-    buildInputs = [ gimp ] ++ gimp.nativeBuildInputs;
     src = fetchurl {
       url = mirror://sourceforge/gimp-texturize/texturize-2.1_src.tgz;
       sha256 = "0cdjq25g3yfxx6bzx6nid21kq659s1vl9id4wxyjs2dhcv229cg3";
     };
+    buildInputs = with pkgs; [ intltool perl ];
     patchPhase = ''
       sed -i '/.*gimpimage_pdb.h.*/ d' src/*.c*
     '';
@@ -156,7 +159,7 @@ rec {
       Filters/Enhance/Wavelet sharpen
     */
     name = "wavelet-sharpen-0.1.2";
-    buildInputs = [ gimp ] ++ gimp.nativeBuildInputs;
+    buildInputs = with pkgs; [ intltool ];
     src = fetchurl {
       url = http://registry.gimp.org/files/wavelet-sharpen-0.1.2.tar.gz;
       sha256 = "0vql1k67i21g5ivaa1jh56rg427m0icrkpryrhg75nscpirfxxqw";
@@ -169,7 +172,7 @@ rec {
        Layer/Liquid Rescale
     */
     name = "lqr-plugin-0.6.1";
-    buildInputs = [ pkgconfig libLQR gimp ] ++ gimp.nativeBuildInputs;
+    buildInputs = with pkgs; [ intltool libLQR ];
     src = fetchurl {
       url = http://registry.gimp.org/files/gimp-lqr-plugin-0.6.1.tar.bz2;
       sha256 = "00hklkpcimcbpjly4rjhfipaw096cpy768g9wixglwrsyqhil7l9";
@@ -182,8 +185,7 @@ rec {
     pluginDerivation rec {
       inherit (pkgs.gmic) name src meta;
 
-      nativeBuildInputs = [ pkgconfig ];
-      buildInputs = [ pkgs.fftw pkgs.opencv gimp ] ++ gimp.nativeBuildInputs;
+      buildInputs = with pkgs; [ fftw opencv curl ];
 
       sourceRoot = "${name}/src";
 
@@ -197,7 +199,7 @@ rec {
   # or use the binary
   ufraw = pluginDerivation rec {
     name = "ufraw-0.19.2";
-    buildInputs = [pkgs.gtkimageview pkgs.lcms gimp] ++ gimp.nativeBuildInputs;
+    buildInputs = with pkgs; [ gtkimageview lcms ];
       # --enable-mime - install mime files, see README for more information
       # --enable-extras - build extra (dcraw, nikon-curve) executables
       # --enable-dst-correction - enable DST correction for file timestamps.
@@ -230,7 +232,7 @@ rec {
       sha256 = "0zlmp9v732qmzj083mnk5z421s57mnckmpjhiw890wmmwzj2lhxz";
     };
 
-    buildInputs = [ gimp pkgconfig glib gimp.gtk pkgs.lensfun pkgs.exiv2 ];
+    buildInputs = with pkgs; [ lensfun exiv2 ];
 
     installPhase = "
       installPlugins gimp-lensfun

From 8452e0684ee06c30f866c37c43e50caa52ed78ab Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@avnik.info>
Date: Tue, 2 May 2017 09:26:10 +0300
Subject: [PATCH 05/79] gimp: split buildInputs and nativeBuildInputs for
 plugins

---
 .../graphics/gimp/plugins/default.nix         | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix
index 91a408833a4..b52009d715e 100644
--- a/pkgs/applications/graphics/gimp/plugins/default.nix
+++ b/pkgs/applications/graphics/gimp/plugins/default.nix
@@ -25,7 +25,8 @@ let
     # don't call this gimp-* unless you want nix replace gimp by a plugin :-)
   // {
       name = "${a.name}-${gimp.name}-plugin";
-      buildInputs = [ gimp gimp.gtk glib pkgconfig ] ++ (a.buildInputs or []);
+      buildInputs = [ gimp gimp.gtk glib ] ++ (a.buildInputs or []);
+      nativeBuildInputs = [ pkgconfig ] ++ (a.nativeBuildInputs or []);
     }
   );
 
@@ -50,7 +51,7 @@ rec {
        Video
     */
     name = "gap-2.6.0";
-    buildInputs = [ gimp pkgconfig glib pkgs.intltool gimp.gtk ] ++ gimp.nativeBuildInputs;
+    nativeBuildInputs = with pkgs; [ intltool ];
     src = fetchurl {
       url = http://ftp.gimp.org/pub/gimp/plug-ins/v2.6/gap/gimp-gap-2.6.0.tar.bz2;
       sha256 = "1jic7ixcmsn4kx2cn32nc5087rk6g8xsrz022xy11yfmgvhzb0ql";
@@ -75,7 +76,7 @@ rec {
        Filters/Generic/FFT Inverse
     */
     name = "fourier-0.4.1";
-    buildInputs = with pkgs; [ fftw  glib];
+    buildInputs = with pkgs; [ fftw ];
     postInstall = "fail";
     installPhase = "installPlugins fourier";
     src = fetchurl {
@@ -89,7 +90,8 @@ rec {
        Blur/Focus Blur
     */
     name = "focusblur-3.2.6";
-    buildInputs = with pkgs; [ intltool fftwSinglePrec ];
+    buildInputs = with pkgs; [ fftwSinglePrec ];
+    nativeBuildInputs = with pkgs; [ intltool ];
     patches = [ ./patches/focusblur-glib.patch ];
     postInstall = "fail";
     installPhase = "installPlugins src/focusblur";
@@ -127,8 +129,8 @@ rec {
       Filters/Enhance/Smart remove selection
     */
     name = "resynthesizer-2.0.1";
-    buildInputs = with pkgs; [ 
-      fftw 
+    buildInputs = with pkgs; [ fftw ];
+    nativeBuildInputs = with pkgs; [ 
       autoreconfHook
       intltool
     ];
@@ -147,7 +149,8 @@ rec {
       url = mirror://sourceforge/gimp-texturize/texturize-2.1_src.tgz;
       sha256 = "0cdjq25g3yfxx6bzx6nid21kq659s1vl9id4wxyjs2dhcv229cg3";
     };
-    buildInputs = with pkgs; [ intltool perl ];
+    buildInputs = with pkgs; [ perl ];
+    nativeBuildInputs = with pkgs; [ intltool ];
     patchPhase = ''
       sed -i '/.*gimpimage_pdb.h.*/ d' src/*.c*
     '';
@@ -159,7 +162,7 @@ rec {
       Filters/Enhance/Wavelet sharpen
     */
     name = "wavelet-sharpen-0.1.2";
-    buildInputs = with pkgs; [ intltool ];
+    nativeBuildInputs = with pkgs; [ intltool ];
     src = fetchurl {
       url = http://registry.gimp.org/files/wavelet-sharpen-0.1.2.tar.gz;
       sha256 = "0vql1k67i21g5ivaa1jh56rg427m0icrkpryrhg75nscpirfxxqw";
@@ -172,7 +175,8 @@ rec {
        Layer/Liquid Rescale
     */
     name = "lqr-plugin-0.6.1";
-    buildInputs = with pkgs; [ intltool libLQR ];
+    buildInputs = with pkgs; [ libLQR ];
+    nativeBuildInputs = with pkgs; [ intltool ];
     src = fetchurl {
       url = http://registry.gimp.org/files/gimp-lqr-plugin-0.6.1.tar.bz2;
       sha256 = "00hklkpcimcbpjly4rjhfipaw096cpy768g9wixglwrsyqhil7l9";

From 0de51ef70e7e1a796a6eac883bf2a79bd8a28569 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Tue, 2 May 2017 14:13:31 -0300
Subject: [PATCH 06/79] connman-gtk: init at 1.1.1

---
 pkgs/tools/networking/connman-gtk/default.nix | 43 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 45 insertions(+)
 create mode 100644 pkgs/tools/networking/connman-gtk/default.nix

diff --git a/pkgs/tools/networking/connman-gtk/default.nix b/pkgs/tools/networking/connman-gtk/default.nix
new file mode 100644
index 00000000000..d5688354a76
--- /dev/null
+++ b/pkgs/tools/networking/connman-gtk/default.nix
@@ -0,0 +1,43 @@
+{ stdenv, fetchFromGitHub, autoconf, automake, intltool, pkgconfig,
+gtk3, connman, openconnect, wrapGAppsHook }:
+
+stdenv.mkDerivation rec {
+  name = "connman-gtk-${version}";
+  version = "1.1.1";
+
+  src = fetchFromGitHub {
+    owner = "jgke";
+    repo = "connman-gtk";
+    rev = "v${version}";
+    sha256 = "09k0hx5hxpbykvslv12l2fq9pxdwpd311mxj038hbqzjghcyidyr";
+  };
+
+  nativeBuildInputs = [
+    autoconf
+    automake
+    intltool
+    pkgconfig
+    wrapGAppsHook
+  ];
+
+  buildInputs = [
+    gtk3
+    openconnect
+    connman
+  ];
+
+  preConfigure = ''
+    # m4/intltool.m4 is an invalid symbolic link
+    rm m4/intltool.m4
+    ln -s ${intltool}/share/aclocal/intltool.m4 m4/
+    ./autogen.sh
+  '';
+
+  meta = with stdenv.lib; {
+    description = "GTK GUI for Connman";
+    homepage = https://github.com/jgke/connman-gtk;
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.romildo ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 67014b02d9c..bf629ac8ead 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1259,6 +1259,8 @@ with pkgs;
 
   connman = callPackage ../tools/networking/connman { };
 
+  connman-gtk = callPackage ../tools/networking/connman-gtk { };
+
   connman-notify = callPackage ../tools/networking/connman-notify { };
 
   connmanui = callPackage ../tools/networking/connmanui { };

From 830669ca05c41545679f452957baed18abc9a927 Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Tue, 2 May 2017 18:46:53 +0000
Subject: [PATCH 07/79] xrdp: do not restart xrdp-sesman on nixos-rebuild

---
 nixos/modules/services/networking/xrdp.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/services/networking/xrdp.nix b/nixos/modules/services/networking/xrdp.nix
index bf59130ce5b..634b0e7efb6 100644
--- a/nixos/modules/services/networking/xrdp.nix
+++ b/nixos/modules/services/networking/xrdp.nix
@@ -133,8 +133,10 @@ in
         wantedBy = [ "multi-user.target" ];
         after = [ "network.target" ];
         description = "xrdp session manager";
+        restartIfChanged = false; # do not restart on "nixos-rebuild switch". like "display-manager", it can have many interactive programs as children
         serviceConfig = {
           ExecStart = "${cfg.package}/bin/xrdp-sesman --nodaemon --config ${confDir}/sesman.ini";
+          ExecStop  = "${pkgs.coreutils}/bin/kill -INT $MAINPID";
         };
       };
 

From 9bce416637ec210925addb7babfdc367dd99b12d Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Tue, 2 May 2017 21:07:57 +0000
Subject: [PATCH 08/79] xrdp: environment.pathsToLink from xserver.nix

---
 nixos/modules/services/networking/xrdp.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/nixos/modules/services/networking/xrdp.nix b/nixos/modules/services/networking/xrdp.nix
index 634b0e7efb6..bf23c6ae619 100644
--- a/nixos/modules/services/networking/xrdp.nix
+++ b/nixos/modules/services/networking/xrdp.nix
@@ -93,6 +93,11 @@ in
 
   config = mkIf cfg.enable {
 
+    # copied from <nixos/modules/services/x11/xserver.nix>
+    # xrdp can run X11 program even if "services.xserver.enable = false"
+    environment.pathsToLink =
+      [ "/etc/xdg" "/share/xdg" "/share/applications" "/share/icons" "/share/pixmaps" ];
+
     systemd = {
       services.xrdp = {
         wantedBy = [ "multi-user.target" ];

From 31ad4e16579f169060449a90d4870efa7375fcb4 Mon Sep 17 00:00:00 2001
From: zraexy <zraexy@gmail.com>
Date: Tue, 2 May 2017 13:14:36 -0800
Subject: [PATCH 09/79] perlPackages.RegexpGrammars: init at 1.045

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index e48e1269166..19a3503c72f 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -11317,6 +11317,19 @@ let self = _self // overrides; _self = with self; {
       sha256 = "09c8xb43p1s6ala6g4274az51mf33phyjkp66dpvgkgbi1xfnawp";
     };
   };
+  
+  RegexpGrammars = buildPerlPackage rec {
+    name = "Regexp-Grammars-1.045";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/D/DC/DCONWAY/${name}.tar.gz";
+      sha256 = "8ab001f5641d03f7acce09ca5826b219b02ce40f8e56c2066737228a9232b594";
+    };
+    meta = {
+      homepage = http://search.cpan.org/~dconway/Regexp-Grammars-1.045/lib/Regexp/Grammars.pm;
+      description = "Add grammatical parsing features to Perl 5.10 regexes";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+    };
+  };
 
   RegexpIPv6 = buildPerlPackage {
     name = "Regexp-IPv6-0.03";

From f93d70bc60c485f2e98db213f114d2e8316bafea Mon Sep 17 00:00:00 2001
From: Jon Banafato <jon@jonafato.com>
Date: Tue, 2 May 2017 19:10:25 -0400
Subject: [PATCH 10/79] corebird: 1.4.2 -> 1.5

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

diff --git a/pkgs/applications/networking/corebird/default.nix b/pkgs/applications/networking/corebird/default.nix
index b4197a12db3..7b67ad235e3 100644
--- a/pkgs/applications/networking/corebird/default.nix
+++ b/pkgs/applications/networking/corebird/default.nix
@@ -3,14 +3,14 @@
 , glib_networking }:
 
 stdenv.mkDerivation rec {
-  version = "1.4.2";
+  version = "1.5";
   name = "corebird-${version}";
 
   src = fetchFromGitHub {
     owner = "baedert";
     repo = "corebird";
     rev = version;
-    sha256 = "0s28q9c7p4p4jyhb1g6gdwdphlf6yhi6yg4yn8bkd0gmyf9acakb";
+    sha256 = "0nll3ns1riylxg33w6myz5x8h6ai39k5fw2bkf96g5rgmi6zsjma";
   };
 
   preConfigure = ''

From cfd831437f9bccb18e50193838d45e8fba20c2b0 Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Tue, 2 May 2017 22:54:22 +0000
Subject: [PATCH 11/79] freerdp: 20170201 -> 20170502

---
 .../networking/remote/freerdp/default.nix     | 18 ++++++-------
 .../remote/freerdp/dlopen-absolute-paths.diff | 25 -------------------
 2 files changed, 7 insertions(+), 36 deletions(-)
 delete mode 100644 pkgs/applications/networking/remote/freerdp/dlopen-absolute-paths.diff

diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix
index d35f22c1839..f4109bbd179 100644
--- a/pkgs/applications/networking/remote/freerdp/default.nix
+++ b/pkgs/applications/networking/remote/freerdp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, substituteAll, cmake, pkgconfig
+{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig
 , alsaLib, ffmpeg_2, glib, openssl, pcre, zlib
 , libX11, libXcursor, libXdamage, libXext, libXi, libXinerama, libXrandr, libXrender, libXv
 , libxkbcommon, libxkbfile
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation rec {
   name = "freerdp-git-${version}";
-  version = "20170201";
+  version = "20170502";
 
   src = fetchFromGitHub {
     owner  = "FreeRDP";
     repo   = "FreeRDP";
-    rev    = "6001cb710dc67eb8811362b7bf383754257a902b";
-    sha256 = "0l2lwqk2r8rq8a0f91wbb30kqg21fv0k0508djpwj0pa9n73fgmg";
+    rev    = "8569102c3a011602de3a1cdf69f7c69adbb864ee";
+    sha256 = "0m61aiy8l3ybnk2d2kjmpp9ql31zfs63gjixyj9x95jd4m507j67";
   };
 
   # outputs = [ "bin" "out" "dev" ];
@@ -29,15 +29,11 @@ stdenv.mkDerivation rec {
     export HOME=$TMP
     substituteInPlace "libfreerdp/freerdp.pc.in" \
       --replace "Requires:" "Requires: @WINPR_PKG_CONFIG_FILENAME@"
+  '' + lib.optionalString (pcsclite != null) ''
+    substituteInPlace "winpr/libwinpr/smartcard/smartcard_pcsc.c" \
+      --replace "libpcsclite.so" "${pcsclite}/lib/libpcsclite.so"
   '';
 
-  patches = with lib; [
-  ] ++ optional (pcsclite != null)
-      (substituteAll {
-        src = ./dlopen-absolute-paths.diff;
-        inherit pcsclite;
-      });
-
   buildInputs = with lib; [
     alsaLib cups ffmpeg_2 glib openssl pcre pcsclite libpulseaudio zlib
     gstreamer gst-plugins-base gst-plugins-good
diff --git a/pkgs/applications/networking/remote/freerdp/dlopen-absolute-paths.diff b/pkgs/applications/networking/remote/freerdp/dlopen-absolute-paths.diff
deleted file mode 100644
index 2037ad6acb9..00000000000
--- a/pkgs/applications/networking/remote/freerdp/dlopen-absolute-paths.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-*** FreeRDP-1.2.0-beta1+android7-src/winpr/libwinpr/smartcard/smartcard_pcsc.c.orig	2015-01-25 19:10:03.971628580 -0800
---- FreeRDP-1.2.0-beta1+android7-src/winpr/libwinpr/smartcard/smartcard_pcsc.c	2015-01-25 19:55:05.453980544 -0800
-***************
-*** 2807,2816 ****
-  #ifdef __MACOSX__
-  	g_PCSCModule = LoadLibraryA("/System/Library/Frameworks/PCSC.framework/PCSC");
-  #else
-! 	g_PCSCModule = LoadLibraryA("libpcsclite.so.1");
-  
-  	if (!g_PCSCModule)
-! 		g_PCSCModule = LoadLibraryA("libpcsclite.so");
-  #endif
-  
-  	if (!g_PCSCModule)
---- 2807,2816 ----
-  #ifdef __MACOSX__
-  	g_PCSCModule = LoadLibraryA("/System/Library/Frameworks/PCSC.framework/PCSC");
-  #else
-! 	g_PCSCModule = LoadLibraryA("@pcsclite@/lib/libpcsclite.so.1");
-  
-  	if (!g_PCSCModule)
-! 		g_PCSCModule = LoadLibraryA("@pcsclite@/lib/libpcsclite.so");
-  #endif
-  
-  	if (!g_PCSCModule)

From 8678c0339d4595008c674cc4e7815bac35fbf477 Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Tue, 2 May 2017 20:54:44 -0700
Subject: [PATCH 12/79] aenum: 1.4.7 -> 2.0.3

---
 pkgs/development/python-modules/aenum/default.nix | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/aenum/default.nix b/pkgs/development/python-modules/aenum/default.nix
index 1233b94dccd..9d6fe94a262 100644
--- a/pkgs/development/python-modules/aenum/default.nix
+++ b/pkgs/development/python-modules/aenum/default.nix
@@ -1,18 +1,25 @@
-{ stdenv, fetchPypi, buildPythonPackage }:
+{ stdenv, fetchPypi, buildPythonPackage, isPy3k }:
 
 buildPythonPackage rec {
   pname = "aenum";
-  version = "1.4.7";
+  version = "2.0.6";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1bvn2k53nz99fiwql5fkl0fh7xjw8ama9qzdjp36609mpk05ikl8";
+    sha256 = "0rlhb5wzlyyz0l44r2jxn3m0nh51ifih97dk2y7zfs1m299gwcv6";
   };
 
+  doCheck = !isPy3k;
+  # The following tests fail (only in python3
+  # test_convert (aenum.test.TestIntEnumConvert)
+  # test_convert_value_lookup_priority (aenum.test.TestIntEnumConvert)
+  # test_convert (aenum.test.TestIntEnumConvert)
+  # test_convert_value_lookup_priority (aenum.test.TestIntEnumConvert)
+
   meta = {
     description = "Advanced Enumerations (compatible with Python's stdlib Enum), NamedTuples, and NamedConstants";
-    maintainer = with stdenv.lib.maintainers; [ vrthra ];
+    maintainers = with stdenv.lib.maintainers; [ vrthra ];
     license = with stdenv.lib.licenses; [ bsd3 ];
     homepage = https://bitbucket.org/stoneleaf/aenum;
   };

From 92d18827d40eef32fafa26d5d097059cd77c1e08 Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Tue, 2 May 2017 20:56:36 -0700
Subject: [PATCH 13/79] agate: 1.2.2 -> 1.6.0

---
 pkgs/top-level/python-packages.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 774ef2fb0fc..e3d137e467f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -115,8 +115,7 @@ in {
   aenum = callPackage ../development/python-modules/aenum { };
 
   agate = buildPythonPackage rec {
-    name = "agate-1.2.2";
-    disabled = isPy3k;
+    name = "agate-1.6.0";
 
     meta = {
       description = "A Python data analysis library that is optimized for humans instead of machines";
@@ -125,11 +124,15 @@ in {
       maintainers = with maintainers; [ vrthra ];
     };
 
-    propagatedBuildInputs = with self; [ discid six parsedatetime isodate Babel pytimeparse ];
+    doCheck = false;
+    # (only) on python3 unittest loader (loadTestsFromModule) fails
+
+    propagatedBuildInputs = with self; [ discid six parsedatetime isodate Babel
+         pytimeparse leather python-slugify ];
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/a/agate/${name}.tar.gz";
-      sha256 = "0h2w30a0zhylivz86d823a05hvg8w8p61lmm855z1wwkgml9l9d4";
+      sha256 = "02pb5jjvzjqfpsa7q12afbk9nqj06xdpw1s7qa6a1bnalikfniqm";
     };
   };
 

From 390f67924fc9990197470458d4ff2955d13202dd Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Tue, 2 May 2017 20:57:18 -0700
Subject: [PATCH 14/79] agate-dbf: 0.1.0 -> 0.2.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e3d137e467f..bd361825222 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -139,8 +139,7 @@ in {
   phonenumbers = callPackage ../development/python-modules/phonenumbers { };
 
   agate-dbf = buildPythonPackage rec {
-    name = "agate-dbf-0.1.0";
-    disabled = isPy3k;
+    name = "agate-dbf-0.2.0";
 
     meta = {
       description = "Adds read support for dbf files to agate";
@@ -153,7 +152,7 @@ in {
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/a/agate-dbf/${name}.tar.gz";
-      sha256 = "0xzz834lh4xbl342c6wmxqy7ynmsrjp42bsjahfcxhsgq33vzngz";
+      sha256 = "0pkk6m873xpqj77ja6ylmg8v41abpn4bvsqw6mh2hjyd0snw2rh6";
     };
   };
 

From fcd954181c54778390e951a46801139f9df169fd Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Tue, 2 May 2017 20:58:31 -0700
Subject: [PATCH 15/79] agate-excel: 0.1.0 -> 0.2.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bd361825222..3d3a127a0cd 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -157,8 +157,7 @@ in {
   };
 
   agate-excel = buildPythonPackage rec {
-    name = "agate-excel-0.1.0";
-    disabled = isPy3k;
+    name = "agate-excel-0.2.1";
 
     meta = {
       description = "Adds read support for excel files to agate";
@@ -171,7 +170,7 @@ in {
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/a/agate-excel/${name}.tar.gz";
-      sha256 = "08zvj3pwqw8zhd58iyymiwblrk92y4gl6yyrb2svb0k8za7v0hak";
+      sha256 = "1d28s01a0a8n8rdrd78w88cqgl3lawzy38h9afwm0iks618i0qn7";
     };
   };
 

From 36acb4ec3e7a6f93f26ae59e313f048db0335188 Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Tue, 2 May 2017 20:59:06 -0700
Subject: [PATCH 16/79] agate-sql: Init at 0.5.2

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3d3a127a0cd..8cdf4ecbe13 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -174,6 +174,24 @@ in {
     };
   };
 
+  agate-sql = buildPythonPackage rec {
+    name = "agate-sql-0.5.2";
+
+    meta = {
+      description = "Adds SQL read/write support to agate.";
+      homepage    = https://github.com/wireservice/agate-sql;
+      license     = licenses.mit;
+      maintainers = with maintainers; [ vrthra ];
+    };
+
+    propagatedBuildInputs = with self; [ agate sqlalchemy ];
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/a/agate-sql/${name}.tar.gz";
+      sha256 = "0qlfwql6fnbs0r1rj7nxv4n5scad53b8dlh4qv6gyklvdk3wwn14";
+    };
+  };
+
   ansicolor = buildPythonPackage rec {
     name = "ansicolor-${version}";
     version = "0.2.4";

From fddbb6b1ee99037077732789328a36254b3dd0d4 Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Tue, 2 May 2017 20:59:48 -0700
Subject: [PATCH 17/79] dbf: 0.94.003 -> 0.96.8

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8cdf4ecbe13..69605ddab3c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -226,8 +226,12 @@ in {
   bugseverywhere = callPackage ../applications/version-management/bugseverywhere {};
 
   dbf = buildPythonPackage rec {
-    name = "dbf-0.94.003";
-    disabled = isPy3k;
+    name = "dbf-0.96.8";
+
+    propagatedBuildInputs = [ self.aenum ];
+
+    doCheck = false;
+    # (only) on python3 the unittest loader (loadTestsFromName(submodule)) fails
 
     meta = {
       description = "Pure python package for reading/writing dBase, FoxPro, and Visual FoxPro .dbf files";
@@ -238,7 +242,7 @@ in {
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/d/dbf/${name}.tar.gz";
-      sha256 = "0i2454hwg67079jb56x663wqmmwr55pcr6c76q2415185y6nhny9";
+      sha256 = "1z8n7s4cka6x9ybh4qpfhj51v2qrk38h2f06npizzhm0hmn6r3v1";
     };
   };
 

From 6040adc67400f792879de0833472cdcd73d94c94 Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Tue, 2 May 2017 21:00:33 -0700
Subject: [PATCH 18/79] python-slugify: Init at 1.2.4

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 69605ddab3c..a4900cfe04d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1609,6 +1609,28 @@ in {
     };
   }));
 
+  python-slugify = buildPythonPackage rec {
+    name = "python-slugify-${version}";
+    version = "1.2.4";
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/p/python-slugify/${name}.tar.gz";
+      sha256 = "097qllxys22kghcv2a5jcc1zdlr9zzqayvk6ywavsv8wgbgqb8sp";
+    };
+    doCheck = false;
+    # (only) on python3 unittest loader (loadTestsFromModule) fails
+
+    propagatedBuildInputs = with self; [ unidecode regex ];
+
+    meta = with stdenv.lib; {
+      homepage = https://github.com/un33k/python-slugify;
+      description = "A Python Slugify application that handles Unicode";
+      license = licenses.mit;
+      platforms = platforms.all;
+      maintainers = with maintainers; [ vrthra ];
+    };
+  };
+
   awesome-slugify = buildPythonPackage rec {
     name = "awesome-slugify-${version}";
     version = "1.6.5";

From 918773356d9a9c0923ddde97bdf1ca5de2453ba7 Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Tue, 2 May 2017 21:00:58 -0700
Subject: [PATCH 19/79] dbfread: Enable python3

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a4900cfe04d..69dc1c31423 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -249,7 +249,6 @@ in {
 
   dbfread = buildPythonPackage rec {
     name = "dbfread-2.0.5";
-    disabled = isPy3k;
 
     meta = {
       description = "Read DBF Files with Python";

From 9b5b713d8f525c400f7406ec35c2dac851975586 Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Tue, 2 May 2017 21:01:30 -0700
Subject: [PATCH 20/79] csvkit: 0.9.1 -> 1.0.2

---
 pkgs/top-level/python-packages.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 69dc1c31423..fa8e7df9766 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2575,15 +2575,19 @@ in {
 
   csvkit = buildPythonPackage rec {
     name = "csvkit-${version}";
-    version = "0.9.1";
-    disabled = isPy3k;
+    version = "1.0.2";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/c/csvkit/${name}.tar.gz";
-      sha256 = "0fprr4wgp0bq8kl5qims88np11af7ahr5bxkrhfwpdgcgdjbiy4j";
+      sha256 = "05vfsba9nwh4islszgs18rq8sjkpzqni0cdwvvkw7pi0r63pz2as";
     };
 
-    propagatedBuildInputs = with self; [ dateutil_2_2 dbf xlrd sqlalchemy openpyxl_2_2_0_b1 ];
+    propagatedBuildInputs = with self; [ dateutil dbf xlrd sqlalchemy openpyxl
+      agate-excel agate-dbf agate-sql ];
+
+    doCheck = false;
+    # (only) python 3 we had 9 failures and 57 errors out of a much larger
+    # number of tests.
 
     meta = {
       description = "A library of utilities for working with CSV, the king of tabular file formats";

From 5d1c598655ef557ef3a6a7c79761aaaff9dabf45 Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Mon, 1 May 2017 12:20:51 -0700
Subject: [PATCH 21/79] dateutil: remove 2_2

---
 pkgs/top-level/python-packages.nix | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index fa8e7df9766..f98a5dd6f1f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6058,27 +6058,6 @@ in {
 
   dateutil = callPackage ../development/python-modules/dateutil { };
 
-  # csvkit 0.9.1 needs dateutil==2.2
-  dateutil_2_2 = buildPythonPackage (rec {
-    name = "dateutil-2.2";
-    disabled = isPy3k;
-
-    propagatedBuildInputs = with self; [ self.six ];
-
-    buildInputs = [ pkgs.glibcLocales ];
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/python-dateutil/python-${name}.tar.gz";
-      sha256 = "0s74ad6r789810s10dxgvaf48ni6adac2icrdad34zxygqq6bj7f";
-    };
-
-    meta = {
-      description = "Powerful extensions to the standard datetime module";
-      homepage = http://pypi.python.org/pypi/python-dateutil;
-      license = "BSD-style";
-    };
-  });
-
   # Buildbot 0.8.7p1 needs dateutil==1.5
   dateutil_1_5 = buildPythonPackage (rec {
     name = "dateutil-1.5";

From d76e68423ff67200aba23ae38ceda61a23c983bf Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Tue, 2 May 2017 20:46:08 -0700
Subject: [PATCH 22/79] openpyxl: remove 2_2_0_b1

---
 pkgs/top-level/python-packages.nix | 25 -------------------------
 1 file changed, 25 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f98a5dd6f1f..63fefc324d8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16434,31 +16434,6 @@ in {
     doCheck = false;
   };
 
-  openpyxl_2_2_0_b1 = buildPythonPackage rec {
-    version = "2.2.0-b1";
-    name = "openpyxl-${version}";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/o/openpyxl/${name}.tar.gz";
-      sha256 = "0n10pawp2558jrrmppyhkrv7889k3g4mifqj3fp68qbr20ldk51k";
-    };
-
-    buildInputs = with self; [ pytest ];
-    propagatedBuildInputs = with self; [ jdcal et_xmlfile lxml ];
-
-    # Tests are not included in archive.
-    # https://bitbucket.org/openpyxl/openpyxl/issues/610
-    doCheck = false;
-
-    meta = {
-      description = "A Python library to read/write Excel 2007 xlsx/xlsm files";
-      homepage = https://openpyxl.readthedocs.org;
-      license = licenses.mit;
-      maintainers = with maintainers; [ lihop sjourdois ];
-      platforms = platforms.all;
-    };
-  };
-
   openpyxl = buildPythonPackage rec {
     version = "2.3.5";
     name = "openpyxl-${version}";

From 4036bc91da25b31f846431ee6dce77b6f48d4c06 Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Tue, 2 May 2017 21:08:10 -0700
Subject: [PATCH 23/79] agate: refactor

---
 .../python-modules/agate/default.nix          | 27 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 22 +--------------
 2 files changed, 28 insertions(+), 21 deletions(-)
 create mode 100644 pkgs/development/python-modules/agate/default.nix

diff --git a/pkgs/development/python-modules/agate/default.nix b/pkgs/development/python-modules/agate/default.nix
new file mode 100644
index 00000000000..3ff097a78cf
--- /dev/null
+++ b/pkgs/development/python-modules/agate/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchPypi, buildPythonPackage, isPy3k,
+  discid, six, parsedatetime, isodate, Babel, pytimeparse,
+  leather, python-slugify }:
+
+buildPythonPackage rec {
+    name = "${pname}-${version}";
+    pname = "agate";
+    version = "1.6.0";
+
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "02pb5jjvzjqfpsa7q12afbk9nqj06xdpw1s7qa6a1bnalikfniqm";
+    };
+
+    propagatedBuildInputs = [ discid six parsedatetime
+         isodate Babel pytimeparse leather python-slugify ];
+
+    doCheck = !isPy3k;
+    # (only) on python3 unittest loader (loadTestsFromModule) fails
+
+    meta = with stdenv.lib; {
+      description = "A Python data analysis library that is optimized for humans instead of machines";
+      homepage    = https://github.com/wireservice/agate;
+      license     = with licenses; [ mit ];
+      maintainers = with maintainers; [ vrthra ];
+    };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 63fefc324d8..8bb828402bb 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -114,27 +114,7 @@ in {
 
   aenum = callPackage ../development/python-modules/aenum { };
 
-  agate = buildPythonPackage rec {
-    name = "agate-1.6.0";
-
-    meta = {
-      description = "A Python data analysis library that is optimized for humans instead of machines";
-      homepage    = "https://github.com/wireservice/agate";
-      license     = licenses.mit;
-      maintainers = with maintainers; [ vrthra ];
-    };
-
-    doCheck = false;
-    # (only) on python3 unittest loader (loadTestsFromModule) fails
-
-    propagatedBuildInputs = with self; [ discid six parsedatetime isodate Babel
-         pytimeparse leather python-slugify ];
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/a/agate/${name}.tar.gz";
-      sha256 = "02pb5jjvzjqfpsa7q12afbk9nqj06xdpw1s7qa6a1bnalikfniqm";
-    };
-  };
+  agate = callPackage ../development/python-modules/agate { };
 
   phonenumbers = callPackage ../development/python-modules/phonenumbers { };
 

From 90daf2de276b774c8da7e605f4dd7d90358e1824 Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Tue, 2 May 2017 21:09:41 -0700
Subject: [PATCH 24/79] agate-dbf: refactor

---
 .../python-modules/agate-dbf/default.nix      | 21 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 20 ++----------------
 2 files changed, 23 insertions(+), 18 deletions(-)
 create mode 100644 pkgs/development/python-modules/agate-dbf/default.nix

diff --git a/pkgs/development/python-modules/agate-dbf/default.nix b/pkgs/development/python-modules/agate-dbf/default.nix
new file mode 100644
index 00000000000..11409a11778
--- /dev/null
+++ b/pkgs/development/python-modules/agate-dbf/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchPypi, buildPythonPackage, agate, dbf, dbfread }:
+
+buildPythonPackage rec {
+    name = "${pname}-${version}";
+    pname = "agate-dbf";
+    version = "0.2.0";
+
+    propagatedBuildInputs = [ agate dbf dbfread ];
+
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "0pkk6m873xpqj77ja6ylmg8v41abpn4bvsqw6mh2hjyd0snw2rh6";
+    };
+
+    meta = with stdenv.lib; {
+      description = "Adds read support for dbf files to agate";
+      homepage    = https://github.com/wireservice/agate-dbf;
+      license     = with licenses; [ mit ];
+      maintainers = with maintainers; [ vrthra ];
+    };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8bb828402bb..45307356282 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -116,26 +116,10 @@ in {
 
   agate = callPackage ../development/python-modules/agate { };
 
+  agate-dbf = callPackage ../development/python-modules/agate-dbf { };
+
   phonenumbers = callPackage ../development/python-modules/phonenumbers { };
 
-  agate-dbf = buildPythonPackage rec {
-    name = "agate-dbf-0.2.0";
-
-    meta = {
-      description = "Adds read support for dbf files to agate";
-      homepage    = "https://github.com/wireservice/agate-dbf";
-      license     = licenses.mit;
-      maintainers = with maintainers; [ vrthra ];
-    };
-
-    propagatedBuildInputs = with self; [ agate dbf dbfread ];
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/a/agate-dbf/${name}.tar.gz";
-      sha256 = "0pkk6m873xpqj77ja6ylmg8v41abpn4bvsqw6mh2hjyd0snw2rh6";
-    };
-  };
-
   agate-excel = buildPythonPackage rec {
     name = "agate-excel-0.2.1";
 

From 4365d634c8ed6a37e898820cbc888194a96013e8 Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Tue, 2 May 2017 21:10:26 -0700
Subject: [PATCH 25/79] agate-excel: refactor

---
 .../python-modules/agate-excel/default.nix    | 22 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 18 +--------------
 2 files changed, 23 insertions(+), 17 deletions(-)
 create mode 100644 pkgs/development/python-modules/agate-excel/default.nix

diff --git a/pkgs/development/python-modules/agate-excel/default.nix b/pkgs/development/python-modules/agate-excel/default.nix
new file mode 100644
index 00000000000..cb0113c22b3
--- /dev/null
+++ b/pkgs/development/python-modules/agate-excel/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchPypi, buildPythonPackage, agate, openpyxl, xlrd }:
+
+buildPythonPackage rec {
+    name = "${pname}-${version}";
+    pname = "agate-excel";
+    version = "0.2.1";
+
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "1d28s01a0a8n8rdrd78w88cqgl3lawzy38h9afwm0iks618i0qn7";
+    };
+
+    propagatedBuildInputs = [ agate openpyxl xlrd ];
+
+    meta = with stdenv.lib; {
+      description = "Adds read support for excel files to agate";
+      homepage    = "https://github.com/wireservice/agate-excel";
+      license     = licenses.mit;
+      maintainers = with maintainers; [ vrthra ];
+    };
+
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 45307356282..1ff8f7d7d09 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -120,23 +120,7 @@ in {
 
   phonenumbers = callPackage ../development/python-modules/phonenumbers { };
 
-  agate-excel = buildPythonPackage rec {
-    name = "agate-excel-0.2.1";
-
-    meta = {
-      description = "Adds read support for excel files to agate";
-      homepage    = "https://github.com/wireservice/agate-excel";
-      license     = licenses.mit;
-      maintainers = with maintainers; [ vrthra ];
-    };
-
-    propagatedBuildInputs = with self; [ agate openpyxl xlrd ];
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/a/agate-excel/${name}.tar.gz";
-      sha256 = "1d28s01a0a8n8rdrd78w88cqgl3lawzy38h9afwm0iks618i0qn7";
-    };
-  };
+  agate-excel = callPackage ../development/python-modules/agate-excel { };
 
   agate-sql = buildPythonPackage rec {
     name = "agate-sql-0.5.2";

From e13b240359d51af91400d6fb2c1c1ae720502926 Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Tue, 2 May 2017 21:12:09 -0700
Subject: [PATCH 26/79] agate-sql: refactor

---
 .../python-modules/agate-sql/default.nix      | 21 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 18 +---------------
 2 files changed, 22 insertions(+), 17 deletions(-)
 create mode 100644 pkgs/development/python-modules/agate-sql/default.nix

diff --git a/pkgs/development/python-modules/agate-sql/default.nix b/pkgs/development/python-modules/agate-sql/default.nix
new file mode 100644
index 00000000000..0167b40ea43
--- /dev/null
+++ b/pkgs/development/python-modules/agate-sql/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchPypi, buildPythonPackage, agate, sqlalchemy }:
+
+buildPythonPackage rec {
+    name = "${pname}-${version}";
+    pname = "agate-sql";
+    version = "0.5.2";
+
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "0qlfwql6fnbs0r1rj7nxv4n5scad53b8dlh4qv6gyklvdk3wwn14";
+    };
+
+    propagatedBuildInputs = [ agate sqlalchemy ];
+
+    meta = with stdenv.lib; {
+      description = "Adds SQL read/write support to agate.";
+      homepage    = https://github.com/wireservice/agate-sql;
+      license     = with licenses; [ mit ];
+      maintainers = with maintainers; [ vrthra ];
+    };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1ff8f7d7d09..aeee6b08eb7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -122,23 +122,7 @@ in {
 
   agate-excel = callPackage ../development/python-modules/agate-excel { };
 
-  agate-sql = buildPythonPackage rec {
-    name = "agate-sql-0.5.2";
-
-    meta = {
-      description = "Adds SQL read/write support to agate.";
-      homepage    = https://github.com/wireservice/agate-sql;
-      license     = licenses.mit;
-      maintainers = with maintainers; [ vrthra ];
-    };
-
-    propagatedBuildInputs = with self; [ agate sqlalchemy ];
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/a/agate-sql/${name}.tar.gz";
-      sha256 = "0qlfwql6fnbs0r1rj7nxv4n5scad53b8dlh4qv6gyklvdk3wwn14";
-    };
-  };
+  agate-sql = callPackage ../development/python-modules/agate-sql { };
 
   ansicolor = buildPythonPackage rec {
     name = "ansicolor-${version}";

From b94706926b984001f257363ac8561bf614de0af3 Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Tue, 2 May 2017 21:13:50 -0700
Subject: [PATCH 27/79] dbf: refactor

---
 .../python-modules/dbf/default.nix            | 25 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 22 +---------------
 2 files changed, 26 insertions(+), 21 deletions(-)
 create mode 100644 pkgs/development/python-modules/dbf/default.nix

diff --git a/pkgs/development/python-modules/dbf/default.nix b/pkgs/development/python-modules/dbf/default.nix
new file mode 100644
index 00000000000..2343ea2918b
--- /dev/null
+++ b/pkgs/development/python-modules/dbf/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchPypi, buildPythonPackage, aenum, isPy3k }:
+
+buildPythonPackage rec {
+    pname = "dbf";
+    version = "0.96.8";
+    name = "${pname}-${version}";
+
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "1z8n7s4cka6x9ybh4qpfhj51v2qrk38h2f06npizzhm0hmn6r3v1";
+    };
+
+    propagatedBuildInputs = [ aenum ];
+
+    doCheck = !isPy3k;
+    # tests are not yet ported.
+    # https://groups.google.com/forum/#!topic/python-dbase/96rx2xmCG4w
+
+    meta = with stdenv.lib; {
+      description = "Pure python package for reading/writing dBase, FoxPro, and Visual FoxPro .dbf files";
+      homepage    = "https://pypi.python.org/pypi/dbf";
+      license     = licenses.bsd2;
+      maintainers = with maintainers; [ vrthra ];
+    };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index aeee6b08eb7..5d05ea6ef44 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -157,27 +157,7 @@ in {
 
   bugseverywhere = callPackage ../applications/version-management/bugseverywhere {};
 
-  dbf = buildPythonPackage rec {
-    name = "dbf-0.96.8";
-
-    propagatedBuildInputs = [ self.aenum ];
-
-    doCheck = false;
-    # (only) on python3 the unittest loader (loadTestsFromName(submodule)) fails
-
-    meta = {
-      description = "Pure python package for reading/writing dBase, FoxPro, and Visual FoxPro .dbf files";
-      homepage    = "https://pypi.python.org/pypi/dbf";
-      license     = licenses.bsd2;
-      maintainers = with maintainers; [ vrthra ];
-    };
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/d/dbf/${name}.tar.gz";
-      sha256 = "1z8n7s4cka6x9ybh4qpfhj51v2qrk38h2f06npizzhm0hmn6r3v1";
-    };
-  };
-
+  dbf = callPackage ../development/python-modules/dbf { };
 
   dbfread = buildPythonPackage rec {
     name = "dbfread-2.0.5";

From 2b56afea4d295a4d055ed4d5418790da5885376f Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Tue, 2 May 2017 21:14:50 -0700
Subject: [PATCH 28/79] dbfread: refactor

---
 .../python-modules/dbfread/default.nix        | 19 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 16 +---------------
 2 files changed, 20 insertions(+), 15 deletions(-)
 create mode 100644 pkgs/development/python-modules/dbfread/default.nix

diff --git a/pkgs/development/python-modules/dbfread/default.nix b/pkgs/development/python-modules/dbfread/default.nix
new file mode 100644
index 00000000000..6bbc4775605
--- /dev/null
+++ b/pkgs/development/python-modules/dbfread/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchPypi, buildPythonPackage }:
+
+buildPythonPackage rec {
+    name = "${pname}-${version}";
+    pname = "dbfread";
+    version = "2.0.5";
+
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "0r5axq9ax0czyapm7b69krcv22r1nyb4vci7c5x8mx8pq1axim93";
+    };
+
+    meta = with stdenv.lib; {
+      description = "Read DBF Files with Python";
+      homepage    = http://dbfread.readthedocs.org/;
+      license     = with licenses; [ mit ];
+      maintainers = with maintainers; [ vrthra ];
+    };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5d05ea6ef44..03958bc9d7f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -159,21 +159,7 @@ in {
 
   dbf = callPackage ../development/python-modules/dbf { };
 
-  dbfread = buildPythonPackage rec {
-    name = "dbfread-2.0.5";
-
-    meta = {
-      description = "Read DBF Files with Python";
-      homepage    = "http://dbfread.readthedocs.org/";
-      license     = licenses.mit;
-      maintainers = with maintainers; [ vrthra ];
-    };
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/d/dbfread/${name}.tar.gz";
-      sha256 = "0r5axq9ax0czyapm7b69krcv22r1nyb4vci7c5x8mx8pq1axim93";
-    };
-  };
+  dbfread = callPackage ../development/python-modules/dbfread { };
 
   dkimpy = callPackage ../development/python-modules/dkimpy { };
 

From 0ef0a4ab5e56c797bc7fe47699b6910f217b1bf7 Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Tue, 2 May 2017 21:16:23 -0700
Subject: [PATCH 29/79] pytimeparse: refactor

---
 .../python-modules/pytimeparse/default.nix    | 21 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 20 +-----------------
 2 files changed, 22 insertions(+), 19 deletions(-)
 create mode 100644 pkgs/development/python-modules/pytimeparse/default.nix

diff --git a/pkgs/development/python-modules/pytimeparse/default.nix b/pkgs/development/python-modules/pytimeparse/default.nix
new file mode 100644
index 00000000000..ce5ff058664
--- /dev/null
+++ b/pkgs/development/python-modules/pytimeparse/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchPypi, buildPythonPackage, nose }:
+
+buildPythonPackage rec {
+    pname = "pytimeparse";
+    version = "1.1.6";
+    name = "${pname}-${version}";
+
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "0imbb68i5n5fm704gv47if1blpxd4f8g16qmp5ar07cavgh2mibl";
+    };
+
+    propagatedBuildInputs = [ nose ];
+
+    meta = with stdenv.lib; {
+      description = "A small Python library to parse various kinds of time expressions";
+      homepage    = "https://github.com/wroberts/pytimeparse";
+      license     = licenses.mit;
+      maintainers = with maintainers; [ vrthra ];
+    };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 03958bc9d7f..6f46ee91d63 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -318,25 +318,7 @@ in {
 
   python-stdnum = callPackage ../development/python-modules/python-stdnum { };
 
-  pytimeparse = buildPythonPackage rec {
-    pname = "pytimeparse";
-    version = "1.1.6";
-    name = "${pname}-${version}";
-
-    meta = {
-      description = "A small Python library to parse various kinds of time expressions";
-      homepage    = "https://github.com/wroberts/pytimeparse";
-      license     = licenses.mit;
-      maintainers = with maintainers; [ vrthra ];
-    };
-
-    propagatedBuildInputs = with self; [ nose ];
-
-    src = fetchPypi {
-      inherit pname version;
-      sha256 = "0imbb68i5n5fm704gv47if1blpxd4f8g16qmp5ar07cavgh2mibl";
-    };
-  };
+  pytimeparse =  callPackage ../development/python-modules/pytimeparse { };
 
   PyWebDAV = callPackage ../development/python-modules/pywebdav { };
 

From 14d951c46fc400c3aae80ac28f35213d28804472 Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Tue, 2 May 2017 21:17:48 -0700
Subject: [PATCH 30/79] python-slugify: refactor

---
 .../python-modules/python-slugify/default.nix | 24 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 22 +----------------
 2 files changed, 25 insertions(+), 21 deletions(-)
 create mode 100644 pkgs/development/python-modules/python-slugify/default.nix

diff --git a/pkgs/development/python-modules/python-slugify/default.nix b/pkgs/development/python-modules/python-slugify/default.nix
new file mode 100644
index 00000000000..03c37f7a6c4
--- /dev/null
+++ b/pkgs/development/python-modules/python-slugify/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchPypi, buildPythonPackage, unidecode, regex, isPy3k }:
+
+buildPythonPackage rec {
+    name = "${pname}-${version}";
+    pname = "python-slugify";
+    version = "1.2.4";
+
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "097qllxys22kghcv2a5jcc1zdlr9zzqayvk6ywavsv8wgbgqb8sp";
+    };
+    doCheck = !isPy3k;
+    # (only) on python3 unittest loader (loadTestsFromModule) fails
+
+    propagatedBuildInputs = [ unidecode regex ];
+
+    meta = with stdenv.lib; {
+      homepage = https://github.com/un33k/python-slugify;
+      description = "A Python Slugify application that handles Unicode";
+      license = licenses.mit;
+      platforms = platforms.all;
+      maintainers = with maintainers; [ vrthra ];
+    };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6f46ee91d63..e08b0d502ad 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1488,27 +1488,7 @@ in {
     };
   }));
 
-  python-slugify = buildPythonPackage rec {
-    name = "python-slugify-${version}";
-    version = "1.2.4";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/python-slugify/${name}.tar.gz";
-      sha256 = "097qllxys22kghcv2a5jcc1zdlr9zzqayvk6ywavsv8wgbgqb8sp";
-    };
-    doCheck = false;
-    # (only) on python3 unittest loader (loadTestsFromModule) fails
-
-    propagatedBuildInputs = with self; [ unidecode regex ];
-
-    meta = with stdenv.lib; {
-      homepage = https://github.com/un33k/python-slugify;
-      description = "A Python Slugify application that handles Unicode";
-      license = licenses.mit;
-      platforms = platforms.all;
-      maintainers = with maintainers; [ vrthra ];
-    };
-  };
+  python-slugify = callPackage ../development/python-modules/python-slugify { };
 
   awesome-slugify = buildPythonPackage rec {
     name = "awesome-slugify-${version}";

From 5762985302e4947529ec09ad185f9403f8f90a44 Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Tue, 2 May 2017 21:18:57 -0700
Subject: [PATCH 31/79] csvkit: refactor

---
 .../python-modules/csvkit/default.nix         | 28 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 24 +---------------
 2 files changed, 29 insertions(+), 23 deletions(-)
 create mode 100644 pkgs/development/python-modules/csvkit/default.nix

diff --git a/pkgs/development/python-modules/csvkit/default.nix b/pkgs/development/python-modules/csvkit/default.nix
new file mode 100644
index 00000000000..bfabf4376e7
--- /dev/null
+++ b/pkgs/development/python-modules/csvkit/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchPypi, buildPythonPackage,
+  dateutil, dbf, xlrd, sqlalchemy, openpyxl,
+ agate-excel, agate-dbf, agate-sql, isPy3k }:
+
+buildPythonPackage rec {
+    name = "${pname}-${version}";
+    pname = "csvkit";
+    version = "1.0.2";
+
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "05vfsba9nwh4islszgs18rq8sjkpzqni0cdwvvkw7pi0r63pz2as";
+    };
+
+    propagatedBuildInputs = [ dateutil dbf xlrd sqlalchemy openpyxl
+      agate-excel agate-dbf agate-sql ];
+
+    doCheck = !isPy3k;
+    # (only) python 3 we had 9 failures and 57 errors out of a much larger
+    # number of tests.
+
+    meta = with stdenv.lib; {
+      description = "A library of utilities for working with CSV, the king of tabular file formats";
+      maintainers = with maintainers; [ vrthra ];
+      license = with licenses; [ mit ];
+      homepage = https://github.com/wireservice/csvkit;
+    };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e08b0d502ad..554e5ac468c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2433,29 +2433,7 @@ in {
 
   csscompressor = callPackage ../development/python-modules/csscompressor.nix {};
 
-  csvkit = buildPythonPackage rec {
-    name = "csvkit-${version}";
-    version = "1.0.2";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/c/csvkit/${name}.tar.gz";
-      sha256 = "05vfsba9nwh4islszgs18rq8sjkpzqni0cdwvvkw7pi0r63pz2as";
-    };
-
-    propagatedBuildInputs = with self; [ dateutil dbf xlrd sqlalchemy openpyxl
-      agate-excel agate-dbf agate-sql ];
-
-    doCheck = false;
-    # (only) python 3 we had 9 failures and 57 errors out of a much larger
-    # number of tests.
-
-    meta = {
-      description = "A library of utilities for working with CSV, the king of tabular file formats";
-      maintainers = with maintainers; [ vrthra ];
-      license = licenses.mit;
-      homepage = "https://github.com/wireservice/csvkit";
-    };
-  };
+  csvkit =  callPackage ../development/python-modules/csvkit { };
 
   cx_Freeze = buildPythonPackage rec {
     name = "cx_freeze-${version}";

From 7845163d6af84e570ed4c8a1220fd60a2319d9a8 Mon Sep 17 00:00:00 2001
From: zraexy <zraexy@gmail.com>
Date: Tue, 2 May 2017 13:17:04 -0800
Subject: [PATCH 32/79] bt-fw-converter: init at 2017-02-19

---
 .../firmware/bt-fw-converter/default.nix      | 35 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/os-specific/linux/firmware/bt-fw-converter/default.nix

diff --git a/pkgs/os-specific/linux/firmware/bt-fw-converter/default.nix b/pkgs/os-specific/linux/firmware/bt-fw-converter/default.nix
new file mode 100644
index 00000000000..8927e1a28e7
--- /dev/null
+++ b/pkgs/os-specific/linux/firmware/bt-fw-converter/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchurl, makeWrapper, perl, perlPackages, bluez }:
+
+stdenv.mkDerivation  rec {
+  name = "bt-fw-converter-${version}";
+  version = "2017-02-19";
+  rev = "2d8b34402df01c6f7f4b8622de9e8b82fadf4153";
+
+  src = fetchurl {
+    url = "https://raw.githubusercontent.com/winterheart/broadcom-bt-firmware/${rev}/tools/bt-fw-converter.pl";
+    sha256 = "c259b414a4a273c89a0fa7159b3ef73d1ea62b6de91c3a7c2fcc832868e39f4b";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  buildInputs = [ perl perlPackages.RegexpGrammars bluez ];
+
+  unpackCmd = ''
+    mkdir -p ${name}
+    cp $src ${name}/bt-fw-converter.pl
+  '';
+
+  installPhase = ''
+    install -D -m755 bt-fw-converter.pl $out/bin/bt-fw-converter
+    substituteInPlace $out/bin/bt-fw-converter --replace /usr/bin/hex2hcd ${bluez}/bin/hex2hcd
+    wrapProgram $out/bin/bt-fw-converter --set PERL5LIB $PERL5LIB
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/winterheart/broadcom-bt-firmware/;
+    description = "A tool that converts hex to hcd based on inf file";
+    license = licenses.mit;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ zraexy ];
+  };
+} 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8692977cec2..3285c2a60b7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11352,6 +11352,8 @@ with pkgs;
   b43Firmware_6_30_163_46 = callPackage ../os-specific/linux/firmware/b43-firmware/6.30.163.46.nix { };
 
   b43FirmwareCutter = callPackage ../os-specific/linux/firmware/b43-firmware-cutter { };
+  
+  bt-fw-converter = callPackage ../os-specific/linux/firmware/bt-fw-converter { };
 
   batctl = callPackage ../os-specific/linux/batman-adv/batctl.nix { };
 

From d900478e3c38fe3a714fd95e1ddd07bf9f5e251e Mon Sep 17 00:00:00 2001
From: zraexy <zraexy@gmail.com>
Date: Tue, 2 May 2017 20:30:21 -0800
Subject: [PATCH 33/79] broadcom-bt-firmware: init at 12.0.1.1011

broadcom-bt-firmware: init at 12.0.1.1011
---
 nixos/modules/hardware/all-firmware.nix       |  1 +
 .../firmware/broadcom-bt-firmware/default.nix | 39 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 42 insertions(+)
 create mode 100644 pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix

diff --git a/nixos/modules/hardware/all-firmware.nix b/nixos/modules/hardware/all-firmware.nix
index bc82bfd066c..6e7f0bb491a 100644
--- a/nixos/modules/hardware/all-firmware.nix
+++ b/nixos/modules/hardware/all-firmware.nix
@@ -23,6 +23,7 @@ with lib;
 
   config = mkIf config.hardware.enableAllFirmware {
     hardware.firmware = with pkgs; [
+      broadcom-bt-firmware
       firmwareLinuxNonfree
       intel2200BGFirmware
       rtl8723bs-firmware
diff --git a/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix b/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix
new file mode 100644
index 00000000000..bac0ad14fdc
--- /dev/null
+++ b/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchurl, cabextract, bt-fw-converter }:
+
+stdenv.mkDerivation rec {
+  name = "broadcom-bt-firmware-${version}";
+  version = "12.0.1.1011";
+
+  src = fetchurl {
+    url = "http://download.windowsupdate.com/d/msdownload/update/driver/drvs/2016/11/200033618_94cfea9130b30c04bc602cd3dcc1f9a793fc75bb.cab";
+    sha256 = "6091e49c9d9c71cbe3aed2db3c0d60994ff562804c3b40e1e8bcbb818180987b";
+  };
+
+  nativeBuildInputs = [ cabextract bt-fw-converter ];
+
+  unpackCmd = ''
+    mkdir -p ${name}
+    cabextract $src --directory ${name}
+  '';
+  
+  installPhase = ''
+    mkdir -p $out/lib/firmware/brcm
+    bt-fw-converter -f bcbtums.inf -o $out/lib/firmware/brcm
+    for filename in $out/lib/firmware/brcm/*.hcd
+    do
+      linkname=$(basename $filename | awk 'match($0,/^(BCM)[0-9A-Z]+(-[0-9a-z]{4}-[0-9a-z]{4}\.hcd)$/,c) { print c[1]c[2] }')
+      if ! [ -z $linkname ]
+      then
+        ln -s -T $filename $out/lib/firmware/brcm/$linkname
+      fi
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Firmware for Broadcom WIDCOMM® Bluetooth devices";
+    homepage = http://www.catalog.update.microsoft.com/Search.aspx?q=Broadcom+bluetooth;
+    license = licenses.unfree;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ zraexy ];
+  };
+} 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3285c2a60b7..6c893722638 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11355,6 +11355,8 @@ with pkgs;
   
   bt-fw-converter = callPackage ../os-specific/linux/firmware/bt-fw-converter { };
 
+  broadcom-bt-firmware = callPackage ../os-specific/linux/firmware/broadcom-bt-firmware { };
+
   batctl = callPackage ../os-specific/linux/batman-adv/batctl.nix { };
 
   blktrace = callPackage ../os-specific/linux/blktrace { };

From db8243566004973d2ad850c816c02bb608ad6b46 Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@avnik.info>
Date: Thu, 4 May 2017 16:44:59 +0300
Subject: [PATCH 34/79] gimp: promote intltool to default nativeBuildDepends

It used by gimp itself (so should be already present on machine builds
gimp+plugins) and 90% of plugins.
---
 .../applications/graphics/gimp/plugins/default.nix | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix
index b52009d715e..6b145ca09ee 100644
--- a/pkgs/applications/graphics/gimp/plugins/default.nix
+++ b/pkgs/applications/graphics/gimp/plugins/default.nix
@@ -5,7 +5,7 @@
 
 { pkgs, gimp }:
 let
-  inherit (pkgs) stdenv fetchurl pkgconfig glib fetchFromGitHub;
+  inherit (pkgs) stdenv fetchurl pkgconfig intltool glib fetchFromGitHub;
   inherit (gimp) targetPluginDir targetScriptDir;
 
   pluginDerivation = a: stdenv.mkDerivation ({
@@ -26,7 +26,7 @@ let
   // {
       name = "${a.name}-${gimp.name}-plugin";
       buildInputs = [ gimp gimp.gtk glib ] ++ (a.buildInputs or []);
-      nativeBuildInputs = [ pkgconfig ] ++ (a.nativeBuildInputs or []);
+      nativeBuildInputs = [ pkgconfig intltool ] ++ (a.nativeBuildInputs or []);
     }
   );
 
@@ -51,7 +51,6 @@ rec {
        Video
     */
     name = "gap-2.6.0";
-    nativeBuildInputs = with pkgs; [ intltool ];
     src = fetchurl {
       url = http://ftp.gimp.org/pub/gimp/plug-ins/v2.6/gap/gimp-gap-2.6.0.tar.bz2;
       sha256 = "1jic7ixcmsn4kx2cn32nc5087rk6g8xsrz022xy11yfmgvhzb0ql";
@@ -91,7 +90,6 @@ rec {
     */
     name = "focusblur-3.2.6";
     buildInputs = with pkgs; [ fftwSinglePrec ];
-    nativeBuildInputs = with pkgs; [ intltool ];
     patches = [ ./patches/focusblur-glib.patch ];
     postInstall = "fail";
     installPhase = "installPlugins src/focusblur";
@@ -130,10 +128,7 @@ rec {
     */
     name = "resynthesizer-2.0.1";
     buildInputs = with pkgs; [ fftw ];
-    nativeBuildInputs = with pkgs; [ 
-      autoreconfHook
-      intltool
-    ];
+    nativeBuildInputs = with pkgs; [ autoreconfHook ];
     makeFlags = "GIMP_LIBDIR=$out/lib/gimp/2.0/";
     src = fetchFromGitHub {
       owner = "bootchk";
@@ -150,7 +145,6 @@ rec {
       sha256 = "0cdjq25g3yfxx6bzx6nid21kq659s1vl9id4wxyjs2dhcv229cg3";
     };
     buildInputs = with pkgs; [ perl ];
-    nativeBuildInputs = with pkgs; [ intltool ];
     patchPhase = ''
       sed -i '/.*gimpimage_pdb.h.*/ d' src/*.c*
     '';
@@ -162,7 +156,6 @@ rec {
       Filters/Enhance/Wavelet sharpen
     */
     name = "wavelet-sharpen-0.1.2";
-    nativeBuildInputs = with pkgs; [ intltool ];
     src = fetchurl {
       url = http://registry.gimp.org/files/wavelet-sharpen-0.1.2.tar.gz;
       sha256 = "0vql1k67i21g5ivaa1jh56rg427m0icrkpryrhg75nscpirfxxqw";
@@ -176,7 +169,6 @@ rec {
     */
     name = "lqr-plugin-0.6.1";
     buildInputs = with pkgs; [ libLQR ];
-    nativeBuildInputs = with pkgs; [ intltool ];
     src = fetchurl {
       url = http://registry.gimp.org/files/gimp-lqr-plugin-0.6.1.tar.bz2;
       sha256 = "00hklkpcimcbpjly4rjhfipaw096cpy768g9wixglwrsyqhil7l9";

From 887058766fec01cae993d58a70cd6389cd5b26fe Mon Sep 17 00:00:00 2001
From: Tristan Helmich <tristan.helmich@gmail.com>
Date: Thu, 4 May 2017 19:34:17 +0200
Subject: [PATCH 35/79] emby: 3.2.12 -> 3.2.13.0

---
 pkgs/servers/emby/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/emby/default.nix b/pkgs/servers/emby/default.nix
index f88b82675da..406731424cd 100644
--- a/pkgs/servers/emby/default.nix
+++ b/pkgs/servers/emby/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "emby-${version}";
-  version = "3.2.12";
+  version = "3.2.13.0";
 
   src = fetchurl {
     url = "https://github.com/MediaBrowser/Emby/releases/download/${version}/Emby.Mono.zip";
-    sha256 = "0vbb7ax3100djz6zl8vji04a1x3r9vrrgkar605sc2w9n1j1msp2";
+    sha256 = "180prfbc1lv35cqwamzzgl30c0j89nh18jr1nwjancq0s0wkiksp";
   };
 
   buildInputs = with pkgs; [

From 5db271c99a3313d36d72e008ad5db1335024de5e Mon Sep 17 00:00:00 2001
From: "pe@pijul.org" <pe@pijul.org>
Date: Thu, 27 Apr 2017 10:06:12 +0200
Subject: [PATCH 36/79] pythonPackages.httpserver: init at 1.1.0

---
 .../python-modules/httpserver/default.nix     | 27 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/development/python-modules/httpserver/default.nix

diff --git a/pkgs/development/python-modules/httpserver/default.nix b/pkgs/development/python-modules/httpserver/default.nix
new file mode 100644
index 00000000000..0e4ae14acd7
--- /dev/null
+++ b/pkgs/development/python-modules/httpserver/default.nix
@@ -0,0 +1,27 @@
+{ lib, fetchPypi, buildPythonPackage, docopt, pythonOlder }:
+
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "httpserver";
+  version = "1.1.0";
+
+  buildInputs = [ docopt ];
+
+  # Tests pull in lots of other dependencies to emulate different web
+  # drivers.
+  doCheck = false;
+
+  # Because it uses asyncio
+  disabled = pythonOlder "3.4";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1q62g324dvb0hqdwwrnj41sqr4d3ly78v9nc26rz1whj4pwdmhsv";
+  };
+
+  meta = {
+    description = "Asyncio implementation of an HTTP server";
+    homepage = https://github.com/thomwiggers/httpserver;
+    license = with lib.licenses; [ bsd3 ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 50907f509f0..d60d2707070 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2945,6 +2945,8 @@ in {
     };
   };
 
+  httpserver = callPackage ../development/python-modules/httpserver {};
+
   bleach = buildPythonPackage rec {
     pname = "bleach";
     version = "2.0.0";

From f3f38eccbb066521eb0f6fa022314ec08ad189be Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Wed, 3 May 2017 01:59:27 +0200
Subject: [PATCH 37/79] kicad: update to 4.0.6

---
 .../science/electronics/kicad/default.nix            | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix
index 9cac49d5189..a7dcbb675f5 100644
--- a/pkgs/applications/science/electronics/kicad/default.nix
+++ b/pkgs/applications/science/electronics/kicad/default.nix
@@ -1,24 +1,24 @@
-{ stdenv, fetchurl, fetchbzr, cmake, mesa, wxGTK, zlib, libX11, gettext, glew, cairo, openssl, boost, pkgconfig, doxygen }:
+{ stdenv, fetchurl, fetchbzr, cmake, mesa, wxGTK, zlib, libX11, gettext, glew, cairo, curl, openssl, boost, pkgconfig, doxygen }:
 
 stdenv.mkDerivation rec {
   name = "kicad-${series}";
   series = "4.0";
-  version = "4.0.2";
+  version = "4.0.6";
 
   srcs = [
     (fetchurl {
       url = "https://code.launchpad.net/kicad/${series}/${version}/+download/kicad-${version}.tar.xz";
-      sha256 = "1fcf91fmxj6ha3mm6gzdb0px50j58m80p8wrncm8ca9shj36kbif";
+      sha256 = "1612lkr1p5sii2c4q8zdm6m4kmdylcq8hkd1mzr6b7l3g70sqz79";
     })
 
     (fetchurl {
       url = "http://downloads.kicad-pcb.org/libraries/kicad-library-${version}.tar.gz";
-      sha256 = "1xk9sxxb3d42chdysqmvizrjcbm0467q7nsq5cahq3j1hci49m6l";
+      sha256 = "16f47pd6f0ddsdxdrp327nr9v05gl8c24d0qypq2aqx5hdjmkp7f";
     })
 
     (fetchurl {
       url = "http://downloads.kicad-pcb.org/libraries/kicad-footprints-${version}.tar.gz";
-      sha256 = "0vrzykgxx423iwgz6186bi8724kmbi5wfl92gfwb3r6mqammgwpg";
+      sha256 = "0vmgqhdw05k5fdnqv42grnvlz7v75g9md82jp2d3dvw2zw050lfb";
     })
   ];
 
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true; # often fails on Hydra: fatal error: pcb_plot_params_lexer.h: No such file or directory
 
-  buildInputs = [ cmake mesa wxGTK zlib libX11 gettext glew cairo openssl boost pkgconfig doxygen ];
+  buildInputs = [ cmake mesa wxGTK zlib libX11 gettext glew cairo curl openssl boost pkgconfig doxygen ];
 
   # They say they only support installs to /usr or /usr/local,
   # so we have to handle this.

From d53540dd3215e70bc8a23ec1b0d045d81737e7c4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 4 May 2017 20:45:20 +0200
Subject: [PATCH 38/79] nixUnstable: 1.12pre5308_2f21d522 ->
 1.12pre5344_eba840c8

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

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 31186fb07e3..5295591af29 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -147,12 +147,12 @@ in rec {
 
   nixUnstable = (lib.lowPrio (common rec {
     name = "nix-1.12${suffix}";
-    suffix = "pre5308_2f21d522";
+    suffix = "pre5344_eba840c8";
     src = fetchFromGitHub {
       owner = "NixOS";
       repo = "nix";
-      rev = "2f21d522c28b1e902bd7f0b5b9e7523975102d81";
-      sha256 = "1r3jxz0ydnlxp4b3ggxjgx1q9dv7jyfjm8w1srqjanzn944wnmi9";
+      rev = "eba840c8a13b465ace90172ff76a0db2899ab11b";
+      sha256 = "08yrzlmshg854w5pwq8af634wic91h7k55fs51i55dyxpw4wpxk7";
     };
     fromGit = true;
   })) // { perl-bindings = perl-bindings { nix = nixUnstable; }; };

From 10abea9eccead7908f525f978ba1ad62ade03cda Mon Sep 17 00:00:00 2001
From: Albert Peschar <albert@peschar.net>
Date: Wed, 3 May 2017 18:47:56 +0200
Subject: [PATCH 39/79] pythonPackages.PyLD: init at 0.7.2

---
 lib/maintainers.nix                           |  1 +
 .../python-modules/PyLD/default.nix           | 56 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 3 files changed, 59 insertions(+)
 create mode 100644 pkgs/development/python-modules/PyLD/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index d75cbec8d51..aca69cc85f2 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -43,6 +43,7 @@
   andsild = "Anders Sildnes <andsild@gmail.com>";
   aneeshusa = "Aneesh Agrawal <aneeshusa@gmail.com>";
   antono = "Antono Vasiljev <self@antono.info>";
+  apeschar = "Albert Peschar <albert@peschar.net>";
   apeyroux = "Alexandre Peyroux <alex@px.io>";
   ardumont = "Antoine R. Dumont <eniotna.t@gmail.com>";
   aristid = "Aristid Breitkreuz <aristidb@gmail.com>";
diff --git a/pkgs/development/python-modules/PyLD/default.nix b/pkgs/development/python-modules/PyLD/default.nix
new file mode 100644
index 00000000000..e4edaf83a25
--- /dev/null
+++ b/pkgs/development/python-modules/PyLD/default.nix
@@ -0,0 +1,56 @@
+{ stdenv, fetchPypi, buildPythonPackage, fetchFromGitHub, python, gnugrep }:
+
+let
+
+  json-ld = fetchFromGitHub {
+    owner = "json-ld";
+    repo = "json-ld.org";
+    rev = "843a70e4523d7cd2a4d3f5325586e726eb1b123f";
+    sha256 = "05j0nq6vafclyypxjj30iw898ig0m32nvz0rjdlslx6lawkiwb2a";
+  };
+
+  normalization = fetchFromGitHub {
+    owner = "json-ld";
+    repo = "normalization";
+    rev = "aceeaf224b64d6880189d795bd99c3ffadb5d79e";
+    sha256 = "125q5rllfm8vg9mz8hn7bhvhv2vqpd86kx2kxlk84smh33l8kbyl";
+  };
+
+in
+
+buildPythonPackage rec {
+  pname = "PyLD";
+  version = "0.7.2";
+  name = "${pname}-${version}";
+
+  src = fetchFromGitHub {
+    owner = "digitalbazaar";
+    repo = "pyld";
+    rev = "652473f828e9a396d4c1db9addbd294fb7db1797";
+    sha256 = "1bmpz4s6j7by6l45wwxy7dn7hmrhxc26kbx2hbfy41x29vbjg6j9";
+  };
+
+  # Unfortunately PyLD does not pass all testcases in the JSON-LD corpus. We
+  # check for at least a minimum amount of successful tests so we know it's not
+  # getting worse, at least.
+  checkPhase = ''
+    ok_min=401
+
+    if ! ${python.interpreter} tests/runtests.py -d ${json-ld}/test-suite 2>&1 | tee test.out; then
+      ok_count=$(${gnugrep}/bin/grep -F '... ok' test.out | wc -l)
+      if [[ $ok_count -lt $ok_min ]]; then
+        echo "Less than $ok_min tests passed ($ok_count). Failing the build."
+        exit 1
+      fi
+    fi
+
+    ${python.interpreter} tests/runtests.py -d ${normalization}/tests
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Python implementation of the JSON-LD API";
+    homepage = "https://github.com/digitalbazaar/pyld";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ apeschar ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 774ef2fb0fc..8a84bd53815 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5083,6 +5083,8 @@ in {
     };
   };
 
+  PyLD = callPackage ../development/python-modules/PyLD { };
+
   python-jose = callPackage ../development/python-modules/python-jose {};
 
   pyhepmc = buildPythonPackage rec {

From 700d6186a30e9e8118a6b319f12cb5cfb9d086bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 4 May 2017 22:09:15 +0200
Subject: [PATCH 40/79] wrapFirefox: fix #25505 gtk3 file dialogs

Crash + icons.
---
 .../networking/browsers/firefox/common.nix           |  2 +-
 .../networking/browsers/firefox/wrapper.nix          | 12 ++++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix
index e926822b42a..8d8217e33a2 100644
--- a/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/pkgs/applications/networking/browsers/firefox/common.nix
@@ -200,6 +200,6 @@ stdenv.mkDerivation (rec {
     gtk = gtk2;
     inherit nspr;
     inherit ffmpegSupport;
-  };
+  } // lib.optionalAttrs gtk3Support { inherit gtk3; };
 
 } // overrides)
diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
index f2ca9eaa622..cffdfa7a97d 100644
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -74,7 +74,9 @@ in stdenv.mkDerivation {
     ];
   };
 
-  buildInputs = [makeWrapper] ++ lib.optionals (!ffmpegSupport) gst-plugins;
+  buildInputs = [makeWrapper]
+    ++ lib.optional (!ffmpegSupport) gst-plugins
+    ++ lib.optional (browser ? gtk3) browser.gtk3;
 
   buildCommand = ''
     if [ ! -x "${browser}/bin/${browserName}" ]
@@ -92,7 +94,13 @@ in stdenv.mkDerivation {
         --prefix-contents PATH ':' "$(filterExisting $(addSuffix /extra-bin-path $plugins))" \
         --suffix PATH ':' "$out/bin" \
         --set MOZ_APP_LAUNCHER "${browserName}${nameSuffix}" \
-        ${lib.optionalString (!ffmpegSupport) ''--prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH"''}
+        ${lib.optionalString (!ffmpegSupport)
+            ''--prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH"''
+        + lib.optionalString (browser ? gtk3)
+            ''--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
+              --suffix XDG_DATA_DIRS : '${gnome3.defaultIconTheme}/share'
+            ''
+         }
 
     if [ -e "${browser}/share/icons" ]; then
         mkdir -p "$out/share"

From 37a2949ab4f81a1476b2bf104b0ef5da606bc0f1 Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Thu, 4 May 2017 22:31:18 +0200
Subject: [PATCH 41/79] openshift: copy symlinks into $bin/bin

---
 pkgs/applications/networking/cluster/openshift/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix
index 3915ab6cc26..6ade5bab70e 100644
--- a/pkgs/applications/networking/cluster/openshift/default.nix
+++ b/pkgs/applications/networking/cluster/openshift/default.nix
@@ -36,7 +36,7 @@ in buildGoPackage rec {
 
   installPhase = ''
     mkdir -p "$bin/bin"
-    cp "_output/local/bin/$(go env GOOS)/$(go env GOARCH)/"* "$bin/bin/"
+    cp -a "_output/local/bin/$(go env GOOS)/$(go env GOARCH)/"* "$bin/bin/"
   '';
 
   meta = with stdenv.lib; {

From 68c6e5bc8baf87ac03ebe517298b920a7d2f0b9e Mon Sep 17 00:00:00 2001
From: Josef Kemetmueller <josef.kemetmueller@aon.at>
Date: Tue, 25 Apr 2017 21:44:28 +0200
Subject: [PATCH 42/79] opencv3: Enable darwin build

---
 pkgs/development/libraries/opencv/3.x.nix | 10 ++++++----
 pkgs/top-level/all-packages.nix           |  4 +++-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix
index af0456c0162..52afa08f031 100644
--- a/pkgs/development/libraries/opencv/3.x.nix
+++ b/pkgs/development/libraries/opencv/3.x.nix
@@ -4,7 +4,7 @@
 , enablePNG       ? true, libpng
 , enableTIFF      ? true, libtiff
 , enableWebP      ? true, libwebp
-, enableEXR       ? true, openexr, ilmbase
+, enableEXR ? (!stdenv.isDarwin), openexr, ilmbase
 , enableJPEG2K    ? true, jasper
 
 , enableIpp       ? false
@@ -16,6 +16,7 @@
 , enableGStreamer ? false, gst_all_1
 , enableEigen     ? false, eigen
 , enableCuda      ? false, cudatoolkit, gcc5
+, AVFoundation, Cocoa, QTKit
 }:
 
 let
@@ -115,7 +116,7 @@ stdenv.mkDerivation rec {
     ++ lib.optional enableEigen eigen
     ++ lib.optionals enableCuda [ cudatoolkit gcc5 ]
     ++ lib.optional enableContrib protobuf3_1
-    ;
+    ++ lib.optionals stdenv.isDarwin [ AVFoundation Cocoa QTKit ];
 
   propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy;
 
@@ -134,7 +135,8 @@ stdenv.mkDerivation rec {
     (opencvFlag "CUDA" enableCuda)
     (opencvFlag "CUBLAS" enableCuda)
   ] ++ lib.optionals enableCuda [ "-DCUDA_FAST_MATH=ON" ]
-    ++ lib.optional enableContrib "-DBUILD_PROTOBUF=off";
+    ++ lib.optional enableContrib "-DBUILD_PROTOBUF=off"
+    ++ lib.optionals stdenv.isDarwin ["-DWITH_OPENCL=OFF" "-DWITH_LAPACK=OFF"];
 
   enableParallelBuilding = true;
 
@@ -147,6 +149,6 @@ stdenv.mkDerivation rec {
     homepage = http://opencv.org/;
     license = stdenv.lib.licenses.bsd3;
     maintainers = with stdenv.lib.maintainers; [viric flosse mdaiter];
-    platforms = with stdenv.lib.platforms; linux;
+    platforms = with stdenv.lib.platforms; linux ++ darwin;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 24fc47efd64..e8c2c6ecffd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9289,7 +9289,9 @@ with pkgs;
     ffmpeg = ffmpeg_2;
   };
 
-  opencv3 = callPackage ../development/libraries/opencv/3.x.nix { };
+  opencv3 = callPackage ../development/libraries/opencv/3.x.nix {
+    inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa QTKit;
+  };
 
   # this ctl version is needed by openexr_viewers
   openexr_ctl = ctl;

From 4e8aea4339876b19c675011bfa586510fe4cfc7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 4 May 2017 22:53:45 +0200
Subject: [PATCH 43/79] thunderbird: fix missing icons

It's just a fallback in case the user has no icon theme on path.
---
 .../networking/mailreaders/thunderbird/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index 501e7180783..2a942ce14f3 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -6,7 +6,7 @@
 , cairo, gstreamer, gst-plugins-base, icu, libpng, jemalloc
 , autoconf213, which, m4
 , writeScript, xidel, common-updater-scripts, coreutils, gnused, gnugrep, curl
-, enableGTK3 ? false, gtk3, wrapGAppsHook, makeWrapper
+, enableGTK3 ? false, gtk3, gnome3, wrapGAppsHook, makeWrapper
 , enableCalendar ? true
 , debugBuild ? false
 , # If you want the resulting program to call itself "Thunderbird" instead
@@ -47,7 +47,7 @@ in stdenv.mkDerivation rec {
       hunspell libevent libstartup_notification /* cairo */
       icu libpng jemalloc
     ]
-    ++ lib.optional enableGTK3 gtk3;
+    ++ lib.optionals enableGTK3 [ gtk3 gnome3.defaultIconTheme ];
 
   # from firefox + m4 + wrapperTool
   nativeBuildInputs = [ m4 autoconf213 which gnused pkgconfig perl python wrapperTool ];

From d75ae6dee98fd39d0fb14f8c175d238636f3d2db Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 4 May 2017 21:25:19 +0200
Subject: [PATCH 44/79] smplayer: 17.3.0 -> 17.4.2

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

diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/applications/video/smplayer/default.nix
index d7411c1128e..41967f50bd0 100644
--- a/pkgs/applications/video/smplayer/default.nix
+++ b/pkgs/applications/video/smplayer/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, qmakeHook, qtscript }:
 
 stdenv.mkDerivation rec {
-  name = "smplayer-17.3.0";
+  name = "smplayer-17.4.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/smplayer/${name}.tar.bz2";
-    sha256 = "0yv7725kr3dq02mcanc07sapirx6s73l4b6d13nzvq5rkwr8crmj";
+    sha256 = "1lc5pj0y56yynygb7cnl98lpvsf82rc0aa4si8isn81nvy07hmq5";
   };
 
   buildInputs = [ qtscript ];

From d072ef956dd2ba87c046a221115b53f5f1b9b776 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <Mic92@users.noreply.github.com>
Date: Thu, 4 May 2017 22:32:55 +0100
Subject: [PATCH 45/79] broadcom-bt-firmware: mention package limitations

---
 .../linux/firmware/broadcom-bt-firmware/default.nix            | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix b/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix
index bac0ad14fdc..101468c7e08 100644
--- a/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix
+++ b/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix
@@ -1,5 +1,8 @@
 { stdenv, fetchurl, cabextract, bt-fw-converter }:
 
+# Kernels between 4.2 and 4.7 will not work with
+# this packages as they expect the firmware to be named "BCM.hcd"
+# see: https://github.com/NixOS/nixpkgs/pull/25478#issuecomment-299034865
 stdenv.mkDerivation rec {
   name = "broadcom-bt-firmware-${version}";
   version = "12.0.1.1011";

From d95cd1b24ea133435fa23f36e5492b937c8f42b4 Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Thu, 4 May 2017 15:14:59 -0700
Subject: [PATCH 46/79] obs-studio: 18.0.1 -> 18.0.2

add myself as a maintainer for this package, add fdk_aac, pthreadstubs,
and Xdmcp as dependencies. Also add a patch to fix a linker error
involving xcb
---
 .../applications/video/obs-studio/default.nix | 18 ++++++++---
 .../video/obs-studio/find-xcb.patch           | 31 +++++++++++++++++++
 2 files changed, 45 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/applications/video/obs-studio/find-xcb.patch

diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix
index 539314867ab..9c0d8c6b004 100644
--- a/pkgs/applications/video/obs-studio/default.nix
+++ b/pkgs/applications/video/obs-studio/default.nix
@@ -1,9 +1,12 @@
 { stdenv
 , fetchFromGitHub
 , cmake
+, fdk_aac
 , ffmpeg
 , jansson
 , libxkbcommon
+, libpthreadstubs
+, libXdmcp
 , qtbase
 , qtx11extras
 , libv4l
@@ -11,6 +14,7 @@
 , curl
 , xorg
 , makeWrapper
+, pkgconfig
 
 , alsaSupport ? false
 , alsaLib
@@ -22,23 +26,29 @@ let
   optional = stdenv.lib.optional;
 in stdenv.mkDerivation rec {
   name = "obs-studio-${version}";
-  version = "18.0.1";
+  version = "18.0.2";
 
   src = fetchFromGitHub {
     owner = "jp9000";
     repo = "obs-studio";
-    rev = "624aa2a5";
-    sha256 = "1bs82rqyq7wjjg99mh23ap8z5bmrhjfnza5iyjx808fzqc0bgzaj";
+    rev = "26c28b45";
+    sha256 = "06rr70z2p2l8prxmd075pnlc759ddlqn3jprn8ns148x6s2vqik2";
   };
 
+  patches = [ ./find-xcb.patch ];
+
   nativeBuildInputs = [ cmake
+                        pkgconfig
                       ];
 
   buildInputs = [ curl
+                  fdk_aac
                   ffmpeg
                   jansson
                   libv4l
                   libxkbcommon
+                  libpthreadstubs
+                  libXdmcp
                   qtbase
                   qtx11extras
                   x264
@@ -65,7 +75,7 @@ in stdenv.mkDerivation rec {
       video content, efficiently
     '';
     homepage = "https://obsproject.com";
-    maintainers = with maintainers; [ jb55 ];
+    maintainers = with maintainers; [ jb55 MP2E ];
     license = licenses.gpl2;
     platforms = with platforms; linux;
   };
diff --git a/pkgs/applications/video/obs-studio/find-xcb.patch b/pkgs/applications/video/obs-studio/find-xcb.patch
new file mode 100644
index 00000000000..c45aba4ce2f
--- /dev/null
+++ b/pkgs/applications/video/obs-studio/find-xcb.patch
@@ -0,0 +1,31 @@
+diff --git a/libobs/CMakeLists.txt b/libobs/CMakeLists.txt
+index cd2b80e1..7d829cdb 100644
+--- a/libobs/CMakeLists.txt
++++ b/libobs/CMakeLists.txt
+@@ -15,6 +15,7 @@ if(UNIX)
+ 	find_package(DBus QUIET)
+ 	if (NOT APPLE)
+ 		find_package(X11_XCB REQUIRED)
++		find_package(XCB REQUIRED)
+ 	endif()
+ else()
+ 	set(HAVE_DBUS "0")
+@@ -161,12 +162,15 @@ elseif(UNIX)
+ 	endif()
+ 
+ 	include_directories(
+-		${X11_XCB_INCLUDE_DIRS})
++		${X11_XCB_INCLUDE_DIRS}
++		${XCB_INCLUDE_DIRS})
+ 	add_definitions(
+-		${X11_XCB_DEFINITIONS})
++		${X11_XCB_DEFINITIONS}
++		${XCB_DEFINITIONS})
+ 	set(libobs_PLATFORM_DEPS
+ 		${libobs_PLATFORM_DEPS}
+-		${X11_XCB_LIBRARIES})
++		${X11_XCB_LIBRARIES}
++		${XCB_LIBRARIES})
+ 
+ 	if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
+ 		# use the sysinfo compatibility library on bsd

From d8fccd4ac571ac20069076380f89082205c0764e Mon Sep 17 00:00:00 2001
From: pajowu <pajowu@users.noreply.github.com>
Date: Fri, 5 May 2017 02:13:44 +0300
Subject: [PATCH 47/79] libsmi: init at 0.5.0 (#25433)

---
 pkgs/development/libraries/libsmi/default.nix | 18 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 20 insertions(+)
 create mode 100644 pkgs/development/libraries/libsmi/default.nix

diff --git a/pkgs/development/libraries/libsmi/default.nix b/pkgs/development/libraries/libsmi/default.nix
new file mode 100644
index 00000000000..21b788efb89
--- /dev/null
+++ b/pkgs/development/libraries/libsmi/default.nix
@@ -0,0 +1,18 @@
+{ stdenv , fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "libsmi-${version}";
+  version = "0.5.0";
+
+  src = fetchurl {
+    url = "https://www.ibr.cs.tu-bs.de/projects/libsmi/download/${name}.tar.gz";
+    sha256 = "1lslaxr2qcj6hf4naq5n5mparfhmswsgq4wa7zm2icqvvgdcq6pj";
+  };
+
+  meta = with stdenv.lib; {
+    description = "A Library to Access SMI MIB Information";
+    homepage = "https://www.ibr.cs.tu-bs.de/projects/libsmi/index.html";
+    license = licenses.free;
+    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4e4fa547726..d0fcb420957 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2580,6 +2580,8 @@ with pkgs;
 
   libcpuid = callPackage ../tools/misc/libcpuid { };
 
+  libsmi = callPackage ../development/libraries/libsmi { };
+
   lesspipe = callPackage ../tools/misc/lesspipe { };
 
   liquidsoap = callPackage ../tools/audio/liquidsoap/full.nix {

From 85ea6249bbff5f5fb5d1dbc60ff84ced22480aa8 Mon Sep 17 00:00:00 2001
From: Utku Demir <utdemir@gmail.com>
Date: Fri, 5 May 2017 14:55:07 +1200
Subject: [PATCH 48/79] rdkafka: 2015-11-03 -> 0.9.5

---
 pkgs/development/libraries/rdkafka/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/rdkafka/default.nix b/pkgs/development/libraries/rdkafka/default.nix
index 32fff70ebfb..c80c25381b3 100644
--- a/pkgs/development/libraries/rdkafka/default.nix
+++ b/pkgs/development/libraries/rdkafka/default.nix
@@ -1,16 +1,17 @@
-{ stdenv, fetchFromGitHub, zlib, perl }:
+{ stdenv, fetchFromGitHub, zlib, perl, pkgconfig, python }:
 
 stdenv.mkDerivation rec {
-  name = "rdkafka-2015-11-03";
+  name = "rdkafka-${version}";
+  version = "0.9.5";
 
   src = fetchFromGitHub {
     owner = "edenhill";
     repo = "librdkafka";
-    rev = "3e1babf4f26a7d12bbd272c1cdf4aa6a44000d4a";
-    sha256 = "1vmbbkgdwxr25wz60hi6rhqb843ipz34r9baygv87fwh3lwwkqwl";
+    rev = "v${version}";
+    sha256 = "0yp8vmj3yc564hcmhx46ssyn8qayywnsrg4wg67qk6jw967qgwsn";
   };
 
-  buildInputs = [ zlib perl ];
+  buildInputs = [ zlib perl pkgconfig python ];
 
   NIX_CFLAGS_COMPILE = "-Wno-error=strict-overflow";
 

From 5ed9d8df865574256c17f3f2b07f8332663211b5 Mon Sep 17 00:00:00 2001
From: Vinh Le <vinh.ninja@icloud.com>
Date: Fri, 5 May 2017 12:57:53 +0800
Subject: [PATCH 49/79] mozjpeg: 3.1 -> 3.2

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

diff --git a/pkgs/applications/graphics/mozjpeg/default.nix b/pkgs/applications/graphics/mozjpeg/default.nix
index 1b082de98bc..0ca997adb78 100644
--- a/pkgs/applications/graphics/mozjpeg/default.nix
+++ b/pkgs/applications/graphics/mozjpeg/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, file, pkgconfig, libpng, nasm }:
 
 stdenv.mkDerivation rec {
-  version = "3.1";
+  version = "3.2";
   name = "mozjpeg-${version}";
 
   src = fetchurl {
     url = "https://github.com/mozilla/mozjpeg/releases/download/v${version}/mozjpeg-${version}-release-source.tar.gz";
-    sha256 = "07vs0xq9di7bv3y68daig8dvxvjqrn8a5na702gj3nn58a1xivfy";
+    sha256 = "0wvv5qh1jasz8apq93c3j9d5wd22j7lld9dr06p76yj4mpnc3v4a";
   };
 
   postPatch = ''

From e2bc4e4bde72c92e915094b6f1d27e3e6300db15 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Fri, 5 May 2017 07:37:44 +0200
Subject: [PATCH 50/79] libressl: 2.5.3 -> 2.5.4

Contains a fix for CVE-2017-8301: TLS verification vulnerability in
LibreSSL 2.5.1 - 2.5.3 [1][2]

[1]: http://seclists.org/oss-sec/2017/q2/145
[2]: https://github.com/libressl-portable/portable/issues/307
---
 pkgs/development/libraries/libressl/2.5.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libressl/2.5.nix b/pkgs/development/libraries/libressl/2.5.nix
index b2444b18902..2284db5ad7d 100644
--- a/pkgs/development/libraries/libressl/2.5.nix
+++ b/pkgs/development/libraries/libressl/2.5.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libressl-${version}";
-  version = "2.5.3";
+  version = "2.5.4";
 
   src = fetchurl {
     url    = "mirror://openbsd/LibreSSL/${name}.tar.gz";
-    sha256 = "0c4awq45cl757fv7f7f75i5i0ibc6v7ns13n7xvfak7chv2lrqql";
+    sha256 = "1ykf6dqlbafafhbdfmcj19pjj1z6wmsq0rmyqga1i0xv5x95nyhh";
   };
 
   enableParallelBuilding = true;

From 17d2ff414d83095361c2070f1cdaf57c016af9c7 Mon Sep 17 00:00:00 2001
From: Yuri Aisaka <yuriaisaka@users.noreply.github.com>
Date: Fri, 5 May 2017 15:00:38 +0900
Subject: [PATCH 51/79] imagej: init at 150 (#25249)

* imagej: init at 150

* correcting for PR comments
---
 lib/maintainers.nix                           |  1 +
 pkgs/applications/graphics/imagej/default.nix | 48 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 51 insertions(+)
 create mode 100644 pkgs/applications/graphics/imagej/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index aca69cc85f2..a477fb46b86 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -575,6 +575,7 @@
   yarr = "Dmitry V. <savraz@gmail.com>";
   yochai = "Yochai <yochai@titat.info>";
   yorickvp = "Yorick van Pelt <yorickvanpelt@gmail.com>";
+  yuriaisaka = "Yuri Aisaka <yuri.aisaka+nix@gmail.com>";
   yurrriq = "Eric Bailey <eric@ericb.me>";
   z77z = "Marco Maggesi <maggesi@math.unifi.it>";
   zagy = "Christian Zagrodnick <cz@flyingcircus.io>";
diff --git a/pkgs/applications/graphics/imagej/default.nix b/pkgs/applications/graphics/imagej/default.nix
new file mode 100644
index 00000000000..673361c734e
--- /dev/null
+++ b/pkgs/applications/graphics/imagej/default.nix
@@ -0,0 +1,48 @@
+{ stdenv, fetchurl, jre, unzip, makeWrapper }:
+
+# Note:
+# - User config dir is hard coded by upstream to $HOME/.imagej on linux systems
+#   and to $HOME/Library/Preferences on macOS.
+#  (The current trend appears to be to use $HOME/.config/imagej
+#    on linux systems, but we here do not attempt to fix it.)
+
+let
+  imagej150 = stdenv.mkDerivation rec {
+    name = "imagej-${version}";
+    version = "150";
+
+    src = fetchurl {
+      url = "http://wsr.imagej.net/distros/cross-platform/ij150.zip";
+      sha256 = "97aba6fc5eb908f5160243aebcdc4965726693cb1353d9c0d71b8f5dd832cb7b";
+    };
+    buildInputs = [ unzip makeWrapper ];
+    inherit jre;
+
+    # JAR files that are intended to be used by other packages
+    # should go to $out/share/java.
+    # (Some uses ij.jar as a library not as a standalone program.)
+    installPhase = ''
+      mkdir -p $out/share/java
+      # Read permisssion suffices for the jar and others.
+      # Simple cp shall clear suid bits, if any.
+      cp ij.jar $out/share/java
+      cp -dR luts macros plugins $out/share
+      mkdir $out/bin
+      makeWrapper ${jre}/bin/java $out/bin/imagej \
+        --add-flags "-jar $out/share/java/ij.jar -ijpath $out/share"
+    '';
+    meta = with stdenv.lib; {
+      homepage = https://imagej.nih.gov/ij/;
+      description = "Image processing and analysis in Java";
+      longDescription = ''
+        ImageJ is a public domain Java image processing program
+        inspired by NIH Image for the Macintosh.
+        It runs on any computer with a Java 1.4 or later virtual machine.
+      '';
+      license = licenses.publicDomain;
+      platforms = with platforms; linux ++ darwin;
+      maintainers = with maintainers; [ yuriaisaka ];
+    };
+  };
+in
+  imagej150
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5b5af2587d2..de8d9fd05cb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14284,6 +14284,8 @@ with pkgs;
     inherit (perlPackages.override { pkgs = pkgs // { imagemagick = imagemagickBig;}; }) PerlMagick;
   };
 
+  imagej = callPackage ../applications/graphics/imagej { };
+
   imagemagick_light = imagemagick.override {
     bzip2 = null;
     zlib = null;

From bbdfa06eb5b0bea96bb287eacfee5c720e4cade6 Mon Sep 17 00:00:00 2001
From: Benjamin Saunders <ben.e.saunders@gmail.com>
Date: Thu, 4 May 2017 22:17:56 -0700
Subject: [PATCH 52/79] rust-bindgen: 0.23.0 -> 0.24.0

Fixes errors arising from unset LIBCLANG_PATH
---
 pkgs/development/tools/rust/bindgen/default.nix | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/rust/bindgen/default.nix b/pkgs/development/tools/rust/bindgen/default.nix
index 4a4738e069c..79c400fd334 100644
--- a/pkgs/development/tools/rust/bindgen/default.nix
+++ b/pkgs/development/tools/rust/bindgen/default.nix
@@ -1,25 +1,30 @@
-{ stdenv, fetchFromGitHub, rustPlatform, llvmPackages }:
+{ stdenv, fetchFromGitHub, rustPlatform, makeWrapper, llvmPackages }:
 
 # Future work: Automatically communicate NIX_CFLAGS_COMPILE to bindgen's tests and the bindgen executable itself.
 
 rustPlatform.buildRustPackage rec {
   name = "rust-bindgen-${version}";
-  version = "0.23.0";
+  version = "0.24.0";
 
   src = fetchFromGitHub {
     owner = "servo";
     repo = "rust-bindgen";
     rev = "v${version}";
-    sha256 = "1cr7wgb13pavjpv2glq02wf5sqigcl1k0qgf3cqi9c5mjca2cg5y";
+    sha256 = "1nzva8g5nj7m2w8vax86p4rd02ci8793nhnm7sf76ajr4hfnx323";
   };
 
+  nativeBuildInputs = [ makeWrapper ];
   buildInputs = [ llvmPackages.clang-unwrapped ];
 
   configurePhase = ''
     export LIBCLANG_PATH="${llvmPackages.clang-unwrapped}/lib"
   '';
 
-  depsSha256 = "1qrnd9a73vxr7572byjjlhwbax3z4slc7qmwjx3aiwjix3r250dh";
+  postInstall = ''
+    wrapProgram $out/bin/bindgen --set LIBCLANG_PATH "${llvmPackages.clang-unwrapped}/lib"
+  '';
+
+  depsSha256 = "1l8c48y67azzwmv4hzghia1c53b5dw6qiv22cgv8zbyrg20aj8as";
 
   doCheck = false; # A test fails because it can't find standard headers in NixOS
 

From 6ad804324f61e196d7f5793c40c57ba4d209a452 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 5 May 2017 07:46:06 +0100
Subject: [PATCH 53/79] environment: remove lib/kde4/libexec from PATH

kde4 is gone and does need to be in $PATH anymore by default
---
 nixos/modules/programs/environment.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/programs/environment.nix b/nixos/modules/programs/environment.nix
index 48a1e2a0a88..5a63b806cd7 100644
--- a/nixos/modules/programs/environment.nix
+++ b/nixos/modules/programs/environment.nix
@@ -31,7 +31,7 @@ in
 
     # TODO: move most of these elsewhere
     environment.profileRelativeEnvVars =
-      { PATH = [ "/bin" "/sbin" "/lib/kde4/libexec" ];
+      { PATH = [ "/bin" "/sbin" ];
         INFOPATH = [ "/info" "/share/info" ];
         PKG_CONFIG_PATH = [ "/lib/pkgconfig" ];
         TERMINFO_DIRS = [ "/share/terminfo" ];

From 96c0a6db3aeb08b71a670170298bb0913937f4fe Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Fri, 5 May 2017 10:01:56 +0300
Subject: [PATCH 54/79] pythonPackages.phpserialize: init at 1.3 (#25521)

* pythonPackages.phpserialize: init at 1.3

* pythonPackages.phpserialize: clarify test situation
---
 lib/maintainers.nix                           |  1 +
 .../python-modules/phpserialize/default.nix   | 22 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 3 files changed, 25 insertions(+)
 create mode 100644 pkgs/development/python-modules/phpserialize/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index a477fb46b86..ee0697ed6e4 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -242,6 +242,7 @@
   jhhuh = "Ji-Haeng Huh <jhhuh.note@gmail.com>";
   jirkamarsik = "Jirka Marsik <jiri.marsik89@gmail.com>";
   jlesquembre = "José Luis Lafuente <jl@lafuente.me>";
+  jluttine = "Jaakko Luttinen <jaakko.luttinen@iki.fi>";
   joachifm = "Joachim Fasting <joachifm@fastmail.fm>";
   joamaki = "Jussi Maki <joamaki@gmail.com>";
   joelmo = "Joel Moberg <joel.moberg@gmail.com>";
diff --git a/pkgs/development/python-modules/phpserialize/default.nix b/pkgs/development/python-modules/phpserialize/default.nix
new file mode 100644
index 00000000000..57dd687604d
--- /dev/null
+++ b/pkgs/development/python-modules/phpserialize/default.nix
@@ -0,0 +1,22 @@
+{lib, buildPythonPackage, fetchPypi}:
+
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "phpserialize";
+  version = "1.3";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "19qgkb9z4zjbjxlpwh2w6pxkz2j3iymnydi69jl0jg905lqjsrxz";
+  };
+
+  # project does not have tests at the moment
+  doCheck = false;
+
+  meta = {
+    description = "A port of the serialize and unserialize functions of PHP to Python";
+    homepage = http://github.com/mitsuhiko/phpserialize;
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ jluttine ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ffd3f6c8c5d..1d8ced3e2e1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8833,6 +8833,8 @@ in {
     };
   };
 
+  phpserialize = callPackage ../development/python-modules/phpserialize { };
+
   pies = buildPythonPackage rec {
     name = "pies-2.6.5";
 

From 87723d5ac3c935b0b5139283db09c0e261903941 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 5 May 2017 09:48:58 +0200
Subject: [PATCH 55/79] pythonPackages.mplleaflet: init at 0.0.5

---
 .../python-modules/mplleaflet/default.nix     | 28 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/development/python-modules/mplleaflet/default.nix

diff --git a/pkgs/development/python-modules/mplleaflet/default.nix b/pkgs/development/python-modules/mplleaflet/default.nix
new file mode 100644
index 00000000000..29984eed9e9
--- /dev/null
+++ b/pkgs/development/python-modules/mplleaflet/default.nix
@@ -0,0 +1,28 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, jinja2
+, six
+}:
+
+buildPythonPackage rec {
+  pname = "mplleaflet";
+  version = "0.0.5";
+  name = "${pname}-${version}";
+
+  propagatedBuildInputs = [ jinja2 six ];
+
+  # No tests in archive
+  doCheck = false;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "049e0b91797ce5b462853395138161fed9e8dfc1f4723f482ebb0739a0bbd289";
+  };
+
+  meta = {
+    description = "Convert Matplotlib plots into Leaflet web maps";
+    homepage = http://github.com/jwass/mplleaflet;
+    license = with lib.licenses; [ bsd3 ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1d8ced3e2e1..93a22b7f5a3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14392,6 +14392,8 @@ in {
     };
   };
 
+  mplleaflet = callPackage ../development/python-modules/mplleaflet { };
+
   multidict = callPackage ../development/python-modules/multidict { };
 
   munch = buildPythonPackage rec {

From f4b5950d8cebd2a1d3ffe8d5f28fe18d4e4b5c0b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 5 May 2017 09:50:49 +0200
Subject: [PATCH 56/79] pythonPackages.bibtexparser: init at 0.6.2

---
 .../python-modules/bibtexparser/default.nix   | 25 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/development/python-modules/bibtexparser/default.nix

diff --git a/pkgs/development/python-modules/bibtexparser/default.nix b/pkgs/development/python-modules/bibtexparser/default.nix
new file mode 100644
index 00000000000..0f624a145e0
--- /dev/null
+++ b/pkgs/development/python-modules/bibtexparser/default.nix
@@ -0,0 +1,25 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+  pname = "bibtexparser";
+  version = "0.6.2";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "5888219ac5db1c63ae0ad4db52ec7ad87fe7a32bd60e62ee87bceedb8ebf73b8";
+  };
+
+  # No tests in archive
+  doCheck = false;
+
+  meta = {
+    description = "Bibtex parser for python 2.7 and 3.3 and newer";
+    homepage = https://github.com/sciunto-org/python-bibtexparser;
+    license = with lib.licenses; [ gpl3 bsd3 ];
+    maintainer = with lib.maintainers; [ fridh ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 93a22b7f5a3..c41ed0522c4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2217,6 +2217,8 @@ in {
     };
   };
 
+  bibtexparser = callPackage ../development/python-modules/bibtexparser { };
+
   binwalk_fun = { visualizationSupport ? false, pyqtgraph ? null }:
     assert visualizationSupport -> pyqtgraph != null;
 

From 8b6ea100ce2d0f2a4389040f111a74f484ea6bc8 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Fri, 5 May 2017 09:56:35 +0200
Subject: [PATCH 57/79] vscode: 1.11.2 -> 1.12.1

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

diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix
index 3d710296219..81aca06267b 100644
--- a/pkgs/applications/editors/vscode/default.nix
+++ b/pkgs/applications/editors/vscode/default.nix
@@ -2,7 +2,7 @@
   makeWrapper, libXScrnSaver, libxkbfile }:
 
 let
-  version = "1.11.2";
+  version = "1.12.1";
   channel = "stable";
 
   plat = {
@@ -12,9 +12,9 @@ let
   }.${stdenv.system};
 
   sha256 = {
-    "i686-linux" = "0cd3iwd5aizixfxc6ayrpvx6k1zk8nsfhd8i3rgz4p4zzfnx6ri5";
-    "x86_64-linux" = "1y3qgm7p1vchh02mqgn8d8pxxnifxfs6hbv01q8zjw3gb7m4anw3";
-    "x86_64-darwin" = "1v8x466080rpm0rfiv1mr2adbpia6j5v9pbsspwm0ndc7ly0h71k";
+    "i686-linux" = "0i4zqxbq7bm2afzyny3a53sq1fghlz5an1z8fkqh5i3029s635h9";
+    "x86_64-linux" = "0kwmfiyb70if4svamnivbc9w65c14j3lrn5vysqkc4b8hlk4r75i";
+    "x86_64-darwin" = "1dgs4k4m885qzammhj0x9k6pd8rayxn61iq3fiazp0w8v5bhl4l5";
   }.${stdenv.system};
 
   archive_fmt = if stdenv.system == "x86_64-darwin" then "zip" else "tar.gz";

From 7aafda3024daae0f35d553b8c7567354f0b8b6ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilian=20G=C3=BCntner?= <code@sourcediver.org>
Date: Thu, 4 May 2017 19:18:28 +0200
Subject: [PATCH 58/79] pythonPackages: pytest-datafiles init at 1.0

---
 .../pytest-datafiles/default.nix              | 19 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/development/python-modules/pytest-datafiles/default.nix

diff --git a/pkgs/development/python-modules/pytest-datafiles/default.nix b/pkgs/development/python-modules/pytest-datafiles/default.nix
new file mode 100644
index 00000000000..6df1792f884
--- /dev/null
+++ b/pkgs/development/python-modules/pytest-datafiles/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, buildPythonPackage, fetchPypi, py, pytest }:
+
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "pytest-datafiles";
+  version = "1.0";
+  src = fetchPypi {
+    inherit version pname;
+    sha256 = "1w5435b5pimk6479ml53lmld3qbag7awcg4gl3ljdywc1v096r5v";
+  };
+
+  buildInputs = [ py pytest ];
+
+  meta = with stdenv.lib; {
+    license = licenses.mit;
+    website = https://pypi.python.org/pypi/pytest-catchlog/;
+    description = "py.test plugin to create a 'tmpdir' containing predefined files/directories.";
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c41ed0522c4..699a0fd1924 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5190,6 +5190,8 @@ in {
     };
   };
 
+  pytest-datafiles = callPackage ../development/python-modules/pytest-datafiles { };
+
   pytest-django = callPackage ../development/python-modules/pytest-django { };
 
   pytest-fixture-config = buildPythonPackage rec {

From 401ace9cd32d1d3e12b47a49bbd757c3e763a6e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilian=20G=C3=BCntner?= <code@sourcediver.org>
Date: Thu, 4 May 2017 19:18:58 +0200
Subject: [PATCH 59/79] pythonPackages: pytest-mock 1.2 -> 1.6.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 699a0fd1924..363963e700a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5271,9 +5271,9 @@ in {
   pytest-mock = buildPythonPackage rec {
     name = "${pname}-${version}";
     pname = "pytest-mock";
-    version = "1.2";
+    version = "1.6.0";
 
-    buildInputs = with self; [ pytest ];
+    buildInputs = with self; [ pytest setuptools_scm ];
     propagatedBuildInputs = with self; [ mock ];
 
     meta = {
@@ -5284,9 +5284,9 @@ in {
       platforms   = platforms.all;
     };
 
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/${pname}/${name}.zip";
-      sha256 = "03zxar5drzm7ksqyrwypjaza3cri6wqvpr6iam92djvg6znp32gp";
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "07qccww4bq9jxlc0fbhlspr13kcsixchsnl8vk4wdiyvsjy7r8c3";
     };
   };
 

From de53284cbd258a1a723677b8a1e9ec0eaf724ba8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilian=20G=C3=BCntner?= <code@sourcediver.org>
Date: Thu, 4 May 2017 18:11:36 +0200
Subject: [PATCH 60/79] watson: init at 1.4.0

---
 pkgs/applications/office/watson/default.nix | 27 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  4 +++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/applications/office/watson/default.nix

diff --git a/pkgs/applications/office/watson/default.nix b/pkgs/applications/office/watson/default.nix
new file mode 100644
index 00000000000..e3d04285d21
--- /dev/null
+++ b/pkgs/applications/office/watson/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, pythonPackages }:
+
+pythonPackages.buildPythonApplication rec {
+  pname = "td-watson";
+  name = "${pname}-${version}";
+  version = "1.4.0";
+
+  src = pythonPackages.fetchPypi {
+    inherit version pname;
+    sha256 = "1py0g4990jmvq0dn7jasda7f10kzr41bix46hnbyc1rshjzc17hq";
+  };
+
+  # uses tox, test invocation fails
+  doCheck = true;
+  checkPhase = ''
+    py.test -vs tests
+ '';
+  checkInputs = with pythonPackages; [ py pytest pytest-datafiles mock pytest-mock pytestrunner ];
+  propagatedBuildInputs = with pythonPackages; [ requests2 click arrow ];
+
+  meta = with stdenv.lib; {
+    homepage = https://tailordev.github.io/Watson/;
+    description = "A wonderful CLI to track your time!";
+    license = licenses.mit;
+    maintainers = with maintainers; [ mguentner ] ;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index de8d9fd05cb..d3883fd2f00 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16193,6 +16193,10 @@ with pkgs;
     imlib2 = imlib2-nox;
   };
 
+  watson = callPackage ../applications/office/watson {
+    pythonPackages = python3Packages;
+  };
+
   way-cooler = callPackage ../applications/window-managers/way-cooler {};
 
   wayv = callPackage ../tools/X11/wayv {};

From af87b922f1af3614ec338197b6193433a78840a0 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 5 May 2017 14:22:16 +0200
Subject: [PATCH 61/79] pythonPackages.plotly: 1.9.5 -> 2.0.8

---
 .../python-modules/plotly/default.nix         | 37 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 18 +--------
 2 files changed, 38 insertions(+), 17 deletions(-)
 create mode 100644 pkgs/development/python-modules/plotly/default.nix

diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix
new file mode 100644
index 00000000000..3c2e78ac1f1
--- /dev/null
+++ b/pkgs/development/python-modules/plotly/default.nix
@@ -0,0 +1,37 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, decorator
+, nbformat
+, pytz
+, requests2
+, six
+}:
+
+buildPythonPackage rec {
+  pname = "plotly";
+  version = "2.0.8";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1zbwx771w6425w4g6l9fhq4x1854fdnni6xq9xhvs8xqgxkrljm5";
+  };
+
+  propagatedBuildInputs = [
+    decorator
+    nbformat
+    pytz
+    requests2
+    six
+  ];
+
+  # No tests in archive
+  doCheck = false;
+
+  meta = {
+    description = "Python plotting library for collaborative, interactive, publication-quality graphs";
+    homepage = https://plot.ly/python/;
+    license = with lib.licenses; [ mit ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c41ed0522c4..97461c8e5f2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8899,23 +8899,7 @@ in {
     };
   };
 
-  plotly = self.buildPythonPackage rec {
-    name = "plotly-1.9.5";
-    disabled = isPy3k;
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/plotly/${name}.tar.gz";
-      sha256 = "628679e880caab22e2a46273e85e1d1ce1382b631e1c7bbfe539f804c5269b21";
-    };
-
-    propagatedBuildInputs = with self; [ self.pytz self.six self.requests ];
-
-    meta = {
-      description = "Python plotting library for collaborative, interactive, publication-quality graphs";
-      homepage = https://plot.ly/python/;
-      license = licenses.mit;
-    };
-  };
+  plotly = callPackage ../development/python-modules/plotly { };
 
   podcastparser = callPackage ../development/python-modules/podcastparser { };
 

From c6385eb0f58dc3ccb86a52dd35299c25e4061c4d Mon Sep 17 00:00:00 2001
From: Matthew Daiter <mdaiter8121@gmail.com>
Date: Wed, 3 May 2017 14:55:06 +0200
Subject: [PATCH 62/79] openmvg: init at v1.1

---
 .../science/misc/openmvg/default.nix          | 50 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 52 insertions(+)
 create mode 100644 pkgs/applications/science/misc/openmvg/default.nix

diff --git a/pkgs/applications/science/misc/openmvg/default.nix b/pkgs/applications/science/misc/openmvg/default.nix
new file mode 100644
index 00000000000..05e0a98d08e
--- /dev/null
+++ b/pkgs/applications/science/misc/openmvg/default.nix
@@ -0,0 +1,50 @@
+{ lib, stdenv, fetchgit, pkgconfig, cmake
+, libjpeg ? null
+, zlib ? null
+, libpng ? null
+, eigen ? null
+, libtiff ? null
+, enableExamples ? false
+, enableDocs ? false }:
+
+stdenv.mkDerivation rec {
+  version = "1.1";
+  name = "openmvg-${version}";
+
+  src = fetchgit {
+    url = "https://www.github.com/openmvg/openmvg.git";
+
+    # Tag v1.1
+    rev = "f5ecb48";
+    sha256 = "1di9i7yxnkdvl8lhflynmqw62gaxwv00r1sd7nzzs9qn63g0af0f";
+    fetchSubmodules = true;
+  };
+
+  buildInputs = [ libjpeg zlib libpng eigen libtiff ];
+
+  nativeBuildInputs = [ cmake pkgconfig ];
+
+  cmakeFlags = [
+    "-DCMAKE_CXX_FLAGS=-std=c++11"
+    "-DOpenMVG_BUILD_EXAMPLES=${if enableExamples then "ON" else "OFF"}"
+    "-DOpenMVG_BUILD_DOC=${if enableDocs then "ON" else "OFF"}"
+  ];
+
+  cmakeDir = "./src";
+
+  dontUseCmakeBuildDir = true;
+
+  # This can be enabled, but it will exhause virtual memory on most machines.
+  enableParallelBuilding = false;
+
+  # Without hardeningDisable, certain flags are passed to the compile that break the build (primarily string format errors)
+  hardeningDisable = [ "all" ];
+
+  meta = {
+    description = "A library for computer-vision scientists and targeted for the Multiple View Geometry community";
+    homepage = http://openmvg.readthedocs.io/en/latest/;
+    license = stdenv.lib.licenses.mpl20;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ mdaiter ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 61e36c33aad..2692ddcf6e4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3301,6 +3301,8 @@ with pkgs;
 
   openjade = callPackage ../tools/text/sgml/openjade { };
 
+  openmvg = callPackage ../applications/science/misc/openmvg { };
+
   openntpd = callPackage ../tools/networking/openntpd { };
 
   openntpd_nixos = openntpd.override {

From 8d03054f77a3fdee0803041df550e3bd3cdc0789 Mon Sep 17 00:00:00 2001
From: William Casarin <jb55@jb55.com>
Date: Tue, 2 May 2017 12:37:10 -0700
Subject: [PATCH 63/79] mb2md: init at 3.20

---
 pkgs/tools/text/mb2md/default.nix | 38 +++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix   |  2 ++
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/tools/text/mb2md/default.nix

diff --git a/pkgs/tools/text/mb2md/default.nix b/pkgs/tools/text/mb2md/default.nix
new file mode 100644
index 00000000000..a920cbf3948
--- /dev/null
+++ b/pkgs/tools/text/mb2md/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, lib, fetchurl, perl, makeWrapper, perlPackages }:
+
+let
+  perlDeps = with perlPackages; [ TimeDate ];
+in
+stdenv.mkDerivation rec {
+  version = "3.20";
+  name = "mb2md-${version}";
+
+  src = fetchurl {
+    url = "http://batleth.sapienti-sat.org/projects/mb2md/mb2md-${version}.pl.gz";
+    sha256 = "0bvkky3c90738h3skd2f1b2yy5xzhl25cbh9w2dy97rs86ssjidg";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+  buildInputs = [ perl ];
+
+  unpackPhase = ''
+    sourceRoot=.
+    gzip -d < $src > mb2md.pl
+  '';
+
+  installPhase = ''
+    install -D $sourceRoot/mb2md.pl $out/bin/mb2md
+  '';
+
+  postFixup = ''
+    wrapProgram $out/bin/mb2md \
+      --set PERL5LIB "${lib.makePerlPath perlDeps}"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "mbox to maildir tool";
+    license = licenses.publicDomain;
+    platforms = platforms.all;
+    maintainers = [ maintainers.jb55 ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 531a238c20f..a9f55ce5da6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2919,6 +2919,8 @@ with pkgs;
 
   mawk = callPackage ../tools/text/mawk { };
 
+  mb2md = callPackage ../tools/text/mb2md { };
+
   mbox = callPackage ../tools/security/mbox { };
 
   mbuffer = callPackage ../tools/misc/mbuffer { };

From 7131e06214560625cc85b89d93df3764d223a6e6 Mon Sep 17 00:00:00 2001
From: Judah Jacobson <judah@users.noreply.github.com>
Date: Wed, 3 May 2017 13:13:05 -0700
Subject: [PATCH 64/79] haskell: work around linker limits on Mac OS X Sierra.

The Sierra linker added a limit on the number of paths that any one
dynamic library (`*.dylib`) can reference.  This causes problems when
a Haskell library has many immediate dependencies (#22810).

We follow a similar fix as GHC/Cabal/Stack: for each derivation,
create a new directory with symlinks to all the dylibs of its immediate
dependencies, and patch its package DB to reference that directory
using the new `dynamic-library-dirs` field.

Note that this change is a no-op for older versions of GHC, i.e., they will
continue to fail on some packages as before.

Also note that this change causes the bootstrapped versions of GHC to be
recompiled, since they depend on `hscolour` which is built by
`generic-builder.nix`.

Tested by building the `stack` binary as described in #22810.
---
 .../haskell-modules/generic-builder.nix       | 19 +++++++++++++++
 .../haskell-modules/with-packages-wrapper.nix | 23 +++++++++++++++++++
 2 files changed, 42 insertions(+)

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index f2b98e541e8..29f0fc5b496 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -228,6 +228,25 @@ stdenv.mkDerivation ({
         configureFlags+=" --extra-lib-dirs=$p/lib"
       fi
     done
+
+    if "${if stdenv.isDarwin then "true" else "false"}"; then
+      # Work around a limit in the Mac OS X Sierra linker on the number of paths
+      # referenced by any one dynamic library:
+      #
+      # Create a local directory with symlinks of the *.dylib (Mac OS X shared
+      # libraries) from all the dependencies.
+      local dynamicLinksDir="$out/lib/links"
+      mkdir -p $dynamicLinksDir
+      local foundDylib=false
+      for d in $(grep dynamic-library-dirs $packageConfDir/*|awk '{print $2}'); do
+        ln -s $d/*.dylib $dynamicLinksDir
+      done
+      # Edit the local package DB to reference the links directory.
+      for f in $packageConfDir/*.conf; do
+        sed -i "s,dynamic-library-dirs: .*,dynamic-library-dirs: $dynamicLinksDir," $f
+      done
+    fi
+
     ${ghcCommand}-pkg --${packageDbFlag}="$packageConfDir" recache
 
     runHook postSetupCompilerEnvironment
diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix
index 15d66bbd6dc..bcbfa32bb1e 100644
--- a/pkgs/development/haskell-modules/with-packages-wrapper.nix
+++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix
@@ -97,6 +97,29 @@ symlinkJoin {
       fi
     done
 
+    # Work around a linker limit in Mac OS X Sierra (see generic-builder.nix):
+    if "${if stdenv.isDarwin then "true" else "false"}"; then
+      local packageConfDir="$out/lib/${ghc.name}/package.conf.d";
+      local dynamicLinksDir="$out/lib/links"
+      mkdir -p $dynamicLinksDir
+      # Clean up the old links that may have been (transitively) included by
+      # symlinkJoin:
+      rm -f $dynamicLinksDir/*
+      for d in $(grep dynamic-library-dirs $packageConfDir/*|awk '{print $2}'); do
+        ln -s $d/*.dylib $dynamicLinksDir
+      done
+      for f in $packageConfDir/*.conf; do
+        # Initially, $f is a symlink to a read-only file in one of the inputs
+        # (as a result of this symlinkJoin derivation).
+        # Replace it with a copy whose dynamic-library-dirs points to
+        # $dynamicLinksDir
+        cp $f $f-tmp
+        rm $f
+        sed "s,dynamic-library-dirs: .*,dynamic-library-dirs: $dynamicLinksDir," $f-tmp > $f
+        rm $f-tmp
+      done
+    fi
+
     ${lib.optionalString hasLibraries "$out/bin/${ghcCommand}-pkg recache"}
     ${# ghcjs will read the ghc_libdir file when resolving plugins.
       lib.optionalString (isGhcjs && ghcLibdir != null) ''

From 2caa7b88ae52caccac9c1b07c52af0080e9417c3 Mon Sep 17 00:00:00 2001
From: Judah Jacobson <judah@users.noreply.github.com>
Date: Fri, 5 May 2017 09:53:08 -0700
Subject: [PATCH 65/79] Fix use of `isDarwin` conditionals.

---
 .../haskell-modules/generic-builder.nix       | 36 +++++++--------
 .../haskell-modules/with-packages-wrapper.nix | 44 +++++++++----------
 2 files changed, 38 insertions(+), 42 deletions(-)

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 29f0fc5b496..65569dfb9ba 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -228,25 +228,23 @@ stdenv.mkDerivation ({
         configureFlags+=" --extra-lib-dirs=$p/lib"
       fi
     done
-
-    if "${if stdenv.isDarwin then "true" else "false"}"; then
-      # Work around a limit in the Mac OS X Sierra linker on the number of paths
-      # referenced by any one dynamic library:
-      #
-      # Create a local directory with symlinks of the *.dylib (Mac OS X shared
-      # libraries) from all the dependencies.
-      local dynamicLinksDir="$out/lib/links"
-      mkdir -p $dynamicLinksDir
-      local foundDylib=false
-      for d in $(grep dynamic-library-dirs $packageConfDir/*|awk '{print $2}'); do
-        ln -s $d/*.dylib $dynamicLinksDir
-      done
-      # Edit the local package DB to reference the links directory.
-      for f in $packageConfDir/*.conf; do
-        sed -i "s,dynamic-library-dirs: .*,dynamic-library-dirs: $dynamicLinksDir," $f
-      done
-    fi
-
+  '' + (optionalString stdenv.isDarwin ''
+    # Work around a limit in the Mac OS X Sierra linker on the number of paths
+    # referenced by any one dynamic library:
+    #
+    # Create a local directory with symlinks of the *.dylib (Mac OS X shared
+    # libraries) from all the dependencies.
+    local dynamicLinksDir="$out/lib/links"
+    mkdir -p $dynamicLinksDir
+    local foundDylib=false
+    for d in $(grep dynamic-library-dirs $packageConfDir/*|awk '{print $2}'); do
+      ln -s $d/*.dylib $dynamicLinksDir
+    done
+    # Edit the local package DB to reference the links directory.
+    for f in $packageConfDir/*.conf; do
+      sed -i "s,dynamic-library-dirs: .*,dynamic-library-dirs: $dynamicLinksDir," $f
+    done
+  '') + ''
     ${ghcCommand}-pkg --${packageDbFlag}="$packageConfDir" recache
 
     runHook postSetupCompilerEnvironment
diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix
index bcbfa32bb1e..147a021ff53 100644
--- a/pkgs/development/haskell-modules/with-packages-wrapper.nix
+++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix
@@ -96,30 +96,28 @@ symlinkJoin {
         makeWrapper ${ghc}/bin/$prg $out/bin/$prg --add-flags "${packageDBFlag}=${packageCfgDir}"
       fi
     done
-
+  '' + (lib.optionalString stdenv.isDarwin ''
     # Work around a linker limit in Mac OS X Sierra (see generic-builder.nix):
-    if "${if stdenv.isDarwin then "true" else "false"}"; then
-      local packageConfDir="$out/lib/${ghc.name}/package.conf.d";
-      local dynamicLinksDir="$out/lib/links"
-      mkdir -p $dynamicLinksDir
-      # Clean up the old links that may have been (transitively) included by
-      # symlinkJoin:
-      rm -f $dynamicLinksDir/*
-      for d in $(grep dynamic-library-dirs $packageConfDir/*|awk '{print $2}'); do
-        ln -s $d/*.dylib $dynamicLinksDir
-      done
-      for f in $packageConfDir/*.conf; do
-        # Initially, $f is a symlink to a read-only file in one of the inputs
-        # (as a result of this symlinkJoin derivation).
-        # Replace it with a copy whose dynamic-library-dirs points to
-        # $dynamicLinksDir
-        cp $f $f-tmp
-        rm $f
-        sed "s,dynamic-library-dirs: .*,dynamic-library-dirs: $dynamicLinksDir," $f-tmp > $f
-        rm $f-tmp
-      done
-    fi
-
+    local packageConfDir="$out/lib/${ghc.name}/package.conf.d";
+    local dynamicLinksDir="$out/lib/links"
+    mkdir -p $dynamicLinksDir
+    # Clean up the old links that may have been (transitively) included by
+    # symlinkJoin:
+    rm -f $dynamicLinksDir/*
+    for d in $(grep dynamic-library-dirs $packageConfDir/*|awk '{print $2}'); do
+      ln -s $d/*.dylib $dynamicLinksDir
+    done
+    for f in $packageConfDir/*.conf; do
+      # Initially, $f is a symlink to a read-only file in one of the inputs
+      # (as a result of this symlinkJoin derivation).
+      # Replace it with a copy whose dynamic-library-dirs points to
+      # $dynamicLinksDir
+      cp $f $f-tmp
+      rm $f
+      sed "s,dynamic-library-dirs: .*,dynamic-library-dirs: $dynamicLinksDir," $f-tmp > $f
+      rm $f-tmp
+    done
+  '') + ''
     ${lib.optionalString hasLibraries "$out/bin/${ghcCommand}-pkg recache"}
     ${# ghcjs will read the ghc_libdir file when resolving plugins.
       lib.optionalString (isGhcjs && ghcLibdir != null) ''

From 959695dd5faa3a43a5b366302e007e881c9e4c4b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 5 May 2017 20:36:48 +0200
Subject: [PATCH 66/79] pythonPackages.grequests: 0.2.0 -> 0.3.0

---
 pkgs/top-level/python-packages.nix | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 97461c8e5f2..8f921c00b74 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -28670,19 +28670,24 @@ EOF
 
 
   grequests = buildPythonPackage rec {
-    name = "grequests-0.2.0";
+    pname = "grequests";
+    version = "0.3.0";
+    name = "${pname}-${version}";
 
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/g/grequests/${name}.tar.gz";
+    src = fetchPypi {
+      inherit pname version;
       sha256 = "0lafzax5igbh8y4x0krizr573wjsxz7bhvwygiah6qwrzv83kv5c";
     };
 
-    buildInputs = with self; [ requests gevent ];
+    # No tests in archive
+    doCheck = false;
+
+    propagatedBuildInputs = with self; [ requests2 gevent ];
 
     meta = {
       description = "Asynchronous HTTP requests";
       homepage = https://github.com/kennethreitz/grequests;
-      license = "bsd";
+      license = with licenses; [ bsd2 ];
       maintainers = with maintainers; [ matejc ];
     };
   };

From f63eb5857352705665411130d4f1638d55dd8c58 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 5 May 2017 20:45:15 +0200
Subject: [PATCH 67/79] pythonPackages.requests: point to requests2

The Python package has two packages for requests, `requests`
corresponding to version 1.2.3, and `requests2` corresponding to version
2.13.0. Version 1.2.3 is almost 4 years old, and by now all software
should have transitioned.

This commit aliases `requests` to `requests2`. Packages that stop to
function should be upgraded. In the rare case that that is not possible,
version 1.2.3 is still available as `requests_1` but I plan to drop
that before the release of 17.09.
---
 pkgs/top-level/python-packages.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8f921c00b74..09b99d3b620 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -21897,8 +21897,10 @@ in {
     };
   };
 
+  requests = self.requests2;
 
-  requests = buildPythonPackage rec {
+  # Remove before release of 17.09
+  requests_1 = buildPythonPackage rec {
     name = "requests-1.2.3";
     disabled = !pythonOlder "3.4";
 
@@ -21913,7 +21915,6 @@ in {
     };
   };
 
-
   requests2 = buildPythonPackage rec {
     name = "requests-${version}";
     version = "2.13.0";

From ef1149e8291a196d42ddb099f48952b241f936cd Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 5 May 2017 20:53:22 +0200
Subject: [PATCH 68/79] pythonPackages.umemcache: mark as broken

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 09b99d3b620..c2a46c4875d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -25996,6 +25996,7 @@ in {
       description = "Ultra fast memcache client written in highly optimized C++ with Python bindings";
       homepage = https://github.com/esnme/ultramemcache;
       license = licenses.bsdOriginal;
+      broken = true;
     };
   };
 

From f6dd52cd6933e401cc79f4381ac6eaca98ec3f35 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 5 May 2017 21:13:26 +0200
Subject: [PATCH 69/79] pythonPackage.Pyro: use upstream name

---
 pkgs/tools/misc/openopc/default.nix | 2 +-
 pkgs/top-level/python-packages.nix  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/openopc/default.nix b/pkgs/tools/misc/openopc/default.nix
index 9da59824e29..8d3850745f1 100644
--- a/pkgs/tools/misc/openopc/default.nix
+++ b/pkgs/tools/misc/openopc/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, python }:
 
 let
-  pythonEnv = python.withPackages(ps: [ps.pyro3]);
+  pythonEnv = python.withPackages(ps: [ps.Pyro]);
 in stdenv.mkDerivation rec {
   name = "openopc-${version}";
   version = "1.2.0";
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3e05819215f..430cc4ac386 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -20599,7 +20599,7 @@ in {
     };
   });
 
-  pyro3 = buildPythonPackage (rec {
+  Pyro = buildPythonPackage (rec {
     name = "Pyro-3.16";
     disabled = isPy3k;
 

From b7ea2a4f39a0248011527cf32077829f026cd618 Mon Sep 17 00:00:00 2001
From: Winnie Quinn <me@winniequinn.com>
Date: Fri, 5 May 2017 20:26:00 -0400
Subject: [PATCH 70/79] gitkraken: 2.4.0 -> 2.5.0

---
 pkgs/applications/version-management/gitkraken/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix
index 2090da057b0..1404bd97599 100644
--- a/pkgs/applications/version-management/gitkraken/default.nix
+++ b/pkgs/applications/version-management/gitkraken/default.nix
@@ -9,11 +9,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "gitkraken-${version}";
-  version = "2.4.0";
+  version = "2.5.0";
 
   src = fetchurl {
     url = "https://release.gitkraken.com/linux/v${version}.deb";
-    sha256 = "1s95wnlyy41s8gy7vq4k8w03qrhxq56fr7idsrgvcv065cf5hqmd";
+    sha256 = "1in8caxsc8fld1sl6d9nzch86s9x0770qi6amh573zmb80yyd743";
   };
 
   libPath = makeLibraryPath [

From c217f59344d6fc8e2299be9a6cdd248d72eae2fd Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Fri, 5 May 2017 21:34:16 -0400
Subject: [PATCH 71/79] darwin.make-bootstrap-tools.test: fix build breakage

In the extremely unlikely case that our store hash path ends in several
digits (as is the case right now), the Darwin ld will try to interpret
those digits as a version number and barf. To avoid that, we pass in the
SDK version explicitly to stop it from trying to figure it out from iffy
context.
---
 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 4f651575d6a..65f0cba51f7 100644
--- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix
@@ -301,8 +301,8 @@ in rec {
       export flags="-idirafter ${unpack}/include-Libsystem --sysroot=${unpack} -L${unpack}/lib"
 
       export CPP="clang -E $flags"
-      export CC="clang $flags -Wl,-rpath,${unpack}/lib -Wl,-v"
-      export CXX="clang++ $flags --stdlib=libc++ -lc++abi -isystem${unpack}/include/c++/v1 -Wl,-rpath,${unpack}/lib -Wl,-v"
+      export CC="clang $flags -Wl,-rpath,${unpack}/lib -Wl,-v -Wl,-sdk_version,10.10"
+      export CXX="clang++ $flags --stdlib=libc++ -lc++abi -isystem${unpack}/include/c++/v1 -Wl,-rpath,${unpack}/lib -Wl,-v -Wl,-sdk_version,10.10"
 
       echo '#include <stdio.h>' >> foo.c
       echo '#include <float.h>' >> foo.c

From dee8865d03ad78f7beb8e8a7f990f1ec64de199d Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Sat, 6 May 2017 09:05:23 +0300
Subject: [PATCH 72/79] gitAndTools.gitflow: fix runtime dependencies #25487

If `git-flow` was installed without explicitly installing `getopt` and `git`
too, it couldn't find those executables. Now it can find those and it can be
used as `git-flow` executable. Note, however, that in order to use `git-flow` as
git subcommand (`git flow`), one needs to install `git` too.
---
 .../version-management/git-and-tools/gitflow/default.nix   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/gitflow/default.nix b/pkgs/applications/version-management/git-and-tools/gitflow/default.nix
index a6ac1958385..05659a68a52 100644
--- a/pkgs/applications/version-management/git-and-tools/gitflow/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/gitflow/default.nix
@@ -14,15 +14,16 @@ stdenv.mkDerivation rec {
     sha256 = "1i8bwi83qcqvi8zrkjn4mp2v8v7y11fd520wpg2jgy5hqyz34chg";
   };
 
-  buildInputs = optionals (stdenv.isDarwin) [ pkgs.makeWrapper ];
+  buildInputs = [ pkgs.makeWrapper ];
 
   preBuild = ''
     makeFlagsArray+=(prefix="$out")
   '';
 
-  postInstall = optional (stdenv.isDarwin) ''
+  postInstall = ''
     wrapProgram $out/bin/git-flow \
-      --set FLAGS_GETOPT_CMD ${pkgs.getopt}/bin/getopt
+      --set FLAGS_GETOPT_CMD ${pkgs.getopt}/bin/getopt \
+      --suffix PATH : ${pkgs.git}/bin
   '';
 
   meta = with stdenv.lib; {

From 4ea961ccc368c2f6ab9bda94643dd179cd7ba0cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 5 May 2017 21:16:13 +0100
Subject: [PATCH 73/79] kernelPackages.splUnstable: 0.7.0-rc3 -> 0.7.0-rc4

---
 pkgs/os-specific/linux/spl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix
index 8e0bb935730..a67c9426844 100644
--- a/pkgs/os-specific/linux/spl/default.nix
+++ b/pkgs/os-specific/linux/spl/default.nix
@@ -66,7 +66,7 @@ in
       sha256 = "15qpx2nhprmk14jgb7yqp9dvfb6i3hhhspi77kvian171b0a6112";
     };
     splUnstable = common {
-      version = "0.7.0-rc3";
-      sha256 = "09v5gh7mqdl3bfq5an9iiw9fw3l1skprclxdz7r19bw3ids3lfja";
+      version = "0.7.0-rc4";
+      sha256 = "13r5qwrdnaabqfy9fvizvdj4n4cvfv6zy4jh0vijzjvbjd4an9g1";
     };
   }

From 7765e5971c3eb882866bd5e333b91bbb96f9ccdb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 5 May 2017 21:35:19 +0100
Subject: [PATCH 74/79] kernelPackages.zfsUnstable: 0.7.0-rc3 -> 0.7.0-rc4

---
 pkgs/os-specific/linux/zfs/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index c70e96aa9fd..b03da8869f7 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -139,12 +139,12 @@ in
     };
     zfsUnstable = common {
       # comment/uncomment if breaking kernel versions are known
-      incompatibleKernelVersion = "4.11";
+      incompatibleKernelVersion = null;
 
-      version = "0.7.0-rc3";
+      version = "0.7.0-rc4";
 
       # this package should point to a version / git revision compatible with the latest kernel release
-      sha256 = "0js3lazqq8wb4nklqxd6sgbvwqgwnjgz3xi3mm33xf4284gia6pc";
+      sha256 = "16jiq2h7m2ljg5xv7m5lqmsszzclkhvj1iq1wa9w740la4vl22kf";
       extraPatches = [
         (fetchpatch {
           url = "https://github.com/Mic92/zfs/compare/zfs-0.7.0-rc3...nixos-zfs-0.7.0-rc3.patch";

From 637e41fa6fb68c94895f90de45a905cf23fcc5f0 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Sat, 6 May 2017 14:56:18 +0800
Subject: [PATCH 75/79] calibre: 2.83.0 -> 2.84.0

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

diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index fd35c5d3681..6dcd96216cb 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -5,12 +5,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.83.0";
+  version = "2.84.0";
   name = "calibre-${version}";
 
   src = fetchurl {
     url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz";
-    sha256 = "1ar6hkcl50lhgwccss759201cqgnwasqmhw9japgnz04fj66w5ln";
+    sha256 = "1kvnmb6hsby4bdnx70bcy32f4dz1axzlr310dr6mkvnc8bqw59km";
   };
 
   patches = [

From 37f59b3586c5a4d9f07c6aef7a9355a84691297a Mon Sep 17 00:00:00 2001
From: Vanessa McHale <tmchale@wisc.edu>
Date: Sun, 23 Apr 2017 00:22:27 -0500
Subject: [PATCH 76/79] tw-rs: init at 0.1.26

fixes #25514
---
 pkgs/misc/tw-rs/default.nix     | 24 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/misc/tw-rs/default.nix

diff --git a/pkgs/misc/tw-rs/default.nix b/pkgs/misc/tw-rs/default.nix
new file mode 100644
index 00000000000..6c6963303e9
--- /dev/null
+++ b/pkgs/misc/tw-rs/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchFromGitHub, rustPlatform, perl, zlib, openssl }:
+
+rustPlatform.buildRustPackage rec {
+  name = "tw-rs-${version}";
+  version = "0.1.26";
+
+  src = fetchFromGitHub {
+    owner = "vmchale";
+    repo = "tw-rs";
+    rev = "${version}";
+    sha256 = "1s1gk2wcs3792gdzrngksczz3gma5kv02ni2jqrhib8l6z8mg9ia";
+    };
+  buildInputs = [ perl zlib openssl ];
+
+  depsSha256 = "1lg1jh6f9w28i94vaj62r859g6raalxmxabvw7av6sqr0hr56p05";
+
+  meta = with stdenv.lib; {
+    description = "Twitter command-line interface written in rust";
+    homepage = https://github.com/vmchale/tw-rs;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ vmchale ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a9f55ce5da6..e4ed1329f9f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18685,6 +18685,8 @@ with pkgs;
 
   fpm2 = callPackage ../tools/security/fpm2 { };
 
+  tw-rs = callPackage ../misc/tw-rs { };
+
   simplenote = callPackage ../applications/misc/simplenote { };
 
   hy = callPackage ../development/interpreters/hy {};

From a2569f5fd63bd1867ba6da1a2207560384dfa7a3 Mon Sep 17 00:00:00 2001
From: Josef Kemetmueller <josef.kemetmueller@aon.at>
Date: Sat, 6 May 2017 10:44:23 +0200
Subject: [PATCH 77/79] c-blosc: init at 1.11.3

---
 .../development/libraries/c-blosc/default.nix | 24 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/development/libraries/c-blosc/default.nix

diff --git a/pkgs/development/libraries/c-blosc/default.nix b/pkgs/development/libraries/c-blosc/default.nix
new file mode 100644
index 00000000000..5066b0a3250
--- /dev/null
+++ b/pkgs/development/libraries/c-blosc/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchFromGitHub, cmake }:
+
+stdenv.mkDerivation rec {
+  name = "c-blosc";
+  version = "1.11.3";
+
+  src = fetchFromGitHub {
+    owner = "Blosc";
+    repo = "c-blosc";
+    rev = "v${version}";
+    sha256 = "18665lwszwbb48pxgisyxxjh92sr764hv6h7jw8zzsmzdkgzrmcw";
+  };
+
+  buildInputs = [ cmake ];
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "A blocking, shuffling and loss-less compression library";
+    homepage = http://www.blosc.org;
+    license = licenses.bsd3;
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e4ed1329f9f..5febd6cbbb4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7239,6 +7239,8 @@ with pkgs;
     fetchurl = fetchurlBoot;
   };
 
+  c-blosc = callPackage ../development/libraries/c-blosc { };
+
   capnproto = callPackage ../development/libraries/capnproto { };
 
   ccnx = callPackage ../development/libraries/ccnx { };

From facf9a6d22966c9ab664e669b7a68f814dc2337f Mon Sep 17 00:00:00 2001
From: Josef Kemetmueller <josef.kemetmueller@aon.at>
Date: Sat, 6 May 2017 10:45:34 +0200
Subject: [PATCH 78/79] pytables: Fix build on darwin by using external c-blosc

Using the pytables internal c-blosc lead to a compilation error on
darwin, as the installer uses cpuinfo.get_cpu_info(), which
(unexpectedly for pytables) returns None in the current darwin-python.
---
 pkgs/development/python-modules/tables/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/tables/default.nix b/pkgs/development/python-modules/tables/default.nix
index e5de7c4e2a4..7faad8ec4f4 100644
--- a/pkgs/development/python-modules/tables/default.nix
+++ b/pkgs/development/python-modules/tables/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, python, buildPythonPackage
-, cython, bzip2, lzo, numpy, numexpr, hdf5, six }:
+, cython, bzip2, lzo, numpy, numexpr, hdf5, six, c-blosc }:
 
 buildPythonPackage rec {
   version = "3.3.0";
@@ -10,7 +10,7 @@ buildPythonPackage rec {
     sha256 = "0b4211s0zzdmh74k49ss0m9lc2ql2iazq2aa95ams6h45vqcr0w3";
   };
 
-  buildInputs = [ hdf5 cython bzip2 lzo ];
+  buildInputs = [ hdf5 cython bzip2 lzo c-blosc ];
   propagatedBuildInputs = [ numpy numexpr six ];
 
   # The setup script complains about missing run-paths, but they are
@@ -19,6 +19,7 @@ buildPythonPackage rec {
     [ "--hdf5=${hdf5}"
       "--lzo=${lzo}"
       "--bzip2=${bzip2.dev}"
+      "--blosc=${c-blosc}"
     ];
 
   # Run the test suite.

From cc51dd699d0d55562f5ecc1f190450674f3de975 Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Sat, 6 May 2017 10:26:32 +0300
Subject: [PATCH 79/79] pythonPackages.pytest-flake8: init at 0.8.1

---
 .../python-modules/pytest-flake8/default.nix  | 29 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/development/python-modules/pytest-flake8/default.nix

diff --git a/pkgs/development/python-modules/pytest-flake8/default.nix b/pkgs/development/python-modules/pytest-flake8/default.nix
new file mode 100644
index 00000000000..93883283627
--- /dev/null
+++ b/pkgs/development/python-modules/pytest-flake8/default.nix
@@ -0,0 +1,29 @@
+{lib, buildPythonPackage, fetchPypi, pytest, flake8}:
+
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "pytest-flake8";
+  version = "0.8.1";
+
+  # although pytest is a runtime dependency, do not add it as
+  # propagatedBuildInputs in order to allow packages depend on another version
+  # of pytest more easily
+  buildInputs = [ pytest ];
+  propagatedBuildInputs = [ flake8 ];
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1za5i09gz127yraigmcl443w6149714l279rmlfxg1bl2kdsc45a";
+  };
+
+  checkPhase = ''
+    pytest --ignore=nix_run_setup.py .
+  '';
+
+  meta = {
+    description = "py.test plugin for efficiently checking PEP8 compliance";
+    homepage = https://github.com/tholo/pytest-flake8;
+    maintainers = with lib.maintainers; [ jluttine ];
+    license = lib.licenses.bsd2;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 430cc4ac386..ffc06ab1b65 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5129,6 +5129,8 @@ in {
     };
   };
 
+  pytest-flake8 = callPackage ../development/python-modules/pytest-flake8 { };
+
   pytestflakes = buildPythonPackage rec {
     name = "pytest-flakes-${version}";
     version = "1.0.1";