Merge branch 'master' into staging

... to get the ffmpeg changes which cause nontrivial rebuilds.

lib/maintainers.nix

@@ -13,8 +13,8 @@
   aboseley = "Adam Boseley <adam.boseley@gmail.com>";
   adev = "Adrien Devresse <adev@adev.name>";
   Adjective-Object = "Maxwell Huang-Hobbs <mhuan13@gmail.com>";
-  aespinosa = "Allan Espinosa <allan.espinosa@outlook.com>";
   adnelson = "Allen Nelson <ithinkican@gmail.com>";
+  aespinosa = "Allan Espinosa <allan.espinosa@outlook.com>";
   aflatter = "Alexander Flatter <flatter@fastmail.fm>";
   aforemny = "Alexander Foremny <alexanderforemny@googlemail.com>";
   afranchuk = "Alex Franchuk <alex.franchuk@gmail.com>";
@@ -147,9 +147,9 @@
   giogadi = "Luis G. Torres <lgtorres42@gmail.com>";
   gleber = "Gleb Peregud <gleber.p@gmail.com>";
   globin = "Robin Gloster <mail@glob.in>";
-  gpyh = "Yacine Hmito <yacine.hmito@gmail.com>";
   goibhniu = "Cillian de Róiste <cillian.deroiste@gmail.com>";
   Gonzih = "Max Gonzih <gonzih@gmail.com>";
+  gpyh = "Yacine Hmito <yacine.hmito@gmail.com>";
   gridaphobe = "Eric Seidel <eric@seidel.io>";
   guibert = "David Guibert <david.guibert@gmail.com>";
   havvy = "Ryan Scheel <ryan.havvy@gmail.com>";
@@ -179,6 +179,7 @@
   joelteon = "Joel Taylor <me@joelt.io>";
   jpbernardy = "Jean-Philippe Bernardy <jeanphilippe.bernardy@gmail.com>";
   jraygauthier = "Raymond Gauthier <jraygauthier@gmail.com>";
+  juliendehos = "Julien Dehos <dehos@lisic.univ-littoral.fr>";
   jwiegley = "John Wiegley <johnw@newartisans.com>";
   jwilberding = "Jordan Wilberding <jwilberding@afiniate.com>";
   jzellner = "Jeff Zellner <jeffz@eml.cc>";
@@ -225,9 +226,9 @@
   matejc = "Matej Cotman <cotman.matej@gmail.com>";
   mathnerd314 = "Mathnerd314 <mathnerd314.gph+hs@gmail.com>";
   matthiasbeyer = "Matthias Beyer <mail@beyermatthias.de>";
-  mbauer = "Matthew Bauer <mjbauer95@gmail.com>";
   maurer = "Matthew Maurer <matthew.r.maurer+nix@gmail.com>";
   mbakke = "Marius Bakke <ymse@tuta.io>";
+  mbauer = "Matthew Bauer <mjbauer95@gmail.com>";
   mbe = "Brandon Edens <brandonedens@gmail.com>";
   mboes = "Mathieu Boespflug <mboes@tweag.net>";
   mcmtroffaes = "Matthias C. M. Troffaes <matthias.troffaes@gmail.com>";
@@ -260,7 +261,7 @@
   notthemessiah = "Brian Cohen <brian.cohen.88@gmail.com>";
   np = "Nicolas Pouillard <np.nix@nicolaspouillard.fr>";
   nslqqq = "Nikita Mikhailov <nslqqq@gmail.com>";
-  obadz = "obadz <nixos@obadz.com>";
+  obadz = "obadz <obadz-nixos@obadz.com>";
   ocharles = "Oliver Charles <ollie@ocharles.org.uk>";
   odi = "Oliver Dunkl <oliver.dunkl@gmail.com>";
   offline = "Jaka Hudoklin <jakahudoklin@gmail.com>";
@@ -276,6 +277,7 @@
   pashev = "Igor Pashev <pashev.igor@gmail.com>";
   pesterhazy = "Paulus Esterhazy <pesterhazy@gmail.com>";
   peterhoeg = "Peter Hoeg <peter@hoeg.com>";
+  peti = "Peter Simons <simons@cryp.to>";
   philandstuff = "Philip Potter <philip.g.potter@gmail.com>";
   phile314 = "Philipp Hausmann <nix@314.ch>";
   Phlogistique = "Noé Rubinstein <noe.rubinstein@gmail.com>";
@@ -328,11 +330,11 @@
   schristo = "Scott Christopher <schristopher@konputa.com>";
   scolobb = "Sergiu Ivanov <sivanov@colimite.fr>";
   sepi = "Raffael Mancini <raffael@mancini.lu>";
+  seppeljordan = "Sebastian Jordan <sebastian.jordan.mail@googlemail.com>";
   sheenobu = "Sheena Artrip <sheena.artrip@gmail.com>";
   sheganinans = "Aistis Raulinaitis <sheganinans@gmail.com>";
   shell = "Shell Turner <cam.turn@gmail.com>";
   shlevy = "Shea Levy <shea@shealevy.com>";
-  simons = "Peter Simons <simons@cryp.to>";
   simonvandel = "Simon Vandel Sillesen <simon.vandel@gmail.com>";
   sjagoe = "Simon Jagoe <simon@simonjagoe.com>";
   sjmackenzie = "Stewart Mackenzie <setori88@gmail.com>";

maintainers/scripts/travis-nox-review-pr.sh

@@ -23,12 +23,12 @@ elif [[ $1 == nox ]]; then
 elif [[ $1 == build ]]; then
     source $HOME/.nix-profile/etc/profile.d/nix.sh
 
+    echo "=== Checking NixOS options"
+    nix-build nixos/release.nix -A options
+
     echo "=== Checking tarball creation"
     nix-build pkgs/top-level/release.nix -A tarball
 
-    echo "=== Checking NixOS options"
-    nix-build --show-trace nixos/release.nix -A options
-
     if [[ $TRAVIS_PULL_REQUEST == false ]]; then
         echo "=== Not a pull request"
     else

nixos/modules/misc/ids.nix

@@ -266,6 +266,7 @@
       emby = 242;
       graylog = 243;
       sniproxy = 244;
+      nzbget = 245;
 
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
@@ -502,6 +503,7 @@
       factorio = 241;
       emby = 242;
       sniproxy = 244;
+      nzbget = 245;
 
       # When adding a gid, make sure it doesn't match an existing
       # uid. Users and groups with the same name should have equal

nixos/modules/module-list.nix

@@ -239,6 +239,7 @@
   ./services/misc/nix-gc.nix
   ./services/misc/nixos-manual.nix
   ./services/misc/nix-ssh-serve.nix
+  ./services/misc/nzbget.nix
   ./services/misc/octoprint.nix
   ./services/misc/parsoid.nix
   ./services/misc/phd.nix

nixos/modules/security/pam.nix

@@ -471,6 +471,7 @@ in
         cups = {};
         ftp = {};
         i3lock = {};
+        i3lock-color = {};
         screen = {};
         vlock = {};
         xlock = {};

nixos/modules/services/games/minetest-server.nix

@@ -97,7 +97,7 @@ in
       script = ''
         cd /var/lib/minetest
 
-        exec ${pkgs.minetest}/bin/minetestserver ${concatStrings flags}
+        exec ${pkgs.minetest}/bin/minetest --server ${concatStrings flags}
       '';
     };
   };

nixos/modules/services/misc/nzbget.nix

