Merge remote-tracking branch 'upstream/master' into HEAD

.github/CONTRIBUTING.md

@@ -32,11 +32,14 @@ under the terms of [COPYING](../COPYING), which is an MIT-like license.
     The old config generation system used impure shell scripts and could break in specific circumstances (see #1234).
 
 * `meta.description` should:
-  * Be capitalized
+  * Be capitalized.
-  * Not start with the package name
+  * Not start with the package name.
-  * Not have a dot at the end
+  * Not have a period at the end.
+* `meta.license` must be set and fit the upstream license.
+  * If there is no upstream license, `meta.license` should default to `stdenv.lib.licenses.unfree`.
+* `meta.maintainers` must be set.
 
-See the nixpkgs manual for more details on how to [Submit changes to nixpkgs](https://nixos.org/nixpkgs/manual/#chap-submitting-changes).
+See the nixpkgs manual for more details on [standard meta-attributes](https://nixos.org/nixpkgs/manual/#sec-standard-meta-attributes) and on how to [submit changes to nixpkgs](https://nixos.org/nixpkgs/manual/#chap-submitting-changes).
 
 ## Writing good commit messages
 

lib/maintainers.nix

@@ -66,7 +66,7 @@
   aycanirican = "Aycan iRiCAN <iricanaycan@gmail.com>";
   bachp = "Pascal Bach <pascal.bach@nextrem.ch>";
   badi = "Badi' Abdul-Wahid <abdulwahidc@gmail.com>";
-  balajisivaraman = "Balaji Sivaraman<sivaraman.balaji@gmail.com>";
+  balajisivaraman = "Balaji Sivaraman <sivaraman.balaji@gmail.com>";
   barrucadu = "Michael Walker <mike@barrucadu.co.uk>";
   basvandijk = "Bas van Dijk <v.dijk.bas@gmail.com>";
   Baughn = "Svein Ove Aas <sveina@gmail.com>";
@@ -161,6 +161,7 @@
   dgonyeo = "Derek Gonyeo <derek@gonyeo.com>";
   dipinhora = "Dipin Hora <dipinhora+github@gmail.com>";
   disassembler = "Samuel Leathers <disasm@gmail.com>";
+  dizfer = "David Izquierdo <david@izquierdofernandez.com>";
   dmalikov = "Dmitry Malikov <malikov.d.y@gmail.com>";
   DmitryTsygankov = "Dmitry Tsygankov <dmitry.tsygankov@gmail.com>";
   dmjio = "David Johnson <djohnson.m@gmail.com>";
@@ -268,6 +269,7 @@
   htr = "Hugo Tavares Reis <hugo@linux.com>";
   iand675 = "Ian Duncan <ian@iankduncan.com>";
   ianwookim = "Ian-Woo Kim <ianwookim@gmail.com>";
+  iblech = "Ingo Blechschmidt <iblech@speicherleck.de>";
   igsha = "Igor Sharonov <igor.sharonov@gmail.com>";
   ikervagyok = "Balázs Lengyel <ikervagyok@gmail.com>";
   infinisil = "Silvan Mosberger <infinisil@icloud.com>";
@@ -548,6 +550,7 @@
   ryneeverett = "Ryne Everett <ryneeverett@gmail.com>";
   rzetterberg = "Richard Zetterberg <richard.zetterberg@gmail.com>";
   s1lvester = "Markus Silvester <s1lvester@bockhacker.me>";
+  samdroid-apps = "Sam Parkinson <sam@sam.today>";
   samuelrivas = "Samuel Rivas <samuelrivas@gmail.com>";
   sander = "Sander van der Burg <s.vanderburg@tudelft.nl>";
   sargon = "Daniel Ehlers <danielehlers@mindeye.net>";

nixos/doc/manual/installation/installing.xml

@@ -16,7 +16,8 @@
   hardware.</para></listitem>
 
   <listitem><para>The NixOS manual is available on virtual console 8
-  (press Alt+F8 to access).</para></listitem>
+  (press Alt+F8 to access) or by running <command>nixos-help</command>.
+  </para></listitem>
 
   <listitem><para>You get logged in as <literal>root</literal>
   (with empty password).</para></listitem>

nixos/modules/services/misc/nixos-manual.nix

@@ -135,8 +135,9 @@ in
         };
       };
 
-    services.mingetty.helpLine = mkIf cfg.showManual
+      services.mingetty.helpLine = "\nRun `nixos-help` "
-      "\nPress <Alt-F${toString cfg.ttyNumber}> for the NixOS manual.";
+        + lib.optionalString cfg.showManual "or press <Alt-F${toString cfg.ttyNumber}> "
+        + "for the NixOS manual.";
 
   };
 

nixos/modules/services/x11/display-managers/gdm.nix

@@ -125,7 +125,6 @@ in
       "getty@tty1.service"
     ];
 
-    systemd.services.display-manager.conflicts = [ "getty@tty1.service" ];
     systemd.services.display-manager.serviceConfig = {
       # Restart = "always"; - already defined in xserver.nix
       KillMode = "mixed";

pkgs/applications/audio/gradio/0001-Remove-post-install-script-that-hardcodes-paths.patch

@@ -0,0 +1,23 @@
+From 184c64718ee68b2738647f4a106b260c47f00437 Mon Sep 17 00:00:00 2001
+From: Sam Parkinson <sam@sam.today>
+Date: Thu, 26 Oct 2017 14:50:13 +1100
+Subject: [PATCH] Remove post-install script that hardcodes paths
+
+---
+ meson.build | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 25f3e1a..18b43bd 100644
+--- a/meson.build
++++ b/meson.build
+@@ -21,4 +21,5 @@ subdir('src')
+ # subdir('tests')
+ # TODO: unit tests
+ 
+-meson.add_install_script('meson_post_install.sh')
++# This does not work for nixos; it hard-codes paths
++# meson.add_install_script('meson_post_install.sh')
+-- 
+2.14.2
+

pkgs/applications/audio/gradio/default.nix

@@ -0,0 +1,72 @@
+{ stdenv, fetchFromGitHub, pkgconfig
+, gcc
+, python3
+, gsettings_desktop_schemas
+, desktop_file_utils
+, glib
+, gtk3
+, intltool
+, libsoup
+, json_glib
+, wrapGAppsHook
+, meson
+, ninja
+, vala
+, sqlite
+, gst_all_1
+, gst_plugins ? with gst_all_1; [ gst-plugins-good gst-plugins-ugly ]
+}:
+let
+  version = "6.0.2";
+
+in stdenv.mkDerivation rec {
+  name = "gradio-${version}";
+
+  src = fetchFromGitHub {
+    owner = "haecker-felix";
+    repo = "gradio";
+    rev = "v${version}";
+    sha256 = "05hg26yr7splgpkl8wjxcsdks9sm1is3hcnp7f5mjnp2ch0nn57s";
+  };
+
+  nativeBuildInputs = [
+    pkgconfig
+
+    meson
+    ninja
+    vala
+
+    python3
+  ];
+  buildInputs = [
+    sqlite
+
+    glib
+    intltool
+    libsoup
+    json_glib
+
+    gtk3
+    gst_all_1.gstreamer
+    gst_all_1.gst-plugins-base
+
+    wrapGAppsHook
+    desktop_file_utils
+    gsettings_desktop_schemas
+  ] ++ gst_plugins;
+
+  enableParallelBuilding = true;
+  postInstall = ''
+    ${glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas
+  '';
+
+  patches = [ ./0001-Remove-post-install-script-that-hardcodes-paths.patch ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/haecker-felix/gradio;
+    description = "A GTK3 app for finding and listening to internet radio stations";
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.samdroid-apps ];
+  };
+}

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

@@ -0,0 +1,20 @@
+{ stdenv, fetchgit, emacs }:
+
+stdenv.mkDerivation {
+  name = "gn-mode-2017-09-21";
+  src = fetchgit {
+    url = "https://chromium.googlesource.com/chromium/src/tools/gn";
+    rev = "34f2780efb3fe14fe361ec161ad58440de5a6b36";
+    sha256 = "10cisqz3l6ny3471yi7y1z8v622lpl65zh0liqr6absvmy63g866";
+  };
+  buildInputs = [ emacs ];
+
+  buildPhase = ''
+    emacs --batch -f batch-byte-compile misc/emacs/gn-mode.el
+  '';
+
+  installPhase = ''
+    mkdir -p $out/share/emacs/site-lisp/
+    cp misc/emacs/gn-mode.el* $out/share/emacs/site-lisp/
+  '';
+}

pkgs/applications/graphics/ahoviewer/default.nix

@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "ahoviewer-${version}";
-  version = "1.4.8";
+  version = "1.4.9";
 
   src = fetchFromGitHub {
     owner = "ahodesuka";
     repo = "ahoviewer";
     rev = version;
-    sha256 = "0fsak22hpi2r8zqysswdyngaf3n635qvclqh1p0g0wrkfza4dbc4";
+    sha256 = "194h3k5zvd8gjrbs91qba7d9h7i30yh4rjk4w3aa1vwvv0qm2amx";
   };
 
   enableParallelBuilding = true; 
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = https://github.com/ahodesuka/ahoviewer;
     description = "A GTK2 image viewer, manga reader, and booru browser";
-    maintainers = [ maintainers.skrzyp ];
+    maintainers = with maintainers; [ skrzyp xzfc ];
     license = licenses.mit;
     platforms = platforms.allBut [ "darwin" "cygwin" ];
   };

pkgs/applications/graphics/digikam/default.nix

