From 71fa82826375ab854c79230a86bf475efa8d4f36 Mon Sep 17 00:00:00 2001
From: "Rommel M. Martinez" <ebzzry@gmail.com>
Date: Wed, 20 Jan 2016 10:59:18 +0800
Subject: [PATCH 01/37] emem: 0.2.11 -> 0.2.12

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

diff --git a/pkgs/applications/misc/emem/default.nix b/pkgs/applications/misc/emem/default.nix
index 8c4fa09a214..3d8e4742fa6 100644
--- a/pkgs/applications/misc/emem/default.nix
+++ b/pkgs/applications/misc/emem/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   pname = "emem";
-  version = "0.2.11";
+  version = "0.2.12";
   name = "${pname}-${version}";
 
   inherit jdk;
 
   src = fetchurl {
     url = "https://github.com/ebzzry/${pname}/releases/download/v${version}/${pname}.jar";
-    sha256 = "0b514nc1s5jff3586jmfx9js57j7hl8zdwi2jxlwiavwv46rl436";
+    sha256 = "1ynn72n9pw9zk29c9q2zybxjg8dniilp05vghrc9vnslyi8ml90d";
   };
 
   buildInputs = [ ];

From 078a19c43fe0cf73d70d5682c9542fcad5b026f6 Mon Sep 17 00:00:00 2001
From: Ozan Sener <ozan@ozansener.com>
Date: Wed, 10 Feb 2016 16:50:59 +0200
Subject: [PATCH 02/37] closurecompiler: 20151015 -> 20160208

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

diff --git a/pkgs/development/compilers/closure/default.nix b/pkgs/development/compilers/closure/default.nix
index 1c684c21bf4..949008d990f 100644
--- a/pkgs/development/compilers/closure/default.nix
+++ b/pkgs/development/compilers/closure/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "closure-compiler-${version}";
-  version = "20151015";
+  version = "20160208";
 
   src = fetchurl {
     url = "http://dl.google.com/closure-compiler/compiler-${version}.tar.gz";
-    sha256 = "0idb0qrzca8j2nj0zxfpnsspmdkmda864rr5m05xxgcvn7150x0h";
+    sha256 = "19v9z8lfxfmhc4cl9fys7vnaslqiznjy1jpk5mcv468p7vysg46p";
   };
 
   phases = [ "installPhase" ];

From 243c336022e9f324b721630a163bfa7b01939fa9 Mon Sep 17 00:00:00 2001
From: Arnold Krille <arnold@arnoldarts.de>
Date: Sat, 13 Feb 2016 17:17:24 +0100
Subject: [PATCH 03/37] rsync: Add rrsync as individual app

Extract the rsync source fetching into its own expression and use that
expression to fetch the same source for rsync and rrsync.

rrsync is just copied from the support folder of rsync, no configure or build
needed. Also none of the rsync patches are needed. Only the path to rsync needs
to be patched into rrsync.
---
 .../networking/sync/rsync/default.nix         |  6 +---
 .../networking/sync/rsync/rrsync.nix          | 34 +++++++++++++++++++
 .../networking/sync/rsync/src.nix             |  7 ++++
 pkgs/top-level/all-packages.nix               |  1 +
 4 files changed, 43 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/applications/networking/sync/rsync/rrsync.nix
 create mode 100644 pkgs/applications/networking/sync/rsync/src.nix

diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix
index c13bb1b329d..6608e32e8bc 100644
--- a/pkgs/applications/networking/sync/rsync/default.nix
+++ b/pkgs/applications/networking/sync/rsync/default.nix
@@ -9,11 +9,7 @@ stdenv.mkDerivation rec {
   name = "rsync-${version}";
   version = "3.1.2";
 
-  mainSrc = fetchurl {
-    # signed with key 0048 C8B0 26D4 C96F 0E58  9C2F 6C85 9FB1 4B96 A8C5
-    url = "mirror://samba/rsync/src/rsync-${version}.tar.gz";
-    sha256 = "1hm1q04hz15509f0p9bflw4d6jzfvpm1d36dxjwihk1wzakn5ypc";
-  };
+  mainSrc = import ./src.nix { inherit fetchurl version; };
 
   patchesSrc = fetchurl {
     # signed with key 0048 C8B0 26D4 C96F 0E58  9C2F 6C85 9FB1 4B96 A8C5
diff --git a/pkgs/applications/networking/sync/rsync/rrsync.nix b/pkgs/applications/networking/sync/rsync/rrsync.nix
new file mode 100644
index 00000000000..044a01993f9
--- /dev/null
+++ b/pkgs/applications/networking/sync/rsync/rrsync.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, perl, rsync }:
+
+stdenv.mkDerivation rec {
+  name = "rrsync-${version}";
+  version = "3.1.2";
+
+  src = import ./src.nix { inherit fetchurl version; };
+
+  buildInputs = [ rsync ];
+  nativeBuildInputs = [perl];
+
+  # Skip configure and build phases.
+  # We just want something from the support directory
+  configurePhase = "true";
+  dontBuild = true;
+
+  postPatch = ''
+    sed -i 's#/usr/bin/rsync#${rsync}/bin/rsync#' support/rrsync
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp support/rrsync $out/bin
+    chmod a+x $out/bin/rrsync
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://rsync.samba.org/;
+    description = "A helper to run rsync-only environments from ssh-logins.";
+    license = licenses.gpl3Plus;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ simons ehmry ];
+  };
+}
diff --git a/pkgs/applications/networking/sync/rsync/src.nix b/pkgs/applications/networking/sync/rsync/src.nix
new file mode 100644
index 00000000000..f6896d2c598
--- /dev/null
+++ b/pkgs/applications/networking/sync/rsync/src.nix
@@ -0,0 +1,7 @@
+{ version, fetchurl }:
+
+fetchurl {
+  # signed with key 0048 C8B0 26D4 C96F 0E58  9C2F 6C85 9FB1 4B96 A8C5
+  url = "mirror://samba/rsync/src/rsync-${version}.tar.gz";
+  sha256 = "1hm1q04hz15509f0p9bflw4d6jzfvpm1d36dxjwihk1wzakn5ypc";
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5e8312764dd..ebbd1edce0d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13225,6 +13225,7 @@ let
     enableACLs = !(stdenv.isDarwin || stdenv.isSunOS || stdenv.isFreeBSD);
     enableCopyDevicesPatch = (config.rsync.enableCopyDevicesPatch or false);
   };
+  rrsync = callPackage ../applications/networking/sync/rsync/rrsync.nix {};
 
   rtl-sdr = callPackage ../applications/misc/rtl-sdr { };
 

From 6efcbd89506590a2d16fc3ca8d540ae3e632e219 Mon Sep 17 00:00:00 2001
From: Svein Ove Aas <svein.ove@aas.no>
Date: Tue, 16 Feb 2016 16:37:45 +0000
Subject: [PATCH 04/37] mprime: Init at 28.7

---
 pkgs/tools/misc/mprime/default.nix    | 56 +++++++++++++++++++++++++++
 pkgs/tools/misc/mprime/makefile.patch | 46 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix       |  2 +
 3 files changed, 104 insertions(+)
 create mode 100644 pkgs/tools/misc/mprime/default.nix
 create mode 100644 pkgs/tools/misc/mprime/makefile.patch

diff --git a/pkgs/tools/misc/mprime/default.nix b/pkgs/tools/misc/mprime/default.nix
new file mode 100644
index 00000000000..9a435622c7d
--- /dev/null
+++ b/pkgs/tools/misc/mprime/default.nix
@@ -0,0 +1,56 @@
+{ stdenv, fetchurl, unzip, pkgconfig, curl }:
+
+let
+  srcDir =
+    if stdenv.system == "x86_64-linux" then "linux64"
+    else if stdenv.system == "i686-linux" then "linux"
+    else if stdenv.system == "x86_64-darwin" then "macosx64"
+    else abort "Unsupported platform";
+  gwnum =
+    if stdenv.system == "x86_64-linux" then "make64"
+    else if stdenv.system == "i686-linux" then "makefile"
+    else if stdenv.system == "x86_64-darwin" then "makemac"
+    else abort "Unsupported platform";
+in
+
+stdenv.mkDerivation {
+  name = "mprime-28.7";
+
+  src = fetchurl {
+    url = http://www.mersenne.org/ftp_root/gimps/p95v287.source.zip;
+    sha256 = "1k3gxhs3g8hfghzpmidhcwpwyayj8r83v8zjai1z4xgsql4jwby1";
+  };
+
+  unpackCmd = "unzip -d src -q $curSrc";
+
+  buildInputs = [ unzip pkgconfig curl ];
+
+  patches = [ ./makefile.patch ];
+
+  buildPhase = ''
+    make -C gwnum -f ${gwnum}
+    echo 'override CFLAGS := $(CFLAGS)' $(pkg-config --cflags libcurl) >> ${srcDir}/makefile
+    echo 'override LIBS := $(LIBS)' $(pkg-config --libs libcurl) >> ${srcDir}/makefile
+    make -C ${srcDir}
+  '';
+
+  installPhase = ''
+    install -D ${srcDir}/mprime $out/bin/mprime
+  '';
+  
+  meta = {
+    description = "Mersenne prime search / System stability tester";
+    longDescription = ''
+      MPrime is the Linux command-line interface version of Prime95, to be run
+      in a text terminal or in a terminal emulator window as a remote shell
+      client. It is identical to Prime95 in functionality, except it lacks a
+      graphical user interface.
+    '';
+    homepage = http://www.mersenne.org/;
+    # Unfree, because of a license requirement to share prize money if you find
+    # a suitable prime. http://www.mersenne.org/legal/#EULA
+    license = stdenv.lib.licenses.unfree;
+    # Untested on linux-32 and osx. Works in theory.
+    platforms = ["i686-linux" "x86_64-linux" "x86_64-darwin"];
+  };
+}
diff --git a/pkgs/tools/misc/mprime/makefile.patch b/pkgs/tools/misc/mprime/makefile.patch
new file mode 100644
index 00000000000..7f758af7b7c
--- /dev/null
+++ b/pkgs/tools/misc/mprime/makefile.patch
@@ -0,0 +1,46 @@
+diff -ru orig/linux/makefile patched/linux/makefile
+--- orig/linux/makefile	2015-08-09 21:06:18.000000000 +0100
++++ patched/linux/makefile	2016-02-16 16:25:45.988662423 +0000
+@@ -25,8 +25,8 @@
+ CPP = g++
+ CPPFLAGS = -I.. -I../gwnum -O2 -march=i486 -malign-double
+ 
+-LFLAGS = -Wl,-M -Wl,-L/usr/local/lib
+-LIBS = ../gwnum/gwnum.a ../gwnum/gwnum.ld -lm -lpthread -Wl,-Bstatic -lcurl -Wl,-Bdynamic -lrt -lstdc++ -ldl
++LFLAGS =
++LIBS = ../gwnum/gwnum.a ../gwnum/gwnum.ld -lm -lpthread -lrt -lstdc++ -ldl
+ 
+ FACTOROBJ = factor32.o
+ LINUXOBJS = prime.o menu.o
+diff -ru orig/linux64/makefile patched/linux64/makefile
+--- orig/linux64/makefile	2015-08-09 21:06:20.000000000 +0100
++++ patched/linux64/makefile	2016-02-16 16:25:57.076531585 +0000
+@@ -13,13 +13,13 @@
+ #	LIBS = ../gwnum/gwnum.a ../gwnum/gwnum.ld -lm -lpthread -Wl,-Bstatic $(shell pkg-config --static --libs libcurl) -lstdc++ -Wl,-Bdynamic -ldl
+ 
+ CC = gcc
+-CFLAGS = -I.. -I../gwnum -I/usr/local/include -DX86_64 -O2 
++CFLAGS = -I.. -I../gwnum -I/usr/local/include -DX86_64 -O2
+ 
+ CPP = g++
+ CPPFLAGS = -I.. -I../gwnum -DX86_64 -O2
+ 
+-LFLAGS = -Wl,-M -Wl,-L/usr/local/lib
+-LIBS = ../gwnum/gwnum.a ../gwnum/gwnum.ld -lm -lpthread -Wl,-Bstatic -lcurl -Wl,-Bdynamic -lrt -lstdc++ -ldl
++LFLAGS =
++LIBS = ../gwnum/gwnum.a ../gwnum/gwnum.ld -lm -lpthread -lrt -lstdc++ -ldl
+ 
+ FACTOROBJ = factor64.o
+ LINUXOBJS = prime.o menu.o
+diff -ru orig/macosx64/makefile patched/macosx64/makefile
+--- orig/macosx64/makefile	2015-08-09 21:06:22.000000000 +0100
++++ patched/macosx64/makefile	2016-02-16 16:19:03.988415925 +0000
+@@ -10,7 +10,7 @@
+ CPPFLAGS = -I.. -I../gwnum -I../linux -O2 -DX86_64 -DCOMMAND_LINE_MPRIME -m64
+ 
+ LFLAGS = -m64 -Wl,-no_pie
+-LIBS   = ../gwnum/amd64/release/gwnum.a -lm -lpthread -lcurl -framework IOKit -framework CoreFoundation -lstdc++
++LIBS   = ../gwnum/amd64/release/gwnum.a -lm -lpthread -framework IOKit -framework CoreFoundation -lstdc++
+ 
+ FACTOROBJ = ../prime95/macosx64/factor64.o
+ OBJS = prime.o menu.o
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c98153fa533..f40edd90bcc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2386,6 +2386,8 @@ let
 
   mpage = callPackage ../tools/text/mpage { };
 
+  mprime = callPackage ../tools/misc/mprime { };
+
   mpw = callPackage ../tools/security/mpw { };
 
   mr = callPackage ../applications/version-management/mr { };

From 2abb0ddb53f813256e5b3a3dfef0b1745b240817 Mon Sep 17 00:00:00 2001
From: Cole Mickens <cole.mickens@gmail.com>
Date: Wed, 17 Feb 2016 14:38:46 -0800
Subject: [PATCH 05/37] plex: plexpass 0.9.5.3.1674 -> 0.9.15.4.1679

---
 pkgs/servers/plex/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/plex/default.nix b/pkgs/servers/plex/default.nix
index 03f6fb63c72..d1c77045c8a 100644
--- a/pkgs/servers/plex/default.nix
+++ b/pkgs/servers/plex/default.nix
@@ -5,9 +5,9 @@
 
 let
   plexpkg = if enablePlexPass then {
-    version = "0.9.15.3.1674";
-    vsnHash = "f46e7e6";
-    sha256 = "086njnjcmknmbn90mmvf60ls7q73g2m955yk621jjdngs4ybvm19";
+    version = "0.9.15.4.1679";
+    vsnHash = "e4df231";
+    sha256 = "1l6kw5dkqam1fyihp02p4slxq3yy232dqp0m5dcg1vi146s911dh";
   } else {
     version = "0.9.15.2.1663";
     vsnHash = "7efd046";

From 454be2f4d74b711a04c7dd46e879992611cd2b0e Mon Sep 17 00:00:00 2001
From: Cole Mickens <cole.mickens@gmail.com>
Date: Wed, 17 Feb 2016 14:47:55 -0800
Subject: [PATCH 06/37] plex: 0.9.15.3.1663 -> 0.9.15.3.1674

---
 pkgs/servers/plex/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/plex/default.nix b/pkgs/servers/plex/default.nix
index d1c77045c8a..29a1b2d47da 100644
--- a/pkgs/servers/plex/default.nix
+++ b/pkgs/servers/plex/default.nix
@@ -9,9 +9,9 @@ let
     vsnHash = "e4df231";
     sha256 = "1l6kw5dkqam1fyihp02p4slxq3yy232dqp0m5dcg1vi146s911dh";
   } else {
-    version = "0.9.15.2.1663";
-    vsnHash = "7efd046";
-    sha256 = "1kzr826khn0n69mr2kbr5hxcb56mj12fryhwr95r3132gj02aqph";
+    version = "0.9.15.3.1674";
+    vsnHash = "f46e7e6";
+    sha256 = "086njnjcmknmbn90mmvf60ls7q73g2m955yk621jjdngs4ybvm19";
   };
 
 in stdenv.mkDerivation rec {

From 24e0fc99f9fecc817d917944f937648c7de119f2 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Sun, 24 Jan 2016 23:27:06 +0000
Subject: [PATCH 07/37] buildRubyGem: remove unecessary duplication

---
 .../ruby/build-ruby-gem/default.nix           | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/build-ruby-gem/default.nix b/pkgs/development/interpreters/ruby/build-ruby-gem/default.nix
index c5b9fba37aa..effd343ecfd 100644
--- a/pkgs/development/interpreters/ruby/build-ruby-gem/default.nix
+++ b/pkgs/development/interpreters/ruby/build-ruby-gem/default.nix
@@ -50,24 +50,24 @@ lib.makeOverridable (
 , passthru ? {}
 , ...} @ attrs:
 
-if ! builtins.elem type [ "git" "gem" ]
-then throw "buildRubyGem: don't know how to build a gem of type \"${type}\""
-else
-
 let
   shellEscape = x: "'${lib.replaceChars ["'"] [("'\\'" + "'")] x}'";
   rubygems = (attrs.rubygems or defs.rubygems).override {
     inherit ruby;
   };
   src = attrs.src or (
-    if type == "gem"
-    then fetchurl {
-      urls = map (remote: "${remote}/gems/${gemName}-${version}.gem") remotes;
-      inherit (attrs) sha256;
-    } else fetchgit {
-      inherit (attrs) url rev sha256 fetchSubmodules;
-      leaveDotGit = true;
-    }
+    if type == "gem" then
+      fetchurl {
+        urls = map (remote: "${remote}/gems/${gemName}-${version}.gem") remotes;
+        inherit (attrs) sha256;
+      }
+    else if type == "git" then
+      fetchgit {
+        inherit (attrs) url rev sha256 fetchSubmodules;
+        leaveDotGit = true;
+      }
+    else
+      throw "buildRubyGem: don't know how to build a gem of type \"${type}\""
   );
   documentFlag =
     if document == []

From a92c609ec6428cedd816229f739b0aa28addde2a Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Mon, 25 Jan 2016 10:22:00 +0000
Subject: [PATCH 08/37] gemconfig: add eventmachine and msgpack

---
 pkgs/development/interpreters/ruby/gemconfig/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/development/interpreters/ruby/gemconfig/default.nix b/pkgs/development/interpreters/ruby/gemconfig/default.nix
index 787c3be54e3..dd4ae725095 100644
--- a/pkgs/development/interpreters/ruby/gemconfig/default.nix
+++ b/pkgs/development/interpreters/ruby/gemconfig/default.nix
@@ -21,6 +21,7 @@
 , libiconv, postgresql, v8_3_16_14, clang, sqlite, zlib, imagemagick
 , pkgconfig , ncurses, xapian, gpgme, utillinux, fetchpatch, tzdata, icu, libffi
 , cmake, libssh2, openssl, mysql, darwin, git, perl, gecode_3, curl
+, libmsgpack
 }:
 
 let