@@ -0,0 +1,85 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+let
+  cfg = config.services.nzbget;
+  nzbget = pkgs.nzbget;
+in
+{
+  options = {
+    services.nzbget = {
+      enable = mkEnableOption "NZBGet";
+
+      package = mkOption {
+        type = types.package;
+        default = pkgs.nzbget;
+        defaultText = "pkgs.nzbget";
+        description = "The NZBGet package to use";
+      };
+
+      user = mkOption {
+        type = types.str;
+        default = "nzbget";
+        description = "User account under which NZBGet runs";
+      };
+
+      group = mkOption {
+        type = types.str;
+        default = "nzbget";
+        description = "Group under which NZBGet runs";
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    systemd.services.nzbget = {
+      description = "NZBGet Daemon";
+      after = [ "network.target" ];
+      wantedBy = [ "multi-user.target" ];
+      path = with pkgs; [
+        unrar
+        p7zip
+      ];
+      preStart = ''
+        test -d /var/lib/nzbget || {
+          echo "Creating nzbget state directoy in /var/lib/"
+          mkdir -p /var/lib/nzbget
+        }
+        test -f /var/lib/nzbget/nzbget.conf || {
+          echo "nzbget.conf not found. Copying default config to /var/lib/nzbget/nzbget.conf"
+          cp ${cfg.package}/share/nzbget/nzbget.conf /var/lib/nzbget/nzbget.conf
+          echo "Setting file mode of nzbget.conf to 0700 (needs to be written and contains plaintext credentials)"
+          chmod 0700 /var/lib/nzbget/nzbget.conf
+          echo "Setting temporary \$MAINDIR variable in default config required in order to allow nzbget to complete initial start"
+          echo "Remember to change this to a proper value once NZBGet startup has been completed"
+          sed -i -e 's/MainDir=.*/MainDir=\/tmp/g' /var/lib/nzbget/nzbget.conf
+        }
+        echo "Ensuring proper ownership of /var/lib/nzbget (${cfg.user}:${cfg.group})."
+        chown -R ${cfg.user}:${cfg.group} /var/lib/nzbget
+      '';
+
+      serviceConfig = {
+        Type = "forking";
+        User = cfg.user;
+        Group = cfg.group;
+        PermissionsStartOnly = "true";
+        ExecStart = "${cfg.package}/bin/nzbget --daemon --configfile /var/lib/nzbget/nzbget.conf";
+        Restart = "on-failure";
+      };
+    };
+
+    users.extraUsers = mkIf (cfg.user == "nzbget") {
+      nzbget = {
+        group = cfg.group;
+        uid = config.ids.uids.nzbget;
+      };
+    };
+
+    users.extraGroups = mkIf (cfg.group == "nzbget") {
+      nzbget = {
+        gid = config.ids.gids.nzbget;
+      };
+    };
+  };
+}

nixos/modules/services/networking/dnscrypt-proxy.nix

@@ -162,7 +162,7 @@ in
         /etc/group r,
         ${config.environment.etc."nsswitch.conf".source} r,
 
-        ${pkgs.glibc.out}/lib/*.so mr,
+        ${getLib pkgs.glibc}/lib/*.so mr,
         ${pkgs.tzdata}/share/zoneinfo/** r,
 
         network inet stream,
@@ -170,15 +170,15 @@ in
         network inet dgram,
         network inet6 dgram,
 
-        ${pkgs.gcc.cc.lib}/lib/libssp.so.* mr,
+        ${getLib pkgs.gcc.cc}/lib/libssp.so.* mr,
-        ${pkgs.libsodium.out}/lib/libsodium.so.* mr,
+        ${getLib pkgs.libsodium}/lib/libsodium.so.* mr,
-        ${pkgs.systemd}/lib/libsystemd.so.* mr,
+        ${getLib pkgs.systemd}/lib/libsystemd.so.* mr,
-        ${pkgs.xz.out}/lib/liblzma.so.* mr,
+        ${getLib pkgs.xz}/lib/liblzma.so.* mr,
-        ${pkgs.libgcrypt.out}/lib/libgcrypt.so.* mr,
+        ${getLib pkgs.libgcrypt}/lib/libgcrypt.so.* mr,
-        ${pkgs.libgpgerror.out}/lib/libgpg-error.so.* mr,
+        ${getLib pkgs.libgpgerror}/lib/libgpg-error.so.* mr,
-        ${pkgs.libcap.lib}/lib/libcap.so.* mr,
+        ${getLib pkgs.libcap}/lib/libcap.so.* mr,
-        ${pkgs.lz4}/lib/liblz4.so.* mr,
+        ${getLib pkgs.lz4}/lib/liblz4.so.* mr,
-        ${pkgs.attr.out}/lib/libattr.so.* mr,
+        ${getLib pkgs.attr}/lib/libattr.so.* mr,
 
         ${cfg.resolverList} r,
       }

nixos/modules/services/x11/desktop-managers/xfce.nix

@@ -75,7 +75,7 @@ in
         pkgs.xfce.xfce4settings
         pkgs.xfce.xfce4mixer
         pkgs.xfce.xfce4volumed
-        pkgs.xfce.xfce4screenshooter
+        pkgs.xfce.xfce4-screenshooter
         pkgs.xfce.xfconf
         pkgs.xfce.xfwm4
         # This supplies some "abstract" icons such as

pkgs/applications/audio/audacious/default.nix

@@ -60,7 +60,7 @@ stdenv.mkDerivation {
   meta = {
     description = "Audio player";
     homepage = http://audacious-media-player.org/;
-    maintainers = with stdenv.lib.maintainers; [ eelco simons ];
+    maintainers = with stdenv.lib.maintainers; [ eelco ];
     platforms = stdenv.lib.platforms.linux;
   };
 }

pkgs/applications/audio/quodlibet/default.nix

@@ -11,8 +11,7 @@ let version = "2.6.3"; in
 
 buildPythonApplication {
   # call the package quodlibet and just quodlibet
-  name = "quodlibet-${version}"
+  name = "quodlibet${stdenv.lib.optionalString withGstPlugins "-with-gst-plugins"}-${version}";
-         + stdenv.lib.optionalString withGstPlugins "-with-gst-plugins";
   namePrefix = "";
 
   # XXX, tests fail

pkgs/applications/editors/atom/default.nix

@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "atom-${version}";
-  version = "1.6.2";
+  version = "1.7.3";
 
   src = fetchurl {
     url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb";
-    sha256 = "1kl2pc0smacn4lgk5wwlaiw03rm8b0763vaisgp843p35zzsbc9n";
+    sha256 = "1fd6j05czir2z3bvkf0mixkfncp73jw8kgqgaqxjjg546381yb7a";
     name = "${name}.deb";
   };
 

pkgs/applications/editors/ed/default.nix

@@ -1,7 +1,7 @@
 { fetchurl, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "ed-1.12";
+  name = "ed-1.13";
 
   src = fetchurl {
     # gnu only provides *.lz tarball, which is unfriendly for stdenv bootstrapping
@@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
     # When updating, please make sure the sources pulled match those upstream by
     # Unpacking both tarballs and running `find . -type f -exec sha256sum \{\} \; | sha256sum`
     # in the resulting directory
-    url = "http://fossies.org/linux/privat/${name}.tar.gz";
+    url = "http://fossies.org/linux/privat/${name}.tar.bz2";
-    sha256 = "111ci6x43bcmylqhrzr32l0q8pplmpb4kiq5pb6cyp0yxkb2dhgj";
+    sha256 = "1iym2fsamxr886l3sz8lqzgf00bip5cr0aly8jp04f89kf5mvl0j";
   };
 
   /* FIXME: Tests currently fail on Darwin:

pkgs/applications/editors/emacs-24/default.nix

@@ -83,7 +83,7 @@ stdenv.mkDerivation rec {
     description = "GNU Emacs 24, the extensible, customizable text editor";
     homepage    = http://www.gnu.org/software/emacs/;
     license     = licenses.gpl3Plus;
-    maintainers = with maintainers; [ chaoflow lovek323 simons the-kenny jwiegley ];
+    maintainers = with maintainers; [ chaoflow lovek323 peti the-kenny jwiegley ];
     platforms   = platforms.all;
 
     longDescription = ''

pkgs/applications/editors/emacs-25/default.nix

@@ -83,7 +83,7 @@ stdenv.mkDerivation rec {
     description = "GNU Emacs 25 (pre), the extensible, customizable text editor";
     homepage    = http://www.gnu.org/software/emacs/;
     license     = licenses.gpl3Plus;
-    maintainers = with maintainers; [ chaoflow lovek323 simons the-kenny jwiegley ];
+    maintainers = with maintainers; [ chaoflow lovek323 peti the-kenny jwiegley ];
     platforms   = platforms.all;
 
     longDescription = ''

pkgs/applications/editors/emacs-modes/haskell/default.nix

@@ -34,6 +34,6 @@ stdenv.mkDerivation {
     description = "Haskell mode for Emacs";
 
     platforms = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.simons ];
+    maintainers = [ stdenv.lib.maintainers.peti ];
   };
 }

pkgs/applications/editors/emacs-modes/icicles/default.nix

@@ -36,7 +36,5 @@ stdenv.mkDerivation {
     homepage = "http://www.emacswiki.org/emacs/Icicles";
     description = "Enhance Emacs minibuffer input with cycling and powerful completion";
     license = stdenv.lib.licenses.gpl2Plus;
-
-    maintainers = with stdenv.lib.maintainers; [ simons ];
   };
 }

pkgs/applications/editors/emacs-modes/let-alist/default.nix

@@ -22,6 +22,5 @@ stdenv.mkDerivation rec {
     homepage = "http://elpa.gnu.org/packages/let-alist.html";
     description = "Easily let-bind values of an assoc-list by their names";
     license = stdenv.lib.licenses.gpl3Plus;
-    maintainers = with stdenv.lib.maintainers; [ simons ];
   };
 }

pkgs/applications/editors/emacs-modes/maude/default.nix

@@ -15,6 +15,6 @@ stdenv.mkDerivation {
     description = "Emacs mode for the programming language Maude";
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.simons ];
+    maintainers = [ stdenv.lib.maintainers.peti ];
   };
 }

pkgs/applications/editors/joe/default.nix

@@ -1,12 +1,12 @@
 { stdenv, fetchurl } :
 
 stdenv.mkDerivation rec {
-  version = "4.1";
+  version = "4.2";
   name = "joe-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/joe-editor/${name}.tar.gz";
-    sha256 = "1nznzr9h0rh8g15c56yxzwpn2labx9sgsak0wcnpj7wmpnr12ql1";
+    sha256 = "0x39x0qrwdbhl45wd8r8cpzigsip6m5j2crajsrbffk8qm5scpdw";
   };
 
   meta = with stdenv.lib; {

pkgs/applications/graphics/gocr/default.nix

@@ -16,8 +16,6 @@ stdenv.mkDerivation rec {
     homepage = "http://jocr.sourceforge.net/";
     description = "GPL Optical Character Recognition";
     license = stdenv.lib.licenses.gpl2;
-
     platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.simons ];
   };
 }

pkgs/applications/graphics/sane/backends/generic.nix

@@ -70,7 +70,7 @@ stdenv.mkDerivation {
     homepage = "http://www.sane-project.org/";
     license = licenses.gpl2Plus;
 
-    maintainers = with maintainers; [ nckx simons ];
+    maintainers = with maintainers; [ nckx peti ];
     platforms = platforms.linux;
   };
 }

pkgs/applications/graphics/sane/frontends.nix

@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     description = "Scanner Access Now Easy";
     license = stdenv.lib.licenses.gpl2Plus;
 
-    maintainers = [ stdenv.lib.maintainers.simons ];
+    maintainers = [ stdenv.lib.maintainers.peti ];
     platforms = stdenv.lib.platforms.linux;
   };
 }

pkgs/applications/graphics/sane/xsane.nix

@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     homepage = http://www.sane-project.org/;
     description = "Graphical scanning frontend for sane";
     license = stdenv.lib.licenses.gpl2Plus;
-    maintainers = with stdenv.lib.maintainers; [viric simons];
+    maintainers = with stdenv.lib.maintainers; [viric peti];
     platforms = with stdenv.lib.platforms; linux;
   };
 }

pkgs/applications/graphics/synfigstudio/default.nix

@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, boost, cairo, fontsConf, gettext, glibmm, gtk3, gtkmm3
 , libjack2, libsigcxx, libtool, libxmlxx, makeWrapper, mlt-qt5, pango, pkgconfig
-, imagemagick, intltool, autoreconfHook, which
+, imagemagick, intltool, autoreconfHook, which, defaultIconTheme
 }:
 
 let
@@ -56,12 +56,53 @@ stdenv.mkDerivation rec {
 
   postUnpack = "sourceRoot=\${sourceRoot}/synfig-studio/";
 
+  postPatch = ''
+    for i in \
+      brushlib/brushlib.hpp \
+      gui/canvasview.cpp \
+      gui/compview.cpp \
+      gui/docks/dock_canvasspecific.cpp \
+      gui/docks/dock_children.cpp \
+      gui/docks/dock_curves.cpp \
+      gui/docks/dock_history.cpp \
+      gui/docks/dock_keyframes.cpp \
+      gui/docks/dock_layergroups.cpp \
+      gui/docks/dock_layers.cpp \
+      gui/docks/dock_metadata.cpp \
+      gui/docks/dock_params.cpp \
+      gui/docks/dock_timetrack.cpp \
+      gui/docks/dock_toolbox.cpp \
+      gui/docks/dockable.cpp \
+      gui/docks/dockdialog.cpp \
+      gui/docks/dockmanager.h \
+      gui/duck.h \
+      gui/duckmatic.cpp \
+      gui/duckmatic.h \
+      gui/instance.cpp \
+      gui/instance.h \
+      gui/states/state_stroke.h \
+      gui/states/state_zoom.cpp \
+      gui/widgets/widget_curves.cpp \
+      gui/workarea.cpp \
+      gui/workarearenderer/workarearenderer.h \
+      synfigapp/action_system.h \
+      synfigapp/canvasinterface.h \
+      synfigapp/instance.h \
+      synfigapp/main.h \
+      synfigapp/uimanager.h
+    do
+      substituteInPlace src/"$i" --replace '#include <sigc++/object.h>' '#include <sigc++/sigc++.h>'
+      substituteInPlace src/"$i" --replace '#include <sigc++/hide.h>' '#include <sigc++/adaptors/hide.h>'
+      substituteInPlace src/"$i" --replace '#include <sigc++/retype.h>' '#include <sigc++/adaptors/retype.h>'
+    done
+  '';
+
   preConfigure = "./bootstrap.sh";
 
   buildInputs = [
     ETL boost cairo gettext glibmm gtk3 gtkmm3 imagemagick intltool
     libjack2 libsigcxx libxmlxx makeWrapper mlt-qt5 pkgconfig
-    synfig autoreconfHook which
+    synfig autoreconfHook which defaultIconTheme
   ];
 
   postInstall = ''

pkgs/applications/misc/fetchmail/default.nix

@@ -28,6 +28,6 @@ stdenv.mkDerivation {
     '';
 
     platforms = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.simons ];
+    maintainers = [ stdenv.lib.maintainers.peti ];
   };
 }

pkgs/applications/misc/grip/default.nix

@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     homepage = "http://nostatic.org/grip";
     license = stdenv.lib.licenses.gpl2;
 
-    maintainers = [ stdenv.lib.maintainers.marcweber stdenv.lib.maintainers.simons ];
+    maintainers = with stdenv.lib.maintainers; [ marcweber peti ];
     platforms = stdenv.lib.platforms.linux;
   };
 }

pkgs/applications/misc/ikiwiki/default.nix

@@ -86,6 +86,6 @@ stdenv.mkDerivation {
     license = stdenv.lib.licenses.gpl2Plus;
 
     platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.simons ];
+    maintainers = [ stdenv.lib.maintainers.peti ];
   };
 }

pkgs/applications/misc/jbidwatcher/default.nix

@@ -45,6 +45,5 @@ stdenv.mkDerivation rec {
     '';
 
     platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
-    maintainers = [ stdenv.lib.maintainers.simons ];
   };
 }

pkgs/applications/misc/keepass/default.nix

@@ -8,11 +8,11 @@
 # plugin derivations in the Nix store and nowhere else.
 with builtins; buildDotnetPackage rec {
   baseName = "keepass";
-  version = "2.32";
+  version = "2.33";
 
   src = fetchurl {
     url = "mirror://sourceforge/keepass/KeePass-${version}-Source.zip";
-    sha256 = "11bkflmqrpfk95v2j7pjcm78nilx2s611mn2x7kxwn77ilnbcjbw";
+    sha256 = "0n4rkx2awyq1gbqiby1lkf2zw82brji96s4fkjsahmci528a882i";
   };
 
   sourceRoot = ".";

pkgs/applications/misc/mupdf/default.nix

@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   name = "mupdf-${version}";
 
   src = fetchurl {
-    url = "http://mupdf.com/download/archive/${name}-source.tar.gz";
+    url = "http://mupdf.com/downloads/archive/${name}-source.tar.gz";
     sha256 = "01n26cy41lc2fjri63s4js23ixxb4nd37aafry3hz4i4id6wd8x2";
   };
 

pkgs/applications/misc/rofi-menugen/default.nix

@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub, rofi, gnused }:
+
+stdenv.mkDerivation rec {
+  rev = "168efd2608fdb88b1aff3e0244bda8402169f207";
+  name = "rofi-menugen-2015-12-28-${builtins.substring 0 7 rev}";
+  src = fetchFromGitHub {
+    owner = "octotep";
+    repo = "menugen";
+    inherit rev;
+    sha256 = "09fk9i6crw772qlc5zld35pcff1jq4jcag0syial2q000fbpjx5m";
+  };
+  patchPhase = ''
+    sed -i -e "s|menugenbase|$out/bin/rofi-menugenbase|" menugen
+    sed -i -e "s|rofi |${rofi}/bin/rofi |" menugen
+    sed -i -e "s|sed |${gnused}/bin/sed |" menugenbase
+  '';
+  installPhase = ''
+    mkdir -p $out/bin
+    cp menugen $out/bin/rofi-menugen
+    cp menugenbase $out/bin/rofi-menugenbase
+  '';
+  meta = with stdenv.lib; {
+    description = "Generates menu based applications using rofi";
+    homepage = https://github.com/octotep/menugen;
+    maintainers = with maintainers; [ garbas ];
+    platforms = platforms.all;
+  };
+}

pkgs/applications/misc/rofi/default.nix

@@ -1,16 +1,15 @@
-{ stdenv, fetchurl, autoreconfHook, pkgconfig
+{ stdenv, fetchurl, autoreconfHook, pkgconfig, libX11, libxkbcommon, pango
-, libX11, libxkbcommon, pango, cairo, glib
+, cairo, glib, libxcb, xcbutil, xcbutilwm, which, git, libstartup_notification
-, libxcb, xcbutil, xcbutilwm, which, git
+, i3Support ? false, i3
-, libstartup_notification, i3Support ? false, i3
 }:
 
 stdenv.mkDerivation rec {
+  version = "1.0.1";
   name = "rofi-${version}";
-  version = "1.0.0";
 
   src = fetchurl {
     url = "https://github.com/DaveDavenport/rofi/releases/download/${version}/${name}.tar.xz";
-    sha256 = "0ard95pjgykafm5ga8lfy7x206f07lrc6kara5s9irlhdgblq2m5";
+    sha256 = "01jxml9vk4cw7pngpan7dipmb98s6ibh6f0023lw3hbgxy650637";
   };
 
   preConfigure = ''
@@ -20,16 +19,13 @@ stdenv.mkDerivation rec {
   '';
 
   buildInputs = [ autoreconfHook pkgconfig libX11 libxkbcommon pango
-                  cairo libstartup_notification libxcb xcbutil xcbutilwm
+    cairo libstartup_notification libxcb xcbutil xcbutilwm which git
-                  which git
+  ] ++ stdenv.lib.optional i3Support i3;
-                ] ++ stdenv.lib.optional i3Support i3;
 
-  doCheck = true;
+  meta = with stdenv.lib; {
-
+    description = "Window switcher, run dialog and dmenu replacement";
-  meta = {
+    homepage = https://davedavenport.github.io/rofi;
-      description = "Window switcher, run dialog and dmenu replacement";
+    license = licenses.mit;
-      homepage = https://davedavenport.github.io/rofi;
+    maintainers = with maintainers; [ mbakke garbas ];
-      license = stdenv.lib.licenses.mit;
-      maintainers = [ stdenv.lib.maintainers.mbakke ];
   };
 }

pkgs/applications/misc/rxvt_unicode-plugins/urxvt-theme-switch/default.nix

@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  rev = "cfcbcc3dd5a5b09a3fec0f6a1fea95f4a36a48c4";
+  name = "urxvt-theme-switch-2014-12-21_rev${builtins.substring 0 1 rev}";
+  dontPatchShebangs = true;
+
+  src = fetchFromGitHub {
+    owner = "felixr";
+    repo = "urxvt-theme-switch";
+    inherit rev;
+    sha256 = "0x27m1vdqprn3lqpwgxvffill7prmaj6j9rhgvkvi13mzl5wmlli";
+  };
+
+  installPhase = ''
+    mkdir -p $out/lib/urxvt/perl
+    sed -i -e "s|/usr/bin/env||" color-themes
+    cp color-themes $out/lib/urxvt/perl
+  '';
+
+  meta = with stdenv.lib; {
+    description = "";
+    homepage = "";
+    license = "CCBYNC";
+    maintainers = with maintainers; [ garbas ];
+  };
+}

pkgs/applications/misc/rxvt_unicode/default.nix

@@ -3,14 +3,13 @@
   unicode3Support }:
 
 let
-  name = "rxvt-unicode";
+  pname = "rxvt-unicode";
   version = "9.22";
-  n = "${name}-${version}";
 in
 
 stdenv.mkDerivation (rec {
 
-  name = "${n}${if perlSupport then "-with-perl" else ""}${if unicode3Support then "-with-unicode3" else ""}";
+  name = "${pname}${if perlSupport then "-with-perl" else ""}${if unicode3Support then "-with-unicode3" else ""}-${version}";
 
   src = fetchurl {
     url = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${version}.tar.bz2";

pkgs/applications/misc/rxvt_unicode/wrapper.nix

@@ -4,9 +4,10 @@ let
   rxvt = rxvt_unicode.override {
     perlSupport = true;
   };
+  rxvt_name = builtins.parseDrvName rxvt.name;
 
 in symlinkJoin {
-  name = "${rxvt.name}-with-plugins";
+  name = "${rxvt_name.name}-with-plugins-${rxvt_name.version}";
 
   paths = [ rxvt ] ++ plugins;
 

pkgs/applications/misc/termite/default.nix

@@ -1,34 +1,47 @@
-{ stdenv, fetchgit, pkgconfig, vte, gtk3, ncurses }:
+{ stdenv, fetchgit, pkgconfig, vte, gtk3, ncurses, makeWrapper
+, configFile ? null
+}:
 
-stdenv.mkDerivation rec {
+let 
-  name = "termite-${version}";
   version = "11";
+  termite = stdenv.mkDerivation {
+    name = "termite-${version}";
 
-  src = fetchgit {
+    src = fetchgit {
-    url = "https://github.com/thestinger/termite";
+      url = "https://github.com/thestinger/termite";
-    rev = "refs/tags/v${version}";
+      rev = "refs/tags/v${version}";
-    sha256 = "1k91nw19c0p5ghqhs00mn9npa91idfkyiwik3ng6hb4jbnblp5ph";
+      sha256 = "1k91nw19c0p5ghqhs00mn9npa91idfkyiwik3ng6hb4jbnblp5ph";
+    };
+
+    makeFlags = [ "VERSION=v${version}" "PREFIX=" "DESTDIR=$(out)" ];
+
+    buildInputs = [ pkgconfig vte gtk3 ncurses ];
+
+    outputs = [ "out" "terminfo" ];
+
+    postInstall = ''
+      mkdir -p $terminfo/share
+      mv $out/share/terminfo $terminfo/share/terminfo
+
+      mkdir -p $out/nix-support
+      echo "$terminfo" >> $out/nix-support/propagated-user-env-packages
+    '';
+
+    meta = with stdenv.lib; {
+      description = "A simple VTE-based terminal";
+      license = licenses.lgpl2Plus;
+      homepage = https://github.com/thestinger/termite/;
+      maintainers = with maintainers; [ koral garbas ];
+      platforms = platforms.all;
+    };
   };
-
+in if configFile == null then termite else stdenv.mkDerivation {
-  makeFlags = [ "VERSION=v${version}" "PREFIX=" "DESTDIR=$(out)" ];
+  name = "termite-with-config-${version}";
-
+  nativeBuildInputs = [ makeWrapper ];
-  buildInputs = [ pkgconfig vte gtk3 ncurses ];
+  buildCommand = ''
-
+    mkdir -p $out/etc/xdg/termite/ $out/bin
-  outputs = [ "out" "terminfo" ];
+    ln -s ${termite}/bin/termite $out/bin/termite
-
+    wrapProgram $out/bin/termite --add-flags "--config ${configFile}"
-  postInstall = ''
-    mkdir -p $terminfo/share
-    mv $out/share/terminfo $terminfo/share/terminfo
-
-    mkdir -p $out/nix-support
-    echo "$terminfo" >> $out/nix-support/propagated-user-env-packages
   '';
-
+  passthru.terminfo = termite.terminfo;
-  meta = with stdenv.lib; {
-    description = "A simple VTE-based terminal";
-    license = licenses.lgpl2Plus;
-    homepage = https://github.com/thestinger/termite/;
-    maintainers = [ maintainers.koral ];
-    platforms = platforms.all;
-  };
 }

pkgs/applications/misc/thinking-rock/default.nix

@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation {
-  name = "thinkingrock-2.2.1-binary";
+  name = "thinkingrock-binary-2.2.1";
 
   src = fetchurl {
     url = mirror://sourceforge/thinkingrock/ThinkingRock/TR%202.2.1/tr-2.2.1.tar.gz;

pkgs/applications/misc/xpdf/default.nix

@@ -38,6 +38,6 @@ stdenv.mkDerivation {
     description = "viewer for Portable Document Format (PDF) files";
 
     platforms = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.simons ];
+    maintainers = [ stdenv.lib.maintainers.peti ];
   };
 }

pkgs/applications/networking/browsers/chromium/upstream-info.nix

@@ -1,18 +1,18 @@
 # This file is autogenerated from update.sh in the same directory.
 {
   beta = {
-    sha256 = "1jwk0x5hjpah0bl4dpirxwyfxv0d0wnkvfgyja91kkbh8471gzmk";
+    sha256 = "0l1434wqhi6c24qyb5ysg1wnd0s9l9i1k6kh6wr3s4acrsbb7p12";
-    sha256bin64 = "10sl3ddd77i1gl3l4yvhkpavfq2bygv7gwql0jnhchmrvyax1cjh";
+    sha256bin64 = "1ssw92l8zwj8x0zs5h6vxl7d7gj0lqb0x71vsazgd4d0p23nglb1";
-    version = "50.0.2661.49";
+    version = "51.0.2704.47";
   };
   dev = {
-    sha256 = "042h6klyijnhkb4m9lsnfi3qss6pbs4p4981rm4cbc86rsyppkhl";
+    sha256 = "0czp4p434yqr5rv3w2vypkyis13x8lc4xph8yh84r9big1ga6fqs";
-    sha256bin64 = "1p6lhd3n9q93fkydxksgfv68vz26yj8i2zx1kqby2z9yc0pdcniq";
+    sha256bin64 = "0hahamx9k14czswqdh8iwh69lsml0acca5kxvp2kw471g3s55n78";
-    version = "51.0.2693.2";
+    version = "52.0.2729.3";
   };
   stable = {
-    sha256 = "1lmv6nmbqhxmr4340s5i4ypgz2b7vkh0wy5x9v75b5bnscjhk121";
+    sha256 = "1ijpbmn38znjjb3h8579x5gsclgjx122lvm0afv17gf2j3w5w4qj";
-    sha256bin64 = "1djd2i9phym1d8afv4vfajb7l1bz0ny2wmihwi6jaz712vil4a13";
+    sha256bin64 = "17vqvxmy6llg7dpc3pxi0qhwpm9qc9rsq8lgknhwwygvkl8g14sb";
-    version = "49.0.2623.110";
+    version = "50.0.2661.102";
   };
 }

pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix

@@ -0,0 +1,192 @@
+# This file is generated from generate_sources.rb. DO NOT EDIT.
+# Execute the following command to update the file.
+#
+# ruby generate_sources.rb 46.0.1 > sources.nix
+
+{
+  version = "47.0b5";
+  sources = [
+    { locale = "ach"; arch = "linux-i686"; sha512 = "98b283db66cd5d66a8fb74cab768526af7751eb3a2353791dbc8c40100be43753cf977262f5257fe55d7e42160600055209fc77b0ab5ce6893e393e273f0a961"; }
+    { locale = "ach"; arch = "linux-x86_64"; sha512 = "f931442f88a1d624e194732b4e8b0ce09cae2648a70cad658fa9439f0f69f66d1303236a110e8a9bd64f0034eb6adcc89313ec116624fb3e8d557ee387d2e5ef"; }
+    { locale = "af"; arch = "linux-i686"; sha512 = "f45f3644c0e6f51e5f88747e6f4c9b6123a40f112dd3768471838c68f8fdb42c729351d6eaa6768b5a7dcb30c1145545bee03c981eb7f271cd42ad7d526b7d74"; }
+    { locale = "af"; arch = "linux-x86_64"; sha512 = "a48c2e8de38c0f06d51b701eeb8dd4e68973e9601acdb879bc63bf375fdd08412408abd98bface2651dd86a86812ede0fb5ae9981de484afc0657f622428d720"; }
+    { locale = "an"; arch = "linux-i686"; sha512 = "d0de5de0d84f30b9b4a7e0aaf697bb543a2c0d3e7118a4f963b059a99433fe72d3497526c66102a64600585e3a97243918f91ea08f9e1c189670ac2cb5f7f695"; }
+    { locale = "an"; arch = "linux-x86_64"; sha512 = "4ad8f425043259bb1ead7c5cf2bafda8d87dfb8e544e6335c9a36c9096f32919e65a28c2f33e87584d53cccaf26c22ebc45657b7e9055876bb19698fb3fe4bd2"; }
+    { locale = "ar"; arch = "linux-i686"; sha512 = "b34739502ee0e18a8d2e97f4af694cb5aa71bba530915bf18a7488260163d720cb8df07197e46a75081f34a956e586e64fa7b999505a6b32c47010e2b5c6bb8b"; }
+    { locale = "ar"; arch = "linux-x86_64"; sha512 = "4ded69d272fbebac790dc16b7ebec5d9ee42a71a852f069141d95b423ee3d544839b9b852ede8c2a70e1a90aaf991821f2f51107c749af14e5197aaa747d9657"; }
+    { locale = "as"; arch = "linux-i686"; sha512 = "54d09a607b608fb1983ad9990a870f422d90d626f91d691a420ce691a904abda0e3539d156fa218a8d0259144a5d6c4da2b4d855f4103bde996bc887b40b6847"; }
+    { locale = "as"; arch = "linux-x86_64"; sha512 = "19d425bbf52a4c621a61c2fc6dfb88693b90d0705707ae40804c93871f12b22e67dcca0400cb65565e3f4e135c29de14eb581ede6cf204cc8384381267767d56"; }
+    { locale = "ast"; arch = "linux-i686"; sha512 = "bfdadb27f446b63fa5679731f188bf1a9c59d3efa5371cbc9944ee50de13e2d9ee741faf32a2d340568d6537067b394248245bc0fa426e08c5cfa91b788332fd"; }
+    { locale = "ast"; arch = "linux-x86_64"; sha512 = "0a4563494a2bfee6aba79a1212c011dc223f0567c5baa106b7af057e697eddbf90fb418cbe2f42d7df6ed183481375a33604275ed256802960f81992851a6354"; }
+    { locale = "az"; arch = "linux-i686"; sha512 = "d5311c69962d07fb3a2d95dcc0edefe74d59c484d5b61df5efeee46a40afa19a1f2707345f0834c7510e82e8f3f09dfda2fd1c1dad8980fbf02a177bbd58ec7a"; }
+    { locale = "az"; arch = "linux-x86_64"; sha512 = "071e8a37ca66c113d152f676da4e39de17bd2d28339d036d300b31f7ff8b09f052adac376f858bfe74976c905ab685fa3fa14387359af7456738727d51efc6cb"; }
+    { locale = "be"; arch = "linux-i686"; sha512 = "fc073297a8363776a6db25b9ea197d5732010c4c9d26726bb655256caae902b7fde05003c28e727cb1728282c7ba22151b554862d0c2aedc4ba483e1291159aa"; }
+    { locale = "be"; arch = "linux-x86_64"; sha512 = "e2cd3d493dea9e97523dcfb3dedee7ba0c9f6fe6c21e484ac673922090a56a1725eeb278d2c5186a544af4502a74a6d26a02ecad43e39038a7bed5fa0776151a"; }
+    { locale = "bg"; arch = "linux-i686"; sha512 = "02a0bb4e22d70fc6ffd26cbd1633c7834cc47e0b6b6ac48ca315440e93a8a1eea88fbce0e9f21053da2d65ea715270a84790db597857627b742134929df493c9"; }
+    { locale = "bg"; arch = "linux-x86_64"; sha512 = "e7c23fca63fda9cfba5c3c70d48a39f7517e0852df213c122db0f2b9ddb5546633f0ad1d8ecf57832cd4396f7f36f0a2b95c44a53ddfa42cee9502de36a27405"; }
+    { locale = "bn-BD"; arch = "linux-i686"; sha512 = "fcb750a8f297b611b5885f074285644d38a7ffd5cc44e34a9f416edcb7bfad1cb61c58947815ccc882adb349862c8de6a7c67637c257598e9aec2700c34ef4f1"; }
+    { locale = "bn-BD"; arch = "linux-x86_64"; sha512 = "8c08859d299ced430dcaf3ce2070608f0384ac2fabb42f3acb55e0015a7179906317f0fba051953207021087fb2fbef38e89d1b924d1bb8fc8a32933354353f6"; }
+    { locale = "bn-IN"; arch = "linux-i686"; sha512 = "e9b0a786571711d278e94e94887b7064f5168b3e57b177d519b847014792fdaafbacf5cfde6d4340309beabede605b719b9a1a58f30ae7f1d11fefbfcd56f6d3"; }
+    { locale = "bn-IN"; arch = "linux-x86_64"; sha512 = "64e9aa733c14eb31ae8e60b01975c6605b8a01fcdfe2018ec8b395472aff13135a40fb1b664fad6a159eaa809fa56f087d81139b622e58e4d879ae1b7800cf7b"; }
+    { locale = "br"; arch = "linux-i686"; sha512 = "34423736e3fd774da60984ffd9a99254bc5bb1ce49ce2f88e299e11aa8c7b7d5e8789b76222300d9e87a50cb25764f4705b1664b178149edaecd5f1d25abb3c4"; }
+    { locale = "br"; arch = "linux-x86_64"; sha512 = "3ccc90fc5118aac8b89194298e376ce90013dd9b4155ef604ac0e39c6fd886dc7397eb332c8370d79a85775b5224c98edd83df2f4bd8f18d0c22e26e307a3f00"; }
+    { locale = "bs"; arch = "linux-i686"; sha512 = "040c5b200f17f9f1c36b6395e99b531e6509569b8aeaaabe326813a08a19c2d7e911d8cf977eeab3c660738e45a5d56a0d16bb1f0085c72fde95984c8f965e8b"; }
+    { locale = "bs"; arch = "linux-x86_64"; sha512 = "d0f808f888dd83cc9811f0a85a062fe4ed8b3ba26d2c9819fdb1c91124ad35a00425a92439a91da2b94dda253dccbcd6be51a620e8a1ad0a2b485e14a96db6b7"; }
+    { locale = "ca"; arch = "linux-i686"; sha512 = "8c8bfb8b2c1c280eacc4653edbaa713c3516ea0ea02df2aefc74ac4b0b920a19e14ccfb559ecce3b9c4b744629c741e6c9a2efd6da1888fab63e545bb8534272"; }
+    { locale = "ca"; arch = "linux-x86_64"; sha512 = "e68cb49fef941ffdedea5054a4c7cf223c794d261ab8c5526bb4384001a2263d6018097d737ddf6210c3e73175902fb3773f263beced13faed8f697c52dfd479"; }
+    { locale = "cak"; arch = "linux-i686"; sha512 = "4cf074c30ed3360f92a523dcd54ffc6f18516452f56620d444cf1fc76a669387aa70687e2dec97a19fffeeae5cb413ed2dc62390de77bf2ef609e758521de647"; }
+    { locale = "cak"; arch = "linux-x86_64"; sha512 = "c66cf417086b3faae42a089fff4847f2c925c2f1e4fa6324888faf231f909ad95c51b1ebb844598e8172bc6b3b08cba8f89b9890b722a6915e1baceda319b91c"; }
+    { locale = "cs"; arch = "linux-i686"; sha512 = "627abef27cecd1d4801d1d370254f2a68560091dc337f2780ce585566b522d6c75e370177cd0dfdc9e38e96db52d5c54e201c780086fd769e53d6e24149c2988"; }
+    { locale = "cs"; arch = "linux-x86_64"; sha512 = "4dd222795547eb14ad0d9f66193b9ad139f66f5a1730bbed3a4213b29cd4717a18ccd095e910071d8642602404bd2732bd377dbc3fdf931cdd8c51862fd43295"; }
+    { locale = "cy"; arch = "linux-i686"; sha512 = "10eccf20af40d4f1e74d1fcd740a0be0da539a2997a7e403e3830ae6d797ae97fa17f573255a6bf414635fe48809c98f0ef2088c6dcb6e730a3d8bbf2a6e88fa"; }
+    { locale = "cy"; arch = "linux-x86_64"; sha512 = "e5fefa0248b7b594dba6c7e25a069d0f73a5ba3016c557f5866923ca062fa5ba172206c6396bbc595ce76540a9dd23308db23fe1a6a5b10c81dbd4db252ff865"; }
+    { locale = "da"; arch = "linux-i686"; sha512 = "909ed57b9745cd124bd16821f08aa578aaea79aa452ccd88c2f3cf5d8441ea5969b5f5bf29cce7ed9b46e0117c1ef278a9b34493a347e934a327afe3bc6a5f2a"; }
+    { locale = "da"; arch = "linux-x86_64"; sha512 = "2188776b00c04c76ca754ae65e1a8c4897fb24ab1fec5afdfbda5d76e71dd68e3e98e44cedd3d4659c92f7b490b888a1e680446428c3b1bbfa6aeed092cb61eb"; }
+    { locale = "de"; arch = "linux-i686"; sha512 = "67b26a3eac785f893d19f6fddc955c9aeedcd7ad8e4ec40a5f57d14dd1d3c742e3613faf5860c845aa31b9533fafed47b9342e422f1e74e94192a82490634ec7"; }
+    { locale = "de"; arch = "linux-x86_64"; sha512 = "8385f21ffa8e35e8a475a1795026d4f91660c5b68a219dcfabbf06a5bf41d6d3711c23e810a2df6a8665878930d71e94a398e563caa60bd2e000dc7e74c735af"; }
+    { locale = "dsb"; arch = "linux-i686"; sha512 = "4aa529f48d6a039952bcb50d91c402b8d85c5def54be9fc4e571e1065e9732c2a7d7c95ecd37963cea9735e30043207b53ec10285fc3988c91b2527dc848c1e7"; }
+    { locale = "dsb"; arch = "linux-x86_64"; sha512 = "96ebcb4941137c1e07753ed20bd6a53a7ef80d191eaf7c2b949663026f03160ff30d4e085f79710766d3b937753f038f429ea8da33fea49c1472afe7e1a14d10"; }
+    { locale = "el"; arch = "linux-i686"; sha512 = "df48924718d78d9c39003c65c363301f0009487c6db79f73e1121f7f1f871c43f485050d0a1fd7086ee71830c0de121a0aca8aa6c4cccebdbdbb21603ab35afc"; }
+    { locale = "el"; arch = "linux-x86_64"; sha512 = "a72a4becb87932795002063809481ec3167c16995d64d18c5a0e9e9acbe094491f8e6e1f35628a1fd99d3c7fa95b541e7b87ecc9b61da46eebf41468edd9e6bb"; }
+    { locale = "en-GB"; arch = "linux-i686"; sha512 = "a8a35b2420dd581ba61ea01ae1f38b6c3d0c21d26ae5cfc561aac10d7fb7ab9069ee0a488675e0910909f4179fa003800bbcddca1696fbf4d51e98a1030d9032"; }
+    { locale = "en-GB"; arch = "linux-x86_64"; sha512 = "7a81e63466cfe6340553cd75794804b5f2fc53a975d4ca64be5fdba4915993cebb8b5b45c26940e669938d878627433005ef916ea16a703fc9024a776217ca51"; }
+    { locale = "en-US"; arch = "linux-i686"; sha512 = "def0f98752e1ba92e3154b7275fdce2c63688369fd26d743c9157a8afb37202caed49a96ac4b580764b39e22b6b1e1dfd3c417d3ae4e8c508f24d181dbec4003"; }
+    { locale = "en-US"; arch = "linux-x86_64"; sha512 = "8267845b8956245ec961d22a7538db7370e0a484adf4117ecc8824228a2035711538b9676e5673dea8f133e3bc935e9639b896a1a384650b03843233875ff872"; }
+    { locale = "en-ZA"; arch = "linux-i686"; sha512 = "bea9951b6f1b3665d380f81c5777af4dc87e8616ff222d06c7018438d04c2c310652357d5fe13237f5567e8b223308746bd96dfad73e20d7869e7a7897402bdb"; }
+    { locale = "en-ZA"; arch = "linux-x86_64"; sha512 = "371d20607fb9570409bef79374485915b279be3ff93c573b4d8a6471d7f551e774839371d857079cdcdd671df384a8cba93ccde71b9ad49a5d813f9b092ac0db"; }
+    { locale = "eo"; arch = "linux-i686"; sha512 = "36435cb8204873243bf2f7286d8f8a148892fc3f8d47940722214639230546fb87e941b4c449cbfb642a17bc2d12be1586444cb2146a773774b2486c424dfd6c"; }
+    { locale = "eo"; arch = "linux-x86_64"; sha512 = "c1ca2aadbec3dbc46e72c05a36d01a3973a61239fd57e3493258129532c45b0a2cf76b1877f98167c836065f25071cda89e3636b6f8ca61c2925e8d359f4aef9"; }
+    { locale = "es-AR"; arch = "linux-i686"; sha512 = "9bb812c5f2d623d8f9688867ac2a159e2edcbfbe9c883eba713451ebcfb7ad4716fcd10e022d988a6854921266ffeaec5a8ee7780196eed4c2ec32f424b3d423"; }
+    { locale = "es-AR"; arch = "linux-x86_64"; sha512 = "1559ca934349aa4583609a64ec5ec4f9b3fc7c7ba0d55344e2853774736adc118599b48e3aea42ab376a393bc31b3f798d406fc79fd7f4acab6ed4be1ea5d649"; }
+    { locale = "es-CL"; arch = "linux-i686"; sha512 = "c4b7fc14c455fcb007406ce648b329d664caca0739187600191837cafd7f835024f4636bd1622708fca8315d8808f2e0721934cc028349507454092298520315"; }
+    { locale = "es-CL"; arch = "linux-x86_64"; sha512 = "c380341e32a153c504a1b72bc6ecd2a4b907b854dde42e91230d2d3679866f4c01c5a09a29373f0e580f992469e2448e8c3a1c448083c0416c7f14ebd3afabe5"; }
+    { locale = "es-ES"; arch = "linux-i686"; sha512 = "c3b8dd9909cda43d4227ee2cf4a747f3d4774dab3b8e38463464843286e86e5bd25edd026943ee8ded649ec4504f3c41a2ffe70deb3f33d9c54a2bcfebc8d697"; }
+    { locale = "es-ES"; arch = "linux-x86_64"; sha512 = "8e0dfc6380b71230bb4b3153bb682f71b759755e5acd8efc727f61769a701dd1e61d6895a9a82d6481335ea1fb82192febdb9e3810a61fe7d209f741e2ab3741"; }
+    { locale = "es-MX"; arch = "linux-i686"; sha512 = "0491052cbd95b439537d03909459b22754717fe581f6c33aff218def471a164c3ea2c44d1db1ebbdc2be592cbb1e87a8cba8f9bcdc0360a18ebe7e3f0e559003"; }
+    { locale = "es-MX"; arch = "linux-x86_64"; sha512 = "26b5d89429c5fb26fd2179f74c789ae023beb4d90cfaff47e044dd388525120a8dc42bc0d52442847249d86c6f5be88fa347f7ded1edd9485bca4df6fbd6b0c8"; }
+    { locale = "et"; arch = "linux-i686"; sha512 = "0311dde01390a778f5a043ddc64654697245f60d325e0d189fb79ea50df7b5cfcfd5e72403f349cc2f92282a93dad9ad7efec23bacabd695c74e809234cfd484"; }
+    { locale = "et"; arch = "linux-x86_64"; sha512 = "64ac04e96cffb54a35a9f2a2c41b55d66e0d7d4f218ea71ed590f1c62b83e4b426609473f0cae5c65bc382b298b670f5295354f5151c65eb93170607a39ab125"; }
+    { locale = "eu"; arch = "linux-i686"; sha512 = "8fde0bdaea215428b77c586846b647d1ae8423ee80f35d61dd400a4c732e1cacd1c65d77f95a8584e60ed26a90d3c92d2510fee62ba20c0135cb94245136d2a2"; }
+    { locale = "eu"; arch = "linux-x86_64"; sha512 = "8304ca1172dccbabcd88c39955213bf3d57b9622f3f387a748db26310974d9b82de1dee01a4b34a0abcb4d6789f7c2fd4ecc17ce4d8090a5e271729c80494736"; }
+    { locale = "fa"; arch = "linux-i686"; sha512 = "d54bdbdd1bff08d7bd3f45a5a40f893f269b219fee009184f76eebcc5e9908430c57f7770f26de2ce6c343744046cca8368c2ec5a5e36e860f975ab24783ac63"; }
+    { locale = "fa"; arch = "linux-x86_64"; sha512 = "5ccf346b56925f02f1261981830a40c25a33ca38d2214bb528c4df9c8f389ac97c27bba0236b80c07152978705a02485e3c8e5151d1f1ac4cd62958d2d49143d"; }
+    { locale = "ff"; arch = "linux-i686"; sha512 = "b7cfc0598678ebdb2b6d5f3e555067684d4d059179ac4bf63c9852579f8153f649e356eb4d88f483f6a79b26c8788723e83f273a2de900baa99e95bacdf11202"; }
+    { locale = "ff"; arch = "linux-x86_64"; sha512 = "ff1b6479190b1b784595beccfeaa842d5f66da934909cc1c92a5d34a5aa7fd448708068057e3a07f7f86c28608289ce78f754326f228bbdfc96993a81a88963c"; }
+    { locale = "fi"; arch = "linux-i686"; sha512 = "09f42f06e9c9b98f250a2df5864aa3e0aecd5eacf851d55c2f005ce7420d30c0ca5c1fc0a50a64cb90cf95628cf1be1ddebfa82c37f1a128f4a122bdf581ca9c"; }
+    { locale = "fi"; arch = "linux-x86_64"; sha512 = "711058109e442cca3e127dbf3a487db2aa89ca7859d6d9872d219dd21b729ad98dc4812c590689583a628e3b118a366cad9b0801b994217f2f971fad9e83ebd4"; }
+    { locale = "fr"; arch = "linux-i686"; sha512 = "9ce0946cf7aa588476cb2be42020b5087e98dbd8cf8983a48b38bf9b9472756bf0cbe0295324c8d706df72f35c57266c882ce5722bbff02e59ca1b16114bf73a"; }
+    { locale = "fr"; arch = "linux-x86_64"; sha512 = "304df64f3b914168f92195a7cc39e7368ba1633d75acb9cac6ebc5c90c126d40d78211458da4a2cb1eb1e9cbc3b7346e815ba36c09bb672eecc7e2805835989d"; }
+    { locale = "fy-NL"; arch = "linux-i686"; sha512 = "d920a93e27e9f6bdb5d0390157f913696c5755a5a07cd15df4baa5589b93cd71e4b4fc11da9c2453ebfd453d1774d1b2238ecb56326bc8f5c7aeab77b86e6641"; }
+    { locale = "fy-NL"; arch = "linux-x86_64"; sha512 = "488d2e6d02ffc5695ad476cc835f451bcb6e42bc197da256ca0ce8ade7baec50fd818d3658269c6f2e6f372ab9b4893d90f7dbbd9e4f08c8376a59638d8c6b23"; }
+    { locale = "ga-IE"; arch = "linux-i686"; sha512 = "dea5e1b24420e958f4275ea9d3d646d99c16022f8086ee8cc207b6d7ab5bf7d7ba2d715d50f8f6ebd633544bba692d34134034c0ecfd0c85a466425c97a6300a"; }
+    { locale = "ga-IE"; arch = "linux-x86_64"; sha512 = "aa6e55e3aa56aa61a13b1270e812058a513baf3d82759dfce6eb79c8ae87d18b634704a4c8aadbdcab289b2c501bddef2997e82b3872a8d5f485aef70182ac4f"; }
+    { locale = "gd"; arch = "linux-i686"; sha512 = "4dc9c3a6159eed67e391c002adc8eee467bea21b7a0166132a13891134802332acb4cd11764383beeef44528a29eeaf19f30ca8985228097c79278403cd309df"; }
+    { locale = "gd"; arch = "linux-x86_64"; sha512 = "fdbfdd04846e37271c4565f3e6ccf2936b5bdcce5ef92ecbe5be13c5a1ca547ad4c1fca9e8d87c14147f2fcaa815778bb4d5e17a4f04eef4be1659636f39468b"; }
+    { locale = "gl"; arch = "linux-i686"; sha512 = "ee8e7ddb91856c0caaecc376e4a835ae04e1081e07341ada4d49b543796c98d07aece0837b887dc7780c935cd30c813cb22eed485dc57bb68a94aacefb368e7b"; }
+    { locale = "gl"; arch = "linux-x86_64"; sha512 = "906d16f7a10f1e5f548c744d520e27f7bd9fdd4668287992d5d8af50c9b389d3af882eeed859a64c97b88e94de8fcc93dbcadf41caae36a3442eb3da131de81d"; }
+    { locale = "gn"; arch = "linux-i686"; sha512 = "69167c749ecafac6b7fc610dff05122907b152f0c6c5fef2966c41252b94a3e5853264d8254a3aa5d72f2e11e07397a8b192b1d8e7e0c5654ab1ae7467e2b9bf"; }
+    { locale = "gn"; arch = "linux-x86_64"; sha512 = "efb6d111e97bb49312537fd0517a8e48ffb58fede9031c90880a8ac4ae909acbd21140e56f9f82151e27b3f1ea014e9c9a3204b35a1c6fed6794dcd282c523d7"; }
+    { locale = "gu-IN"; arch = "linux-i686"; sha512 = "d57f0091a765f80493e95493a2f82a408754205942109858656cab840db3573f58d48f00cb799b9f5ce6a2e5147299a1f636c9af81fe55a91624d2c8a73a4dae"; }
+    { locale = "gu-IN"; arch = "linux-x86_64"; sha512 = "96c38bf77f37fa791b04f6f63004caaae6bde4423733620bc7aa095d887f497da12414028c1ff250c5efe811ec3828e9214788bc85e7d73f885c433379da4bb9"; }
+    { locale = "he"; arch = "linux-i686"; sha512 = "ca812d1008cce0b8314e5a0a50c8b2de8b0153e99eb7c493ca828159c78fd9a02e15e3926b865698fb0822b995d9a757282d32c8c13d2f9f1c42896280c0048f"; }
+    { locale = "he"; arch = "linux-x86_64"; sha512 = "4bf246c12753f70c8a0d084738fd992966430bc0cc2a6d363e09715dcfd9099f5ecef5b110f5c79bdcf9eca3c029ad0b7b04574eb172421c252dd850926f3b67"; }
+    { locale = "hi-IN"; arch = "linux-i686"; sha512 = "63727a991fa87d2fb675ee10d2759a42fcbbf50794af4d7d96cec26a02fb07f0c221d069ce762555595b6ad5b713379c5969273e87034a1cbeb886ceb7e68bad"; }
+    { locale = "hi-IN"; arch = "linux-x86_64"; sha512 = "d190f4d39e485bd212547b39ce72dc9f02b87436313d7a449cef6f3c8594357534867b635d21d3914faa4f6eb89668cf29a2499ad166b0feb3a7f232de3599fe"; }
+    { locale = "hr"; arch = "linux-i686"; sha512 = "508e6c6f55c5ea5ed65180467e682071c0804e499392835f53c06516d09d8f40c209c6b252406599bbbbaa3300679ae1002c436a5c638c79559ac5747e69812a"; }
+    { locale = "hr"; arch = "linux-x86_64"; sha512 = "0fcc0ce95c5765563a3c090087854fec969e2eb7c936fd26bdda15c39087c24eb4dbc1748cdd0eda9f4a8922b62af0f3ef51d176d44d75b00c0e8604d7d09426"; }
+    { locale = "hsb"; arch = "linux-i686"; sha512 = "40c941ea0f08ef6b81ebcd001bbcf7d1d5bd6b43f67cdb9b9669148221c5157d4e9a3dbd02bd377ae23805ce20f7e8e097bb96b26be15ffb724e4636ee8f69b6"; }
+    { locale = "hsb"; arch = "linux-x86_64"; sha512 = "f2452ff5d06af892f7b33fe62cadb18444e7199f956b7a9afd8f5804f59999683e80b92f8193ba99bba7677c505f6cb9cc7f5e2ab11066bad3b4c5230168c15d"; }
+    { locale = "hu"; arch = "linux-i686"; sha512 = "7b33b356cc463e21fbc0eb8e79c68622f0a5c9080a077428b29664bb6a2e627f36dc19588577fde8bf0dd47b92a68c5642111d55dc4f9593d103cb59404dc94a"; }
+    { locale = "hu"; arch = "linux-x86_64"; sha512 = "7d96f273f258141fcb7438f4c4a940b8351261f5b72e7c9bcad23edfa4c8bb4dbc3867264e8af9d81be926c177adc5b1e872a8b6b4796ef2e057e322f5d8f7a2"; }
+    { locale = "hy-AM"; arch = "linux-i686"; sha512 = "1124c892d9e5d0f134eb02cda33aaf823c099e9fe7ed875df994af8b99abb992cab28e3de1227b71d61048285078d0c0bc9104f28a78330649d098a516e96a9e"; }
+    { locale = "hy-AM"; arch = "linux-x86_64"; sha512 = "e85c7be731bfc4ae5ae0dbfe10c611ecfb815ad3749cb0cfd0b7b9b31d24c6a949c80f5bc5f698932c4420f9819e97069667a21fd99b77e2b4c2ed1164cf861c"; }
+    { locale = "id"; arch = "linux-i686"; sha512 = "5c509dc4ad9e07ec1bbd7235f9b05dd97cfac2d9d6b18897192f9863719d3b2509ed1fa6bec528ccf57a0c96414325fb9d74e3db8ef3bfb880685eb96e7a8beb"; }
+    { locale = "id"; arch = "linux-x86_64"; sha512 = "6aabb3f1b0eacc7f6203c77492683f37814fcf71595c8b01d4c4304f00c17fae89c0b2a681d59612c676d889516663ecc6c12cfa8d42a804d734995a861d971e"; }
+    { locale = "is"; arch = "linux-i686"; sha512 = "bd87b3c76104b1436be92ae86bc9e1040258334f7b79484a5ce94bddcd0473d8cf28ffe615cf46c0d92698e90885de66627688dd8485cf75acbdde84f5d414d1"; }
+    { locale = "is"; arch = "linux-x86_64"; sha512 = "d542a1eb114f917f7f0652933f9378428e58169b91fa691d05589390a13918bd0d2109aa59ce8ade43dbfeebd49deea8feb110e24c54f1c90d0fb1314e2be8a9"; }
+    { locale = "it"; arch = "linux-i686"; sha512 = "3ae512498e1bfd6ea249b7693fa4da77c209e6747745eede733528504465cc090f17524e57edac99789781e5bbe831f21c68eb34aa4f6f294cf66ba04f37d375"; }
+    { locale = "it"; arch = "linux-x86_64"; sha512 = "f53816f745d6a5c6ed74bf23f0e48a0171d79719f21c262657b6402e54b416563e38c215e9fc33179ef82051747025c642757ddf650ae7cfb601af33fb46eaba"; }
+    { locale = "ja"; arch = "linux-i686"; sha512 = "22d6416182f3766751e7f0aa647c0f4b658cf32321287550dda1885711ecf6725cb85c1e75f9656661b33d8ee4b3e0fe6b62399848d668b5ac3922d53922a370"; }
+    { locale = "ja"; arch = "linux-x86_64"; sha512 = "70f390611d41bfd5e0eff0f2a32afa38abdc41ca3ee2d50b0242cae7b5003d0b6e4430cebb949185ba00e711b46c2bdc410aeb2180e52f2884785617da04e696"; }
+    { locale = "kk"; arch = "linux-i686"; sha512 = "322032a5bfe60e135ea430596989db85df3cc1c7d39061b8606c86b01f0fa3523e197b0e0a2dd7eed6667dc01bc3df3b7b8c5c9f1254305c4afb9a247c647a9f"; }
+    { locale = "kk"; arch = "linux-x86_64"; sha512 = "d92cf7c83e19733a66955a7351aff90debb6057fc7f3277ccc196e0f0f72b43dc261ad34ec600a5862784dcd6bfc71bae5c7d3f5ffdbb06c2ea8c632ab320a38"; }
+    { locale = "km"; arch = "linux-i686"; sha512 = "bb482b0ea1d09e624095e5cecb7327321ac5a6895d7a522da9a1aef081d93ed090e7ee743487afbeab125f660179c7e65ad767918724f7eed84ecbaaa28ed9e9"; }
+    { locale = "km"; arch = "linux-x86_64"; sha512 = "0f1ce557998ecd2fc698c091b95f8669ca32ff0a27b415bfb122f9c5e37a25abf4baf62ea3e3ac63c649c4d1510d2bd71e8bcbad399e8ac423eee7bdc240f0cd"; }
+    { locale = "kn"; arch = "linux-i686"; sha512 = "68a55c9712a1eab6677ba9577326211aa4c3f6122690da540eb44dddef2d5f6b1a34fc026ddc2e3d005af41149f9e8ccc8eff2bfab952a688b25ab48464dd2e7"; }
+    { locale = "kn"; arch = "linux-x86_64"; sha512 = "ed7285ea39f41820dd38677d0dda05c0193e2bfbb2149b6ac12b3611b67a154cc76a0e75a23badaf813cbc0f24dd2be78707ecf2962d5582777cfeb8fb59d042"; }
+    { locale = "ko"; arch = "linux-i686"; sha512 = "c20fd881febb57ed2012e654338a24e24277b6c0ff71b86e190c80afbf5caa8bd6408b2b265ac7aebbc5233c942761beffb4252cac6a5bef41d6f18d13cf6884"; }
+    { locale = "ko"; arch = "linux-x86_64"; sha512 = "27eb552c9e88088191becf75e3ab0b789a76a5423e84451ddc74ce5ded95b0f98a2fdb0a7552e95752ee4ae41ca9e83bbef3f6ebc8ab089903a63d7d9b558213"; }
+    { locale = "lij"; arch = "linux-i686"; sha512 = "d0f697f29c8008344e5ebfa4325046837720e5061e309f530db3de4eb066ffa7f3bdce3e97abfc388569664af46f60e73fa9018998f8c42af0ab1b8c44a751c8"; }
+    { locale = "lij"; arch = "linux-x86_64"; sha512 = "3da427ccb0a138d40af0ed0139adba64accccdc02c2d3abbed04c7ed51bd5cca675b2a39d765406a607b76050bac11fc90ded3b84491066920a8387e490ce3a1"; }
+    { locale = "lt"; arch = "linux-i686"; sha512 = "c9c779d3f9902248ade70fdec78ea282e021d857a7594ee9fc52eb39c65c142c5278694f6f9621f7f98075a3e9f44e4765493b88a1bf9108bd91fe8522d73319"; }
+    { locale = "lt"; arch = "linux-x86_64"; sha512 = "ac53cab92414f0c28cd1cd6a722e59889b0f8ef5d842f93c5ab775b8c857ce1c266522ab119b655c5800e1e0fa370791f4c545c00e35d64e8e6c0f6e2a7bd7d5"; }
+    { locale = "lv"; arch = "linux-i686"; sha512 = "a8cc63ad51e11bb98c8b1e7d0b4673ac198eaa73083ffec491e2b4d333ad6b9908d734da53ad70306717bee4de7c48c9f7ed08cc5647b3d494eca001bf80bb22"; }
+    { locale = "lv"; arch = "linux-x86_64"; sha512 = "8b229439f9ddead6b965f5e14626e159a6d94774b2f9e57898b86c39f77adc08a6e93b33be050e053bbc1a660f27da66a81f3d1e3222001e52e5463716ee370d"; }
+    { locale = "mai"; arch = "linux-i686"; sha512 = "b39472c32581b9977cb5701a398d83b8d4abaf2943c99035d57404610b3ccb016b99f4d89618451701434320dd6a83ecb3d927fcbab2999c273b3e7df32e0428"; }
+    { locale = "mai"; arch = "linux-x86_64"; sha512 = "d8e7f74ef1d4e70da44bfd12a2b93e66df40e7ead86f6d1f33eed0f3bafd72b39c43b4cce086c8b27d9d8d297469a5c5238ca48f46bacaf7b850c57c067702f7"; }
+    { locale = "mk"; arch = "linux-i686"; sha512 = "99267203937be5687b638f44ccdd9610d0b4804035f6681aa6924f07064e6f26d6dc2900cf39bbdfc2abbb0a72e3cc3b194a20a804e0052b704032e057e469c9"; }
+    { locale = "mk"; arch = "linux-x86_64"; sha512 = "e656d150a4a49d9d9f0c619450b9a1bea4a14f7f63d40684c29b247efba83de4a4238d247bb2e62fc77bf4251c5199188d1c1e8498b2e85b9c9be351e9dd3cd2"; }
+    { locale = "ml"; arch = "linux-i686"; sha512 = "4a25b6677772dfe7c7e61910fe0c3edc74d42b1a87468ca9315231c983e8cd9db56ffc02d02345c6e76408c5d40ee655dc5e75d7add173a88f1f3a2b4e922c56"; }
+    { locale = "ml"; arch = "linux-x86_64"; sha512 = "dec2789ab8d4ed76e642d9bbbab740fd260e8c159568bfb560623e6d774f8ff0692789e1bab26ae759bc864f8e7bd9ebae04e591589bb6fd5a9598b22d28fa52"; }
+    { locale = "mr"; arch = "linux-i686"; sha512 = "ac74407da2b53417edee5e0286964d4e6ee1019d40995e7b4a2f545b4689b6eef65e46dfb59892ce27a06a79c8f6e6b73e29738544377d33b8d6ed7bb6eb0cf2"; }
+    { locale = "mr"; arch = "linux-x86_64"; sha512 = "e8c492e12556421385150c3ab1387c857a2b6fdecace7277d9a71d614a12f0905662ed838824ab09aded7c7b01d3da891ac60969bcad57a130bc6bb280cc4a27"; }
+    { locale = "ms"; arch = "linux-i686"; sha512 = "b0da250f5f73dd3a9ef7e0c7eec1ff4a67247f74e4b3afd12f8ff025ada35b737d3d948eb75ce1b0abf48a5553ecd4f464214e85e70b2a8e0478b2b27905ca93"; }
+    { locale = "ms"; arch = "linux-x86_64"; sha512 = "88e28245914f5cdcf745e85c102e2365b017637f1b08048d74a92a5671dd99d605fea1448e6ae1b1ac19346762be63cc3786b79e0399c9966b915f4d1b2bbd51"; }
+    { locale = "nb-NO"; arch = "linux-i686"; sha512 = "ec8f67a63cf22401f99c8c1724ddbf18c281780cd6b8b4b872941ec932150c532e04e39f49531e8fed05a3ef29228292b957e05abec99a348d1e91f4b30d1fc9"; }
+    { locale = "nb-NO"; arch = "linux-x86_64"; sha512 = "72cb3b2cc2da91ea8b8222f332f4115f87455913abd99fe3b8ca0a290881ad35c5d9e08e5352e380550c6f6775e6e03269f65498887e03c349ab63369101f3a2"; }
+    { locale = "nl"; arch = "linux-i686"; sha512 = "0cfa7d042bc73e1027a2ac51b87d1f62730b04dad8f87dbd93252c3a11ac3082bbf837cd6b98b1b85a032f638d9d9a400599c9fbd17b565ecff5adaf8ee5b443"; }
+    { locale = "nl"; arch = "linux-x86_64"; sha512 = "03456fbfb93971264e75ea2a5db9511610a26269e2d3d31bd25e57133a605d7dc12a8a779f2dd215beaea8a1c93d4f7e6642eed0968d4a99e2b6ace5a1a95b50"; }
+    { locale = "nn-NO"; arch = "linux-i686"; sha512 = "97951fc2eb41eb89740bf1512db62d26e6ff7b2244e68fde834d2818dc8fea61557f12f6a18f871b509e4d3c1f4f1db2fae53b8da5b87cb0ee93ab44b9e2555e"; }
+    { locale = "nn-NO"; arch = "linux-x86_64"; sha512 = "f0b9aa2f67ddced02ebc4e90e91777799f8fa455313132d3e686c26705446321515caa0ca148f0969c1a5e0ee8b7b005630ba76d4bbd6437eacfcdf581e0c0cd"; }
+    { locale = "or"; arch = "linux-i686"; sha512 = "97333fecf4097ad57c117bd7228037c7b4ef4c5e7d713801f468c951994d3c1ee65c58351ee4dcb7f3ffd193ce05e67d6502b560f8d39f92b9da185dbd322fd9"; }
+    { locale = "or"; arch = "linux-x86_64"; sha512 = "4714229f654ec610d0ed3ec88f4d55f60de72e67524e6e572279bfa2dd433bf68486f0d0498ee4227bd687d55ac38914ae8b595cae676aab2508ef4790f4fbe7"; }
+    { locale = "pa-IN"; arch = "linux-i686"; sha512 = "4ee507e28cc5069824a1386fd7d28b7f65a634f1ebd8f3c3387c2753c193fd8059221923504a4032ec07c3fecdcb5a15ac1b2dcdb73307fed357c0d9af8b4437"; }
+    { locale = "pa-IN"; arch = "linux-x86_64"; sha512 = "9f1cb5dc4128547bff4bdbc1dc48ca505f1b16dc3e6b42afe5685b9b3659d7e540801a1e71a46a0bdaf2c3476b75b898f6a0ac907cb0f99e425b517b08cdaab0"; }
+    { locale = "pl"; arch = "linux-i686"; sha512 = "692eca157eccad4392f241d56644806abd2a183dc809480db7d5aa1482d6034b2e367ee382984fb7621cb4ed794c200b3db55c052e1a0f6f01306fd02f3efc14"; }
+    { locale = "pl"; arch = "linux-x86_64"; sha512 = "635ffa536d4309da36beee2829d665a9bbef2e2ced5003632c982c0cfca776eae1b2b5be03ae6b59cdb8b22966b2866c8346acb75c49fb47e6ea39c576530817"; }
+    { locale = "pt-BR"; arch = "linux-i686"; sha512 = "18b8c00f31dd3af18f9aa8ee5ebd28a533830844484ecc373c6477c7d862e8e512b52c5de80c6cfdfd70ff9942593b2d9ee13e03d17f7e2088e550e519e216a6"; }
+    { locale = "pt-BR"; arch = "linux-x86_64"; sha512 = "70e01c566b9344a51f2c893e3fa437d65a7930b571a87213fc4371af818c036612f79ad687fc6e0e52397529a5b173aedbccbcc948c7a816786d4ebdefd4438a"; }
+    { locale = "pt-PT"; arch = "linux-i686"; sha512 = "e5628b348f9aa98bb831628016360b15cb265b749451017fe0e0c09b10355be80a4358442d53e4e18972ea426f8fc90350587859bdcab9c987a1a633abbbdb9d"; }
+    { locale = "pt-PT"; arch = "linux-x86_64"; sha512 = "f5ec3e50559608c77f0f96db27e7b32ed26965599489cccd8e49a15665b1d33d3628f2220e9af6d22969183a50d8c7d7cfb7cef208a277d74386bb284413ac87"; }
+    { locale = "rm"; arch = "linux-i686"; sha512 = "e1c64a105a4a44e8de276cf5d4e7592f4558663981f57277702b112caf0c1f212325932d048dbaba4c593caee52b7932377bd9024bdaa1615107e8b5546d8ea1"; }
+    { locale = "rm"; arch = "linux-x86_64"; sha512 = "0e06044ea7869f0e00e0a6bf99c1f2c6bd04a9d87823dbfa8387defa11d479f44e225ee839cbfaf93fa1d45680bd6803620bb7256574ed94522a319a8f1ba5e4"; }
+    { locale = "ro"; arch = "linux-i686"; sha512 = "9a514be28ac95c17b6694bdcb0243ba772363d9b333420af82be70b947b200177f500e2e3ddb9f010932b9ee0b7271568a6f3ed0bbcadaa904d650e0001f1b96"; }
+    { locale = "ro"; arch = "linux-x86_64"; sha512 = "06e10fbdf4ad4c9c13e62c817bc94b9b3522d8b625c65d273f77cf44658b74419ed37ec84453158f136a1597445bbbaaa7cd8d6bda3ed21ddb7c1ceb2420a17e"; }
+    { locale = "ru"; arch = "linux-i686"; sha512 = "a443e644552326a85895dc6368f91365163342fca8bf6a467496c41bbc2d0934476a5b0be9ae079e7d260a1930a53595f054b1778563b20557de300db383b100"; }
+    { locale = "ru"; arch = "linux-x86_64"; sha512 = "f85745244798c0eff4f603a72fdf44d20812614793b7697add27ef06f55a57eb21ec21ec8a7a6ee3228228d6d0ea52f43d6bdac8f88ea310f1561af0381b3ba1"; }
+    { locale = "si"; arch = "linux-i686"; sha512 = "00d3c6f0fd87ea63ba2bd1870ad422d41a9d984674bb00b07e1c2b60dbe0c24585cc095af68f0728f2bd24af3fc00d5308aa4181d1f4b0460866b26c35b0a187"; }
+    { locale = "si"; arch = "linux-x86_64"; sha512 = "aad8a7b45871e8633a85a0a40adc231d9f57315fc93b683c498699f8549c6d14d097922d7b79e96892fbe4e3454be55845994d826f2cf37d877e3445a049a578"; }
+    { locale = "sk"; arch = "linux-i686"; sha512 = "c290d2d481e39a2780362b420130b5638e4fc832c09d49e0892f25dc420dea6a3f087a76ed89a5650a8efc7d82d3ec80d0ae3d3ae2e012fe5eb58c18f025bdbc"; }
+    { locale = "sk"; arch = "linux-x86_64"; sha512 = "0e64a924486d8c0efb8bed4271a3ef6731f76fc0a7b7e1909215ed2b9635963659427a57342a26b825ce11aa57c2aa54fd75928d27e63dc5bffbce2bc3af75df"; }
+    { locale = "sl"; arch = "linux-i686"; sha512 = "2cf452873a756785e1468eeb2f9b2e90567c22895bddfdff40b23e69025abd38e1634358a47bc943335e8516fc2f55b939dd2f3ffcbdddeacd3b1c3d39811c46"; }
+    { locale = "sl"; arch = "linux-x86_64"; sha512 = "c89b76f586190b2f3d5141c066691652a193d25841e87ae0e5ff5dd938164b95032e50239354e7842960a4a4e8a3a917c0061717acd9fd36e74e739676935736"; }
+    { locale = "son"; arch = "linux-i686"; sha512 = "ff56f55c9716ec5d7af6b1f22da2b3105d62c821010f95333412befed11146e95abf7952b2fa998b444d6b9ec9777e747b139bbfbf79e16c881cb55e0c49f335"; }
+    { locale = "son"; arch = "linux-x86_64"; sha512 = "284585a534cb65ef2c3dfb46afd1ab3ff0d9695a553aa4c04caf9487a4f6418b461c872aba2f2e15e6c00010934a7f44424a18ffcafaa76e35d3d2a0d61a7551"; }
+    { locale = "sq"; arch = "linux-i686"; sha512 = "3a2cb298bef66314afa54b94205de0c9fae75f6f063462060d3381939f2359255492adfae51f8215807723912d94ad55a99be7ec7fb023b39f79a951ffa19bdc"; }
+    { locale = "sq"; arch = "linux-x86_64"; sha512 = "62cbbe10959edb18824fd22729bb7d0615441377a546b745ca287b9c2398d6b4e8c4f6f80eda48efe5e808f1f5327862e7a364f1d837901341317536f952bb69"; }
+    { locale = "sr"; arch = "linux-i686"; sha512 = "c367d4b46752b0574d8842ef211e9f9bdbd68a2f14785740f4cbf785ba82b42c33d6092f3abae2c730be12345d629864b719d534a4c07d5cbec311fbf92df19b"; }
+    { locale = "sr"; arch = "linux-x86_64"; sha512 = "16263f6414ecc92e4c7cd0e41457f42217c86d9d373c6f5459b4ddf4b0842d20bdf1b7446a80ba59bb9513f745ab7433c504dd0174ff516c34adbcdc4861b5a9"; }
+    { locale = "sv-SE"; arch = "linux-i686"; sha512 = "fef1978d41a13c485ca24fcd1358c8421aa6be06730100e66567e6a7021424ffd2c94debd96f6e25cc8d429d7460399e10e346251223b36ee924174bb63aa9b5"; }
+    { locale = "sv-SE"; arch = "linux-x86_64"; sha512 = "1c8a7506109569c0298b20fb00f2463d4e78ff04d5b41661c5cd758a6bebf63fc2abec6f1cafa89acaab679764897dbe10e5647c3a32efe2b748a06e6d5af342"; }
+    { locale = "ta"; arch = "linux-i686"; sha512 = "7060ea65a9a4556bf7b7d438de3a516ca4c20531cc5f3c97d8695f3fbbc94c37060273551a0e04382df84812e170512c143e7f835699e99ca8ef21c50fd47437"; }
+    { locale = "ta"; arch = "linux-x86_64"; sha512 = "beca8cf5594e6865510c2873c6f2b8a9fcf68440d9fb75979e72ddaa994ea789e9cc5d5829982abfff5932ca4d1a491da53ccc34b7dee38c3114982fcda169b0"; }
+    { locale = "te"; arch = "linux-i686"; sha512 = "e99f01f99eee95ce73af2b818ebedb05414764cf02f3928bbcde6fe3bf03c71a2043b99088af4912b4033453d6a70adee70a7ca583ab5279d9b5ea194137a156"; }
+    { locale = "te"; arch = "linux-x86_64"; sha512 = "077e1246824e5ef9b08f83c4589216b9d91e79a6cd8fa7b6da0de9f35807076bf9b29d9e514c58e1437d1a39d32c2ec09eb39176461daec35734d327fddb8a90"; }
+    { locale = "th"; arch = "linux-i686"; sha512 = "a1eb5970b00c0472a96fcfba4c1a30d3ea7d383b5547cd8156a547a5725e7ca7b42c45a4c3ee749221af8bec65764498cc0693f778b6fe3e186de0580f8187a1"; }
+    { locale = "th"; arch = "linux-x86_64"; sha512 = "73bace49382ba38af87d77a0ec180e0bc2e9c308208dc0ef8d789ba529d7d4c4d97815924279eded4f7438f4f12bb6e7f92c6474b00d1336bd15d5b48ae87935"; }
+    { locale = "tr"; arch = "linux-i686"; sha512 = "23ce428ae503c2a9a5471ae84d79b110317d17d59eadbc39aedf3c219285c7c20af7eead04a2de7cb6bd97dea3b9834bf97341f3fe68c79d31a029e547c2d7e6"; }
+    { locale = "tr"; arch = "linux-x86_64"; sha512 = "e8a640a5e1dfcb2e118cc20f26ec0bdaca3fde5a9b94cb62b6170a8f0a161ed7d1492cfafd0a5ddbb7f82810c96b589979c31cb98983a9ff26a7f131fc186b99"; }
+    { locale = "uk"; arch = "linux-i686"; sha512 = "6f6c3ba54d22f90869a9d045ffcec89ccfef7f80745ad89c8200e0cf3d76bd09d379680440f27aaf50ee5eb7c09d29dafb37416a5d939d6f1b44cd9dcd542b03"; }
+    { locale = "uk"; arch = "linux-x86_64"; sha512 = "e41efe76cf15b1b3bb51dd3ec1c4c571ad80dac69962c604ed8b717cb442626c76a5ebb078dba5d2e94cf7381461803504c9a3e313401a1d25addba46b46810a"; }
+    { locale = "uz"; arch = "linux-i686"; sha512 = "c5037d8f96f0b1c98c7e93557872f02506abf78dbec0d3041dd69baac73f6928622d4131d3387d79c5e4edc4b37a9c9f29c5c06d891e3ddd8c78ba3b1c3e8a58"; }
+    { locale = "uz"; arch = "linux-x86_64"; sha512 = "ee727853b1323a12aebedaae543e18833f1167832baa76c8dc7341d1c50f48751e10c5d3d35c69cf2837cb1cf6fea6162839be045afee22c06ca25833dfc419f"; }
+    { locale = "vi"; arch = "linux-i686"; sha512 = "463ef27d81df3f7d3d5cf2362e3d8d5144db2bc7c57b0ccec75bbebdae7ed5e366242bd9202adb47bf785dacf161699fbb619d6c35a8bc6eefdfb15af9c9d257"; }
+    { locale = "vi"; arch = "linux-x86_64"; sha512 = "efc8bc04e117ce791d5bf491cb5feb78bd6a9c112221590073ce5a801384049e1279f5e051d8475b960c9f7149175345742dce02fd593a95f1ec83724a1b5fb9"; }
+    { locale = "xh"; arch = "linux-i686"; sha512 = "0283091ad6f61f1d6ed547ec841271d6c222bd02ada832bacae0d5b75019e788043abc97ce90bb94ab30b3ec5414911ae45a86a79b4c1e17efb78ec309103fd5"; }
+    { locale = "xh"; arch = "linux-x86_64"; sha512 = "1fefd81b65e80705d09612e2fa3996d0a11fbf01c1a49d4ea7769a31b6f89827e1c7acba85c7c5d109387afca5d108f2f2e3f6db36032298c260093687aaf54f"; }
+    { locale = "zh-CN"; arch = "linux-i686"; sha512 = "f22c920f0959995c3b0985044e364ff3edf191227f70c339ab6a64e2c02e4d0c11064439cd8a9d04917619f0128585cd46c64d12f4109170ff8b2fec51ba8e3d"; }
+    { locale = "zh-CN"; arch = "linux-x86_64"; sha512 = "801e25e24fb66d46e650aa5af7ee95999a8410bdac5e8a067192fbef24690f1f0c273ce4836d8cabea637d165cc0a16b2c2f39f4604bf098e3d6cc8e4ea3df07"; }
+    { locale = "zh-TW"; arch = "linux-i686"; sha512 = "ee2ca9b3bbae6a889d51d0922932e8bf7f523f8ad28b14647cebe19b5526580271ee87a124977089009ab1ca68d70120363bae76127c90e024567fa3cd9cbef1"; }
+    { locale = "zh-TW"; arch = "linux-x86_64"; sha512 = "6c53b22c8bf8320a397a4703e9b4568dc955e11e592b216c50e4382bb3dcfdf8810283afc7fe79039d83d5d5ce272d386ba0441472445afdd784a3da9ed61f5d"; }
+  ];
+}

pkgs/applications/networking/browsers/firefox-bin/default.nix

@@ -35,14 +35,23 @@
 , libheimdal
 , libpulseaudio
 , systemd
+, channel ? "stable"
 }:
 
 assert stdenv.isLinux;
 
-# imports `version` and `sources`
-with (import ./sources.nix);
-
 let
+
+  generated = if channel == "stable" then (import ./sources.nix)
+         else if channel == "beta"   then (import ./beta_sources.nix)
+         else if channel == "developer"   then { version = "48.0a2"; sources = [
+            { locale = "en-US"; arch = "linux-i686"; sha512 = "3xa9lmq4phx7vfd74ha1bq108la96m4jyq11h2m070rbcjv5pg6ck2pxphr2im55lym7h6saw2l4lpzcr5xvnfmj1a7fdhszswjl3s4"; }
+            { locale = "en-US"; arch = "linux-x86_64"; sha512 = "1vndwja68xbn3rfq15ffksagr7fm2ns84cib4bhx654425hp5ghfpiszl7qwyxg8s28srqdfsl9w8hp7qxsz5gmmiznf05zxfv487w7"; }
+          ]; }
+         else builtins.abort "Wrong channel! Channel must be one of `stable`, `beta` or `developer`";
+
+  inherit (generated) version sources;
+
   arch = if stdenv.system == "i686-linux"
     then "linux-i686"
     else "linux-x86_64";
@@ -65,7 +74,9 @@ stdenv.mkDerivation {
   name = "firefox-bin-unwrapped-${version}";
 
   src = fetchurl {
-    url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/${version}/${source.arch}/${source.locale}/firefox-${version}.tar.bz2";
+    url = if channel == "developer"
+            then "http://download-installer.cdn.mozilla.net/pub/firefox/nightly/latest-mozilla-aurora/firefox-${version}.${source.locale}.${source.arch}.tar.bz2"
+            else "http://download-installer.cdn.mozilla.net/pub/firefox/releases/${version}/${source.arch}/${source.locale}/firefox-${version}.tar.bz2";
     inherit (source) sha512;
   };
 
@@ -130,8 +141,10 @@ stdenv.mkDerivation {
         firefox firefox-bin plugin-container \
         updater crashreporter webapprt-stub
       do
-        patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+        if [ -e "$out/usr/lib/firefox-bin-${version}/$executable" ]; then
-          "$out/usr/lib/firefox-bin-${version}/$executable"
+          patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+            "$out/usr/lib/firefox-bin-${version}/$executable"
+        fi
       done
 
       find . -executable -type f -exec \
@@ -167,5 +180,6 @@ stdenv.mkDerivation {
       url = http://www.mozilla.org/en-US/foundation/trademarks/policy/;
     };
     platforms = platforms.linux;
+    maintainers = with maintainers; [ garbas ];
   };
 }

pkgs/applications/networking/browsers/firefox/default.nix

@@ -3,7 +3,7 @@
 , freetype, fontconfig, file, alsaLib, nspr, nss, libnotify
 , yasm, mesa, sqlite, unzip, makeWrapper, pysqlite
 , hunspell, libevent, libstartup_notification, libvpx
-, cairo, gstreamer, gst_plugins_base, icu, libpng, jemalloc, libpulseaudio
+, cairo, icu, libpng, jemalloc, libpulseaudio
 , enableGTK3 ? false
 , debugBuild ? false
 , # If you want the resulting program to call itself "Firefox" instead
@@ -35,8 +35,8 @@ common = { pname, version, sha512 }: stdenv.mkDerivation rec {
       alsaLib nspr nss libnotify xorg.pixman yasm mesa
       xorg.libXScrnSaver xorg.scrnsaverproto pysqlite
       xorg.libXext xorg.xextproto sqlite unzip makeWrapper
-      hunspell libevent libstartup_notification /* libvpx */ /* cairo */
+      hunspell libevent libstartup_notification libvpx /* cairo */
-      gstreamer gst_plugins_base icu libpng jemalloc
+      icu libpng jemalloc
       libpulseaudio # only headers are needed
     ]
     ++ lib.optional enableGTK3 gtk3;
@@ -50,7 +50,7 @@ common = { pname, version, sha512 }: stdenv.mkDerivation rec {
       "--with-system-nspr"
       "--with-system-nss"
       "--with-system-libevent"
-      #"--with-system-libvpx" # needs 1.5.0
+      "--with-system-libvpx"
       "--with-system-png" # needs APNG support
       "--with-system-icu"
       "--enable-system-ffi"
@@ -58,7 +58,6 @@ common = { pname, version, sha512 }: stdenv.mkDerivation rec {
       "--enable-system-pixman"
       "--enable-system-sqlite"
       #"--enable-system-cairo"
-      "--enable-gstreamer"
       "--enable-startup-notification"
       "--enable-content-sandbox"            # available since 26.0, but not much info available
       "--disable-content-sandbox-reporter"  # keeping disabled for now

pkgs/applications/networking/browsers/firefox/wrapper.nix

@@ -2,7 +2,7 @@
 
 ## various stuff that can be plugged in
 , gnash, flashplayer, hal-flash
-, MPlayerPlugin, gecko_mediaplayer, gst_all, xorg, libpulseaudio, libcanberra
+, MPlayerPlugin, gecko_mediaplayer, ffmpeg, xorg, libpulseaudio, libcanberra
 , supportsJDK, jrePlugin, icedtea_web
 , trezor-bridge, bluejeans, djview4, adobe-reader
 , google_talk_plugin, fribid, gnome3/*.gnome_shell*/
@@ -45,12 +45,11 @@ let
       ++ lib.optional (cfg.enableAdobeReader or false) adobe-reader
       ++ lib.optional (cfg.enableEsteid or false) esteidfirefoxplugin
      );
-  libs = [ gst_all.gstreamer gst_all.gst-plugins-base ]
+  libs = [ ffmpeg ]
          ++ lib.optionals (cfg.enableQuakeLive or false)
          (with xorg; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ])
          ++ lib.optional (enableAdobeFlash && (cfg.enableAdobeFlashDRM or false)) hal-flash
          ++ lib.optional (config.pulseaudio or false) libpulseaudio;
-  gst-plugins = with gst_all; [ gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-ffmpeg ];
   gtk_modules = [ libcanberra ];
 
 in
@@ -76,7 +75,7 @@ stdenv.mkDerivation {
     ];
   };
 