@@ -1,4 +1,4 @@
-{ mkDerivation, lib, fetchurl, cmake, extra-cmake-modules, wrapGAppsHook
+{ mkDerivation, lib, fetchurl, cmake, doxygen, extra-cmake-modules, wrapGAppsHook
 
 # For `digitaglinktree`
 , perl, sqlite
@@ -33,8 +33,8 @@
 , liblqr1
 , libqtav
 , libusb1
-, mesa
 , marble
+, mesa
 , mysql
 , opencv3
 , pcre
@@ -53,11 +53,11 @@ mkDerivation rec {
   version = "5.7.0";
 
   src = fetchurl {
-    url = "http://download.kde.org/stable/digikam/${name}.tar.xz";
+    url = "mirror://kde/stable/digikam/${name}.tar.xz";
     sha256 = "1xah079g47fih8l9qy1ifppfvmq5yms5y1z54nvxdyz8nsszy19n";
   };
 
-  nativeBuildInputs = [ cmake extra-cmake-modules kdoctools wrapGAppsHook ];
+  nativeBuildInputs = [ cmake doxygen extra-cmake-modules kdoctools wrapGAppsHook ];
 
   buildInputs = [
     bison

pkgs/applications/graphics/shotwell/default.nix

@@ -8,12 +8,12 @@
 stdenv.mkDerivation rec {
   version = "${major}.${minor}";
   major = "0.27";
-  minor = "0";
+  minor = "1";
   name = "shotwell-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/shotwell/${major}/${name}.tar.xz";
-    sha256 = "03vwp314kckr67p7shrysqpr95hc3326lk3bv40g11i9clsik1a2";
+    sha256 = "1jav7qv0s1v6wvd7x2ri85hjqnbswq883pnd228qhd6bhjbryp89";
   };
 
   NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include";

pkgs/applications/misc/buku/default.nix

@@ -1,14 +1,14 @@
 { stdenv, python3, fetchFromGitHub }:
 
 with python3.pkgs; buildPythonApplication rec {
-  version = "3.3.1";
+  version = "3.4";
   name = "buku-${version}";
 
   src = fetchFromGitHub {
     owner = "jarun";
     repo = "buku";
     rev = "v${version}";
-    sha256 = "1byq8jgv1rb67ygibk0vzgz5ri1il4q4hpg23z5q0ml27fif9hw3";
+    sha256 = "0v0wvsxw78g6yl606if25k1adghr5764chwy1kl7dsxvchqwvmg0";
   };
 
   nativeBuildInputs = [

pkgs/applications/misc/eaglemode/default.nix

@@ -38,6 +38,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl3;
     maintainers = with maintainers; [ viric ];
     platforms = platforms.linux;
-    hydraPlatforms = [];
+    broken = true;
   };
 }

pkgs/applications/misc/kanboard/default.nix

@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "kanboard-${version}";
-  version = "1.0.46";
+  version = "1.0.48";
 
   src = fetchzip {
-    url = "https://kanboard.net/${name}.zip";
+    url = "https://github.com/kanboard/kanboard/releases/download/v${version}/${name}.zip";
-    sha256 = "00fzzijibj7x8pz8xwc601fcrzvdwz5fv45f2zzmbygl86khp82a";
+    sha256 = "0ipyijlfcnfqlz9n20wcnaf9pw404a675x404pm9h2n4ld8x6m5v";
   };
 
   dontBuild = true;

pkgs/applications/misc/robo3t/default.nix

@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   };
 
   desktopItem = makeDesktopItem {
-    name = "Robo3T";
+    name = "robo3t";
     exec = "robo3t";
     icon = icon;
     comment = "Query GUI for mongodb";

pkgs/applications/networking/browsers/chromium/common.nix

@@ -60,10 +60,13 @@ let
     in attrs: concatStringsSep " " (attrValues (mapAttrs toFlag attrs));
 
   gnSystemLibraries = [
-    "flac" "harfbuzz-ng" "libwebp" "libxslt" "yasm" "opus" "snappy" "libpng" "zlib"
+    "flac" "libwebp" "libxslt" "yasm" "opus" "snappy" "libpng" "zlib"
     # "libjpeg" # fails with multiple undefined references to chromium_jpeg_*
     # "re2" # fails with linker errors
     # "ffmpeg" # https://crbug.com/731766
+  ] ++ optionals (versionRange "62" "63") [
+    "harfbuzz-ng" # in versions over 63 harfbuzz and freetype are being built together
+                  # so we can't build with one from system and other from source
   ];
 
   opusWithCustomModes = libopus.override {
@@ -76,7 +79,10 @@ let
     libpng libcap
     xdg_utils yasm minizip libwebp
     libusb1 re2 zlib
-    ffmpeg harfbuzz-icu libxslt libxml2
+    ffmpeg libxslt libxml2
+  ] ++ optionals (versionRange "62" "63") [
+    harfbuzz-icu # in versions over 63 harfbuzz and freetype are being built together
+                 # so we can't build with one from system and other from source
   ];
 
   # build paths and release info

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 = "0qn3pjq5n3ri3qh25wg5gd2as5a8wlkncqvi975xsab771833pz8";
+    sha256 = "1ljpr7xkbg6hznpq9kph5xvrc6dwnp7y9ydirjawqvyhcmy6b8zj";
-    sha256bin64 = "10d1v9sa0wnnhjz6ria315aml20v1jl2bnkhcqi125rqk5fw9wrq";
+    sha256bin64 = "1ca9p82k7a9h416vwldzy84ww5psv3kbvh5xdys3j3cwaxxa0b4q";
-    version = "62.0.3202.62";
+    version = "63.0.3239.18";
   };
   dev = {
-    sha256 = "0dx9n9j1apngs4gc1n0kyccczm58045l342jr06azaw5yamsk8xb";
+    sha256 = "1ljpr7xkbg6hznpq9kph5xvrc6dwnp7y9ydirjawqvyhcmy6b8zj";
-    sha256bin64 = "1syqi1fx3kkn7865m6ldicg9cxcg1pfy9l1fr2k5mcqxsdblcyyv";
+    sha256bin64 = "1hq3qz7b5nmnck5sfbaa8d25khv88ylnq10dhbp76ahz4ixn9f7k";
-    version = "63.0.3239.9";
+    version = "63.0.3239.18";
   };
   stable = {
-    sha256 = "0qn3pjq5n3ri3qh25wg5gd2as5a8wlkncqvi975xsab771833pz8";
+    sha256 = "0k4hvmhaspw3f2scjjcam9dwnkrrzzibnx9sq5b1p56bgd2zxka9";
-    sha256bin64 = "1ijpv76wbxgwcvgr3nd9ciyyf26z56gxw4caga4x6600pa2lm8wq";
+    sha256bin64 = "0c4g2h1kcpksx0whf784hs7w62xbgsvq42fvzs0lfjgs11s8fm0x";
-    version = "62.0.3202.62";
+    version = "62.0.3202.75";
   };
 }

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

@@ -40,5 +40,6 @@ stdenv.mkDerivation rec {
     license     = licenses.gpl3;
     maintainers = with maintainers; [ peterhoeg ];
     platforms   = platforms.unix;
+    broken      = true;
   };
 }

pkgs/applications/networking/dropbox/default.nix

@@ -22,6 +22,11 @@
 # them with our own.
 
 let
+  ## Prefetch commands to run after update, from this directory:
+  ## e.g. with Emacs: C-u M-x shell-command
+  # nix-prefetch-url ../../../../ -A dropbox.src
+  # nix-prefetch-url ../../../../ -A pkgsi686Linux.dropbox.src
+
   # NOTE: When updating, please also update in current stable,
   # as older versions stop working
   version = "37.4.29";

pkgs/applications/networking/mailreaders/claws-mail/default.nix

@@ -39,6 +39,8 @@ stdenv.mkDerivation rec {
     sha256 = "0hlm2jipyr4z6izlrpvabpz4ivh49i13avnm848kr1nv68pkq2cd";
   };
 
+  outputs = [ "out" "dev" ];
+
   patches = [ ./mime.patch ];
 
   hardeningDisable = [ "format" ];

pkgs/applications/networking/mailreaders/neomutt/default.nix

@@ -14,14 +14,14 @@ let
   '';
 
 in stdenv.mkDerivation rec {
-  version = "20171013";
+  version = "20171027";
   name = "neomutt-${version}";
 
   src = fetchFromGitHub {
     owner  = "neomutt";
     repo   = "neomutt";
     rev    = "neomutt-${version}";
-    sha256 = "0zn8imqfa76bxpkpy111c4vn6vjarbxc8gqv6m18qkksk0ly26l1";
+    sha256 = "0pwc5zdxc9h23658dfkzndfj1ld3ijyvcxmsiv793y3i4dig0s3n";
   };
 
   buildInputs = [

pkgs/applications/science/machine-learning/shogun/default.nix

@@ -0,0 +1,51 @@
+{ stdenv, lib, fetchFromGitHub, ccache, cmake, ctags, swig
+# data, compression
+, bzip2, curl, hdf5, json_c, lzma, lzo, protobuf, snappy
+# maths
+, blas, eigen, nlopt, lp_solve, colpack
+# libraries
+, libarchive, liblapack, libxml2
+# extra support
+, pythonSupport ? true, pythonPackages ? null
+, opencvSupport ? false, opencv ? null
+}:
+
+assert pythonSupport -> pythonPackages != null;
+assert opencvSupport -> opencv != null;
+
+stdenv.mkDerivation rec {
+
+  pname = "shogun";
+  version = "6.0.0";
+  name = pname + "-" + version;
+
+  src = fetchFromGitHub {
+    owner = pname + "-toolbox";
+    repo = pname;
+    rev = pname + "_" + version;
+    sha256 = "0f2zwzvn5apvwypkfkq371xp7c5bdb4g1fwqfh8c2d57ysjxhmgf";
+    fetchSubmodules = true;
+  };
+
+  CCACHE_DIR=".ccache";
+
+  buildInputs = with lib; [
+      blas bzip2 ccache cmake colpack curl ctags eigen hdf5 json_c lp_solve lzma lzo
+      protobuf nlopt snappy swig (libarchive.dev) liblapack libxml2
+    ]
+    ++ optionals (pythonSupport) (with pythonPackages; [ python ply numpy ])
+    ++ optional  (opencvSupport) opencv;
+
+  cmakeFlags = with lib; []
+    ++ (optional (pythonSupport) "-DPythonModular=ON")
+    ++ (optional (opencvSupport) "-DOpenCV=ON")
+    ;
+
+  meta = with stdenv.lib; {
+    description = "A toolbox which offers a wide range of efficient and unified machine learning methods";
+    homepage = "http://shogun-toolbox.org/";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ edwtjo ];
+  };
+
+}

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

@@ -0,0 +1,31 @@
+{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, gettext }:
+
+stdenv.mkDerivation rec {
+
+  pname = "ColPack";
+  version = "1.0.10";
+  name = pname + "-" + version;
+
+  src = fetchFromGitHub {
+    owner = "CSCsw";
+    repo = pname;
+    rev = "v" + version;
+    sha256 = "1p05vry940mrjp6236c0z83yizmw9pk6ly2lb7d8rpb7j9h03glr";
+  };
+
+  buildInputs = [ autoconf automake gettext libtool ];
+
+  configurePhase = ''
+    autoreconf -vif
+    ./configure --prefix=$out --enable-openmp
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A package comprising of implementations of algorithms for
+    vertex coloring and derivative computation";
+    homepage = "http://cscapes.cs.purdue.edu/coloringpage/software.htm#functionalities";
+    license = licenses.lgpl3;
+    maintainers = with maintainers; [ edwtjo ];
+  };
+
+}

pkgs/applications/virtualization/virtualbox/default.nix

@@ -190,7 +190,10 @@ in stdenv.mkDerivation {
     cp -rv out/linux.*/${buildType}/bin/src "$modsrc"
   '';
 
-  passthru = { inherit version; /* for guest additions */ };
+  passthru = {
+    inherit version;       # for guest additions
+    inherit extensionPack; # for inclusion in profile to prevent gc
+  };
 
   meta = {
     description = "PC emulator";

pkgs/applications/window-managers/stumpwm/default.nix

@@ -23,9 +23,9 @@ let
       patches = [ ./fix-module-path.patch ];
     };
     "git" = {
-        name = "git-20160617";
+        name = "git-20170203";
-        rev = "7d5b5eb76aa656baf5a8713f514937765f66b10a";
+        rev = "d20f24e58ab62afceae2afb6262ffef3cc318b97";
-        sha256 = "1jpj978r54086hypjxqxi0r3zacqpkr61dp6dbi0lykgx7m5bjfb";
+        sha256 = "1gi29ds1x6dq7lz8lamnhcvcrr3cvvrg5yappfkggyhyvib1ii70";
         patches = [];
     };
   }.${version};
@@ -48,6 +48,7 @@ stdenv.mkDerivation rec {
     sbcl
     lispPackages.clx
     lispPackages.cl-ppcre
+    lispPackages.alexandria
     xdpyinfo
   ];
 

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

@@ -39,7 +39,7 @@ usage(){
 
 Options:
       --out path      Path where the output would be stored.
-      --url url       Any url understand by 'git clone'.
+      --url url       Any url understood by 'git clone'.
       --rev ref       Any sha1 or references (such as refs/heads/master)
       --hash h        Expected hash.
       --deepClone     Clone the entire repository.

pkgs/development/libraries/appstream/default.nix

@@ -26,10 +26,10 @@ stdenv.mkDerivation rec {
   cmakeFlags = ''
     -DSTEMMING=off
     '';
-      
+
   meta = with stdenv.lib; {
     description = "Software metadata handling library";
-    homepage    = "http://www.freedesktop.org/wiki/Distributions/AppStream/Software/";
+    homepage    = https://www.freedesktop.org/wiki/Distributions/AppStream/;
     longDescription =
     ''
       AppStream is a cross-distro effort for building Software-Center applications

pkgs/development/libraries/geoclue/2.0.nix

@@ -12,6 +12,8 @@ stdenv.mkDerivation rec {
     sha256 = "19hfmr8fa1js8ynazdyjxlyrqpjn6m1719ay70ilga4rayxrcyyi";
   };
 
+  outputs = [ "out" "dev" ];
+
   nativeBuildInputs = [
     pkgconfig intltool wrapGAppsHook
   ];
@@ -21,6 +23,8 @@ stdenv.mkDerivation rec {
      dbus dbus_glib avahi
    ] ++ optionals (!stdenv.isDarwin) [ modemmanager ];
 
+  propagatedBuildInputs = [ dbus dbus_glib glib glib_networking ];
+
   preConfigure = ''
      substituteInPlace configure --replace "-Werror" ""
   '';
@@ -35,7 +39,9 @@ stdenv.mkDerivation rec {
 
   NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin " -lintl";
 
-  propagatedBuildInputs = [ dbus dbus_glib glib glib_networking ];
+  postInstall = ''
+    sed -i $dev/lib/pkgconfig/libgeoclue-2.0.pc -e "s|includedir=.*|includedir=$dev/include|"
+  '';
 
   meta = with stdenv.lib; {
     description = "Geolocation framework and some data providers";

pkgs/development/libraries/geoclue/default.nix

@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "15j619kvmdgj2hpma92mkxbzjvgn8147a7500zl3bap9g8bkylqg";
   };
 
+  outputs = [ "out" "dev" ];
+
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ libxml2 gnome2.GConf libxslt glib_networking ];
 

pkgs/development/libraries/giblib/default.nix

@@ -8,9 +8,25 @@ stdenv.mkDerivation rec {
     sha256 = "1b4bmbmj52glq0s898lppkpzxlprq9aav49r06j2wx4dv3212rhp";
   };
 
+  outputs = [ "out" "dev" ];
+  setOutputFlags = false;
+
+  preConfigure = ''
+    configureFlagsArray+=(
+      --includedir=$dev/include
+    )
+  '';
+
   buildInputs = [ xlibsWrapper ];
   propagatedBuildInputs = [ imlib2 ];
 
+  postFixup = ''
+    moveToOutput bin/giblib-config "$dev"
+
+    # Doesn't contain useful stuff
+    rm -rf $out/share/doc
+  '';
+
   meta = {
     homepage = http://linuxbrit.co.uk/giblib/;
     description = "wrapper library for imlib2, and other stuff";

pkgs/development/libraries/imlib2/default.nix

@@ -1,5 +1,5 @@
 { stdenv, fetchurl, libjpeg, libtiff, giflib, libpng, bzip2, pkgconfig
-, freetype
+, freetype, libid3tag
 , x11Support ? true, xlibsWrapper ? null }:
 
 with stdenv.lib;
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "0wm2q2xlkbm71k7mw2jyzbxgzylrkcj5yh6nq58w5gybhp98qs9z";
   };
 
-  buildInputs = [ libjpeg libtiff giflib libpng bzip2 freetype ]
+  buildInputs = [ libjpeg libtiff giflib libpng bzip2 freetype libid3tag ]
     ++ optional x11Support xlibsWrapper;
 
   nativeBuildInputs = [ pkgconfig ];

pkgs/development/libraries/kde-frameworks/fetch.sh

@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/frameworks/5.38/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/frameworks/5.39/ -A '*.tar.xz' )

pkgs/development/libraries/kde-frameworks/ktexteditor.nix

@@ -1,5 +1,5 @@
 {
-  mkDerivation, lib, copyPathsToStore,
+  mkDerivation, lib, copyPathsToStore, fetchpatch,
   extra-cmake-modules, perl,
   karchive, kconfig, kguiaddons, ki18n, kiconthemes, kio, kparts, libgit2,
   qtscript, qtxmlpatterns, sonnet, syntax-highlighting, qtquickcontrols
@@ -14,4 +14,9 @@ mkDerivation {
     qtxmlpatterns sonnet syntax-highlighting qtquickcontrols
   ];
   propagatedBuildInputs = [ kparts ];
+  patches = [ (fetchpatch {
+    url = "https://cgit.kde.org/ktexteditor.git/patch/?id=aeebeadb5f5955995c17de56cf83ba7166a132dd";
+    sha256 = "10a61w1qyw3czffl06xgccgd3yycz7s0hpg2vj0a24v05jhqiigf";
+    name = "ktextedtor_fix_indenters.patch";
+  })];
 }

pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix

@@ -1,6 +1,7 @@
 {
   mkDerivation, lib, copyPathsToStore,
   extra-cmake-modules,
+  libpthreadstubs, libXdmcp,
   qtbase, qttools, qtx11extras
 }:
 
@@ -11,7 +12,7 @@ mkDerivation {
     broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
   };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ qttools qtx11extras ];
+  buildInputs = [ libpthreadstubs libXdmcp qttools qtx11extras ];
   propagatedBuildInputs = [ qtbase ];
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
   preConfigure = ''

pkgs/development/libraries/kde-frameworks/srcs.nix

@@ -3,603 +3,611 @@
 
 {
   attica = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/attica-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/attica-5.39.0.tar.xz";
-      sha256 = "12smdcd7lcyjqiw0bsk3lwivrl6cvmiqv5cqaw0gz8flhvk29w96";
+      sha256 = "15972518n4g65k391imkcsjikfsfhx8livdm6n0whag0aiz55haf";
-      name = "attica-5.38.0.tar.xz";
+      name = "attica-5.39.0.tar.xz";
     };
   };
   baloo = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/baloo-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/baloo-5.39.0.tar.xz";
-      sha256 = "14522akyxg36lclfblp65xai95i9hiydqjhkmfkadjbq82wm9s9i";
+      sha256 = "06y8mv7v9y7syz04x0zicdm628k6za3p366xrzwafc43m159wyms";
-      name = "baloo-5.38.0.tar.xz";
+      name = "baloo-5.39.0.tar.xz";
     };
   };
   bluez-qt = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/bluez-qt-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/bluez-qt-5.39.0.tar.xz";
-      sha256 = "0hanmygp4smbvczxn4dj997z3bln32p017z0r26z89m2p0b2ylwv";
+      sha256 = "0j0072q0zc9hdpjbkqciqv18pwpdij74qrjph7whh66csjkr5ad1";
-      name = "bluez-qt-5.38.0.tar.xz";
+      name = "bluez-qt-5.39.0.tar.xz";
     };
   };
   breeze-icons = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/breeze-icons-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/breeze-icons-5.39.0.tar.xz";
-      sha256 = "09afi6c4h31ycs6aa85lqbmn392zi532zf8fp7ll43xxjv9isac9";
+      sha256 = "132bpgma1lqhrly48zz1f8jyg5z5pvnn1wnqxz6psvqhipw7fh5x";
-      name = "breeze-icons-5.38.0.tar.xz";
+      name = "breeze-icons-5.39.0.tar.xz";
     };
   };
   extra-cmake-modules = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/extra-cmake-modules-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/extra-cmake-modules-5.39.0.tar.xz";
-      sha256 = "0ci3vdzdbcrbnxpqvf4hcwcrzz1ijhifp8b99wh3k53rinnai231";
+      sha256 = "1ldwzx2bzlzw7r31w8zy08j4cn9q7d1kszc5jb22zhfqpvbkc1dq";
-      name = "extra-cmake-modules-5.38.0.tar.xz";
+      name = "extra-cmake-modules-5.39.0.tar.xz";
     };
   };
   frameworkintegration = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/frameworkintegration-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/frameworkintegration-5.39.0.tar.xz";
-      sha256 = "0w1n3czgsnnmaqwypy3mpci8s4ppv9030zxw7ka7rsvwgkpqijq8";
+      sha256 = "136s8chyiac30czicqgkrc4abgm7c8b2ppnqwv9ngxpx7nsjgd2h";
-      name = "frameworkintegration-5.38.0.tar.xz";
+      name = "frameworkintegration-5.39.0.tar.xz";
     };
   };
   kactivities = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kactivities-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kactivities-5.39.0.tar.xz";
-      sha256 = "0grm0cilc80g5ih2hqhwgwm35mlfnrs343j6ixkd9s0mflv2b798";
+      sha256 = "0nkc1p7n6yvybcib6aqmnz08hwn3ryj1f9wbkiimgs0svr00sslq";
-      name = "kactivities-5.38.0.tar.xz";
+      name = "kactivities-5.39.0.tar.xz";
     };
   };
   kactivities-stats = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kactivities-stats-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kactivities-stats-5.39.0.tar.xz";