@@ -40,6 +41,10 @@ in
     '';
   };
 
+  eventmachine = attrs: {
+    buildInputs = [ openssl ];
+  };
+
   ffi = attrs: {
     buildInputs = [ libffi pkgconfig ];
   };
@@ -56,6 +61,10 @@ in
     buildFlags = [ "--with-system-v8=true" ];
   };
 
+  msgpack = attrs: {
+    buildInputs = [ libmsgpack ];
+  };
+
   mysql2 = attrs: {
     buildInputs = [ mysql.lib zlib openssl ];
   };

From 673bc7f32aaf40c6c83900b9ce883d345c668318 Mon Sep 17 00:00:00 2001
From: Nathan Zadoks <nathan@nathan7.eu>
Date: Thu, 18 Feb 2016 00:59:31 +0100
Subject: [PATCH 09/37] go: add 1.6 compiler and packages

---
 pkgs/development/compilers/go/1.6.nix | 141 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix       |  13 +++
 2 files changed, 154 insertions(+)
 create mode 100644 pkgs/development/compilers/go/1.6.nix

diff --git a/pkgs/development/compilers/go/1.6.nix b/pkgs/development/compilers/go/1.6.nix
new file mode 100644
index 00000000000..cb1d396f50a
--- /dev/null
+++ b/pkgs/development/compilers/go/1.6.nix
@@ -0,0 +1,141 @@
+{ stdenv, lib, fetchurl, tzdata, iana_etc, go_1_4, runCommand
+, perl, which, pkgconfig, patch
+, pcre
+, Security, Foundation }:
+
+let
+  goBootstrap = runCommand "go-bootstrap" {} ''
+    mkdir $out
+    cp -rf ${go_1_4}/* $out/
+    chmod -R u+w $out
+    find $out -name "*.c" -delete
+    cp -rf $out/bin/* $out/share/go/bin/
+  '';
+in
+
+stdenv.mkDerivation rec {
+  name = "go-${version}";
+  version = "1.6";
+
+  src = fetchurl {
+    url = "https://github.com/golang/go/archive/go${version}.tar.gz";
+    sha256 = "04g7w34qamgy9gqpy75xm03s8xbbslv1735iv1a06z8sphpkgs7m";
+  };
+
+  # perl is used for testing go vet
+  nativeBuildInputs = [ perl which pkgconfig patch ];
+  buildInputs = [ pcre ];
+  propagatedBuildInputs = lib.optionals stdenv.isDarwin [
+    Security Foundation
+  ];
+
+  # I'm not sure what go wants from its 'src', but the go installation manual
+  # describes an installation keeping the src.
+  preUnpack = ''
+    mkdir -p $out/share
+    cd $out/share
+  '';
+
+  prePatch = ''
+    # Ensure that the source directory is named go
+    cd ..
+    if [ ! -d go ]; then
+      mv * go
+    fi
+
+    cd go
+    patchShebangs ./ # replace /bin/bash
+
+    # Disabling the 'os/http/net' tests (they want files not available in
+    # chroot builds)
+    rm src/net/{listen,parse}_test.go
+    rm src/syscall/exec_linux_test.go
+    # !!! substituteInPlace does not seems to be effective.
+    # The os test wants to read files in an existing path. Just don't let it be /usr/bin.
+    sed -i 's,/usr/bin,'"`pwd`", src/os/os_test.go
+    sed -i 's,/bin/pwd,'"`type -P pwd`", src/os/os_test.go
+    # Disable the unix socket test
+    sed -i '/TestShutdownUnix/areturn' src/net/net_test.go
+    # Disable the hostname test
+    sed -i '/TestHostname/areturn' src/os/os_test.go
+    # ParseInLocation fails the test
+    sed -i '/TestParseInSydney/areturn' src/time/format_test.go
+    # Remove the api check as it never worked
+    sed -i '/src\/cmd\/api\/run.go/ireturn nil' src/cmd/dist/test.go
+    # Remove the coverage test as we have removed this utility
+    sed -i '/TestCoverageWithCgo/areturn' src/cmd/go/go_test.go
+
+    sed -i 's,/etc/protocols,${iana_etc}/etc/protocols,' src/net/lookup_unix.go
+    sed -i 's,/etc/services,${iana_etc}/etc/services,' src/net/port_unix.go
+  '' + lib.optionalString stdenv.isLinux ''
+    sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go
+  '' + lib.optionalString stdenv.isDarwin ''
+    substituteInPlace src/race.bash --replace \
+      "sysctl machdep.cpu.extfeatures | grep -qv EM64T" true
+    sed -i 's,strings.Contains(.*sysctl.*,true {,' src/cmd/dist/util.go
+    sed -i 's,"/etc","'"$TMPDIR"'",' src/os/os_test.go
+    sed -i 's,/_go_os_test,'"$TMPDIR"'/_go_os_test,' src/os/path_test.go
+    sed -i '/TestCgoLookupIP/areturn' src/net/cgo_unix_test.go
+    sed -i '/TestChdirAndGetwd/areturn' src/os/os_test.go
+    sed -i '/TestRead0/areturn' src/os/os_test.go
+    sed -i '/TestNohup/areturn' src/os/signal/signal_test.go
+    sed -i '/TestSystemRoots/areturn' src/crypto/x509/root_darwin_test.go
+
+    sed -i '/TestGoInstallRebuildsStalePackagesInOtherGOPATH/areturn' src/cmd/go/go_test.go
+    sed -i '/TestBuildDashIInstallsDependencies/areturn' src/cmd/go/go_test.go
+
+    sed -i '/TestDisasmExtld/areturn' src/cmd/objdump/objdump_test.go
+
+    touch $TMPDIR/group $TMPDIR/hosts $TMPDIR/passwd
+  '';
+
+  patches = [
+    ./cacert-1.5.patch
+    ./remove-tools-1.5.patch
+  ]
+  # -ldflags=-s is required to compile on Darwin, see
+  # https://github.com/golang/go/issues/11994
+  ++ stdenv.lib.optional stdenv.isDarwin ./strip.patch;
+
+  GOOS = if stdenv.isDarwin then "darwin" else "linux";
+  GOARCH = if stdenv.isDarwin then "amd64"
+           else if stdenv.system == "i686-linux" then "386"
+           else if stdenv.system == "x86_64-linux" then "amd64"
+           else if stdenv.isArm then "arm"
+           else throw "Unsupported system";
+  GOARM = stdenv.lib.optionalString (stdenv.system == "armv5tel-linux") "5";
+  GO386 = 387; # from Arch: don't assume sse2 on i686
+  CGO_ENABLED = 1;
+  GOROOT_BOOTSTRAP = "${goBootstrap}/share/go";
+
+  # The go build actually checks for CC=*/clang and does something different, so we don't
+  # just want the generic `cc` here.
+  CC = if stdenv.isDarwin then "clang" else "cc";
+
+  installPhase = ''
+    mkdir -p "$out/bin"
+    export GOROOT="$(pwd)/"
+    export GOBIN="$out/bin"
+    export PATH="$GOBIN:$PATH"
+    cd ./src
+    echo Building
+    ./all.bash
+  '';
+
+  preFixup = ''
+    rm -r $out/share/go/pkg/bootstrap
+  '';
+
+  setupHook = ./setup-hook.sh;
+
+  disallowedReferences = [ go_1_4 ];
+
+  meta = with stdenv.lib; {
+    branch = "1.6";
+    homepage = http://golang.org/;
+    description = "The Go Programming language";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ cstrahan wkennington ];
+    platforms = platforms.linux ++ platforms.darwin;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 44c42e012a4..8c758d536c5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4293,6 +4293,10 @@ let
     inherit (darwin.apple_sdk.frameworks) Security Foundation;
   };
 
+  go_1_6 = callPackage ../development/compilers/go/1.6.nix {
+    inherit (darwin.apple_sdk.frameworks) Security Foundation;
+  };
+
   go = go_1_5;
 
   go-repo-root = goPackages.go-repo-root.bin // { outputs = [ "bin" ]; };
@@ -9114,6 +9118,15 @@ let
     overrides = (config.goPackageOverrides or (p: {})) pkgs;
   };
 
+  go16Packages = callPackage ./go-packages.nix {
+    go = go_1_6;
+    buildGoPackage = callPackage ../development/go-modules/generic {
+      go = go_1_6;
+      govers = go16Packages.govers.bin;
+    };
+    overrides = (config.goPackageOverrides or (p: {})) pkgs;
+  };
+
   goPackages = go15Packages;
 
   ### DEVELOPMENT / LISP MODULES

From c9b5c4a445845c48a7c7a3479087f2859c739f72 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 19 Feb 2016 15:12:08 +0100
Subject: [PATCH 10/37] kde5.kdeconnect: init at 0.9g

---
 pkgs/applications/misc/kdeconnect/0.7.nix     | 36 ++++++++++
 pkgs/applications/misc/kdeconnect/default.nix | 66 ++++++++++++-------
 pkgs/top-level/all-packages.nix               |  4 +-
 3 files changed, 82 insertions(+), 24 deletions(-)
 create mode 100644 pkgs/applications/misc/kdeconnect/0.7.nix

diff --git a/pkgs/applications/misc/kdeconnect/0.7.nix b/pkgs/applications/misc/kdeconnect/0.7.nix
new file mode 100644
index 00000000000..551d7c06468
--- /dev/null
+++ b/pkgs/applications/misc/kdeconnect/0.7.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig
+, gettext, kdelibs, libXtst, libfakekey, makeWrapper, qca2, qjson
+}:
+
+stdenv.mkDerivation rec {
+  name = "kdeconnect-${version}";
+  version = "0.7.3";
+
+  src = fetchurl {
+    url = "http://download.kde.org/unstable/kdeconnect/${version}/src/kdeconnect-kde-${version}.tar.xz";
+    sha256 = "1vrr047bq5skxvibv5pb9ch9dxh005zmar017jzbyb9hilxr8kg4";
+  };
+
+  buildInputs = [ gettext kdelibs libXtst libfakekey makeWrapper qca2 qjson ];
+
+  nativeBuildInputs = [ automoc4 cmake perl pkgconfig ];
+
+  meta = with stdenv.lib; {
+    description = "A tool to connect and sync your devices with KDE";
+    longDescription = ''
+        The corresponding Android app, "KDE Connect", is available in
+        F-Droid and Google play and has the following features:
+
+        - Share files and URLs to KDE from any app
+        - Clipboard share: copy from or to your desktop
+        - Notifications sync (4.3+): Read your Android notifications from KDE
+        - Multimedia remote control: Use your phone as a remote control
+        - WiFi connection: no usb wire or bluetooth needed
+        - RSA Encryption: your information is safe 
+    '';
+    license = licenses.gpl2;
+    homepage = https://projects.kde.org/projects/playground/base/kdeconnect-kde;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.goibhniu ];
+  };
+}
diff --git a/pkgs/applications/misc/kdeconnect/default.nix b/pkgs/applications/misc/kdeconnect/default.nix
index 551d7c06468..ff9c451461d 100644
--- a/pkgs/applications/misc/kdeconnect/default.nix
+++ b/pkgs/applications/misc/kdeconnect/default.nix
@@ -1,36 +1,56 @@
-{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig
-, gettext, kdelibs, libXtst, libfakekey, makeWrapper, qca2, qjson
+{ stdenv
+, lib
+, fetchurl
+, extra-cmake-modules
+, makeQtWrapper
+, qtquick1
+, kcmutils
+, kconfigwidgets
+, kdbusaddons
+, kiconthemes
+, ki18n
+, knotifications
+, qca-qt5
+, libfakekey
+, libXtst
 }:
 
 stdenv.mkDerivation rec {
   name = "kdeconnect-${version}";
-  version = "0.7.3";
+  version = "0.9g";
 
   src = fetchurl {
-    url = "http://download.kde.org/unstable/kdeconnect/${version}/src/kdeconnect-kde-${version}.tar.xz";
-    sha256 = "1vrr047bq5skxvibv5pb9ch9dxh005zmar017jzbyb9hilxr8kg4";
+    url = http://download.kde.org/unstable/kdeconnect/0.9/src/kdeconnect-kde-0.9g.tar.xz;
+    sha256 = "4033754057bbc993b1d4350959afbe1d17a4f1e56dd60c6df6abca5a321ee1b8";
   };
 
-  buildInputs = [ gettext kdelibs libXtst libfakekey makeWrapper qca2 qjson ];
+  buildInputs = [
+    kcmutils
+    kconfigwidgets
+    kdbusaddons
+    qca-qt5
+    qtquick1
+    ki18n
+    kiconthemes
+    knotifications
+    libfakekey
+    libXtst
+  ];
 
-  nativeBuildInputs = [ automoc4 cmake perl pkgconfig ];
+  nativeBuildInputs = [
+    extra-cmake-modules
+    makeQtWrapper
+  ];
 
-  meta = with stdenv.lib; {
-    description = "A tool to connect and sync your devices with KDE";
-    longDescription = ''
-        The corresponding Android app, "KDE Connect", is available in
-        F-Droid and Google play and has the following features:
+  postInstall = ''
+    wrapQtProgram "$out/bin/kdeconnect-cli"
+  '';
 
-        - Share files and URLs to KDE from any app
-        - Clipboard share: copy from or to your desktop
-        - Notifications sync (4.3+): Read your Android notifications from KDE
-        - Multimedia remote control: Use your phone as a remote control
-        - WiFi connection: no usb wire or bluetooth needed
-        - RSA Encryption: your information is safe 
-    '';
-    license = licenses.gpl2;
-    homepage = https://projects.kde.org/projects/playground/base/kdeconnect-kde;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.goibhniu ];
+  meta = {
+    description = "KDE Connect provides several features to integrate your phone and your computer";
+    license = with lib.licenses; [ gpl2 ];
+    maintainers = with lib.maintainers; [ fridh ];
+    homepage = https://community.kde.org/KDEConnect;
   };
+
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 662905129e5..8cda40f93b7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14734,7 +14734,7 @@ let
 
           kde_wacomtablet = callPackage ../applications/misc/kde-wacomtablet { };
 
-          kdeconnect = callPackage ../applications/misc/kdeconnect { };
+          kdeconnect = callPackage ../applications/misc/kdeconnect/0.7.nix { };
 
           kdenlive = callPackage ../applications/video/kdenlive { mlt = mlt-qt4; };
 
@@ -14926,6 +14926,8 @@ let
 
     k9copy = callPackage ../applications/video/k9copy {};
 
+    kdeconnect = callPackage ../applications/misc/kdeconnect { };
+
     konversation = callPackage ../applications/networking/irc/konversation/1.6.nix {
     };
 

From 825ba05efbf26801138ca3558b42a040ea774f0a Mon Sep 17 00:00:00 2001
From: Adrien Devresse <adrien.devresse@epfl.ch>
Date: Thu, 18 Feb 2016 23:39:18 +0100
Subject: [PATCH 11/37] vmmlib: init at 1.6.2

vmmlib is a vector and matrix C++ library
---
 pkgs/development/libraries/vmmlib/default.nix | 41 +++++++++++++++++++
 .../libraries/vmmlib/disable-cpack.patch      | 11 +++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 54 insertions(+)
 create mode 100644 pkgs/development/libraries/vmmlib/default.nix
 create mode 100644 pkgs/development/libraries/vmmlib/disable-cpack.patch

diff --git a/pkgs/development/libraries/vmmlib/default.nix b/pkgs/development/libraries/vmmlib/default.nix
new file mode 100644
index 00000000000..3a7f8770e6c
--- /dev/null
+++ b/pkgs/development/libraries/vmmlib/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, blas }:
+
+stdenv.mkDerivation rec {
+  version = "1.6.2";
+  name = "vmmlib-${version}";
+  buildInputs = [ stdenv pkgconfig cmake boost blas ];
+
+  src = fetchFromGitHub {
+    owner = "VMML";
+    repo = "vmmlib";
+    rev = "release-${version}";
+    sha256 = "0sn6jl1r5k6ka0vkjsdnn14hb95dqq8158dapby6jk72wqj9kdml";
+  };
+
+  patches = [ 
+		./disable-cpack.patch   #disable the need of cpack/rpm
+	    ];
+  
+  enableParallelBuilding = true;
+
+  doCheck = true;
+
+  checkTarget = "test";
+
+  meta = with stdenv.lib; {
+    description = "A vector and matrix math library implemented using C++ templates";
+
+    longDescription = ''vmmlib is a vector and matrix math library implemented 
+            using C++ templates. Its basic functionality includes a vector 
+            and a matrix class, with additional functionality for the 
+            often-used 3d and 4d vectors and 3x3 and 4x4 matrices.
+            More advanced functionality include solvers, frustum 
+            computations and frustum culling classes, and spatial data structures'';
+
+    license     = licenses.bsd2;
+    homepage    = http://github.com/VMML/vmmlib/;
+    maintainers = [ maintainers.adev ];
+    platforms   = platforms.all;
+  };  
+}
+
diff --git a/pkgs/development/libraries/vmmlib/disable-cpack.patch b/pkgs/development/libraries/vmmlib/disable-cpack.patch
new file mode 100644
index 00000000000..8b9a7983a92
--- /dev/null
+++ b/pkgs/development/libraries/vmmlib/disable-cpack.patch
@@ -0,0 +1,11 @@
+diff -ur a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt	1970-01-01 00:00:01.000000000 +0000
++++ b/CMakeLists.txt	2016-02-19 08:49:30.053759000 +0000
+@@ -178,6 +178,5 @@
+ install(FILES ${DOCS} DESTINATION share/vmmlib COMPONENT dev)
+ 
+ include(DoxygenRule) # must be after all targets
+-include(CPackConfig)
+ include(CTest)
+-include(PackageConfig)
++
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 38d8bf29642..cd4fb6cc904 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6508,6 +6508,8 @@ let
   eigen = callPackage ../development/libraries/eigen {};
 
   eigen2 = callPackage ../development/libraries/eigen/2.0.nix {};
+  
+  vmmlib = callPackage ../development/libraries/vmmlib {};  
 
   enchant = callPackage ../development/libraries/enchant { };
 

From c3b4dd920b50d6fd7625ada250d042b47fbd0217 Mon Sep 17 00:00:00 2001
From: Arnold Krille <arnold@arnoldarts.de>
Date: Sat, 13 Feb 2016 18:50:07 +0100
Subject: [PATCH 12/37] rsync/rrsync: less code duplication

- refactor the common parts all into the base.nix
- add myself as maintainer
---
 .../networking/sync/rsync/base.nix            | 26 +++++++++++++++++++
 .../networking/sync/rsync/default.nix         | 20 +++++---------
 .../networking/sync/rsync/rrsync.nix          | 18 ++++++-------
 .../networking/sync/rsync/src.nix             |  7 -----
 4 files changed, 41 insertions(+), 30 deletions(-)
 create mode 100644 pkgs/applications/networking/sync/rsync/base.nix
 delete mode 100644 pkgs/applications/networking/sync/rsync/src.nix

diff --git a/pkgs/applications/networking/sync/rsync/base.nix b/pkgs/applications/networking/sync/rsync/base.nix
new file mode 100644
index 00000000000..ef159d4d0e3
--- /dev/null
+++ b/pkgs/applications/networking/sync/rsync/base.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl }:
+
+let
+  version = "3.2.1";
+in
+{
+  version = version;
+  src = fetchurl {
+    # signed with key 0048 C8B0 26D4 C96F 0E58  9C2F 6C85 9FB1 4B96 A8C5
+    url = "mirror://samba/rsync/src/rsync-${version}.tar.gz";
+    sha256 = "1hm1q04hz15509f0p9bflw4d6jzfvpm1d36dxjwihk1wzakn5ypc";
+  };
+  patches = fetchurl {
+    # signed with key 0048 C8B0 26D4 C96F 0E58  9C2F 6C85 9FB1 4B96 A8C5
+    url = "mirror://samba/rsync/rsync-patches-${version}.tar.gz";
+    sha256 = "09i3dcl37p22dp75vlnsvx7bm05ggafnrf1zwhf2kbij4ngvxvpd";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = http://rsync.samba.org/;
+    #description = "A helper to run rsync-only environments from ssh-logins.";
+    license = licenses.gpl3Plus;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ simons ehmry kampfschlaefer ];
+  };
+}
\ No newline at end of file
diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix
index 6608e32e8bc..8a4ff67e2eb 100644
--- a/pkgs/applications/networking/sync/rsync/default.nix
+++ b/pkgs/applications/networking/sync/rsync/default.nix
@@ -5,17 +5,15 @@
 
 assert enableACLs -> acl != null;
 