-  buildInputs = [makeWrapper] ++ gst-plugins;
+  buildInputs = [makeWrapper];
 
   buildCommand = ''
     if [ ! -x "${browser}/bin/${browserName}" ]
@@ -91,7 +90,6 @@ stdenv.mkDerivation {
         --suffix LD_LIBRARY_PATH ':' "$libs" \
         --suffix-each GTK_PATH ':' "$gtk_modules" \
         --suffix-each LD_PRELOAD ':' "$(cat $(filterExisting $(addSuffix /extra-ld-preload $plugins)))" \
-        --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" \
         --prefix-contents PATH ':' "$(filterExisting $(addSuffix /extra-bin-path $plugins))" \
         --set MOZ_OBJDIR "$(ls -d "${browser}/lib/${browserName}"*)"
 

pkgs/applications/networking/cluster/hadoop/default.nix

@@ -46,6 +46,5 @@ stdenv.mkDerivation rec {
     '';
 
     platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.simons ];
   };
 }

pkgs/applications/networking/esniper/default.nix

@@ -24,7 +24,7 @@ stdenv.mkDerivation {
     description = "Simple, lightweight tool for sniping eBay auctions";
     homepage    = http://esniper.sourceforge.net;
     license     = licenses.gpl2;
-    maintainers = with maintainers; [ lovek323 simons ];
+    maintainers = with maintainers; [ lovek323 peti ];
     platforms   = platforms.all;
   };
 }