-      sha256 = "0s57iz04n3m4fpqrqflda6vpk4l1mnf0nyz1iyza382fb375afd2";
+      sha256 = "18ghfqggwf38rmb1lkbv8ggxx71cp6ba3882kp5ccb7wwih51qcy";
-      name = "kactivities-stats-5.38.0.tar.xz";
+      name = "kactivities-stats-5.39.0.tar.xz";
     };
   };
   kapidox = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kapidox-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kapidox-5.39.0.tar.xz";
-      sha256 = "1j4k75lhqdnsxmgyvblla0627qvgabxivw6limfdb3rdpmqdxj76";
+      sha256 = "12nmsa1cg5amyawfxywlg8qsl01idi0jacrd8jzmvdj5m8sisw6n";
-      name = "kapidox-5.38.0.tar.xz";
+      name = "kapidox-5.39.0.tar.xz";
     };
   };
   karchive = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/karchive-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/karchive-5.39.0.tar.xz";
-      sha256 = "0n5nxd3v9ljjff0r6k4xrvy5hj057b7c7jzcq258harl359d8m4k";
+      sha256 = "0rb8vr6lg8vx4f07swvlsyrxy4gj21aqfffk0cvhlsdz94j1phrw";
-      name = "karchive-5.38.0.tar.xz";
+      name = "karchive-5.39.0.tar.xz";
     };
   };
   kauth = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kauth-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kauth-5.39.0.tar.xz";
-      sha256 = "12nyfbilz4v4b2i5x191iph3jj4lcpw7z1rh0xrv5y1v7dczk6i7";
+      sha256 = "08bjxvv22y199skx4l9m8az165wz7inqqx7s8b7p5cjms4bvi15i";
-      name = "kauth-5.38.0.tar.xz";
+      name = "kauth-5.39.0.tar.xz";
     };
   };
   kbookmarks = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kbookmarks-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kbookmarks-5.39.0.tar.xz";
-      sha256 = "0s230mcwmrg0qpz42sg804m96j2xpnwj4bdp0mfv08x3jasqpbrq";
+      sha256 = "1xfabyc7hxmi1p0wqld0va5pl6bfwh50px4mvpxbnjdna6anw6z5";
-      name = "kbookmarks-5.38.0.tar.xz";
+      name = "kbookmarks-5.39.0.tar.xz";
     };
   };
   kcmutils = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kcmutils-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kcmutils-5.39.0.tar.xz";
-      sha256 = "0n6f2xvl5v8fwfxpdl6la1hb01dh4h1pcdrf05nn60v0rqg9f58b";
+      sha256 = "1cz4haj83j59szl16r0mfh4zx93szrwkmb9mq2r21v46c8k5ldw0";
-      name = "kcmutils-5.38.0.tar.xz";
+      name = "kcmutils-5.39.0.tar.xz";
     };
   };
   kcodecs = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kcodecs-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kcodecs-5.39.0.tar.xz";
-      sha256 = "0cnxhaj5jk7f3j9q4hzphc3nm3vdaqwy9xab5d4nvn1kv8vjv8ii";
+      sha256 = "1q0l88nfbxgdy5lpm5xbcs749n9jyxhq7xsgqpf9c8irc7c1gw7f";
-      name = "kcodecs-5.38.0.tar.xz";
+      name = "kcodecs-5.39.0.tar.xz";
     };
   };
   kcompletion = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kcompletion-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kcompletion-5.39.0.tar.xz";
-      sha256 = "0f955w67wrk15rdmglrk7k0xc5i6kah12bpb078xhzlyfackg52w";
+      sha256 = "09jdc4pn7yjb7nagic38xiqdpv9fy4f2f4c1a5ynbli7x1r6l7ms";
-      name = "kcompletion-5.38.0.tar.xz";
+      name = "kcompletion-5.39.0.tar.xz";
     };
   };
   kconfig = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kconfig-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kconfig-5.39.0.tar.xz";
-      sha256 = "0fi428dsr6qpa9336wcfic6hyix6l2p9s135w00qzdwhdkr4lx3r";
+      sha256 = "011i48f07470igqqcz4hychbw0q85p0bh5dykpla4zwdldllsl1w";
-      name = "kconfig-5.38.0.tar.xz";
+      name = "kconfig-5.39.0.tar.xz";
     };
   };
   kconfigwidgets = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kconfigwidgets-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kconfigwidgets-5.39.0.tar.xz";
-      sha256 = "0w319d94wxn90dbbdfw5zrn2ddnv9vb7wldkpvvycq7yxrhsfw0x";
+      sha256 = "1i6cniqsmn9sds8nj7bcsnbmlkq9m1yjwvr45mhal9rkhaas4xzw";
-      name = "kconfigwidgets-5.38.0.tar.xz";
+      name = "kconfigwidgets-5.39.0.tar.xz";
     };
   };
   kcoreaddons = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kcoreaddons-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kcoreaddons-5.39.0.tar.xz";
-      sha256 = "1m3mn9fhllwcidzji2l26k5yxzrqkbyjdly04nh3s5rf823dvqwv";
+      sha256 = "0qskv44siykyn8iiq99llibw3bk499ry7r3i8abx4ljjl717cvlz";
-      name = "kcoreaddons-5.38.0.tar.xz";
+      name = "kcoreaddons-5.39.0.tar.xz";
     };
   };
   kcrash = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kcrash-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kcrash-5.39.0.tar.xz";
-      sha256 = "1a8hvyhwa112wx4ldadlrxpyda6qpial387j07dr1jq1cnzr0p11";
+      sha256 = "1fv32l50h9rlc5s9iplyljcsrscivgdy2baghq7hbcs58xrjf1ws";
-      name = "kcrash-5.38.0.tar.xz";
+      name = "kcrash-5.39.0.tar.xz";
     };
   };
   kdbusaddons = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kdbusaddons-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kdbusaddons-5.39.0.tar.xz";
-      sha256 = "1mw9sl82y2aj7l2xj1skrbxbyv55br60h6f61r4f1mqcaxaqj7qw";
+      sha256 = "0hp85995n3193dvvdv48hv59b66dzd9p4iwnx2dmj797lghpnir3";
-      name = "kdbusaddons-5.38.0.tar.xz";
+      name = "kdbusaddons-5.39.0.tar.xz";
     };
   };
   kdeclarative = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kdeclarative-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kdeclarative-5.39.0.tar.xz";
-      sha256 = "1966sxzhdkzi2lwg5ixhrx0yg10plbvn9lsjgnj9crghaajsnf4b";
+      sha256 = "1l8wnyfz6qjqmcpdzavsb6m1r3ay1b2r186myymsyknr80yr2d7p";
-      name = "kdeclarative-5.38.0.tar.xz";
+      name = "kdeclarative-5.39.0.tar.xz";
     };
   };
   kded = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kded-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kded-5.39.0.tar.xz";
-      sha256 = "0xsjzj5jx4wsrq5fnbv6raqlr11shz20p2mvypf5wfvq2c1vb5lb";
+      sha256 = "0jv4ghl2gzfdkhk1in3vx39kigvpprvcb9xlzc5506mpfjc38ga5";
-      name = "kded-5.38.0.tar.xz";
+      name = "kded-5.39.0.tar.xz";
     };
   };
   kdelibs4support = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/portingAids/kdelibs4support-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/portingAids/kdelibs4support-5.39.0.tar.xz";
-      sha256 = "06vlgziy212pwm4z9r8rbfa9ziwx3nkihy9b25m13gbh60baqapp";
+      sha256 = "03xjzhdvs497sk9bpz79crxlzwff198ivj4n5f0mwmnqc0100dfp";
-      name = "kdelibs4support-5.38.0.tar.xz";
+      name = "kdelibs4support-5.39.0.tar.xz";
     };
   };
   kdesignerplugin = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kdesignerplugin-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kdesignerplugin-5.39.0.tar.xz";
-      sha256 = "0rivjxgsxvsgk24lnzsqpzqr7m1i1faqnbby3rnkw2059z28l0y6";
+      sha256 = "1b7rn66wsyn9aipgvfmn2pq18g0zdjxb469126dj18fahg2k777f";
-      name = "kdesignerplugin-5.38.0.tar.xz";
+      name = "kdesignerplugin-5.39.0.tar.xz";
     };
   };
   kdesu = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kdesu-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kdesu-5.39.0.tar.xz";
-      sha256 = "1c9j2zih7r0jph41kzxnxpri9snphm1k4w4rs1q6zawwz8a5kcr5";
+      sha256 = "03avzhs6a0p3cjv4kk9vavf6f64ffgs3pzhbdkfr76fh58h1v6wx";
-      name = "kdesu-5.38.0.tar.xz";
+      name = "kdesu-5.39.0.tar.xz";
     };
   };
   kdewebkit = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kdewebkit-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kdewebkit-5.39.0.tar.xz";
-      sha256 = "1cncbjkgrbrnvwx3izjqh9hqiw9bg6aqaq09f8bdryvr8537b0zf";
+      sha256 = "05f0l3zw8cnvyavwwijwy5jx8dairhdbvg6ynpn7r5l10vawcf6x";
-      name = "kdewebkit-5.38.0.tar.xz";
+      name = "kdewebkit-5.39.0.tar.xz";
     };
   };
   kdnssd = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kdnssd-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kdnssd-5.39.0.tar.xz";
-      sha256 = "101gygxrq2m3yfz6j0ldspib3pm3jjvqz505j3h15zj59qcwqw0x";
+      sha256 = "1c8d1wwr0hkdkgnq4k7lgkqwm1pj676i09l1kas256rzz6dcyl75";
-      name = "kdnssd-5.38.0.tar.xz";
+      name = "kdnssd-5.39.0.tar.xz";
     };
   };
   kdoctools = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kdoctools-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kdoctools-5.39.0.tar.xz";
-      sha256 = "0fbv7i1930rl496psny7nfiixvsnaq535h1zggwkwv6i9dh7wpy9";
+      sha256 = "17g4kf7mbjjxhii4nbhfpmhjs1q23mlh0d3fqyxxhm3pp02jg8ap";
-      name = "kdoctools-5.38.0.tar.xz";
+      name = "kdoctools-5.39.0.tar.xz";
     };
   };
   kemoticons = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kemoticons-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kemoticons-5.39.0.tar.xz";
-      sha256 = "1c0991yd8jx2diy5ynl11h5qqyapn1dsir2gy04y8m90h944vdd5";
+      sha256 = "132gs69v43ms117ibdqmnhbyzzs5by76pfz7bd2zqwl4mq94hpgh";
-      name = "kemoticons-5.38.0.tar.xz";
+      name = "kemoticons-5.39.0.tar.xz";
     };
   };
   kfilemetadata = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kfilemetadata-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kfilemetadata-5.39.0.tar.xz";
-      sha256 = "1815r9lx99h9kzbk67bfk41jya3y2hsi112fsgpv3m4mg028pklm";
+      sha256 = "1mcxphjpayyq7v16b6c3zhb6c9vn67495xywfb9y8ysma1cdpshg";
-      name = "kfilemetadata-5.38.0.tar.xz";
+      name = "kfilemetadata-5.39.0.tar.xz";
     };
   };
   kglobalaccel = {
-    version = "5.38.1";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kglobalaccel-5.38.1.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kglobalaccel-5.39.0.tar.xz";
-      sha256 = "0si3bxxa6wj008j6rr6a1ljnsbmim4z0pqyx1z48ih4qamcfpkin";
+      sha256 = "0wcbnwfi98cx8f99a2mcz2kg7mggz3hipfxv9s8ks6c80865kar1";
-      name = "kglobalaccel-5.38.1.tar.xz";
+      name = "kglobalaccel-5.39.0.tar.xz";
     };
   };
   kguiaddons = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kguiaddons-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kguiaddons-5.39.0.tar.xz";
-      sha256 = "1jks0hwn665hlypl0qfhi5r0prqzrg1gv4skc88zp1kgx05kb9h1";
+      sha256 = "1az9i5bg7xd7kv7ajq8j8jab7zly683gyi90rmk54vfnn6igbq3f";
-      name = "kguiaddons-5.38.0.tar.xz";
+      name = "kguiaddons-5.39.0.tar.xz";
     };
   };
   khtml = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/portingAids/khtml-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/portingAids/khtml-5.39.0.tar.xz";
-      sha256 = "0fa61va3dbwml40y4scxks223swlb8vf5730wr7rijl91lz1adgy";
+      sha256 = "097nbwv8ba48xmrga62j1irlkkc0l0f3971fp7225pzh1g3cg152";
-      name = "khtml-5.38.0.tar.xz";
+      name = "khtml-5.39.0.tar.xz";
     };
   };
   ki18n = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/ki18n-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/ki18n-5.39.0.tar.xz";
-      sha256 = "0z9arj2s4fn04vavl6ad3avl1p5yr3mgr2n802lmvy2wlqicy314";
+      sha256 = "1985qgihrch37b5gf7qw33bazahm3xb5v2nj43k6vdjxfg1clcay";
-      name = "ki18n-5.38.0.tar.xz";
+      name = "ki18n-5.39.0.tar.xz";
     };
   };
   kiconthemes = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kiconthemes-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kiconthemes-5.39.0.tar.xz";
-      sha256 = "01xa30r2cx312vbmz2c3x8vvna1cqb6fx91cjp4aivp9q4jwaz9a";
+      sha256 = "1k4r263zz54497dgqaw9a74wqdklq4w353mc0g905k2g8arh7p9f";
-      name = "kiconthemes-5.38.0.tar.xz";
+      name = "kiconthemes-5.39.0.tar.xz";
     };
   };
   kidletime = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kidletime-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kidletime-5.39.0.tar.xz";
-      sha256 = "1i91w9hcb2k5n9qz8q7k2z44z9ss7r9i2zsg9vnl8am7dqqhmlsv";
+      sha256 = "01h5pcr5kn11jby0zsz6igiwzf31hzip7h63dcsa8h67li4sibd8";
-      name = "kidletime-5.38.0.tar.xz";
+      name = "kidletime-5.39.0.tar.xz";
     };
   };
   kimageformats = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kimageformats-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kimageformats-5.39.0.tar.xz";
-      sha256 = "0q78shcwgczdm5ylhbp9fnq70w3hqzkbynp2vpyyg5pjaam8xjlp";
+      sha256 = "1mnfdsxqnqdzhw3as77n1f1ddxpmab4slqlpwi4ih55xmgl85455";
-      name = "kimageformats-5.38.0.tar.xz";
+      name = "kimageformats-5.39.0.tar.xz";
     };
   };
   kinit = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kinit-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kinit-5.39.0.tar.xz";
-      sha256 = "0k4i0zrwkz088vjkk7d7whwhkrjvqqhdigspzf58d1laryiy0jdf";
+      sha256 = "0a2wl1vhsbb2x1cjd3wz7j3bp9kz1pxfc6mml7gpnq70qgk8hsn2";
-      name = "kinit-5.38.0.tar.xz";
+      name = "kinit-5.39.0.tar.xz";
     };
   };
   kio = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kio-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kio-5.39.0.tar.xz";
-      sha256 = "15qmr2ghrj7pgqxrgpvhdp9g5vaap9mzlmry6ayph75m1afb4fpl";
+      sha256 = "091g4dbnals6c5wrj3xh3ws29wszysmb9ksyvyqf3d1lp9dfmjwn";
-      name = "kio-5.38.0.tar.xz";
+      name = "kio-5.39.0.tar.xz";
     };
   };
   kirigami2 = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kirigami2-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kirigami2-5.39.0.tar.xz";
-      sha256 = "18k41j5ijmgmzgl2rv4ac0bnxlax3505zi1nmqm8bkdpznhfr13c";
+      sha256 = "0spgylk4yjy74rs5d5b28qv72qz5ra9j3wfmk6vx2b6cvf1fw517";
-      name = "kirigami2-5.38.0.tar.xz";
+      name = "kirigami2-5.39.0.tar.xz";
     };
   };
   kitemmodels = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kitemmodels-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kitemmodels-5.39.0.tar.xz";
