Merge staging into staging-next

nixos/modules/services/networking/iwd.nix

@@ -20,14 +20,7 @@ in {
 
     services.dbus.packages = [ pkgs.iwd ];
 
-    systemd.services.iwd = {
+    systemd.packages = [ pkgs.iwd ];
-      description = "Wireless daemon";
-      before = [ "network.target" ];
-      wants = [ "network.target" ];
-      wantedBy = [ "multi-user.target" ];
-
-      serviceConfig.ExecStart = "${pkgs.iwd}/libexec/iwd";
-    };
 
     systemd.tmpfiles.rules = [
       "d /var/lib/iwd 0700 root root -"

nixos/tests/netdata.nix

@@ -20,6 +20,9 @@ import ./make-test.nix ({ pkgs, ...} : {
 
     $netdata->waitForUnit("netdata.service");
 
+    # wait for the service to listen before sending a request
+    $netdata->waitForOpenPort(19999);
+
     # check if the netdata main page loads.
     $netdata->succeed("curl --fail http://localhost:19999/");
 

nixos/tests/networking.nix

@@ -448,8 +448,8 @@ let
 
       testScript = ''
         my $targetList = <<'END';
-        tap0: tap UNKNOWN_FLAGS:800 user 0
+        tap0: tap persist user 0
-        tun0: tun UNKNOWN_FLAGS:800 user 0
+        tun0: tun persist user 0
         END
 
         # Wait for networking to come up
@@ -552,15 +552,15 @@ let
 
       testScript = ''
         my $targetIPv4Table = <<'END';
-        10.0.0.0/16 scope link mtu 1500 
+        10.0.0.0/16 proto static scope link mtu 1500 
         192.168.1.0/24 proto kernel scope link src 192.168.1.2 
-        192.168.2.0/24 via 192.168.1.1 
+        192.168.2.0/24 via 192.168.1.1 proto static 
         END
 
         my $targetIPv6Table = <<'END';
         2001:1470:fffd:2097::/64 proto kernel metric 256 pref medium
-        2001:1470:fffd:2098::/64 via fdfd:b3f0::1 metric 1024 pref medium
+        2001:1470:fffd:2098::/64 via fdfd:b3f0::1 proto static metric 1024 pref medium
-        fdfd:b3f0::/48 metric 1024 pref medium
+        fdfd:b3f0::/48 proto static metric 1024 pref medium
         END
 
         $machine->start;

pkgs/applications/altcoins/nano-wallet/default.nix

@@ -3,13 +3,13 @@
 stdenv.mkDerivation rec {
 
   name = "nano-wallet-${version}";
-  version = "14.2";
+  version = "15.2";
 
   src = fetchFromGitHub {
     owner = "nanocurrency";
     repo = "raiblocks";
     rev = "V${version}";
-    sha256 = "0jbv5a8sz403a1pqcgl32idk6y0z510h7ikjg1dcxla0rsch6ipl";
+    sha256 = "0ngsnaczw5y709zk52flp6m2c83q3kxfgz0bzi8rzfjxp10ncnz3";
     fetchSubmodules = true;
   };
 

pkgs/applications/audio/mixxx/default.nix

@@ -1,34 +1,24 @@
-{ stdenv, fetchurl, chromaprint, fetchpatch, fftw, flac, faad2, mp4v2
+{ stdenv, fetchFromGitHub, chromaprint, fetchpatch, fftw, flac, faad2, mp4v2
 , libid3tag, libmad, libopus, libshout, libsndfile, libusb1, libvorbis
 , pkgconfig, portaudio, portmidi, protobuf, qt4, rubberband, scons, sqlite
-, taglib, vampSDK
+, taglib, upower, vampSDK
 }:
 
 stdenv.mkDerivation rec {
   name = "mixxx-${version}";
-  version = "2.0.0";
+  version = "2.1.3";
 
-  src = fetchurl {
+  src = fetchFromGitHub {
-    url = "https://downloads.mixxx.org/${name}/${name}-src.tar.gz";
+    owner = "mixxxdj";
-    sha256 = "0vb71w1yq0xwwsclrn2jj9bk8w4n14rfv5c0aw46c11mp8xz7f71";
+    repo = "mixxx";
+    rev = "release-${version}";
+    sha256 = "1fm8lkbnxka4haidf6yr8mb3r6vaxmc97hhrp8pcx0fvq2mnzvy2";
   };
 
-  patches = [
-    (fetchpatch {
-      url = "https://sources.debian.net/data/main/m/mixxx/2.0.0~dfsg-7.1/debian/patches/0007-fix_gcc6_issue.patch";
-      sha256 = "0kpyv10wcjcvbijk6vpq54gx9sqzrq4kq2qilc1czmisp9qdy5sd";
-    })
-    (fetchpatch {
-      url = "https://622776.bugs.gentoo.org/attachment.cgi?id=487284";
-      name = "sqlite.patch";
-      sha256 = "1qqbd8nrxrjcc1dwvyqfq1k2yz3l071sfcgd2dmpk6j8d4j5kx31";
-    })
- ];
-
   buildInputs = [
     chromaprint fftw flac faad2 mp4v2 libid3tag libmad libopus libshout libsndfile
     libusb1 libvorbis pkgconfig portaudio portmidi protobuf qt4
-    rubberband scons sqlite taglib vampSDK
+    rubberband scons sqlite taglib upower vampSDK
   ];
 
   sconsFlags = [
@@ -56,7 +46,7 @@ stdenv.mkDerivation rec {
     homepage = https://mixxx.org;
     description = "Digital DJ mixing software";
     license = licenses.gpl2Plus;
-    maintainers = [ maintainers.aszlig maintainers.goibhniu ];
+    maintainers = [ maintainers.aszlig maintainers.goibhniu maintainers.bfortz ];
     platforms = platforms.linux;
   };
 }

pkgs/applications/misc/calibre/default.nix

@@ -5,12 +5,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "3.29.0";
+  version = "3.30.0";
   name = "calibre-${version}";
 
   src = fetchurl {
     url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz";
-    sha256 = "1r29vi8j51r0nnzpjbg34ryvizzkn31sq1iz7z748wjfgr87wmyh";
+    sha256 = "0j7w63kniqnpr8v1aldzbim2dyrk79n23mzw9y56jqd0k47m8zfz";
   };
 
   patches = [

pkgs/applications/misc/subsurface/default.nix

@@ -4,14 +4,14 @@
 }:
 
 let
-  version = "4.7.5";
+  version = "4.8.1";
 
   libdc = stdenv.mkDerivation rec {
     name = "libdivecomputer-ssrf-${version}";
 
     src = fetchurl {
       url = "https://subsurface-divelog.org/downloads/libdivecomputer-subsurface-branch-${version}.tgz";
-      sha256 = "1xsgnmgc7yb46lflx8ynkbdxg2f6sny6xg6caqgx7rf0x1jmjj4x";
+      sha256 = "1x6z08gfp9jldv7vcsdasjcarns43qns9cm8s9w27n0c2lvchjvy";
     };
 
     nativeBuildInputs = [ autoreconfHook ];
@@ -70,7 +70,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://subsurface-divelog.org/downloads/Subsurface-${version}.tgz";
-    sha256 = "0qqmnrmj2alr4rc2nqkv8sbdp92xb6j4j468wn6yqvgb23n77b82";
+    sha256 = "0758sw05gjy8sckvaqc0hmbh2kibmzapgp0hlk8rsp1vsldq4vd2";
   };
 
   buildInputs = [

pkgs/applications/misc/xkbd/default.nix

@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub, freetype, libXrender, libXft, xextproto
+, xinput, libXi, libXext, libXtst, libXpm, libX11, xproto, autoreconfHook
+}:
+
+stdenv.mkDerivation rec {
+  name = "xkbd-${version}";
+  version = "0.8.18";
+
+  src = fetchFromGitHub {
+    owner = "mahatma-kaganovich";
+    repo = "xkbd";
+    rev = name;
+    sha256 = "05ry6q75jq545kf6p20nhfywaqf2wdkfiyp6iwdpv9jh238hf7m9";
+  };
+
+  buildInputs = [
+    freetype libXrender libXft libXext libXtst libXpm libX11
+    libXi xextproto xinput xproto
+  ];
+
+  nativeBuildInputs = [ autoreconfHook ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/mahatma-kaganovich/xkbd;
+    description = "onscreen soft keyboard for X11";
+    license = licenses.gpl2Plus;
+    maintainers = [ maintainers.genesis ];
+    platforms = platforms.linux;
+  };
+}

pkgs/applications/networking/flexget/default.nix

@@ -36,11 +36,11 @@ with python'.pkgs;
 
 buildPythonApplication rec {
   pname = "FlexGet";
-  version = "2.14.9";
+  version = "2.14.18";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1a8nxfr0rzwwd7b0nxr7zmw04ygbqvnzbi4w4nw2w8xiy46zid3q";
+    sha256 = "1pyvm1d23qy71rg7fzxcal8978kni7sn09zw4s4dsq56g8w80ay9";
   };
 
   postPatch = ''

pkgs/applications/networking/irc/konversation/default.nix

@@ -30,13 +30,13 @@
 
 let
   pname = "konversation";
-  version = "1.7.4";
+  version = "1.7.5";
 in mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
-    sha256 = "0y4rj4fcl1wsi3y1fhnzad9nf4llwrnipfm9mfm55kqnx1zmpvqp";
+    sha256 = "0h098yhlp36ls6pdvs2r93ig8dv4fys62m0h6wxccprb0qrpbgv0";
   };
 
   buildInputs = [
@@ -70,13 +70,6 @@ in mkDerivation rec {
     kdoctools
   ];
 
-  patches = [
-    (fetchpatch {
-      url = "https://cgit.kde.org/konversation.git/patch/?id=20018b3d0798421c9cb8a9d983e5a5b34bd88e8d";
-      sha256 = "0y5m5zimfhc0d1xnkzs05c8ig11lhwdn04fk76vi7966hx8wggnn";
-    })
-  ];
-
   meta = {
     description = "Integrated IRC client for KDE";
     license = with lib.licenses; [ gpl2 ];

pkgs/applications/networking/newsreaders/pan/default.nix

@@ -2,7 +2,7 @@
 , stdenv, fetchurl, pkgconfig, gtk3, gtkspell3 ? null
 , perl, gmime2, gettext, intltool, itstool, libxml2, dbus-glib, libnotify, gnutls
 , makeWrapper, gnupg
-, gnomeSupport ? true, libgnome-keyring3
+, gnomeSupport ? true, gnome3, libsecret
 }:
 
 assert spellChecking -> gtkspell3 != null;
@@ -17,10 +17,10 @@ stdenv.mkDerivation {
     sha256 = "1b4wamv33hprghcjk903bpvnd233yxyrm18qnh13alc8h1553nk8";
   };
 
-  nativeBuildInputs = [ pkgconfig makeWrapper ];
+  nativeBuildInputs = [ pkgconfig gettext intltool itstool libxml2 makeWrapper ];
-  buildInputs = [ gtk3 perl gmime2 gettext intltool itstool libxml2 dbus-glib libnotify gnutls ]
+  buildInputs = [ gtk3 gmime2 libnotify gnutls ]
     ++ stdenv.lib.optional spellChecking gtkspell3
-    ++ stdenv.lib.optional gnomeSupport libgnome-keyring3;
+    ++ stdenv.lib.optionals gnomeSupport [ libsecret gnome3.gcr ];
 
   configureFlags = [
     "--with-dbus"

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

@@ -21,7 +21,7 @@ let
 
       sagelib = self.callPackage ./sagelib.nix {
         inherit flint ecl arb;
-        inherit sage-src openblas-blas-pc openblas-cblas-pc openblas-lapack-pc pynac singular;
+        inherit sage-src pynac singular;
         linbox = nixpkgs.linbox.override { withSage = true; };
       };
 
@@ -41,13 +41,13 @@ let
       };
 
       sage-env = self.callPackage ./sage-env.nix {
-        inherit sage-src python rWrapper openblas-cblas-pc ecl singular palp flint pynac pythonEnv;
+        inherit sage-src python rWrapper ecl singular palp flint pynac pythonEnv;
         pkg-config = nixpkgs.pkgconfig; # not to confuse with pythonPackages.pkgconfig
       };
 
       sage-with-env = self.callPackage ./sage-with-env.nix {
         inherit pythonEnv;
-        inherit sage-src openblas-blas-pc openblas-cblas-pc openblas-lapack-pc pynac singular;
+        inherit sage-src pynac singular;
         pkg-config = nixpkgs.pkgconfig; # not to confuse with pythonPackages.pkgconfig
         three = nodePackages_8_x.three;
       };
@@ -60,10 +60,6 @@ let
     };
   };
 
-  openblas-blas-pc = callPackage ./openblas-pc.nix { name = "blas"; };
-  openblas-cblas-pc = callPackage ./openblas-pc.nix { name = "cblas"; };
-  openblas-lapack-pc = callPackage ./openblas-pc.nix { name = "lapack"; };
-
   sage-src = callPackage ./sage-src.nix {};
 
   pythonRuntimeDeps = with python.pkgs; [

pkgs/applications/science/math/sage/openblas-pc.nix

@@ -1,17 +0,0 @@
-{ openblasCompat
-, writeTextFile
-, name
-}:
-
-writeTextFile {
-  name = "openblas-${name}-pc-${openblasCompat.version}";
-  destination = "/lib/pkgconfig/${name}.pc";
-  text = ''
-    Name: ${name}
-    Version: ${openblasCompat.version}
-
-    Description: ${name} for SageMath, provided by the OpenBLAS package.
-    Cflags: -I${openblasCompat}/include
-    Libs: -L${openblasCompat}/lib -lopenblas
-  '';
-}

pkgs/applications/science/math/sage/sage-env.nix

@@ -37,7 +37,7 @@
 , lcalc
 , rubiks
 , flintqs
-, openblas-cblas-pc
+, openblasCompat
 , flint
 , gmp
 , mpfr
@@ -98,9 +98,9 @@ writeTextFile rec {
     export PKG_CONFIG_PATH='${lib.concatStringsSep ":" (map (pkg: "${pkg}/lib/pkgconfig") [
         # This is only needed in the src/sage/misc/cython.py test and I'm not sure if there's really a use-case
         # for it outside of the tests. However since singular and openblas are runtime dependencies anyways
-        # and openblas-cblas-pc is tiny, it doesn't really hurt to include.
+        # it doesn't really hurt to include.
         singular
-        openblas-cblas-pc
+        openblasCompat
       ])
     }'
     export SAGE_ROOT='${sage-src}'

pkgs/applications/science/math/sage/sage-src.nix

@@ -136,6 +136,13 @@ stdenv.mkDerivation rec {
       url = "https://git.sagemath.org/sage.git/patch?id2=8.4.beta0&id=8bef4fd2876a61969b516fe4eb3b8ad7cc076c5e";
       sha256 = "00p3hfsfn3w2vxgd9fjd23mz7xfxjfravf8ysjxkyd657jbkpjmk";
     })
+
+    # https://trac.sagemath.org/ticket/26117
+    (fetchpatch {
+      name = "sympy-1.2.patch";
+      url = "https://git.sagemath.org/sage.git/patch?id2=8.4.beta2&id=d94a0a3a3fb4aec05a6f4d95166d90c284f05c36";
+      sha256 = "0an2xl1pp3jg36kgg2m1vb7sns7rprk1h3d0qy1gxwdab6i7qnvi";
+    })
   ];
 
   patches = nixPatches ++ packageUpgradePatches ++ [

pkgs/applications/science/math/sage/sage-with-env.nix

@@ -4,9 +4,6 @@
 , sage-env
 , sage-src
 , openblasCompat
-, openblas-blas-pc
-, openblas-cblas-pc
-, openblas-lapack-pc
 , pkg-config
 , three
 , singular
@@ -32,9 +29,6 @@ let
     makeWrapper
     pkg-config
     openblasCompat # lots of segfaults with regular (64 bit) openblas
-    openblas-blas-pc
-    openblas-cblas-pc
-    openblas-lapack-pc
     singular
     three
     pynac

pkgs/applications/science/math/sage/sagelib.nix

@@ -3,9 +3,6 @@
 , buildPythonPackage
 , arb
 , openblasCompat
-, openblas-blas-pc
-, openblas-cblas-pc
-, openblas-lapack-pc
 , brial
 , cliquer
 , cypari2
@@ -59,9 +56,7 @@ buildPythonPackage rec {
   nativeBuildInputs = [
     iml
     perl
-    openblas-blas-pc
+    openblasCompat
-    openblas-cblas-pc
-    openblas-lapack-pc
     jupyter_core
   ];
 

pkgs/applications/science/molecular-dynamics/lammps/default.nix

@@ -1,25 +1,37 @@
-{ stdenv, writeText, fetchurl,
+{ lib
-  libpng, fftw,
+, bash
-  mpiSupport ? false, mpi ? null
+, stdenv
+, writeText
+, fetchFromGitHub
+, libpng
+, gzip
+, fftw
+, openblas
+, mpiSupport ? false, mpi ? null
 }:
 
 assert mpiSupport -> mpi != null;
 
 stdenv.mkDerivation rec {
   # LAMMPS has weird versioning converted to ISO 8601 format
-  version = "2016-02-16";
+  version = "patch_2Aug2018";
   name = "lammps-${version}";
 
-  src = fetchurl {
+  lammps_packages = "asphere body class2 colloid compress coreshell dipole granular kspace manybody mc misc molecule opt peri qeq replica rigid shock snap srd user-reaxc";
-    url = "mirror://sourceforge/lammps/lammps-16Feb16.tar.gz";
+  lammps_includes = "-DLAMMPS_EXCEPTIONS -DLAMMPS_GZIP -DLAMMPS_MEMALIGN=64";
-    sha256 = "1yzfbkxma3xa1288rnn66h4w0smbmjkwq1fx1y60pjiw0prmk105";
+
+  src = fetchFromGitHub {
+    owner = "lammps";
+    repo = "lammps";
+    rev = "${version}";
+    sha256 = "1ph9pr7s11wgmspmnhxa55bh1pq2cyl8iimfi62lbpbpl9pr1ilc";
   };
 
   passthru = {
     inherit mpi;
   };
 
-  buildInputs = [ fftw libpng ]
+  buildInputs = [ fftw libpng openblas gzip bash ]
   ++ (stdenv.lib.optionals mpiSupport [ mpi ]);
 
   # Must do manual build due to LAMMPS requiring a seperate build for
@@ -27,13 +39,19 @@ stdenv.mkDerivation rec {
   builder = writeText "builder.sh" ''
     source $stdenv/setup
 
-    tar xzf $src
+    mkdir lammps
-    cd lammps-*/src
+    cp -r $src/lib $src/src lammps
-    make mode=exe ${if mpiSupport then "mpi" else "serial"} SHELL=$SHELL LMP_INC="-DLAMMPS_GZIP -DLAMMPS_PNG" FFT_PATH=-DFFT_FFTW3 FFT_LIB=-lfftw3 JPG_LIB=-lpng
+    chmod -R 755 lammps/src/
-    make mode=shlib ${if mpiSupport then "mpi" else "serial"} SHELL=$SHELL LMP_INC="-DLAMMPS_GZIP -DLAMMPS_PNG" FFT_PATH=-DFFT_FFTW3 FFT_LIB=-lfftw3 JPG_LIB=-lpng
+    cd lammps/src
+    for pack in ${lammps_packages}; do make "yes-$pack" SHELL=$SHELL; done
+    make mode=exe ${if mpiSupport then "mpi" else "serial"} SHELL=$SHELL LMP_INC="${lammps_includes}" FFT_PATH=-DFFT_FFTW3 FFT_LIB=-lfftw3 JPG_LIB=-lpng
+    make mode=shlib ${if mpiSupport then "mpi" else "serial"} SHELL=$SHELL LMP_INC="${lammps_includes}" FFT_PATH=-DFFT_FFTW3 FFT_LIB=-lfftw3 JPG_LIB=-lpng
 
     mkdir -p $out/bin
-    cp -v lmp_* $out/bin/lammps
+    cp -v lmp_* $out/bin/
+
+    mkdir -p $out/include
+    cp -v *.h $out/include/
 
     mkdir -p $out/lib
     cp -v liblammps* $out/lib/
@@ -51,5 +69,6 @@ stdenv.mkDerivation rec {
     homepage = http://lammps.sandia.gov;
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.linux;
+    maintainers = with lib.maintainers; [ costrouc ];
   };
 }

pkgs/applications/video/clipgrab/default.nix

@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "clipgrab-${version}";
-  version = "3.6.8";
+  version = "3.6.9";
 
   src = fetchurl {
-    sha256 = "0agp97g79mlqcwfz2xk5rdxw4kx0hm92xikdspbpxlfji1mkh10p";
+    sha256 = "16r0h286vqw1bns29sx5x2919pj3y8gxf1k7dpf9xrz0vm2zrc3v";
     # The .tar.bz2 "Download" link is a binary blob, the source is the .tar.gz!
     url = "https://download.clipgrab.org/${name}.tar.gz";
   };

pkgs/desktops/gnome-3/core/gnome-desktop/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libxslt, which, libX11, gnome3, gtk3, glib
+{ stdenv, fetchurl, substituteAll, pkgconfig, libxslt, which, libX11, gnome3, gtk3, glib
 , intltool, libxml2, xkeyboard_config, isocodes, itstool, wayland
 , libseccomp, bubblewrap, gobjectIntrospection, gtk-doc, docbook_xsl }:
 
@@ -30,18 +30,16 @@ stdenv.mkDerivation rec {
   propagatedBuildInputs = [ gnome3.gsettings-desktop-schemas ];
 
   patches = [
-    ./bubblewrap-paths.patch
+    (substituteAll {
+      src = ./bubblewrap-paths.patch;
+      BUBBLEWRAP_BIN = "${bubblewrap}/bin/bwrap";
+    })
   ];
 
   configureFlags = [
     "--enable-gtk-doc"
   ];
 
-  postPatch = ''
-    substituteInPlace libgnome-desktop/gnome-desktop-thumbnail-script.c --subst-var-by \
-      BUBBLEWRAP_BIN "${bubblewrap}/bin/bwrap"
-  '';
-
   passthru = {
     updateScript = gnome3.updateScript {
       packageName = "gnome-desktop";

pkgs/desktops/gnome-3/core/gnome-keyring/default.nix

@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, pkgconfig, dbus, libgcrypt, libtasn1, pam, python2, glib, libxslt
+{ stdenv, fetchurl, pkgconfig, dbus, libgcrypt, pam, python2, glib, libxslt
-, intltool, pango, gcr, gdk_pixbuf, atk, p11-kit, openssh, wrapGAppsHook
+, gettext, gcr, libcap_ng, libselinux, p11-kit, openssh, wrapGAppsHook
-, docbook_xsl, docbook_xml_dtd_42, gnome3 }:
+, docbook_xsl, docbook_xml_dtd_43, gnome3 }:
 
 stdenv.mkDerivation rec {
   name = "gnome-keyring-${version}";
@@ -11,21 +11,15 @@ stdenv.mkDerivation rec {
     sha256 = "0sk4las4ji8wv9nx8mldzqccmpmkvvr9pdwv9imj26r10xyin5w1";
   };
 
-  passthru = {
-    updateScript = gnome3.updateScript { packageName = "gnome-keyring"; attrPath = "gnome3.gnome-keyring"; };
-  };
-
   outputs = [ "out" "dev" ];
 
-  buildInputs = with gnome3; [
+  buildInputs = [
-    dbus libgcrypt pam gtk3 libgnome-keyring openssh
+    glib libgcrypt pam openssh libcap_ng libselinux
-    pango gcr gdk_pixbuf atk p11-kit
+    gcr p11-kit
   ];
 
-  propagatedBuildInputs = [ glib libtasn1 libxslt ];
-
   nativeBuildInputs = [
-    pkgconfig intltool docbook_xsl docbook_xml_dtd_42 wrapGAppsHook
+    pkgconfig gettext libxslt docbook_xsl docbook_xml_dtd_43 wrapGAppsHook
   ];
 
   configureFlags = [
@@ -48,6 +42,13 @@ stdenv.mkDerivation rec {
       make check
   '';
 
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = "gnome-keyring";
+      attrPath = "gnome3.gnome-keyring";
+    };
+  };
+
   meta = with stdenv.lib; {
     description = "Collection of components in GNOME that store secrets, passwords, keys, certificates and make them available to applications";
     homepage = https://wiki.gnome.org/Projects/GnomeKeyring;

pkgs/desktops/xfce4-13/xfce4-settings/default.nix

@@ -1,4 +1,4 @@
-{ mkXfceDerivation, automakeAddFlags, dbus-glib, exo, garcon, gtk3
+{ mkXfceDerivation, automakeAddFlags, exo, garcon, gtk3
 , libnotify ? null, libxfce4ui, libxfce4util, libxklavier ? null
 , upower ? null, xfconf, xf86inputlibinput ? null }:
 
@@ -19,7 +19,6 @@ mkXfceDerivation rec {
   nativeBuildInputs = [ automakeAddFlags ];
 
   buildInputs = [
-    dbus-glib
     exo
     garcon
     gtk3

pkgs/development/compilers/elm/default.nix

@@ -1,14 +1,56 @@
-{ lib, stdenv, buildEnv, haskell, nodejs, fetchurl, makeWrapper }:
+{ lib, stdenv, buildEnv, haskell, nodejs, fetchurl, makeWrapper, git }:
 
 # To update:
-# 1) Update versions in ./update-elm.rb and run it.
+
-# 2) Checkout elm-reactor and run `elm-package install -y` inside.
+# 1) Modify ./update.sh and run it
-# 3) Run ./elm2nix.rb in elm-reactor's directory.
+
-# 4) Move the resulting 'package.nix' to 'packages/elm-reactor-elm.nix'.
+# 2) to generate versions.dat:
+# 2.1) git clone https://github.com/elm/compiler.git
+# 2.2) cd compiler
+# 2.3) cabal2nix --shell . | sed 's/"default",/"ghc822",/' > shell.nix
+# 2.4) nix-shell
+# 2.5) mkdir .elm
+# 2.6) export ELM_HOME=$(pwd)/.elm
+# 2.7) cabal build
+# 2.8) cp .elm/0.19.0/package/versions.dat ...
+
+# 3) generate a template for elm-elm.nix with:
+# (
+#   echo "{";
+#   jq '.dependencies | .direct, .indirect | to_entries | .[] | { (.key) : { version : .value, sha256:  "" } } ' \
+#   < ui/browser/elm.json \
+#   | sed 's/:/ =/' \
+#   | sed 's/^[{}]//' \
+#   | sed -E 's/(["}]),?$/\1;/' \
+#   | sed -E 's/"(version|sha256)"/\1/' \
+#   | grep -v '^$';
+#   echo "}"
+# )
+#
+# ... then fill in the sha256s
+
+# Notes:
+
+# the elm binary embeds a piece of pre-compiled elm code, used by 'elm
+# reactor'. this means that the build process for 'elm' effectively
+# executes 'elm make'. that in turn expects to retrieve the elm
+# dependencies of that code (elm/core, etc.) from
+# package.elm-lang.org, as well as a cached bit of metadata
+# (versions.dat).
+
+# the makeDotElm function lets us retrieve these dependencies in the
+# standard nix way. we have to copy them in (rather than symlink) and
+# make them writable because the elm compiler writes other .dat files
+# alongside the source code. versions.dat was produced during an
+# impure build of this same code; the build complains that it can't
+# update this cache, but continues past that warning.
+
+# finally, we set ELM_HOME to point to these pre-fetched artifacts so
+# that the default of ~/.elm isn't used.
 
 let
-  makeElmStuff = deps:
+  makeDotElm = ver: deps:
-    let json = builtins.toJSON (lib.mapAttrs (name: info: info.version) deps);
+    let versionsDat = ./versions.dat;
         cmds = lib.mapAttrsToList (name: info: let
                  pkg = stdenv.mkDerivation {
 
@@ -29,80 +71,61 @@ let
 
                  };
                in ''
-                 mkdir -p elm-stuff/packages/${name}
+                 mkdir -p .elm/${ver}/package/${name}
-                 ln -s ${pkg} elm-stuff/packages/${name}/${info.version}
+                 cp -R ${pkg} .elm/${ver}/package/${name}/${info.version}
                '') deps;
-    in ''
+    in (lib.concatStrings cmds) + ''
-      export HOME=/tmp
+      mkdir -p .elm/${ver}/package;
-      mkdir elm-stuff
+      cp ${versionsDat} .elm/${ver}/package/versions.dat;
-      cat > elm-stuff/exact-dependencies.json <<EOF
+      chmod -R +w .elm
-      ${json}
+    '';
-      EOF
-    '' + lib.concatStrings cmds;
 
-  hsPkgs = haskell.packages.ghc802.override {
+  hsPkgs = haskell.packages.ghc822.override {
-    overrides = self: super:
+    overrides = self: super: with haskell.lib;
-      let hlib = haskell.lib;
+      let elmPkgs = {
-          elmRelease = import ./packages/release.nix { inherit (self) callPackage; };
+            elm = overrideCabal (self.callPackage ./packages/elm.nix { }) (drv: {
-          elmPkgs' = elmRelease.packages;
+              # sadly with parallelism most of the time breaks compilation
-          elmPkgs = elmPkgs' // {
+              enableParallelBuilding = false;
-
+              preConfigure = ''
-            elm-reactor = hlib.overrideCabal elmPkgs'.elm-reactor (drv: {
+                export ELM_HOME=`pwd`/.elm
-              buildTools = drv.buildTools or [] ++ [ self.elm-make ];
+              '' + (makeDotElm "0.19.0" (import ./packages/elm-elm.nix));
-              preConfigure = makeElmStuff (import ./packages/elm-reactor-elm.nix);
-            });
-
-            elm-repl = hlib.overrideCabal elmPkgs'.elm-repl (drv: {
-              doCheck = false;
               buildTools = drv.buildTools or [] ++ [ makeWrapper ];
-              postInstall =
+              postInstall = ''
-                let bins = lib.makeBinPath [ nodejs self.elm-make ];
+                wrapProgram $out/bin/elm \
-                in ''
+                  --prefix PATH ':' ${lib.makeBinPath [ nodejs ]}
-                  wrapProgram $out/bin/elm-repl \
-                    --prefix PATH ':' ${bins}
               '';
             });
 
+
+
             /*
             This is not a core Elm package, and it's hosted on GitHub.
             To update, run:
 
                 cabal2nix --jailbreak --revision refs/tags/foo http://github.com/avh4/elm-format > packages/elm-format.nix
 
-            where foo is a tag for a new version, for example "0.3.1-alpha".
+            where foo is a tag for a new version, for example "0.8.0".
             */
-            elm-format = self.callPackage ./packages/elm-format.nix { };
+            elm-format = overrideCabal (self.callPackage ./packages/elm-format.nix {  }) (drv: {
-            elm-interface-to-json = self.callPackage ./packages/elm-interface-to-json.nix {
+              # https://github.com/avh4/elm-format/issues/529
-              aeson-pretty = self.aeson-pretty_0_7_2;
+              patchPhase = ''
-              either = hlib.overrideCabal self.either (drv :{
+                cat >Setup.hs <<EOF
-                jailbreak = true;
+                import Distribution.Simple
-                version = "4.4.1.1";
+                main = defaultMain
-                sha256 = "1lrlwqqnm6ibfcydlv5qvvssw7bm0c6yypy0rayjzv1znq7wp1xh";
+                EOF
-                libraryHaskellDepends = drv.libraryHaskellDepends or [] ++ [
+
-                  self.exceptions self.free self.mmorph self.monad-control
+                sed -i '/Build_elm_format/d' elm-format.cabal
-                  self.MonadRandom self.profunctors self.transformers
+                sed -i 's/Build_elm_format.gitDescribe/""/' src/ElmFormat/Version.hs
-                  self.transformers-base
+                sed -i '/Build_elm_format/d' src/ElmFormat/Version.hs
-                ];
+              '';
             });
           };
-          };
       in elmPkgs // {
         inherit elmPkgs;
-        elmVersion = elmRelease.version;
+        elmVersion = elmPkgs.elm.version;
-        # https://github.com/elm-lang/elm-compiler/issues/1566
+
-        indents = hlib.overrideCabal super.indents (drv: {
+        # Needed for elm-format
-          version = "0.3.3";
+        indents = self.callPackage ./packages/indents.nix {};
-          #test dep tasty has a version mismatch
-          doCheck = false;
-          sha256 = "16lz21bp9j14xilnq8yym22p3saxvc9fsgfcf5awn2a6i6n527xn";
-          libraryHaskellDepends = drv.libraryHaskellDepends ++ [super.concatenative];
-        });
       };
   };
-in hsPkgs.elmPkgs // {
+in hsPkgs.elmPkgs
-  elm = lib.hiPrio (buildEnv {
-    name = "elm-${hsPkgs.elmVersion}";
-    paths = lib.mapAttrsToList (name: pkg: pkg) hsPkgs.elmPkgs;
-    pathsToLink = [ "/bin" ];
-  });
-}

pkgs/development/compilers/elm/packages/elm-compiler.nix

@@ -1,41 +0,0 @@
-{ mkDerivation, aeson, aeson-pretty_0_7_2, ansi-terminal, ansi-wl-pprint
-, base, binary, bytestring, containers, directory, edit-distance
-, fetchgit, filemanip, filepath, HUnit, indents
-, language-ecmascript, language-glsl, mtl, parsec, pretty, process
-, QuickCheck, stdenv, test-framework, test-framework-hunit
-, test-framework-quickcheck2, text, union-find
-}:
-mkDerivation {
-  pname = "elm-compiler";
-  version = "0.18";
-  src = fetchgit {
-    url = "https://github.com/elm-lang/elm-compiler";
-    sha256 = "09fmrbfpc1kzc3p9h79w57b9qjhajdswc4jfm9gyjw95vsiwasgh";
-    rev = "eb97f2a5dd5421c708a91b71442e69d02453cc80";
-  };
-  isLibrary = true;
-  isExecutable = true;
-  libraryHaskellDepends = [
-    aeson aeson-pretty_0_7_2 ansi-terminal ansi-wl-pprint base binary
-    bytestring containers directory edit-distance filepath indents
-    language-ecmascript language-glsl mtl parsec pretty process text
-    union-find
-  ];
-  executableHaskellDepends = [
-    aeson base binary directory filepath process text
-  ];
-  testHaskellDepends = [
-    aeson aeson-pretty_0_7_2 ansi-terminal ansi-wl-pprint base binary
-    bytestring containers directory edit-distance filemanip filepath
-    HUnit indents language-ecmascript language-glsl mtl parsec pretty
-    process QuickCheck test-framework test-framework-hunit
-    test-framework-quickcheck2 text union-find
-  ];
-  jailbreak = true;
-  homepage = http://elm-lang.org;
-  description = "Values to help with elm-package, elm-make, and elm-lang.org.";
-  license = stdenv.lib.licenses.bsd3;
-  # added manually since tests are not passing
-  # https://travis-ci.org/elm-lang/elm-compiler/builds/176845852
-  doCheck = false;
-}

pkgs/development/compilers/elm/packages/elm-elm.nix

@@ -0,0 +1,50 @@
+{
+  "elm/browser" = {
+    version = "1.0.0";
+    sha256 = "1apmvyax93nvmagwj00y16zx10kfv640cxpi64xgqbgy7d2wphy4";
+  };
+  "elm/core" = {
+    version = "1.0.0";
+    sha256 = "10kr86h4v5h4p0586q406a5wbl8xvr1jyrf6097zp2wb8sv21ylw";
+  };
+  "elm/html" = {
+    version = "1.0.0";
+    sha256 = "1n3gpzmpqqdsldys4ipgyl1zacn0kbpc3g4v3hdpiyfjlgh8bf3k";
+  };
+  "elm/http" = {
+    version = "1.0.0";
+    sha256 = "1igmm89ialzrjib1j8xagkxalq1x2gj4l0hfxcd66mpwmvg7psl8";
+  };
+  "elm/json" = {
+    version = "1.0.0";
+    sha256 = "1g0hafkqf2q633r7ir9wxpb1lnlzskhpsyi0h5bkzj0gl072zfnb";
+  };
+  "elm/project-metadata-utils" = {
+    version = "1.0.0";
+    sha256 = "1d4rd4grrnbdvj9gf00h7dr6hbkjzawgkzpizfrkp1z1pyr3mvq9";
+  };
+  "elm/svg" = {
+    version = "1.0.0";
+    sha256 = "08x0v8p9wm699jjmsnbq69pxv3jh60j4f6fg7y6hyr7xxj85y390";
+  };
+  "elm-explorations/markdown" = {
+    version = "1.0.0";
+    sha256 = "0k3110ixa4wwf3vkkdplagwah9ypr965qxr1y147rnsc1xsxmr6y";
+  };
+  "elm/parser" = {
+    version = "1.0.0";
+    sha256 = "0k4zlq30lrvawqvzwbvsl0hrmwf9s832mb41z7fdspm4549dj7wc";
+  };
+  "elm/time" = {
+    version = "1.0.0";
+    sha256 = "0vch7i86vn0x8b850w1p69vplll1bnbkp8s383z7pinyg94cm2z1";
+  };
+  "elm/url" = {
+    version = "1.0.0";
+    sha256 = "0av8x5syid40sgpl5vd7pry2rq0q4pga28b4yykn9gd9v12rs3l4";
+  };
+  "elm/virtual-dom" = {
+    version = "1.0.0";
+    sha256 = "0hm8g92h7z39km325dlnhk8n00nlyjkqp3r3jppr37k2k13md6aq";
+  };
+}

pkgs/development/compilers/elm/packages/elm-format.nix

@@ -6,14 +6,12 @@
 }:
 mkDerivation {
   pname = "elm-format";
-  version = "0.7.0";
+  version = "0.8.0";
   src = fetchgit {
     url = "http://github.com/avh4/elm-format";
-    sha256 = "1snl2lrrzdwgzi68agi3sdw84aslj04pzzxpm1mam9ic6dzhn3jf";
+    sha256 = "1w79xvsyq98vfz3jb4sv8433vdh6pcg8s7yh54lcxzr1p08yhsb6";
-    rev = "da4b415c6a2b7e77b7d9f00beca3e45230e603fb";
+    rev = "f19ac28046d7e83ff95f845849c033cc616f1bd6";
   };
-
-  doHaddock = false;
   isLibrary = true;
   isExecutable = true;
   setupHaskellDepends = [ base Cabal directory filepath process ];
@@ -27,15 +25,10 @@ mkDerivation {
     base cmark containers HUnit mtl parsec QuickCheck quickcheck-io
     split tasty tasty-golden tasty-hunit tasty-quickcheck text
   ];
+  doHaddock = false;
   jailbreak = true;
-  postInstall = ''
+  doCheck = false;
-    ln -s $out/bin/elm-format-0.18 $out/bin/elm-format
+  homepage = "http://elm-lang.org";
-  '';
-  postPatch = ''
-    sed -i "s|desc <-.*||" ./Setup.hs
-    sed -i "s|gitDescribe = .*|gitDescribe = \\\\\"da4b415c\\\\\"\"|" ./Setup.hs
-  '';
-  homepage = http://elm-lang.org;
   description = "A source code formatter for Elm";
   license = stdenv.lib.licenses.bsd3;
 }

pkgs/development/compilers/elm/packages/elm-interface-to-json.nix

@@ -1,24 +0,0 @@
-{ mkDerivation, aeson, aeson-pretty, base, binary, bytestring
-, concatenative, containers, directory, either, elm-compiler
-, filemanip, filepath, indents, optparse-applicative, parsec
-, stdenv, text, transformers, fetchgit
-}:
-mkDerivation {
-  pname = "elm-interface-to-json";
-  version = "0.1.0.0";
-  src = fetchgit {
-    url = "https://github.com/stoeffel/elm-interface-to-json";
-    sha256 = "1izc78w91m7nrc9i2b3lgy3kyjsy4d5mkkblx96ws0bp3dpm5f9k";
-    rev = "9884c1c997a55f11cf7c3d99a8afa72cf2e97323";
-  };
-  isLibrary = false;
-  isExecutable = true;
-  jailbreak = true;
-  executableHaskellDepends = [
-    aeson aeson-pretty base binary bytestring concatenative containers
-    directory either elm-compiler filemanip filepath indents
-    optparse-applicative parsec text transformers
-  ];
-  homepage = "https://github.com/githubuser/elm-interface-to-json#readme";
-  license = stdenv.lib.licenses.bsd3;
-}

pkgs/development/compilers/elm/packages/elm-make.nix

@@ -1,26 +0,0 @@
-{ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base, binary
-, blaze-html, blaze-markup, bytestring, containers, directory
-, elm-compiler, elm-package, fetchgit, filepath, mtl
-, optparse-applicative, raw-strings-qq, stdenv, text, time
-}:
-mkDerivation {
-  pname = "elm-make";
-  version = "0.18";
-  src = fetchgit {
-    url = "https://github.com/elm-lang/elm-make";
-    sha256 = "1yq4w4yqignlc2si5ns53pmz0a99gix5d2qgi6x7finf7i6sxyw2";
-    rev = "1a554833a70694ab142b9179bfac996143f68d9e";
-  };
-  isLibrary = false;
-  isExecutable = true;
-  executableHaskellDepends = [
-    aeson ansi-terminal ansi-wl-pprint base binary blaze-html
-    blaze-markup bytestring containers directory elm-compiler
-    elm-package filepath mtl optparse-applicative raw-strings-qq text
-    time
-  ];
-  jailbreak = true;
-  homepage = http://elm-lang.org;
-  description = "A build tool for Elm projects";
-  license = stdenv.lib.licenses.bsd3;
-}

pkgs/development/compilers/elm/packages/elm-package.nix

@@ -1,39 +0,0 @@
-{ mkDerivation, aeson, aeson-pretty_0_7_2, ansi-wl-pprint, base, binary
-, bytestring, containers, directory, edit-distance, elm-compiler
-, fetchgit, fetchurl, filepath, HTTP, http-client, http-client-tls
-, http-types, mtl, network, optparse-applicative, parallel-io
-, pretty, stdenv, text, time, unordered-containers, vector
-, zip-archive
-}:
-mkDerivation {
-  pname = "elm-package";
-  version = "0.18";
-  src = fetchgit {
-    url = "https://github.com/elm-lang/elm-package";
-    sha256 = "19krnkjvfk02gmmic5h5i1i0lw7s30927bnd5g57cj8nqbigysv7";
-    rev = "8bd150314bacab5b6fc451927aa01deec2276fbf";
-  };
-  patches = fetchurl {
-    url = https://github.com/jerith666/elm-package/commit/40bab60c2fbff70812cc24cdd97f5e09db3844ad.patch;
-    sha256 = "0j6pi6cv3h9s6vz68bh0c73fysvk83yhhk56kgshvnrmnpcb3jib";
-  };
-  isLibrary = true;
-  isExecutable = true;
-  libraryHaskellDepends = [
-    aeson aeson-pretty_0_7_2 ansi-wl-pprint base binary bytestring containers
-    directory edit-distance elm-compiler filepath HTTP http-client
-    http-client-tls http-types mtl network parallel-io text time
-    unordered-containers vector zip-archive
-  ];
-  executableHaskellDepends = [
-    aeson aeson-pretty_0_7_2 ansi-wl-pprint base binary bytestring containers
-    directory edit-distance elm-compiler filepath HTTP http-client
-    http-client-tls http-types mtl network optparse-applicative
-    parallel-io pretty text time unordered-containers vector
-    zip-archive
-  ];
-  jailbreak = true;
-  homepage = https://github.com/elm-lang/elm-package;
-  description = "Package manager for Elm libraries";
-  license = stdenv.lib.licenses.bsd3;
-}

pkgs/development/compilers/elm/packages/elm-reactor-elm.nix

@@ -1,22 +0,0 @@
-{
-  "elm-lang/virtual-dom" = {
-    version = "2.0.1";
-    sha256 = "19nfjx072m7a7bx8flc50vbmiww172jmscyq9x91cr2kby5hvbw3";
-  };
-  "evancz/elm-markdown" = {
-    version = "3.0.1";
-    sha256 = "144lzpcapf2mhqiz90mkllmm4skrcs0iha1daps42qn3xps7hvmj";
-  };
-  "elm-lang/html" = {
-    version = "2.0.0";
-    sha256 = "05sqjd5n8jnq4lv5v0ipcg98b8im1isnnl4wns1zzn4w5nbrjjzi";
-  };
-  "elm-lang/svg" = {
-    version = "2.0.0";
-    sha256 = "1c7p967n1yhynravqwgh80vprwz7r2r1n0x3icn5wzk9iaqs069l";
-  };
-  "elm-lang/core" = {
-    version = "5.0.0";
-    sha256 = "0gqyc09bh43pi7r2cizyjm5y0zpgarv3is17dl325qvxb9s1y2gn";
-  };
-}

pkgs/development/compilers/elm/packages/elm-reactor.nix

@@ -1,28 +0,0 @@
-{ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring
-, cmdargs, containers, directory, elm-compiler, elm-package
-, fetchgit, file-embed, filepath, fsnotify, mtl, process, snap-core
-, snap-server, stdenv, template-haskell, text, time, transformers
-, unordered-containers, utf8-string, websockets, websockets-snap
-}:
-mkDerivation {
-  pname = "elm-reactor";
-  version = "0.18";
-  src = fetchgit {
-    url = "https://github.com/elm-lang/elm-reactor";
-    sha256 = "0lpidsckyfcr8d6bln735d98dx7ga7j1vyssw0qsv8ijj18gxx65";
-    rev = "c519d4ec0aaf2f043a416fe858346b0181eca516";
-  };
-  isLibrary = false;
-  isExecutable = true;
-  executableHaskellDepends = [
-    aeson base blaze-html blaze-markup bytestring cmdargs containers
-    directory elm-compiler elm-package file-embed filepath fsnotify mtl
-    process snap-core snap-server template-haskell text time
-    transformers unordered-containers utf8-string websockets
-    websockets-snap
-  ];
-  jailbreak = true;
-  homepage = http://elm-lang.org;
-  description = "Interactive development tool for Elm programs";
-  license = stdenv.lib.licenses.bsd3;
-}

pkgs/development/compilers/elm/packages/elm-repl.nix

@@ -1,30 +0,0 @@
-{ mkDerivation, base, binary, bytestring, bytestring-trie, cmdargs
-, containers, directory, elm-compiler, elm-package, fetchgit
-, filepath, haskeline, HUnit, mtl, parsec, QuickCheck, stdenv
-, test-framework, test-framework-hunit, test-framework-quickcheck2
-, text
-}:
-mkDerivation {
-  pname = "elm-repl";
-  version = "0.18";
-  src = fetchgit {
-    url = "https://github.com/elm-lang/elm-repl";
-    sha256 = "112fzykils4lqz4pc44q4mwvxg0px0zfwx511bfvblrxkwwqlfb5";
-    rev = "85f0bcfc28ea6c8a99a360d55c21ff25a556f9fe";
-  };
-  isLibrary = false;
-  isExecutable = true;
-  executableHaskellDepends = [
-    base binary bytestring bytestring-trie cmdargs containers directory
-    elm-compiler elm-package filepath haskeline mtl parsec text
-  ];
-  testHaskellDepends = [
-    base bytestring bytestring-trie cmdargs directory elm-compiler
-    elm-package filepath haskeline HUnit mtl parsec QuickCheck
-    test-framework test-framework-hunit test-framework-quickcheck2
-  ];
-  jailbreak = true;
-  homepage = https://github.com/elm-lang/elm-repl;
-  description = "a REPL for Elm";
-  license = stdenv.lib.licenses.bsd3;
-}

pkgs/development/compilers/elm/packages/elm.nix

@@ -0,0 +1,30 @@
+{ mkDerivation, ansi-terminal, ansi-wl-pprint, base, binary
+, bytestring, containers, directory, edit-distance, fetchgit
+, file-embed, filepath, ghc-prim, haskeline, HTTP, http-client
+, http-client-tls, http-types, language-glsl, logict, mtl, network
+, parsec, process, raw-strings-qq, scientific, SHA, snap-core
+, snap-server, stdenv, template-haskell, text, time
+, unordered-containers, utf8-string, vector, zip-archive
+}:
+mkDerivation {
+  pname = "elm";
+  version = "0.19.0";
+  src = fetchgit {
+    url = "https://github.com/elm/compiler";
+    sha256 = "0s93z9vr0vp5w894ghc5s34nsq09sg1msf59zfiba87sid5vgjqy";
+    rev = "32059a289d27e303fa1665e9ada0a52eb688f302";
+  };
+  isLibrary = false;
+  isExecutable = true;
+  executableHaskellDepends = [
+    ansi-terminal ansi-wl-pprint base binary bytestring containers
+    directory edit-distance file-embed filepath ghc-prim haskeline HTTP
+    http-client http-client-tls http-types language-glsl logict mtl
+    network parsec process raw-strings-qq scientific SHA snap-core
+    snap-server template-haskell text time unordered-containers
+    utf8-string vector zip-archive
+  ];
+  homepage = "http://elm-lang.org";
+  description = "The `elm` command line interface";
+  license = stdenv.lib.licenses.bsd3;
+}

pkgs/development/compilers/elm/packages/indents.nix

@@ -0,0 +1,11 @@
+{ mkDerivation, base, concatenative, mtl, parsec, stdenv }:
+mkDerivation {
+  pname = "indents";
+  version = "0.3.3";
+  sha256 = "b61f51ac894609cb5571cc3ded12db5de97185a8de236c69ec24c87457109f9a";
+  libraryHaskellDepends = [ base concatenative mtl parsec ];
+  doCheck = false;
+  homepage = "http://patch-tag.com/r/salazar/indents";
+  description = "indentation sensitive parser-combinators for parsec";
+  license = stdenv.lib.licenses.bsd3;
+}

pkgs/development/compilers/elm/packages/release.nix

@@ -1,13 +0,0 @@
-# This file is auto-generated by ./update-elm.rb.
-# Please, do not modify it by hand!
-{ callPackage }:
-{
-  version = "0.18.0";
-  packages = {
-    elm-compiler = callPackage ./elm-compiler.nix { };
-    elm-package = callPackage ./elm-package.nix { };
-    elm-make = callPackage ./elm-make.nix { };
-    elm-reactor = callPackage ./elm-reactor.nix { };
-    elm-repl = callPackage ./elm-repl.nix { };
-  };
-}

pkgs/development/compilers/elm/update-elm.rb

@@ -1,28 +0,0 @@
-#!/usr/bin/env ruby
-
-# Take those from https://github.com/elm-lang/elm-platform/blob/master/installers/BuildFromSource.hs
-$elm_version = "0.18.0"
-$elm_packages = { "elm-compiler" => "0.18.0",
-                  "elm-package" => "0.18.0",
-                  "elm-make" => "0.18.0",
-                  "elm-reactor" => "0.18.0",
-                  "elm-repl" => "0.18.0"
-                }
-
-for pkg, ver in $elm_packages
-  system "cabal2nix https://github.com/elm-lang/#{pkg} --revision refs/tags/#{ver} --jailbreak > packages/#{pkg}.nix"
-end
-
-File.open("packages/release.nix", 'w') do |file|
-  file.puts "# This file is auto-generated by ./update-elm.rb."
-  file.puts "# Please, do not modify it by hand!"
-  file.puts "{ callPackage }:"
-  file.puts "{"
-  file.puts "  version = \"#{$elm_version}\";"
-  file.puts "  packages = {"
-  for pkg, ver in $elm_packages
-    file.puts "    #{pkg} = callPackage ./#{pkg}.nix { };"
-  end
-  file.puts "  };"
-  file.puts "}"
-end

pkgs/development/compilers/elm/update.sh

@@ -0,0 +1,3 @@
+cabal2nix https://github.com/elm/compiler --revision  32059a289d27e303fa1665e9ada0a52eb688f302 > packages/elm.nix
+cabal2nix --no-check cabal://indents-0.3.3 > packages/indents.nix
+cabal2nix --no-haddock --no-check --jailbreak --revision refs/tags/0.8.0 http://github.com/avh4/elm-format > packages/elm-format.nix

pkgs/development/haskell-modules/configuration-common.nix

@@ -672,6 +672,9 @@ self: super: {
   # https://github.com/bos/bloomfilter/issues/7
   bloomfilter = appendPatch super.bloomfilter ./patches/bloomfilter-fix-on-32bit.patch;
 
+  # https://github.com/ashutoshrishi/hunspell-hs/pull/3
+  hunspell-hs = addPkgconfigDepend (dontCheck (appendPatch super.hunspell-hs ./patches/hunspell.patch)) pkgs.hunspell;
+
   # https://github.com/pxqr/base32-bytestring/issues/4
   base32-bytestring = dontCheck super.base32-bytestring;
 

pkgs/development/haskell-modules/generic-builder.nix

@@ -46,6 +46,10 @@ in
 , isExecutable ? false, isLibrary ? !isExecutable
 , jailbreak ? false
 , license
+# We cannot enable -j<n> parallelism for libraries because GHC is far more
+# likely to generate a non-determistic library ID in that case. Further
+# details are at <https://github.com/peti/ghc-library-id-bug>.
+, enableParallelBuilding ? (stdenv.lib.versionOlder "7.8" ghc.version && !isLibrary) || stdenv.lib.versionOlder "8.0.1" ghc.version
 , maintainers ? []
 , doCoverage ? false
 , doHaddock ? !(ghc.isHaLVM or false)
@@ -112,11 +116,6 @@ let
                      main = defaultMain
                    '';
 
-  # We cannot enable -j<n> parallelism for libraries because GHC is far more
-  # likely to generate a non-determistic library ID in that case. Further
-  # details are at <https://github.com/peti/ghc-library-id-bug>.
-  enableParallelBuilding = (versionOlder "7.8" ghc.version && !isLibrary) || versionOlder "8.0.1" ghc.version;
-
   crossCabalFlags = [
     "--with-ghc=${ghc.targetPrefix}ghc"
     "--with-ghc-pkg=${ghc.targetPrefix}ghc-pkg"

pkgs/development/haskell-modules/patches/hunspell.patch

@@ -0,0 +1,30 @@
+diff -Naur hunspell-hs-0.1.0.0.orig/hunspell-hs.cabal hunspell-hs-0.1.0.0/hunspell-hs.cabal
+--- hunspell-hs-0.1.0.0.orig/hunspell-hs.cabal	2018-08-26 20:23:33.053763300 +0200
++++ hunspell-hs-0.1.0.0/hunspell-hs.cabal	2018-08-26 20:42:05.886074510 +0200
+@@ -37,7 +37,7 @@
+       base >=4.7 && <5
+     , stm
+   if os(linux)
+-    extra-libraries:
++    pkgconfig-depends:
+         hunspell
+   if os(darwin)
+     include-dirs:
+@@ -63,7 +63,7 @@
+     , hunspell-hs
+     , stm
+   if os(linux)
+-    extra-libraries:
++    pkgconfig-depends:
+         hunspell
+   if os(darwin)
+     include-dirs:
+@@ -88,7 +88,7 @@
+     , hunspell-hs
+     , stm
+   if os(linux)
+-    extra-libraries:
++    pkgconfig-depends:
+         hunspell
+   if os(darwin)
+     include-dirs:

pkgs/development/libraries/mesa/default.nix

@@ -63,7 +63,7 @@ let
 in
 
 let
-  version = "18.1.5";
+  version = "18.1.7";
   branch  = head (splitString "." version);
 in
 
@@ -77,7 +77,7 @@ let self = stdenv.mkDerivation {
       "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"
       "https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
     ];
-    sha256 = "69dbe6f1a6660386f5beb85d4fcf003ee23023ed7b9a603de84e9a37e8d98dea";
+    sha256 = "655e3b32ce3bdddd5e6e8768596e5d4bdef82d0dd37067c324cc4b2daa207306";
   };
 
   prePatch = "patchShebangs .";
@@ -100,6 +100,7 @@ let self = stdenv.mkDerivation {
     "--with-dri-driverdir=$(drivers)/lib/dri"
     "--with-dri-searchpath=${libglvnd.driverLink}/lib/dri"
     "--with-platforms=x11,wayland,drm"
+    "--enable-texture-float"
   ]
   ++ (optional (galliumDrivers != [])
       ("--with-gallium-drivers=" +

pkgs/development/libraries/pagmo2/default.nix

@@ -0,0 +1,46 @@
+{ lib
+, fetchFromGitHub
+, stdenv
+, cmake
+, eigen
+, nlopt
+, ipopt
+, boost
+, writeText
+}:
+
+stdenv.mkDerivation rec {
+  name = "pagmo2-${version}";
+  version = "2.8";
+
+  src = fetchFromGitHub {
+     owner = "esa";
+     repo = "pagmo2";
+     rev = "v${version}";
+     sha256 = "1xwxamcn3fkwr62jn6bkanrwy0cvsksf75hfwx4fvl56awnbz41z";
+  };
+
+  buildInputs = [ cmake eigen nlopt ipopt boost ];
+
+  preBuild = ''
+    cp -r $src/* .
+  '';
+
+  cmakeFlags = [ "-DPAGMO_BUILD_TESTS=no"
+                 "-DPAGMO_WITH_EIGEN3=yes" "-DPAGMO_WITH_NLOPT=yes"
+                 "-DNLOPT_LIBRARY=${nlopt}/lib/libnlopt_cxx.so" "-DPAGMO_WITH_IPOPT=yes"
+                 "-DCMAKE_CXX_FLAGS='-fuse-ld=gold'" ];
+
+  checkPhase = ''
+    ctest
+  '';
+
+  # All but one test pass skip for now (tests also take about 30 min to compile)
+  doCheck = false;
+
+  meta = {
+    homepage = https://esa.github.io/pagmo2/;
+    description = "Scientific library for massively parallel optimization";
+    license = stdenv.lib.licenses.gpl3Plus;
+  };
+}

pkgs/development/libraries/qt-5/modules/qtwebengine.nix

@@ -134,7 +134,7 @@ EOF
     harfbuzz icu
 
     libevent
-  ] ++ optionals stdenv.hostPlatform.isArm [
+  ] ++ optionals (stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64) [
     ffmpeg
   ] ++ optionals (!stdenv.isDarwin) [
     dbus zlib minizip snappy nss protobuf jsoncpp

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

@@ -136,6 +136,20 @@ stdenv.mkDerivation rec {
   doCheck = true;
   checkTarget = "tests";
 
+  postInstall = ''
+    # Write pkgconfig aliases. Upstream report:
+    # https://github.com/xianyi/OpenBLAS/issues/1740
+    for alias in blas cblas lapack; do
+      cat <<EOF > $out/lib/pkgconfig/openblas-$alias.pc
+Name: $alias
+Version: ${version}
+Description: $alias provided by the OpenBLAS package.
+Cflags: -I$out/include
+Libs: -L$out/lib -lopenblas
+EOF
+    done
+  '';
+
   meta = with stdenv.lib; {
     description = "Basic Linear Algebra Subprograms";
     license = licenses.bsd3;

pkgs/development/libraries/udunits/default.nix

@@ -1,15 +1,19 @@
-{ stdenv, fetchurl,
+{ stdenv, fetchFromGitHub, autoreconfHook,
-  bison, flex, expat, file
+  texinfo, bison, flex, expat, file
 }:
 
 stdenv.mkDerivation rec {
-    name = "udunits-2.2.26";
+  name = "udunits-${version}";
-    src = fetchurl {
+  version = "2.2.27.6";
-        url = "ftp://ftp.unidata.ucar.edu/pub/udunits/${name}.tar.gz";
+  
-        sha256 = "0v9mqw4drnkzkm57331ail6yvs9485jmi37s40lhvmf7r5lli3rn";
+  src = fetchFromGitHub {
+    owner = "Unidata";
+    repo = "UDUNITS-2";
+    rev = "v${version}";
+    sha256 = "0621pac24c842dyipzaa59rh6pza9phdqi3snd4cq4pib0wjw6gm";
   };
 
-    nativeBuildInputs = [ bison flex file ];
+  nativeBuildInputs = [ autoreconfHook texinfo bison flex file ];
   buildInputs = [ expat ];
 
   meta = with stdenv.lib; {

pkgs/development/libraries/umockdev/default.nix

@@ -1,10 +1,12 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, libtool
+{ stdenv, fetchFromGitHub, autoreconfHook, umockdev, gobjectIntrospection
 , pkgconfig, glib, systemd, libgudev, vala }:
 
 stdenv.mkDerivation rec {
   name = "umockdev-${version}";
   version = "0.11.3";
 
+  outputs = [ "bin" "out" "dev" "doc" ];
+
   src = fetchFromGitHub {
     owner  = "martinpitt";
     repo   = "umockdev";
@@ -19,7 +21,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ glib systemd libgudev ];
 
-  nativeBuildInputs = [ autoreconfHook libtool pkgconfig vala ];
+  nativeBuildInputs = [ autoreconfHook pkgconfig vala gobjectIntrospection ];
 
   enableParallelBuilding = true;
 

pkgs/development/perl-modules/DB_File/default.nix

@@ -1,11 +1,11 @@
 {fetchurl, buildPerlPackage, db}:
 
 buildPerlPackage rec {
-  name = "DB_File-1.841";
+  name = "DB_File-1.842";
 
   src = fetchurl {
     url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz";
-    sha256 = "11fks42kgscpia0mxx4lc9krm7q4gv6w7m5h3m2jr3dl7viv36hn";
+    sha256 = "0w2d99vs9qarng2f9fpg3gchfdzy6an13507jhclcl8wv183h5hg";
   };
 
   preConfigure = ''

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

@@ -20,11 +20,11 @@
 
 buildPythonPackage rec {
   pname = "APScheduler";
-  version = "3.5.1";
+  version = "3.5.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "952c8f46a11f32b9d5bfbe3e347dac2cdf0680d8b4799590dc9c3a9865b73b65";
+    sha256 = "6599bc78901ee7e9be85cbd073d9cc155c42d2bc867c5cde4d4d1cc339ebfbeb";
   };
 
   buildInputs = [

pkgs/development/python-modules/Flask-PyMongo/default.nix

@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "Flask-PyMongo";
-  version = "2.0.1";
+  version = "2.1.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "6a02add52ac245064720c2bb8b02074b9a5a0d9498279510ea2a537512fd3fa5";
+    sha256 = "0b99dd99985660ebbc4b34bb44550f88a527cbc573faa01febccce3c4ab28347";
   };
 
   checkInputs = [ pytest ];

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

@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "XlsxWriter";
-  version = "1.0.5";
+  version = "1.0.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "bd4661c04a68621cb2ebc07c38b8b2e98e30bf213a16e1cf3675b61e26ca9bf2";
+    sha256 = "1224b971c174f33b954f9a1906679d0049399bd6a5a8c78bbae2d6c2c4facebd";
   };
 
   meta = {

pkgs/development/python-modules/absl-py/default.nix

@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "absl-py";
-  version = "0.2.2";
+  version = "0.4.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "e0eb8358b549552b1cc5972350bc3e41dd0a926c15b3ff95ce60f3c78c80824c";
+    sha256 = "932e6acb1a57bdcfb784a1ce6ad46a2f50b89d355a5619ed6df60db1414173d2";
   };
 
   propagatedBuildInputs = [ six ];

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

@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "aiofiles";
-  version = "0.3.2";
+  version = "0.4.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "852a493a877b73e11823bfd4e8e5ef2610d70d12c9eaed961bcd9124d8de8c10";
+    sha256 = "021ea0ba314a86027c166ecc4b4c07f2d40fc0f4b3a950d1868a0f2571c2bbee";
   };
 
   disabled = pythonOlder "3.3";

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

@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "aiohue";
-  version = "1.6.0";
+  version = "1.7.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "87f0f86865e88ea715ab358b1e5f2838b79ee7cdc0bdf762e9ed60aaf4c8bd4a";
+    sha256 = "26989babdc3f38575164b60b9536309271d58db005a03045b6e9cca4fc5201d8";
   };
 
   propagatedBuildInputs = [ aiohttp ];

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

@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "allpairspy";
-  version = "2.4.0";
+  version = "2.4.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "9fb7962ee523bd96c5098cd3c97ac1b8eb73021d3df9314657ee9de00f52e034";
+    sha256 = "e8b35751f91692bf0318091b3f44cdf9bbbe3f37a2ff4786eaffc09dc7114fb3";
   };
 
   propagatedBuildInputs = [ six ];

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

@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "argon2_cffi";
-  version = "18.1.0";
+  version = "18.3.0";
   name    = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "7e4b75611b73f53012117ad21cdde7a17b32d1e99ff6799f22d827eb83a2a59b";
+    sha256 = "003f588de43a817af6ecc1c06103fa0801de63849db3cb0f37576bb2da29043d";
   };
 
   propagatedBuildInputs = [ cffi six ];

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

@@ -0,0 +1,36 @@
+{ lib
+, fetchurl
+, buildPythonPackage
+, numpy
+, scipy
+, matplotlib
+, flask
+, pillow
+, psycopg2
+}:
+
+buildPythonPackage rec {
+  version = "3.16.2";
+  pname = "ase";
+
+  src = fetchurl {
+     url = "https://gitlab.com/${pname}/${pname}/-/archive/${version}/${pname}-${version}.tar.gz";
+     sha256 = "171j3f4a261cfnqjq98px5fldxql65i3jgf60wc945xvh0mbc8ds";
+  };
+
+  propagatedBuildInputs = [ numpy scipy matplotlib flask pillow psycopg2 ];
+
+  checkPhase = ''
+    $out/bin/ase test
+  '';
+
+  # tests just hang most likely due to something with subprocesses and cli
+  doCheck = false;
+
+  meta = {
+    description = "Atomic Simulation Environment";
+    homepage = https://wiki.fysik.dtu.dk/ase/;
+    license = lib.licenses.lgpl21Plus;
+    maintainers = with lib.maintainers; [ costrouc ];
+  };
+}

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

@@ -5,13 +5,13 @@
 
 buildPythonPackage rec {
   pname = "astroid";
-  version = "2.0.1";
+  version = "2.0.4";
 
   disabled = pythonOlder "3.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "218e36cf8d98a42f16214e8670819ce307fa707d1dcf7f9af84c7aede1febc7f";
+    sha256 = "c7013d119ec95eb626f7a2011f0b63d0c9a095df9ad06d8507b37084eada1a8d";
   };
 
   # From astroid/__pkginfo__.py

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

@@ -7,7 +7,7 @@
 
 buildPythonPackage rec {
   pname = "astropy";
-  version = "3.0.3";
+  version = "3.0.4";
 
   disabled = !isPy3k; # according to setup.py
 
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "6af07abe5e263820a3dec93832a6ad74005013071490e125afbc6514411721da";
+    sha256 = "f5d37d20632ba74bd0b12a85179c12f64a9ea037ffc916d8a2de3be4f4656c76";
   };
 
   propagatedBuildInputs = [ pytest numpy ]; # yes it really has pytest in install_requires

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

@@ -2,13 +2,13 @@
 
 buildPythonPackage rec {
   pname = "async_generator";
-  version = "1.9";
+  version = "1.10";
 
   disabled = pythonOlder "3.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b7d5465c6174fe86dba498ececb175f93a6097ffb7cc91946405e1f05b848371";
+    sha256 = "6ebb3d106c12920aaae42ccb6f787ef5eefdcdd166ea3d628fa8476abe712144";
   };
 
   checkInputs = [ pytest pytest-asyncio ];

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

@@ -1,22 +1,22 @@
 { stdenv, buildPythonPackage, fetchPypi, isPy3k, isPy33,
   unittest2, mock, pytest, trollius, asyncio,
-  pytest-asyncio, futures,
+  pytest-asyncio, futures, cffi,
   six, twisted, txaio, zope_interface
 }:
 buildPythonPackage rec {
   pname = "autobahn";
-  version = "18.6.1";
+  version = "18.8.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "2f41bfc512ec482044fa8cfa74182118dedd87e03b3494472d9ff1b5a1e27d24";
+    sha256 = "b69858e0be4bff8437b0bd82a0db1cbef7405e16bd9354ba587c043d6d5e1ad9";
   };
 
   # Upstream claim python2 support, but tests require pytest-asyncio which
   # is pythn3 only. Therefore, tests are skipped for python2.
   doCheck = isPy3k;
-  buildInputs = stdenv.lib.optionals isPy3k [ unittest2 mock pytest pytest-asyncio ];
+  checkInputs = stdenv.lib.optionals isPy3k [ unittest2 mock pytest pytest-asyncio ];
-  propagatedBuildInputs = [ six twisted zope_interface txaio ] ++
+  propagatedBuildInputs = [ cffi six twisted zope_interface txaio ] ++
     (stdenv.lib.optional isPy33 asyncio) ++
     (stdenv.lib.optionals (!isPy3k) [ trollius futures ]);
 
@@ -29,6 +29,5 @@ buildPythonPackage rec {
     homepage    = "https://crossbar.io/autobahn";
     license     = licenses.mit;
     maintainers = with maintainers; [ nand0p ];
-    platforms   = platforms.all;
   };
 }

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

@@ -25,6 +25,9 @@ if !(pythonOlder "3.3") then null else buildPythonPackage rec {
     PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH ${python.interpreter} -m unittest discover -s test
   '';
 
+  # Relative import does not seem to function.
+  doCheck = false;
+
   meta = {
     description = "Backport of Python 3.3's 'lzma' module for XZ/LZMA compressed files";
     homepage = https://github.com/peterjc/backports.lzma;

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

@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "beautifulsoup4";
-  version = "4.6.0";
+  version = "4.6.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "12cf0ygpz9srpfh9gx2f9ba0swa1rzypv3sm4r0hmjyw6b4nm2w0";
+    sha256 = "90f8e61121d6ae58362ce3bed8cd997efb00c914eae0ff3d363c32f9a9822d10";
   };
 
   buildInputs = [ nose ];

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

@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "bitmath";
-  version = "1.3.1.2";
+  version = "1.3.3.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1k8d1wmxqjc8cqzaixpxf45k6dl1kqhblr0g4wyjl0qa18q8wasd";
+    sha256 = "293325f01e65defe966853111df11d39215eb705a967cb115851da8c4cfa3eb8";
   };
 
   checkInputs = [ (if isPy3k then progressbar33 else progressbar231) mock ];

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

@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "bleach";
-  version = "2.1.3";
+  version = "2.1.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "eb7386f632349d10d9ce9d4a838b134d4731571851149f9cc2c05a9a837a9a44";
+    sha256 = "0ee95f6167129859c5dce9b1ca291ebdb5d8cd7e382ca0e237dfd0dad63f63d8";
   };
 
   checkInputs = [ pytest pytestrunner ];

pkgs/development/python-modules/bootstrapped-pip/default.nix

@@ -9,9 +9,9 @@ let
   };
   setuptools_source = fetchPypi {
     pname = "setuptools";
-    version = "40.0.0";
+    version = "40.2.0";
     format = "wheel";
-    sha256 = "d68abee4eed409fbe8c302ac4d8429a1ffef912cd047a903b5701c024048dd49";
+    sha256 = "ea3796a48a207b46ea36a9d26de4d0cc87c953a683a7b314ea65d666930ea8e6";
   };
 
 in stdenv.mkDerivation rec {

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

@@ -7,15 +7,16 @@
 , simplejson
 , mock
 , nose
+, urllib3
 }:
 
 buildPythonPackage rec {
   pname = "botocore";
-  version = "1.10.65";
+  version = "1.11.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "35f626029a6b17bfd503ce3379b121606e3f965edcab2612bc75ce8603fdf08c";
+    sha256 = "5b2d2393c02a082d605dac13c1322c3c553a4d4cf23de7b48268ae7f4a105eb3";
   };
 
   propagatedBuildInputs = [
@@ -24,6 +25,7 @@ buildPythonPackage rec {
     docutils
     ordereddict
     simplejson
+    urllib3
   ];
 
   checkInputs = [ mock nose ];

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

@@ -1,12 +1,12 @@
 { lib, fetchPypi, buildPythonPackage, docutils, six, sphinx, isPy3k }:
 
 buildPythonPackage rec {
-  version = "4.9.1";
+  version = "4.10.0";
   pname = "breathe";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "76e1f3706efeda2610d9a8e7b421d2877ff0654a3fe6d3190a8686536111a684";
+    sha256 = "e94370b8b607a32d9611ed8246e635f02c21dc6847f04e888a00f66a12694eff";
   };
 
   propagatedBuildInputs = [ docutils six sphinx ];

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

@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "BTrees";
-  version = "4.5.0";
+  version = "4.5.1";
 
   buildInputs = [ transaction ];
   propagatedBuildInputs = [ persistent zope_interface ];
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "46b02cb69b26a5238db771ea1955b503df73ecf254bb8063af4c61999fc75b5c";
+    sha256 = "dcc096c3cf92efd6b9365951f89118fd30bc209c9af83bf050a28151a9992786";
   };
 
   meta = with stdenv.lib; {

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

@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "bugwarrior";
-  version = "1.5.1";
+  version = "1.6.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0kxknjbw5kchd88i577vlzibg8j60r7zzdhbnragj9wg5s3w60xb";
+    sha256 = "cfa4fac19b4f4638928347b8fe192315f72813c3e8ed668867e5891338c7e4ec";
   };
 
   buildInputs = [ mock unittest2 nose /* jira megaplan */ ];

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

@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "zc.buildout";
-  version = "2.2.5";
+  version = "2.12.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "fb08f24f9e51e647e29d714f6e9ad51a4ea28673dddeed831315617bb5a805d0";
+    sha256 = "1e180b62fd129a68cb3a9ec8eb0ef457e18921269a93e87ef2cc34519415332d";
   };
 
   meta = with stdenv.lib; {

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

@@ -17,11 +17,11 @@
 
 buildPythonPackage rec {
   pname = "cairocffi";
-  version = "0.8.1";
+  version = "0.9.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0y373vafv7q35msg7gqdn7niifr3j4j4n070hflxshahs59irss7";
+    sha256 = "15386c3a9e08823d6826c4491eaccc7b7254b1dc587a3b9ce60c350c3f990337";
   };
 
   LC_ALL = "en_US.UTF-8";

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

@@ -2,7 +2,18 @@
   pytest, case, kombu, billiard, pytz, anyjson, amqp, eventlet
 }:
 
-buildPythonPackage rec {
+let
+
+  # Needed for celery
+  pytest_32 = pytest.overridePythonAttrs( oldAttrs: rec {
+    version = "3.2.5";
+    src = oldAttrs.src.override {
+      inherit version;
+      sha256 = "6d5bd4f7113b444c55a3bbb5c738a3dd80d43563d063fc42dcb0aaefbdd78b81";
+    };
+  });
+
+in buildPythonPackage rec {
   pname = "celery";
   version = "4.2.0";
 

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

@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "cement";
-  version = "2.10.12";
+  version = "3.0.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "58efb4eacd9ec977ce797a364a13851de6e42392bbde5287d44294f06c5a2f70";
+    sha256 = "e50e1033d61d18b36787a60d52cad0d3fe20780e7e2f78f0204bde32000645f9";
   };
 
   # Disable test tests since they depend on a memcached server running on

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

@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "certifi";
-  version = "2018.4.16";
+  version = "2018.8.24";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "13e698f54293db9f89122b0581843a782ad0934a4fe0172d2a980ba77fc61bb7";
+    sha256 = "376690d6f16d32f9d1fe8932551d80b23e9d393a8578c5633a2ed39a64861638";
   };
 
   meta = {

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

@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "cftime";
-  version = "1.0.0";
+  version = "1.0.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "f62fe79ed2ad38f4211477e59f6f045c91278351f4ce7578e33ddf52fb121ea8";
+    sha256 = "20556931f546838d09be5d589482dfae6164e0d403f0aab2163c006b680d3b92";
   };
 
   checkInputs = [ pytest coveralls pytestcov ];

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

@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "chainer";
-  version = "4.3.0";
+  version = "4.4.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "a83044256edb1946c47cb9ae687d195c2aa0deaef46ab85a8ffc4a01f7001683";
+    sha256 = "9cc4d43e1ea3e0766e211e4e755dbb879f2cf27a805cfa52e32b99fd1e5f24dd";
   };
 
   checkInputs = [

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

@@ -3,11 +3,11 @@
 }:
 buildPythonPackage rec {
   pname = "channels";
-  version = "2.1.2";
+  version = "2.1.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "173441ccf2ac3a93c3b4f86135db301cbe95be58f5815c1e071f2e7154c192a2";
+    sha256 = "8d503d18b92cef488ba68808a2205e055d29a6a1abae92d277f8f7a9c8752f13";
   };
 
   # Files are missing in the distribution

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

@@ -1,20 +1,20 @@
 { lib, buildPythonPackage, fetchPypi
-, cheroot, portend, routes, six
+, cheroot, contextlib2, portend, routes, six
-, setuptools_scm
+, setuptools_scm, zc_lockfile
 , backports_unittest-mock, objgraph, pathpy, pytest, pytestcov
 , backports_functools_lru_cache, requests_toolbelt
 }:
 
 buildPythonPackage rec {
   pname = "CherryPy";
-  version = "17.0.0";
+  version = "17.3.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "3cdb5fbae183db49ab1f1a90643d521aa060c93f90001cc99c19d8d15b7a3fb7";
+    sha256 = "c3e4d76232ade4c47666b9008f92556465df517b8dca833ece3bed027028ae7d";
   };
 
-  propagatedBuildInputs = [ cheroot portend routes six ];
+  propagatedBuildInputs = [ cheroot contextlib2 portend routes six zc_lockfile ];
 
   buildInputs = [ setuptools_scm ];
 

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

@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "cloudpickle";
-  version = "0.5.3";
+  version = "0.5.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "54858c7b7dc763ed894ff91059c1d0b017d593fe23850d3d8d75f47d98398197";
+    sha256 = "6ea4b548f61a4f616b065182716318c7dced8c053517f35ac59cec22802daf3d";
   };
 
   buildInputs = [ pytest mock ];

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

@@ -5,11 +5,11 @@
 }:
 buildPythonPackage rec {
   pname = "cmd2";
-  version = "0.9.3";
+  version = "0.9.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "cffc94ad46425f80dfb243f53f456b11cea3f45e683504a60b64618a6d28b417";
+    sha256 = "0037dcf92331c63ae43e7e644536e646fff8be2fd5a83da06b3482f910f929c6";
   };
 
   LC_ALL="en_US.UTF-8";

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

@@ -16,12 +16,12 @@
 buildPythonPackage rec {
   pname = "coveralls";
   name = "${pname}-python-${version}";
-  version = "1.3.0";
+  version = "1.4.0";
 
   # wanted by tests
   src = fetchPypi {
     inherit pname version;
-    sha256 = "664794748d2e5673e347ec476159a9d87f43e0d2d44950e98ed0e27b98da8346";
+    sha256 = "7ddb2e3114db9604a7cb1fcc68a7dcca32dce346f5ba568c99979b38e166f5a6";
   };
 
   checkInputs = [

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

@@ -23,11 +23,11 @@
 buildPythonPackage rec {
   # also bump cryptography_vectors
   pname = "cryptography";
-  version = "2.3";
+  version = "2.3.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c132bab45d4bd0fff1d3fe294d92b0a6eb8404e93337b3127bdec9f21de117e6";
+    sha256 = "8d10113ca826a4c29d5b85b2c4e045ffa8bad74fb525ee0eceb1d38d4c70dfd6";
   };
 
   outputs = [ "out" "dev" ];

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

@@ -5,11 +5,11 @@
 buildPythonPackage rec {
   # also bump cryptography
   pname = "cryptography_vectors";
-  version = "2.3";
+  version = "2.3.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "356a2ded84ae379e556515eec9b68dd74957651a38465d10605bb9fbae280f15";
+    sha256 = "bf4d9b61dce69c49e830950aa36fad194706463b0b6dfe81425b9e0bc6644d46";
   };
 
   # No tests included

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

@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "cupy";
-  version = "4.3.0";
+  version = "4.4.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ea818ff7f36cf6e5b3d3faef5af36a501c8bdeb78805820afa2999789ed698d5";
+    sha256 = "fca0e3d3fdad4c825197ea421bed0d253224b44daf738d82af5cba856c1c0b3e";
   };
 
   checkInputs = [

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

@@ -1,14 +1,22 @@
-{ buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
 , chardet, six}:
 
 buildPythonPackage rec {
   pname = "python-debian";
-  version = "0.1.32";
+  version = "0.1.33";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "143887ac647ad30819f289f5a4ca13b77e56df27b686b84c34669447f7591280";
+    sha256 = "06e91d45019fe5f2e111ba827ea77730d6ce2fea698ada4e5b0b70b5fdbc18c5";
   };
 
   propagatedBuildInputs = [ chardet six ];
+
+  # No tests in archive
+  doCheck = false;
+
+  meta = {
+    description = "Debian package related modules";
+    license = lib.licenses.gpl2;
+  };
 }

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

@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "detox";
-  version = "0.12";
+  version = "0.13";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "06svvkszg6xlg0fr471smn4rmpfga960d6qqsyhyiwa48k59n4gk";
+    sha256 = "f0c2af9c29f8e200a50b561ccc531df3087c80e7d3de6cfa9828f5fea3c8f56c";
   };
 
   buildInputs = [ pytest ];

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

@@ -0,0 +1,47 @@
+{ lib
+, fetchPypi
+, buildPythonPackage
+, pymatgen
+, marshmallow
+, pyyaml
+, pygmo
+, pandas
+, scipy
+, numpy
+, scikitlearn
+, lammps-cython
+, pymatgen-lammps
+, pytestrunner
+, pytest
+, pytestcov
+, pytest-benchmark
+, isPy3k
+, openssh
+}:
+
+buildPythonPackage rec {
+  pname = "dftfit";
+  version = "0.4.11";
+  disabled = (!isPy3k);
+
+  src = fetchPypi {
+     inherit pname version;
+     sha256 = "c6e36a793f9f94746bb8a04fb8316404aeacfa918704de07b15e1b4b8b62242d";
+  };
+
+  buildInputs = [ pytestrunner ];
+  checkInputs = [ pytest pytestcov pytest-benchmark openssh ];
+  propagatedBuildInputs = [ pymatgen marshmallow pyyaml pygmo
+                            pandas scipy numpy scikitlearn
+                            lammps-cython pymatgen-lammps ];
+
+  # tests require git lfs download. and is quite large so skip tests
+  doCheck = false;
+
+  meta = {
+    description = "Ab-Initio Molecular Dynamics Potential Development";
+    homepage = https://gitlab.com/costrouc/dftfit;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ costrouc ];
+  };
+}

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

@@ -3,12 +3,12 @@
 , ipaddress, backports_ssl_match_hostname, docker_pycreds
 }:
 buildPythonPackage rec {
-  version = "3.4.1";
+  version = "3.5.0";
   pname = "docker";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ad077b49660b711d20f50f344f70cfae014d635ef094bf21b0d7df5f0aeedf99";
+    sha256 = "bc693be5a84b3b9e5aaf156068c5c0a445ee5138c638c3fbc857133bf67ebe07";
   };
 
   propagatedBuildInputs = [

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

@@ -0,0 +1,35 @@
+{ lib
+, fetchurl
+, buildPythonPackage
+, isPy3k
+, python
+}:
+
+buildPythonPackage rec {
+  pname = "docutils";
+  version = "0.14";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/docutils/${pname}.tar.gz";
+    sha256 = "0x22fs3pdmr42kvz6c654756wja305qv6cx1zbhwlagvxgr4xrji";
+  };
+
+  checkPhase = if isPy3k then ''
+    ${python.interpreter} test3/alltests.py
+  '' else ''
+    ${python.interpreter} test/alltests.py
+  '';
+
+  # Create symlinks lacking a ".py" suffix, many programs depend on these names
+  postFixup = ''
+    (cd $out/bin && for f in *.py; do
+      ln -s $f $(echo $f | sed -e 's/\.py$//')
+    done)
+  '';
+
+  meta = {
+    description = "Docutils -- Python Documentation Utilities";
+    homepage = http://docutils.sourceforge.net/;
+    maintainers = with lib.maintainers; [ garbas AndersonTorres ];
+  };
+}

pkgs/development/python-modules/dogpile.cache/default.nix

@@ -4,11 +4,11 @@
 
 buildPythonPackage rec {
   pname = "dogpile.cache";
-  version = "0.6.6";
+  version = "0.6.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "044d4ea0a0abc72491044f3d3df8e1fc9e8fa7a436c6e9a0da5850d23a0d16c1";
+    sha256 = "fca7deb7c276b879b01c15c5d39b3c05701dc43b263ec3fef1e52cb851cf88ab";
   };
 
   # Disable concurrency tests that often fail,

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

@@ -4,12 +4,12 @@
 , git, glibcLocales }:
 
 buildPythonPackage rec {
-  version = "0.19.5";
+  version = "0.19.6";
   pname = "dulwich";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "34f99e575fe1f1e89cca92cec1ddd50b4991199cb00609203b28df9eb83ce259";
+    sha256 = "9a7dc5c5759f3d3b7a9ac0a684aa2c47f099e1722d9caab5b043cef1d73ff4a2";
   };
 
   LC_ALL = "en_US.UTF-8";

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

@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "easydict";
-  version = "1.7";
+  version = "1.8";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1xpnwjdw4x5kficjgcajqcal6bxcb0ax8l6hdkww9fp6lrh28x8v";
+    sha256 = "f1ec91110737a62fe28d14970ffa7a7c7b441a32e35a6f3da6a6082ffb7f9432";
   };
 
   docheck = false; # No tests in archive

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

@@ -4,13 +4,13 @@
 
 buildPythonPackage rec {
   pname = "ECPy";
-  version = "0.9.0";
+  version = "0.9.1";
 
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ef41346ae24789699f3bc3ddefbfac03ad6b73b7d3d19b998ba9ce47b67c7277";
+    sha256 = "f0df66be67f3de0152dfb3c453f4247bdfa2b4e37aa75b98617a637376032229";
   };
 
   buildInputs = [ hidapi pycrypto pillow protobuf future ];

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

@@ -7,11 +7,11 @@
 
 buildPythonPackage (rec {
   pname = "elasticsearch";
-  version = "6.3.0";
+  version = "6.3.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "80ff7a1a56920535a9987da333c7e385b2ded27595b6de33860707dab758efbe";
+    sha256 = "aada5cfdc4a543c47098eb3aca6663848ef5d04b4324935ced441debc11ec98b";
   };
 
   # Check is disabled because running them destroy the content of the local cluster!

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

@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "fastrlock";
-  version = "0.3";
+  version = "0.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "00mr9b15d539z89ng5nf89s2ryhk90xwx95jal77ma0wslixrk5d";
+    sha256 = "6abdbb35205792e2d2a8c441aaa41a613d43ee2d88b3af4fd9735ae7a5f7db6b";
   };
 
   meta = with stdenv.lib; {

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

@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "filelock";
-  version = "3.0.4";
+  version = "3.0.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "011327d4ed939693a5b28c0fdf2fd9bda1f68614c1d6d0643a89382ce9843a71";
+    sha256 = "59ccab92fe118da7e5ce5a9fcd95506ade58d9d5f606db4922192524edfac820";
   };
 
   meta = with stdenv.lib; {

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

@@ -14,11 +14,11 @@
 
 buildPythonPackage rec {
   pname = "folium";
-  version = "0.5.0";
+  version = "0.6.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "748944521146d85c6cd6230acf234e885864cd0f42fea3758d655488517e5e6e";
+    sha256 = "08681be47b1861221bc7cf17b6e368a8d734db81682d716c22a11e839f47cb79";
   };
 
   checkInputs = [ pytest numpy nbconvert pandas mock ];

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

@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "fonttools";
-  version = "3.28.0";
+  version = "3.29.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ebf2ee25a6060e8551880a3b05d6ecadcdcfbd1b32fc272ff7b3acdb22945b6f";
+    sha256 = "aab38c8c131670684321437d4857dcb4de1c775efd152a9ca9c4d81f1cb97fe7";
     extension = "zip";
   };
 

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

@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "gevent";
-  version = "1.3.5";
+  version = "1.3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "7f15861f3cc92f49663ca88c4774d26d8044783a65fbc28071a2bd1c7bf36ff0";
+    sha256 = "7b413c391e8ad6607b7f7540d698a94349abd64e4935184c595f7cdcc69904c6";
   };
 
   buildInputs = [ libev ];