pkgs/applications/networking/mpop/default.nix

@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, openssl, pkgconfig, gnutls, gsasl, libidn, Security }:
+
+stdenv.mkDerivation rec {
+  version = "1.2.4";
+  name = "mpop-${version}";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/mpop/${name}.tar.xz";
+    sha256 = "158zl6clxrl2id4kvdig2lvdvm0vg2byqcgn1dnxfjg5mw16ngwk";
+  };
+
+  buildInputs = [ openssl pkgconfig gnutls gsasl libidn ]
+    ++ stdenv.lib.optional stdenv.isDarwin Security;
+
+  configureFlags =
+    stdenv.lib.optional stdenv.isDarwin [ "--with-macosx-keyring" ];
+
+  meta = {
+      description = "POP3 mail retrieval agent";
+      homepage = "http://mpop.sourceforge.net/";
+      license = stdenv.lib.licenses.gpl3Plus;
+      platforms = stdenv.lib.platforms.unix;
+    };
+}

pkgs/applications/networking/p2p/mldonkey/default.nix

@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ocaml, zlib, bzip2, ncurses, file, gd, libpng }:
+{stdenv, fetchurl, ocaml, zlib, bzip2, ncurses, file, gd, libpng, libjpeg }:
 
 stdenv.mkDerivation (rec {
   name = "mldonkey-3.1.5";
@@ -14,7 +14,7 @@ stdenv.mkDerivation (rec {
     license = stdenv.lib.licenses.gpl2;
   };
 
-  buildInputs = [ ocaml zlib ncurses bzip2 file gd libpng ];
+  buildInputs = [ ocaml zlib ncurses bzip2 file gd libpng libjpeg ];
   configureFlags = [ "--disable-gui" ];
 } // (if !ocaml.nativeCompilers then
 {

pkgs/applications/networking/p2p/transmission-remote-cli/default.nix

@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, pythonPackages }:
+
+stdenv.mkDerivation rec {
+  name = "transmission-remote-cli-${version}";
+  version = "1.7.1";
+
+  src = fetchurl {
+    url = "https://github.com/fagga/transmission-remote-cli/archive/v${version}.tar.gz";
+    sha256 = "1y0hkpcjf6jw9xig8yf484hbhy63nip0pkchx401yxj81m25l4z9";
+  };
+
+  buildInputs = with pythonPackages; [ python wrapPython ];
+  pythonPath = [ pythonPackages.curses ];
+
+  installPhase = ''
+    install -D transmission-remote-cli $out/bin/transmission-remote-cli
+    install -D transmission-remote-cli.1 $out/share/man/man1/transmission-remote-cli.1
+    wrapPythonPrograms
+  '';
+
+  meta = {
+    description = "Curses interface for the Transmission BitTorrent daemon";
+    homepage = https://github.com/fagga/transmission-remote-cli;
+    license = stdenv.lib.licenses.gpl3Plus;
+  };
+}

pkgs/applications/networking/sniffers/wireshark/default.nix

@@ -69,6 +69,6 @@ stdenv.mkDerivation {
     '';
 
     platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ simons bjornfor fpletz ];
+    maintainers = with stdenv.lib.maintainers; [ bjornfor fpletz ];
   };
 }