-      sha256 = "0s20in4jjd2pvv9bn79lvgqqlf806hw014icp51f5hfknrhpdyjc";
+      sha256 = "1bn0k0ya2phix6fyv8ax800ahncrkdzikz0sa3xrw5bq3iz1x6k9";
-      name = "kitemmodels-5.38.0.tar.xz";
+      name = "kitemmodels-5.39.0.tar.xz";
     };
   };
   kitemviews = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kitemviews-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kitemviews-5.39.0.tar.xz";
-      sha256 = "0ldi8qzs2sbhz8l57nshjrnwhjl9mhw90kcqw71cldp41wm0pps6";
+      sha256 = "0pl899d1lz1dymdbq70485a8332z9i3s38dxnxv3cdwbla3xlsfh";
-      name = "kitemviews-5.38.0.tar.xz";
+      name = "kitemviews-5.39.0.tar.xz";
     };
   };
   kjobwidgets = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kjobwidgets-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kjobwidgets-5.39.0.tar.xz";
-      sha256 = "0vp6nc73c9788nrib742k9nzqbx4m8m77ipqh9dnnkx4ggrhsd55";
+      sha256 = "1z26555pkirdkfw8c9j1a863pqybklryfa30v3a59a0m9v2jdzfc";
-      name = "kjobwidgets-5.38.0.tar.xz";
+      name = "kjobwidgets-5.39.0.tar.xz";
     };
   };
   kjs = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/portingAids/kjs-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/portingAids/kjs-5.39.0.tar.xz";
-      sha256 = "0diw580k5kyv60bqhnxhqinlrn0b3p3n89iy0kdgjgnr6197fwy1";
+      sha256 = "0fkn308l6drj7pa94niqhcn2pqv7da7da5lq1nk8q6zlyg4nbcrn";
-      name = "kjs-5.38.0.tar.xz";
+      name = "kjs-5.39.0.tar.xz";
     };
   };
   kjsembed = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/portingAids/kjsembed-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/portingAids/kjsembed-5.39.0.tar.xz";
-      sha256 = "0nb07n54208gnmag7h3dhc8hri2s83ln1c9wq6c0xw7jchaz9z8a";
+      sha256 = "1i3qyxr409x82nqyck4qva63maxa2vvi07i0yxm6zqx5lvm9gkgb";
-      name = "kjsembed-5.38.0.tar.xz";
+      name = "kjsembed-5.39.0.tar.xz";
     };
   };
   kmediaplayer = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/portingAids/kmediaplayer-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/portingAids/kmediaplayer-5.39.0.tar.xz";
-      sha256 = "1qb2g8j871gf38i2dk2j9ags848fa3kqdjl3l4924hf28az0g736";
+      sha256 = "09ysw11br4k26bq6rvzcws2g565336p3gjkz4fxc8w2g3ma527p1";
-      name = "kmediaplayer-5.38.0.tar.xz";
+      name = "kmediaplayer-5.39.0.tar.xz";
     };
   };
   knewstuff = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/knewstuff-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/knewstuff-5.39.0.tar.xz";
-      sha256 = "1l4cmfcsljg7v5l6341fxcp7c7i615l8351l941dwcmw4yng0lj0";
+      sha256 = "1amflv96ybd6dqkc1chmz6d5crrl4dcq07fwsalxzx9mgr0z499r";
-      name = "knewstuff-5.38.0.tar.xz";
+      name = "knewstuff-5.39.0.tar.xz";
     };
   };
   knotifications = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/knotifications-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/knotifications-5.39.0.tar.xz";
-      sha256 = "1jvmv2hi3dbf0bd2b61l9s5lb1dx2rjl9z7pw1fb5j20910k6zgd";
+      sha256 = "0f38ca090p291d114fg3jz25lhwz7vad7s60ql4x3xwmdgaaw7dj";
-      name = "knotifications-5.38.0.tar.xz";
+      name = "knotifications-5.39.0.tar.xz";
     };
   };
   knotifyconfig = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/knotifyconfig-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/knotifyconfig-5.39.0.tar.xz";
-      sha256 = "05hgglm6ypbaplxr43632zh5fmgsz6543110169k9fbjnczyhcyk";
+      sha256 = "09nk6sr6sp9a85lj4x9ac0ir4s5ac08835927b95d7m4ap2dbxrb";
-      name = "knotifyconfig-5.38.0.tar.xz";
+      name = "knotifyconfig-5.39.0.tar.xz";
     };
   };
   kpackage = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kpackage-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kpackage-5.39.0.tar.xz";
-      sha256 = "0v4j3kqgg52rlmdxmd98aqw0hk7i2xqsw9mhhxfs9c7vm1x05sxn";
+      sha256 = "1ibppkg9m77p0dcpfshcd891vlxcfgx6rk205gq6d5qxyqizygki";
-      name = "kpackage-5.38.0.tar.xz";
+      name = "kpackage-5.39.0.tar.xz";
     };
   };
   kparts = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kparts-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kparts-5.39.0.tar.xz";
-      sha256 = "19ba749pwnb7xvmr7lryn6z53zb49hqn0xq4j9fmbic95nh039zp";
+      sha256 = "1r32jf2qbhqdjih9ff4n0ajd6s1cdncpq367mp5am31fz1jv3sr6";
-      name = "kparts-5.38.0.tar.xz";
+      name = "kparts-5.39.0.tar.xz";
     };
   };
   kpeople = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kpeople-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kpeople-5.39.0.tar.xz";
-      sha256 = "0yd29436bgfw6jjjr9n38hx8561mrlgl5vynci6ng9bx1jflay0x";
+      sha256 = "1s78dld3zlldhpk66s08v34zwi1k5ghivzbi7ab290sgrjc9afar";
-      name = "kpeople-5.38.0.tar.xz";
+      name = "kpeople-5.39.0.tar.xz";
     };
   };
   kplotting = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kplotting-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kplotting-5.39.0.tar.xz";
-      sha256 = "1hvfqm6i5fsyssb51w3yybsil8h9cbqgd2n8k0wnz99m8xifzn72";
+      sha256 = "1diy1f23n6pih0s91kv1bp4mnnypnjl3pmi1xqni1v2cfwy0mnba";
-      name = "kplotting-5.38.0.tar.xz";
+      name = "kplotting-5.39.0.tar.xz";
     };
   };
   kpty = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kpty-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kpty-5.39.0.tar.xz";
-      sha256 = "0cgh8hixrplgc280652jlvk8ibcddmjvflwb0gjawd9iq7lcb66y";
+      sha256 = "02h6dg3w3k58d1ydzyz6mhd1y5gds3k64wdsb84fnpxvlw46dlhn";
-      name = "kpty-5.38.0.tar.xz";
+      name = "kpty-5.39.0.tar.xz";
     };
   };
   kross = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/portingAids/kross-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/portingAids/kross-5.39.0.tar.xz";
-      sha256 = "1dccg214cqpyn3nninalpknglfmchz2k1fk4rlgq53wf4n6w23b7";
+      sha256 = "1gh9gicr7ba8y3c0r7qpw2fj651fbbrhsy8gps8yll71axhxqvfh";
-      name = "kross-5.38.0.tar.xz";
+      name = "kross-5.39.0.tar.xz";
     };
   };
   krunner = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/krunner-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/krunner-5.39.0.tar.xz";
-      sha256 = "16fhl5zm8scyxk83mpkavvzkn23qgzcblg315jy6klr5bz9jxgcm";
+      sha256 = "0gxs9z8mlb3s615ccrgkwyxww4jly48d8fkay33zwjaanqhkhgfl";
-      name = "krunner-5.38.0.tar.xz";
+      name = "krunner-5.39.0.tar.xz";
     };
   };
   kservice = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kservice-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kservice-5.39.0.tar.xz";
-      sha256 = "0zaamvxhfx4xdy2m8spyhi0hdv6p0fn5hqn9pyi5l8xdixnwjc9d";
+      sha256 = "0abz878yc8yir7iv5scn55d0g2nljnzhr9c81wa6ggjsw0h077hl";
-      name = "kservice-5.38.0.tar.xz";
+      name = "kservice-5.39.0.tar.xz";
     };
   };
   ktexteditor = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/ktexteditor-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/ktexteditor-5.39.0.tar.xz";
-      sha256 = "195ygv1j4wfvly31g22wxz9sshhqyi1yyf2mv1v63d9ci88v7rri";
+      sha256 = "1bk5wlvzjmfv7g9ab77asn055jp647zj69mfx2z3lvxb69swdnf5";
-      name = "ktexteditor-5.38.0.tar.xz";
+      name = "ktexteditor-5.39.0.tar.xz";
     };
   };
   ktextwidgets = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/ktextwidgets-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/ktextwidgets-5.39.0.tar.xz";
-      sha256 = "120jxab8w1vhqcckda51r0x2pmfb2qd2h6inhivl72c4m5x89w7f";
+      sha256 = "0p6h165y03ir7qdf50kc77iq9plgvx39c8pz9dalvscvx42d2jaq";
-      name = "ktextwidgets-5.38.0.tar.xz";
+      name = "ktextwidgets-5.39.0.tar.xz";
     };
   };
   kunitconversion = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kunitconversion-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kunitconversion-5.39.0.tar.xz";
-      sha256 = "10k0xfb11r7l1bdnlanqgdwwx8wrs8bmnswb2y85xxr7wwsqnlvc";
+      sha256 = "04r1b2nc6vi56nfh6glhhd3d9v0ywxn2waibryjbszwrr39yhlzv";
-      name = "kunitconversion-5.38.0.tar.xz";
+      name = "kunitconversion-5.39.0.tar.xz";
     };
   };
   kwallet = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kwallet-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kwallet-5.39.0.tar.xz";
-      sha256 = "1qysdj4nmkxywj7bzqdc78ifnqjnkrz9qbp4a49acpng2y4zw1nw";
+      sha256 = "1vlz9y3r1n6w7q9is60jsl9f7bm1djckdi9ibgzanwsp4k5ab0sz";
-      name = "kwallet-5.38.0.tar.xz";
+      name = "kwallet-5.39.0.tar.xz";
     };
   };
   kwayland = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kwayland-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kwayland-5.39.0.tar.xz";
-      sha256 = "0gd58nvyc39waj7vv2c68r59qqpv0jppm95548j2p924w48syjj0";
+      sha256 = "0a9hi47nrsspkak88c9f6ind2i7q69zjmrgr5n7xsa4zxznwhx6x";
-      name = "kwayland-5.38.0.tar.xz";
+      name = "kwayland-5.39.0.tar.xz";
     };
   };
   kwidgetsaddons = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kwidgetsaddons-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kwidgetsaddons-5.39.0.tar.xz";
-      sha256 = "1yh48qxdqz3rk020wr897vkzsi4nhh37lxbg6211xrlirn0lzvj5";
+      sha256 = "1d0d3ags15vr7ck031m6n5n3hw347siskzhb8rsgzghn6xnmbfdb";
-      name = "kwidgetsaddons-5.38.0.tar.xz";
+      name = "kwidgetsaddons-5.39.0.tar.xz";
     };
   };
   kwindowsystem = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kwindowsystem-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kwindowsystem-5.39.0.tar.xz";
-      sha256 = "02xrin8lshvqkw12d0692z40h3g61f4crh28jcmi5zqlaxiyn5ic";
+      sha256 = "1dys70va4h00ixxgxv52wbg8wi3jgsqckaikjqr34fzrmjh1lxqp";
-      name = "kwindowsystem-5.38.0.tar.xz";
+      name = "kwindowsystem-5.39.0.tar.xz";
     };
   };
   kxmlgui = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kxmlgui-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kxmlgui-5.39.0.tar.xz";
-      sha256 = "12cmyhm05nkr9xj7cpnqihrlndfqn1kjkzhcn1ywj20y1gd3mxv4";
+      sha256 = "0zwy11rh3yphl2346hmcahajxkgmrnfz1m8pd3vlnjs175dwz115";
-      name = "kxmlgui-5.38.0.tar.xz";
+      name = "kxmlgui-5.39.0.tar.xz";
     };
   };
   kxmlrpcclient = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kxmlrpcclient-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kxmlrpcclient-5.39.0.tar.xz";
-      sha256 = "0g9ah59h8vq68yg4pfdbqx44xrs856wrr181rsdbsizj0qj3hyaa";
+      sha256 = "1j4a1n3ydln62m98h5p5lxlg1i7k5vzxb4f9kxkvzhw5gfpy78zs";
-      name = "kxmlrpcclient-5.38.0.tar.xz";
+      name = "kxmlrpcclient-5.39.0.tar.xz";
     };
   };
   modemmanager-qt = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/modemmanager-qt-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/modemmanager-qt-5.39.0.tar.xz";
-      sha256 = "18ham8lrxblywc634n49237js5y5k6qgjf5zrjc8gzapn934l89w";
+      sha256 = "0gdsp1017yjcfbq2jny7jz5rv7y4cavps5pfvg7zmylx0v057zk7";
-      name = "modemmanager-qt-5.38.0.tar.xz";
+      name = "modemmanager-qt-5.39.0.tar.xz";
     };
   };
   networkmanager-qt = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/networkmanager-qt-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/networkmanager-qt-5.39.0.tar.xz";
-      sha256 = "10d28nrkppmmfl9pwq2hkrvi461acf29djdzala4l37mp4dwvbf8";
+      sha256 = "1jksv0zsdmkrid2f1m92fxw3gl6crcjaw43v5zra8h2m394iyr81";
-      name = "networkmanager-qt-5.38.0.tar.xz";
+      name = "networkmanager-qt-5.39.0.tar.xz";
     };
   };
   oxygen-icons5 = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/oxygen-icons5-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/oxygen-icons5-5.39.0.tar.xz";
-      sha256 = "0fk97r3br5myqpnfalz67l5hkamxc5vc5swa68wpg1xih6jc3iid";
+      sha256 = "1k1rns0fz5gvfnfwg60lrcw885cqmn814nzql9jvk07340w29s98";
-      name = "oxygen-icons5-5.38.0.tar.xz";
+      name = "oxygen-icons5-5.39.0.tar.xz";
     };
   };
   plasma-framework = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/plasma-framework-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/plasma-framework-5.39.0.tar.xz";
-      sha256 = "1dvhqfi34v44h0wj0m68k477hmx53x9zsf4mh03xq164w1yz68sg";
+      sha256 = "1gaxk9mzwlyld09gqk29y3shvi6a1g1q3l849a9kl1hd07gr53x3";
-      name = "plasma-framework-5.38.0.tar.xz";
+      name = "plasma-framework-5.39.0.tar.xz";
     };
   };
   prison = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/prison-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/prison-5.39.0.tar.xz";
-      sha256 = "0prj3z6s3aighmk4qarfljca7j9cy7ypvgh8rv5di3jb2v4nbg4m";
+      sha256 = "1b0ji341xcamrd19z54r2nkm8cglbr4qfxyxmqzn8yc6icfl61nv";
-      name = "prison-5.38.0.tar.xz";
+      name = "prison-5.39.0.tar.xz";
+    };
+  };
+  qqc2-desktop-style = {
+    version = "5.39.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.39/qqc2-desktop-style-5.39.0.tar.xz";
+      sha256 = "1q8ihhrnk2dh6bbmwkz822l5vv15y11qaj7gig1lf7xw5nr1i27v";
+      name = "qqc2-desktop-style-5.39.0.tar.xz";
     };
   };
   solid = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/solid-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/solid-5.39.0.tar.xz";
-      sha256 = "1b3c5drx4m1x4ai0ziz0yan16a5s3ghf0py37mb92qyimq586lhh";
+      sha256 = "19bl7hzg1fya613vqhdxllh09csm6amrndnhfqnx90w4gb31p36r";
-      name = "solid-5.38.0.tar.xz";
+      name = "solid-5.39.0.tar.xz";
     };
   };
   sonnet = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/sonnet-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/sonnet-5.39.0.tar.xz";
