From 1d6464003f2596501123617a2bd992bc75f8fdd1 Mon Sep 17 00:00:00 2001
From: Julien Dehos <dehos@lisic.univ-littoral.fr>
Date: Mon, 8 Aug 2016 14:52:55 +0200
Subject: [PATCH 01/28] wt: init at 3.3.6

---
 pkgs/development/libraries/wt/cmake.patch | 10 ++++++
 pkgs/development/libraries/wt/default.nix | 40 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 3 files changed, 52 insertions(+)
 create mode 100644 pkgs/development/libraries/wt/cmake.patch
 create mode 100644 pkgs/development/libraries/wt/default.nix

diff --git a/pkgs/development/libraries/wt/cmake.patch b/pkgs/development/libraries/wt/cmake.patch
new file mode 100644
index 00000000000..e7b1f87411d
--- /dev/null
+++ b/pkgs/development/libraries/wt/cmake.patch
@@ -0,0 +1,10 @@
+--- a/CMakeLists.txt	2016-07-13 14:27:26.000000000 +0200
++++ b/CMakeLists.txt	2016-08-16 12:58:28.135652964 +0200
+@@ -6,6 +6,7 @@
+   CMAKE_POLICY(SET CMP0002 OLD)
+   CMAKE_POLICY(SET CMP0003 OLD)
+   CMAKE_POLICY(SET CMP0005 OLD)
++  CMAKE_POLICY(SET CMP0037 OLD)
+ ENDIF(COMMAND CMAKE_POLICY)
+ 
+ PROJECT(WT)
diff --git a/pkgs/development/libraries/wt/default.nix b/pkgs/development/libraries/wt/default.nix
new file mode 100644
index 00000000000..4461975402b
--- /dev/null
+++ b/pkgs/development/libraries/wt/default.nix
@@ -0,0 +1,40 @@
+{stdenv, fetchFromGitHub, cmake, boost, pkgconfig, doxygen, qt48Full, libharu, 
+  pango, fcgi, firebird, libmysql, postgresql, graphicsmagick, glew, openssl,
+  pcre }:
+
+stdenv.mkDerivation rec {
+  name = "wt";
+  version = "3.3.6";
+
+  src = fetchFromGitHub {
+    owner = "kdeforche";
+    repo = name;
+    rev = version;
+    sha256 = "1pvykc969l9cpd0da8bgpi4gr8f6qczrbpprrxamyj1pn0ydzvq3";
+  };
+
+  enableParallelBuilding = true;
+
+  buildInputs = [ cmake boost pkgconfig doxygen qt48Full libharu 
+    pango fcgi firebird libmysql postgresql graphicsmagick glew 
+    openssl pcre ];
+
+  cmakeFlags = [
+    "-DWT_WRASTERIMAGE_IMPLEMENTATION=GraphicsMagick"
+    "-DWT_CPP_11_MODE=-std=c++11"
+    "-DGM_PREFIX=${graphicsmagick}"
+    "-DMYSQL_PREFIX=${libmysql}"
+    "--no-warn-unused-cli"
+  ];
+
+  patches = [ ./cmake.patch ];  # fix a cmake warning; PR sent to upstream 
+
+  meta = with stdenv.lib; {
+    homepage = "https://www.webtoolkit.eu/wt";
+    description = "C++ library for developing web applications";
+    platforms = platforms.linux ;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.juliendehos ];
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d7ea90d76f6..157dde003eb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9676,6 +9676,8 @@ in
 
   wiredtiger = callPackage ../development/libraries/wiredtiger { };
 
+  wt = callPackage ../development/libraries/wt { };
+
   wvstreams = callPackage ../development/libraries/wvstreams { };
 
   wxGTK = wxGTK28;

From 3f783e7fd11ff9069a682dbf108fb0c307cf1973 Mon Sep 17 00:00:00 2001
From: obadz <obadz-git@obadz.com>
Date: Fri, 19 Aug 2016 18:11:06 +0100
Subject: [PATCH 02/28] nano: 2.6.2 -> 2.6.3

Add patch to make Darwin happy & fix #17835
---
 pkgs/applications/editors/nano/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix
index dee2d6f0dff..f99e5d76a47 100644
--- a/pkgs/applications/editors/nano/default.nix
+++ b/pkgs/applications/editors/nano/default.nix
@@ -26,6 +26,15 @@ stdenv.mkDerivation rec {
     ${optionalString enableTiny "--enable-tiny"}
   '';
 
+  patchFlags = [ "-p0" ];
+
+  patches = optional stdenv.isDarwin
+    (fetchurl {
+      name = "darwin.patch";
+      url = "https://trac.macports.org/browser/trunk/dports/editors/nano/files/patch-src-winio.c.diff?rev=151356&format=txt";
+      sha256 = "184q33irz9px2svwr2qx70zvfby5zlwlhv4k607yzsy90fq2jpdd";
+    });
+
   postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
     substituteInPlace src/text.c --replace "__time_t" "time_t"
   '';

From b0e11652f4b21759471a133a5a2a6ab2517e3837 Mon Sep 17 00:00:00 2001
From: obadz <obadz-git@obadz.com>
Date: Fri, 19 Aug 2016 18:27:15 +0100
Subject: [PATCH 03/28] dotnetPackages.GitVersionTree: init at 2013-10-01

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

diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix
index e8273f35cde..f287a35bdc4 100644
--- a/pkgs/top-level/dotnet-packages.nix
+++ b/pkgs/top-level/dotnet-packages.nix
@@ -489,6 +489,54 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
   #   };
   # };
 
+  GitVersionTree = buildDotnetPackage rec {
+    baseName = "GitVersionTree";
+    version = "2013-10-01";
+
+    src = fetchFromGitHub {
+      owner = "crc8";
+      repo = "GitVersionTree";
+      rev = "58dc39c43cffea44f721ee4425835e56518f7da2";
+      sha256 = "0mna5pkpqkdr5jgn8paz004h1pa24ncsvmi2c8s4gp94nfw34x05";
+    };
+
+    buildInputs = with pkgs; [ ed ];
+
+    postPatch = ''
+      ed -v -p: -s GitVersionTree/Program.cs << EOF
+      /Main()
+      c
+      static void Main(string[] args)
+      .
+      /EnableVisualStyles
+      i
+      Reg.Write("GitPath", "${pkgs.gitMinimal}/bin/git");
+      Reg.Write("GraphvizPath", "${pkgs.graphviz}/bin/dot");
+      if (args.Length > 0) {
+        Reg.Write("GitRepositoryPath", args[0]);
+      }
+      .
+      w
+      EOF
+
+      substituteInPlace GitVersionTree/Forms/MainForm.cs \
+        --replace 'Directory.GetParent(Application.ExecutablePath)' 'Environment.CurrentDirectory' \
+        --replace '\\' '/' \
+        --replace '@"\"' '"/"'
+    '';
+
+    outputFiles = [ "GitVersionTree/bin/Release/*" ];
+    exeFiles = [ "GitVersionTree.exe" ];
+
+    meta = with stdenv.lib; {
+      description = "A tool to help visualize git revisions and branches";
+      homepage = https://github.com/crc8/GitVersionTree;
+      license = licenses.gpl2;
+      maintainers = with maintainers; [ obadz ];
+      platforms = platforms.all;
+    };
+  };
+
   MathNetNumerics = buildDotnetPackage rec {
     baseName = "MathNet.Numerics";
     version = "3.7.0";

From 4574f22841d23a12fc135af74f198c4313002f4a Mon Sep 17 00:00:00 2001
From: obadz <obadz-git@obadz.com>
Date: Fri, 19 Aug 2016 19:18:14 +0100
Subject: [PATCH 04/28] chromium: remove one layer of wrapper by using ed

---
 .../networking/browsers/chromium/default.nix  | 40 +++++++++----------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index f2c37d9e973..e55a599267a 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -1,4 +1,4 @@
-{ newScope, stdenv, makeWrapper, makeDesktopItem, writeScript
+{ newScope, stdenv, makeWrapper, makeDesktopItem, ed
 
 # package customization
 , channel ? "stable"
@@ -66,38 +66,36 @@ let
 in stdenv.mkDerivation {
   name = "chromium${suffix}-${chromium.browser.version}";
 
-  buildInputs = [ makeWrapper ];
+  buildInputs = [ makeWrapper ed ];
 
   outputs = ["out" "sandbox"];
 
   buildCommand = let
     browserBinary = "${chromium.browser}/libexec/chromium/chromium";
     getWrapperFlags = plugin: "$(< \"${plugin}/nix-support/wrapper-flags\")";
-    launchScript = writeScript "chromium" ''
-      #! ${stdenv.shell}
-
-      if [ -x "/var/setuid-wrappers/${sandboxExecutableName}" ]
-      then
-        export CHROME_DEVEL_SANDBOX="/var/setuid-wrappers/${sandboxExecutableName}"
-      else
-        export CHROME_DEVEL_SANDBOX="@sandbox@/bin/${sandboxExecutableName}"
-      fi
-
-      # libredirect causes chromium to deadlock on startup
-      export LD_PRELOAD="$(echo -n "$LD_PRELOAD" | tr ':' '\n' | grep -v /lib/libredirect\\.so$ | tr '\n' ':')"
-
-      exec @out@/bin/.chromium-wrapped "''${extraFlagsArray[@]}" "$@"
-    '';
   in with stdenv.lib; ''
     mkdir -p "$out/bin" "$out/share/applications"
 
     ln -s "${chromium.browser}/share" "$out/share"
-    eval makeWrapper "${browserBinary}" "$out/bin/.chromium-wrapped" \
+    eval makeWrapper "${browserBinary}" "$out/bin/chromium" \
       ${concatMapStringsSep " " getWrapperFlags chromium.plugins.enabled}
 
-    cp -v "${launchScript}" "$out/bin/chromium"
-    substituteInPlace $out/bin/chromium --subst-var out --subst-var sandbox
-    chmod 755 "$out/bin/chromium"
+    ed -v -s "$out/bin/chromium" << EOF
+    2i
+
+    if [ -x "/var/setuid-wrappers/${sandboxExecutableName}" ]
+    then
+      export CHROME_DEVEL_SANDBOX="/var/setuid-wrappers/${sandboxExecutableName}"
+    else
+      export CHROME_DEVEL_SANDBOX="$sandbox/bin/${sandboxExecutableName}"
+    fi
+
+    # libredirect causes chromium to deadlock on startup
+    export LD_PRELOAD="\$(echo -n "\$LD_PRELOAD" | tr ':' '\n' | grep -v /lib/libredirect\\\\.so$ | tr '\n' ':')"
+
+    .
+    w
+    EOF
 
     ln -sv "${chromium.browser.sandbox}" "$sandbox"
 

From 64ba7b53f189e0cb268fe42eb8496bfb765aac2e Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 19 Aug 2016 15:09:41 -0500
Subject: [PATCH 05/28] Revert "Merge pull request #17806 from
 matthewbauer/emacs-wrapper"

This reverts commit da681277373320321a4e60f3491915b16f0b9f80, reversing
changes made to 2ba494b728ef9ba46e525132457a45a2384cf40e.

These changes are reverted because they cause an incompatibility which
they should not.
---
 pkgs/build-support/emacs/wrapper.nix | 8 ++------
 pkgs/top-level/emacs-packages.nix    | 6 ++----
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/pkgs/build-support/emacs/wrapper.nix b/pkgs/build-support/emacs/wrapper.nix
index cc3ea899043..45931e6914a 100644
--- a/pkgs/build-support/emacs/wrapper.nix
+++ b/pkgs/build-support/emacs/wrapper.nix
@@ -36,10 +36,7 @@ in customEmacsPackages.emacsWithPackages (epkgs: [ epkgs.evil epkgs.magit ])
 
 with lib; let inherit (self) emacs; in
 
-{
-  packagesFun ? [], # packages explicitly requested by the user
-  extraStart ? ""
-}:
+packagesFun: # packages explicitly requested by the user
 
 let
   explicitRequires =
@@ -56,7 +53,7 @@ stdenv.mkDerivation {
   # Store all paths we want to add to emacs here, so that we only need to add
   # one path to the load lists
   deps = runCommand "emacs-packages-deps"
-   { inherit explicitRequires lndir emacs extraStart; }
+   { inherit explicitRequires lndir emacs; }
    ''
      mkdir -p $out/bin
      mkdir -p $out/share/emacs/site-lisp
@@ -99,7 +96,6 @@ stdenv.mkDerivation {
 (load-file "$emacs/share/emacs/site-lisp/site-start.el")
 (add-to-list 'load-path "$out/share/emacs/site-lisp")
 (add-to-list 'exec-path "$out/bin")
-$extraStart
 EOF
 
      # Byte-compiling improves start-up time only slightly, but costs nothing.
diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index ef616f37e0c..d2e3d2b866f 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -63,7 +63,7 @@ let
     inherit fetchurl lib stdenv texinfo;
   };
 
-  emacsWrapper = import ../build-support/emacs/wrapper.nix {
+  emacsWithPackages = import ../build-support/emacs/wrapper.nix {
     inherit lib lndir makeWrapper stdenv runCommand;
   };
 
@@ -71,9 +71,7 @@ let
 
   inherit emacs melpaBuild trivialBuild;
 
-  emacsWrapper = emacsWrapper self;
-
-  emacsWithPackages = packagesFun: emacsWrapper { inherit packagesFun; };
+  emacsWithPackages = emacsWithPackages self;
 
   ## START HERE
 

From 7bf6e249ebc293c079f94d9fa9913cc462586718 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Fri, 19 Aug 2016 21:37:55 +0000
Subject: [PATCH 06/28] talloc: re-add old static output

It was originally added by https://github.com/NixOS/nixpkgs/pull/5142 but removed in
https://github.com/NixOS/nixpkgs/commit/863ef410252ebbc5a146d55993686c5a2377472e.y
---
 pkgs/development/libraries/talloc/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix
index 2c7cbe04019..3c40ae247f6 100644
--- a/pkgs/development/libraries/talloc/default.nix
+++ b/pkgs/development/libraries/talloc/default.nix
@@ -24,6 +24,10 @@ stdenv.mkDerivation rec {
     "--builtin-libraries=replace"
   ];
 
+  postInstall = ''		
+    ar qf $out/lib/libtalloc.a bin/default/talloc_[0-9]*.o		
+  '';
+
   meta = with stdenv.lib; {
     description = "Hierarchical pool based memory allocator with destructors";
     homepage = http://tdb.samba.org/;

From b7b2019e62ad813b9878772e75a1abc96d1a1e7e Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Fri, 19 Aug 2016 21:39:56 +0000
Subject: [PATCH 07/28] proot: fix static build

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

diff --git a/pkgs/tools/system/proot/default.nix b/pkgs/tools/system/proot/default.nix
index aecab9c35d0..87c463bdac9 100644
--- a/pkgs/tools/system/proot/default.nix
+++ b/pkgs/tools/system/proot/default.nix
@@ -12,13 +12,13 @@ stdenv.mkDerivation rec {
     owner = "cedric-vincent";
   };
 
-  buildInputs = [ talloc ];
+  buildInputs = [ talloc ] ++ stdenv.lib.optional enableStatic stdenv.cc.libc.static;
   nativeBuildInputs = [ docutils ];
 
   enableParallelBuilding = true;
 
   preBuild = stdenv.lib.optionalString enableStatic ''
-    export LDFLAGS="-static -L${talloc}/lib"
+    export LDFLAGS="-static"
   '';
 
   makeFlags = [ "-C src" ];

From d7707921979d8f9b0a40ec32d90963510fc3dd16 Mon Sep 17 00:00:00 2001
From: Kranium Gikos Mendoza <kranium@gikos.net>
Date: Sat, 20 Aug 2016 05:40:06 +0800
Subject: [PATCH 08/28] openttd: correct openmsx dir

---
 pkgs/games/openttd/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix
index 7a7571a9fa5..2f174f41731 100644
--- a/pkgs/games/openttd/default.nix
+++ b/pkgs/games/openttd/default.nix
@@ -52,9 +52,12 @@ stdenv.mkDerivation rec {
       cp ${opensfx}/*.{obs,cat} $out/share/games/openttd/data
     ''}
 
+    mkdir $out/share/games/openttd/baseset/openmsx
+
     ${stdenv.lib.optionalString withOpenMSX ''
-      cp ${openmsx}/*.{obm,mid} $out/share/games/openttd/data
+      cp ${openmsx}/*.{obm,mid} $out/share/games/openttd/baseset/openmsx
     ''}
+
   '';
 
   meta = {

From 63a2c80bf9e5a7d2784ce6787563fba93720ded4 Mon Sep 17 00:00:00 2001
From: Kranium Gikos Mendoza <kranium@gikos.net>
Date: Sat, 20 Aug 2016 05:43:34 +0800
Subject: [PATCH 09/28] openttd: out of the box midi playback

---
 pkgs/games/openttd/default.nix | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix
index 2f174f41731..c40337d54f5 100644
--- a/pkgs/games/openttd/default.nix
+++ b/pkgs/games/openttd/default.nix
@@ -1,5 +1,7 @@
 { stdenv, fetchurl, fetchzip, pkgconfig, SDL, libpng, zlib, xz, freetype, fontconfig
 , withOpenGFX ? true, withOpenSFX ? true, withOpenMSX ? true
+, withFluidSynth ? true, audioDriver ? "alsa", fluidsynth, soundfont-fluid, procps
+, writeScriptBin, makeWrapper
 }:
 
 let
@@ -18,6 +20,12 @@ let
     sha256 = "0qnmfzz0v8vxrrvxnm7szphrlrlvhkwn3y92b4iy0b4b6yam0yd4";
   };
 
+  playmidi = writeScriptBin "playmidi" ''
+    #!/bin/sh
+    trap "${procps}/bin/pkill fluidsynth" EXIT
+    ${fluidsynth}/bin/fluidsynth -a ${audioDriver} -i ${soundfont-fluid}/share/soundfonts/FluidR3_GM2-2.sf2 $*
+  '';
+
 in
 stdenv.mkDerivation rec {
   name = "openttd-${version}";
@@ -28,8 +36,9 @@ stdenv.mkDerivation rec {
     sha256 = "1ak32fj5xkk2fvmm3g8i7wzmk4bh2ijsp8fzvvw5wj6365p9j24v";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ SDL libpng xz zlib freetype fontconfig ];
+  nativeBuildInputs = [ pkgconfig makeWrapper ];
+  buildInputs = [ SDL libpng xz zlib freetype fontconfig ]
+    ++ stdenv.lib.optional withFluidSynth [ fluidsynth soundfont-fluid ];
 
   prefixKey = "--prefix-dir=";
 
@@ -58,6 +67,11 @@ stdenv.mkDerivation rec {
       cp ${openmsx}/*.{obm,mid} $out/share/games/openttd/baseset/openmsx
     ''}
 
+    ${stdenv.lib.optionalString withFluidSynth ''
+      wrapProgram $out/bin/openttd \
+        --add-flags -m \
+        --add-flags extmidi:cmd=${playmidi}/bin/playmidi
+    ''}
   '';
 
   meta = {

From 8bfc760e8b9cca3d3708a000701c49399b189297 Mon Sep 17 00:00:00 2001
From: Tristan Helmich <tristan.helmich@gmail.com>
Date: Sat, 20 Aug 2016 09:35:57 +0200
Subject: [PATCH 10/28] emby: 3.0.6060 -> 3.0.6070

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

diff --git a/pkgs/servers/emby/default.nix b/pkgs/servers/emby/default.nix
index 899c4a13502..71cc5865fb8 100644
--- a/pkgs/servers/emby/default.nix
+++ b/pkgs/servers/emby/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "emby-${version}";
-  version = "3.0.6060";
+  version = "3.0.6070";
 
   src = fetchurl {
     url = "https://github.com/MediaBrowser/Emby/archive/${version}.tar.gz";
-    sha256 = "1s895198x3kiqfznhp56vj67wld9fgh2wd7k8hw69mrasby0kmp3";
+    sha256 = "1szxqyr1pj90dfz9ga8ddcipzidm3ajinyp1vngzvwqcsdb7dxc5";
   };
 
   propagatedBuildInputs = with pkgs; [

From b954322b0fa21dff9aafdfb941f9c3e8b5bed0be Mon Sep 17 00:00:00 2001
From: Josef Kemetmueller <josef.kemetmueller@zamg.ac.at>
Date: Thu, 4 Aug 2016 14:07:22 +0000
Subject: [PATCH 11/28] cxx-prettyprint: init at 2016-04-30

---
 .../libraries/cxx-prettyprint/default.nix     | 29 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/development/libraries/cxx-prettyprint/default.nix

diff --git a/pkgs/development/libraries/cxx-prettyprint/default.nix b/pkgs/development/libraries/cxx-prettyprint/default.nix
new file mode 100644
index 00000000000..8be68a314e3
--- /dev/null
+++ b/pkgs/development/libraries/cxx-prettyprint/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "cxx-prettyprint-unstable-${version}";
+  version = "2016-04-30";
+  rev = "9ab26d228f2960f50b38ad37fe0159b7381f7533";
+
+  src = fetchFromGitHub {
+    owner = "louisdx";
+    repo = "cxx-prettyprint";
+    inherit rev;
+    sha256 = "1bp25yw8fb0mi432f72ihfxfj887gi36b36fpv677gawm786l7p1";
+  };
+
+  installPhase = ''
+    mkdir -p "$out/include"
+    cp prettyprint.hpp "$out/include"
+  '';
+
+  meta = with stdenv.lib; {
+    description    = "Header only C++ library for pretty printing standard containers";
+    homepage       = https://github.com/louisdx/cxx-prettyprint;
+    license        = stdenv.lib.licenses.boost;
+    platforms      = platforms.all;
+
+    # This is a header-only library, no point in hydra building it:
+    hydraPlatforms = [];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 81e68056a2a..12116563d75 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7084,6 +7084,8 @@ in
 
   cwiid = callPackage ../development/libraries/cwiid { };
 
+  cxx-prettyprint = callPackage ../development/libraries/cxx-prettyprint { };
+
   cyrus_sasl = callPackage ../development/libraries/cyrus-sasl {
     kerberos = if stdenv.isFreeBSD then libheimdal else kerberos;
   };

From 9bb33d591a7eb7d0e52ed605f5dc59ee30fce940 Mon Sep 17 00:00:00 2001
From: J Phani Mahesh <phanimahesh@gmail.com>
Date: Wed, 20 Jul 2016 10:50:43 +0530
Subject: [PATCH 12/28] areca: switch sf downloads to mirror://

This allows fallback to all configured mirrors for sourceforge
to download, instead of relying on just downloads.sourceforge.net
---
 pkgs/applications/backup/areca/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/backup/areca/default.nix b/pkgs/applications/backup/areca/default.nix
index 76913356b04..90d38712317 100644
--- a/pkgs/applications/backup/areca/default.nix
+++ b/pkgs/applications/backup/areca/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "areca-7.5";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/project/areca/areca-stable/areca-7.5/areca-7.5-src.tar.gz";
+    url = "mirror://sourceforge/project/areca/areca-stable/areca-7.5/areca-7.5-src.tar.gz";
     sha256 = "1q4ha9s96c1syplxm04bh1v1gvjq16l4pa8w25w95d2ywwvyq1xb";
   };
 

From 7b8303a7dea4bdead8b08883b64fefee0a7fb26b Mon Sep 17 00:00:00 2001
From: J Phani Mahesh <phanimahesh@gmail.com>
Date: Wed, 20 Jul 2016 10:55:25 +0530
Subject: [PATCH 13/28] mlterm: switch sf downloads to mirror://

This allows fallback to all configured mirrors for sourceforge
to download, instead of relying on just downloads.sourceforge.net
---
 pkgs/applications/misc/mlterm/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/mlterm/default.nix b/pkgs/applications/misc/mlterm/default.nix
index 80d0c136628..d9b03fd86e1 100644
--- a/pkgs/applications/misc/mlterm/default.nix
+++ b/pkgs/applications/misc/mlterm/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "3.3.8";
 
   src = fetchurl {
-    url = "https://downloads.sourceforge.net/project/mlterm/01release/${name}/${name}.tar.gz";
+    url = "mirror://sourceforge/project/mlterm/01release/${name}/${name}.tar.gz";
     sha256 = "088pgxynzxxii7wdmjp2fdkxydirx4k05588zkhlzalkb5l8ji1i";
   };
 

From 9fdcfb2a6349d253297fe46a0d9ad64c56bc6e0a Mon Sep 17 00:00:00 2001
From: J Phani Mahesh <phanimahesh@gmail.com>
Date: Wed, 20 Jul 2016 10:58:40 +0530
Subject: [PATCH 14/28] xautoclick: switch sf downloads to mirror://

This allows fallback to all configured mirrors for sourceforge
to download, instead of relying on just downloads.sourceforge.net
---
 pkgs/applications/misc/xautoclick/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/xautoclick/default.nix b/pkgs/applications/misc/xautoclick/default.nix
index 19d8a15fbfa..1a71a2756d1 100644
--- a/pkgs/applications/misc/xautoclick/default.nix
+++ b/pkgs/applications/misc/xautoclick/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   version = "0.31";
   name = "xautoclick-${version}";
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/project/xautoclick/xautoclick/xautoclick-0.31/xautoclick-0.31.tar.gz";
+    url = "mirror://sourceforge/project/xautoclick/xautoclick/xautoclick-0.31/xautoclick-0.31.tar.gz";
     sha256 = "0h522f12a7v2b89411xm51iwixmjp2mp90rnizjgiakx9ajnmqnm";
   };
   buildInputs = [ xorg.libX11 xorg.libXtst xorg.xinput xorg.libXi xorg.libXext pkgconfig ]

From e3c18f04dd7f1bb98550593b24a139df74ee5dd0 Mon Sep 17 00:00:00 2001
From: J Phani Mahesh <phanimahesh@gmail.com>
Date: Wed, 20 Jul 2016 11:02:35 +0530
Subject: [PATCH 15/28] lxmenu-data: switch sf downloads to mirror://

This allows fallback to all configured mirrors for sourceforge
to download, instead of relying on just downloads.sourceforge.net
---
 pkgs/desktops/lxde/core/lxmenu-data.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/lxde/core/lxmenu-data.nix b/pkgs/desktops/lxde/core/lxmenu-data.nix
index b75c09d2909..27a5903a61b 100644
--- a/pkgs/desktops/lxde/core/lxmenu-data.nix
+++ b/pkgs/desktops/lxde/core/lxmenu-data.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "0.1.5";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/lxde/${name}.tar.xz";
+    url = "mirror://sourceforge/lxde/${name}.tar.xz";
     sha256 = "9fe3218d2ef50b91190162f4f923d6524c364849f87bcda8b4ed8eb59b80bab8";
   };
 

From 78714df16533a0c09cffb4af2bda16924a1ae76a Mon Sep 17 00:00:00 2001
From: J Phani Mahesh <phanimahesh@gmail.com>
Date: Wed, 20 Jul 2016 11:03:45 +0530
Subject: [PATCH 16/28] python:cgkit: switch sf downloads to mirror://

This allows fallback to all configured mirrors for sourceforge
to download, instead of relying on just downloads.sourceforge.net
---
 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 d39c8d85cdd..6f94a8fa40b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3308,7 +3308,7 @@ in modules // {
     disabled = isPy3k;
 
     src = pkgs.fetchurl {
-      url = "http://downloads.sourceforge.net/project/cgkit/cgkit/cgkit-${version}/cgkit-${version}-py2k.tar.gz";
+      url = "mirror://sourceforge/project/cgkit/cgkit/cgkit-${version}/cgkit-${version}-py2k.tar.gz";
       sha256 = "0vvllc42mdyma3c7yqhahs4bfxymm2kvmc4va7dxqr5x0rzh6rd6";
     };
 

From 5983baa18a21092a0b5ea10ab89e19bd862d035d Mon Sep 17 00:00:00 2001
From: J Phani Mahesh <phanimahesh@gmail.com>
Date: Sat, 20 Aug 2016 17:22:31 +0530
Subject: [PATCH 17/28] gammu: switch sf downloads to mirror://

---
 pkgs/applications/misc/gammu/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/gammu/default.nix b/pkgs/applications/misc/gammu/default.nix
index fc88bb3e354..6a18dee57b9 100644
--- a/pkgs/applications/misc/gammu/default.nix
+++ b/pkgs/applications/misc/gammu/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   version = "1.33.0";
 
   src = fetchurl {
-    url = "http://sourceforge.net/projects/gammu/files/gammu/${version}/gammu-${version}.tar.xz";
+    url = "mirror://sourceforge/projects/gammu/files/gammu/${version}/gammu-${version}.tar.xz";
     sha256 = "18gplx1v9d70k1q86d5i4n4dfpx367g34pj3zscppx126vwhv112";
   };
 

From 7503b0e569c6ab1fce4c9b7e021e5e05e7841be1 Mon Sep 17 00:00:00 2001
From: J Phani Mahesh <phanimahesh@gmail.com>
Date: Sat, 20 Aug 2016 17:24:15 +0530
Subject: [PATCH 18/28] omniorb: switch sf downloads to mirror://

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

diff --git a/pkgs/development/tools/omniorb/default.nix b/pkgs/development/tools/omniorb/default.nix
index 0fe4b191e50..cfe8810d6c1 100644
--- a/pkgs/development/tools/omniorb/default.nix
+++ b/pkgs/development/tools/omniorb/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   version = "4.2.0";
 
   src = fetchurl rec {
-    url = "http://sourceforge.net/projects/omniorb/files/omniORB/omniORB-${version}/omniORB-${version}.tar.bz2";
+    url = "mirror://sourceforge/projects/omniorb/files/omniORB/omniORB-${version}/omniORB-${version}.tar.bz2";
     sha256 = "1g58xcw4641wyisp9wscrkzaqrz0vf123dgy52qq2a3wk7y77hkl";
   };
 

From c8964601e065a6207550b46225a21772cf9f72a7 Mon Sep 17 00:00:00 2001
From: J Phani Mahesh <phanimahesh@gmail.com>
Date: Sat, 20 Aug 2016 17:24:53 +0530
Subject: [PATCH 19/28] mlton: switch sf downloads to mirror://

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

diff --git a/pkgs/development/compilers/mlton/default.nix b/pkgs/development/compilers/mlton/default.nix
index c4890c1ca88..3b8001d563e 100644
--- a/pkgs/development/compilers/mlton/default.nix
+++ b/pkgs/development/compilers/mlton/default.nix
@@ -15,22 +15,22 @@ stdenv.mkDerivation rec {
 
   binSrc =
     if stdenv.system == "i686-linux" then (fetchurl {
-      url = "http://sourceforge.net/projects/mlton/files/mlton/${version}/${name}-1.x86-linux.tgz";
+      url = "mirror://sourceforge/projects/mlton/files/mlton/${version}/${name}-1.x86-linux.tgz";
       sha256 = "1kxjjmnw4xk2d9hpvz43w9dvyhb3025k4zvjx785c33nrwkrdn4j";
     })
     else if stdenv.system == "x86_64-linux" then (fetchurl {
-        url = "http://sourceforge.net/projects/mlton/files/mlton/${version}/${name}-1.amd64-linux.tgz";
+        url = "mirror://sourceforge/projects/mlton/files/mlton/${version}/${name}-1.amd64-linux.tgz";
         sha256 = "0fyhwxb4nmpirjbjcvk9f6w67gmn2gkz7xcgz0xbfih9kc015ygn";
     })
     else if stdenv.system == "x86_64-darwin" then (fetchurl {
-        url = "http://sourceforge.net/projects/mlton/files/mlton/${version}/${name}-1.amd64-darwin.gmp-macports.tgz";
+        url = "mirror://sourceforge/projects/mlton/files/mlton/${version}/${name}-1.amd64-darwin.gmp-macports.tgz";
         sha256 = "044wnh9hhg6if886xy805683k0as347xd37r0r1yi4x7qlxzzgx9";
     })
     else throw "Architecture not supported";
 
   codeSrc =
     fetchurl {
-      url = "http://sourceforge.net/projects/mlton/files/mlton/${version}/${name}.src.tgz";
+      url = "mirror://sourceforge/projects/mlton/files/mlton/${version}/${name}.src.tgz";
       sha256 = "0v1x2hrh9hiqkvnbq11kf34v4i5a2x0ffxbzqaa8skyl26nmfn11";
     };
 

From 879a94436f261c717fa60b2b6021a2fb058da786 Mon Sep 17 00:00:00 2001
From: J Phani Mahesh <phanimahesh@gmail.com>
Date: Sat, 20 Aug 2016 17:27:57 +0530
Subject: [PATCH 20/28] fpc: switch sf downloads to mirror://

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

diff --git a/pkgs/development/compilers/fpc/binary.nix b/pkgs/development/compilers/fpc/binary.nix
index 57e670750db..2b7dbbb4326 100644
--- a/pkgs/development/compilers/fpc/binary.nix
+++ b/pkgs/development/compilers/fpc/binary.nix
@@ -6,12 +6,12 @@ stdenv.mkDerivation {
   src =
     if stdenv.system == "i686-linux" then
       fetchurl {
-        url = "http://sourceforge.net/projects/freepascal/files/Linux/2.6.0/fpc-2.6.0.i386-linux.tar";
+        url = "mirror://sourceforge/projects/freepascal/files/Linux/2.6.0/fpc-2.6.0.i386-linux.tar";
         sha256 = "08yklvrfxvk59bxsd4rh1i6s3cjn0q06dzjs94h9fbq3n1qd5zdf";
       }
     else if stdenv.system == "x86_64-linux" then
       fetchurl {
-        url = "http://sourceforge.net/projects/freepascal/files/Linux/2.6.0/fpc-2.6.0.x86_64-linux.tar";
+        url = "mirror://sourceforge/projects/freepascal/files/Linux/2.6.0/fpc-2.6.0.x86_64-linux.tar";
         sha256 = "0k9vi75k39y735fng4jc2vppdywp82j4qhzn7x4r6qjkad64d8lx";
       }
     else throw "Not supported on ${stdenv.system}.";

From 1673b19be39c480d0f21336e83d49e3d7051ee45 Mon Sep 17 00:00:00 2001
From: J Phani Mahesh <phanimahesh@gmail.com>
Date: Sat, 20 Aug 2016 17:28:27 +0530
Subject: [PATCH 21/28] ht: switch sf downloads to mirror://

---
 pkgs/applications/editors/ht/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/ht/default.nix b/pkgs/applications/editors/ht/default.nix
index b7acdb7f1d5..86a360679bd 100644
--- a/pkgs/applications/editors/ht/default.nix
+++ b/pkgs/applications/editors/ht/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "ht-${version}";
   version = "2.1.0";
   src = fetchurl {
-    url = "http://sourceforge.net/projects/hte/files/ht-source/ht-${version}.tar.bz2";
+    url = "mirror://sourceforge/projects/hte/files/ht-source/ht-${version}.tar.bz2";
     sha256 = "0w2xnw3z9ws9qrdpb80q55h6ynhh3aziixcfn45x91bzrbifix9i";
   };
   buildInputs = [

From 6a7cc8327cf23b10fa43f419729952890f02f478 Mon Sep 17 00:00:00 2001
From: J Phani Mahesh <phanimahesh@gmail.com>
Date: Sat, 20 Aug 2016 17:29:35 +0530
Subject: [PATCH 22/28] fuseiso: switch sf downloads to mirror://

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

diff --git a/pkgs/tools/filesystems/fuseiso/default.nix b/pkgs/tools/filesystems/fuseiso/default.nix
index 161425ad137..c87e6a895c3 100644
--- a/pkgs/tools/filesystems/fuseiso/default.nix
+++ b/pkgs/tools/filesystems/fuseiso/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "fuseiso-20070708";
 
   src = fetchurl {
-    url = "http://sourceforge.net/projects/fuseiso/files/fuseiso/20070708/fuseiso-20070708.tar.bz2";
+    url = "mirror://sourceforge/projects/fuseiso/files/fuseiso/20070708/fuseiso-20070708.tar.bz2";
     sha1 = "fe142556ad35dd7e5dc31a16183232a6e2da7692";  
   };
 

From bf5d09fda9aa6188e8426196a8068edc4e62b3aa Mon Sep 17 00:00:00 2001
From: J Phani Mahesh <phanimahesh@gmail.com>
Date: Sat, 20 Aug 2016 17:30:07 +0530
Subject: [PATCH 23/28] mozart: switch sf downloads to mirror://

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

diff --git a/pkgs/development/compilers/mozart/binary.nix b/pkgs/development/compilers/mozart/binary.nix
index ae040297313..dc806d52af2 100644
--- a/pkgs/development/compilers/mozart/binary.nix
+++ b/pkgs/development/compilers/mozart/binary.nix
@@ -10,7 +10,7 @@ in stdenv.mkDerivation {
   name = "mozart-binary-${version}";
 
   src = fetchurl {
-    url = "http://sourceforge.net/projects/mozart-oz/files/v${version}-alpha.0/mozart2-${version}-alpha.0+build.4105.5c06ced-x86_64-linux.tar.gz";
+    url = "mirror://sourceforge/projects/mozart-oz/files/v${version}-alpha.0/mozart2-${version}-alpha.0+build.4105.5c06ced-x86_64-linux.tar.gz";
     sha256 = "0rsfrjimjxqbwprpzzlmydl3z3aiwg5qkb052jixdxjyad7gyh5z";
   };
 

From a466257b1de66c062504afe795b2f1861cadebb1 Mon Sep 17 00:00:00 2001
From: J Phani Mahesh <phanimahesh@gmail.com>
Date: Sat, 20 Aug 2016 17:31:37 +0530
Subject: [PATCH 24/28] srelay: switch sf downloads to mirror://

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

diff --git a/pkgs/tools/networking/srelay/default.nix b/pkgs/tools/networking/srelay/default.nix
index 853a21da73c..b8cee77f947 100644
--- a/pkgs/tools/networking/srelay/default.nix
+++ b/pkgs/tools/networking/srelay/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "srelay-0.4.8b6";
 
   src = fetchurl {
-    url = "https://sourceforge.net/projects/socks-relay/files/socks-relay/srelay-0.4.8/srelay-0.4.8b6.tar.gz";
+    url = "mirror://sourceforge/projects/socks-relay/files/socks-relay/srelay-0.4.8/srelay-0.4.8b6.tar.gz";
     sha256 = "1az9ds10hpmpw6bqk7fcd1w70001kz0mm48v3vgg2z6vrbmgn0qj";
   };
 

From 61bce9208fac6b79d5fbfec7267c717fc03cd844 Mon Sep 17 00:00:00 2001
From: J Phani Mahesh <phanimahesh@gmail.com>
Date: Sat, 20 Aug 2016 17:32:47 +0530
Subject: [PATCH 25/28] wmsystemtray: switch sf downloads to mirror://

---
 .../window-managers/windowmaker/dockapps/wmsystemtray.nix       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix b/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix
index c28d090e0bd..0d1ca29e12c 100644
--- a/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix
+++ b/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "wmsystemtray-1.4";
   src = fetchurl {
-     url = http://sourceforge.net/projects/wmsystemtray/files/wmsystemtray/wmsystemtray-1.4.tar.gz;
+     url = mirror://sourceforge/projects/wmsystemtray/files/wmsystemtray/wmsystemtray-1.4.tar.gz;
      sha256 = "8edef43691e9fff071000e29166c7c1ad420c0956e9068151061e881c8ac97e9";
   };
 

From ba0f9cfa490a867f675cca4515c998d242c255eb Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sat, 20 Aug 2016 15:14:23 +0200
Subject: [PATCH 26/28] Revert "Merge pull request #16980 from
 phanimahesh/sf-use-mirrors"

This reverts commit 217594fd1d0b4cc36c98c1605b73ccb50ce57bc8, reversing
changes made to 8e8a89d8a8f9d801f9e17d48325d06f20743b364.

Turns out it wasn't ready afterall ...
---
 pkgs/applications/backup/areca/default.nix                | 2 +-
 pkgs/applications/editors/ht/default.nix                  | 2 +-
 pkgs/applications/misc/gammu/default.nix                  | 2 +-
 pkgs/applications/misc/mlterm/default.nix                 | 2 +-
 pkgs/applications/misc/xautoclick/default.nix             | 2 +-
 .../window-managers/windowmaker/dockapps/wmsystemtray.nix | 2 +-
 pkgs/desktops/lxde/core/lxmenu-data.nix                   | 2 +-
 pkgs/development/compilers/fpc/binary.nix                 | 4 ++--
 pkgs/development/compilers/mlton/default.nix              | 8 ++++----
 pkgs/development/compilers/mozart/binary.nix              | 2 +-
 pkgs/development/tools/omniorb/default.nix                | 2 +-
 pkgs/tools/filesystems/fuseiso/default.nix                | 2 +-
 pkgs/tools/networking/srelay/default.nix                  | 2 +-
 pkgs/top-level/python-packages.nix                        | 2 +-
 14 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/pkgs/applications/backup/areca/default.nix b/pkgs/applications/backup/areca/default.nix
index 90d38712317..76913356b04 100644
--- a/pkgs/applications/backup/areca/default.nix
+++ b/pkgs/applications/backup/areca/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "areca-7.5";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/areca/areca-stable/areca-7.5/areca-7.5-src.tar.gz";
+    url = "http://downloads.sourceforge.net/project/areca/areca-stable/areca-7.5/areca-7.5-src.tar.gz";
     sha256 = "1q4ha9s96c1syplxm04bh1v1gvjq16l4pa8w25w95d2ywwvyq1xb";
   };
 
diff --git a/pkgs/applications/editors/ht/default.nix b/pkgs/applications/editors/ht/default.nix
index 86a360679bd..b7acdb7f1d5 100644
--- a/pkgs/applications/editors/ht/default.nix
+++ b/pkgs/applications/editors/ht/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "ht-${version}";
   version = "2.1.0";
   src = fetchurl {
-    url = "mirror://sourceforge/projects/hte/files/ht-source/ht-${version}.tar.bz2";
+    url = "http://sourceforge.net/projects/hte/files/ht-source/ht-${version}.tar.bz2";
     sha256 = "0w2xnw3z9ws9qrdpb80q55h6ynhh3aziixcfn45x91bzrbifix9i";
   };
   buildInputs = [
diff --git a/pkgs/applications/misc/gammu/default.nix b/pkgs/applications/misc/gammu/default.nix
index 6a18dee57b9..fc88bb3e354 100644
--- a/pkgs/applications/misc/gammu/default.nix
+++ b/pkgs/applications/misc/gammu/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   version = "1.33.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/projects/gammu/files/gammu/${version}/gammu-${version}.tar.xz";
+    url = "http://sourceforge.net/projects/gammu/files/gammu/${version}/gammu-${version}.tar.xz";
     sha256 = "18gplx1v9d70k1q86d5i4n4dfpx367g34pj3zscppx126vwhv112";
   };
 
diff --git a/pkgs/applications/misc/mlterm/default.nix b/pkgs/applications/misc/mlterm/default.nix
index d9b03fd86e1..80d0c136628 100644
--- a/pkgs/applications/misc/mlterm/default.nix
+++ b/pkgs/applications/misc/mlterm/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "3.3.8";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/mlterm/01release/${name}/${name}.tar.gz";
+    url = "https://downloads.sourceforge.net/project/mlterm/01release/${name}/${name}.tar.gz";
     sha256 = "088pgxynzxxii7wdmjp2fdkxydirx4k05588zkhlzalkb5l8ji1i";
   };
 
diff --git a/pkgs/applications/misc/xautoclick/default.nix b/pkgs/applications/misc/xautoclick/default.nix
index 1a71a2756d1..19d8a15fbfa 100644
--- a/pkgs/applications/misc/xautoclick/default.nix
+++ b/pkgs/applications/misc/xautoclick/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   version = "0.31";
   name = "xautoclick-${version}";
   src = fetchurl {
-    url = "mirror://sourceforge/project/xautoclick/xautoclick/xautoclick-0.31/xautoclick-0.31.tar.gz";
+    url = "http://downloads.sourceforge.net/project/xautoclick/xautoclick/xautoclick-0.31/xautoclick-0.31.tar.gz";
     sha256 = "0h522f12a7v2b89411xm51iwixmjp2mp90rnizjgiakx9ajnmqnm";
   };
   buildInputs = [ xorg.libX11 xorg.libXtst xorg.xinput xorg.libXi xorg.libXext pkgconfig ]
diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix b/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix
index 0d1ca29e12c..c28d090e0bd 100644
--- a/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix
+++ b/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "wmsystemtray-1.4";
   src = fetchurl {
-     url = mirror://sourceforge/projects/wmsystemtray/files/wmsystemtray/wmsystemtray-1.4.tar.gz;
+     url = http://sourceforge.net/projects/wmsystemtray/files/wmsystemtray/wmsystemtray-1.4.tar.gz;
      sha256 = "8edef43691e9fff071000e29166c7c1ad420c0956e9068151061e881c8ac97e9";
   };
 
diff --git a/pkgs/desktops/lxde/core/lxmenu-data.nix b/pkgs/desktops/lxde/core/lxmenu-data.nix
index 27a5903a61b..b75c09d2909 100644
--- a/pkgs/desktops/lxde/core/lxmenu-data.nix
+++ b/pkgs/desktops/lxde/core/lxmenu-data.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "0.1.5";
 
   src = fetchurl {
-    url = "mirror://sourceforge/lxde/${name}.tar.xz";
+    url = "http://downloads.sourceforge.net/lxde/${name}.tar.xz";
     sha256 = "9fe3218d2ef50b91190162f4f923d6524c364849f87bcda8b4ed8eb59b80bab8";
   };
 
diff --git a/pkgs/development/compilers/fpc/binary.nix b/pkgs/development/compilers/fpc/binary.nix
index 2b7dbbb4326..57e670750db 100644
--- a/pkgs/development/compilers/fpc/binary.nix
+++ b/pkgs/development/compilers/fpc/binary.nix
@@ -6,12 +6,12 @@ stdenv.mkDerivation {
   src =
     if stdenv.system == "i686-linux" then
       fetchurl {
-        url = "mirror://sourceforge/projects/freepascal/files/Linux/2.6.0/fpc-2.6.0.i386-linux.tar";
+        url = "http://sourceforge.net/projects/freepascal/files/Linux/2.6.0/fpc-2.6.0.i386-linux.tar";
         sha256 = "08yklvrfxvk59bxsd4rh1i6s3cjn0q06dzjs94h9fbq3n1qd5zdf";
       }
     else if stdenv.system == "x86_64-linux" then
       fetchurl {
-        url = "mirror://sourceforge/projects/freepascal/files/Linux/2.6.0/fpc-2.6.0.x86_64-linux.tar";
+        url = "http://sourceforge.net/projects/freepascal/files/Linux/2.6.0/fpc-2.6.0.x86_64-linux.tar";
         sha256 = "0k9vi75k39y735fng4jc2vppdywp82j4qhzn7x4r6qjkad64d8lx";
       }
     else throw "Not supported on ${stdenv.system}.";
diff --git a/pkgs/development/compilers/mlton/default.nix b/pkgs/development/compilers/mlton/default.nix
index 3b8001d563e..c4890c1ca88 100644
--- a/pkgs/development/compilers/mlton/default.nix
+++ b/pkgs/development/compilers/mlton/default.nix
@@ -15,22 +15,22 @@ stdenv.mkDerivation rec {
 
   binSrc =
     if stdenv.system == "i686-linux" then (fetchurl {
-      url = "mirror://sourceforge/projects/mlton/files/mlton/${version}/${name}-1.x86-linux.tgz";
+      url = "http://sourceforge.net/projects/mlton/files/mlton/${version}/${name}-1.x86-linux.tgz";
       sha256 = "1kxjjmnw4xk2d9hpvz43w9dvyhb3025k4zvjx785c33nrwkrdn4j";
     })
     else if stdenv.system == "x86_64-linux" then (fetchurl {
-        url = "mirror://sourceforge/projects/mlton/files/mlton/${version}/${name}-1.amd64-linux.tgz";
+        url = "http://sourceforge.net/projects/mlton/files/mlton/${version}/${name}-1.amd64-linux.tgz";
         sha256 = "0fyhwxb4nmpirjbjcvk9f6w67gmn2gkz7xcgz0xbfih9kc015ygn";
     })
     else if stdenv.system == "x86_64-darwin" then (fetchurl {
-        url = "mirror://sourceforge/projects/mlton/files/mlton/${version}/${name}-1.amd64-darwin.gmp-macports.tgz";
+        url = "http://sourceforge.net/projects/mlton/files/mlton/${version}/${name}-1.amd64-darwin.gmp-macports.tgz";
         sha256 = "044wnh9hhg6if886xy805683k0as347xd37r0r1yi4x7qlxzzgx9";
     })
     else throw "Architecture not supported";
 
   codeSrc =
     fetchurl {
-      url = "mirror://sourceforge/projects/mlton/files/mlton/${version}/${name}.src.tgz";
+      url = "http://sourceforge.net/projects/mlton/files/mlton/${version}/${name}.src.tgz";
       sha256 = "0v1x2hrh9hiqkvnbq11kf34v4i5a2x0ffxbzqaa8skyl26nmfn11";
     };
 
diff --git a/pkgs/development/compilers/mozart/binary.nix b/pkgs/development/compilers/mozart/binary.nix
index dc806d52af2..ae040297313 100644
--- a/pkgs/development/compilers/mozart/binary.nix
+++ b/pkgs/development/compilers/mozart/binary.nix
@@ -10,7 +10,7 @@ in stdenv.mkDerivation {
   name = "mozart-binary-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/projects/mozart-oz/files/v${version}-alpha.0/mozart2-${version}-alpha.0+build.4105.5c06ced-x86_64-linux.tar.gz";
+    url = "http://sourceforge.net/projects/mozart-oz/files/v${version}-alpha.0/mozart2-${version}-alpha.0+build.4105.5c06ced-x86_64-linux.tar.gz";
     sha256 = "0rsfrjimjxqbwprpzzlmydl3z3aiwg5qkb052jixdxjyad7gyh5z";
   };
 
diff --git a/pkgs/development/tools/omniorb/default.nix b/pkgs/development/tools/omniorb/default.nix
index cfe8810d6c1..0fe4b191e50 100644
--- a/pkgs/development/tools/omniorb/default.nix
+++ b/pkgs/development/tools/omniorb/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   version = "4.2.0";
 
   src = fetchurl rec {
-    url = "mirror://sourceforge/projects/omniorb/files/omniORB/omniORB-${version}/omniORB-${version}.tar.bz2";
+    url = "http://sourceforge.net/projects/omniorb/files/omniORB/omniORB-${version}/omniORB-${version}.tar.bz2";
     sha256 = "1g58xcw4641wyisp9wscrkzaqrz0vf123dgy52qq2a3wk7y77hkl";
   };
 
diff --git a/pkgs/tools/filesystems/fuseiso/default.nix b/pkgs/tools/filesystems/fuseiso/default.nix
index c87e6a895c3..161425ad137 100644
--- a/pkgs/tools/filesystems/fuseiso/default.nix
+++ b/pkgs/tools/filesystems/fuseiso/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "fuseiso-20070708";
 
   src = fetchurl {
-    url = "mirror://sourceforge/projects/fuseiso/files/fuseiso/20070708/fuseiso-20070708.tar.bz2";
+    url = "http://sourceforge.net/projects/fuseiso/files/fuseiso/20070708/fuseiso-20070708.tar.bz2";
     sha1 = "fe142556ad35dd7e5dc31a16183232a6e2da7692";  
   };
 
diff --git a/pkgs/tools/networking/srelay/default.nix b/pkgs/tools/networking/srelay/default.nix
index b8cee77f947..853a21da73c 100644
--- a/pkgs/tools/networking/srelay/default.nix
+++ b/pkgs/tools/networking/srelay/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "srelay-0.4.8b6";
 
   src = fetchurl {
-    url = "mirror://sourceforge/projects/socks-relay/files/socks-relay/srelay-0.4.8/srelay-0.4.8b6.tar.gz";
+    url = "https://sourceforge.net/projects/socks-relay/files/socks-relay/srelay-0.4.8/srelay-0.4.8b6.tar.gz";
     sha256 = "1az9ds10hpmpw6bqk7fcd1w70001kz0mm48v3vgg2z6vrbmgn0qj";
   };
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6f94a8fa40b..d39c8d85cdd 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3308,7 +3308,7 @@ in modules // {
     disabled = isPy3k;
 
     src = pkgs.fetchurl {
-      url = "mirror://sourceforge/project/cgkit/cgkit/cgkit-${version}/cgkit-${version}-py2k.tar.gz";
+      url = "http://downloads.sourceforge.net/project/cgkit/cgkit/cgkit-${version}/cgkit-${version}-py2k.tar.gz";
       sha256 = "0vvllc42mdyma3c7yqhahs4bfxymm2kvmc4va7dxqr5x0rzh6rd6";
     };
 

From ff7eda555b3f154fb2bbf44c4b9f03ec30b5093a Mon Sep 17 00:00:00 2001
From: Ram Kromberg <ramkromberg@mail.com>
Date: Sat, 20 Aug 2016 16:37:06 +0300
Subject: [PATCH 27/28] vala: 0.32.0 -> 0.32.1

---
 pkgs/development/compilers/vala/0.32.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/vala/0.32.nix b/pkgs/development/compilers/vala/0.32.nix
index 8ae76ec1b05..202b9fff6c8 100644
--- a/pkgs/development/compilers/vala/0.32.nix
+++ b/pkgs/development/compilers/vala/0.32.nix
@@ -4,8 +4,8 @@
 
 let
   major = "0.32";
-  minor = "0";
-  sha256 = "0vpvq403vdd25irvgk7zibz3nw4x4i17m0dgnns8j1q4vr7am8h7";
+  minor = "1";
+  sha256 = "1ab1l44abf9fj1wznzq5956431ia136rl5049cggnk5393jlf3fx";
 in
 stdenv.mkDerivation rec {
   name = "vala-${major}.${minor}";
@@ -27,4 +27,5 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ glib libiconv ]
     ++ libintlOrEmpty;
+
 }

From af15e057f48e25b22fb5c12bc48ec900e22fc706 Mon Sep 17 00:00:00 2001
From: Joachim Schiele <js@lastlog.de>
Date: Sat, 20 Aug 2016 16:01:56 +0200
Subject: [PATCH 28/28] leaps v0.5.0 init

---
 pkgs/development/tools/leaps/default.nix | 25 ++++++++++++++++++++++++
 pkgs/development/tools/leaps/deps.json   | 11 +++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 3 files changed, 38 insertions(+)
 create mode 100644 pkgs/development/tools/leaps/default.nix
 create mode 100644 pkgs/development/tools/leaps/deps.json

diff --git a/pkgs/development/tools/leaps/default.nix b/pkgs/development/tools/leaps/default.nix
new file mode 100644
index 00000000000..c80861b2fd7
--- /dev/null
+++ b/pkgs/development/tools/leaps/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+buildGoPackage rec {
+  name = "leaps-${version}";
+  version = "20160626-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "5cf7328a8c498041d2a887e89f22f138498f4621";
+
+  goPackagePath = "github.com/jeffail/leaps";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/jeffail/leaps";
+    sha256 = "1qbgz48x9yi0w9yz39zsnnhx5nx2xmrns9v8hx28jah2bvag6sq7";
+    fetchSubmodules = false;  
+  };
+
+  goDeps = ./deps.json;
+  meta = {
+    description = "A pair programming tool and library written in Golang";
+    homepage = "https://github.com/jeffail/leaps/";
+    license = "MIT";
+    maintainers = with stdenv.lib.maintainers; [ qknight ];
+    meta.platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/development/tools/leaps/deps.json b/pkgs/development/tools/leaps/deps.json
new file mode 100644
index 00000000000..60141d5eeee
--- /dev/null
+++ b/pkgs/development/tools/leaps/deps.json
@@ -0,0 +1,11 @@
+[
+  {
+   "goPackagePath": "golang.org/x/net",
+    "fetch": {
+      "type": "git",
+       "url": "https://go.googlesource.com/net",
+       "rev": "07b51741c1d6423d4a6abab1c49940ec09cb1aaf",
+       "sha256": "12lvdj0k2gww4hw5f79qb9yswqpy4i3bgv1likmf3mllgdxfm20w"
+    }
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 45b0cec8654..be823f2dfbe 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9987,6 +9987,8 @@ in
 
   go2nix = callPackage ../development/tools/go2nix { };
 
+  leaps = callPackage ../development/tools/leaps { };
+
   ### DEVELOPMENT / LISP MODULES
 
   asdf = callPackage ../development/lisp-modules/asdf {