+let
+  base = import ./base.nix { inherit stdenv fetchurl; };
+in
 stdenv.mkDerivation rec {
-  name = "rsync-${version}";
-  version = "3.1.2";
+  name = "rsync-${base.version}";
 
-  mainSrc = import ./src.nix { inherit fetchurl version; };
+  mainSrc = base.src;
 
-  patchesSrc = fetchurl {
-    # signed with key 0048 C8B0 26D4 C96F 0E58  9C2F 6C85 9FB1 4B96 A8C5
-    url = "mirror://samba/rsync/rsync-patches-${version}.tar.gz";
-    sha256 = "09i3dcl37p22dp75vlnsvx7bm05ggafnrf1zwhf2kbij4ngvxvpd";
-  };
+  patchesSrc = base.patches;
 
   srcs = [mainSrc] ++ stdenv.lib.optional enableCopyDevicesPatch patchesSrc;
   patches = stdenv.lib.optional enableCopyDevicesPatch "./patches/copy-devices.diff";
@@ -25,11 +23,7 @@ stdenv.mkDerivation rec {
 
   configureFlags = "--with-nobody-group=nogroup";
 
-  meta = with stdenv.lib; {
-    homepage = http://rsync.samba.org/;
+  meta = base.meta // {
     description = "A fast incremental file transfer utility";
-    license = licenses.gpl3Plus;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ simons ehmry ];
   };
 }
diff --git a/pkgs/applications/networking/sync/rsync/rrsync.nix b/pkgs/applications/networking/sync/rsync/rrsync.nix
index 044a01993f9..6260fc0ddec 100644
--- a/pkgs/applications/networking/sync/rsync/rrsync.nix
+++ b/pkgs/applications/networking/sync/rsync/rrsync.nix
@@ -1,10 +1,12 @@
 { stdenv, fetchurl, perl, rsync }:
 
+let
+  base = import ./base.nix { inherit stdenv fetchurl; };
+in
 stdenv.mkDerivation rec {
-  name = "rrsync-${version}";
-  version = "3.1.2";
+  name = "rrsync-${base.version}";
 
-  src = import ./src.nix { inherit fetchurl version; };
+  src = base.src;
 
   buildInputs = [ rsync ];
   nativeBuildInputs = [perl];
@@ -15,7 +17,7 @@ stdenv.mkDerivation rec {
   dontBuild = true;
 
   postPatch = ''
-    sed -i 's#/usr/bin/rsync#${rsync}/bin/rsync#' support/rrsync
+    substituteInPlace support/rrsync --replace /usr/bin/rsync ${rsync}/bin/rsync
   '';
 
   installPhase = ''
@@ -24,11 +26,7 @@ stdenv.mkDerivation rec {
     chmod a+x $out/bin/rrsync
   '';
 
-  meta = with stdenv.lib; {
-    homepage = http://rsync.samba.org/;
-    description = "A helper to run rsync-only environments from ssh-logins.";
-    license = licenses.gpl3Plus;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ simons ehmry ];
+  meta = base.meta // {
+    description = "A helper to run rsync-only environments from ssh-logins";
   };
 }
diff --git a/pkgs/applications/networking/sync/rsync/src.nix b/pkgs/applications/networking/sync/rsync/src.nix
deleted file mode 100644
index f6896d2c598..00000000000
--- a/pkgs/applications/networking/sync/rsync/src.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ version, fetchurl }:
-
-fetchurl {
-  # signed with key 0048 C8B0 26D4 C96F 0E58  9C2F 6C85 9FB1 4B96 A8C5
-  url = "mirror://samba/rsync/src/rsync-${version}.tar.gz";
-  sha256 = "1hm1q04hz15509f0p9bflw4d6jzfvpm1d36dxjwihk1wzakn5ypc";
-}
\ No newline at end of file

From 410107cf7606ac61436f46fe52c3ccdcf0de784e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sat, 20 Feb 2016 22:32:26 +0000
Subject: [PATCH 13/37] Revert "cups: 2.0.4 -> 2.1.2"

This reverts commit 35e1f4954555f465fb4499880dcb6a68417fb959.
---
 pkgs/misc/cups/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix
index 7dedf26096d..8fa111ecc02 100644
--- a/pkgs/misc/cups/default.nix
+++ b/pkgs/misc/cups/default.nix
@@ -3,7 +3,7 @@
 , libusb ? null, gnutls ? null, avahi ? null, libpaper ? null
 }:
 
-let version = "2.1.2"; in
+let version = "2.0.4"; in
 
 with stdenv.lib;
 stdenv.mkDerivation {
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://www.cups.org/software/${version}/cups-${version}-source.tar.bz2";
-    sha256 = "1bc1y8fjgh54ryh520gk63i5rbagn6jijsrskcqlibhfm0xwmc5s";
+    sha256 = "1gaakz24k6x5nc09rmpiq0xq20j1qdjc3szag8qwmyi4ky6ydmg1";
   };
 
   buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb gnutls libpaper ]