-      sha256 = "1355p88swnk828gsbnm3v4gryffnwbzjcdq49k8jwywzb65bnwxa";
+      sha256 = "1b5bfjbpb6l3c9j9k42shhnz9lqqxk2g607qx9ni0n2pr7w2p7w1";
-      name = "sonnet-5.38.0.tar.xz";
+      name = "sonnet-5.39.0.tar.xz";
     };
   };
   syntax-highlighting = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/syntax-highlighting-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/syntax-highlighting-5.39.0.tar.xz";
-      sha256 = "101ng0l3jfg8x9bns9z38jk3iayijwcb299kf860vfy0nki8gf6l";
+      sha256 = "0b8sdkh9dqmqk3x48d25v4qhrqph0mv76v47skhvls9jspw7kzdc";
-      name = "syntax-highlighting-5.38.0.tar.xz";
+      name = "syntax-highlighting-5.39.0.tar.xz";
     };
   };
   threadweaver = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/threadweaver-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/threadweaver-5.39.0.tar.xz";
-      sha256 = "1d89l9lknc1q25cz9r8iwc1a102q788mj01ghnl6ydss65rclvfv";
+      sha256 = "101bk8rzdysb3vi3vbbkh2s7sb1dhnsa8ncdvdsxqyyaya9ns4aw";
-      name = "threadweaver-5.38.0.tar.xz";
+      name = "threadweaver-5.39.0.tar.xz";
     };
   };
 }

pkgs/development/libraries/libid3tag/default.nix

@@ -1,24 +1,33 @@
 {stdenv, fetchurl, writeText, zlib, gperf}:
 
 stdenv.mkDerivation rec {
-  version = "0.15.1b";
-
   name = "libid3tag-${version}";
+  version = "0.15.1b";
 
   src = fetchurl {
     url = mirror://sourceforge/mad/libid3tag-0.15.1b.tar.gz;
     sha256 = "63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151";
   };
 
+  outputs = [ "out" "dev" ];
+  setOutputFlags = false;
+
   propagatedBuildInputs = [ zlib gperf ];
 
   patches = [ ./debian-patches.patch ];
 
+  preConfigure = ''
+    configureFlagsArray+=(
+      --includedir=$dev/include
+    )
+  '';
+
   postInstall = ''
-    mkdir -p $out/lib/pkgconfig
+    mkdir -p $dev/lib/pkgconfig
-    cp ${./id3tag.pc} $out/lib/pkgconfig/id3tag.pc
+    cp ${./id3tag.pc} $dev/lib/pkgconfig/id3tag.pc
-    substituteInPlace $out/lib/pkgconfig/id3tag.pc \
+    substituteInPlace $dev/lib/pkgconfig/id3tag.pc \
       --subst-var-by out $out \
+      --subst-var-by dev $dev \
       --subst-var-by version "${version}"
   '';
 

pkgs/development/libraries/libid3tag/id3tag.pc

@@ -1,7 +1,7 @@
 prefix=@out@
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
-includedir=${exec_prefix}/include
+includedir=@dev@/include
 
 Name: libid3tag
 Description: ID3 tag manipulation library

pkgs/development/libraries/science/math/cudnn/default.nix

@@ -30,16 +30,16 @@ in
   };
 
   cudnn_cudatoolkit8 = generic rec {
-    version = "7.0";
+    version = "7.0.3";
     cudatoolkit = cudatoolkit8;
     srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.tgz";
-    sha256 = "19yjdslrslwv5ic4vgpzb0fa0mqbgi6a66b7gc66vdc9n9589398";
+    sha256 = "0gzwadxcyirr2zgiikdapnm860x3gcfwfxh5xn3s47zaa03x4kg4";
   };
 
   cudnn_cudatoolkit9 = generic rec {
-    version = "7.0";
+    version = "7.0.3";
     cudatoolkit = cudatoolkit9;
     srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.tgz";
-    sha256 = "1ld5x819vya6p2ppmr7i3lz9ac2y81kssgbzgd0lsign7r2qjapc";
+    sha256 = "1ycy413cq9y9yxj20djqv05aarn3qzcy2md3dvvjpvhc269kwn09";
   };
 }

pkgs/development/libraries/tbb/default.nix

@@ -1,15 +1,20 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchFromGitHub, compiler ? if stdenv.cc.isClang then "clang" else null, stdver ? null }:
 
-stdenv.mkDerivation {
+with stdenv.lib; stdenv.mkDerivation rec {
-  name = "tbb-4.4-u2";
+  name = "tbb-${version}";
+  version = "2018_U1";
 
-  src = fetchurl {
+  src = fetchFromGitHub {
-    url = "https://www.threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb44_20151115oss_src.tgz";
+    owner = "01org";
-    sha256 = "1fvprkjdxj7529hr1qkzkxkk18mx6zllrpiwglq4k3y1hpyc9m9x";
+    repo = "tbb";
+    rev = version;
+    sha256 = "1lygz07va6hsv2vlx9zwz5d2n81rxsdhmh0pqxgj8n1bvb1rp0qw";
   };
 
-  checkTarget = "test";
+  makeFlags = concatStringsSep " " (
-  doCheck = false;
+    optional (compiler != null) "compiler=${compiler}" ++
+    optional (stdver != null) "stdver=${stdver}"
+  );
 
   installPhase = ''
     mkdir -p $out/{lib,share/doc}
@@ -23,8 +28,8 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Intel Thread Building Blocks C++ Library";
-    homepage = http://threadingbuildingblocks.org/;
+    homepage = "http://threadingbuildingblocks.org/";
-    license = stdenv.lib.licenses.lgpl3Plus;
+    license = licenses.asl20;
     longDescription = ''
       Intel Threading Building Blocks offers a rich and complete approach to
       expressing parallelism in a C++ program. It is a library that helps you
@@ -33,7 +38,7 @@ stdenv.mkDerivation {
       represents a higher-level, task-based parallelism that abstracts platform
       details and threading mechanisms for scalability and performance.
     '';
-    platforms = with stdenv.lib.platforms; linux ++ darwin;
+    platforms = with platforms; linux ++ darwin;
-    maintainers = with stdenv.lib.maintainers; [ peti thoughtpolice ];
+    maintainers = with maintainers; [ peti thoughtpolice dizfer ];
   };
 }

pkgs/development/lua-modules/generic/default.nix

@@ -5,14 +5,13 @@ lua:
 if disabled then
   throw "${attrs.name} not supported by interpreter lua-${lua.luaversion}"
 else
-  lua.stdenv.mkDerivation ({
+  lua.stdenv.mkDerivation (
-
+    {
-      preBuild = ''
+      makeFlags = [
-        makeFlagsArray=(
+        "PREFIX=$(out)"
-          PREFIX=$out
+        "LUA_LIBDIR=$(out)/lib/lua/${lua.luaversion}"
-          LUA_LIBDIR="$out/lib/lua/${lua.luaversion}"
+        "LUA_INC=-I${lua}/include"
-          LUA_INC="-I${lua}/include");
+      ];
-      '';
     }
     //
     attrs

pkgs/development/misc/amdapp-sdk/default.nix

@@ -99,7 +99,7 @@ in stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "AMD Accelerated Parallel Processing (APP) SDK, with OpenCL 1.2 support";
-    homepage = http://developer.amd.com/tools/heterogeneous-computing/amd-accelerated-parallel-processing-app-sdk/;
+    homepage = http://developer.amd.com/amd-accelerated-parallel-processing-app-sdk/;
     license = licenses.amd;
     maintainers = [ maintainers.offline ];
     platforms = [ "i686-linux" "x86_64-linux" ];

pkgs/development/python-modules/bitstring/default.nix

@@ -0,0 +1,21 @@
+{ stdenv, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+  pname = "bitstring";
+  version = "3.1.5";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1algq30j6rz12b1902bpw7iijx5lhrfqhl80d4ac6xzkrrpshqy1";
+    extension = "zip";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Module for binary data manipulation";
+    homepage = "https://github.com/scott-griffiths/bitstring";
+    license = licenses.mit;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ bjornfor ];
+  };
+}

pkgs/development/python-modules/cffi/clang.patch

@@ -0,0 +1,13 @@
+diff --git a/testing/cffi1/test_recompiler.py b/testing/cffi1/test_recompiler.py
+index a3277b0..0d6e2c3 100644
+--- a/testing/cffi1/test_recompiler.py
++++ b/testing/cffi1/test_recompiler.py
+@@ -2270,7 +2270,7 @@ def test_char16_char32_type(no_cpp=False):
+         char32_t foo_4bytes(char32_t);
+     """)
+     lib = verify(ffi, "test_char16_char32_type" + no_cpp * "_nocpp", """
+-    #if !defined(__cplusplus) || __cplusplus < 201103L
++    #if !defined(__cplusplus)
+     typedef uint_least16_t char16_t;
+     typedef uint_least32_t char32_t;
+     #endif

pkgs/development/python-modules/cffi/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, isPyPy, fetchPypi, libffi, pycparser, pytest }:
+{ stdenv, buildPythonPackage, isPy27, isPyPy, fetchPypi, libffi, pycparser, pytest }:
 
 if isPyPy then null else buildPythonPackage rec {
   pname = "cffi";
@@ -10,13 +10,15 @@ if isPyPy then null else buildPythonPackage rec {
     sha256 = "ab87dd91c0c4073758d07334c1e5f712ce8fe48f007b86f8238773963ee700a6";
   };
 
+  patches = stdenv.lib.optional (isPy27 && stdenv.cc.isClang) ./clang.patch;
+
   outputs = [ "out" "dev" ];
 
   propagatedBuildInputs = [ libffi pycparser ];
   buildInputs = [ pytest ];
 
   # The tests use -Werror but with python3.6 clang detects some unreachable code.
-  NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.cc.isClang "-Wno-unreachable-code";
+  NIX_CFLAGS_COMPILE = stdenv.lib.optionals stdenv.cc.isClang [ "-Wno-unused-command-line-argument" "-Wno-unreachable-code" ];
 
   checkPhase = ''
     py.test

pkgs/development/python-modules/cytoolz/default.nix

@@ -0,0 +1,37 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, isPyPy
+, nose
+, toolz
+, python
+}:
+
+buildPythonPackage rec {
+  pname = "cytoolz";
+  version = "0.8.2";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "476a2ad176de5eaef80499b7b43d4f72ba6d23df33d349088dae315e9b31c552";
+  };
+
+  # Extension types
+  disabled = isPyPy;
+
+  checkInputs = [ nose ];
+  propagatedBuildInputs = [ toolz ];
+
+  # Disable failing test https://github.com/pytoolz/cytoolz/issues/97
+  checkPhase = ''
+    NOSE_EXCLUDE=test_curried_exceptions nosetests -v $out/${python.sitePackages}
+  '';
+
+  meta = {
+    homepage = "http://github.com/pytoolz/cytoolz/";
+    description = "Cython implementation of Toolz: High performance functional utilities";
+    license = "licenses.bsd3";
+    maintainers = with lib.maintainers; [ fridh ];
+  };
+}

pkgs/development/python-modules/datashape/default.nix

@@ -0,0 +1,34 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pytest
+, mock
+, numpy
+, multipledispatch
+, dateutil
+}:
+
+buildPythonPackage rec {
+  pname = "datashape";
+  version = "0.5.2";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "2356ea690c3cf003c1468a243a9063144235de45b080b3652de4f3d44e57d783";
+  };
+
+  checkInputs = [ pytest mock ];
+  propagatedBuildInputs = [ numpy multipledispatch dateutil ];
+
+  checkPhase = ''
+    py.test datashape/tests
+  '';
+
+  meta = {
+    homepage = https://github.com/ContinuumIO/datashape;
+    description = "A data description language";
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [ fridh ];
+  };
+}

pkgs/development/python-modules/demjson/default.nix

@@ -0,0 +1,21 @@
+{ stdenv, buildPythonPackage, fetchPypi, isPy36 }:
+
+buildPythonPackage rec {
+  pname = "demjson";
+  version = "2.2.4";
+  name = "${pname}-${version}";
+  disabled = isPy36;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0ygbddpnvp5lby6mr5kz60la3hkvwwzv3wwb3z0w9ngxl0w21pii";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Encoder/decoder and lint/validator for JSON (JavaScript Object Notation)";
+    homepage = http://deron.meranda.us/python/demjson/;
+    license = licenses.lgpl3Plus;
+    maintainers = with maintainers; [ bjornfor ];
+    platforms = platforms.all;
+  };
+}

pkgs/development/python-modules/ipython_genutils/default.nix

@@ -0,0 +1,30 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, nose
+, glibcLocales
+}:
+
+buildPythonPackage rec {
+  pname = "ipython_genutils";
+  version = "0.2.0";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "eb2e116e75ecef9d4d228fdc66af54269afa26ab4463042e33785b887c628ba8";
+  };
+
+  checkInputs = [ nose glibcLocales ];
+
+  checkPhase = ''
+    LC_ALL="en_US.UTF-8" nosetests -v ipython_genutils/tests
+  '';
+
+  meta = {
+    description = "Vestigial utilities from IPython";
+    homepage = http://ipython.org/;
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ fridh ];
+  };
+}

pkgs/development/python-modules/multipledispatch/default.nix

@@ -0,0 +1,25 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+  pname = "multipledispatch";
+  version = "0.4.9";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "bda6abb8188d9abb429bd17ed15bc7433f77f1b05a78cfff761711ed81daa7a2";
+  };
+
+  # No tests in archive
+  doCheck = false;
+
+  meta = {
+    homepage = http://github.com/mrocklin/multipledispatch/;
+    description = "A relatively sane approach to multiple dispatch in Python";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ fridh ];
+  };
+}

pkgs/development/python-modules/nbmerge/default.nix

@@ -0,0 +1,35 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, nbformat
+, nose
+}:
+
+buildPythonPackage rec {
+  pname = "nbmerge";
+  version = "unstable-2017-10-23";
+  name = "${pname}-${version}";
+
+  src = fetchFromGitHub {
+    owner = "jbn";
+    repo = pname;
+    rev = "fc0ba95e8422340317358ffec4404235defbc06a";
+    sha256 = "1cn550kjadnxc1sx2xy814248fpzrj3lgvrmsbrwmk03vwaa2hmi";
+  };
+
+  propagatedBuildInputs = [ nbformat ];
+  checkInputs = [ nose ];
+
+  checkPhase = ''
+    patchShebangs .
+    nosetests -v
+    PATH=$PATH:$out/bin ./cli_tests.sh
+  '';
+
+  meta = {
+    description = "A tool to merge/concatenate Jupyter (IPython) notebooks";
+    inherit (src.meta) homepage;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ globin ];
+  };
+}

pkgs/development/python-modules/nose-exclude/default.nix

@@ -0,0 +1,25 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, nose
+}:
+
+buildPythonPackage rec {
+  pname = "nose-exclude";
+  version = "0.5.0";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "f78fa8b41eeb815f0486414f710f1eea0949e346cfb11d59ba6295ed69e84304";
+  };
+
+  propagatedBuildInputs = [ nose ];
+
+  meta = {
+    license = lib.licenses.lgpl21;
+    description = "Exclude specific directories from nosetests runs";
+    homepage = https://github.com/kgrandis/nose-exclude;
+    maintainers = with lib.maintainers; [ fridh ];
+  };
+}

pkgs/development/python-modules/numtraits/default.nix

@@ -0,0 +1,33 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pytest
+, six
+, numpy
+, traitlets
+}:
+
+buildPythonPackage rec {
+  pname = "numtraits";
+  version = "0.2";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "2fca9a6c9334f7358ef1a3e2e64ccaa6a479fc99fc096910e0d5fbe8edcdfd7e";
+  };
+
+  checkInputs = [ pytest ];
+  propagatedBuildInputs = [ six numpy traitlets];
+
+  checkPhase = ''
+    py.test
+  '';
+
+  meta = {
+    description = "Numerical traits for Python objects";
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [ fridh ];
+    homepage = https://github.com/astrofrog/numtraits;
+  };
+}