pkgs/applications/networking/sync/rsync/default.nix

@@ -25,6 +25,6 @@ stdenv.mkDerivation rec {
 
   meta = base.meta // {
     description = "A fast incremental file transfer utility";
-    maintainers = with stdenv.lib.maintainers; [ simons ehmry kampfschlaefer ];
+    maintainers = with stdenv.lib.maintainers; [ peti ehmry kampfschlaefer ];
   };
 }

pkgs/applications/office/antiword/default.nix

@@ -24,7 +24,7 @@ stdenv.mkDerivation {
     description = "Convert MS Word documents to plain text or PostScript";
     license = stdenv.lib.licenses.gpl2;
 
-    maintainers = [ stdenv.lib.maintainers.simons ];
+    maintainers = [ stdenv.lib.maintainers.peti ];
     platforms = stdenv.lib.platforms.linux;
   };
 }

pkgs/applications/office/gnucash/2.6.nix

@@ -103,7 +103,7 @@ stdenv.mkDerivation rec {
 
     homepage = http://www.gnucash.org/;
 
-    maintainers = [ stdenv.lib.maintainers.simons stdenv.lib.maintainers.iElectric ];
+    maintainers = [ stdenv.lib.maintainers.peti stdenv.lib.maintainers.iElectric ];
     platforms = stdenv.lib.platforms.gnu;
   };
 }