@@ -51,6 +51,7 @@ stdenv.mkDerivation {
       # Idem for /etc.
       "PAMDIR=$(out)/etc/pam.d"
       "DBUSDIR=$(out)/etc/dbus-1"
+      "INITDIR=$(out)/etc/rc.d"
       "XINETD=$(out)/etc/xinetd.d"
       "SERVERROOT=$(out)/etc/cups"
       # Idem for /usr.
@@ -60,8 +61,6 @@ stdenv.mkDerivation {
       "CUPS_PRIMARY_SYSTEM_GROUP=root"
     ];
 
-  enableParallelBuilding = true;
-
   postInstall = ''
       # Delete obsolete stuff that conflicts with cups-filters.
       rm -rf $out/share/cups/banners $out/share/cups/data/testprint

From 2a3d8fc70ca7b78fad344b47c659bc70d697f535 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Wed, 17 Feb 2016 04:40:27 +0200
Subject: [PATCH 14/37] diffoscope: 45 -> 49

We have a new tool dependency for cd-iccdump which comes from the colord
package - put this in the bloat category.
---
 pkgs/tools/misc/diffoscope/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix
index 6715f1ac38f..4c40afbaa0d 100644
--- a/pkgs/tools/misc/diffoscope/default.nix
+++ b/pkgs/tools/misc/diffoscope/default.nix
@@ -1,19 +1,19 @@
 { lib, stdenv, fetchgit, fetchpatch, pythonPackages, docutils
-, acl, binutils, bzip2, cbfstool, cdrkit, cpio, diffutils, e2fsprogs, file, fpc, gettext, ghc, gnupg1
-, gzip, jdk, libcaca, mono, pdftk, poppler_utils, rpm, sng, sqlite, squashfsTools, unzip, vim, xz
+, acl, binutils, bzip2, cbfstool, cdrkit, colord, cpio, diffutils, e2fsprogs, file, fpc, gettext, ghc
+, gnupg1, gzip, jdk, libcaca, mono, pdftk, poppler_utils, rpm, sng, sqlite, squashfsTools, unzip, vim, xz
 , enableBloat ? false
 }:
 
 pythonPackages.buildPythonPackage rec {
   name = "diffoscope-${version}";
-  version = "45";
+  version = "49";
 
   namePrefix = "";
 
   src = fetchgit {
     url = "git://anonscm.debian.org/reproducible/diffoscope.git";
     rev = "refs/tags/${version}";
-    sha256 = "1wdphcmr2n0pyg7zwvczy7ik1bzjlrjb76jwbzk971lwba3ajazk";
+    sha256 = "0kh96h95rp7bk8rgc1z18jwv89dyp1n36bawqyqxhwwklmrgxr66";
   };
 
   patches =
@@ -29,13 +29,13 @@ pythonPackages.buildPythonPackage rec {
     sed -i setup.py -e "/'rpm-python',/d"
   '';
 
-  # Still missing these tools: enjarify otool(maybe OS X only) showttf
+  # Still missing these tools: enjarify, otool & lipo (maybe OS X only), showttf
   # Also these libraries: python3-guestfs
   # FIXME: move xxd into a separate package so we don't have to pull in all of vim.
   propagatedBuildInputs = (with pythonPackages; [ debian libarchive-c python_magic tlsh ]) ++
     [ acl binutils bzip2 cbfstool cdrkit cpio diffutils e2fsprogs file gettext
       gzip libcaca poppler_utils rpm sng sqlite squashfsTools unzip vim xz
-    ] ++ lib.optionals enableBloat [ jdk ghc fpc gnupg1 pdftk mono ];
+    ] ++ lib.optionals enableBloat [ colord fpc ghc gnupg1 jdk mono pdftk ];
 
   doCheck = false; # Calls 'mknod' in squashfs tests, which needs root
 

From ab742b42ab636b78b1b3bc2e5329ba151ec82b90 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 21 Feb 2016 08:02:01 +0100
Subject: [PATCH 15/37] vlc: 2.2.1 -> 2.2.2 and take maintainership

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

diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index ebfa2f0484d..0e08c21fc99 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@@ -20,11 +20,11 @@ assert (!withQt5 -> qt4 != null);
 
 stdenv.mkDerivation rec {
   name = "vlc-${version}";
-  version = "2.2.1";
+  version = "2.2.2";
 
   src = fetchurl {
     url = "http://get.videolan.org/vlc/${version}/${name}.tar.xz";
-    sha256 = "1jqzrzrpw6932lbkf863xk8cfmn4z2ngbxz7w8ggmh4f6xz9sgal";
+    sha256 = "1dazxbmzx2g5570pkg519a7fsj07rdr155kjsw7b9y8npql33lls";
   };
 
   buildInputs =

From b4ac8fb39bbd1bd01c619fa7f19cb4dcd200cde2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 21 Feb 2016 09:59:00 +0100
Subject: [PATCH 16/37] (r)rsync: simplify and don't copy maintainers

Let's keep the original rsync maintainers only on rsync,
as I haven't noticed them wanting to maintain rrsync as well.
---
 pkgs/applications/networking/sync/rsync/base.nix    | 9 ++-------
 pkgs/applications/networking/sync/rsync/default.nix | 1 +
 pkgs/applications/networking/sync/rsync/rrsync.nix  | 1 +
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/networking/sync/rsync/base.nix b/pkgs/applications/networking/sync/rsync/base.nix
index ef159d4d0e3..86b90ea22ef 100644
--- a/pkgs/applications/networking/sync/rsync/base.nix
+++ b/pkgs/applications/networking/sync/rsync/base.nix
@@ -1,10 +1,7 @@
 { stdenv, fetchurl }:
 
-let
+rec {
   version = "3.2.1";
-in
-{
-  version = version;
   src = fetchurl {
     # signed with key 0048 C8B0 26D4 C96F 0E58  9C2F 6C85 9FB1 4B96 A8C5
     url = "mirror://samba/rsync/src/rsync-${version}.tar.gz";
@@ -18,9 +15,7 @@ in
 
   meta = with stdenv.lib; {
     homepage = http://rsync.samba.org/;
-    #description = "A helper to run rsync-only environments from ssh-logins.";
     license = licenses.gpl3Plus;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ simons ehmry kampfschlaefer ];
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix
index 8a4ff67e2eb..b65eb43351e 100644
--- a/pkgs/applications/networking/sync/rsync/default.nix
+++ b/pkgs/applications/networking/sync/rsync/default.nix
@@ -25,5 +25,6 @@ stdenv.mkDerivation rec {
 
   meta = base.meta // {
     description = "A fast incremental file transfer utility";
+    maintainers = with stdenv.lib.maintainers; [ simons ehmry kampfschlaefer ];
   };
 }
diff --git a/pkgs/applications/networking/sync/rsync/rrsync.nix b/pkgs/applications/networking/sync/rsync/rrsync.nix
index 6260fc0ddec..7563b0ea195 100644
--- a/pkgs/applications/networking/sync/rsync/rrsync.nix
+++ b/pkgs/applications/networking/sync/rsync/rrsync.nix
@@ -28,5 +28,6 @@ stdenv.mkDerivation rec {
 
   meta = base.meta // {
     description = "A helper to run rsync-only environments from ssh-logins";
+    maintainers = [ stdenv.lib.maintainers.kampfschlaefer ];
   };
 }

From 92179785b60d9fd9e67ac5301e78b892b1b7a0c7 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 25 Nov 2015 17:13:44 +0100
Subject: [PATCH 17/37] DOC: Overview of Nixpkgs/channels/Hydra/tests (close
 #11263)

What I missed when I began using Nix and NixOS was a clear overview of
how packages, channels, Hydra, the master branch and updates to channels
relate to each other.

I've noticed I am not the only one, given the amount of times these
questions pop up.

For now I propose to include this in the Nixpkgs manual, since this
seems to be the best fit. However, I think it would be good to include
this in either a new manual, i.e., a user manual, or an 'official'
tutorial.
---
 doc/default.nix      |  5 +++++
 doc/introduction.md  | 48 ++++++++++++++++++++++++++++++++++++++++++++
 doc/introduction.xml | 21 -------------------
 3 files changed, 53 insertions(+), 21 deletions(-)
 create mode 100644 doc/introduction.md
 delete mode 100644 doc/introduction.xml

diff --git a/doc/default.nix b/doc/default.nix
index 7e41380d635..65e12254f78 100644
--- a/doc/default.nix
+++ b/doc/default.nix
@@ -42,6 +42,11 @@ stdenv.mkDerivation {
     mkdir ./languages-frameworks
     cp -s '${sources-langs}'/* ./languages-frameworks
   ''
+  + toDocbook {
+      inputFile = ./introduction.md;
+      outputFile = "introduction.xml";
+      useChapters = true;
+    }
   + toDocbook {
       inputFile = ./haskell-users-guide.md;
       outputFile = "haskell-users-guide.xml";
diff --git a/doc/introduction.md b/doc/introduction.md
new file mode 100644
index 00000000000..618251a6e15
--- /dev/null
+++ b/doc/introduction.md
@@ -0,0 +1,48 @@
+---
+title: Introduction
+author: Frederik Rietdijk
+date: 2015-11-25
+---
+
+# Introduction
+
+The Nix Packages collection (Nixpkgs) is a set of over 30,000 packages for the
+[Nix package manager](http://nixos.org/nix/), released under a [permissive MIT/X11 license](https://github.com/NixOS/nixpkgs/blob/master/COPYING).
+Packages are available for several architectures, and can be used with the Nix package manager
+on most GNU/Linux distributions as well as NixOS.
+
+This manual describes how to write packages for the Nix Packages collection
+(Nixpkgs). Thus it’s for packagers and developers who want to add packages to
+Nixpkgs. If you like to learn more about the Nix package manager and the Nix
+expression language, then you are kindly referred to the [Nix manual](http://nixos.org/nix/manual/).
+
+## Overview of Nixpkgs
+
+Nix expressions describe how to build packages from source and are collected in
+the [nixpkgs repository](https://github.com/NixOS/nixpkgs). Also included in the
+collection are Nix expressions for [NixOS modules](http://nixos.org/nixos/manual/index.html#sec-writing-modules). With
+these expressions the Nix package manager can build binary packages.
+
+Packages, including the Nix packages collection, are distributed through
+[channels](http://nixos.org/nix/manual/#sec-channels). The collection is
+distributed for users of Nix on non-NixOS distributions through the channel
+`nixpkgs`. Users of NixOS generally use one of the `nixos-*` channels, e.g.
+`nixos-15.09`, which includes all packages and modules for the stable NixOS
+15.09. The channels of the stable NixOS releases are generally only given
+security updates. More up to date packages and modules are available via the
+`nixos-unstable` channel.
+
+Both `nixos-unstable` and `nixpkgs` follow the `master` branch of the Nixpkgs
+repository, although both do lag the `master` branch by generally [a couple of days](http://howoldis.herokuapp.com/). Updates to a channel are distributed as
+soon as all tests for that channel pass, e.g. [this table](http://hydra.nixos.org/job/nixpkgs/trunk/unstable#tabs-constituents)
+shows the status of tests for the `nixpkgs` channel.
+
+The tests are conducted by a cluster called [Hydra](http://nixos.org/hydra/),
+which also builds binary packages from the Nix expressions in Nixpkgs. As soon
+as a channel is updated, the binaries are made available via a [binary cache](https://cache.nixos.org). Until the channel updates, binaries that have
+already been built, are available via [Hydra's binary cache](https://hydra.nixos.org).
+
+The current Nix expressions of the channels are available in the
+[`nixpkgs-channels`](https://github.com/NixOS/nixpkgs-channels) repository,
+which has branches corresponding to the available channels. There is also the
+Nixpkgs Monitor which keeps track of updates and security vulnerabilities.
diff --git a/doc/introduction.xml b/doc/introduction.xml
deleted file mode 100644
index 577b739e7d1..00000000000
--- a/doc/introduction.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<chapter xmlns="http://docbook.org/ns/docbook"
-         xmlns:xlink="http://www.w3.org/1999/xlink"
-         xml:id="chap-introduction">
-
-<title>Introduction</title>
-
-<para>This manual tells you how to write packages for the Nix Packages
-collection (Nixpkgs).  Thus it’s for packagers and developers who want
-to add packages to Nixpkgs.  End users are kindly referred to the
-<link xlink:href="http://hydra.nixos.org/job/nix/trunk/tarball/latest/download-by-type/doc/manual">Nix
-manual</link>.</para>
-
-<para>This manual does not describe the syntax and semantics of the
-Nix expression language, which are given in the Nix manual in the
-<link
-xlink:href="http://hydra.nixos.org/job/nix/trunk/tarball/latest/download-by-type/doc/manual/#chap-writing-nix-expressions">chapter
-on writing Nix expressions</link>.  It only describes the facilities
-provided by Nixpkgs to make writing packages easier, such as the
-standard build environment (<literal>stdenv</literal>).</para>
-
-</chapter>

From f612dc703eca9d8bb3b2fb85eedf885f70b52a2f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 12 Feb 2016 13:30:06 +0100
Subject: [PATCH 18/37] kde5.kile: init at git 2016-02-12

This adds a kde5/frameworks version of kile.
---
 pkgs/applications/editors/kile/frameworks.nix | 66 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 68 insertions(+)
 create mode 100644 pkgs/applications/editors/kile/frameworks.nix

diff --git a/pkgs/applications/editors/kile/frameworks.nix b/pkgs/applications/editors/kile/frameworks.nix
new file mode 100644
index 00000000000..ff8bc371cf3
--- /dev/null
+++ b/pkgs/applications/editors/kile/frameworks.nix
@@ -0,0 +1,66 @@
+{ stdenv
+, lib
+, fetchgit
+, extra-cmake-modules
+, kdoctools
+, makeQtWrapper
+, qtscript
+, kconfig
+, kcrash
+, kdbusaddons
+, kdelibs4support
+, kguiaddons
+, kiconthemes
+, kinit
+, khtml
+, kparts
+, ktexteditor
+, kwindowsystem
+, poppler
+}:
+
+stdenv.mkDerivation rec {
+  name = "kile-${version}";
+  version = "2016-02-12";
+
+  src = fetchgit {
+    url = git://anongit.kde.org/kile.git;
+    rev = "c586532031872319ae5102fb13ab6de8d80da065";
+    sha256 = "7d5ef8b8c1254a5988a1028e415c9139fbd20a9e6771413c38fa58345a744a7b";
+
+  };
+
+  nativeBuildInputs = [
+    extra-cmake-modules
+    kdoctools
+    makeQtWrapper
+  ];
+
+  buildInputs = [
+    qtscript
+    kconfig
+    kcrash
+    kdbusaddons
+    kdelibs4support
+    kdoctools
+    kguiaddons
+    kiconthemes
+    kinit
+    khtml
+    kparts
+    ktexteditor
+    kwindowsystem
+    poppler
+  ];
+
+  postInstall = ''
+    wrapQtProgram "$out/bin/kile"
+  '';
+
+  meta = {
+    description = "Kile is a user friendly TeX/LaTeX authoring tool for the KDE desktop environment";
+    homepage = https://www.kde.org/applications/office/kile/;
+    maintainers = with lib.maintainers; [ fridh ];
+    license = lib.licenses.gpl2Plus;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ac4336c6701..c06c35c481f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15029,6 +15029,8 @@ let
 
     kdeconnect = callPackage ../applications/misc/kdeconnect { };
 
+    kile = callPackage ../applications/editors/kile/frameworks.nix { };
+
     konversation = callPackage ../applications/networking/irc/konversation/1.6.nix {
     };
 

From 895f51222e9aa87b11028502d3cd2895c1d91dda Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 16 Feb 2016 17:45:15 +0300
Subject: [PATCH 19/37] buildPythonPackage: add installFlags

---
 pkgs/development/python-modules/generic/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix
index 15f369a44f2..1fdbd4ffc0b 100644
--- a/pkgs/development/python-modules/generic/default.nix
+++ b/pkgs/development/python-modules/generic/default.nix
@@ -42,6 +42,9 @@
 # generated binaries.
 , makeWrapperArgs ? []
 
+# Additional flags to pass to "pip install".
+, installFlags ? []
+
 , ... } @ attrs:
 
 
@@ -95,7 +98,7 @@ python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled" "doCheck"] //
     export PYTHONPATH="$out/${python.sitePackages}:$PYTHONPATH"
 
     pushd dist
-    ${bootstrapped-pip}/bin/pip install *.whl --no-index --prefix=$out --no-cache
+    ${bootstrapped-pip}/bin/pip install *.whl --no-index --prefix=$out --no-cache ${toString installFlags}
     popd
 
     runHook postInstall

From b08c0472e1cb4644cef4532186bac784f60c33b3 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 16 Feb 2016 17:45:28 +0300
Subject: [PATCH 20/37] pythonPackages.pip: force installing

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f925e688933..17d5bb6d03a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15067,6 +15067,10 @@ in modules // {
       sha256 = "46f4bd0d8dfd51125a554568d646fe4200a3c2c6c36b9f2d06d2212148439521";
     };
 
+    # pip detects that we already have bootstrapped_pip "installed", so we need
+    # to force it a little.
+    installFlags = [ "--ignore-installed" ];
+
     buildInputs = with self; [ mock scripttest virtualenv pytest ];
   };
 

From dc3a1bff576cd73ff7043c113d722842ec360f40 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Sun, 21 Feb 2016 13:51:08 +0100
Subject: [PATCH 21/37] cups: add a comment about updates

---
 pkgs/misc/cups/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix
index 8fa111ecc02..82fd1d65baf 100644
--- a/pkgs/misc/cups/default.nix
+++ b/pkgs/misc/cups/default.nix
@@ -3,6 +3,8 @@
 , libusb ? null, gnutls ? null, avahi ? null, libpaper ? null
 }:
 
+### IMPORTANT: before updating cups, make sure the nixos/tests/printing.nix test
+### works at least for your platform.
 let version = "2.0.4"; in
 
 with stdenv.lib;

From aee654870169ef30f757d2d71fc61860b878f310 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sun, 21 Feb 2016 09:51:44 -0300
Subject: [PATCH 22/37] xfce4-whiskermenu-plugin: 1.5.1 -> 1.5.2

---
 .../xfce/panel-plugins/xfce4-whiskermenu-plugin.nix         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix
index 420eb128a42..bb77f568735 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix
@@ -5,8 +5,8 @@ with stdenv.lib;
 stdenv.mkDerivation rec {
   p_name  = "xfce4-whiskermenu-plugin";
   ver_maj = "1.5";
-  ver_min = "1";
-  rev = "18c31a357c102ab38e98ac24c154f9e6187b3ef8";
+  ver_min = "2";
+  rev = "d08418c8d55edfacef190ec14e03e1e9a6988101";
 
   name = "${p_name}-${ver_maj}.${ver_min}";
 
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     owner = "gottcode";
     repo = "xfce4-whiskermenu-plugin";
     inherit rev;
-    sha256 = "442e887877ffc347378c23ded2466ebbfc7aacb6b91fc395b12071320616eb76";
+    sha256 = "0icphm6bm5p3csh9kwyyvkj2y87shrs12clfifbhv35dm0skb2dx";
   };
 
   buildInputs = [ cmake pkgconfig intltool libxfce4util libxfcegui4 xfce4panel

From ce763e2d663cf3d79f5c679043bd815cc15a4fa0 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Sun, 21 Feb 2016 22:16:26 +0900
Subject: [PATCH 23/37] thunderbird-bin: 38.5.1 -> 38.6.0

---
 .../mailreaders/thunderbird-bin/sources.nix   | 234 +++++++++---------
 1 file changed, 117 insertions(+), 117 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix
index b758bf996d2..19477d86a3c 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix
@@ -4,123 +4,123 @@
 # ruby generate_sources.rb > sources.nix
 
 {
-  version = "38.5.1";
+  version = "38.6.0";
   sources = [
-    { locale = "ar"; arch = "linux-i686"; sha256 = "428fb92fe6a30f528c13f59d321eb479638133b98692e9abb2821550312027ed"; }
-    { locale = "ar"; arch = "linux-x86_64"; sha256 = "aaa65b171336d8fac42d94f2b7e41ea286415ee0337afcff2c8dc55ea4d01d09"; }
-    { locale = "ast"; arch = "linux-i686"; sha256 = "432e71e48a46bc7e90bfac8820b470346fe6b95e8545a7b6a8b5e799c7658fb6"; }
-    { locale = "ast"; arch = "linux-x86_64"; sha256 = "d8ee8d92f9635396cfe8a27dc57b407a428a0fb210c849b5faa9d7a1458328db"; }
-    { locale = "be"; arch = "linux-i686"; sha256 = "19b33c2683b5ee20264533d64c717320fb82187074c1b4d42e902b3021ac8907"; }
-    { locale = "be"; arch = "linux-x86_64"; sha256 = "8b7659c5327cd6552c4a743cd92100bbdc10b6623021eab79265027b9a0f1550"; }
-    { locale = "bg"; arch = "linux-i686"; sha256 = "02a0d0858de83abb9c732787522b45e8cfad419b765a0922426197c9f9a00f9f"; }
-    { locale = "bg"; arch = "linux-x86_64"; sha256 = "dd0ae9d067365b66a55e337c6b294d672c997c88024b17223583d9ccfb667488"; }
-    { locale = "bn-BD"; arch = "linux-i686"; sha256 = "422b42cc56b3fda6aecece1e0d934f43970fa7a8dfed0bbe859bf0e7daf6f8fd"; }
-    { locale = "bn-BD"; arch = "linux-x86_64"; sha256 = "f4edee91b6101aa4b8c308cf02d1cb926cff4beb44f840b86e0d01232dc5b88f"; }
-    { locale = "br"; arch = "linux-i686"; sha256 = "d64078fe9092e9288cb270b0d35be25a5d8d225f70d4a902d8a5c89b36b0a1a2"; }
-    { locale = "br"; arch = "linux-x86_64"; sha256 = "68b3234560f9678f3b9b1f11ccdfa2109026ca3dce321bb2732b024fbd77ce0e"; }
-    { locale = "ca"; arch = "linux-i686"; sha256 = "a7082da8adf2098449ecaf6750607e394fb03e3e1ba974852bf596c4dc961531"; }
-    { locale = "ca"; arch = "linux-x86_64"; sha256 = "6a81e6713b0b4e01d575c4709137eb8b50811f3ce4fb7222c3466e5dcedcd244"; }
-    { locale = "cs"; arch = "linux-i686"; sha256 = "512a02a544c522b59fd86705668264b2fa85fc738dd93878289230e05f38bd71"; }
-    { locale = "cs"; arch = "linux-x86_64"; sha256 = "809ff680e80ffc8b5aaa631b346d8a34df4b99362e048d16e4d415f32d721710"; }
-    { locale = "cy"; arch = "linux-i686"; sha256 = "c0a3b6f3e8b78e624a7b8f3d68185063fcc2cfb4b8f06942586a384de738eabb"; }
-    { locale = "cy"; arch = "linux-x86_64"; sha256 = "bba5556ed1f3873b9111d47ff978a2ca5fd43a48e7e32bf25cc7ad4650d5b37b"; }
-    { locale = "da"; arch = "linux-i686"; sha256 = "4b296fdd61f2cdf2d644503befafed114f5d18fd8e8bbd37d3f6a06275e8d11d"; }
-    { locale = "da"; arch = "linux-x86_64"; sha256 = "30fd49c129cee05a86a60147ea706286c0dd9a48fe6b43178d80b2a2726fcc48"; }
-    { locale = "de"; arch = "linux-i686"; sha256 = "814d073fc127b74d9edcace83c38ad2e80c74bafa327d2eac44de7673e0b2958"; }
-    { locale = "de"; arch = "linux-x86_64"; sha256 = "00dfd1ed1b981ba5bb66dc86ded8a7aee25e1a67d0c5e739a5ec252e4b4f0764"; }
-    { locale = "dsb"; arch = "linux-i686"; sha256 = "97473204548f40f6b806c1de5835477998f58ad4e9be8a1eb2bc7097def7ceb6"; }
-    { locale = "dsb"; arch = "linux-x86_64"; sha256 = "42042946079e486c24ff5e76c2e572d81a4e996dfb9ca37a9b19417933defd32"; }
-    { locale = "el"; arch = "linux-i686"; sha256 = "9056a466e7e99efa10b30be00d7f0ff2c64c077725a57397ea7462fa2de6bac0"; }
-    { locale = "el"; arch = "linux-x86_64"; sha256 = "06b223ca8ec5e47b2876c7261b94fbb82fefec50527a777802c74ebbc71c6256"; }
-    { locale = "en-GB"; arch = "linux-i686"; sha256 = "8f74bee700e9d6414d379e723e5be952725a96fc4155f1652701327fe36b493c"; }
-    { locale = "en-GB"; arch = "linux-x86_64"; sha256 = "dccdf5e29b19852895eccfd479c2d04d7ae3d7847af050028a6cada9700ef948"; }
-    { locale = "en-US"; arch = "linux-i686"; sha256 = "d2d564f048a9cbc9a956fb1b937c0d43758c97315fd19bde79d63bb0bdd7b9a5"; }
-    { locale = "en-US"; arch = "linux-x86_64"; sha256 = "70a8bdd408cea0d015a560969083445046c3a8e02c7777b2b22eedf6b46888b6"; }
-    { locale = "es-AR"; arch = "linux-i686"; sha256 = "c03ca2ea86db9dc6428e96f50cf8fc86343faa539b5ebff0e476f0e0bcb2c6c3"; }
-    { locale = "es-AR"; arch = "linux-x86_64"; sha256 = "eedc718bc25219803666e95870ce4a0ddfec7443392aa0f3840b2689bb09ab55"; }
-    { locale = "es-ES"; arch = "linux-i686"; sha256 = "962de04ebaa81296a04c84e1dd3574ec1ed5fe1784f1b0345b30fdf6de214301"; }
-    { locale = "es-ES"; arch = "linux-x86_64"; sha256 = "3821a77b83cfe174b10a9b472d8a4a29dc069a8e1c82b536923d90761fa31a4d"; }
-    { locale = "et"; arch = "linux-i686"; sha256 = "17ee3d2c863d7e8c0562a1ba75d7b1b6e469e93d3665aa2de662e98eaff1d921"; }
-    { locale = "et"; arch = "linux-x86_64"; sha256 = "84ffe20179728d1ab3dffd93428b330c6958b3c825ffdca6c8cf63dc831a7519"; }
-    { locale = "eu"; arch = "linux-i686"; sha256 = "424de9056f295b710be3db287a9ee48759efed25e311881750a49c1b30c33fe1"; }
-    { locale = "eu"; arch = "linux-x86_64"; sha256 = "5fdaafd1b691d29df5d1056555a052a0feeaa6d7b01a0383241bbc8b988da7d2"; }
-    { locale = "fi"; arch = "linux-i686"; sha256 = "1037c3d031d00eb4fea5aab50215108d0fcce6668d7226e594f47784a8aa3edb"; }
-    { locale = "fi"; arch = "linux-x86_64"; sha256 = "71f6a24995b16b1e5dfcdd5b3758940a69bf348430d71f800522bc1c0eeb6341"; }
-    { locale = "fr"; arch = "linux-i686"; sha256 = "095f6a9c8876aabbd890a97724060a704336605655a7b1feb890b05e051ae810"; }
-    { locale = "fr"; arch = "linux-x86_64"; sha256 = "97f3b49f91724608520202384d82accd3705290cb6c295dfd88d49ec33dd76c4"; }
-    { locale = "fy-NL"; arch = "linux-i686"; sha256 = "59be75d317a2ebef649adf7eff64a8e9706d5e6f58971e12ab3de3e9da306fe7"; }
-    { locale = "fy-NL"; arch = "linux-x86_64"; sha256 = "b5c4dc6e07d17fb4150d04e5c377e4c2ec18fe6304fb84a2bb19bdf554113b4a"; }
-    { locale = "ga-IE"; arch = "linux-i686"; sha256 = "59afa36ca0b31e9f0cfdaedb5e49889ef1d5d1f9c08b6fb9e6cd21a282ecacae"; }
-    { locale = "ga-IE"; arch = "linux-x86_64"; sha256 = "6e9c48d531cc65f08e08f54170721ce0cecde785978cbca0bffad6847433a5e3"; }
-    { locale = "gd"; arch = "linux-i686"; sha256 = "2c6e63a2c89f74df52d06c8bb6bd46871c04b4c91506c166acd28de1aeba8d8a"; }
-    { locale = "gd"; arch = "linux-x86_64"; sha256 = "73c4923a5a425e2b96cf1e1b05584e282f5802b76337a5180b9c89c0163fb47f"; }
-    { locale = "gl"; arch = "linux-i686"; sha256 = "4ca2c0ab487eb79272fcfe253cef93838eb57925bb2631c29de36f2510fedc1d"; }
-    { locale = "gl"; arch = "linux-x86_64"; sha256 = "7b731eb0ece93a1944ffd8dd7b0f91cad1292955e967a511ab72080b3dc66fdf"; }
-    { locale = "he"; arch = "linux-i686"; sha256 = "056cff554994ef984356b7fb27759548ac546c10b918c727e130adb970430018"; }
-    { locale = "he"; arch = "linux-x86_64"; sha256 = "5592613852a34b7b5990a06ba31b1713bb9b277a5472e153a26e780f0620f2c4"; }
-    { locale = "hr"; arch = "linux-i686"; sha256 = "abe18e183a2b26315dbad115c187eb56fe70daffd8eac3465e1ee2c3b2f364b6"; }
-    { locale = "hr"; arch = "linux-x86_64"; sha256 = "d657795e84fe1ca238e986438d5501e4baf628a890835258bcbd3a32040fef4c"; }
-    { locale = "hsb"; arch = "linux-i686"; sha256 = "806e9da32095fbb5dd6610f715006a3cf0732b69759e8b88d6c3f39617a9fd2c"; }
-    { locale = "hsb"; arch = "linux-x86_64"; sha256 = "3c0c1cdd739d1d82aef6ce864e0a65c735591acdb127a50ebdb8e5999a524b17"; }
-    { locale = "hu"; arch = "linux-i686"; sha256 = "a052932572784bdc90e8a16ffafa855a5817ea28bdd3365fa18f40685bb2f77e"; }
-    { locale = "hu"; arch = "linux-x86_64"; sha256 = "1f98b63f900ab64989ee8860ce3580394dad438078e574e4c7d997bf5a840fd9"; }
-    { locale = "hy-AM"; arch = "linux-i686"; sha256 = "b7148002a1f1790bbc52c1c3fbab837acc9a7681077aad115cc81bd05f1e1a33"; }
-    { locale = "hy-AM"; arch = "linux-x86_64"; sha256 = "cc18eaa5b72c57438c11b8fd5a77f677218d1323ad844f8eb8d294132e40d86c"; }
-    { locale = "id"; arch = "linux-i686"; sha256 = "a1c7fadbb96293391e99ee0abe16b20331a9ee274e5c56d5972a339ccf62b1da"; }
-    { locale = "id"; arch = "linux-x86_64"; sha256 = "7ac143a557c5f913966c81235f6dd398516c3e153e667442297cef82024f2af9"; }
-    { locale = "is"; arch = "linux-i686"; sha256 = "f884769780d273d7e921a236ad6fc21b1749ae8c1c483b9b57943e42bc23206e"; }
-    { locale = "is"; arch = "linux-x86_64"; sha256 = "b10fd3af349285bcecbf0334ec22b93b6811abb9c580f5a38e84b5dede4264d1"; }
-    { locale = "it"; arch = "linux-i686"; sha256 = "1ac48c611c6ae2163ae27970dcef5c20e1ba932a2210eec659ea31cb4967dfd1"; }
-    { locale = "it"; arch = "linux-x86_64"; sha256 = "23930f00a7b9b47d43a23611d4f804025d11aa489101c120449428d866179517"; }
-    { locale = "ja"; arch = "linux-i686"; sha256 = "148df7f75b69757a64427bb96bcb9a2a0d8f885b907130c1d7c519bf6e7a1718"; }
-    { locale = "ja"; arch = "linux-x86_64"; sha256 = "4992ae5d3f348648a9febadb058f558dce7659d18065e352a1d560e552d27e6e"; }
-    { locale = "ko"; arch = "linux-i686"; sha256 = "b4f9668d9d56b15c6af69d7a23716c70074adbb90100725c951d913682003789"; }
-    { locale = "ko"; arch = "linux-x86_64"; sha256 = "43f134ad246b5896a003cb75c73339cc27cc7bdf02584d5b5455a4606112a7a3"; }
-    { locale = "lt"; arch = "linux-i686"; sha256 = "b3e48defce4416d32c968056f07498c268428746c2e99f68c91c08cd623f2741"; }
-    { locale = "lt"; arch = "linux-x86_64"; sha256 = "f8cb85d3f033e6a7c6ea8d7af7e31604a3f67e2435557d108d8bff18a5612785"; }
-    { locale = "nb-NO"; arch = "linux-i686"; sha256 = "ebe6134f09bcd52b7da5461247372b5e352aa78b882039993f0f7e6d08e19047"; }
-    { locale = "nb-NO"; arch = "linux-x86_64"; sha256 = "c2137e014c37c149dfe847dd4516af45307f1ee7ae9f915b48c78b882f7e4b0b"; }
-    { locale = "nl"; arch = "linux-i686"; sha256 = "d2edd221ef00a02a38b037f961671a8f82595ea6796556bbc5cb94041a2e131c"; }
-    { locale = "nl"; arch = "linux-x86_64"; sha256 = "af2110f44b303d5182140771001d3d10b9ed7b44c31261f740b15ea4caa21545"; }
-    { locale = "nn-NO"; arch = "linux-i686"; sha256 = "c0db7cd88d5f0e38e6683181729a2de5ba63abdc4d0af17fbd72de723c909426"; }
-    { locale = "nn-NO"; arch = "linux-x86_64"; sha256 = "040da2abe7aaef427386e31aa24e67aeb389f8294f14f445ab68fb8714f74094"; }
-    { locale = "pa-IN"; arch = "linux-i686"; sha256 = "ca2e02b0ac8f4b5ab6b4af3e905a1c65274dd17bea6c4b84bfa0afa99f5bb6d3"; }
-    { locale = "pa-IN"; arch = "linux-x86_64"; sha256 = "3324461c1d47872b96d6fcfdfe10971e70b7698789fa8a7b439d5d226f87d0fb"; }
-    { locale = "pl"; arch = "linux-i686"; sha256 = "2094e2136ccdac7572203772b0a2cfed2f78116e2ee72c7038137ca198b0f404"; }
-    { locale = "pl"; arch = "linux-x86_64"; sha256 = "59f9d72974f84c2b349a7fd7c614b7473b6dba4fdaf0c57b267369624b13f2b6"; }
-    { locale = "pt-BR"; arch = "linux-i686"; sha256 = "beeb965afb626565155ca1f882ed27fc5489ab650f3eee94064227c213aa9100"; }
-    { locale = "pt-BR"; arch = "linux-x86_64"; sha256 = "a72296d59a7971aaba395fa058b8ecfa4889ccbede3ee0161744b70e848436df"; }
-    { locale = "pt-PT"; arch = "linux-i686"; sha256 = "b8e0925a64aab9e23bf13bd9b2afd1baab7d964e6c1c3af3973201fc6b7a71c9"; }
-    { locale = "pt-PT"; arch = "linux-x86_64"; sha256 = "bd12cfcb485b85bc0444111f7bf7f1e9ecff42a1bf03515e46aeff668da690a8"; }
-    { locale = "rm"; arch = "linux-i686"; sha256 = "220767594e50de01d636d29d38ef87d0ad4871c718ba2f5e9c8f8bdc13023408"; }
-    { locale = "rm"; arch = "linux-x86_64"; sha256 = "298f69008f20a23eda68a92912fbd050eff73f806e0cb8ce0c40f1fc53b76fc2"; }
-    { locale = "ro"; arch = "linux-i686"; sha256 = "3be80143bb1affa8df3c94bcb048bcd2f22f39f60db02d2f9afeeb44b45c67ae"; }
-    { locale = "ro"; arch = "linux-x86_64"; sha256 = "715963ac282e8f972e22f3fcc5b51e03346f011b8848f16b8a8cb9b6a23c864c"; }
-    { locale = "ru"; arch = "linux-i686"; sha256 = "0c793708c8501df82582f5d820c65ee11a46819f012b7d616c7fd4b1424e7eef"; }
-    { locale = "ru"; arch = "linux-x86_64"; sha256 = "5f4fbfaa52b4eca748dd12da12c6bc38286e5fdee2fd81d337d926ea4e0df378"; }
-    { locale = "si"; arch = "linux-i686"; sha256 = "ede99dd26481f9864dbd0ad276f3b10a1bea8a2267a3f0055f10de4c185a3e3d"; }
-    { locale = "si"; arch = "linux-x86_64"; sha256 = "15ca9bb30fe45879bfaac936187951f36af45a134cdf756314e7c1b1d508db22"; }
-    { locale = "sk"; arch = "linux-i686"; sha256 = "9ac426f0148d232de2c11fb0404bfd317aa26d0fecca710c63dda52eb73841d5"; }
-    { locale = "sk"; arch = "linux-x86_64"; sha256 = "8f67b9449e4b0759b82d748c1c0aab3ba42da1c3643e1579f3f0e1cda00cf61f"; }
-    { locale = "sl"; arch = "linux-i686"; sha256 = "12d52efd990e472230cbee546b544f01b2aa7bf8e1812cc561102e9cba58bfa0"; }
-    { locale = "sl"; arch = "linux-x86_64"; sha256 = "432071992c94ae8964db97f02d7c26d1584ab6ba43a3bb87bb605d9933f37673"; }
-    { locale = "sq"; arch = "linux-i686"; sha256 = "b070ecb797dae27d66c449feb34c57d383f64ddbe6dc37cd836658e3e8c28e54"; }
-    { locale = "sq"; arch = "linux-x86_64"; sha256 = "065eebd594fa00315bd017f76eb35ff64e371347b346ec54eef6edbc738476b4"; }
-    { locale = "sr"; arch = "linux-i686"; sha256 = "a76a9b519fbfa5e3ac305522fe313c3f1c52c2bdb1c44878341a0ff5f50c5a36"; }
-    { locale = "sr"; arch = "linux-x86_64"; sha256 = "e90a8c3dd54d69de3e092d1e63288365807238ec3ab01383778bb10aa9799309"; }
-    { locale = "sv-SE"; arch = "linux-i686"; sha256 = "da60ffb3131d7ff150d9a2f70b1071d0399cfaf671003c5b5b598911561eddb8"; }
-    { locale = "sv-SE"; arch = "linux-x86_64"; sha256 = "686162ef37b00757ff49784fb6c2fd04ea55103c78af6f97bf5e7e6be34cb46a"; }
-    { locale = "ta-LK"; arch = "linux-i686"; sha256 = "ad8702ca5223fd9a17dce9e71360299938f53548e357d93a5bc23d24cbec8039"; }
-    { locale = "ta-LK"; arch = "linux-x86_64"; sha256 = "f6178474338c75f1b216176ae40a9e09df68697d9cc1ccdc661293b51ae133ed"; }
-    { locale = "tr"; arch = "linux-i686"; sha256 = "54c88fd15417a271368a981b79467064a968993e7076e2f4a87f0cb280b4954f"; }
-    { locale = "tr"; arch = "linux-x86_64"; sha256 = "d1943ef072cfc40ab90d0b008527d6e4607db2299eb536573db5a7e832babb9c"; }
-    { locale = "uk"; arch = "linux-i686"; sha256 = "276ed6dac2090fdd53c967daadda3d39c8f05b70f6d91779af2998b446a831dd"; }
-    { locale = "uk"; arch = "linux-x86_64"; sha256 = "f18455e1df20364ff0c4e2f44397b068faf387f7efa25941f167750f349f93a5"; }
-    { locale = "vi"; arch = "linux-i686"; sha256 = "3a72f5935f32de88a0bf88eb5252864b19b8bdd1f01fa49b14d54021a88fb2cf"; }
-    { locale = "vi"; arch = "linux-x86_64"; sha256 = "3f53c378fce2c5a7245103510714b2d99b8915ef78452d469cbd4f0343a3767d"; }
-    { locale = "zh-CN"; arch = "linux-i686"; sha256 = "6ac29a8081a339f334ea0b22ac49b81d79d26a22995ea592f1a78fe9c66a4edc"; }
-    { locale = "zh-CN"; arch = "linux-x86_64"; sha256 = "82733b4f96f42fe3d0fd7e429e8f23bd1aa059890a6403cc991b3236f31399c6"; }
-    { locale = "zh-TW"; arch = "linux-i686"; sha256 = "4d376644e762630bd7e9077d616cd4b4c0175ea3fd3df04c4c76ac489d87cecf"; }
-    { locale = "zh-TW"; arch = "linux-x86_64"; sha256 = "0044c3e78014df76fd09009142d75858fd8ac5abea54920d52870bf2d6599310"; }
+    { locale = "ar"; arch = "linux-i686"; sha256 = "141b3e5a5a51b0ed8f11bc9233d19bccc3116e55d568eb4995bcd48c91ba3390"; }
+    { locale = "ar"; arch = "linux-x86_64"; sha256 = "f2841d9da85e788d868eb56a43baa8e7d72d40c9c82ca60f4f958b9285be5bc3"; }
+    { locale = "ast"; arch = "linux-i686"; sha256 = "aa52c0672bf8c2b28ae5efb26aa552592aad6c637b660f9cb4533cad72b9a4fc"; }
+    { locale = "ast"; arch = "linux-x86_64"; sha256 = "1a083214fc2f31e52b0d03bffbef64e364b77457e447ddc134dc363004768b03"; }
+    { locale = "be"; arch = "linux-i686"; sha256 = "f3e7653a7f9957e9722cf29a7a97b751ffc2b19bd4982ff603f6460afb07445d"; }
+    { locale = "be"; arch = "linux-x86_64"; sha256 = "55d7082b20da1bbe23b8d1a2e1e07f6a02f9dd96b065cab1a8a2acd086790d21"; }
+    { locale = "bg"; arch = "linux-i686"; sha256 = "132fb89107e653cb30e9f6fffbca6ced0451811080b89058a652dcb5187601f3"; }
+    { locale = "bg"; arch = "linux-x86_64"; sha256 = "03868dab14f8bd671eed93a05c50c3836bb047e4195a2b8e92d04d3cf3244c67"; }
+    { locale = "bn-BD"; arch = "linux-i686"; sha256 = "ffa2c116e814da8f0a5995f382de0b4d614e72b55ecc905185c014abea763851"; }
+    { locale = "bn-BD"; arch = "linux-x86_64"; sha256 = "74631bb2d75687aefc6e8dfa9414176a92de7a22890704f6f84603703a3dd880"; }
+    { locale = "br"; arch = "linux-i686"; sha256 = "3942e35a9ea655ac365a4b00f70d8b97e7833e50d00d7d07e5ce851956f55f00"; }
+    { locale = "br"; arch = "linux-x86_64"; sha256 = "33dba57581571faac7cc11aeafda68fce323c9fc322a3c8e43cbce794489ab39"; }
+    { locale = "ca"; arch = "linux-i686"; sha256 = "5001132684f89e6e4c4ab8d22f37739da4465577e850bed4748ad3079a0b592e"; }
+    { locale = "ca"; arch = "linux-x86_64"; sha256 = "3cfad5f05320d179b575bc263ceecef0c9bfec08e7a3471dd779be8798f8f8e8"; }
+    { locale = "cs"; arch = "linux-i686"; sha256 = "14879dadca5936473b42ccefc2485707330aa7062bd1c2094adafee0dde83a50"; }
+    { locale = "cs"; arch = "linux-x86_64"; sha256 = "92f39de732f2264c5658e3282d0a4259b437f81277c926b3fe0a1c51bb18a27b"; }
+    { locale = "cy"; arch = "linux-i686"; sha256 = "e38d9c45558bbf1414efff8568b79ed58c0383329923944aca72bcd075c71967"; }
+    { locale = "cy"; arch = "linux-x86_64"; sha256 = "43f11c8ea150c1b58031fd765fc5d789e56df68ef36dd989a8a67135d9a1e501"; }
+    { locale = "da"; arch = "linux-i686"; sha256 = "9815c3fb3c95d4fb73faeb9db10591a39131edcb846fb72b6c2b01ac132602f5"; }
+    { locale = "da"; arch = "linux-x86_64"; sha256 = "6435f69ebb748f2f81dfcd1da4d66030792e73735d11c788c4478cdb750de89d"; }
+    { locale = "de"; arch = "linux-i686"; sha256 = "d8601890fe1021c61b48cb755a98358fffb0e5c3de106d0408baa748c6e4ff21"; }
+    { locale = "de"; arch = "linux-x86_64"; sha256 = "96626e10573940ce9a77277f8776066e1f33d852ff1a9be25c613ea54b2ad3d0"; }
+    { locale = "dsb"; arch = "linux-i686"; sha256 = "c0cf3e5db343c031171cca6507839e18bb4232a498eb0ff87864c0d3f54c31d3"; }
+    { locale = "dsb"; arch = "linux-x86_64"; sha256 = "5c94f8200bf7e5bccdb4f454232707c1354d4cb87713648847d742d1d127b5bc"; }
+    { locale = "el"; arch = "linux-i686"; sha256 = "43b61ae50412d5df24f903bd1890be52164689b53ec9bbfe134b7bbb36952377"; }
+    { locale = "el"; arch = "linux-x86_64"; sha256 = "163e041e125f84db5f9d55f6e8a2e8d15b7ac6335187a55f00f7019b3038249c"; }
+    { locale = "en-GB"; arch = "linux-i686"; sha256 = "b34105daffdf9088fecd199e1525ebbc332ff6536487caa058d19daa4c7306c4"; }
+    { locale = "en-GB"; arch = "linux-x86_64"; sha256 = "ac54bf8c804d17ecebab6a865471ce5adf712466612eb435e5871a4ffcc7238a"; }
+    { locale = "en-US"; arch = "linux-i686"; sha256 = "2e60a2a5764cdee16659b125f7ad2dde7ff6e993c69a738d86fb39530e469328"; }
+    { locale = "en-US"; arch = "linux-x86_64"; sha256 = "f0b4b0d5a7f4b21845e76411cd75d59b0e34a341747cafcb3e871a00b1b2535e"; }
+    { locale = "es-AR"; arch = "linux-i686"; sha256 = "fa9de1698297336d3db8d7cc6c59ea1cad595c2d5caf8081f85fc217535d630d"; }
+    { locale = "es-AR"; arch = "linux-x86_64"; sha256 = "62bf96299b20de2b6ea17db2113fd8220c60507314d9c3dfbd2ef06557746298"; }
+    { locale = "es-ES"; arch = "linux-i686"; sha256 = "1e79df1375e29c6aaf2839584ee51e23a326587e02440c07f10969f82e29daa3"; }
+    { locale = "es-ES"; arch = "linux-x86_64"; sha256 = "e5ef4e579c83b1f982b5d071966b3c1be39b94aa128e0ef14f4244e51b19c6c9"; }
+    { locale = "et"; arch = "linux-i686"; sha256 = "110dc75c81abcca2199c2f6bee542fe0909bfbe678e91376a1413a81bac88edf"; }
+    { locale = "et"; arch = "linux-x86_64"; sha256 = "71f7f7d5d9025423438138a62728d3494f2227c3b1daf8945cbd20d65e7629b3"; }
+    { locale = "eu"; arch = "linux-i686"; sha256 = "ad2e6071fafe18f3db5d4af4d938450ec1a8f538e2a5efc7f8ce1d28f1f3dd66"; }
+    { locale = "eu"; arch = "linux-x86_64"; sha256 = "32c8b0e825912b97a36cedf19ead4eba8427e08ac059b4bb9fda15c568ce6cff"; }
+    { locale = "fi"; arch = "linux-i686"; sha256 = "203006ba5572a315f851e69e74779f92123df25d6a1964283bbf546c43ca0ecb"; }
+    { locale = "fi"; arch = "linux-x86_64"; sha256 = "f87904779b68a60aef440a7eb5cf490fe224bc25517d9fa463575fd35c4fc895"; }
+    { locale = "fr"; arch = "linux-i686"; sha256 = "4d92b6273006f6a20c6b405cfdd017930e7341230f0deefdbe8961a3ab2099d7"; }
+    { locale = "fr"; arch = "linux-x86_64"; sha256 = "a7858e1fca3007710053cd6ffcd8d17fe111ec3727e98cfc410f426fb4dd04a1"; }
+    { locale = "fy-NL"; arch = "linux-i686"; sha256 = "d222ea0506db332ab7590fc85dce4102613489506d7680bac31c82b855ae238e"; }
+    { locale = "fy-NL"; arch = "linux-x86_64"; sha256 = "b466075727c3d3f709b9ddb1987f9fe69deb1efa34fecbd73aa1c5231ef844d8"; }
+    { locale = "ga-IE"; arch = "linux-i686"; sha256 = "d786389a7866d2be769c079ec65396fe3888968f80f3fbd8d54e355ac3098f91"; }
+    { locale = "ga-IE"; arch = "linux-x86_64"; sha256 = "8134a011c31cf63a5538fea89ef332a28ab510fb08e1251a9d460ba83946f656"; }
+    { locale = "gd"; arch = "linux-i686"; sha256 = "a5b5cb6e9a2daf1587af84083cd680b14f49a0f998d4e6e80f09c37aebac0b0f"; }
+    { locale = "gd"; arch = "linux-x86_64"; sha256 = "7b15ab841f95eda59256c7cb4c9c876b0bea34df9f0e1d3af3bd144230d7254a"; }
+    { locale = "gl"; arch = "linux-i686"; sha256 = "7bee6ae14c9f43689ab2c7b9a7de60af9fe4d9d567efb94b26e3109af04d6c43"; }
+    { locale = "gl"; arch = "linux-x86_64"; sha256 = "b9a6e5bd2c62745a82fd3685a694a6f34d3327b60a62af6e283caf3a67d77f22"; }
+    { locale = "he"; arch = "linux-i686"; sha256 = "17a322f92322de536ead76e292d877ab8e9deff9855b1c12fc20855d3935a548"; }
+    { locale = "he"; arch = "linux-x86_64"; sha256 = "e542cfdfd29f7d54520dc86c9b73252e57fd3346874f9d629fd31b25be463471"; }
+    { locale = "hr"; arch = "linux-i686"; sha256 = "fe1fc94042eaeeedc1e7592cbedc5e4c922c5e05cd212feff8a654898d2c2a9e"; }
+    { locale = "hr"; arch = "linux-x86_64"; sha256 = "de191f3cc421ed5b06ce981c0431decb933799252107b27103bc3c45ac6995be"; }
+    { locale = "hsb"; arch = "linux-i686"; sha256 = "f55ad886854541ea1d684d168f8fb3c858fc8a11324dc14fb64340cb47f6d7fe"; }
+    { locale = "hsb"; arch = "linux-x86_64"; sha256 = "ee03f60c834c141d3340dca9ecfce8f427ee50a3b6b963f4a565a843e895f614"; }
+    { locale = "hu"; arch = "linux-i686"; sha256 = "8462e0a665d04b9273dbfc1095ef57831165438c21c34b5d04d22b51276fc047"; }
+    { locale = "hu"; arch = "linux-x86_64"; sha256 = "6cc42919c6417860e19fcc851b8210b9d6e405c4b2ff0bf51cffb18af733b488"; }
+    { locale = "hy-AM"; arch = "linux-i686"; sha256 = "2c3f4f4358387dad669254da46e21b4da1f54cedbc7be62c38448862a88edf37"; }
+    { locale = "hy-AM"; arch = "linux-x86_64"; sha256 = "0556cb57c012554449d7044efaa5e8b4b938b15d55a19f91cb31ea5187b7ef76"; }
+    { locale = "id"; arch = "linux-i686"; sha256 = "26d31f04b836d3e5e3874c4e37d258effc8bd228223f6b963df3434d2276529c"; }
+    { locale = "id"; arch = "linux-x86_64"; sha256 = "55b2be7503278c0a41785796425fe35f5635e0c635d79a4246f7830a7cf6f075"; }
+    { locale = "is"; arch = "linux-i686"; sha256 = "29ce03e041c320aaa61c8ecefbe1a6cd2e9b96e916f3605f09a59cd271cfb741"; }
+    { locale = "is"; arch = "linux-x86_64"; sha256 = "44d7856e1779e86d715026a26fdc0db8beb8fac1bcba5c27ed652779f858c12e"; }
+    { locale = "it"; arch = "linux-i686"; sha256 = "47dd016eda154be31646105061570653ab61ab99d8bf873cf9e8e4b727847fc6"; }
+    { locale = "it"; arch = "linux-x86_64"; sha256 = "299941c56912734dd06c2f1dd89838d3a746dfde10df39f6caf198cf4fc6a332"; }
+    { locale = "ja"; arch = "linux-i686"; sha256 = "ff809f8f752612d242d5787f511b4821294855dd42027d7493f789200747575a"; }
+    { locale = "ja"; arch = "linux-x86_64"; sha256 = "babda834d5e6fa669691b974c4c4ea4b9207c3926796d0c1d76784b733d738a3"; }
+    { locale = "ko"; arch = "linux-i686"; sha256 = "a04ca9cd1cd435d4ab5d832efaeb1a6fee5e9e6c933c5a3a9b0e21bbc5141f24"; }
+    { locale = "ko"; arch = "linux-x86_64"; sha256 = "0390d47ca644679631b8bbb83cb45e404b4b7f1e4ad237d439318fd6464aeeb4"; }
+    { locale = "lt"; arch = "linux-i686"; sha256 = "9e9d3ed60a3ba5ef761937e5b2b06a4eaac1c6f6c1d72a9b3fe0ab7818e3d18f"; }
+    { locale = "lt"; arch = "linux-x86_64"; sha256 = "8d7cf2a173df6b7930a37244829934b2729341a8938288c988120010d1a52d2f"; }
+    { locale = "nb-NO"; arch = "linux-i686"; sha256 = "fde6089efa39e867f8c8b4b6d6e9d5c006f87c4ceaabb78517b34ea288cebe1e"; }
+    { locale = "nb-NO"; arch = "linux-x86_64"; sha256 = "9ff74ec5e87468f3912b1ec847eff2d215c35224b4ef82ba29efaba4a48f2bb0"; }
+    { locale = "nl"; arch = "linux-i686"; sha256 = "349101916960741272549700a4050850730679826ef3f6c837b542628ac9b17b"; }
+    { locale = "nl"; arch = "linux-x86_64"; sha256 = "0bc2cf52b46f15976cd5355960b81106279c4cea9b7d55ac0360a56dd934ce6a"; }
+    { locale = "nn-NO"; arch = "linux-i686"; sha256 = "6eff1f88b362d81d71833b50606afffdb7e0210160bc9933226c472daa692259"; }
+    { locale = "nn-NO"; arch = "linux-x86_64"; sha256 = "748726556948ebc59913a72965a54de67615217a93cf0351ece356524d8e3097"; }
+    { locale = "pa-IN"; arch = "linux-i686"; sha256 = "6606ee970387998235ed96fdbacc64a47fe2bc0d78061cf4205200517ab6f092"; }
+    { locale = "pa-IN"; arch = "linux-x86_64"; sha256 = "0a77fe35ddce1921252d2e2acbeb09d6e719d34b4d81af8d6ef9c5c846359780"; }
+    { locale = "pl"; arch = "linux-i686"; sha256 = "b8d81eba8470a29768ded1c6882cdbf2f3306843754d29fa35e385b0a6efce25"; }
+    { locale = "pl"; arch = "linux-x86_64"; sha256 = "2b10f69274860e7af35cbb795042d058c9480ad195cd435e457923da2341c99d"; }
+    { locale = "pt-BR"; arch = "linux-i686"; sha256 = "4391c285e1db0767f7242fad4fbf6441572ef930acabc63209f1d2ac64e6d08c"; }
+    { locale = "pt-BR"; arch = "linux-x86_64"; sha256 = "003060a341e1134870f96e1e032023884f3f22fa62261b07084e3cb8813423fb"; }
+    { locale = "pt-PT"; arch = "linux-i686"; sha256 = "d261cbc11bd9b176b656c3ae75f802aee4f1828e14f1a9f0e8c7822e9a24c090"; }
+    { locale = "pt-PT"; arch = "linux-x86_64"; sha256 = "81fb37b9591a159e9d5ceff18921683037b4c965765b47e736c9124ba6268ee2"; }
+    { locale = "rm"; arch = "linux-i686"; sha256 = "a7d699ac74a568922a363eabaa38627564fbc715cdd3612a8f51e0c373594646"; }
+    { locale = "rm"; arch = "linux-x86_64"; sha256 = "ab9c84765f54f02e385b360025d1c70937af91350cbf8eea666f97aec4e36276"; }
+    { locale = "ro"; arch = "linux-i686"; sha256 = "00db7d515ee4abcba36713a7bac64a2afdfa1782bc3e4175ae2c69535c7b6cdf"; }
+    { locale = "ro"; arch = "linux-x86_64"; sha256 = "03da97e6c832ce49ccf6736ddac4a14b92768442f6f462b0174324964693aaa7"; }
+    { locale = "ru"; arch = "linux-i686"; sha256 = "d7d78792a83d76ce4c521674275b3b6443d0c12ad376b4ec3c34bc4edef64078"; }
+    { locale = "ru"; arch = "linux-x86_64"; sha256 = "bc4c751c5079d3863df1b0dd5717d7f5c07c031fefe798642ff3ff91e8f7512c"; }
+    { locale = "si"; arch = "linux-i686"; sha256 = "9525a7a704f262efa1ad18ab154d7f0eeec8f923f641621a38cce3be5c090cd4"; }
+    { locale = "si"; arch = "linux-x86_64"; sha256 = "2e847ce3ee90d27b7e20602844cbc1c3a9e458a7d449386e5bc8067163b6559d"; }
+    { locale = "sk"; arch = "linux-i686"; sha256 = "389e6dea7b61aced9ad491b57441963cf9c3f5f0c90a80778ccee71320a8bf53"; }
+    { locale = "sk"; arch = "linux-x86_64"; sha256 = "c36e78ce9aecaa23cf183a453e6ae817a52b84e2129f4e41fd409a61e1705c6a"; }
+    { locale = "sl"; arch = "linux-i686"; sha256 = "e8f1dd49850b2c359a66e8f79839a95d6e1a09de5cdd41a64c44315fdcea544c"; }
+    { locale = "sl"; arch = "linux-x86_64"; sha256 = "3ae2a85dadbaf99109fa971bb0c7a825d4ad3d1357f4d51bc7bb20455564ea68"; }
+    { locale = "sq"; arch = "linux-i686"; sha256 = "dd52238fbd564d49ae8f3dfcee7e608615d3e78bd99373b1bbcdf51b9e20c354"; }
+    { locale = "sq"; arch = "linux-x86_64"; sha256 = "cbeadcb1de666c42c9e5b42b2a6c1fa14f80e4c6454ea8cfc34b0ad5dd472bb8"; }
+    { locale = "sr"; arch = "linux-i686"; sha256 = "1318c997a56245b296b2f9ac004b07f87d6492448272c8978e78193fe484336b"; }
+    { locale = "sr"; arch = "linux-x86_64"; sha256 = "0898d16c990669028fbea084755221c747db48392b30b7c498770fcb5df7b328"; }
+    { locale = "sv-SE"; arch = "linux-i686"; sha256 = "50c76b8904b51a84136a1c69939e49541205ce8b804c2ce90cff196e826c275c"; }
+    { locale = "sv-SE"; arch = "linux-x86_64"; sha256 = "bf3e5c83815458726317c8415963825975500452202f240200be0fab43b1e226"; }
+    { locale = "ta-LK"; arch = "linux-i686"; sha256 = "7d62ec98b8f01b12425e7692c4966faeeeb42ea66cd6105c37742698215bde5a"; }
+    { locale = "ta-LK"; arch = "linux-x86_64"; sha256 = "416cffbe25f2b00cd584fa455768b09c5f8d1bc7938263880903050f8c08fab4"; }
+    { locale = "tr"; arch = "linux-i686"; sha256 = "581d6c8df1611d749d0dda9d1f248ebf354825f8a8097624fd08338ea5e01d38"; }
+    { locale = "tr"; arch = "linux-x86_64"; sha256 = "24b1b9bfa251add2d7f3183b0c3aafdea6b4caa5bdbcea718462185d6dc63e5b"; }
+    { locale = "uk"; arch = "linux-i686"; sha256 = "97175dba275e382b2436e9b7a948c46f137ed38612e90ea43466dd3fe20c878b"; }
+    { locale = "uk"; arch = "linux-x86_64"; sha256 = "273b08710fbc57c30828736c38a158ff66ac788b2ca3726118367466cab09797"; }
+    { locale = "vi"; arch = "linux-i686"; sha256 = "e0391fdecb11b5daac913f57894970208b51e1e7f1665ff56cb7a68dba0c442a"; }
+    { locale = "vi"; arch = "linux-x86_64"; sha256 = "af51ee3bd2ac246a4b465aa65b13d1aa661dbce5e0988524532616fb9d2d651b"; }
+    { locale = "zh-CN"; arch = "linux-i686"; sha256 = "5e7d1543d41912ffa0a71137b90c40ab5569ffab65e8b99f0b62446561a78ca2"; }
+    { locale = "zh-CN"; arch = "linux-x86_64"; sha256 = "f85c8086b462474e40b0b090f9b566aa55b228ec49ec18fa1b5987ec3efa048b"; }
+    { locale = "zh-TW"; arch = "linux-i686"; sha256 = "6f161428af67a1635364660a8ec6d7c785350204d5bac602ebcd32861e9baf62"; }
+    { locale = "zh-TW"; arch = "linux-x86_64"; sha256 = "2088379539a9b4ece3012b603a5731c92567fa4b3e5c448ae54e2729c8df0658"; }
   ];
 }

From 696052cb622b718cfe7543126b86d543ba19f43b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 21 Feb 2016 14:59:04 +0100
Subject: [PATCH 24/37] pythonPackages.protobuf: fix

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 17d5bb6d03a..df742a5c84c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15496,7 +15496,7 @@ in modules // {
       ${python.executable} setup.py test
     '';
 
-    installFlags = optional (versionAtLeast protobuf.version "2.6.0") "--cpp_implementation";
+    installFlags = optional (versionAtLeast protobuf.version "2.6.0") "--install-option='--cpp_implementation'";
 
     doCheck = true;
 

From a3017f92d845b9313dffdd3ed1ef5dcd4808d96a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Sun, 21 Feb 2016 15:30:05 +0100
Subject: [PATCH 25/37] libcrossguid: init at 2016-02-21

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

diff --git a/pkgs/development/libraries/libcrossguid/default.nix b/pkgs/development/libraries/libcrossguid/default.nix
new file mode 100644
index 00000000000..cf142ac68c4
--- /dev/null
+++ b/pkgs/development/libraries/libcrossguid/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitHub, libuuid }:
+
+stdenv.mkDerivation rec {
+  name = "lib" + pname + "-" + version;
+  pname = "crossguid";
+  version = "2016-02-21";
+
+  src = fetchFromGitHub {
+    owner = "graeme-hill";
+    repo = pname;
+    rev = "8f399e8bd4252be9952f3dfa8199924cc8487ca4";
+    sha256 = "1i29y207qqddvaxbn39pk2fbh3gx8zvdprfp35wasj9rw2wjk3s9";
+  };
+
+  buildInputs = [ libuuid ];
+
+  buildPhase = ''
+    g++ -c guid.cpp -o guid.o $CXXFLAGS -std=c++11 -DGUID_LIBUUID
+    ar rvs libcrossguid.a guid.o
+  '';
+  installPhase = ''
+    mkdir -p $out/{lib,include}
+    install -D -m644 libcrossguid.a "$out/lib/libcrossguid.a"
+    install -D -m644 guid.h "$out/include/guid.h"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Lightweight cross platform C++ GUID/UUID library";
+    license = licenses.mit;
+    maintainers = with maintainers; [ edwtjo ];
+    homepage = https://github.com/graeme-hill/crossguid;
+  };
+
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c06c35c481f..ae201693745 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7232,6 +7232,8 @@ let
 
   libcrafter = callPackage ../development/libraries/libcrafter { };
 
+  libcrossguid = callPackage ../development/libraries/libcrossguid { };
+
   libuchardet = callPackage ../development/libraries/libuchardet { };
 
   libchop = callPackage ../development/libraries/libchop { };

From 8968a6e60476fd5160ee450e4ea7f9d69877fd8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Sun, 21 Feb 2016 15:30:50 +0100
Subject: [PATCH 26/37] dcadec: init at 0.2.0

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

diff --git a/pkgs/development/tools/dcadec/default.nix b/pkgs/development/tools/dcadec/default.nix
new file mode 100644
index 00000000000..ba2c13fbc3b
--- /dev/null
+++ b/pkgs/development/tools/dcadec/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = pname + "-" + version;
+  pname = "dcadec";
+  version = "0.2.0";
+
+  src = fetchFromGitHub {
+    owner = "foo86";
+    repo = pname;
+    rev = "v" + version;
+    sha256 = "07nd0ajizrp1w02bsyfcv18431r8m8rq8gjfmz9wmckpg7cxj2hs";
+  };
+
+  installPhase = "make PREFIX=/ DESTDIR=$out install";
+
+  meta = with stdenv.lib; {
+    description = "DTS Coherent Acoustics decoder with support for HD extensions.";
+    maintainers = with maintainers; [ edwtjo ];
+    homepage = http://github.com/foo86/dcadec;
+    license = licenses.lgpl21;
+    platforms = platforms.linux;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ae201693745..c6bf469169b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5807,6 +5807,8 @@ let
 
   libsigrokdecode = callPackage ../development/tools/libsigrokdecode { };
 
+  dcadec = callPackage ../development/tools/dcadec { };
+
   dejagnu = callPackage ../development/tools/misc/dejagnu { };
 
   dfeet = callPackage ../development/tools/misc/d-feet {

From ad4bfe4dda80815c2d02016623cc48df7a5ed8ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Sun, 21 Feb 2016 15:31:41 +0100
Subject: [PATCH 27/37] kodi: 15.2 -> 16.0

---
 pkgs/applications/video/kodi/default.nix | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix
index e1dc182ba0b..5761a443df8 100644
--- a/pkgs/applications/video/kodi/default.nix
+++ b/pkgs/applications/video/kodi/default.nix
@@ -15,7 +15,8 @@
 , lzo, libcdio, libmodplug, libass, libbluray
 , sqlite, mysql, nasm, gnutls, libva, wayland
 , curl, bzip2, zip, unzip, glxinfo, xdpyinfo
-, libcec, libcec_platform
+, libcec, libcec_platform, dcadec, libuuid
+, libcrossguid
 , dbus_libs ? null, dbusSupport ? true
 , udev, udevSupport ? true
 , libusb ? null, usbSupport ? false
@@ -36,18 +37,18 @@ assert pulseSupport -> libpulseaudio != null;
 assert rtmpSupport  -> rtmpdump != null;
 
 let
-  rel = "Isengard";
-  ffmpeg_2_6_4 = fetchurl {
-    url = "https://github.com/xbmc/FFmpeg/archive/2.6.4-${rel}.tar.gz";
-    sha256 = "0gsjz8sr0dqq68gcln29xhz3h35n77769h1gb0ias0apmpaad1r4";
+  rel = "Jarvis";
+  ffmpeg_2_8_6 = fetchurl {
+    url = "https://github.com/xbmc/FFmpeg/archive/2.8.6-${rel}-16.0.tar.gz";
+    sha256 = "00cvjwfpz6ladmln4yny4d4viwflrbgrid1na412g5pif70qv3dh";
   };
 in stdenv.mkDerivation rec {
     name = "kodi-" + version;
-    version = "15.2";
+    version = "16.0";
 
     src = fetchurl {
       url = "https://github.com/xbmc/xbmc/archive/${version}-${rel}.tar.gz";
-      sha256 = "043i0f1crx9glwxil4xm45z5kxpkrx316gi4ir4d3rbd5safp2nx";
+      sha256 = "0iirspvv7czf785l2lqf232dvdaj87srbn9ni97ngvnd6w9yl884";
     };
 
     buildInputs = [
@@ -68,7 +69,8 @@ in stdenv.mkDerivation rec {
       lzo libcdio libmodplug libass libbluray
       sqlite mysql.lib nasm avahi libdvdcss lame
       curl bzip2 zip unzip glxinfo xdpyinfo
-      libcec libcec_platform
+      libcec libcec_platform dcadec libuuid
+      libcrossguid
     ]
     ++ lib.optional dbusSupport dbus_libs
     ++ lib.optional udevSupport udev
@@ -85,7 +87,7 @@ in stdenv.mkDerivation rec {
         --replace 'usr/share/zoneinfo' 'etc/zoneinfo'
       substituteInPlace tools/depends/target/ffmpeg/autobuild.sh \
         --replace "/bin/bash" "${bash}/bin/bash -ex"
-      cp ${ffmpeg_2_6_4} tools/depends/target/ffmpeg/ffmpeg-2.6.4-${rel}.tar.gz
+      cp ${ffmpeg_2_8_6} tools/depends/target/ffmpeg/ffmpeg-2.8.6-${rel}-16.0.tar.gz
     '';
 
     preConfigure = ''

From 4046d3ce8dbecb74fc9da8f03d7fcd651ca94f35 Mon Sep 17 00:00:00 2001
From: devresse <adrien.devresse@epfl.ch>
Date: Fri, 19 Feb 2016 10:52:22 +0000
Subject: [PATCH 28/37] neuron: init at 7.4

---
 .../science/biology/neuron/default.nix        | 38 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  6 +++
 2 files changed, 44 insertions(+)
 create mode 100644 pkgs/applications/science/biology/neuron/default.nix

diff --git a/pkgs/applications/science/biology/neuron/default.nix b/pkgs/applications/science/biology/neuron/default.nix
new file mode 100644
index 00000000000..33f6d50d8ad
--- /dev/null
+++ b/pkgs/applications/science/biology/neuron/default.nix
@@ -0,0 +1,38 @@
+{ stdenv 
+, fetchurl 
+, pkgconfig 
+, ncurses 
+, mpi ? null
+}:
+
+stdenv.mkDerivation rec {
+  name = "neuron-7.4";
+  buildInputs = [ stdenv pkgconfig ncurses mpi ];
+
+  src = fetchurl {
+    url = "http://www.neuron.yale.edu/ftp/neuron/versions/v7.4/nrn-7.4.tar.gz";
+    sha256 = "1rid8cmv5mca0vqkgwahm0prkwkbdvchgw2bdwvx4adkn8bbl0ql";
+  };
+
+
+  enableParallelBuilding = true;
+
+  configureFlags = [ "--without-x"
+		     "${if mpi != null then "--with-mpi" else "--without-mpi"}" ];
+
+  meta = with stdenv.lib; {
+    description = "Simulation environment for empirically-based simulations of neurons and networks of neurons";
+
+    longDescription = "NEURON is a simulation environment for developing and exercising models of 
+		neurons and networks of neurons. It is particularly well-suited to problems where 
+		cable properties of cells play an important role, possibly including extracellular 
+		potential close to the membrane), and where cell membrane properties are complex, 
+		involving many ion-specific channels, ion accumulation, and second messengers";
+
+    license     = licenses.bsd3;
+    homepage    = http://www.neuron.yale.edu/neuron;
+    maintainers = [ maintainers.adev ];
+    platforms   = platforms.all;
+  };  
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 38d8bf29642..f5e6452fcc5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15074,6 +15074,12 @@ let
 
   emboss = callPackage ../applications/science/biology/emboss { };
 
+  neuron = callPackage ../applications/science/biology/neuron { };
+
+  neuron-mpi = appendToName "mpi" (neuron.override {
+    mpi = pkgs.openmpi;
+  });
+
   mrbayes = callPackage ../applications/science/biology/mrbayes { };
 
   ncbi_tools = callPackage ../applications/science/biology/ncbi-tools { };

From 4575d58b3d414210e35468fef6ab86c423a77f67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Sun, 21 Feb 2016 16:15:13 +0100
Subject: [PATCH 29/37] kodiPlugins.genesis: 5.1.3 -> 5.1.4

---
 pkgs/applications/video/kodi/plugins.nix | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix
index 9e0f4cd2b68..078de59bdb1 100644
--- a/pkgs/applications/video/kodi/plugins.nix
+++ b/pkgs/applications/video/kodi/plugins.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, cmake, kodi, steam, libcec_platform, tinyxml }:
+{ stdenv, fetchurl, fetchFromGitHub, fetchpatch, cmake, kodi, steam, libcec_platform, tinyxml, unzip }:
 
 let
 
@@ -70,17 +70,15 @@ in
 
   };
 
-  genesis = mkKodiPlugin rec {
+  genesis = (mkKodiPlugin rec {
 
     plugin = "genesis";
     namespace = "plugin.video.genesis";
-    version = "5.1.3";
+    version = "5.1.4";
 
-    src = fetchFromGitHub {
-      owner = "lambda81";
-      repo = "lambda-addons";
-      rev = "f2cd04f33af88d60e1330573bbf2ef9cee7f0a56";
-      sha256 = "0z0ldckqqif9v5nhnjr5n2495cm3z9grjmrh7czl4xlnq4bvviqq";
+    src = fetchurl {
+      url = "https://offshoregit.com/lambda81/lambda-repo/${namespace}/${namespace}-${version}.zip";
+      sha256 = "0b0pdzgg42mgxgkb6sb83rldh4k19c3l9z7g2wnvxm3s2p6rjy3v";
     };
 
     meta = with stdenv.lib; {
@@ -89,8 +87,7 @@ in
       platforms = platforms.all;
       maintainers = with maintainers; [ edwtjo ];
     };
-
-  };
+  }).override { buildInputs = [ unzip ]; };
 
   urlresolver = (mkKodiPlugin rec {
 

From bc1e1c56985811d5f64032c78305b8e5492b4e8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Sun, 21 Feb 2016 16:15:54 +0100
Subject: [PATCH 30/37] kodiPlugins.salts: 1.0.98 -> 2.0.6

---
 pkgs/applications/video/kodi/plugins.nix | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix
index 078de59bdb1..34b454ddcdd 100644
--- a/pkgs/applications/video/kodi/plugins.nix
+++ b/pkgs/applications/video/kodi/plugins.nix
@@ -109,24 +109,21 @@ in
       maintainers = with maintainers; [ edwtjo ];
     };
   }).override {
-    patches = [ (fetchpatch {
-      url = https://github.com/Eldorados/script.module.urlresolver/pull/355.patch;
-      sha256 = "0q1n2sqdjqq32202s6ifh81c9a1l5a7yfkkf170dbkiajvxglz1m";
-    }) ];
+    postPatch = "sed -i -e 's,settings_file = os.path.join(addon_path,settings_file = os.path.join(profile_path,g' lib/urlresolver/common.py";
   };
 
-  salts = (mkKodiPlugin rec {
+  salts = mkKodiPlugin rec {
 
     plugin = "salts";
     namespace = "plugin.video.salts";
-    version = "1.0.98";
+    version = "2.0.6";
 
     src = fetchFromGitHub {
       name = plugin + "-" + version + ".tar.gz";
       owner = "tknorris";
       repo = plugin;
-      rev = "02cb63360ac1f60c01ec29d1da94902542f9a47a";
-      sha256 = "10cy633g383m1xy6yap46aqzyz96dh62y7c5rn5nvyw8ms18089z";
+      rev = "5100565bec5818cdcd8a891ab6a6d67b0018e070";
+      sha256 = "00nlcddmgzyi3462i12qikdryfwqzqd1i30rkp485ay16akyj0lr";
     };
 
     meta = with stdenv.lib; {
@@ -134,11 +131,6 @@ in
       description = "Stream All The Sources";
       maintainers = with maintainers; [ edwtjo ];
     };
-  }).override {
-    patches = [ (fetchpatch {
-      url = https://github.com/tknorris/salts/pull/115.patch;
-      sha256 = "157dhp049mw8lna6cg3x549jv2b9zq1vj6v94mil65q2hlw09sjd";
-    }) ];
   };
 
   svtplay = mkKodiPlugin rec {

From a6638c62a84a5208251cf40cceade9c472a47217 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Sun, 21 Feb 2016 17:57:39 +0200
Subject: [PATCH 31/37] Revert "linux: 4.1.17 -> 4.1.18"

This reverts commit 6cdf5fe85fc0e6dd1dc9789993fc59962270374a.

This version has a crypto regression:
https://lkml.org/lkml/2016/2/19/748 which is blocking the channel update
due to a failing luksroot test: http://hydra.nixos.org/build/32159615
---
 pkgs/os-specific/linux/kernel/linux-4.1.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.1.nix b/pkgs/os-specific/linux/kernel/linux-4.1.nix
index f2286895f07..fbcfa17a8bc 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.1.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.1.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.1.18";
+  version = "4.1.17";
   extraMeta.branch = "4.1";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1n838dg058knmx4n5mfqxh2ai9d3x6w9zs1apkwzm89rpisc1ijb";
+    sha256 = "084ij19vgm27ljrjabqqmlqn27p168nsm9grhr6rajid4n79h6ab";
   };
 
   kernelPatches = args.kernelPatches;

From e6d3a4e7d1e2262c0b28dac67538d253cc4e719e Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Sat, 23 Jan 2016 15:32:58 -0800
Subject: [PATCH 32/37] ghcjs: Remove wrapper, which seems long unused

---
 pkgs/development/compilers/ghcjs/wrapper.nix | 77 --------------------
 1 file changed, 77 deletions(-)
 delete mode 100644 pkgs/development/compilers/ghcjs/wrapper.nix

diff --git a/pkgs/development/compilers/ghcjs/wrapper.nix b/pkgs/development/compilers/ghcjs/wrapper.nix
deleted file mode 100644
index 751b7d9a7de..00000000000
--- a/pkgs/development/compilers/ghcjs/wrapper.nix
+++ /dev/null
@@ -1,77 +0,0 @@
-{ stdenv, ghc, makeWrapper, coreutils, writeScript }:
-let
-  ghcjs = ghc;
-  packageDBFlag = "-package-db";
-
-  GHCGetPackages = writeScript "ghc-get-packages.sh" ''
-    #! ${stdenv.shell}
-    # Usage:
-    #  $1: version of GHC
-    #  $2: invocation path of GHC
-    #  $3: prefix
-    version="$1"
-    if test -z "$3"; then
-      prefix="${packageDBFlag} "
-    else
-      prefix="$3"
-    fi
-    PATH="$PATH:$2"
-    IFS=":"
-    for p in $PATH; do
-      for i in "$p/../share/ghcjs/$system-${ghcjs.version}-${ghcjs.ghc.version}"{,/lib,/ghcjs}"/package.conf.d" "$p/../lib/ghcjs-${ghc.version}_ghc-${ghc.ghc.version}/package.conf.d" ; do
-        # output takes place here
-        test -f $i/package.cache && echo -n " $prefix$i"
-      done
-    done
-  '';
-
-  GHCPackages = writeScript "ghc-packages.sh" ''
-    #! ${stdenv.shell} -e
-    declare -A GHC_PACKAGES_HASH # using bash4 hashs to get uniq paths
-
-    for arg in $(${GHCGetPackages} ${ghcjs.version} "$(dirname $0)"); do # Why is ghc.version passed in from here instead of captured in the other script directly?
-      case "$arg" in
-        ${packageDBFlag}) ;;
-        *)
-          CANONICALIZED="$(${coreutils}/bin/readlink -f -- "$arg")"
-          GHC_PACKAGES_HASH["$CANONICALIZED"]= ;;
-      esac
-    done
-
-    for path in ''${!GHC_PACKAGES_HASH[@]}; do
-      echo -n "$path:"
-    done
-  '';
-in
-stdenv.mkDerivation {
-  name = "ghcjs-ghc${ghcjs.ghc.version}-${ghcjs.version}-wrapper";
-
-  buildInputs = [makeWrapper];
-  propagatedBuildInputs = [ghcjs];
-
-  unpackPhase = "true";
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out/bin
-    for prg in ghcjs ; do
-      makeWrapper $ghc/bin/$prg $out/bin/$prg --add-flags "\$(${GHCGetPackages} ${ghcjs.version} \"\$(dirname \$0)\")"
-    done
-    for prg in ghcjs-pkg ; do
-      makeWrapper $ghc/bin/$prg $out/bin/$prg --add-flags "\$(${GHCGetPackages} ${ghcjs.version} \"\$(dirname \$0)\" -${packageDBFlag}=)"
-    done
-
-    mkdir -p $out/nix-support
-    ln -s $out/nix-support/propagated-build-inputs $out/nix-support/propagated-user-env-packages
-
-    mkdir -p $out/share/doc
-    ln -s $ghc/lib $out/lib
-    ln -s $ghc/share/doc/ghc $out/share/doc/ghc-${ghcjs.version}
-
-    runHook postInstall
-  '';
-
-  ghc = ghcjs;
-  inherit GHCGetPackages GHCPackages;
-  inherit (ghcjs) meta version;
-}

From 114cd6765d9a1dc405af223294657b9e765a6f3d Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Sun, 21 Feb 2016 10:15:04 -0800
Subject: [PATCH 33/37] haskell: Expose the package set used to build each GHC,
 where possible

Tested to not change hashes
---
 pkgs/development/compilers/ghc/7.10.2.nix    |  7 ++++-
 pkgs/development/compilers/ghc/7.10.3.nix    |  7 ++++-
 pkgs/development/compilers/ghc/8.0.1.nix     | 10 +++++++-
 pkgs/development/compilers/ghc/head.nix      | 11 ++++++--
 pkgs/development/compilers/ghc/nokinds.nix   |  7 ++++-
 pkgs/development/compilers/ghcjs/default.nix | 10 +++++---
 pkgs/top-level/haskell-packages.nix          | 27 ++++++++++++--------
 7 files changed, 59 insertions(+), 20 deletions(-)

diff --git a/pkgs/development/compilers/ghc/7.10.2.nix b/pkgs/development/compilers/ghc/7.10.2.nix
index 73fcd788c74..87490842b3b 100644
--- a/pkgs/development/compilers/ghc/7.10.2.nix
+++ b/pkgs/development/compilers/ghc/7.10.2.nix
@@ -1,8 +1,9 @@
-{ stdenv, fetchurl, fetchpatch, ghc, perl, gmp, ncurses, libiconv, binutils, coreutils
+{ stdenv, fetchurl, fetchpatch, bootPkgs, perl, gmp, ncurses, libiconv, binutils, coreutils
 , libxml2, libxslt, docbook_xsl, docbook_xml_dtd_45, docbook_xml_dtd_42, hscolour
 }:
 
 let
+  inherit (bootPkgs) ghc;
 
   buildMK = ''
     libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"
@@ -60,6 +61,10 @@ stdenv.mkDerivation rec {
     done
   '';
 
+  passthru = {
+    inherit bootPkgs;
+  };
+
   meta = {
     homepage = "http://haskell.org/ghc";
     description = "The Glasgow Haskell Compiler";
diff --git a/pkgs/development/compilers/ghc/7.10.3.nix b/pkgs/development/compilers/ghc/7.10.3.nix
index 88d1bec4d42..53ba058def4 100644
--- a/pkgs/development/compilers/ghc/7.10.3.nix
+++ b/pkgs/development/compilers/ghc/7.10.3.nix
@@ -1,8 +1,9 @@
-{ stdenv, fetchurl, fetchpatch, ghc, perl, gmp, ncurses, libiconv, binutils, coreutils
+{ stdenv, fetchurl, fetchpatch, bootPkgs, perl, gmp, ncurses, libiconv, binutils, coreutils
 , libxml2, libxslt, docbook_xsl, docbook_xml_dtd_45, docbook_xml_dtd_42, hscolour
 }:
 
 let
+  inherit (bootPkgs) ghc;
 
   docFixes = fetchurl {
     url = "https://downloads.haskell.org/~ghc/7.10.3/ghc-7.10.3a.patch";
@@ -61,6 +62,10 @@ stdenv.mkDerivation rec {
     done
   '';
 
+  passthru = {
+    inherit bootPkgs;
+  };
+
   meta = {
     homepage = "http://haskell.org/ghc";
     description = "The Glasgow Haskell Compiler";
diff --git a/pkgs/development/compilers/ghc/8.0.1.nix b/pkgs/development/compilers/ghc/8.0.1.nix
index d24ad4106ee..00482d013c2 100644
--- a/pkgs/development/compilers/ghc/8.0.1.nix
+++ b/pkgs/development/compilers/ghc/8.0.1.nix
@@ -1,7 +1,11 @@
-{ stdenv, fetchurl, fetchpatch, ghc, perl, gmp, ncurses, libiconv, binutils, coreutils
+{ stdenv, fetchurl, fetchpatch, bootPkgs, perl, gmp, ncurses, libiconv, binutils, coreutils
 , hscolour
 }:
 
+let
+  inherit (bootPkgs) ghc;
+
+in 
 stdenv.mkDerivation rec {
   version = "8.0.0.20160204";
   name = "ghc-${version}";
@@ -51,6 +55,10 @@ stdenv.mkDerivation rec {
     done
   '';
 
+  passthru = {
+    inherit bootPkgs;
+  };
+
   meta = {
     homepage = "http://haskell.org/ghc";
     description = "The Glasgow Haskell Compiler";
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index 9b360b609e4..18e22f0100b 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -1,8 +1,11 @@
-{ stdenv, fetchgit, ghc, perl, gmp, ncurses, libiconv, binutils, coreutils
+{ stdenv, fetchgit, bootPkgs, perl, gmp, ncurses, libiconv, binutils, coreutils
 , autoconf, automake, happy, alex
 }:
 
-stdenv.mkDerivation rec {
+let
+  inherit (bootPkgs) ghc;
+
+in stdenv.mkDerivation rec {
   version = "7.11.20151216";
   name = "ghc-${version}";
   rev = "28638dfe79e915f33d75a1b22c5adce9e2b62b97";
@@ -62,6 +65,10 @@ stdenv.mkDerivation rec {
     done
   '';
 
+  passthru = {
+    inherit bootPkgs;
+  };
+
   meta = {
     homepage = "http://haskell.org/ghc";
     description = "The Glasgow Haskell Compiler";
diff --git a/pkgs/development/compilers/ghc/nokinds.nix b/pkgs/development/compilers/ghc/nokinds.nix
index 6334759496f..acaef9c5ab1 100644
--- a/pkgs/development/compilers/ghc/nokinds.nix
+++ b/pkgs/development/compilers/ghc/nokinds.nix
@@ -1,6 +1,7 @@
-{ stdenv, fetchgit, ghc, perl, gmp, ncurses, libiconv, autoconf, automake, happy, alex }:
+{ stdenv, fetchgit, bootPkgs, perl, gmp, ncurses, libiconv, autoconf, automake, happy, alex }:
 
 let
+  inherit (bootPkgs) ghc;
 
   buildMK = ''
     libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"
@@ -66,6 +67,10 @@ stdenv.mkDerivation rec {
   # that in turn causes GHCi to abort
   stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols";
 
+  passthru = {
+    inherit bootPkgs;
+  };
+
   meta = {
     homepage = "http://haskell.org/ghc";
     description = "The dependently-typed 'nokinds' branch of the Glasgow Haskell Compiler by Richard Eisenberg";
diff --git a/pkgs/development/compilers/ghcjs/default.nix b/pkgs/development/compilers/ghcjs/default.nix
index 81a8c90b53a..3aca5f23919 100644
--- a/pkgs/development/compilers/ghcjs/default.nix
+++ b/pkgs/development/compilers/ghcjs/default.nix
@@ -20,7 +20,7 @@
 , ghcjs-prim
 , regex-posix
 
-, ghc, gmp
+, bootPkgs, gmp
 , jailbreak-cabal
 
 , runCommand
@@ -41,8 +41,11 @@
 , ghcjsBoot ? import ./ghcjs-boot.nix { inherit fetchgit runCommand; }
 , shims ? import ./shims.nix { inherit fetchFromGitHub; }
 }:
-let version = "0.2.0"; in
-mkDerivation (rec {
+let
+  inherit (bootPkgs) ghc;
+  version = "0.2.0";
+
+in mkDerivation (rec {
   pname = "ghcjs";
   inherit version;
   src = fetchFromGitHub {
@@ -114,6 +117,7 @@ mkDerivation (rec {
         --with-gmp-libraries ${gmp}/lib
   '';
   passthru = {
+    inherit bootPkgs;
     isGhcjs = true;
     nativeGhc = ghc;
     inherit nodejs ghcjsBoot;
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 2d0151dc542..2eadcbeefef 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -34,24 +34,29 @@ rec {
     ghc784 = callPackage ../development/compilers/ghc/7.8.4.nix {
       ghc = compiler.ghc742Binary;
     };
-    ghc7102 = callPackage ../development/compilers/ghc/7.10.2.nix {
-      ghc = compiler.ghc784; inherit (packages.ghc784) hscolour;
+    ghc7102 = callPackage ../development/compilers/ghc/7.10.2.nix rec {
+      bootPkgs = packages.ghc784;
+      inherit (bootPkgs) hscolour;
     };
-    ghc7103 = callPackage ../development/compilers/ghc/7.10.3.nix {
-      ghc = compiler.ghc784; inherit (packages.ghc784) hscolour;
+    ghc7103 = callPackage ../development/compilers/ghc/7.10.3.nix rec {
+      bootPkgs = packages.ghc784;
+      inherit (bootPkgs) hscolour;
     };
-    ghc801 = callPackage ../development/compilers/ghc/8.0.1.nix {
-      ghc = compiler.ghc7103; inherit (packages.ghc7103) hscolour;
+    ghc801 = callPackage ../development/compilers/ghc/8.0.1.nix rec {
+      bootPkgs = packages.ghc7103;
+      inherit (bootPkgs) hscolour;
     };
-    ghcHEAD = callPackage ../development/compilers/ghc/head.nix {
-      inherit (packages.ghc784) ghc alex happy;
+    ghcHEAD = callPackage ../development/compilers/ghc/head.nix rec {
+      bootPkgs = packages.ghc784;
+      inherit (bootPkgs) alex happy;
     };
-    ghcNokinds = callPackage ../development/compilers/ghc/nokinds.nix {
-      inherit (packages.ghc784) ghc alex happy;
+    ghcNokinds = callPackage ../development/compilers/ghc/nokinds.nix rec {
+      bootPkgs = packages.ghc784;
+      inherit (bootPkgs) alex happy;
     };
 
     ghcjs = packages.ghc7103.callPackage ../development/compilers/ghcjs {
-      ghc = compiler.ghc7103;
+      bootPkgs = packages.ghc7103;
     };
 
     jhc = callPackage ../development/compilers/jhc {

From 51b66ed4d918a795af55ae50de05fd0cb4b19a38 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Fri, 19 Feb 2016 08:40:33 -0800
Subject: [PATCH 34/37] haskell: Add notion of cross compiler and define
 nativeGhc with it

Tested to not change hashes
---
 pkgs/development/compilers/ghcjs/default.nix         | 2 +-
 pkgs/development/haskell-modules/generic-builder.nix | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/ghcjs/default.nix b/pkgs/development/compilers/ghcjs/default.nix
index 3aca5f23919..722c3eab10a 100644
--- a/pkgs/development/compilers/ghcjs/default.nix
+++ b/pkgs/development/compilers/ghcjs/default.nix
@@ -118,8 +118,8 @@ in mkDerivation (rec {
   '';
   passthru = {
     inherit bootPkgs;
+    isCross = true;
     isGhcjs = true;
-    nativeGhc = ghc;
     inherit nodejs ghcjsBoot;
   };
 
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index b871b7d73fa..50efcc27fe6 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -56,8 +56,9 @@ let
   inherit (stdenv.lib) optional optionals optionalString versionOlder
                        concatStringsSep enableFeature optionalAttrs toUpper;
 
+  isCross = ghc.isCross or false;
   isGhcjs = ghc.isGhcjs or false;
-  nativeGhc = if isGhcjs then ghc.nativeGhc else ghc;
+  nativeGhc = if isCross then ghc.bootPkgs.ghc else ghc;
 
   newCabalFileUrl = "http://hackage.haskell.org/package/${pname}-${version}/revision/${revision}.cabal";
   newCabalFile = fetchurl {
@@ -97,7 +98,7 @@ let
     (optionalString (isGhcjs || versionOlder "7.4" ghc.version) (enableFeature enableSharedExecutables "executable-dynamic"))
     (optionalString (isGhcjs || versionOlder "7" ghc.version) (enableFeature doCheck "tests"))
   ] ++ optionals isGhcjs [
-    "--with-hsc2hs=${ghc.nativeGhc}/bin/hsc2hs"
+    "--with-hsc2hs=${nativeGhc}/bin/hsc2hs"
     "--ghcjs"
   ];
 

From f13eede7e58d06a64bae410602ada6626af39991 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Fri, 19 Feb 2016 08:45:45 -0800
Subject: [PATCH 35/37] haskell: Tiny refactor in generic-builder. No
 hashes/interfaces changed.

---
 .../development/haskell-modules/generic-builder.nix | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 50efcc27fe6..8b54a19c2b5 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -58,7 +58,15 @@ let
 
   isCross = ghc.isCross or false;
   isGhcjs = ghc.isGhcjs or false;
+  packageDbFlag = if isGhcjs || versionOlder "7.6" ghc.version
+                  then "package-db"
+                  else "package-conf";
+
   nativeGhc = if isCross then ghc.bootPkgs.ghc else ghc;
+  nativeIsCross = nativeGhc.isCross or false;
+  nativePackageDbFlag = if versionOlder "7.6" nativeGhc.version
+                        then "package-db"
+                        else "package-conf";
 
   newCabalFileUrl = "http://hackage.haskell.org/package/${pname}-${version}/revision/${revision}.cabal";
   newCabalFile = fetchurl {
@@ -72,9 +80,6 @@ let
                      main = defaultMain
                    '';
 
-  ghc76xOrLater = isGhcjs || stdenv.lib.versionOlder "7.6" ghc.version;
-  packageDbFlag = if ghc76xOrLater then "package-db" else "package-conf";
-
   hasActiveLibrary = isLibrary && (enableStaticLibraries || enableSharedLibraries || enableLibraryProfiling);
 
   # We cannot enable -j<n> parallelism for libraries because GHC is far more
@@ -126,7 +131,7 @@ let
 
   ghcEnv = ghc.withPackages (p: haskellBuildInputs);
 
-  setupBuilder = if isGhcjs then "${nativeGhc}/bin/ghc" else ghcCommand;
+  setupBuilder = if isCross then "${nativeGhc}/bin/ghc" else ghcCommand;
   setupCommand = "./Setup";
   ghcCommand = if isGhcjs then "ghcjs" else "ghc";
   ghcCommandCaps = toUpper ghcCommand;

From f0b072abaa64b0d3d4f66a7f69b6798ccfdb2f9e Mon Sep 17 00:00:00 2001
From: Eugene Akentyev <ak3ntev@gmail.com>
Date: Sun, 21 Feb 2016 21:34:30 +0300
Subject: [PATCH 36/37] staruml: init at 2.6.0

---
 pkgs/tools/misc/staruml/default.nix | 49 +++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix     |  2 ++
 2 files changed, 51 insertions(+)
 create mode 100644 pkgs/tools/misc/staruml/default.nix

diff --git a/pkgs/tools/misc/staruml/default.nix b/pkgs/tools/misc/staruml/default.nix
new file mode 100644
index 00000000000..4c60e790238
--- /dev/null
+++ b/pkgs/tools/misc/staruml/default.nix
@@ -0,0 +1,49 @@
+{ stdenv, fetchurl, makeWrapper, dpkg, patchelf, gtk2, glib, gdk_pixbuf, alsaLib, nss, nspr, GConf, cups, libgcrypt, dbus, udev }:
+
+stdenv.mkDerivation rec {
+  version = "2.6.0";
+  name = "staruml-${version}";
+
+  src =
+    if stdenv.system == "i686-linux" then fetchurl {
+      url = "http://staruml.io/download/release/v${version}/StarUML-v${version}-32-bit.deb";
+      sha256 = "684d7ce7827a98af5bf17bf68d18f934fd970f13a2112a121b1f1f76d6387849";
+    } else fetchurl {
+      url = "http://staruml.io/download/release/v${version}/StarUML-v${version}-64-bit.deb";
+      sha256 = "36e0bdc1bb57b7d808a007a3fafb1b38662d5b0793424d5ad4f51a3a6a9a636d";
+    };
+
+  buildInputs = [ dpkg ];
+
+  nativeBuildInputs = [ makeWrapper ];
+  
+  unpackPhase = ''
+    mkdir pkg
+    dpkg-deb -x $src pkg
+    sourceRoot=pkg
+  '';
+  
+  installPhase = ''
+    mkdir $out
+    mv opt/staruml $out/bin
+
+    ${patchelf}/bin/patchelf \
+      --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+      $out/bin/StarUML
+    
+    mkdir -p $out/lib
+    
+    ln -s ${stdenv.cc.cc}/lib/libstdc++.so.6 $out/lib/
+    ln -s ${udev}/lib/libudev.so.1 $out/lib/libudev.so.0
+
+    wrapProgram $out/bin/StarUML \
+      --prefix LD_LIBRARY_PATH : $out/lib:${glib}/lib:${gtk2}/lib:${gdk_pixbuf}/lib/:${alsaLib}/lib/:${nss}/lib/:${nspr}/lib/:${GConf}/lib/:${cups}/lib/:${libgcrypt}/lib/:${dbus}/lib/
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A sophisticated software modeler";
+    homepage = http://staruml.io/;
+    license = licenses.unfree;
+    platforms = [ "i686-linux" "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2e016152a5c..476bdb0b9de 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3316,6 +3316,8 @@ let
 
   stricat = callPackage ../tools/security/stricat { };
 
+  staruml = callPackage ../tools/misc/staruml { inherit (gnome) GConf; libgcrypt = libgcrypt_1_5; };
+  
   privoxy = callPackage ../tools/networking/privoxy {
     w3m = w3m-batch;
   };

From 6908e75441f5b34dc923a66a8dfbdde0cb7ed9ec Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Sun, 21 Feb 2016 22:28:04 +0000
Subject: [PATCH 37/37] curl: fixes installation of 7.15

It was trying to install /etc/ssl/cert/ca-certificates.pem

See https://hydra.nixos.org/build/32167398/nixlog/1
---
 pkgs/tools/networking/curl/7.15.nix                |  2 ++
 .../tools/networking/curl/disable-ca-install.patch | 14 ++++++++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 pkgs/tools/networking/curl/disable-ca-install.patch

diff --git a/pkgs/tools/networking/curl/7.15.nix b/pkgs/tools/networking/curl/7.15.nix
index 1e91d6bd088..356c9b4f32d 100644
--- a/pkgs/tools/networking/curl/7.15.nix
+++ b/pkgs/tools/networking/curl/7.15.nix
@@ -20,6 +20,8 @@ stdenv.mkDerivation rec {
     sha256 = "061bgjm6rv0l9804vmm4jvr023l52qvmy9qq4zjv4lgqhlljvhz3";
   };
 
+  patches = [ ./disable-ca-install.patch ];
+
   # Zlib and OpenSSL must be propagated because `libcurl.la' contains
   # "-lz -lssl", which aren't necessary direct build inputs of
   # applications that use Curl.
diff --git a/pkgs/tools/networking/curl/disable-ca-install.patch b/pkgs/tools/networking/curl/disable-ca-install.patch
new file mode 100644
index 00000000000..aedf8ef5c3e
--- /dev/null
+++ b/pkgs/tools/networking/curl/disable-ca-install.patch
@@ -0,0 +1,14 @@
+--- a/lib/Makefile.in
++++ b/lib/Makefile.in
+@@ -106,10 +106,7 @@ else
+ endif
+ 
+ install-data-hook:
+-	@if test -n "@CURL_CA_BUNDLE@"; then \
+-	  $(mkinstalldirs) `dirname $(DESTDIR)@CURL_CA_BUNDLE@`; \
+-	  @INSTALL_DATA@ $(srcdir)/ca-bundle.crt $(DESTDIR)@CURL_CA_BUNDLE@; \
+-        fi
++	echo "install-data-hook disabled"
+ 
+ # this hook is mainly for non-unix systems to build even if configure
+ # isn't run