From a8dd23a2217a6d99fdb8f2e2e99e2213caf22953 Mon Sep 17 00:00:00 2001
From: Michel Kuhlmann <michel@kuhlmanns.info>
Date: Mon, 3 Nov 2014 11:24:47 +0100
Subject: [PATCH 01/48] saga: update from 2.1.2 to 2.1.4 and re-enable build on
 x86_64-linux

---
 pkgs/applications/gis/saga/default.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/gis/saga/default.nix b/pkgs/applications/gis/saga/default.nix
index a990e19dbc3f..bb31b24bf5ef 100644
--- a/pkgs/applications/gis/saga/default.nix
+++ b/pkgs/applications/gis/saga/default.nix
@@ -2,23 +2,22 @@
   libharu, opencv, vigra, postgresql }:
 
 stdenv.mkDerivation rec {
-  name = "saga-2.1.2";
+  name = "saga-2.1.4";
 
   buildInputs = [ gdal wxGTK30 proj libharu opencv vigra postgresql libiodbc lzma jasper ];
 
   enableParallelBuilding = true;
 
   src = fetchurl {
-    url = "http://sourceforge.net/projects/saga-gis/files/SAGA%20-%202.1/SAGA%202.1.2/saga_2.1.2.tar.gz";
-    sha256 = "51885446f717191210c4b13f0c35a1c5194c9d696d4f9b8f594bc1014809b2f5";
+    url = "http://sourceforge.net/projects/saga-gis/files/SAGA%20-%202.1/SAGA%202.1.4/saga_2.1.4.tar.gz";
+    sha256 = "694e4102f592f512c635328c40fdeff33493f74698d9466bb654baf3247e7b76";
   };
 
   meta = {
-    description = "SAGA - System for Automated Geoscientific Analyses";
+    description = "System for Automated Geoscientific Analyses";
     homepage = http://www.saga-gis.org;
     license = stdenv.lib.licenses.gpl2Plus;
     maintainers = [ stdenv.lib.maintainers.michelk ];
-    platforms = with stdenv.lib.platforms; linux;
-    broken = true;
+    platforms = ["x86_64-linux" ];
   };
 }

From fd73e9948d65a27f2f17fac592e6031ab5794a7b Mon Sep 17 00:00:00 2001
From: Ryan Newton <rrnewton@gmail.com>
Date: Mon, 24 Nov 2014 13:58:22 -0500
Subject: [PATCH 02/48] racket: add libreadline to ffi libs - enables xrepl.

---
 pkgs/development/interpreters/racket/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix
index 8c26d1f89ef2..b626c8a1539c 100644
--- a/pkgs/development/interpreters/racket/default.nix
+++ b/pkgs/development/interpreters/racket/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, cairo, file, fontconfig, glib, gtk, freefont_ttf
-, libjpeg, libpng, libtool, makeWrapper, openssl, pango, sqlite, which } :
+, libjpeg, libpng, libtool, makeWrapper, openssl, pango, sqlite, which, readline } :
 
 stdenv.mkDerivation rec {
   pname = "racket";
@@ -13,7 +13,8 @@ stdenv.mkDerivation rec {
 
   # Various Racket executables do runtime searches for these.
   ffiSharedLibs = "${cairo}/lib:${fontconfig}/lib:${glib}/lib:${gtk}/lib:${libjpeg}/lib:"
-                + "${libpng}/lib:${openssl}/lib:${pango}/lib:${sqlite}/lib";
+                + "${libpng}/lib:${openssl}/lib:${pango}/lib:${sqlite}/lib:"
+                + "${readline}/lib";
 
   buildInputs = [ file fontconfig freefont_ttf libtool makeWrapper sqlite which ];
 

From b4aba8c5771ccfa9ab3fa232704b5da0729d69eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 8 Nov 2014 21:20:57 +0100
Subject: [PATCH 03/48] evince-3.12: maintenance update

---
 pkgs/desktops/gnome-3/3.12/core/evince/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/core/evince/default.nix b/pkgs/desktops/gnome-3/3.12/core/evince/default.nix
index 2a585d78f4e5..aaef1d59ed98 100644
--- a/pkgs/desktops/gnome-3/3.12/core/evince/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/evince/default.nix
@@ -6,11 +6,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "evince-3.12.1";
+  name = "evince-3.12.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/evince/3.12/${name}.tar.xz";
-    sha256 = "ef22cc29a7cbe70d2e7ce8c0b5b7ee774187ea69f3ae49a64c6d4a91559ef137";
+    sha256 = "30c243bbfde56338c25a39003b4848143be42157177e2163a368f14139909f7d";
   };
 
   buildInputs = [

From 52b743add43d66b9ddef70366a065c889fd9cf5e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 25 Nov 2014 00:42:22 +0100
Subject: [PATCH 04/48] tzdata: Update to 2014j

---
 pkgs/data/misc/tzdata/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix
index 3b4a4cc74c7e..df3f3ec82246 100644
--- a/pkgs/data/misc/tzdata/default.nix
+++ b/pkgs/data/misc/tzdata/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl }:
 
-let version = "2014i"; in
+let version = "2014j"; in
 
 stdenv.mkDerivation rec {
   name = "tzdata-${version}";
@@ -8,11 +8,11 @@ stdenv.mkDerivation rec {
   srcs =
     [ (fetchurl {
         url = "http://www.iana.org/time-zones/repository/releases/tzdata${version}.tar.gz";
-        sha256 = "0lv1i3ikibf9yn1l3hcy00x5ghwxn87k1myyp1cyr55psayk3wra";
+        sha256 = "038fvj6zf51k6z9sbbxbj87ajaf69l3whal2vwshbm4l0qr71n52";
       })
       (fetchurl {
         url = "http://www.iana.org/time-zones/repository/releases/tzcode${version}.tar.gz";
-        sha256 = "10s7x24lh2vm3magl7dq2xs9pw47hhyaq6xpi6c4aiqdzdsi0nb2";
+        sha256 = "1qpd12imy7q5hb5fhk48mfw65s0xlrkmms0zr2gk0mj88qjn3m3z";
       })
     ];
 

From ca6d86b7fb10d656b12c5d3e7a5e8bb3936f79e5 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Tue, 25 Nov 2014 00:56:22 +0100
Subject: [PATCH 05/48] cargoSnapshot: Update from 2014-09-19 -> 2014-11-22

---
 pkgs/development/tools/build-managers/cargo/common.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/build-managers/cargo/common.nix b/pkgs/development/tools/build-managers/cargo/common.nix
index e60efc18d29d..447aed275700 100644
--- a/pkgs/development/tools/build-managers/cargo/common.nix
+++ b/pkgs/development/tools/build-managers/cargo/common.nix
@@ -14,16 +14,16 @@ rec {
     else throw "no snapshot to boostrap for this platform (missing platform url suffix)";
 
   snapshotHash = if stdenv.system == "i686-linux"
-    then "c92895421e6fa170dbd713e74334b8c3cf22b817"
+    then "3204c8a38721199f69d2971db887d1dc71a63825"
     else if stdenv.system == "x86_64-linux"
-    then "66ee4126f9e4820cd82e78181931f8ea365904de"
+    then "39ca0d02eac184bc764ff9c1f645ca361715c5c2"
     else if stdenv.system == "i686-darwin"
-    then "e2364b1f1ece338b9fc4c308c472fc2413bff04e"
+    then "ebc1836424c4b3ba49f9adef271c50d2a8e134c0"
     else if stdenv.system == "x86_64-darwin"
-    then "09f92f06ab4f048acf71d83dc0426ff1509779a9"
+    then "a2045e95984b65eab4a704152566f8ab9a3be518"
     else throw "no snapshot for platform ${stdenv.system}";
 
-  snapshotDate = "2014-09-19";
+  snapshotDate = "2014-11-22";
   snapshotName = "cargo-nightly-${platform}.tar.gz";
 
   snapshot = stdenv.mkDerivation {

From 83c2fcada472fd8594fd51a4677fb2c60b1c26e8 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 25 Nov 2014 02:01:22 +0100
Subject: [PATCH 06/48] my-env: Provide explicit store path for "rm".

If you do not provide any dependencies which don't propagate coreutils,
you'll get "rm: No such file or directory". Like for example by using
this:

nix-build -E '(import <nixpkgs> {}).myEnvFun {
    name = "mybrokentest";
    buildInputs = [];
}'

Thanks to "ewemoa" from the #nixos IRC channel for spotting this.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/misc/my-env/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/misc/my-env/default.nix b/pkgs/misc/my-env/default.nix
index 1c0dc0cbfe9b..4b0336b30da9 100644
--- a/pkgs/misc/my-env/default.nix
+++ b/pkgs/misc/my-env/default.nix
@@ -131,7 +131,7 @@ mkDerivation {
         echo "\$tmp/script";
         source "\$tmp/script";
       fi
-      rm -fr "\$tmp"
+      ${pkgs.coreutils}/bin/rm -fr "\$tmp"
       ${extraCmds}
 
       nix_cleanup() {

From 140e1de0ec3eea96cda68d2ce1724d55434dfe94 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 24 Nov 2014 20:50:17 -0500
Subject: [PATCH 07/48] strongswan: dont patchelf

fixes #5045 ('fixes')
---
 pkgs/tools/networking/strongswan/default.nix | 2 ++
 pkgs/top-level/all-packages.nix              | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix
index e840d0507f6c..426396367024 100644
--- a/pkgs/tools/networking/strongswan/default.nix
+++ b/pkgs/tools/networking/strongswan/default.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "05cjjd7gg65bl6fswj2r2i13nn1nk4x86s06y75gwfdvnlrsnlga";
   };
 
+  dontPatchELF = true;
+
   buildInputs = [ gmp pkgconfig ];
 
   configureFlags = [ "--enable-swanctl" "--enable-cmd" ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 54483719f111..01c364ca27c0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2437,7 +2437,7 @@ let
 
   stunnel = callPackage ../tools/networking/stunnel { };
 
-  strongswan = callPackage ../tools/networking/strongswan { stdenv = clangStdenv; };
+  strongswan = callPackage ../tools/networking/strongswan { };
 
   su = shadow.su;
 

From d21dc419d3b3ceff7b00b5a0ba8ec8bed882daa7 Mon Sep 17 00:00:00 2001
From: Jeremy Huffman <jeremy@jeremyhuffman.com>
Date: Mon, 24 Nov 2014 20:55:14 -0500
Subject: [PATCH 08/48] haskell-distributed-process-p2p add from Hackage

---
 .../distributed-process-p2p/default.nix       | 23 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/distributed-process-p2p/default.nix

diff --git a/pkgs/development/libraries/haskell/distributed-process-p2p/default.nix b/pkgs/development/libraries/haskell/distributed-process-p2p/default.nix
new file mode 100644
index 000000000000..165b09d13bf6
--- /dev/null
+++ b/pkgs/development/libraries/haskell/distributed-process-p2p/default.nix
@@ -0,0 +1,23 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, binary, distributedProcess, mtl, network, networkTransport
+, networkTransportTcp
+}:
+
+cabal.mkDerivation (self: {
+  pname = "distributed-process-p2p";
+  version = "0.1.3.0";
+  sha256 = "00lvi2x1s8r7lwfvsjnvzc9iwdk4ip8svw85p2h3ra4iqbzj70l2";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    binary distributedProcess mtl network networkTransport
+    networkTransportTcp
+  ];
+  meta = {
+    homepage = "https://bitbucket.org/dpwiz/distributed-process-p2p/";
+    description = "Peer-to-peer node discovery for Cloud Haskell";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 6d54c2e8b1c7..1252b54f0ebd 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -678,6 +678,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   distributedProcess = callPackage ../development/libraries/haskell/distributed-process {};
 
+  distributedProcessP2p = callPackage ../development/libraries/haskell/distributed-process-p2p {};
+
   distributedProcessPlatform = callPackage ../development/libraries/haskell/distributed-process-platform {};
 
   distributive = callPackage ../development/libraries/haskell/distributive {};

From dbe6c1a71f974f715d4bea62f95cd9f3d5b2c605 Mon Sep 17 00:00:00 2001
From: Tim Dysinger <tim@dysinger.net>
Date: Tue, 25 Nov 2014 08:11:32 +0100
Subject: [PATCH 09/48] Upgrade Purescript to 0.6.1.2

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

diff --git a/pkgs/development/libraries/haskell/purescript/default.nix b/pkgs/development/libraries/haskell/purescript/default.nix
index a1d999d9a86d..3a521ea121b8 100644
--- a/pkgs/development/libraries/haskell/purescript/default.nix
+++ b/pkgs/development/libraries/haskell/purescript/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "purescript";
-  version = "0.6.1.1";
-  sha256 = "1wzaimcdddwivlzhb7m4888wwa58al2rccgdnhzng70r0r9qvpng";
+  version = "0.6.1.2";
+  sha256 = "0j1fmfcal2m75ji937xxl9cizzpw6v4pr31hxfjmal8fdcf677ma";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From 1fdefd5562be9f8b726e20a8f0bfab46cc7ae024 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 25 Nov 2014 12:59:56 +0100
Subject: [PATCH 10/48] Revert "protobuf: Clean up and update to version
 2.6.1."

This reverts commit 18b306b0414c13b5584c2325e9a01e065d715498. Protobuf
releases are generally not very backwards compatible and likely to
break lots of stuff. E.g.

  http://hydra.nixos.org/build/17535340
  http://hydra.nixos.org/build/17535640
  http://hydra.nixos.org/build/17536998
  http://hydra.nixos.org/build/17536170

See also b851e970daee1cd4a6b6977c9f67ed16cefc1229.
---
 .../libraries/protobuf/default.nix            | 39 +++++++------------
 1 file changed, 13 insertions(+), 26 deletions(-)

diff --git a/pkgs/development/libraries/protobuf/default.nix b/pkgs/development/libraries/protobuf/default.nix
index 0f52999bc0ee..bba8481780a5 100644
--- a/pkgs/development/libraries/protobuf/default.nix
+++ b/pkgs/development/libraries/protobuf/default.nix
@@ -1,41 +1,28 @@
-{ stdenv, fetchFromGitHub, autoconf, automake, libtool, zlib, gtest }:
+{ fetchurl, stdenv, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "protobuf-${version}";
-  version = "2.6.1";
+  name = "protobuf-2.5.0";
 
-  src = fetchFromGitHub {
-    owner = "google";
-    repo = "protobuf";
-    rev = version;
-    sha256 = "03df8zvx2sry3jz2x4pi3l32qyfqa7w8kj8jdbz30nzy0h7aa070";
+  src = fetchurl {
+    url = "http://protobuf.googlecode.com/files/${name}.tar.bz2";
+    sha256 = "0xxn9gxhvsgzz2sgmihzf6pf75clr05mqj6218camwrwajpcbgqk";
   };
 
-  postPatch = ''
-    sed -i -e '/gtest/d' Makefile.am
-    sed -i \
-      -e 's!\$(top_\(build\|src\)dir)/gtest!${gtest}!g' \
-      -e 's/\(libgtest[^.]*\.\)la/\1a/g' \
-      src/Makefile.am
-  '';
-
-  buildInputs = [ zlib autoconf automake libtool gtest ];
-
-  preConfigure = "autoreconf -vfi";
+  buildInputs = [ zlib ];
 
   doCheck = true;
 
   meta = {
     description = "Protocol Buffers - Google's data interchange format";
 
-    longDescription = ''
-      Protocol Buffers are a way of encoding structured data in an
-      efficient yet extensible format. Google uses Protocol Buffers for
-      almost all of its internal RPC protocols and file formats.
-    '';
+    longDescription =
+      '' Protocol Buffers are a way of encoding structured data in an
+         efficient yet extensible format.  Google uses Protocol Buffers for
+         almost all of its internal RPC protocols and file formats.
+      '';
 
-    license = stdenv.lib.licenses.bsd3;
+    license = "mBSD";
 
-    homepage = "https://developers.google.com/protocol-buffers/";
+    homepage = http://code.google.com/p/protobuf/;
   };
 }

From 518173ac24908eb21573a75765616833f6ec42ad Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 25 Nov 2014 10:08:28 +0100
Subject: [PATCH 11/48] chromium: Shorten line length of name attribute.

No feature change, I'm just very nitpicky if it comes to lines with more
than 79 characters.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/applications/networking/browsers/chromium/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index f122e753b5c7..aeb56d88eabe 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -59,8 +59,10 @@ let
     categories = "Network;WebBrowser";
   };
 
+  suffix = if channel != "stable" then "-" + channel else "";
+
 in stdenv.mkDerivation {
-  name = "chromium${if channel != "stable" then "-" + channel else ""}-${chromium.browser.version}";
+  name = "chromium${suffix}-${chromium.browser.version}";
 
   buildInputs = [ makeWrapper ];
 

From 690a845de93a49e85480ad5fae492fa14658ce85 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 25 Nov 2014 13:39:16 +0100
Subject: [PATCH 12/48] chromium: Use Nix expressions for plugin settings.

We now create Nix expressions within the plugin output path(s) which
then will be imported and incorporated into the wrapper. This makes it
easier for other plugins to provide configuration settings to the main
Chromium wrapper.

Of course, in order to allow for external plugins we need to allow
passing a list of plugins to the Chromium derivation, but right now we
keep it internal and only use it for things such as NaCl (as soon as we
support it, of course).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../networking/browsers/chromium/default.nix  |  9 ++++--
 .../networking/browsers/chromium/plugins.nix  | 31 ++++++++++++-------
 2 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index aeb56d88eabe..3e35b704120c 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -69,14 +69,17 @@ in stdenv.mkDerivation {
   buildCommand = let
     browserBinary = "${chromium.browser}/libexec/chromium/chromium";
     sandboxBinary = "${chromium.sandbox}/bin/chromium-sandbox";
-  in ''
+    mkEnvVar = key: val: "--set '${key}' '${val}'";
+    envVars = chromium.plugins.settings.envVars or {};
+    flags = chromium.plugins.settings.flags or [];
+  in with stdenv.lib; ''
     mkdir -p "$out/bin" "$out/share/applications"
 
     ln -s "${chromium.browser}/share" "$out/share"
     makeWrapper "${browserBinary}" "$out/bin/chromium" \
       --set CHROMIUM_SANDBOX_BINARY_PATH "${sandboxBinary}" \
-      --run "export ${chromium.plugins.envVarsEnabled}" \
-      --add-flags "${chromium.plugins.flagsEnabled}"
+      ${concatStrings (mapAttrsToList mkEnvVar envVars)} \
+      --add-flags "${concatStringsSep " " flags}"
 
     ln -s "$out/bin/chromium" "$out/bin/chromium-browser"
     ln -s "${chromium.browser}/share/icons" "$out/share/icons"
diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix
index 8098ec747227..55e0cc4caa21 100644
--- a/pkgs/applications/networking/browsers/chromium/plugins.nix
+++ b/pkgs/applications/networking/browsers/chromium/plugins.nix
@@ -62,29 +62,38 @@ let
       install -vD PepperFlash/libpepflashplayer.so \
         "$flash/lib/libpepflashplayer.so"
       mkdir -p "$flash/nix-support"
-      echo "--ppapi-flash-path='$flash/lib/libpepflashplayer.so'" \
-           "--ppapi-flash-version=$flashVersion" \
-           > "$flash/nix-support/chromium-flags"
+      cat > "$flash/nix-support/chromium-plugin.nix" <<NIXOUT
+        { flags = [
+            "--ppapi-flash-path='$flash/lib/libpepflashplayer.so'"
+            "--ppapi-flash-version=$flashVersion"
+          ];
+        }
+      NIXOUT
 
       install -vD libwidevinecdm.so \
         "$widevine/lib/libwidevinecdm.so"
       install -vD libwidevinecdmadapter.so \
         "$widevine/lib/libwidevinecdmadapter.so"
       mkdir -p "$widevine/nix-support"
-      echo "--register-pepper-plugins='${wvModule}${wvInfo}'" \
-        > "$widevine/nix-support/chromium-flags"
-      echo "NIX_CHROMIUM_PLUGIN_PATH_WIDEVINE=$widevine/lib" \
-        > "$widevine/nix-support/chromium-env-vars"
+      cat > "$widevine/nix-support/chromium-plugin.nix" <<NIXOUT
+        { flags = [ "--register-pepper-plugins='${wvModule}${wvInfo}'" ];
+          envVars.NIX_CHROMIUM_PLUGIN_PATH_WIDEVINE = "$widevine/lib";
+        }
+      NIXOUT
     '';
 
     passthru = let
       enabledPlugins = optional enablePepperFlash plugins.flash
                     ++ optional enableWideVine    plugins.widevine;
-      getFlags = plugin: "$(< ${plugin}/nix-support/chromium-flags)";
-      getEnvVars = plugin: "$(< ${plugin}/nix-support/chromium-env-vars)";
+      getNix = plugin: import "${plugin}/nix-support/chromium-plugin.nix";
+      mergeAttrsets = let
+        f = v: if all isAttrs v then mergeAttrsets v
+          else if all isList  v then concatLists   v
+          else if tail v == []  then head          v
+          else head (tail v);
+      in fold (l: r: zipAttrsWith (_: f) [ l r ]) {};
     in {
-      flagsEnabled = concatStringsSep " " (map getFlags enabledPlugins);
-      envVarsEnabled = concatStringsSep " " (map getEnvVars enabledPlugins);
+      settings = mergeAttrsets (map getNix enabledPlugins);
     };
   };
 in plugins

From 7d9fb8625e1e2ce6732c7b4afe1c6fdbe03e35ad Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 25 Nov 2014 13:44:20 +0100
Subject: [PATCH 13/48] chromium: Allow enableWideVine in nixpkgs.config.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/top-level/all-packages.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 01c364ca27c0..2fe22bc9d395 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9155,6 +9155,7 @@ let
     channel = "stable";
     pulseSupport = config.pulseaudio or true;
     enablePepperFlash = config.chromium.enablePepperFlash or false;
+    enableWideVine = config.chromium.enableWideVine or false;
     hiDPISupport = config.chromium.hiDPISupport or false;
   };
 

From 6f683e4ba30d85c2665b83da4a578fc577a0047c Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 25 Nov 2014 14:05:21 +0100
Subject: [PATCH 14/48] my-env: Use sed to substitute $initialPath.

initialPath is now added to the top of the modified setup.sh. It's not
very nice altogether to patch setup.sh in this way, as it is prone to
break on setup.sh changes, but it should (hopefully finally, but
unfortunately only temporarily) fix the issue ewemoa (in #nixos) had
with myEnvFun.

In the long term, if people want to have roughly similar functionality,
nix-shell provides a better way for that, so maybe we might either
remove myEnvFun or replace it with a smaller implementation using
nix-shell.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/misc/my-env/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/misc/my-env/default.nix b/pkgs/misc/my-env/default.nix
index 4b0336b30da9..7d37576e4cdb 100644
--- a/pkgs/misc/my-env/default.nix
+++ b/pkgs/misc/my-env/default.nix
@@ -72,20 +72,21 @@ mkDerivation {
   phases = [ "buildPhase" "fixupPhase" ];
   setupNew = substituteAll {
     src = ../../stdenv/generic/setup.sh;
-    initialPath= (import ../../stdenv/common-path.nix) { inherit pkgs; };
     inherit gcc;
   };
 
-  buildPhase = ''
+  buildPhase = let
+    initialPath = import ../../stdenv/common-path.nix { inherit pkgs; };
+  in ''
     set -x
     mkdir -p "$out/dev-envs" "$out/nix-support" "$out/bin"
     s="$out/nix-support/setup-new-modified"
-    cp "$setupNew" "$s"
     # shut some warning up.., do not use set -e
     sed -e 's@set -e@@' \
         -e 's@assertEnvExists\s\+NIX_STORE@:@' \
         -e 's@trap.*@@' \
-        -i "$s"
+        -e '1i initialPath="${toString initialPath}"' \
+        "$setupNew" > "$s"
     cat >> "$out/dev-envs/''${name/env-/}" << EOF
       nativeBuildInputs="$nativeBuildInputs"
       propagatedBuildInputs="$propagatedBuildInputs2"

From 28b29f173dda5e99ecd70a0988837ba8c86e605e Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 25 Nov 2014 14:14:22 +0100
Subject: [PATCH 15/48] chromium: Switch to using bundled protobuf.

This is a response to 1fdefd5562be9f8b726e20a8f0bfab46cc7ae024.

We are already using bundled protobuf for the beta and dev channels and
it also breaks regularly with about every new Chromium release, so let's
use bundled protobuf for all channels now.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/applications/networking/browsers/chromium/common.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 49ddaae04f96..cfdddf288566 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -69,7 +69,7 @@ let
     use_system_xdg_utils = true;
     use_system_yasm = true;
     use_system_zlib = false;
-    use_system_protobuf = versionOlder source.version "40.0.0.0";
+    use_system_protobuf = false; # needs newer protobuf
 
     use_system_harfbuzz = false;
     use_system_icu = false; # Doesn't support ICU 52 yet.

From 159bdd12192b052ddb39e3c82dd073695dff3581 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@gmail.com>
Date: Tue, 25 Nov 2014 21:39:46 +0800
Subject: [PATCH 16/48] performous: new package

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

diff --git a/pkgs/games/performous/default.nix b/pkgs/games/performous/default.nix
new file mode 100644
index 000000000000..ff4f370f04a6
--- /dev/null
+++ b/pkgs/games/performous/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, gettext
+, glibmm, libxmlxx, pango, librsvg
+, SDL2, glew, boost, libav, portaudio
+}:
+
+stdenv.mkDerivation {
+  name = "performous-1.0";
+
+  meta = with stdenv.lib; {
+    description = "Karaoke, band and dancing game";
+    homepage    = "http://performous.org/";
+    license     = licenses.gpl2Plus;
+    platforms   = platforms.linux;
+    maintainers = with maintainers; [ iyzsong ];
+  };
+
+  src = fetchFromGitHub {
+    owner = "performous";
+    repo = "performous";
+    rev = "1.0";
+    sha256 = "1wgydwnhadrjkj3mjzrhppfmphrxnqfljs361206imirmvs7s15l";
+  };
+
+  nativeBuildInputs = [ cmake pkgconfig gettext ];
+
+  buildInputs = [
+    glibmm libxmlxx pango librsvg
+    SDL2 glew boost libav portaudio
+  ];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9e3cd16fe6b1..05e9aef05cef 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11493,6 +11493,8 @@ let
 
   openxcom = callPackage ../games/openxcom { };
 
+  performous = callPackage ../games/performous { };
+
   pingus = callPackage ../games/pingus {};
 
   pioneers = callPackage ../games/pioneers { };

From 8a6914e65941684788144372fea351c3f913efd3 Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Tue, 25 Nov 2014 14:12:36 +0000
Subject: [PATCH 17/48] haskellPackages.snapErrorCollector: New expression

---
 .../haskell/snap-error-collector/default.nix  | 22 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/snap-error-collector/default.nix

diff --git a/pkgs/development/libraries/haskell/snap-error-collector/default.nix b/pkgs/development/libraries/haskell/snap-error-collector/default.nix
new file mode 100644
index 000000000000..fae4082d2242
--- /dev/null
+++ b/pkgs/development/libraries/haskell/snap-error-collector/default.nix
@@ -0,0 +1,22 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, async, MonadCatchIOTransformers, monadLoops, snap, stm
+, time, transformers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "snap-error-collector";
+  version = "1.0.0";
+  sha256 = "1rywfbc489kgbcm7svgrim3zihma5j9vy6cwhlc6dgvsb1rb37j2";
+  buildDepends = [
+    async MonadCatchIOTransformers monadLoops snap stm time
+    transformers
+  ];
+  meta = {
+    homepage = "http://github.com/ocharles/snap-error-collector";
+    description = "Collect errors in batches and dispatch them";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 1252b54f0ebd..497374e2ce75 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2238,6 +2238,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   snapletAcidState = callPackage ../development/libraries/haskell/snaplet-acid-state {};
 
+  snapErrorCollector = callPackage ../development/libraries/haskell/snap-error-collector {};
+
   snapletPostgresqlSimple = callPackage ../development/libraries/haskell/snaplet-postgresql-simple {};
 
   snapletRedis = callPackage ../development/libraries/haskell/snaplet-redis {};

From 4f9111e91f180165aa43cc9dafb7f95b79686215 Mon Sep 17 00:00:00 2001
From: Igor Pashev <pashev.igor@gmail.com>
Date: Sat, 22 Nov 2014 19:22:21 +0100
Subject: [PATCH 18/48] strongSwan needs python for building (Closes #4940)

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

diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix
index 426396367024..13941ae64424 100644
--- a/pkgs/tools/networking/strongswan/default.nix
+++ b/pkgs/tools/networking/strongswan/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gmp, pkgconfig }:
+{ stdenv, fetchurl, gmp, pkgconfig, python }:
 
 stdenv.mkDerivation rec {
   name = "strongswan-5.2.1";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   dontPatchELF = true;
 
-  buildInputs = [ gmp pkgconfig ];
+  buildInputs = [ gmp pkgconfig python ];
 
   configureFlags = [ "--enable-swanctl" "--enable-cmd" ];
 

From 4c33004e1f962d44a5f3f1f4efb057f385b3b764 Mon Sep 17 00:00:00 2001
From: Igor Pashev <pashev.igor@gmail.com>
Date: Sat, 22 Nov 2014 19:27:23 +0100
Subject: [PATCH 19/48] Added strongSwan service

---
 nixos/modules/module-list.nix                 |   1 +
 .../services/networking/strongswan.nix        | 130 ++++++++++++++++++
 2 files changed, 131 insertions(+)
 create mode 100644 nixos/modules/services/networking/strongswan.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 3965dc3e53ef..85afcb824fb7 100755
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -274,6 +274,7 @@
   ./services/networking/spiped.nix
   ./services/networking/ssh/lshd.nix
   ./services/networking/ssh/sshd.nix
+  ./services/networking/strongswan.nix
   ./services/networking/supybot.nix
   ./services/networking/syncthing.nix
   ./services/networking/tcpcrypt.nix
diff --git a/nixos/modules/services/networking/strongswan.nix b/nixos/modules/services/networking/strongswan.nix
new file mode 100644
index 000000000000..4ceb8254b1ec
--- /dev/null
+++ b/nixos/modules/services/networking/strongswan.nix
@@ -0,0 +1,130 @@
+{ config, lib, pkgs, ... }:
+
+let
+
+  inherit (builtins) toFile;
+  inherit (lib) concatMapStringsSep concatStringsSep mapAttrsToList
+                mkIf mkEnableOption mkOption types;
+
+  cfg = config.services.strongswan;
+
+  ipsecSecrets = secrets: toFile "ipsec.secrets" (
+    concatMapStringsSep "\n" (f: "include ${f}") secrets
+  );
+
+  ipsecConf = {setup, connections, ca}:
+    let
+      # https://wiki.strongswan.org/projects/strongswan/wiki/IpsecConf
+      makeSections = type: sections: concatStringsSep "\n\n" (
+        mapAttrsToList (sec: attrs:
+          "${type} ${sec}\n" +
+            (concatStringsSep "\n" ( mapAttrsToList (k: v: "  ${k}=${v}") attrs ))
+        ) sections
+      );
+      setupConf       = makeSections "config" { inherit setup; };
+      connectionsConf = makeSections "conn" connections;
+      caConf          = makeSections "ca" ca;
+
+    in
+    builtins.toFile "ipsec.conf" ''
+      ${setupConf}
+      ${connectionsConf}
+      ${caConf}
+    '';
+
+  strongswanConf = {setup, connections, ca, secrets}: toFile "strongswan.conf" ''
+    charon {
+      plugins {
+        stroke {
+          secrets_file = ${ipsecSecrets secrets}
+        }
+      }
+    }
+
+    starter {
+      config_file = ${ipsecConf { inherit setup connections ca; }}
+    }
+  '';
+
+in
+{
+  options.services.strongswan = {
+    enable = mkEnableOption "strongSwan";
+
+    secrets = mkOption {
+      type = types.listOf types.path;
+      default = [];
+      example = [ "/run/keys/ipsec-foo.secret" ];
+      description = ''
+        A list of paths to IPSec secret files. These
+        files will be included into the main ipsec.secrets file
+        with the `include' directive. It is safer if these paths are absolute.
+      '';
+    };
+
+    setup = mkOption {
+      type = types.attrsOf types.str;
+      default = {};
+      example = { cachecrls = "yes"; strictcrlpolicy = "yes"; };
+      description = ''
+        A set of options for the `config setup' section of
+        the `ipsec.conf' file. Defines general configuration parameters.
+      '';
+    };
+
+    connections = mkOption {
+      type = types.attrsOf (types.attrsOf types.str);
+      default = {};
+      example = {
+        "%default" = {
+          keyexchange = "ikev2";
+          keyingtries = "1";
+        };
+        roadwarrior = {
+          auto       = "add";
+          leftcert   = "/run/keys/moonCert.pem";
+          leftid     = "@moon.strongswan.org";
+          leftsubnet = "10.1.0.0/16";
+          right      = "%any";
+        };
+      };
+      description = ''
+        A set of connections and their options for the `conn xxx'
+        sections of the `ipsec.conf' file.
+      '';
+    };
+
+    ca = mkOption {
+      type = types.attrsOf (types.attrsOf types.str);
+      default = {};
+      example = {
+        strongswan = {
+          auto   = "add";
+          cacert = "/run/keys/strongswanCert.pem";
+          crluri = "http://crl2.strongswan.org/strongswan.crl";
+        };
+      };
+      description = ''
+        A set of CAs (certification authorities) and their options
+        for the `ca xxx' sections of the `ipsec.conf' file.
+      '';
+    };
+  };
+
+  config = with cfg; mkIf enable {
+    systemd.services.strongswan = {
+      description = "strongSwan IPSec service";
+      wantedBy = [ "multi-user.target" ];
+      path = with pkgs; [ kmod ]; # XXX Linux
+      wants = [ "keys.target" ];
+      after = [ "network.target" "keys.target" ];
+      environment = {
+        STRONGSWAN_CONF = strongswanConf { inherit setup connections ca secrets; };
+      };
+      serviceConfig = {
+        ExecStart  = "${pkgs.strongswan}/sbin/ipsec start --nofork";
+      };
+    };
+  };
+}
+

From d250ca4e317c8d8ca1a0ec5bfe84eb7c828b6ecc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Tue, 25 Nov 2014 15:33:22 +0100
Subject: [PATCH 20/48] openimageio: update from 1.4.14 to 1.4.15

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

diff --git a/pkgs/applications/graphics/openimageio/default.nix b/pkgs/applications/graphics/openimageio/default.nix
index b0abecc7caee..473db68dc274 100644
--- a/pkgs/applications/graphics/openimageio/default.nix
+++ b/pkgs/applications/graphics/openimageio/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "oiio-${version}";
-  version = "1.4.14";
+  version = "1.4.15";
 
   src = fetchurl {
     url = "https://github.com/OpenImageIO/oiio/archive/Release-${version}.zip";
-    sha256 = "1wn51d7044wyh25bwykxiw8rysb0v0sy2cfj6pyk5fg6rsr9cx51";
+    sha256 = "1fc5v3qmrzf9qx765fd15r2dc3ccrz4xf4f9q4cwsrspmaxqyqzs";
   };
 
   buildInputs = [

From dd2dedafa337888bd85b3df6bbcfb26ab7398c56 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 25 Nov 2014 16:01:27 +0100
Subject: [PATCH 21/48] Style fixes

---
 .../services/networking/strongswan.nix        | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/nixos/modules/services/networking/strongswan.nix b/nixos/modules/services/networking/strongswan.nix
index 4ceb8254b1ec..19ad635d07e7 100644
--- a/nixos/modules/services/networking/strongswan.nix
+++ b/nixos/modules/services/networking/strongswan.nix
@@ -57,8 +57,9 @@ in
       example = [ "/run/keys/ipsec-foo.secret" ];
       description = ''
         A list of paths to IPSec secret files. These
-        files will be included into the main ipsec.secrets file
-        with the `include' directive. It is safer if these paths are absolute.
+        files will be included into the main ipsec.secrets file with
+        the <literal>include</literal> directive. It is safer if these
+        paths are absolute.
       '';
     };
 
@@ -67,8 +68,9 @@ in
       default = {};
       example = { cachecrls = "yes"; strictcrlpolicy = "yes"; };
       description = ''
-        A set of options for the `config setup' section of
-        the `ipsec.conf' file. Defines general configuration parameters.
+        A set of options for the ‘config setup’ section of the
+        <filename>ipsec.conf</filename> file. Defines general
+        configuration parameters.
       '';
     };
 
@@ -89,8 +91,8 @@ in
         };
       };
       description = ''
-        A set of connections and their options for the `conn xxx'
-        sections of the `ipsec.conf' file.
+        A set of connections and their options for the ‘conn xxx’
+        sections of the <filename>ipsec.conf</filename> file.
       '';
     };
 
@@ -105,15 +107,16 @@ in
         };
       };
       description = ''
-        A set of CAs (certification authorities) and their options
-        for the `ca xxx' sections of the `ipsec.conf' file.
+        A set of CAs (certification authorities) and their options for
+        the ‘ca xxx’ sections of the <filename>ipsec.conf</filename>
+        file.
       '';
     };
   };
 
   config = with cfg; mkIf enable {
     systemd.services.strongswan = {
-      description = "strongSwan IPSec service";
+      description = "strongSwan IPSec Service";
       wantedBy = [ "multi-user.target" ];
       path = with pkgs; [ kmod ]; # XXX Linux
       wants = [ "keys.target" ];

From 1abc3e01550a4c1119d9284a09fe9c04d43ba53f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 25 Nov 2014 16:28:55 +0100
Subject: [PATCH 22/48] firefox-bin: Fix meta.license

---
 .../applications/networking/browsers/firefox-bin/default.nix | 5 ++---
 .../networking/mailreaders/thunderbird-bin/default.nix       | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix
index 7e48eb83653d..3f85467fe315 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix
@@ -151,11 +151,10 @@ stdenv.mkDerivation {
     '';
 
   meta = with stdenv.lib; {
-    description = "Mozilla Firefox, free web browser";
+    description = "Mozilla Firefox, free web browser (binary package)";
     homepage = http://www.mozilla.org/firefox/;
     license = {
-      shortName = "unfree"; # not sure
-      fullName = "unfree";
+      free = false;
       url = http://www.mozilla.org/en-US/foundation/trademarks/policy/;
     };
     platforms = platforms.linux;
diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
index 41a24dc8a9f7..55e5820a5d2b 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
@@ -141,11 +141,10 @@ stdenv.mkDerivation {
     '';
 
   meta = with stdenv.lib; {
-    description = "Mozilla Thunderbird, a full-featured email client";
+    description = "Mozilla Thunderbird, a full-featured email client (binary package)";
     homepage = http://www.mozilla.org/thunderbird/;
     license = {
-      shortName = "unfree"; # not sure
-      fullName = "unfree";
+      free = false;
       url = http://www.mozilla.org/en-US/foundation/trademarks/policy/;
     };
     maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];

From a4beb6a2b65881849a858ba4ea42bc5763712df2 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Tue, 25 Nov 2014 16:30:21 +0100
Subject: [PATCH 23/48] flashplayer: Update from 11.2.202.418 -> 11.2.202.424

---
 .../browsers/mozilla-plugins/flashplayer-11/default.nix     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
index 656a639b2c35..c742f414cd12 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
@@ -36,7 +36,7 @@
 
 let
   # -> http://get.adobe.com/flashplayer/
-  version = "11.2.202.418";
+  version = "11.2.202.424";
 
   src =
     if stdenv.system == "x86_64-linux" then
@@ -47,7 +47,7 @@ let
       else rec {
         inherit version;
         url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.x86_64.tar.gz";
-        sha256 = "0c7iid6apab99axrhl509hycbc4yc55k8xrh0pvr005q5jlmx99n";
+        sha256 = "1nkk77lbvvq9x17rlygwlkprq2pgnci5riwxvvriknkqr277dhz8";
       }
     else if stdenv.system == "i686-linux" then
       if debug then
@@ -60,7 +60,7 @@ let
       else rec {
         inherit version;
         url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.i386.tar.gz";
-        sha256 = "17mpjvkvvb7wwmyvwz93w7q4lvjrpma1f9lcf83i927jqpzg8x73";
+        sha256 = "1zwlzc7z6q8vr5hjzx6jywjcx9r0g9jxz141hlf6lqzicf4x6qan";
       }
     else throw "Flash Player is not supported on this platform";
 

From 60e661074dc88ed43ffe56c8952c6740d5c67601 Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Tue, 25 Nov 2014 16:10:04 +0000
Subject: [PATCH 24/48] haskellPackages.ekgBosun: New expression

---
 pkgs/development/libraries/haskell/ekg-bosun/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/ekg-bosun/default.nix b/pkgs/development/libraries/haskell/ekg-bosun/default.nix
index 44a810d90393..23876662f2ae 100644
--- a/pkgs/development/libraries/haskell/ekg-bosun/default.nix
+++ b/pkgs/development/libraries/haskell/ekg-bosun/default.nix
@@ -6,13 +6,12 @@
 
 cabal.mkDerivation (self: {
   pname = "ekg-bosun";
-  version = "1.0.0";
-  sha256 = "0r7ri2mfqhxypjm96s03d00b3fh28mw79wkj2cbhk4w23v2rhdv0";
+  version = "1.0.2";
+  sha256 = "0q32yvl5j59s22v357j8vx0i3b5cd0gygh7gyibym5ka5d5xd82m";
   buildDepends = [
     aeson ekgCore httpClient lens network networkUri text time
     unorderedContainers vector wreq
   ];
-  jailbreak = true;
   meta = {
     homepage = "http://github.com/ocharles/ekg-bosun";
     description = "Send ekg metrics to a Bosun instance";

From 880f6a517e0d7c8a41b2adfc4a6bc684819670e7 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 25 Nov 2014 18:15:31 +0100
Subject: [PATCH 25/48] bmon: update from 3.5 to 3.6

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

diff --git a/pkgs/tools/misc/bmon/default.nix b/pkgs/tools/misc/bmon/default.nix
index 4a1a272cc0fe..1a24ba700513 100644
--- a/pkgs/tools/misc/bmon/default.nix
+++ b/pkgs/tools/misc/bmon/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "bmon-${version}";
-  version = "3.5";
+  version = "3.6";
 
   src = fetchFromGitHub {
     owner = "tgraf";
     repo = "bmon";
     rev = "v${version}";
-    sha256 = "0k6cwprwnrnilbs2fgkx7z9mg6rr11wf6djq6pjfc7fjn2fjvybi";
+    sha256 = "16qwazays2j448kmfckv6wvh4rhmhc9q4vp1s75hm9z02cmhvk8q";
   };
 
   buildInputs = [ autoconf automake pkgconfig ncurses confuse libnl ];

From 10c9196c0f0186ca303d4315267c4b938e07a301 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 25 Nov 2014 18:17:08 +0100
Subject: [PATCH 26/48] parallel: update from 20141022 to 20141122

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

diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix
index 5e4a6fb4d1b3..61745c8bf490 100644
--- a/pkgs/tools/misc/parallel/default.nix
+++ b/pkgs/tools/misc/parallel/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, perl }:
 
 stdenv.mkDerivation rec {
-  name = "parallel-20141022";
+  name = "parallel-20141122";
 
   src = fetchurl {
     url = "mirror://gnu/parallel/${name}.tar.bz2";
-    sha256 = "1dpssybids6k6na4rh2gwv1m581h28rcmsvq0hs56hrrh7qpjmvp";
+    sha256 = "1kpd4ayd4lb867nfnpkam4b3mh86jl6cdy386x1rich938gbrg38";
   };
 
   patchPhase =

From c73ce5fa1e0fa1744a3fe349dc0e0f3fc6c58ce8 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 25 Nov 2014 18:45:59 +0100
Subject: [PATCH 27/48] lessc: add comment that versions > 2.x break
 twitter-bootstrap

---
 pkgs/development/compilers/lessc/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/lessc/default.nix b/pkgs/development/compilers/lessc/default.nix
index 84a3a37de488..82052b3d3ca9 100644
--- a/pkgs/development/compilers/lessc/default.nix
+++ b/pkgs/development/compilers/lessc/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   name = "lessc-${version}";
-  version = "1.7.5";
+  version = "1.7.5"; # Upgrade to > 2.x breaks twitter-bootstrap
 
   src = fetchgit {
     url = https://github.com/less/less.js.git;

From 49561b8b650606ecab2ae954cf7b4765e3885d4d Mon Sep 17 00:00:00 2001
From: Rene Donner <code@donner.at>
Date: Tue, 25 Nov 2014 17:24:25 +0100
Subject: [PATCH 28/48] julia -> 0.3.3

---
 .../compilers/julia/{0.3.2.nix => 0.3.3.nix}  | 35 ++++++++-----------
 pkgs/top-level/all-packages.nix               |  9 +++--
 2 files changed, 19 insertions(+), 25 deletions(-)
 rename pkgs/development/compilers/julia/{0.3.2.nix => 0.3.3.nix} (80%)

diff --git a/pkgs/development/compilers/julia/0.3.2.nix b/pkgs/development/compilers/julia/0.3.3.nix
similarity index 80%
rename from pkgs/development/compilers/julia/0.3.2.nix
rename to pkgs/development/compilers/julia/0.3.3.nix
index 2040d62a0c80..10441fd785aa 100644
--- a/pkgs/development/compilers/julia/0.3.2.nix
+++ b/pkgs/development/compilers/julia/0.3.3.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchgit, gfortran, perl, m4, llvm, gmp, pcre, zlib
  , readline, fftwSinglePrec, fftw, libunwind, suitesparse, glpk, fetchurl
- , ncurses, libunistring, lighttpd, patchelf, openblas, liblapack
+ , ncurses, libunistring, patchelf, openblas, liblapack
  , tcl, tk, xproto, libX11, git, mpfr, which
  } :
 
@@ -11,64 +11,59 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "julia";
-  version = "0.3.2";
+  version = "0.3.3";
   name = "${pname}-${version}";
 
   dsfmt_ver = "2.2";
   grisu_ver = "1.1.1";
-  openblas_ver = "v0.2.10";
+  openblas_ver = "v0.2.12";
   lapack_ver = "3.5.0";
   arpack_ver = "3.1.5";
-  lighttpd_ver = "1.4.29";
-  patchelf_ver = "0.6";
-  pcre_ver = "8.31";
+  patchelf_ver = "0.8";
+  pcre_ver = "8.36";
   utf8proc_ver = "1.1.6";
 
   dsfmt_src = fetchurl {
     url = "http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-${dsfmt_ver}.tar.gz";
     name = "dsfmt-${dsfmt_ver}.tar.gz";
-    sha256 = "bc3947a9b2253a869fcbab8ff395416cb12958be9dba10793db2cd7e37b26899";
+    md5 = "cb61be3be7254eae39684612c524740d";
   };
   grisu_src = fetchurl {
     url = "http://double-conversion.googlecode.com/files/double-conversion-${grisu_ver}.tar.gz";
-    sha256 = "e1cabb73fd69e74f145aea91100cde483aef8b79dc730fcda0a34466730d4d1d";
+    md5 = "29b533ed4311161267bff1a9a97e2953";
   };
   openblas_src = fetchurl {
     url = "https://github.com/xianyi/OpenBLAS/tarball/${openblas_ver}";
     name = "openblas-${openblas_ver}.tar.gz";
-    sha256 = "06i0q4qnd5q5xljzrgvda0gjsczc6l2pl9hw6dn2qjpw38al73za";
+    md5 = "dfc868e0c134855639f036d2723bf4be";
   };
   arpack_src = fetchurl rec {
     url = "https://github.com/opencollab/arpack-ng/archive/${arpack_ver}.tar.gz";
-    sha256 = "164hc2qcvr7fvvf7bn2k7z40hyyv8hhhzjr6jq0mq6a7l80x02gn";
+    md5 = "d84e1b6108d9ee67c0d21aba7099e953";
     name = "arpack-ng-${arpack_ver}.tar.gz";
   };
   lapack_src = fetchurl {
     url = "http://www.netlib.org/lapack/lapack-${lapack_ver}.tgz";
     name = "lapack-${lapack_ver}.tgz";
-    sha256 = "0lk3f97i9imqascnlf6wr5mjpyxqcdj73pgj97dj2mgvyg9z1n4s";
-  };
-  lighttpd_src = fetchurl {
-    url = "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${lighttpd_ver}.tar.gz";
-    sha256 = "ff9f4de3901d03bb285634c5b149191223d17f1c269a16c863bac44238119c85";
+    md5 = "b1d3e3e425b2e44a06760ff173104bdf";
   };
   patchelf_src = fetchurl {
     url = "http://hydra.nixos.org/build/1524660/download/2/patchelf-${patchelf_ver}.tar.bz2";
-    sha256 = "00bw29vdsscsili65wcb5ay0gvg1w0ljd00sb5xc6br8bylpyzpw";
+    md5 = "5087261514b4b5814a39c3d3a36eb6ef";
   };
   pcre_src = fetchurl {
     url = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-${pcre_ver}.tar.bz2";
-    sha256 = "0g4c0z4h30v8g8qg02zcbv7n67j5kz0ri9cfhgkpwg276ljs0y2p";
+    md5 = "b767bc9af0c20bc9c1fe403b0d41ad97";
   };
   utf8proc_src = fetchurl {
     url = "http://www.public-software-group.org/pub/projects/utf8proc/v${utf8proc_ver}/utf8proc-v${utf8proc_ver}.tar.gz";
-    sha256 = "1rwr84pw92ajjlbcxq0da7yxgg3ijngmrj7vhh2qzsr2h2kqzp7y";
+    md5 = "2462346301fac2994c34f5574d6c3ca7";
   };
 
   src = fetchgit {
     url = "git://github.com/JuliaLang/julia.git";
     rev = "refs/tags/v${version}";
-    sha256 = "11w81mznhlfcnn6vcv1rhrbajnyz8aim29wvwl92zsllq8z9hv2i";
+    md5 = "84266f0201ad34abe8ca1474620fe891";
     name = "julia-git-v${version}";
   };
 
@@ -78,7 +73,7 @@ stdenv.mkDerivation rec {
     ];
 
   configurePhase = ''
-    for i in GMP LLVM PCRE READLINE FFTW LIBUNWIND SUITESPARSE GLPK LIGHTTPD ZLIB MPFR;
+    for i in GMP LLVM PCRE READLINE FFTW LIBUNWIND SUITESPARSE GLPK ZLIB MPFR;
     do
       makeFlags="$makeFlags USE_SYSTEM_$i=1 "
     done
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2fe22bc9d395..8a7f52cc209a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3443,17 +3443,16 @@ let
     openblas = openblas_0_2_2;
   };
 
-  julia032 = let
+  julia033 = let
     liblapack = liblapack_3_5_0.override {shared = true;};
-  in callPackage ../development/compilers/julia/0.3.2.nix {
+  in callPackage ../development/compilers/julia/0.3.3.nix {
     inherit liblapack;
     suitesparse = suitesparse.override {
       inherit liblapack;
     };
-    llvm = llvm_34;
-    openblas = openblas_0_2_10;
+    llvm = llvm_33;
   };
-  julia = julia032;
+  julia = julia033;
 
   lazarus = callPackage ../development/compilers/fpc/lazarus.nix {
     fpc = fpc;

From b0dc5b17cac02e50e5595f00b9f83ef0f913994e Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Tue, 25 Nov 2014 12:42:53 -0600
Subject: [PATCH 29/48] nixpkgs: American Fuzzy Lop

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/tools/security/afl/default.nix | 32 +++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix     |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/tools/security/afl/default.nix

diff --git a/pkgs/tools/security/afl/default.nix b/pkgs/tools/security/afl/default.nix
new file mode 100644
index 000000000000..402071b61c80
--- /dev/null
+++ b/pkgs/tools/security/afl/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, bash }:
+
+stdenv.mkDerivation rec {
+  name    = "afl-${version}";
+  version = "0.68b";
+
+  src = fetchurl {
+    url    = "http://lcamtuf.coredump.cx/afl/releases/${name}.tgz";
+    sha256 = "07z5lnkl82d6rpm63wr7lxs3g49wb7lw8zi9wwazzv2hi7l2vcs7";
+  };
+
+  buildPhase   = "make PREFIX=$out";
+  installPhase = "make install PREFIX=$out";
+
+  meta = {
+    description = "Powerful fuzzer via genetic algorithms and instrumentation";
+    longDescription = ''
+      American fuzzy lop is a fuzzer that employs a novel type of
+      compile-time instrumentation and genetic algorithms to
+      automatically discover clean, interesting test cases that
+      trigger new internal states in the targeted binary. This
+      substantially improves the functional coverage for the fuzzed
+      code. The compact synthesized corpora produced by the tool are
+      also useful for seeding other, more labor or resource-intensive
+      testing regimes down the road.
+    '';
+    homepage    = "http://lcamtuf.coredump.cx/afl/";
+    license     = stdenv.lib.licenses.asl20;
+    platforms   = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8a7f52cc209a..af54d6d69edf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -465,6 +465,8 @@ let
 
   aescrypt = callPackage ../tools/misc/aescrypt { };
 
+  afl = callPackage ../tools/security/afl { };
+
   ahcpd = callPackage ../tools/networking/ahcpd { };
 
   aide = callPackage ../tools/security/aide { };

From 57ec90f90f769f44d4a169b83a7298cbb36886a3 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Tue, 25 Nov 2014 13:03:43 -0600
Subject: [PATCH 30/48] nixpkgs: Fuzzing test case optimizer

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/tools/security/tmin/default.nix | 24 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix      |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/tools/security/tmin/default.nix

diff --git a/pkgs/tools/security/tmin/default.nix b/pkgs/tools/security/tmin/default.nix
new file mode 100644
index 000000000000..2c16e936a695
--- /dev/null
+++ b/pkgs/tools/security/tmin/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, bash }:
+
+stdenv.mkDerivation rec {
+  name    = "tmin-${version}";
+  version = "0.05";
+
+  src = fetchurl {
+    url    = "https://tmin.googlecode.com/files/${name}.tar.gz";
+    sha256 = "0166kcfs4b0da4hs2aqyn41f5l09i8rwxpi20k7x17qsxbmjbpd5";
+  };
+
+  buildPhase   = ''
+    gcc -O3 -funroll-loops -fno-strict-aliasing -Wno-pointer-sign tmin.c -o tmin
+  '';
+  installPhase = "mkdir -p $out/bin && mv tmin $out/bin";
+
+  meta = {
+    description = "Fuzzing tool test-case optimizer";
+    homepage    = "https://code.google.com/p/tmin";
+    license     = stdenv.lib.licenses.asl20;
+    platforms   = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index af54d6d69edf..2855c5be3113 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2514,6 +2514,8 @@ let
 
   tmux = callPackage ../tools/misc/tmux { };
 
+  tmin = callPackage ../tools/security/tmin { };
+
   tor = callPackage ../tools/security/tor { };
 
   torbutton = callPackage ../tools/security/torbutton { };

From 49e112c309ce68550e63d18a7d9ca56fedfb9abf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Tue, 25 Nov 2014 21:15:53 +0100
Subject: [PATCH 31/48] i2pd: 0.3.0 -> 0.4.0

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

diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix
index f163f73edb2e..a02616860387 100644
--- a/pkgs/tools/networking/i2pd/default.nix
+++ b/pkgs/tools/networking/i2pd/default.nix
@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
 
   name = "i2pd-${version}";
-  version = "0.3.0";
+  version = "0.4.0";
 
   src = fetchurl {
-    url = "https://github.com/PrivacySolutions/i2pd/archive/v${version}-1stbinrelease.tar.gz";
-    sha256 = "015y5v6w1mmzmnylfdc1l3r4qbmax3nywyz0r0pd651xgvvvinrv";
+    url = "https://github.com/PrivacySolutions/i2pd/archive/${version}.tar.gz";
+    sha256 = "1gab0ams8bwkiwq0wjiclkm5ms5m5p3x06gzhi2dpdc6vbdkzmlp";
   };
 
   buildInputs = [ boost cryptopp ];

From 4b287deccd2c0891ab3b04feaa81e2133d2ee987 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Tue, 25 Nov 2014 21:25:49 +0100
Subject: [PATCH 32/48] ideas version bumps

---
 pkgs/applications/editors/idea/default.nix | 27 +++++++++++-----------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix
index 8f055476dcdf..7f69e1864c15 100644
--- a/pkgs/applications/editors/idea/default.nix
+++ b/pkgs/applications/editors/idea/default.nix
@@ -147,6 +147,7 @@ let
   buildRubyMine = { name, version, build, src, license, description }:
     (mkIdeaProduct rec {
       inherit name version build src;
+      patchSnappy = false;
       product = "RubyMine";
       meta = with stdenv.lib; {
         homepage = "https://www.jetbrains.com/ruby/";
@@ -208,62 +209,62 @@ in
 
   android-studio = buildAndroidStudio rec {
     name = "android-studio-${version}";
-    version = "0.8.12";
-    build = "135.1503853";
+    version = "1.0.0-rc1";
+    build = "135.1598475";
     description = "Android development environment based on IntelliJ IDEA";
     license = stdenv.lib.licenses.asl20;
     src = fetchurl {
       url = "https://dl.google.com/dl/android/studio/ide-zips/${version}" +
             "/android-studio-ide-${build}-linux.zip";
-      sha256 = "225c8b2f90b9159c465eae5797132350660994184a568c631d4383313a510695";
+      sha256 = "1d0gj9c2hkrcij79xv8i5fy1z8zss1fp8szjp6h7z7zak989rsrf";
     };
   };
 
   clion = buildClion rec {
     name = "clion";
     version = "eap";
-    build = "138.2344.17";
+    build = "140.569.17";
     description  = "C/C++ IDE. New. Intelligent. Cross-platform.";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "http://download.jetbrains.com/cpp/${name}-${build}.tar.gz";
-      sha256 = "4b568d31132a787b748bc41c69b614dcd90229db69b02406677361bc077efab3";
+      sha256 = "1y4137dxbydf3g5s6c58bf015k2q7dsl8h4n0q2llqj5bprwcr23";
     };
   };
 
   idea-community = buildIdea rec {
     name = "idea-community-${version}";
-    version = "14";
-    build = "IC-139.224";
+    version = "14.0.1";
+    build = "IC-139.225";
     description = "Integrated Development Environment (IDE) by Jetbrains, community edition";
     license = stdenv.lib.licenses.asl20;
     src = fetchurl {
       url = "http://download-ln.jetbrains.com/idea/ideaIC-${version}.tar.gz";
-      sha256 = "72e1e7659aa90c0b520eed8190fa96899e26bde7448a9fe4ed43929ef25c508a";
+      sha256 = "166m55q33q4jwfvzwxm8mak6ic32h63bvpxdnjd41si6bs19ynvg";
     };
   };
 
   idea-ultimate = buildIdea rec {
     name = "idea-ultimate-${version}";
-    version = "14";
-    build = "IU-139.224";
+    version = "14.0.1";
+    build = "IU-139.225";
     description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "http://download-ln.jetbrains.com/idea/ideaIU-${version}.tar.gz";
-      sha256 = "e1c86f0b39e74b3468f7512d299ad9e0ca0c492316e996e65089368aff5446c6";
+      sha256 = "0hh84f3297ak63n2kv76xv1rnf1fhjws9d3b2r5pwzgfd78zja4q";
     };
   };
 
   ruby-mine = buildRubyMine rec {
     name = "ruby-mine-${version}";
-    version = "6.3.3";
+    version = "7.0";
     build = "135.1104";
     description = "The Most Intelligent Ruby and Rails IDE";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "http://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz";
-      sha256 = "58d555c2702a93fe62f3809a5cc34e566ecce0c3f1f15daaf87744402157dfac";
+      sha256 = "0xsx44gaddarkw5k4yjidzwkayf2xvsxklfzdnzcck4rg4vyk4v4";
     };
   };
 

From 3c748b6023ee6f6503508f9d4ad5f38574df00dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Tue, 25 Nov 2014 22:14:12 +0100
Subject: [PATCH 33/48] python-robomachine: new package

Test data generator for Robot Framework.

https://github.com/mkorpela/RoboMachine
---
 pkgs/top-level/python-packages.nix | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e5d9ca58e14e..c310d2102158 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8142,6 +8142,27 @@ let
     };
   };
 
+  robomachine = buildPythonPackage rec {
+    name = "robomachine-0.6";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/R/RoboMachine/RoboMachine-0.6.tar.gz";
+      md5 = "4e95eaa43afda0f363c78a88e9da7159";
+    };
+
+    propagatedBuildInputs = with self; [ pyparsing argparse robotframework ];
+
+    # Remove Windows .bat files
+    postInstall = ''
+      rm "$out"/bin/*.bat
+    '';
+
+    meta = with stdenv.lib; {
+      description = "Test data generator for Robot Framework";
+      homepage = https://github.com/mkorpela/RoboMachine;
+      license = licenses.asl20;
+    };
+  };
 
   robotframework = buildPythonPackage rec {
     version = "2.8.5";

From df16451fa5577bd8ec3a93c48cb75fea566907ba Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 26 Nov 2014 00:56:24 +0300
Subject: [PATCH 34/48] c2hsc: move to development/tools

---
 pkgs/development/{libraries => tools}/haskell/c2hsc/default.nix | 0
 pkgs/top-level/haskell-packages.nix                             | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename pkgs/development/{libraries => tools}/haskell/c2hsc/default.nix (100%)

diff --git a/pkgs/development/libraries/haskell/c2hsc/default.nix b/pkgs/development/tools/haskell/c2hsc/default.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/c2hsc/default.nix
rename to pkgs/development/tools/haskell/c2hsc/default.nix
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 497374e2ce75..5eae8f23b659 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -341,7 +341,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   c2hs = callPackage ../development/libraries/haskell/c2hs {};
 
-  c2hsc = callPackage ../development/libraries/haskell/c2hsc {};
+  c2hsc = callPackage ../development/tools/haskell/c2hsc {};
 
   Cabal_1_16_0_3 = callPackage ../development/libraries/haskell/Cabal/1.16.0.3.nix {};
   Cabal_1_18_1_3 = callPackage ../development/libraries/haskell/Cabal/1.18.1.3.nix {};

From 08748b4098f8ef8ff37f642c0d33a8eec2111916 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 26 Nov 2014 00:56:58 +0300
Subject: [PATCH 35/48] c2hs: update and move to development/tools

---
 pkgs/development/{libraries => tools}/haskell/c2hs/default.nix | 2 --
 pkgs/top-level/haskell-packages.nix                            | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)
 rename pkgs/development/{libraries => tools}/haskell/c2hs/default.nix (95%)

diff --git a/pkgs/development/libraries/haskell/c2hs/default.nix b/pkgs/development/tools/haskell/c2hs/default.nix
similarity index 95%
rename from pkgs/development/libraries/haskell/c2hs/default.nix
rename to pkgs/development/tools/haskell/c2hs/default.nix
index a464b6224246..fe8992e9989f 100644
--- a/pkgs/development/libraries/haskell/c2hs/default.nix
+++ b/pkgs/development/tools/haskell/c2hs/default.nix
@@ -15,8 +15,6 @@ cabal.mkDerivation (self: {
     filepath HUnit shelly testFramework testFrameworkHunit text
     transformers
   ];
-  jailbreak = true;
-  doCheck = false;
   meta = {
     homepage = "https://github.com/haskell/c2hs";
     description = "C->Haskell FFI tool that gives some cross-language type safety";
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 5eae8f23b659..544c0eb6ee21 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -339,7 +339,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   bzlib = callPackage ../development/libraries/haskell/bzlib {};
 
-  c2hs = callPackage ../development/libraries/haskell/c2hs {};
+  c2hs = callPackage ../development/tools/haskell/c2hs {};
 
   c2hsc = callPackage ../development/tools/haskell/c2hsc {};
 

From fdbd5e132315521df402ee85d6b51f9ed63a5e2c Mon Sep 17 00:00:00 2001
From: Spencer Whitt <sw@swhitt.me>
Date: Tue, 25 Nov 2014 16:40:25 -0500
Subject: [PATCH 36/48] New package: git-extras

---
 lib/maintainers.nix                           |  1 +
 .../git-and-tools/default.nix                 |  2 ++
 .../git-and-tools/git-extras/default.nix      | 23 +++++++++++++++++++
 3 files changed, 26 insertions(+)
 create mode 100644 pkgs/applications/version-management/git-and-tools/git-extras/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index d02e2cec53d5..e64ecce1b4e3 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -147,6 +147,7 @@
   skeidel = "Sven Keidel <svenkeidel@gmail.com>";
   smironov = "Sergey Mironov <ierton@gmail.com>";
   sprock = "Roger Mason <rmason@mun.ca>";
+  spwhitt = "Spencer Whitt <sw@swhitt.me>";
   sztupi = "Attila Sztupak <attila.sztupak@gmail.com>";
   tailhook = "Paul Colomiets <paul@colomiets.name>";
   thammers = "Tobias Hammerschmidt <jawr@gmx.de>";
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 4cabe3a4e2ab..71fb75a21576 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -99,4 +99,6 @@ rec {
   git-remote-hg = callPackage ./git-remote-hg { };
 
   gitRemoteGcrypt = callPackage ./git-remote-gcrypt { };
+
+  git-extras = callPackage ./git-extras { };
 }
diff --git a/pkgs/applications/version-management/git-and-tools/git-extras/default.nix b/pkgs/applications/version-management/git-and-tools/git-extras/default.nix
new file mode 100644
index 000000000000..3392c1c00217
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/git-extras/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "git-extras-${version}";
+  version = "2.2.0";
+
+  src = fetchurl {
+    url = "https://github.com/tj/git-extras/archive/${version}.tar.gz";
+    sha256 = "0qwgaj0r9lsmwricpnma9rm7llfrcqarcfk5iq3ilxkns8a334va";
+  };
+
+  phases = [ "unpackPhase" "installPhase" ];
+
+  makeFlags = "DESTDIR=$(out) PREFIX=";
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/tj/git-extras;
+    description = "GIT utilities -- repo summary, repl, changelog population, author commit percentages and more";
+    license = licenses.mit;
+    platforms = platforms.all;
+    maintainers = [ maintainers.spwhitt ];
+  };
+}

From 1a516da865255e755c9c4686fcba8d0387c909ac Mon Sep 17 00:00:00 2001
From: Jeremy Huffman <jeremy@jeremyhuffman.com>
Date: Mon, 24 Nov 2014 20:38:15 -0500
Subject: [PATCH 37/48] haskell-distributed-process-monad-control add from
 Hackage

---
 .../default.nix                               | 20 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/distributed-process-monad-control/default.nix

diff --git a/pkgs/development/libraries/haskell/distributed-process-monad-control/default.nix b/pkgs/development/libraries/haskell/distributed-process-monad-control/default.nix
new file mode 100644
index 000000000000..14adad138441
--- /dev/null
+++ b/pkgs/development/libraries/haskell/distributed-process-monad-control/default.nix
@@ -0,0 +1,20 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, distributedProcess, monadControl, transformers
+, transformersBase
+}:
+
+cabal.mkDerivation (self: {
+  pname = "distributed-process-monad-control";
+  version = "0.5.0";
+  sha256 = "1ja6xwdpssm7wafv2id6c3f49iw7pkks2smk6l1n1dxkh029z8nk";
+  buildDepends = [
+    distributedProcess monadControl transformers transformersBase
+  ];
+  meta = {
+    homepage = "http://haskell-distributed.github.io";
+    description = "Orphan instances for MonadBase and MonadBaseControl";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 497374e2ce75..7a951e89c4e6 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -678,6 +678,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   distributedProcess = callPackage ../development/libraries/haskell/distributed-process {};
 
+  distributedProcessMonadControl = callPackage ../development/libraries/haskell/distributed-process-monad-control {};
+
   distributedProcessP2p = callPackage ../development/libraries/haskell/distributed-process-p2p {};
 
   distributedProcessPlatform = callPackage ../development/libraries/haskell/distributed-process-platform {};

From 26c2e6a8a8b572e1368387de857244d75bf0e7a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 26 Nov 2014 08:13:55 +0100
Subject: [PATCH 38/48] python-robomachine: add myself (bjornfor) as maintainer

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c310d2102158..f211ee98680b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8161,6 +8161,7 @@ let
       description = "Test data generator for Robot Framework";
       homepage = https://github.com/mkorpela/RoboMachine;
       license = licenses.asl20;
+      maintainers = [ maintainers.bjornfor ];
     };
   };
 

From 1bd68c447835d417386673f210e1bd7d23e56509 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 26 Nov 2014 10:19:36 +0000
Subject: [PATCH 39/48] zim: update from 0.61 to 0.62

---
 pkgs/applications/office/zim/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/office/zim/default.nix b/pkgs/applications/office/zim/default.nix
index 658f460793f1..85ec081ea416 100644
--- a/pkgs/applications/office/zim/default.nix
+++ b/pkgs/applications/office/zim/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   name = "zim-${version}";
-  version = "0.60";
+  version = "0.62";
   namePrefix = "";
   
   src = fetchurl {
-    url = "http://zim-wiki.org/downloads/zim-0.61.tar.gz";
-    sha256 = "0jncxkf83bwra3022jbvjfwhk5w8az0jlwr8nsvm7wa1zfrajhsq";
+    url = "http://zim-wiki.org/downloads/${name}.tar.gz";
+    sha256 = "1hmx24jjazqvs3z6h10jl8wrqxyvvk0wc807v222vaf1sbmjmmhr";
   };
 
   propagatedBuildInputs = [ pythonPackages.sqlite3 pygtk /*pythonPackages.pyxdg*/ pygobject ];
@@ -100,4 +100,3 @@ buildPythonPackage rec {
       license = stdenv.lib.licenses.gpl2Plus;
   };
 }
-

From c7d3f6021707ce18690a0f59807c02cae38b8338 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 25 Nov 2014 13:22:45 +0100
Subject: [PATCH 40/48] cabal: add support for "editedCabalFile" attribute to
 address https://github.com/NixOS/cabal2nix/issues/84

When 'editedCabalFile' is set to an SHA256 hash, the build driver replaces the
original Cabal instructions with the new version that is downloaded from
"http://hackage.haskell.org/package/${fname}/${pname}.cabal".
---
 pkgs/build-support/cabal/default.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/cabal/default.nix b/pkgs/build-support/cabal/default.nix
index 83294373c1e6..ce0eca1a2bb9 100644
--- a/pkgs/build-support/cabal/default.nix
+++ b/pkgs/build-support/cabal/default.nix
@@ -189,7 +189,16 @@ assert !enableStaticLibraries -> versionOlder "7.7" ghc.version;
             configurePhase = ''
               eval "$preConfigure"
 
-              ${optionalString self.jailbreak "${jailbreakCabal}/bin/jailbreak-cabal ${self.pname}.cabal"}
+              ${let newCabalFile = fetchurl {
+                      url = "http://hackage.haskell.org/package/${self.fname}/${self.pname}.cabal";
+                      sha256 = self.editedCabalFile;
+                    };
+                in
+                  optionalString (self.editedCabalFile or "" != "") ''
+                    echo "Replace Cabal file with edited version ${newCabalFile}."
+                    cp ${newCabalFile} ${self.pname}.cabal
+                  ''
+              }${optionalString self.jailbreak "${jailbreakCabal}/bin/jailbreak-cabal ${self.pname}.cabal"}
 
               for i in Setup.hs Setup.lhs ${defaultSetupHs}; do
                 test -f $i && break

From 232e90378f7327a4ab54e0876eb6df1c84f2cf68 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 25 Nov 2014 14:36:25 +0100
Subject: [PATCH 41/48] haskell-twitter-conduit: use new editedCabalFile
 feature

---
 .../libraries/haskell/twitter-conduit/default.nix         | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/haskell/twitter-conduit/default.nix b/pkgs/development/libraries/haskell/twitter-conduit/default.nix
index 54d091ebb869..31542d43ebcb 100644
--- a/pkgs/development/libraries/haskell/twitter-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/twitter-conduit/default.nix
@@ -7,16 +7,11 @@
 , transformersBase, twitterTypes, twitterTypesLens, fetchurl
 }:
 
-let
-  editedCabalFile = fetchurl {
-    url = "http://hackage.haskell.org/package/twitter-conduit-0.1.0/twitter-conduit.cabal";
-    sha256 = "06z8dwvc17xhzpvb7cm0j6v63r5f3xirj36rr86bds3rw1zbnd0z";
-  };
-in
 cabal.mkDerivation (self: {
   pname = "twitter-conduit";
   version = "0.1.0";
   sha256 = "1cymgp3wlswxn5qfdr442cqq2ak48b5w1zcsr67n2g5p1izadwji";
+  editedCabalFile = "06z8dwvc17xhzpvb7cm0j6v63r5f3xirj36rr86bds3rw1zbnd0z";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
@@ -31,7 +26,6 @@ cabal.mkDerivation (self: {
     resourcet text time transformers transformersBase twitterTypes
     twitterTypesLens
   ];
-  preConfigure = "cp ${editedCabalFile} twitter-conduit.cabal";
   meta = {
     homepage = "https://github.com/himura/twitter-conduit";
     description = "Twitter API package with conduit interface and Streaming API support";

From 26bbbecae31c93cdc8962d0de5f103927eedf1f6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 25 Nov 2014 14:36:50 +0100
Subject: [PATCH 42/48] haskell-pandoc: use new editedCabalFile feature

---
 pkgs/development/libraries/haskell/pandoc/default.nix | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/haskell/pandoc/default.nix b/pkgs/development/libraries/haskell/pandoc/default.nix
index f6a1966ddd05..3788c1f3bf88 100644
--- a/pkgs/development/libraries/haskell/pandoc/default.nix
+++ b/pkgs/development/libraries/haskell/pandoc/default.nix
@@ -9,19 +9,13 @@
 , tagsoup, temporary, testFramework, testFrameworkHunit
 , testFrameworkQuickcheck2, texmath, text, time
 , unorderedContainers, vector, xml, yaml, zipArchive, zlib
-, fetchurl
 }:
 
-let
-  editedCabalFile = fetchurl {
-    url = "hackage.haskell.org/package/pandoc-1.13.1/pandoc.cabal";
-    sha256 = "1i57yk1pql4gv97cs86fk82hkwncics1wkzjqd9iz866204y4wrg";
-  };
-in
 cabal.mkDerivation (self: {
   pname = "pandoc";
   version = "1.13.1";
   sha256 = "0vvysa70xp4pskxrvslmddwdsalc479zb8wn6z1vmpvfssvvj6vv";
+  editedCabalFile = "1i57yk1pql4gv97cs86fk82hkwncics1wkzjqd9iz866204y4wrg";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
@@ -38,7 +32,6 @@ cabal.mkDerivation (self: {
     pandocTypes QuickCheck syb testFramework testFrameworkHunit
     testFrameworkQuickcheck2 text zipArchive
   ];
-  preConfigure = "cp ${editedCabalFile} pandoc.cabal";
   configureFlags = "-fhttps -fmake-pandoc-man-pages";
   jailbreak = true;
   doCheck = false;

From a5dafe774665904501051c62af14a1713f240e26 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Wed, 26 Nov 2014 14:26:47 +0100
Subject: [PATCH 43/48] rethinkdb: upgrade to 1.15.2

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

diff --git a/pkgs/servers/nosql/rethinkdb/default.nix b/pkgs/servers/nosql/rethinkdb/default.nix
index 727fb810e6e8..1c8eac99737c 100644
--- a/pkgs/servers/nosql/rethinkdb/default.nix
+++ b/pkgs/servers/nosql/rethinkdb/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, which, protobuf, gperftools, boost, zlib, curl, python, m4 }:
 
 stdenv.mkDerivation rec {
-  name = "rethinkdb-1.14.1";
+  name = "rethinkdb-1.15.2";
 
   src = fetchurl {
     url = "http://download.rethinkdb.com/dist/${name}.tgz";
-    sha256 = "0brsbb289hcsmipma4rsgrkqpqagwff2y6w46dvb25n95id65hx8";
+    sha256 = "1fpx9apqm62i332q2isanpdql8gwwab4qxwzrspqwgcka9zd6gy3";
   };
 
   preConfigure = ''

From 1dd53cc9903d394117bbc70ef043cb7054543d95 Mon Sep 17 00:00:00 2001
From: Igor Pashev <pashev.igor@gmail.com>
Date: Wed, 26 Nov 2014 16:41:50 +0100
Subject: [PATCH 44/48] Mediawiki: updated for Apache 2.4

---
 .../web-servers/apache-httpd/mediawiki.nix      | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
index d7bdd81b7ebe..c0ed20416397 100644
--- a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
@@ -4,6 +4,17 @@ with lib;
 
 let
 
+  httpd = serverInfo.serverConfig.package;
+
+  version24 = !versionOlder httpd.version "2.4";
+
+  allGranted = if version24 then ''
+    Require all granted
+  '' else ''
+    Order allow,deny
+    Allow from all
+  '';
+
   mediawikiConfig = pkgs.writeText "LocalSettings.php"
     ''
       <?php
@@ -121,8 +132,7 @@ in
         Alias ${config.urlPrefix}/images ${config.uploadDir}
 
         <Directory ${config.uploadDir}>
-            Order allow,deny
-            Allow from all
+            ${allGranted}
             Options -Indexes
         </Directory>
       ''}
@@ -142,8 +152,7 @@ in
       ''}
 
       <Directory ${mediawikiRoot}>
-          Order allow,deny
-          Allow from all
+          ${allGranted}
           DirectoryIndex index.php
       </Directory>
 

From 61d7fb934b0e356cd108afcd293c09837efcc6bf Mon Sep 17 00:00:00 2001
From: Shaun Sharples <shaun.sharples@gmail.com>
Date: Wed, 26 Nov 2014 16:56:49 +0200
Subject: [PATCH 45/48] fontconfig: avoid questionmark in patch name on darwin

Close #5135.
@vcunat made this conditional to avoid rebuild for now.
---
 pkgs/development/libraries/fontconfig/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix
index 72906232eff9..bb8289b661ee 100644
--- a/pkgs/development/libraries/fontconfig/default.nix
+++ b/pkgs/development/libraries/fontconfig/default.nix
@@ -32,10 +32,13 @@ stdenv.mkDerivation rec {
     ;
 
   patches = [
-    (fetchpatch {
-      url = "http://cgit.freedesktop.org/fontconfig/patch/?id=f44157c809d280e2a0ce87fb078fc4b278d24a67";
-      sha256 = "19s5irclg4irj2yxd7xw9yikbazs9263px8qbv4r21asw06nfalv";
-    })
+    (fetchpatch ({
+        url = "http://cgit.freedesktop.org/fontconfig/patch/?id=f44157c809d280e2a0ce87fb078fc4b278d24a67";
+        sha256 = "19s5irclg4irj2yxd7xw9yikbazs9263px8qbv4r21asw06nfalv";
+      } // stdenv.lib.optionalAttrs (!stdenv.isLinux) {
+        name = "fc-cache-bug-77252.patch"; # TODO: collapse on mass rebuild
+      }
+    ))
     (substituteAll {
       src = ./config-compat.patch;
       inherit configVersion;

From 412a2e21fbe2658157375ce03aaba5267be671b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 24 Nov 2014 12:10:20 +0100
Subject: [PATCH 46/48] chromium: set two additional mimetypes for desktop icon

---
 pkgs/applications/networking/browsers/chromium/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index 3e35b704120c..75d5f1c248e9 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -55,6 +55,8 @@ let
       "x-scheme-handler/ftp"
       "x-scheme-handler/mailto"
       "x-scheme-handler/webcal"
+      "x-scheme-handler/about"
+      "x-scheme-handler/unknown"
     ];
     categories = "Network;WebBrowser";
   };

From f45b6fb078b2803e85abd57c28023be60e976e8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 26 Nov 2014 21:04:59 +0100
Subject: [PATCH 47/48] fix tarball job

---
 pkgs/tools/networking/strongswan/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix
index 13941ae64424..a41bc5e5b8f0 100644
--- a/pkgs/tools/networking/strongswan/default.nix
+++ b/pkgs/tools/networking/strongswan/default.nix
@@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
     description = "OpenSource IPsec-based VPN Solution";
     homepage = https://www.strongswan.org;
     license = stdenv.lib.licenses.gpl2Plus;
-    inherit (stdenv.gcc.gcc.meta) platforms;
+    platforms = stdenv.lib.platforms.all;
   };
 }

From b1803465d9221639a0a0073d7dcb9ef4262b5f3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 26 Nov 2014 21:40:43 +0100
Subject: [PATCH 48/48] imagemagick: use a stable URL, reshuffle mirrors

CC: #5133.
---
 pkgs/applications/graphics/ImageMagick/default.nix | 2 +-
 pkgs/build-support/fetchurl/mirrors.nix            | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix
index da2ca64d9758..69bc2006666c 100644
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/pkgs/applications/graphics/ImageMagick/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   name = "ImageMagick-${version}";
 
   src = fetchurl {
-    url = "mirror://imagemagick/${name}.tar.xz";
+    url = "mirror://imagemagick/releases/${name}.tar.xz";
     sha256 = "1c792hbwi308lm9xkml319xaa4w3bz6hwy6i92jwrm7kqr4h8di7";
   };
 
diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix
index b54088d047d3..6284655e5e97 100644
--- a/pkgs/build-support/fetchurl/mirrors.nix
+++ b/pkgs/build-support/fetchurl/mirrors.nix
@@ -147,10 +147,10 @@ rec {
 
   # ImageMagick mirrors, see http://www.imagemagick.org/script/download.php.
   imagemagick = [
-    http://ftp.nluug.nl/pub/ImageMagick/
-    ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/
+    ftp://ftp.nluug.nl/pub/ImageMagick/
     ftp://ftp.imagemagick.org/pub/ImageMagick/
     ftp://ftp.imagemagick.net/pub/ImageMagick/
+    ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/
   ];
 
   # CPAN mirrors.