pkgs/applications/office/gnucash/default.nix

@@ -77,7 +77,7 @@ stdenv.mkDerivation rec {
 
     homepage = http://www.gnucash.org/;
 
-    maintainers = [ stdenv.lib.maintainers.simons stdenv.lib.maintainers.iElectric ];
+    maintainers = [ stdenv.lib.maintainers.peti stdenv.lib.maintainers.iElectric ];
     platforms = stdenv.lib.platforms.gnu;
   };
 }

pkgs/applications/office/ledger/2.6.3.nix

@@ -32,6 +32,6 @@ stdenv.mkDerivation rec {
     '';
 
     platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.simons ];
+    maintainers = [ stdenv.lib.maintainers.peti ];
   };
 }

pkgs/applications/office/ledger/default.nix

@@ -40,6 +40,6 @@ stdenv.mkDerivation {
     '';
 
     platforms = stdenv.lib.platforms.all;
-    maintainers = with stdenv.lib.maintainers; [ simons the-kenny jwiegley ];
+    maintainers = with stdenv.lib.maintainers; [ peti the-kenny jwiegley ];
   };
 }

pkgs/applications/office/libreoffice/default.nix

@@ -23,7 +23,7 @@ let
   langsSpaces = lib.concatStringsSep " " langs;
   major = "5";
   minor = "1";
-  patch = "2";
+  patch = "3";
   tweak = "2";
   subdir = "${major}.${minor}.${patch}";
   version = "${subdir}${if tweak == "" then "" else "."}${tweak}";
@@ -50,14 +50,14 @@ let
 
     translations = fetchSrc {
       name = "translations";
-      sha256 = "1w2m4hfrxb706p8bjfgklqv0j5hnivbvif3vav7sbngp5ms0vgvz";
+      sha256 = "039gjg4295x9f3hj0bh32csp63gbfns1sj7wk5mv51szdz50a8zi";
     };
 
     # TODO: dictionaries
 
     help = fetchSrc {
       name = "help";
-      sha256 = "0lr90z5fdg157lcid5w4p0zxi72c4xziiw51kh38kbbqrbb9ykfw";
+      sha256 = "0fq9wqzvbs6x003ljvhwbnq7vglzcq3yylndv0kp1mj00dkyz3gm";
     };
 
   };
@@ -66,7 +66,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
-    sha256 = "108p8jg22lg3g9wypqv5d71j4vkcpmg2x2w9l2v4z9h10agdrv2l";
+    sha256 = "1i077hz24kz1wmnvw9xicmm1mrr9msdxq4lg3y0hy47ar6kiqnnd";
   };
 
   # Openoffice will open libcups dynamically, so we link it directly

pkgs/applications/office/libreoffice/still.nix

@@ -23,8 +23,8 @@ let
   langsSpaces = lib.concatStringsSep " " langs;
   major = "5";
   minor = "0";
-  patch = "5";
+  patch = "6";
-  tweak = "2";
+  tweak = "3";
   subdir = "${major}.${minor}.${patch}";
   version = "${subdir}${if tweak == "" then "" else "."}${tweak}";
 
@@ -50,14 +50,14 @@ let
 
     translations = fetchSrc {
       name = "translations";
-      sha256 = "13cbfiqaycy8cxji5jfwfbgar8l4fzhg3aaggavsrwsmbvrqpbb7";
+      sha256 = "0ir97k91p3dxxs85ld1vyxcx7s63w678h9njbmw4y3mpp9f28y8c";
     };
 
     # TODO: dictionaries
 
     help = fetchSrc {
       name = "help";
-      sha256 = "0an081aj63hfhxv0k8h92vly0rnglbcpqax2pinybryk4dnljr36";
+      sha256 = "06qwdmdb086852qs6fzb3mm1wixkkkkg39njpvqsrfbdrr2amdjc";
     };
 
   };
@@ -66,7 +66,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
-    sha256 = "120vcxpxzs0za76fyfry281ysv6d1ianb37d1yq8py8chkdjkrqy";
+    sha256 = "1izc1ynfzg36jyi1ms5lmz9rl5lhlxa8qfa4bg7j2qlf65wdf0a6";
   };
 
   # Openoffice will open libcups dynamically, so we link it directly
@@ -251,5 +251,6 @@ in stdenv.mkDerivation rec {
     license = licenses.lgpl3;
     maintainers = with maintainers; [ viric raskin ];
     platforms = platforms.linux;
+    hydraPlatforms = [];
   };
 }

pkgs/applications/science/astronomy/celestia/default.nix

@@ -72,6 +72,6 @@ stdenv.mkDerivation {
     license = stdenv.lib.licenses.gpl2;
 
     platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.simons ];
+    maintainers = [ stdenv.lib.maintainers.peti ];
   };
 }

pkgs/applications/science/astronomy/gravit/default.nix

@@ -28,6 +28,5 @@ stdenv.mkDerivation rec {
     '';
 
     platforms = stdenv.lib.platforms.mesaPlatforms;
-    maintainers = [ stdenv.lib.maintainers.simons ];
   };
 }

pkgs/applications/science/astronomy/stellarium/default.nix

@@ -23,6 +23,6 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.gpl2;
 
     platforms = stdenv.lib.platforms.linux; # should be mesaPlatforms, but we don't have qt on darwin
-    maintainers = [ stdenv.lib.maintainers.simons ];
+    maintainers = [ stdenv.lib.maintainers.peti ];
   };
 }

pkgs/applications/science/electronics/tkgate/1.x.nix

@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     description = "Event driven digital circuit simulator with a TCL/TK-based graphical editor";
     homepage = "http://www.tkgate.org/";
     license = stdenv.lib.licenses.gpl2Plus;
-    maintainers = [ stdenv.lib.maintainers.simons ];
+    maintainers = [ stdenv.lib.maintainers.peti ];
     hydraPlatforms = stdenv.lib.platforms.linux;
   };
 }

pkgs/applications/science/math/R/default.nix

@@ -102,6 +102,6 @@ stdenv.mkDerivation rec {
     platforms = stdenv.lib.platforms.all;
     hydraPlatforms = stdenv.lib.platforms.linux;
 
-    maintainers = [ stdenv.lib.maintainers.simons ];
+    maintainers = [ stdenv.lib.maintainers.peti ];
   };
 }

pkgs/applications/science/math/eukleides/default.nix

@@ -32,6 +32,6 @@ stdenv.mkDerivation {
     '';
 
     platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.simons ];
+    maintainers = [ stdenv.lib.maintainers.peti ];
   };
 }

pkgs/applications/science/math/maxima/default.nix

@@ -49,6 +49,6 @@ stdenv.mkDerivation {
     '';
 
     platforms = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.simons ];
+    maintainers = [ stdenv.lib.maintainers.peti ];
   };
 }

pkgs/applications/science/math/pssp/default.nix

@@ -35,6 +35,5 @@ stdenv.mkDerivation rec {
     '';
 
     platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.simons ];
   };
 }

pkgs/applications/science/math/wxmaxima/default.nix

@@ -30,6 +30,6 @@ stdenv.mkDerivation {
     license = stdenv.lib.licenses.gpl2;
     homepage = http://wxmaxima.sourceforge.net;
     platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.simons ];
+    maintainers = [ stdenv.lib.maintainers.peti ];
   };
 }

pkgs/applications/version-management/cvs/default.nix

@@ -23,8 +23,6 @@ stdenv.mkDerivation {
   meta = {
     homepage = "http://cvs.nongnu.org";
     description = "Concurrent Versions System - a source control system";
-
     platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.simons ];
   };
 }

pkgs/applications/version-management/git-and-tools/git/default.nix

@@ -165,6 +165,6 @@ stdenv.mkDerivation {
     '';
 
     platforms = stdenv.lib.platforms.all;
-    maintainers = with stdenv.lib.maintainers; [ simons the-kenny wmertens ];
+    maintainers = with stdenv.lib.maintainers; [ peti the-kenny wmertens ];
   };
 }

pkgs/applications/version-management/git-and-tools/stgit/default.nix

@@ -28,7 +28,7 @@ stdenv.mkDerivation {
     description = "A patch manager implemented on top of Git";
     license = "GPL";
 
-    maintainers = with stdenv.lib.maintainers; [ simons the-kenny ];
+    maintainers = with stdenv.lib.maintainers; [ the-kenny ];
     platforms = stdenv.lib.platforms.unix;
   };
 }

pkgs/applications/version-management/git-and-tools/topgit/default.nix

@@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
     description = "TopGit manages large amount of interdependent topic branches";
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.unix;
-    maintainers = with stdenv.lib.maintainers; [ marcweber simons ];
+    maintainers = with stdenv.lib.maintainers; [ marcweber ];
   };
 }

pkgs/applications/version-management/rcs/default.nix

@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
       '';
 
     license = stdenv.lib.licenses.gpl3Plus;
-    maintainers = with stdenv.lib.maintainers; [ eelco simons ];
+    maintainers = with stdenv.lib.maintainers; [ eelco ];
     platforms = stdenv.lib.platforms.all;
   };
 }

pkgs/applications/video/obs-studio/default.nix

@@ -10,6 +10,8 @@
 , x264
 , curl
 
+, alsaSupport ? false
+, alsaLib
 , pulseaudioSupport ? false
 , libpulseaudio
 }:
@@ -18,13 +20,13 @@ let
   optional = stdenv.lib.optional;
 in stdenv.mkDerivation rec {
   name = "obs-studio-${version}";
-  version = "0.13.1";
+  version = "0.14.2";
 
   src = fetchFromGitHub {
     owner = "jp9000";
     repo = "obs-studio";
     rev = "${version}";
-    sha256 = "00dx8lksj10n0qhyar41y5q0bdrz7jdjwmhj8bdyz7jfkijjr44i";
+    sha256 = "05yjm58d6daya1x6v8d73gx8fb20l0icay74nx0v4si2c898vm1j";
   };
 
   nativeBuildInputs = [ cmake
@@ -39,6 +41,7 @@ in stdenv.mkDerivation rec {
                   qtx11extras
                   x264
                 ]
+                ++ optional alsaSupport alsaLib
                 ++ optional pulseaudioSupport libpulseaudio;
 
   # obs attempts to dlopen libobs-opengl, it fails unless we make sure

pkgs/applications/virtualization/virtualbox/default.nix

@@ -18,7 +18,7 @@ let
   # revision/hash as well. See
   # http://download.virtualbox.org/virtualbox/${version}/SHA256SUMS
   # for hashes.
-  version = "5.0.14";
+  version = "5.0.20";
 
   forEachModule = action: ''
     for mod in \
@@ -39,12 +39,12 @@ let
   '';
 
   # See https://github.com/NixOS/nixpkgs/issues/672 for details
-  extpackRevision = "105127";
+  extpackRevision = "106931";
   extensionPack = requireFile rec {
     name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${extpackRevision}.vbox-extpack";
     # IMPORTANT: Hash must be base16 encoded because it's used as an input to
     # VBoxExtPackHelperApp!
-    sha256 = "4a404b0d09dfd3952107e314ab63262293b2fb0a4dc6837b57fb7274bd016865";
+    sha256 = "11f40842a56ebb17da1bbc82a21543e66108a5330ebd54ded68038a990aa071b";
     message = ''
       In order to use the extension pack, you need to comply with the VirtualBox Personal Use
       and Evaluation License (PUEL) by downloading the related binaries from:
@@ -63,7 +63,7 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2";
-    sha256 = "69abac7255b2251a18fd73c0b7c200d5f8ce72a59fa019b53a5cdbf7f2843002";
+    sha256 = "0asc5n9an2dzvrd4isjz3vac2h0sm6dbzvrc36hn8ag2ma3hg75g";
   };
 
   buildInputs =

pkgs/applications/virtualization/virtualbox/guest-additions/default.nix

@@ -12,7 +12,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
-    sha256 = "cec0df18671adfe62a34d3810543f76f76206b212b2b61791fe026214c77507c";
+    sha256 = "1rh1dw0fqz1zhdbpnwxclh1bfj889xh27dm2m23v5wg54bymkfvg";
   };
 
   KERN_DIR = "${kernel.dev}/lib/modules/*/build";

pkgs/applications/window-managers/i3/lock-color.nix

@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub, which, pkgconfig, libxcb, xcbutilkeysyms
+, xcbutilimage, pam, libX11, libev, cairo, libxkbcommon, libxkbfile }:
+
+stdenv.mkDerivation rec {
+  rev = "63a4c23ec6f0b3f62144122a4277d51caf023e4f";
+  name = "i3lock-color-2.7_rev${builtins.substring 0 7 rev}";
+  src = fetchFromGitHub {
+    owner = "Arcaena";
+    repo = "i3lock-color";
+    inherit rev;
+    sha256 = "1wfp0p85h45l50l6zfk5cr9ynka60vhjlgnyk8mqd5fp0w4ibxip";
+  };
+  buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutilimage pam libX11
+    libev cairo libxkbcommon libxkbfile ];
+  makeFlags = "all";
+  preInstall = ''
+    mkdir -p $out/share/man/man1
+  '';
+  installFlags = "PREFIX=\${out} SYSCONFDIR=\${out}/etc MANDIR=\${out}/share/man";
+  meta = with stdenv.lib; {
+    description = "A simple screen locker like slock";
+    homepage = http://i3wm.org/i3lock/;
+    maintainers = with maintainers; [ garbas malyn iElectric ];
+    license = licenses.bsd3;
+    platforms = platforms.all;
+  };
+}

pkgs/applications/window-managers/i3/lock-fancy.nix

@@ -0,0 +1,36 @@
+{ stdenv, fetchFromGitHub, coreutils, scrot, imagemagick, gawk
+, i3lock-color
+}:
+
+stdenv.mkDerivation rec {
+  rev = "b7196aaff72b90bb6ea0464a9f7b37d140db3230";
+  name = "i3lock-fancy-2016-05-05_rev${builtins.substring 0 7 rev}";
+  src = fetchFromGitHub {
+    owner = "meskarune";
+    repo = "i3lock-fancy";
+    inherit rev;
+    sha256 = "0az43nqhmbniih3yw9kz5lnky0n7mxylvklsib76s4l2alf6i3ps";
+  };
+  patchPhase = ''
+    sed -i -e "s|mktemp|${coreutils}/bin/mktemp|" lock
+    sed -i -e "s|\`pwd\`|$out/share/i3lock-fancy|" lock
+    sed -i -e "s|dirname|${coreutils}/bin/dirname|" lock
+    sed -i -e "s|rm |${coreutils}/bin/rm |" lock
+    sed -i -e "s|scrot |${scrot}/bin/scrot |" lock
+    sed -i -e "s|convert |${imagemagick}/bin/convert |" lock
+    sed -i -e "s|awk |${gawk}/bin/awk|" lock
+    sed -i -e "s|i3lock |${i3lock-color}/bin/i3lock-color |" lock
+  '';
+  installPhase = ''
+    mkdir -p $out/bin $out/share/i3lock-fancy
+    cp lock $out/bin/i3lock-fancy
+    cp lock*.png $out/share/i3lock-fancy
+  '';
+  meta = with stdenv.lib; {
+    description = "i3lock is a bash script that takes a screenshot of the desktop, blurs the background and adds a lock icon and text.";
+    homepage = https://github.com/meskarune/i3lock-fancy;
+    maintainers = with maintainers; [ garbas ];
+    license = licenses.mit;
+    platforms = platforms.linux;
+  };
+}

pkgs/applications/window-managers/i3/pystatus.nix