pkgs/development/python-modules/odo/default.nix

@@ -0,0 +1,36 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pytest
+, datashape
+, numpy
+, pandas
+, toolz
+, multipledispatch
+, networkx
+}:
+
+buildPythonPackage rec {
+  pname = "odo";
+  version= "0.5.0";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1mh5k69d9ph9jd07jl9yqh78rbnh5cjspi1q530v3ml7ivjzz4p8";
+  };
+
+  checkInputs = [ pytest ];
+  propagatedBuildInputs = [ datashape numpy pandas toolz multipledispatch networkx ];
+
+  checkPhase = ''
+    py.test odo/tests
+  '';
+
+  meta = {
+    homepage = https://github.com/ContinuumIO/odo;
+    description = "Data migration utilities";
+    license = lib.licenses.bsdOriginal;
+    maintainers = with lib.maintainers; [ fridh ];
+  };
+}

pkgs/development/python-modules/ofxclient/default.nix

@@ -0,0 +1,29 @@
+{ stdenv, buildPythonPackage, fetchPypi,
+ ofxhome, ofxparse, beautifulsoup, lxml, keyring
+}:
+
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  version = "2.0.3";
+  pname = "ofxclient";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0jdhqsbl34yn3n0x6mwsnl58c25v5lp6vr910c2hk7l74l5y7538";
+  };
+
+  patchPhase = ''
+    substituteInPlace setup.py --replace '"argparse",' ""
+  '';
+
+  # ImportError: No module named tests
+  doCheck = false;
+
+  propagatedBuildInputs = [ ofxhome ofxparse beautifulsoup lxml keyring ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/captin411/ofxclient;
+    description = "OFX client for dowloading transactions from banks";
+    license = licenses.mit;
+  };
+}

pkgs/development/python-modules/pwntools/default.nix

@@ -0,0 +1,27 @@
+{ stdenv, buildPythonPackage, fetchPypi, isPy3k
+, Mako, packaging, pysocks, pygments, ROPGadget
+, capstone, paramiko, pip, psutil
+, pyelftools, pypandoc, pyserial, dateutil
+, requests, tox, pandoc, unicorn, intervaltree }:
+
+buildPythonPackage rec {
+  version = "3.10.0";
+  pname = "pwntools";
+  name = "pwntools-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1l8hb30mwxqd1y7r5ihd7kzmjm2mz6m5aiphd3hwzmxkmxbxj8zk";
+  };
+
+  propagatedBuildInputs = [ Mako packaging pysocks pygments ROPGadget capstone paramiko pip psutil pyelftools pypandoc pyserial dateutil requests tox pandoc unicorn intervaltree ];
+
+  disabled = isPy3k;
+
+  meta = with stdenv.lib; {
+    homepage = "http://pwntools.com";
+    description = "CTF framework and exploit development library";
+    license = licenses.mit;
+    maintainers = with maintainers; [ bennofs kristoff3r ];
+  };
+}

pkgs/development/python-modules/pyodbc/default.nix

@@ -0,0 +1,23 @@
+{ stdenv, buildPythonPackage, fetchPypi, isPyPy, libiodbc }:
+
+buildPythonPackage rec {
+  pname = "pyodbc";
+  version = "4.0.19";
+  name = "${pname}-${version}";
+  disabled = isPyPy;  # use pypypdbc instead
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "05mkaxbi9n02bpr3l0qnyfb3458f35hk71bq8jmadikp3h8al7dg";
+  };
+
+  buildInputs = [ libiodbc ];
+
+  meta = with stdenv.lib; {
+    description = "Python ODBC module to connect to almost any database";
+    homepage = "https://github.com/mkleehammer/pyodbc";
+    license = licenses.mit;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ bjornfor ];
+  };
+}

pkgs/development/python-modules/pysoundfile/default.nix

@@ -0,0 +1,38 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pytest
+, numpy
+, libsndfile
+, cffi
+, isPyPy
+, stdenv
+}:
+
+buildPythonPackage rec {
+  pname = "PySoundFile";
+  name = "PySoundFile-${version}";
+  version = "0.8.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "72c3e23b7c9998460ec78176084ea101e3439596ab29df476bc8508708df84df";
+  };
+
+    checkInputs = [ pytest ];
+    propagatedBuildInputs = [ numpy libsndfile cffi ];
+
+    meta = {
+      description = "An audio library based on libsndfile, CFFI and NumPy";
+      license = lib.licenses.bsd3;
+      homepage = https://github.com/bastibe/PySoundFile;
+      maintainers = with lib.maintainers; [ fridh ];
+    };
+
+    prePatch = ''
+      substituteInPlace soundfile.py --replace "'sndfile'" "'${libsndfile.out}/lib/libsndfile.so'"
+    '';
+
+    # https://github.com/bastibe/PySoundFile/issues/157
+    disabled = isPyPy ||  stdenv.isi686;
+}

pkgs/development/python-modules/recommonmark/default.nix

@@ -0,0 +1,32 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pytest
+, sphinx
+, CommonMark_54
+, docutils
+}:
+
+buildPythonPackage rec {
+  pname = "recommonmark";
+  name = "${pname}-${version}";
+  version = "0.4.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "6e29c723abcf5533842376d87c4589e62923ecb6002a8e059eb608345ddaff9d";
+  };
+
+  checkInputs = [ pytest sphinx ];
+  propagatedBuildInputs = [ CommonMark_54 docutils ];
+
+  # No tests in archive
+  doCheck = false;
+
+  meta = {
+    description = "A docutils-compatibility bridge to CommonMark";
+    homepage = https://github.com/rtfd/recommonmark;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fridh ];
+  };
+}

pkgs/development/python-modules/robotsuite/default.nix

@@ -0,0 +1,21 @@
+{ stdenv, buildPythonPackage, fetchPypi, unittest2, robotframework, lxml }:
+
+buildPythonPackage rec {
+  pname = "robotsuite";
+  version = "2.0.0";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "15iw7g6gspf1ill0mzjrj71dirqfc86f1j14wphdvs2lazv8d50z";
+  };
+
+  buildInputs = [ unittest2 ];
+  propagatedBuildInputs = [ robotframework lxml ];
+
+  meta = with stdenv.lib; {
+    description = "Python unittest test suite for Robot Framework";
+    homepage = http://github.com/collective/robotsuite/;
+    license = licenses.gpl3;
+  };
+}

pkgs/development/python-modules/seaborn/default.nix

@@ -0,0 +1,34 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, nose
+, pandas
+, matplotlib
+}:
+
+buildPythonPackage rec {
+  pname = "seaborn";
+  version = "0.7.1";
+  name = "${pname}-${version}";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0pawrqc3mxpwd5g9pvi9gba02637bh5c8ldpp8izfwpfn52469zs";
+  };
+
+  checkInputs = [ nose ];
+  propagatedBuildInputs = [ pandas matplotlib ];
+
+  checkPhase = ''
+    nosetests -v
+  '';
+
+  # Computationally very demanding tests
+  doCheck = false;
+
+  meta = {
+    description = "Statisitical data visualization";
+    homepage = "http://stanford.edu/~mwaskom/software/seaborn/";
+    license = with lib.licenses; [ bsd3 ];
+    maintainers = with lib.maintainers; [ fridh ];
+  };
+}

pkgs/development/python-modules/tabulate/default.nix

@@ -0,0 +1,28 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, nose
+}:
+
+buildPythonPackage rec {
+  version = "0.7.7";
+  pname = "tabulate";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "83a0b8e17c09f012090a50e1e97ae897300a72b35e0c86c0b53d3bd2ae86d8c6";
+  };
+
+  checkInputs = [ nose ];
+
+  # Tests: cannot import common (relative import).
+  doCheck = false;
+
+  meta = {
+    description = "Pretty-print tabular data";
+    homepage = https://bitbucket.org/astanin/python-tabulate;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fridh ];
+  };
+}

pkgs/development/python-modules/toolz/default.nix

@@ -0,0 +1,31 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, nose
+}:
+
+buildPythonPackage rec{
+  pname = "toolz";
+  version = "0.8.2";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0l3czks4xy37i8099waxk2fdz5g0k1dwys2mkhlxc0b0886cj4sa";
+  };
+
+  checkInputs = [ nose ];
+
+  checkPhase = ''
+    # https://github.com/pytoolz/toolz/issues/357
+    rm toolz/tests/test_serialization.py
+    nosetests toolz/tests
+  '';
+
+  meta = {
+    homepage = "http://github.com/pytoolz/toolz/";
+    description = "List processing tools and functional utilities";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ fridh ];
+  };
+}

pkgs/development/python-modules/traitlets/default.nix

@@ -0,0 +1,35 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, glibcLocales
+, pytest
+, mock
+, ipython_genutils
+, decorator
+, enum34
+}:
+
+buildPythonPackage rec {
+  pname = "traitlets";
+  version = "4.3.2";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "9c4bd2d267b7153df9152698efb1050a5d84982d3384a37b2c1f7723ba3e7835";
+  };
+
+  checkInputs = [ glibcLocales pytest mock ];
+  propagatedBuildInputs = [ ipython_genutils decorator enum34 ];
+
+  checkPhase = ''
+    LC_ALL="en_US.UTF-8" py.test $out
+  '';
+
+  meta = {
+    description = "Traitlets Python config system";
+    homepage = http://ipython.org/;
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ fridh ];
+  };
+}

pkgs/development/python-modules/zipfile36/default.nix

@@ -0,0 +1,33 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, python
+, isPy3k
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+  pname = "zipfile36";
+  version = "0.1.3";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "a78a8dddf4fa114f7fe73df76ffcce7538e23433b7a6a96c1c904023f122aead";
+  };
+
+  checkPhase = ''
+    ${python.interpreter} -m unittest test_zipfile.py
+  '';
+
+  # Only works with Python 3.x.
+  # Not supposed to be used with 3.6 and up.
+  disabled = !(isPy3k && (pythonOlder "3.6"));
+
+  meta = {
+    description = "Read and write ZIP files - backport of the zipfile module from Python 3.6";
+    homepage = https://gitlab.com/takluyver/zipfile36;
+    license = lib.licenses.psfl;
+    maintainer = lib.maintainers.fridh;
+  };
+}

pkgs/development/tools/continuous-integration/gitlab-runner/default.nix

@@ -1,16 +1,16 @@
 { lib, buildGoPackage, fetchFromGitLab, fetchurl, go-bindata }:
 
 let
-  version = "10.0.2";
+  version = "10.1.0";
   # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64
   docker_x86_64 = fetchurl {
     url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-x86_64.tar.xz";
-    sha256 = "14lrc9frigym93ppphmdhwnbhk7xz5drpai3d29gyi1z4xsm1jaq";
+    sha256 = "0h8fwqsr8ibd82jxq4pc9p8x7af0i8jyrrsj13p4daqhla0srxr4";
   };
 
   docker_arm = fetchurl {
     url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-arm.tar.xz";
-    sha256 = "013bly0xswzkf2kwi2pr2ryd880h63n8pya2ccv4z77hxs80cfmp";
+    sha256 = "0bzj8zr6d5ab5bjlbw7q3iwn19ha8fksymrvw6cyzs4qacfsj54w";
   };
 in
 buildGoPackage rec {
@@ -29,7 +29,7 @@ buildGoPackage rec {
     owner = "gitlab-org";
     repo = "gitlab-runner";
     rev = "v${version}";
-    sha256 = "0hr964r7bcff74sna0b8w3d2ip0hs441ijlhplh2xzqnzpbvx2jq";
+    sha256 = "0knvjmxcscyr6v5b9vvyvm8w6p58a1h6nfcvf13dxp59psm71q00";
   };
 
   patches = [ ./fix-shell-path.patch ];

pkgs/development/web/nodejs/v8.nix

@@ -10,11 +10,11 @@ let
   baseName = if enableNpm then "nodejs" else "nodejs-slim";
 in
   stdenv.mkDerivation (nodejs // rec {
-    version = "8.8.0";
+    version = "8.8.1";
     name = "${baseName}-${version}";
     src = fetchurl {
       url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz";
-      sha256 = "1ksfj6h6vwaws52055mg80pm2bslw23kpx3a7ahraa6ngk934kw5";
+      sha256 = "0ymmhw41n5a81qkxvq7lrssis4y53jh5gxs2k6s2v6brnxxc9qjw";
     };
 
     patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ];

pkgs/games/duckmarines/default.nix

@@ -2,7 +2,7 @@
 
 let
   pname = "duckmarines";
-  version = "1.0b";
+  version = "1.0c";
 
   icon = fetchurl {
     url = "http://tangramgames.dk/img/thumb/duckmarines.png";

pkgs/games/dwarf-fortress/default.nix

@@ -11,6 +11,9 @@ let
       inherit (pkgs.perlPackages) XMLLibXML XMLLibXSLT;
     };
 
+    soundSense = callPackage ./soundsense.nix { };
+    stoneSense = callPackage ./stonesense.nix { };
+
     dwarf-fortress-unfuck = callPackage ./unfuck.nix { };
 
     dwarf-fortress = callPackage ./wrapper {

pkgs/games/dwarf-fortress/dfhack/default.nix

@@ -1,6 +1,6 @@
-{ stdenv, fetchgit, cmake, writeScriptBin
+{ stdenv, lib, fetchgit, cmake, writeScriptBin, callPackage
-, perl, XMLLibXML, XMLLibXSLT
+, perl, XMLLibXML, XMLLibXSLT, zlib
-, zlib
+, enableStoneSense ? false,  allegro5, mesa
 }:
 
 let
@@ -43,11 +43,12 @@ in stdenv.mkDerivation rec {
     inherit rev sha256;
   };
 
-  patches = [ ./skip-ruby.patch ];
+  patches = [ ./fix-stonesense.patch ];
 
   nativeBuildInputs = [ cmake perl XMLLibXML XMLLibXSLT fakegit ];
   # We don't use system libraries because dfhack needs old C++ ABI.
-  buildInputs = [ zlib ];
+  buildInputs = [ zlib ]
+             ++ lib.optionals enableStoneSense [ allegro5 mesa ];
 
   preConfigure = ''
     # Trick build system into believing we have .git
@@ -59,7 +60,8 @@ in stdenv.mkDerivation rec {
     export LD_LIBRARY_PATH="$PWD/depends/protobuf:$LD_LIBRARY_PATH"
   '';
 
-  cmakeFlags = [ "-DDFHACK_BUILD_ARCH=${arch}" ];
+  cmakeFlags = [ "-DDFHACK_BUILD_ARCH=${arch}" "-DDOWNLOAD_RUBY=OFF" ]
+            ++ lib.optionals enableStoneSense [ "-DBUILD_STONESENSE=ON" "-DSTONESENSE_INTERNAL_SO=OFF" ];
 
   enableParallelBuilding = true;
 

pkgs/games/dwarf-fortress/dfhack/fix-stonesense.patch

@@ -0,0 +1,23 @@
+From f5be6fe5fb192f01ae4551ed9217e97fd7f6a0ae Mon Sep 17 00:00:00 2001
+From: Herwig Hochleitner <hhochleitner@gmail.com>
+Date: Sun, 1 Oct 2017 18:01:43 +0200
+Subject: [PATCH] include <GL/glext.h>
+
+this fixes `GLhandleARB` not being defined
+---
+ plugins/stonesense/common.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/plugins/stonesense/common.h b/plugins/stonesense/common.h
+index eb36691..ef45389 100644
+--- a/plugins/stonesense/common.h
++++ b/plugins/stonesense/common.h
+@@ -31,6 +31,8 @@ using namespace df::enums;
+ #include <allegro5/allegro_opengl.h>
+ #include <allegro5/utf8.h>
+ 
++#include <GL/glext.h>
++
+ // allegro leaks X headers, undef some of it here:
+ #undef TileShape
+ #undef None

pkgs/games/dwarf-fortress/dfhack/skip-ruby.patch

@@ -1,10 +0,0 @@
-diff --git a/plugins/ruby/CMakeLists.txt b/plugins/ruby/CMakeLists.txt
-index f1ef12ac..0976e18a 100644
---- a/plugins/ruby/CMakeLists.txt
-+++ b/plugins/ruby/CMakeLists.txt
-@@ -1,5 +1,5 @@
- # Allow build system to turn off downloading of libruby.so.
--OPTION(DOWNLOAD_RUBY "Download prebuilt libruby.so for ruby plugin." ON)
-+OPTION(DOWNLOAD_RUBY "Download prebuilt libruby.so for ruby plugin." OFF)
- 
- IF (DOWNLOAD_RUBY)

pkgs/games/dwarf-fortress/dwarf-therapist/default.nix

@@ -1,29 +1,34 @@
-{ stdenv, fetchFromGitHub, coreutils, qtbase, qtdeclarative, qmake, texlive }:
+{ stdenv, fetchFromGitHub, coreutils, qtbase, qtdeclarative, cmake, texlive, ninja }:
 
 stdenv.mkDerivation rec {
   name = "dwarf-therapist-original-${version}";
-  version = "37.0.0";
+  version = "37.0.0-Hello71";
 
   src = fetchFromGitHub {
-    owner = "splintermind";
+    ## We use `Hello71`'s fork for 43.05 support
+    # owner = "splintermind";
+    owner = "Hello71";
     repo = "Dwarf-Therapist";
-    rev = "v${version}";
+    rev = "42ccaa71f6077ebdd41543255a360c3470812b97";
-    sha256 = "0dw86b4x5hjhb7h4ynvwjgcinpqywfc5l48ljb5sahz08rfnx63d";
+    sha256 = "0f6mlfck7q31jl5cb6d6blf5sb7cigvvs2rn31k16xc93hsdgxaz";
   };
 
   outputs = [ "out" "layouts" ];
   buildInputs = [ qtbase qtdeclarative ];
-  nativeBuildInputs = [ texlive qmake ];
+  nativeBuildInputs = [ texlive cmake ninja ];
 
-  enableParallelBuilding = false;
+  configurePhase = ''
+    cmake -GNinja
+  '';
 
-  # Move layout files so they cannot be found by Therapist
+  buildPhase = ''
-  postInstall = ''
+    ninja -j$NIX_BUILD_CORES
-    mkdir -p $layouts
+  '';
-    mv $out/share/dwarftherapist/memory_layouts/* $layouts
+
-    rmdir $out/share/dwarftherapist/memory_layouts
+  installPhase = ''
-    # Useless symlink
+    mkdir -p $out/bin
-    rm $out/bin/dwarftherapist
+    cp ./DwarfTherapist $out/bin/DwarfTherapist
+    cp -r ./share/memory_layouts $layouts
   '';
 
   meta = with stdenv.lib; {

pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix

@@ -3,7 +3,7 @@
 let
   df = dwarf-fortress-original;
   dt = dwarf-therapist-original;
-  inifile = "linux/v0${df.baseVersion}.${df.patchVersion}.ini";
+  inifile = "linux/v0.${df.baseVersion}.${df.patchVersion}.ini";
   dfHashFile = "${df}/hash.md5";
 
 in symlinkJoin {

pkgs/games/dwarf-fortress/soundsense.nix

@@ -0,0 +1,35 @@
+{ stdenv, fetchzip, dos2unix
+, soundPack ? stdenv.mkDerivation {
+    name = "soundsense-soundpack";
+    src = fetchzip {
+      url = "http://df.zweistein.cz/soundsense/soundpack.zip";
+      sha256 = "0qz0mjkp7wp0gxk3ws2x760awv8c9lkacj2fn9bz3gqqnq262ffa";
+    };
+    installPhase = ''
+      cp -r . $out
+    '';
+}}:
+
+stdenv.mkDerivation rec {
+  version = "2016-1_196";
+  dfVersion = "0.43.05";
+  inherit soundPack;
+  name = "soundsense-${version}";
+  src = fetchzip {
+    url = "http://df.zweistein.cz/soundsense/soundSense_${version}.zip";
+    sha256 = "1gkrs69l3xsh858yjp204ddp29m668j630akm7arssc9359wxqkk";
+  };
+  phases = [ "unpackPhase" "buildPhase" "installPhase" ];
+  nativeBuildInputs = [ dos2unix ];
+  buildPhase = ''
+    dos2unix soundSense.sh
+    chmod +x soundSense.sh
+  '';
+  installPhase = ''
+    mkdir $out
+    cp -R . $out/soundsense
+    ln -s $out/soundsense/dfhack $out/hack
+    ln -s $soundPack $out/soundsense/packs
+  '';
+  passthru = { inherit version dfVersion; };
+}

pkgs/games/dwarf-fortress/stonesense.nix

@@ -0,0 +1,15 @@
+{ stdenv, fetchFromGitHub, cmake }:
+
+stdenv.mkDerivation rec {
+  name = "stonesense";
+  src = fetchFromGitHub {
+    owner = "DFHack";
+    repo = "stonesense";
+    rev = "be793a080e66db1ff79ac284070632ec1a896708";
+    sha256 = "1kibqblxp16z75zm48kk59w483933rkg4w339f28fcrbpg4sn92s";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  cmakeFlags = [ "-DDFHACK_BUILD_ARCH=64" ];
+}

pkgs/games/dwarf-fortress/wrapper/default.nix

@@ -1,10 +1,16 @@
 { stdenv, lib, buildEnv, dwarf-fortress-original, substituteAll
 , enableDFHack ? false, dfhack
+, enableSoundSense ? false, soundSense, jdk
+, enableStoneSense ? false
 , themes ? {}
 , theme ? null
 }:
 
 let
+  dfhack_ = dfhack.override {
+    inherit enableStoneSense;
+  };
+
   ptheme =
     if builtins.isString theme
     then builtins.getAttr theme themes
@@ -12,19 +18,20 @@ let
 
   # These are in inverse order for first packages to override the next ones.
   pkgs = lib.optional (theme != null) ptheme
-         ++ lib.optional enableDFHack dfhack
+         ++ lib.optional enableDFHack dfhack_
+         ++ lib.optional enableSoundSense soundSense
          ++ [ dwarf-fortress-original ];
 
   env = buildEnv {
     name = "dwarf-fortress-env-${dwarf-fortress-original.dfVersion}";
 
     paths = pkgs;
-    pathsToLink = [ "/" "/hack" ];
+    pathsToLink = [ "/" "/hack" "/hack/scripts" ];
     ignoreCollisions = true;
 
     postBuild = lib.optionalString enableDFHack ''
       rm $out/hack/symbols.xml
-      substitute ${dfhack}/hack/symbols.xml $out/hack/symbols.xml \
+      substitute ${dfhack_}/hack/symbols.xml $out/hack/symbols.xml \
         --replace $(cat ${dwarf-fortress-original}/hash.md5.orig) \
                   $(cat ${dwarf-fortress-original}/hash.md5)
     '';
@@ -44,6 +51,7 @@ stdenv.mkDerivation rec {
 
   runDF = ./dwarf-fortress.in;
   runDFHack = ./dfhack.in;
+  runSoundSense = ./soundSense.in;
 
   buildCommand = ''
     mkdir -p $out/bin
@@ -57,6 +65,12 @@ stdenv.mkDerivation rec {
       --subst-var-by stdenv_shell ${stdenv.shell} \
       --subst-var dfInit
     chmod 755 $out/bin/dfhack
+  '' + lib.optionalString enableSoundSense ''
+    substitute $runSoundSense $out/bin/soundsense \
+      --subst-var-by stdenv_shell ${stdenv.shell} \
+      --subst-var-by jre ${jdk.jre} \
+      --subst-var dfInit
+    chmod 755 $out/bin/soundsense
   '';
 
   preferLocalBuild = true;

pkgs/games/dwarf-fortress/wrapper/dfhack.in

@@ -2,7 +2,7 @@
 
 source @dfInit@
 
-for i in dfhack.init-example dfhack-config/default hack/*; do
+for i in dfhack.init-example dfhack-config/default hack/* stonesense/*; do
   update_path "$i"
 done
 

pkgs/games/dwarf-fortress/wrapper/soundSense.in

@@ -0,0 +1,10 @@
+#!@stdenv_shell@ -e
+
+source @dfInit@
+
+for p in soundsense/*; do
+  update_path "$p"
+done
+
+cd "$DF_DIR"
+PATH=@jre@/bin exec $DF_DIR/soundsense/soundSense.sh

pkgs/games/robotfindskitten/default.nix

@@ -14,6 +14,12 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ ncurses ];
 
+  makeFlags = [ "execgamesdir=$(out)/bin" ];
+
+  postInstall = ''
+    install -Dm644 {nki,$out/share/games/robotfindskitten}/vanilla.nki
+  '';
+
   meta = {
     description = "Yet another zen simulation; A simple find-the-kitten game";
     homepage = http://robotfindskitten.org/;

pkgs/games/steam/runtime-wrapped.nix

@@ -26,7 +26,7 @@ let
     xlibs.libICE
     gnome2.GConf
     freetype
-    curl
+    (curl.override { gnutlsSupport = true; sslSupport = false; })
     nspr
     nss
     fontconfig
@@ -57,6 +57,7 @@ let
     glew110
     openssl
     libidn
+    tbb
 
     # Other things from runtime
     xlibs.libXinerama

pkgs/misc/themes/e17gtk/default.nix

@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "e17gtk-${version}";
-  version = "3.22.1";
+  version = "3.22.2";
 
   src = fetchFromGitHub {
     owner = "tsujan";
     repo = "E17gtk";
     rev = "V${version}";
-    sha256 = "0y1v5hamssgzgcmwbr60iz7wipb9yzzj3ypzkc6i65mp4pyazrv8";
+    sha256 = "1qwj1hmdlk8sdqhkrh60p2xg4av1rl0lmipdg5j0i40318pmiml1";
   };
 
   installPhase = ''

pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix

@@ -3,9 +3,9 @@
 with stdenv.lib;
 
 let
-  version = "4.13.9";
+  version = "4.13.10";
   revision = "a";
-  sha256 = "0v2ki1vgmg8yifnflbhryrv7pxvyf0157ysngc1n1hcqyypq4sji";
+  sha256 = "0m4yxdcll1zvvvagpjf9s7vw7dmad22qbakhc50as3ixyd7w5ah6";
 
   # modVersion needs to be x.y.z, will automatically add .0 if needed
   modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));

pkgs/servers/ldap/389/default.nix

@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
   passthru.version = version;
 
   meta = with stdenv.lib; {
-    homepage = https://directory.fedoraproject.org/;
+    homepage = http://www.port389.org/;
     description = "Enterprise-class Open Source LDAP server for Linux";
     license = licenses.gpl2;
     platforms = platforms.linux;

pkgs/servers/mail/nullmailer/default.nix

@@ -4,12 +4,12 @@ assert tls -> gnutls != null;
 
 stdenv.mkDerivation rec {
 
-  version = "2.0";
+  version = "2.1";
   name = "nullmailer-${version}";
 
   src = fetchurl {
     url = "http://untroubled.org/nullmailer/nullmailer-${version}.tar.gz";
-    sha256 = "112ghdln8q9yljc8kp9mc3843mh0fyb4rig2v4q2dzy1l324q3yp";
+    sha256 = "0gykh0qc86rk0knfvp8ndqkryal3pvqdfdya94wvb6n1cc8p3ild";
   };
 
   buildInputs = stdenv.lib.optional tls gnutls;

pkgs/servers/x11/xorg/overrides.nix

@@ -321,8 +321,9 @@ in
       url = "mirror://xorg/individual/driver/${name}.tar.bz2";
       sha256 = "0yrqs88b7yn9nljwlxzn76jfmvf0sh939kzij5b2jvr2qa7mbjmb";
     };
+    outputs = [ "out" "dev" ];
     buildInputs = attrs.buildInputs ++ [ args.libinput ];
-    installFlags = "sdkdir=\${out}/include/xorg";
+    installFlags = "sdkdir=\${dev}/include/xorg";
   };
 
   xf86inputsynaptics = attrs: attrs // {

pkgs/tools/admin/fastlane/Gemfile.lock

@@ -24,7 +24,7 @@ GEM
     faraday_middleware (0.12.2)
       faraday (>= 0.7.4, < 1.0)
     fastimage (2.1.0)
-    fastlane (2.61.0)
+    fastlane (2.62.1)
       CFPropertyList (>= 2.3, < 3.0.0)
       addressable (>= 2.3, < 3.0.0)
       babosa (>= 1.0.2, < 2.0.0)
@@ -65,9 +65,9 @@ GEM
       mime-types (~> 3.0)
       representable (~> 3.0)
       retriable (>= 2.0, < 4.0)
-    googleauth (0.5.3)
+    googleauth (0.6.1)
       faraday (~> 0.12)
-      jwt (~> 1.4)
+      jwt (>= 1.4, < 3.0)
       logging (~> 2.0)
       memoist (~> 0.12)
       multi_json (~> 1.11)
@@ -78,7 +78,7 @@ GEM
       domain_name (~> 0.5)
     httpclient (2.8.3)
     json (2.1.0)
-    jwt (1.5.6)
+    jwt (2.1.0)
     little-plugger (1.1.4)
     logging (2.2.2)
       little-plugger (~> 1.1)
@@ -112,21 +112,21 @@ GEM
     terminal-notifier (1.8.0)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
-    tty-screen (0.5.0)
+    tty-screen (0.5.1)
     uber (0.1.0)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.4)
     unicode-display_width (1.3.0)
     word_wrap (1.0.0)
-    xcodeproj (1.5.2)
+    xcodeproj (1.5.3)
       CFPropertyList (~> 2.3.3)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
       nanaimo (~> 0.2.3)
     xcpretty (0.2.8)
       rouge (~> 2.0.7)
-    xcpretty-travis-formatter (0.0.4)
+    xcpretty-travis-formatter (1.0.0)
       xcpretty (~> 0.2, >= 0.0.7)
 
 PLATFORMS

pkgs/tools/admin/fastlane/gemset.nix

@@ -137,10 +137,10 @@
     dependencies = ["CFPropertyList" "addressable" "babosa" "colored" "commander-fastlane" "dotenv" "excon" "faraday" "faraday-cookie_jar" "faraday_middleware" "fastimage" "gh_inspector" "google-api-client" "highline" "json" "mini_magick" "multi_json" "multi_xml" "multipart-post" "plist" "public_suffix" "rubyzip" "security" "slack-notifier" "terminal-notifier" "terminal-table" "tty-screen" "word_wrap" "xcodeproj" "xcpretty" "xcpretty-travis-formatter"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0n73748vw7y29ycx0rjdg9zvn8xhncq07zq1l4a16n5s82rb14iy";
+      sha256 = "1r6ci3rkrzsdk8cbxidzcjv94hbwq7ljwvm5whgxb8lcxcfl696k";
       type = "gem";
     };
-    version = "2.61.0";
+    version = "2.62.1";
   };
   gh_inspector = {
     source = {
@@ -163,10 +163,10 @@
     dependencies = ["faraday" "jwt" "logging" "memoist" "multi_json" "os" "signet"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1xpmvrzhczak25nm0k3r9aa083lmfnzi94mir3g1xyrgzz66vxli";
+      sha256 = "13laklpf99m3qzq9n3vnc9dblgw7q05n1r16jlxsh4lxlaijr0sf";
       type = "gem";
     };
-    version = "0.5.3";
+    version = "0.6.1";
   };
   highline = {
     source = {
@@ -204,10 +204,10 @@
   jwt = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "124zz1142bi2if7hl5pcrcamwchv4icyr5kaal9m2q6wqbdl6aw4";
+      sha256 = "1w0kaqrbl71cq9sbnixc20x5lqah3hs2i93xmhlfdg2y3by7yzky";
       type = "gem";
     };
-    version = "1.5.6";
+    version = "2.1.0";
   };
   little-plugger = {
     source = {
@@ -393,10 +393,10 @@
   tty-screen = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "005rpl9l1r9i7wypb4kv057y01fxqvanznx62msx6z451cfjsfn3";
+      sha256 = "12qkjwpkgznvhwbywq2y7l5mcq2f4z404b0ip7xm4byg3827lh4h";
       type = "gem";
     };
-    version = "0.5.0";
+    version = "0.5.1";
   };
   uber = {
     source = {
@@ -443,10 +443,10 @@
     dependencies = ["CFPropertyList" "claide" "colored2" "nanaimo"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0v40167wxhjfczjqp7axvblivrzgbmqldaj9vb15pw45qh6xly51";
+      sha256 = "1gvnd5ixa4wbn1cpc6jp6i9z0dxhcwlxny47irzbr6zr8wpj3ww7";
       type = "gem";
     };
-    version = "1.5.2";
+    version = "1.5.3";
   };
   xcpretty = {
     dependencies = ["rouge"];
@@ -461,9 +461,9 @@
     dependencies = ["xcpretty"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1wn5pcxja1jkc8y5b6s3pks5inc1vmjkq7fqmlbkl39z8l1vdis2";
+      sha256 = "15b5c0lxz2blmichfdlabzlbyw5nlh1ci898pxwb661m9bahz3ml";
       type = "gem";
     };
-    version = "0.0.4";
+    version = "1.0.0";
   };
 }

pkgs/tools/admin/fastlane/update

@@ -0,0 +1,10 @@
+#!/usr/bin/env nix-shell
+#! nix-shell -i bash -p bash ruby bundler bundix
+
+rm Gemfile.lock
+bundler install
+bundix
+
+if [ "clean" == "$1" ]; then
+  rm -r ~/.gem
+fi

pkgs/tools/backup/borg/default.nix

@@ -1,14 +1,14 @@
-{ stdenv, fetchurl, python3Packages, acl, lz4, openssl }:
+{ stdenv, fetchurl, python3Packages, acl, lz4, openssl, openssh }:
 
 python3Packages.buildPythonApplication rec {
   name = "borgbackup-${version}";
-  version = "1.1.0";
+  version = "1.1.1";
   namePrefix = "";
 
   src = fetchurl {
     url = "https://github.com/borgbackup/borg/releases/download/"
       + "${version}/${name}.tar.gz";
-    sha256 = "0vwyg0b4kxb0rspqwhvgi5c78dzimgkydf03wif27a40qhh1235l";
+    sha256 = "0iik5lq349cl87imlwra2pp0j36wjhpn8r1d3778azvvqpyjq2d5";
   };
 
   nativeBuildInputs = with python3Packages; [
@@ -27,6 +27,10 @@ python3Packages.buildPythonApplication rec {
     export BORG_LZ4_PREFIX="${lz4.dev}"
   '';
 
+  makeWrapperArgs = [
+    ''--prefix PATH ':' "${openssh}/bin"''
+  ];
+
   postInstall = ''
     make -C docs singlehtml
     mkdir -p $out/share/doc/borg
@@ -45,6 +49,6 @@ python3Packages.buildPythonApplication rec {
     homepage = https://borgbackup.github.io/;
     license = licenses.bsd3;
     platforms = platforms.unix; # Darwin and FreeBSD mentioned on homepage
-    maintainers = with maintainers; [ nckx ];
+    maintainers = with maintainers; [ nckx flokli ];
   };
 }

pkgs/tools/inputmethods/skk/skktools/default.nix

@@ -0,0 +1,45 @@
+{ stdenv, fetchFromGitHub, pkgconfig, gdbm, glib }:
+
+# Note (2017-10-24, yuriaisaka):
+# - Version 1.3.3 dates from Jul. 19, 2013.
+# - The latest commit to the github repo dates from Mar. 05, 2017
+# - The repo since appears to have become a kitchen sink place to keep
+#   misc tools to handle SKK dictionaries, and these tools have runtime
+#   dependencies on a Ruby interpreter etc.
+# - We for the moment do not package them to keep the dependencies slim.
+#   Probably, shall package the newer tools as skktools-extra in the future.
+stdenv.mkDerivation rec {
+  name = "skktools-${version}";
+  version = "1.3.3";
+  src = fetchFromGitHub {
+    owner = "skk-dev";
+    repo = "skktools";
+    rev = "c8816fe720604d4fd79f3552e99e0430ca6f2769";
+    sha256 = "11v1i5gkxvfsipigc1w1m16ijzh85drpl694kg6ih4jfam1q4vdh";
+  };
+  # # See "12.2. Package naming"
+  # name = "skktools-unstable-${version}";
+  # version = "2017-03-05";
+  # src = fetchFromGitHub {
+  #   owner = "skk-dev";
+  #   repo = "skktools";
+  #   rev = "e14d98e734d2fdff611385c7df65826e94d929db";
+  #   sha256 = "1k9zxqybl1l5h0a8px2awc920qrdyp1qls50h3kfrj3g65d08aq2";
+  # };
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ gdbm glib ];
+
+  meta = {
+    description = "A collection of tools to edit SKK dictionaries";
+    longDescription = ''
+      This package provides a collection of tools to manipulate
+      (merge, sort etc.) the dictionaries formatted for SKK Japanese
+      input method.
+    '';
+    homepage = https://github.com/skk-dev/skktools;
+    license = stdenv.lib.licenses.gpl2Plus;
+    maintainers = with stdenv.lib.maintainers; [ yuriaisaka ];
+    platforms = with stdenv.lib.platforms; linux ++ darwin;
+  };
+}

pkgs/tools/misc/arp-scan/default.nix

@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
       Arp-scan is a command-line tool that uses the ARP protocol to discover
       and fingerprint IP hosts on the local network.
     '';
-    homepage = http://www.nta-monitor.com/tools-resources/security-tools/arp-scan;
+    homepage = http://www.nta-monitor.com/wiki/index.php/Arp-scan_Documentation;
     license = licenses.gpl3;
     platforms = platforms.linux;
     maintainers = [ maintainers.bjornfor ];

pkgs/tools/misc/fd/default.nix

@@ -2,18 +2,23 @@
 
 rustPlatform.buildRustPackage rec {
   name = "fd-${version}";
-  version = "4.0.0";
+  version = "5.0.0";
 
   src = fetchFromGitHub {
     owner = "sharkdp";
     repo = "fd";
     rev = "v${version}";
-    sha256 = "1aw4pgsmvzzqlvbxzv5jnw42nf316qfhvr50b58iqi2dxy8z8cmv";
+    sha256 = "17y2fr3faaf32lv171ppkgi55v5zxq97jiilsgmjcn00rd9i6v0j";
   };
 
-  cargoSha256 = "1v9wg4dq4c7i85bkdhd79bj8gx7200z6np05wsyj2ycbv97p095j";
+  cargoSha256 = "17f4plyj6mnz0d9f4ykgbmddsdp6c3f6q4kmgj406p49xsf0jjkc";
 
-  meta = {
+  preFixup = ''
+    mkdir -p "$out/man/man1"
+    cp "$src/doc/fd.1" "$out/man/man1"
+  '';
+
+  meta = with stdenv.lib; {
     description = "A simple, fast and user-friendly alternative to find";
     longDescription = ''
       `fd` is a simple, fast and user-friendly alternative to `find`.
@@ -22,7 +27,7 @@ rustPlatform.buildRustPackage rec {
       it provides sensible (opinionated) defaults for 80% of the use cases.
     '';
     homepage = "https://github.com/sharkdp/fd";
-    license = stdenv.lib.licenses.mit;
+    license = with licenses; [ asl20 /* or */ mit ];
-    platforms = stdenv.lib.platforms.all;
+    platforms = platforms.all;
   };
 }

pkgs/tools/networking/i2p/default.nix

@@ -27,10 +27,10 @@ let wrapper = stdenv.mkDerivation rec {
 in
 
 stdenv.mkDerivation rec {
-  name = "i2p-0.9.30";
+  name = "i2p-0.9.31";
   src = fetchurl {
     url = "https://github.com/i2p/i2p.i2p/archive/${name}.tar.gz";
-    sha256 = "03hrirmah3ba9ygql487jy233nsxkfjyz82mmyppazi0mcgiass1";
+    sha256 = "1v2my5jqcj8zidxij34h0lpa533rr6ianzz8yld01sxi6gg41w28";
   };
   buildInputs = [ jdk ant gettext which ];
   patches = [ ./i2p.patch ];

pkgs/tools/networking/pptp/default.nix

@@ -12,12 +12,12 @@ stdenv.mkDerivation rec {
   patchPhase =
     ''
       sed -e 's/install -o root/install/' -i Makefile
-      sed -e 's,/bin/ip,${iproute}/sbin/ip,' -i routing.c
     '';
   preConfigure =
     ''
-      makeFlagsArray=( PPPD=${ppp}/sbin/pppd BINDIR=$out/sbin \
+      makeFlagsArray=( IP=${iproute}/bin/ip PPPD=${ppp}/sbin/pppd \
-          MANDIR=$out/share/man/man8 PPPDIR=$out/etc/ppp )
+                       BINDIR=$out/sbin MANDIR=$out/share/man/man8 \
+                       PPPDIR=$out/etc/ppp )
     '';
 
   nativeBuildInputs = [ perl which ];

pkgs/tools/package-management/dpkg/default.nix

@@ -1,12 +1,12 @@
-{ stdenv, fetchurl, perl, zlib, bzip2, xz, makeWrapper }:
+{ stdenv, fetchurl, perl, zlib, bzip2, xz, makeWrapper, coreutils }:
 
 stdenv.mkDerivation rec {
   name = "dpkg-${version}";
-  version = "1.18.24";
+  version = "1.19.0.4";
 
   src = fetchurl {
     url = "mirror://debian/pool/main/d/dpkg/dpkg_${version}.tar.xz";
-    sha256 = "1d6p22vk1b9v16q96mwaz9w2xr4ly28yamkh49md9gq67qfhhlyq";
+    sha256 = "02lrwrkl2g1jwj71088rwswx07a1zq1jkq7193lbvy8jj2qnp9lq";
   };
 
   configureFlags = [
@@ -31,6 +31,24 @@ stdenv.mkDerivation rec {
     done
   '';
 
+  patchPhase = ''
+    patchShebangs .
+
+    # Dpkg commands sometimes calls out to shell commands
+    substituteInPlace lib/dpkg/dpkg.h \
+       --replace '"dpkg-deb"' \"$out/bin/dpkg-deb\" \
+       --replace '"dpkg-split"' \"$out/bin/dpkg-split\" \
+       --replace '"dpkg-query"' \"$out/bin/dpkg-query\" \
+       --replace '"dpkg-divert"' \"$out/bin/dpkg-divert\" \
+       --replace '"dpkg-statoverride"' \"$out/bin/dpkg-statoverride\" \
+       --replace '"dpkg-trigger"' \"$out/bin/dpkg-trigger\" \
+       --replace '"dpkg"' \"$out/bin/dpkg\" \
+       --replace '"debsig-verify"' \"$out/bin/debsig-verify\" \
+       --replace '"rm"' \"${coreutils}/bin/rm\" \
+       --replace '"cat"' \"${coreutils}/bin/cat\" \
+       --replace '"diff"' \"${coreutils}/bin/diff\"
+  '';
+
   buildInputs = [ perl zlib bzip2 xz ];
   nativeBuildInputs = [ makeWrapper ];
 

pkgs/tools/package-management/nixops/default.nix

@@ -1,9 +1,9 @@
 { callPackage, fetchurl }:
 
 callPackage ./generic.nix (rec {
-  version = "1.5.1";
+  version = "1.5.2";
   src = fetchurl {
     url = "http://nixos.org/releases/nixops/nixops-${version}/nixops-${version}.tar.bz2";
-    sha256 = "0pba9c8ya4hvqmg458p74g69hb06lh0f5bsgw7dsi8pjrcb0624g";
+    sha256 = "00y2arc5rffvy6xmx4p6ibpjyc61k8dkiabq7ccwwjgckz1d2dpb";
   };
 })

pkgs/tools/security/ecdsautils/default.nix

@@ -0,0 +1,24 @@
+{ stdenv, pkgs }:
+
+stdenv.mkDerivation rec {
+  version = "0.4.0";
+  name = "ecdsautils-${version}";
+
+  src = pkgs.fetchFromGitHub {
+    owner = "tcatm";
+    repo = "ecdsautils";
+    rev = "07538893fb6c2a9539678c45f9dbbf1e4f222b46";
+    sha256 = "18sr8x3qiw8s9l5pfi7r9i3ayplz4jqdml75ga9y933vj7vs0k4d";
+  };
+
+  nativeBuildInputs = with pkgs; [ cmake pkgconfig doxygen ];
+  buildInputs = with pkgs; [ libuecc  ];
+
+  meta = with stdenv.lib; {
+    description = "Tiny collection of programs used for ECDSA (keygen, sign, verify)";
+    homepage = https://github.com/tcatm/ecdsautils/;
+    license = with licenses; [ mit bsd2 ];
+    maintainers = with maintainers; [ andir ];
+    platforms = platforms.unix;
+  };
+}

pkgs/tools/system/datefudge/default.nix

@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "datefudge";
-  version = "1.2.1";
+  version = "1.22";
   name = "${pname}-${version}";
 
   src = fetchgit {
-    sha256 = "0l83kn6c3jr3wzs880zfa64rw81cqjjk55gjxz71rjf2balp64ps";
+    sha256 = "1fmd05r00wx4zc90lbi804jl7xwdl11jq2a1kp5lqimk3yyvfw4c";
     url = "git://anonscm.debian.org/users/robert/datefudge.git";
-    rev = "cd141c63bebe9b579109b2232b5e83db18f222c2";
+    rev = "fe27db47a0f250fb56164114fff8ae8d5af47ab6";
   };
 
   patchPhase = ''

pkgs/tools/text/a2ps/default.nix

@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
       (page number, printing date, file name or supplied header), line numbering, symbol substitution as
       well as pretty printing for a wide range of programming languages.
     '';
-    homepage = http://www.inf.enst.fr/~demaille/a2ps/index.html;
+    homepage = https://www.gnu.org/software/a2ps/;
     license = licenses.gpl3Plus;
     maintainers = [ maintainers.bennofs ];
     platforms = platforms.linux;

pkgs/tools/typesetting/sshlatex/default.nix

@@ -0,0 +1,38 @@
+{ stdenv, fetchFromGitHub, inotify-tools, openssh, perl, gnutar, bash, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  name = "sshlatex-${version}";
+  version = "0.7";
+
+  src = fetchFromGitHub {
+    owner = "iblech";
+    repo = "sshlatex";
+    rev = "${version}";
+    sha256 = "02h81i8n3skg9jnlfrisyg5bhqicrn6svq64kp20f70p64s3d7ix";
+  };
+
+  buildInputs = [ makeWrapper ];
+
+  installPhase = let
+    binPath = stdenv.lib.makeBinPath [ openssh perl gnutar bash inotify-tools ];
+  in ''
+    mkdir -p $out/bin
+    cp sshlatex $out/bin
+    wrapProgram $out/bin/sshlatex --prefix PATH : "${binPath}"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A collection of hacks to efficiently run LaTeX via ssh";
+    longDescription = ''
+      sshlatex is a tool which uploads LaTeX source files to a remote, runs
+      LaTeX there, and streams the resulting PDF file to the local host.
+      Because sshlatex prestarts LaTeX with the previous run's preamble,
+      thereby preloading the required LaTeX packages, it is also useful in a
+      purely local setting.
+    '';
+    homepage = https://github.com/iblech/sshlatex;
+    license = stdenv.lib.licenses.gpl3Plus;  # actually dual-licensed gpl3Plus | lppl13cplus
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [ maintainers.iblech ];
+  };
+}