@@ -14,7 +14,8 @@ python3Packages.buildPythonApplication rec {
   propagatedBuildInputs = with python3Packages; [ keyring colour netifaces praw psutil basiciw ] ++
     [ libpulseaudio ] ++ extraLibs;
 
-  ldWrapperSuffix = "--suffix LD_LIBRARY_PATH : \"${libpulseaudio}/lib\"";
+  libpulseaudioPath = stdenv.lib.makeLibraryPath [ libpulseaudio ];
+  ldWrapperSuffix = "--suffix LD_LIBRARY_PATH : \"${libpulseaudioPath}\"";
   makeWrapperArgs = [ ldWrapperSuffix ]; # libpulseaudio.so is loaded manually
 
   postInstall = ''

pkgs/build-support/fetchgit/nix-prefetch-git

@@ -286,7 +286,7 @@ _clone_user_rev() {
     eval "$NIX_PREFETCH_GIT_CHECKOUT_HOOK"
     if test -z "$leaveDotGit"; then
         echo "removing \`.git'..." >&2
-        find "$dir" -name .git\* -print0 | xargs -0 rm -rf
+        find "$dir" -name .git -print0 | xargs -0 rm -rf
     else
         find "$dir" -name .git | while read gitdir; do
             make_deterministic_repo "$(readlink -f "$gitdir/..")"

pkgs/build-support/fetchurl/mirrors.nix

@@ -54,9 +54,9 @@ rec {
     https://gnupg.org/ftp/gcrypt/
     http://www.ring.gr.jp/pub/net/
     http://gd.tuwien.ac.at/privacy/
-    http://mirrors.dotsrc.org/
+    http://mirrors.dotsrc.org/gcrypt/
-    http://ftp.heanet.ie/mirrors/ftp.gnupg.org/
+    http://ftp.heanet.ie/mirrors/ftp.gnupg.org/gcrypt/
-    http://www.mirrorservice.org/sites/ftp.gnupg.org/
+    http://www.mirrorservice.org/sites/ftp.gnupg.org/gcrypt/
   ];
 
   # kernel.org's /pub (/pub/{linux,software}) tree.

pkgs/data/fonts/dosemu-fonts/default.nix

@@ -1,31 +1,28 @@
-{stdenv, fetchurl, bdftopcf, mkfontdir, mkfontscale}:
+{ stdenv, fetchurl, bdftopcf, mkfontdir, mkfontscale }:
 
 stdenv.mkDerivation rec {
-  version = "1.4.0";
   name = "dosemu-fonts-${version}";
+  version = "1.4.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/dosemu/dosemu-${version}.tgz";
     sha256 = "0l1zwmw42mpakjrzmbygshcg2qzq9mv8lx42738rz3j9hrqzg4pw";
   };
 
-  dontBuild = true;
+  buildCommand = ''
-
+    tar xf "$src" --anchored --wildcards '*/etc/*.bdf' '*/etc/dosemu.alias'
-  buildInputs = [bdftopcf mkfontdir mkfontscale];
-
-  installPhase = ''
     fontPath="$out/share/fonts/X11/misc/dosemu"
     mkdir -p "$fontPath"
-    for i in etc/*.bdf; do
+    for i in */etc/*.bdf; do
       fontOut="$out/share/fonts/X11/misc/dosemu/$(basename "$i" .bdf).pcf.gz"
       echo -n "Installing font $fontOut..." >&2
-      bdftopcf $i | gzip -c -9 > "$fontOut"
+      ${bdftopcf}/bin/bdftopcf $i | gzip -c -9 > "$fontOut"
       echo " done." >&2
     done
-    cp etc/dosemu.alias "$fontPath/fonts.alias"
+    cp */etc/dosemu.alias "$fontPath/fonts.alias"
     cd "$fontPath"
-    mkfontdir
+    ${mkfontdir}/bin/mkfontdir
-    mkfontscale
+    ${mkfontscale}/bin/mkfontscale
   '';
 
   meta = {

pkgs/data/fonts/fantasque-sans-mono/default.nix

@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "fantasque-sans-mono-${version}";
-  version = "1.6.5";
+  version = "1.7.1";
 
   src = fetchurl {
     url = "https://github.com/belluzj/fantasque-sans/releases/download/v${version}/FantasqueSansMono.zip";
-    sha256 = "19a82xlbcnd7dxqmpp03b62gjvi33bh635r0bjw2l09lgir6alym";
+    sha256 = "0lkky7mmpq6igpjh7lsv30xjx62mwlx27gd9zwcyv3mp2d2b5cvb";
   };
 
   buildInputs = [unzip];

pkgs/data/fonts/nerdfonts/default.nix

@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub, bash, which }:
+
+stdenv.mkDerivation rec {
+  version = "0.7.0";
+  name = "nerdfonts-${version}";
+  src = fetchFromGitHub {
+    owner = "ryanoasis";
+    repo = "nerd-fonts";
+    rev = version;
+    sha256 = "0q2h8hpkbid8idi2kvzx5bnhyh65y51k02g7xpv3drjqj08cz7y0";
+  };
+  dontPatchShebangs = true;
+  buildInputs = [ which ];
+  patchPhase = ''
+    sed -i -e 's|/bin/bash|${bash}/bin/bash|g' install.sh
+    sed -i -e 's|font_dir="\$HOME/.local/share/fonts|font_dir="$out/share/fonts/truetype|g' install.sh
+  '';
+  installPhase = ''
+    mkdir -p $out/share/fonts/truetype
+    ./install.sh
+  '';
+  meta = with stdenv.lib; {
+    description = "Nerd Fonts is a project that attempts to patch as many developer targeted and/or used fonts as possible. The patch is to specifically add a high number of additional glyphs from popular 'iconic fonts' such as Font Awesome, Devicons, Octicons, and others.";
+    homepage = "https://github.com/ryanoasis/nerd-fonts";
+    license = licenses.mit;
+    maintainers = with maintainers; [ garbas ];
+  };
+}

pkgs/data/misc/geolite-legacy/default.nix

@@ -8,7 +8,7 @@ let
 in
 stdenv.mkDerivation rec {
   name = "geolite-legacy-${version}";
-  version = "2016-05-09";
+  version = "2016-05-16";
 
   srcGeoIP = fetchDB
     "GeoLiteCountry/GeoIP.dat.gz" "GeoIP.dat.gz"
@@ -24,10 +24,10 @@ stdenv.mkDerivation rec {
     "1v8wdqh6yjicb7bdcxp7v5dimlrny1fiynf4wr6wh65vr738csy2";
   srcGeoIPASNum = fetchDB
     "asnum/GeoIPASNum.dat.gz" "GeoIPASNum.dat.gz"
-    "0a8m521r1b4q88d7zffnkgvn9hjxcr7jzwd9qmnzjxfl5r7iiwzr";
+    "1nplklc88jn0iqla9ar5vgcq4wvkqkd5pbgvn89757466dl1igiw";
   srcGeoIPASNumv6 = fetchDB
     "asnum/GeoIPASNumv6.dat.gz" "GeoIPASNumv6.dat.gz"
-    "079a88ybfbbhqslm2hf72lpl2rjr6s6nz3cahay6m8ahaga9y75s";
+    "06wmjr4frc83v68abpnad8z9xy4fsjsvwild6bw7816w9rdvdqzw";
 
   meta = with stdenv.lib; {
     description = "GeoLite Legacy IP geolocation databases";

pkgs/desktops/kde-5/applications-16.04/fetchsrcs.sh

@@ -4,7 +4,7 @@
 set -x
 
 # The trailing slash at the end is necessary!
-WGET_ARGS='http://download.kde.org/stable/applications/16.04.0/ -A *.tar.xz'
+WGET_ARGS='http://download.kde.org/stable/applications/16.04.1/ -A *.tar.xz'
 
 mkdir tmp; cd tmp
 

pkgs/desktops/kde-5/frameworks-5.21/kservice/ksycoca-buffer-size.patch

@@ -1,25 +0,0 @@
-Index: kservice-5.21.0/src/sycoca/ksycocautils.cpp
-===================================================================
---- kservice-5.21.0.orig/src/sycoca/ksycocautils.cpp
-+++ kservice-5.21.0/src/sycoca/ksycocautils.cpp
-@@ -24,9 +24,10 @@
- 
- void KSycocaUtilsPrivate::read(QDataStream &s, QString &str)
- {
-+    const qint32 bufferSize = 65528;
-     quint32 bytes;
-     s >> bytes;                          // read size of string
--    if (bytes > 8192) {                  // null string or too big
-+    if (bytes > bufferSize) {                  // null string or too big
-         if (bytes != 0xffffffff) {
-             KSycoca::flagError();
-         }
-@@ -35,7 +36,7 @@ void KSycocaUtilsPrivate::read(QDataStre
-         int bt = bytes / 2;
-         str.resize(bt);
-         QChar *ch = str.data();
--        char t[8192];
-+        char t[bufferSize];
-         char *b = t;
-         s.readRawData(b, bytes);
-         while (bt--) {

pkgs/desktops/kde-5/frameworks-5.21/kservice/series

@@ -1,3 +0,0 @@
-qdiriterator-follow-symlinks.patch
-no-canonicalize-path.patch
-ksycoca-buffer-size.patch

pkgs/desktops/kde-5/frameworks-5.21/srcs.nix

@@ -1,573 +0,0 @@
-# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh
-{ fetchurl, mirror }:
-
-{
-  attica = {
-    version = "5.21.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.21/attica-5.21.0.tar.xz";
-      sha256 = "1aqfw73g424f60qmpx1lky3qfqrsl1id02388pnlmpa8fnpp940c";
-      name = "attica-5.21.0.tar.xz";
-    };
-  };
-  baloo = {
-    version = "5.21.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.21/baloo-5.21.0.tar.xz";
-      sha256 = "1a5sl2bkrs90mfks93q2hrijp6dpapp2l0fhq7km36mvsrc78yqn";
-      name = "baloo-5.21.0.tar.xz";
-    };
-  };
-  bluez-qt = {
-    version = "5.21.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.21/bluez-qt-5.21.0.tar.xz";
-      sha256 = "0nsnxa4k31l69fapxn49g112948zprc5xr7v3ggxwnxkb1pll60a";
-      name = "bluez-qt-5.21.0.tar.xz";
-    };
-  };
-  breeze-icons = {
-    version = "5.21.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.21/breeze-icons-5.21.0.tar.xz";
-      sha256 = "1a7ikdq8a44n42i6swf29aqyfwjh05ir3ym0lzjzdb6133fzlb01";
-      name = "breeze-icons-5.21.0.tar.xz";
-    };
-  };
-  extra-cmake-modules = {
-    version = "5.21.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.21/extra-cmake-modules-5.21.0.tar.xz";
-      sha256 = "1kbc5fkcbz9vkg0jpz10vsfgwajlrsmbl0vrbls5qvrdgbgrwlm3";
-      name = "extra-cmake-modules-5.21.0.tar.xz";
-    };
-  };
-  frameworkintegration = {
-    version = "5.21.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.21/frameworkintegration-5.21.0.tar.xz";
-      sha256 = "0mbpn18cjzd8xznk73slvals86lv77ram09px4l44xgyf019xll8";
-      name = "frameworkintegration-5.21.0.tar.xz";
-    };
-  };
-  kactivities = {
-    version = "5.21.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.21/kactivities-5.21.0.tar.xz";
-      sha256 = "09jr7m6vaffdb879jph1ckgri0b9pdyh5q39i7fyi6s277rybcyk";
-      name = "kactivities-5.21.0.tar.xz";
-    };
-  };
-  kactivities-stats = {
-    version = "5.21.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.21/kactivities-stats-5.21.0.tar.xz";
-      sha256 = "0vd01b812r0ggbnqsq3y6ik68v0668rzx6npl3h11wdrvlidhyqf";
-      name = "kactivities-stats-5.21.0.tar.xz";
-    };
-  };
-  kapidox = {
-    version = "5.21.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.21/kapidox-5.21.0.tar.xz";
-      sha256 = "0w3jch93d8vdqd0g4yl2fxmamrg9hnx1lypnpgw7615wlsb02qyx";
-      name = "kapidox-5.21.0.tar.xz";
-    };
-  };
-  karchive = {
-    version = "5.21.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.21/karchive-5.21.0.tar.xz";
-      sha256 = "042ww21wmm3sf87zqgr2qiyg2j5mjf1mmqpqhpcax4gnjpck5nvc";
-      name = "karchive-5.21.0.tar.xz";
-    };
-  };
-  kauth = {
-    version = "5.21.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.21/kauth-5.21.0.tar.xz";
-      sha256 = "03dy36g9y04p3533l2y0m0jlr91m94y0i4wpnlr5ndgccif2a63r";
-      name = "kauth-5.21.0.tar.xz";
-    };
-  };
-  kbookmarks = {
-    version = "5.21.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.21/kbookmarks-5.21.0.tar.xz";
-      sha256 = "0qxq5wbddaj1cpjd34q8k65brfbb677gs0y5zh24mqbwcr0rfs6g";
-      name = "kbookmarks-5.21.0.tar.xz";
-    };
-  };
-  kcmutils = {
-    version = "5.21.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.21/kcmutils-5.21.0.tar.xz";
-      sha256 = "01ch3y43r4cb1sj0gy5a8wq3c6wpx2brn96d7rjm3r3hh5n5xdlj";
-      name = "kcmutils-5.21.0.tar.xz";
-    };
-  };
-  kcodecs = {
-    version = "5.21.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.21/kcodecs-5.21.0.tar.xz";
-      sha256 = "0wng7kqqxrsz7b4w163j6m2zdhb5pvgbd9n6bn7ggyldn4zl86w7";
-      name = "kcodecs-5.21.0.tar.xz";
-    };
-  };
-  kcompletion = {
-    version = "5.21.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.21/kcompletion-5.21.0.tar.xz";
-      sha256 = "0r6gsnsjkfvwhrpkch7y44m2yqyxb42bdkc35jxrm8y7xaa8nwi4";
-      name = "kcompletion-5.21.0.tar.xz";
-    };
-  };
-  kconfig = {
-    version = "5.21.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.21/kconfig-5.21.0.tar.xz";
-      sha256 = "0w5wvy3yhgh64k8jghyv5fkx9jr828yl11jlihg24hfplnmihkxw";
-      name = "kconfig-5.21.0.tar.xz";
-    };
-  };
-  kconfigwidgets = {
-    version = "5.21.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.21/kconfigwidgets-5.21.0.tar.xz";
-      sha256 = "030iq46bwiaixn2wf6285y2gg7h1y5xqf6d6bg3xcz0v1xjd3n0f";
-      name = "kconfigwidgets-5.21.0.tar.xz";
-    };
-  };
-  kcoreaddons = {
-    version = "5.21.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.21/kcoreaddons-5.21.0.tar.xz";
-      sha256 = "16226z60simxgfriwsm6srx39f7wm64mdl39qxaa77wn07i8xmsi";
-      name = "kcoreaddons-5.21.0.tar.xz";
-    };
-  };
-  kcrash = {
-    version = "5.21.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.21/kcrash-5.21.0.tar.xz";
-      sha256 = "1mrbmfkzd0dy42ppq8gl1z9liprq722w4f3a499iamqnlsdwq2w8";
-      name = "kcrash-5.21.0.tar.xz";
-    };
-  };
-  kdbusaddons = {
-    version = "5.21.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.21/kdbusaddons-5.21.0.tar.xz";
-      sha256 = "1yvpan0plm80sw0wai39ffvpswyzy7xiqra69cb8mfxcdl8acjjw";
-      name = "kdbusaddons-5.21.0.tar.xz";
-    };
-  };
-  kdeclarative = {
-    version = "5.21.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.21/kdeclarative-5.21.0.tar.xz";
-      sha256 = "1m61js8kdnif1106vxs5bv830hyj8j2whv5mlshkj9jbpp9v5qkj";
-      name = "kdeclarative-5.21.0.tar.xz";
-    };
-  };
-  kded = {
-    version = "5.21.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.21/kded-5.21.0.tar.xz";
-      sha256 = "138svq07zgabn6razkqp5zxdlw9ajr1966icd82mxsxq1cjgfl4g";
-      name = "kded-5.21.0.tar.xz";
-    };
-  };
-  kdelibs4support = {
-    version = "5.21.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.21/portingAids/kdelibs4support-5.21.0.tar.xz";
-      sha256 = "1q1wyfry2ypa1mk01rabva0cq1ai9lmq8ygsji413p6c1avfrywc";
-      name = "kdelibs4support-5.21.0.tar.xz";
-    };
-  };
-  kdesignerplugin = {
-    version = "5.21.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.21/kdesignerplugin-5.21.0.tar.xz";
-      sha256 = "0rj79mdgdcm0wlramx5s53ba0jkhravcgkl570ds7s3wwa1aa62j";
-      name = "kdesignerplugin-5.21.0.tar.xz";
-    };
-  };
-  kdesu = {
-    version = "5.21.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.21/kdesu-5.21.0.tar.xz";
-      sha256 = "13daljcjgrvybj7hbv6l9cwc6cdh45d2zz2ch7cbar46z2zxh5qb";
-      name = "kdesu-5.21.0.tar.xz";
-    };
-  };
-  kdewebkit = {
-    version = "5.21.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.21/kdewebkit-5.21.0.tar.xz";
-      sha256 = "1rc5i265sagvbqwy96i4dnksc4vnrq864z3rkxqlrx2blwq08550";
-      name = "kdewebkit-5.21.0.tar.xz";
-    };
-  };
-  kdnssd = {
-    version = "5.21.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.21/kdnssd-5.21.0.tar.xz";
-      sha256 = "0k3qia322cd2h9pcf7k0fg7w91jxc503digjv93vhsfzfhbadf9l";
-      name = "kdnssd-5.21.0.tar.xz";
-    };
-  };
-  kdoctools = {
-    version = "5.21.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.21/kdoctools-5.21.0.tar.xz";
-      sha256 = "16ysqwvwmxas56rhg68rzkipszqqahh787ww9rkq9ak2r6d29r6c";
-      name = "kdoctools-5.21.0.tar.xz";
-    };
-  };
-  kemoticons = {
-    version = "5.21.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.21/kemoticons-5.21.0.tar.xz";
-      sha256 = "1paddfylh1xb4g4h939lzvy7f67syyfsx76gz7w5mdbnqk5xc7fc";
-      name = "kemoticons-5.21.0.tar.xz";
-    };
-  };
-  kfilemetadata = {
-    version = "5.21.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.21/kfilemetadata-5.21.0.tar.xz";
-      sha256 = "1jmcvzazcw5klmnzd17a7x6rcwjb6xdrxrn1jjiq8kibdbghx7l0";
-      name = "kfilemetadata-5.21.0.tar.xz";
-    };
-  };
-  kglobalaccel = {
-    version = "5.21.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.21/kglobalaccel-5.21.0.tar.xz";
-      sha256 = "1bdd613ybz1cl25sx3ihdfzsjwlxyjx9blidmzbnvv0lb2304hwp";
-      name = "kglobalaccel-5.21.0.tar.xz";
-    };
-  };
-  kguiaddons = {
-    version = "5.21.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.21/kguiaddons-5.21.0.tar.xz";
-      sha256 = "01hdrcdsiq3qs620jprv65kk4pvldlm70aghjsi9wk7j3x6qid2x";
-      name = "kguiaddons-5.21.0.tar.xz";
-    };
-  };
-  khtml = {
-    version = "5.21.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.21/portingAids/khtml-5.21.0.tar.xz";
-      sha256 = "17xvzklhhp6k9wi94s7agc8qnb7gwvx3aa5jbq6d76qn0rsqbzhv";
-      name = "khtml-5.21.0.tar.xz";
-    };
-  };
-  ki18n = {
-    version = "5.21.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.21/ki18n-5.21.0.tar.xz";
-      sha256 = "0qm9p77zqz2jy0j5yfv5v6pqska25p790yy1b6wg1gd67561q5bn";
-      name = "ki18n-5.21.0.tar.xz";
-    };
-  };
-  kiconthemes = {
-    version = "5.21.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.21/kiconthemes-5.21.0.tar.xz";
-      sha256 = "14a43jca1cyh45dbz5c9lc5yqc376qg3q2c420bk5s44ynpnhp4i";
-      name = "kiconthemes-5.21.0.tar.xz";
-    };
-  };
-  kidletime = {
-    version = "5.21.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.21/kidletime-5.21.0.tar.xz";
-      sha256 = "10vdx2sp3hjp20saqlyqdz83jbqhsqyk7gl063lhz00mnk7nk1mn";
-      name = "kidletime-5.21.0.tar.xz";
-    };
-  };
-  kimageformats = {
-    version = "5.21.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.21/kimageformats-5.21.0.tar.xz";
-      sha256 = "09m0w5f39y9gq0g00iapay3v09kk24lqwiyjq4y487il865p22ph";
-      name = "kimageformats-5.21.0.tar.xz";
-    };
-  };
-  kinit = {
-    version = "5.21.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.21/kinit-5.21.0.tar.xz";
-      sha256 = "19avsq0bi2ys574n0dcn65chd7wrpyp354xfsw45gig28skjiir5";
-      name = "kinit-5.21.0.tar.xz";
-    };
-  };
-  kio = {
-    version = "5.21.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.21/kio-5.21.0.tar.xz";
-      sha256 = "08wrjimkv255gbc9y7pxilwxi9nikg3196rzs0fbw4vqdlzl0gjq";
-      name = "kio-5.21.0.tar.xz";
-    };
-  };
-  kitemmodels = {
-    version = "5.21.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.21/kitemmodels-5.21.0.tar.xz";
-      sha256 = "1bp02vp08bwsd64wnrr3ivy4k8g1vzv1s5iyiqj99d1gk0fxvv7d";
-      name = "kitemmodels-5.21.0.tar.xz";
-    };
-  };
-  kitemviews = {
-    version = "5.21.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.21/kitemviews-5.21.0.tar.xz";
-      sha256 = "16yzcyrg8wa8fvz749x8dbixyga1ggls1fvjns6gdbz5aqm6ib4d";
-      name = "kitemviews-5.21.0.tar.xz";
-    };
-  };
-  kjobwidgets = {
-    version = "5.21.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.21/kjobwidgets-5.21.0.tar.xz";
-      sha256 = "0y8zmz6wx4igbpc0jlsxrr1yxgyq8hsmynl9fqy3lc2bzmwr9wcp";
-      name = "kjobwidgets-5.21.0.tar.xz";
-    };
-  };
-  kjs = {
-    version = "5.21.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.21/portingAids/kjs-5.21.0.tar.xz";
-      sha256 = "0vsgmz0yn1if11xfbw3f9p0kg2dv1rb26ging4fc860wv2j5gyln";
-      name = "kjs-5.21.0.tar.xz";
-    };
-  };
-  kjsembed = {
-    version = "5.21.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.21/portingAids/kjsembed-5.21.0.tar.xz";
-      sha256 = "1nbc12m86s90y8f5gp62l4f9v4hqy8cmzw4sh0655sczd5vbkvki";
-      name = "kjsembed-5.21.0.tar.xz";
-    };
-  };
-  kmediaplayer = {
-    version = "5.21.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.21/portingAids/kmediaplayer-5.21.0.tar.xz";
-      sha256 = "1hz7l95w57z73wg9ypbqpkxvkw42wgbymv67lg4vdxppplnkqriz";
-      name = "kmediaplayer-5.21.0.tar.xz";
-    };
-  };
-  knewstuff = {
-    version = "5.21.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.21/knewstuff-5.21.0.tar.xz";
-      sha256 = "05r11r9r789686i36y0x770f1pc7dwvqzdzclrx22r3lbz708pga";
-      name = "knewstuff-5.21.0.tar.xz";
-    };
-  };
-  knotifications = {
-    version = "5.21.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.21/knotifications-5.21.0.tar.xz";
-      sha256 = "0iia73ai2s5w8c3j1kmc8bb7yp1d2cv0yd2k3ilaxf3y9wgsp4x8";
-      name = "knotifications-5.21.0.tar.xz";
-    };
-  };
-  knotifyconfig = {
-    version = "5.21.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.21/knotifyconfig-5.21.0.tar.xz";
-      sha256 = "1mqal5ndr3v54lp7a9a2fm0c0hsiqb7kziw56rz0xd659328k9ix";
-      name = "knotifyconfig-5.21.0.tar.xz";
-    };
-  };
-  kpackage = {
-    version = "5.21.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.21/kpackage-5.21.0.tar.xz";
-      sha256 = "024k15v0b24hivkjpn3gwn2wdfsng9ralz414i858qj0lm688xk5";
-      name = "kpackage-5.21.0.tar.xz";
-    };
-  };
-  kparts = {
-    version = "5.21.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.21/kparts-5.21.0.tar.xz";
-      sha256 = "1s1nk1vdnb3g0ilv2b1m783h8g52yr9hpqz0vscj56m9cn2sf8rv";
-      name = "kparts-5.21.0.tar.xz";
-    };
-  };
-  kpeople = {
-    version = "5.21.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.21/kpeople-5.21.0.tar.xz";
-      sha256 = "0nfpv4g9zvja9sv3zbpyksbvz1xa8lmncg48awrwbrmf83bxvcjq";
-      name = "kpeople-5.21.0.tar.xz";
-    };
-  };
-  kplotting = {
-    version = "5.21.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.21/kplotting-5.21.0.tar.xz";
-      sha256 = "1hrpv1qg6qx4y4wvyq0rxfi0ngq1lgd5l3vwi00ri86xm1qbs4hk";
-      name = "kplotting-5.21.0.tar.xz";
-    };
-  };
-  kpty = {
-    version = "5.21.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.21/kpty-5.21.0.tar.xz";
-      sha256 = "1vzgpmagjggssva6r57hd094dv3vxf3gpsr3xpvspa9l1mk4d35c";
-      name = "kpty-5.21.0.tar.xz";
-    };
-  };
-  kross = {
-    version = "5.21.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.21/portingAids/kross-5.21.0.tar.xz";
-      sha256 = "0c1gbaifzswz4dcdwzka5mnlm07i463dpwc2fihmzn67skm4ybix";
-      name = "kross-5.21.0.tar.xz";
-    };
-  };
-  krunner = {
-    version = "5.21.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.21/portingAids/krunner-5.21.0.tar.xz";
-      sha256 = "1jn8fr83c71kz25yzd1qay9as6dvzl1xvlg1vyspdifxg43vqzq4";
-      name = "krunner-5.21.0.tar.xz";
-    };
-  };
-  kservice = {
-    version = "5.21.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.21/kservice-5.21.0.tar.xz";
-      sha256 = "19cnapz23ji5p01r9rgj91rzph3mqqrmnfwprmi9p3h2w68njhv6";
-      name = "kservice-5.21.0.tar.xz";
-    };
-  };
-  ktexteditor = {
-    version = "5.21.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.21/ktexteditor-5.21.0.tar.xz";
-      sha256 = "1m9zipx5kisxsy037py709c2ri5qvix6n362l981kbbvcgkpiaq2";
-      name = "ktexteditor-5.21.0.tar.xz";
-    };
-  };
-  ktextwidgets = {
-    version = "5.21.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.21/ktextwidgets-5.21.0.tar.xz";
-      sha256 = "11nsi6j9b2678bqaa0ykp8as5lw1v9421b73dd1qxqrpdqfkxyzn";
-      name = "ktextwidgets-5.21.0.tar.xz";
-    };
-  };
-  kunitconversion = {
-    version = "5.21.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.21/kunitconversion-5.21.0.tar.xz";
-      sha256 = "03vnls5df0c2bqyw9a04hlc3cn34y6xwx693klh27jmm37r776yh";
-      name = "kunitconversion-5.21.0.tar.xz";
-    };
-  };
-  kwallet = {
-    version = "5.21.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.21/kwallet-5.21.0.tar.xz";
-      sha256 = "1rmfy21r2p79gwg1kq26g2fqnclbsww9rz3py368pk4s1lrzafii";
-      name = "kwallet-5.21.0.tar.xz";
-    };
-  };
-  kwidgetsaddons = {
-    version = "5.21.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.21/kwidgetsaddons-5.21.0.tar.xz";
-      sha256 = "1gqyc0j77sm6i2511qnz0sllmfxjgjb9qpi8551np16zviqa52k7";
-      name = "kwidgetsaddons-5.21.0.tar.xz";
-    };
-  };
-  kwindowsystem = {
-    version = "5.21.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.21/kwindowsystem-5.21.0.tar.xz";
-      sha256 = "13lfwpw5a4in0mp5y8d15jg6xhhrka2qmw73wrdzcvj22n6ldzzi";
-      name = "kwindowsystem-5.21.0.tar.xz";
-    };
-  };
-  kxmlgui = {
-    version = "5.21.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.21/kxmlgui-5.21.0.tar.xz";
-      sha256 = "1cb6n016ffvxy8dbbhc3dwlzdqpq0pbvly416qlvlc1lv70lxyfj";
-      name = "kxmlgui-5.21.0.tar.xz";
-    };
-  };
-  kxmlrpcclient = {
-    version = "5.21.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.21/kxmlrpcclient-5.21.0.tar.xz";
-      sha256 = "082qpnvgm9r81iip9akakbf5rqmxb0r8y6gp7jk49q29lvkrx1kh";
-      name = "kxmlrpcclient-5.21.0.tar.xz";
-    };
-  };
-  modemmanager-qt = {
-    version = "5.21.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.21/modemmanager-qt-5.21.0.tar.xz";
-      sha256 = "1w0kjp2pmgss45g63930lbn1c018ld2snng6h40saxi76n8cv57n";
-      name = "modemmanager-qt-5.21.0.tar.xz";
-    };
-  };
-  networkmanager-qt = {
-    version = "5.21.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.21/networkmanager-qt-5.21.0.tar.xz";
-      sha256 = "0iy4a4qb1am2y7w03jg6n7q69c46y4gdpb72r6qjrnm9d4c2xsg1";
-      name = "networkmanager-qt-5.21.0.tar.xz";
-    };
-  };
-  oxygen-icons5 = {
-    version = "5.21.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.21/oxygen-icons5-5.21.0.tar.xz";
-      sha256 = "00qh1h3xx392hh73zdlknc1j9i2sck9ys74a9ffkf6an4rl0hws5";
-      name = "oxygen-icons5-5.21.0.tar.xz";
-    };
-  };
-  plasma-framework = {
-    version = "5.21.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.21/plasma-framework-5.21.0.tar.xz";
-      sha256 = "006k8y8dnar371b5qhikny6rda3vg810jy53sl9yps695j0y39c0";
-      name = "plasma-framework-5.21.0.tar.xz";
-    };
-  };
-  solid = {
-    version = "5.21.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.21/solid-5.21.0.tar.xz";
-      sha256 = "13r9zcf7sr6vg5wlqjms2q7vl4g8gpzqghp3y25ldglhj0z7252r";
-      name = "solid-5.21.0.tar.xz";
-    };
-  };
-  sonnet = {
-    version = "5.21.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.21/sonnet-5.21.0.tar.xz";
-      sha256 = "088b87r80lds6jr0lnqxv0bd4isy2mkcgrq7hxfni7r2h6vn3xcd";
-      name = "sonnet-5.21.0.tar.xz";
-    };
-  };
-  threadweaver = {
-    version = "5.21.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.21/threadweaver-5.21.0.tar.xz";
-      sha256 = "17l23jj9bsixhg3gpv5sjrlc6w1kmjwlfb0z17drdkyzs5ak80ry";
-      name = "threadweaver-5.21.0.tar.xz";
-    };
-  };
-}

pkgs/desktops/kde-5/frameworks-5.22/fetchsrcs.sh

@@ -4,7 +4,7 @@
 set -x
 
 # The trailing slash at the end is necessary!
-RELEASE_URL="http://download.kde.org/stable/frameworks/5.21/"
+RELEASE_URL="http://download.kde.org/stable/frameworks/5.22/"
 EXTRA_WGET_ARGS='-A *.tar.xz'
 
 mkdir tmp; cd tmp