Merge branch 'master' into staging

Haskell rebuild :-)
Hydra: ?compare=1421865

nixos/modules/profiles/all-hardware.nix

@@ -19,13 +19,12 @@
       "sata_sil" "sata_sil24" "sata_sis" "sata_svw" "sata_sx4"
       "sata_uli" "sata_via" "sata_vsc"
 
-      "pata_ali" "pata_amd" "pata_artop" "pata_atiixp"
+      "pata_ali" "pata_amd" "pata_artop" "pata_atiixp" "pata_efar"
-      "pata_cs5520" "pata_cs5530" "pata_cs5535" "pata_efar"
       "pata_hpt366" "pata_hpt37x" "pata_hpt3x2n" "pata_hpt3x3"
       "pata_it8213" "pata_it821x" "pata_jmicron" "pata_marvell"
       "pata_mpiix" "pata_netcell" "pata_ns87410" "pata_oldpiix"
       "pata_pcmcia" "pata_pdc2027x" "pata_qdi" "pata_rz1000"
-      "pata_sc1200" "pata_serverworks" "pata_sil680" "pata_sis"
+      "pata_serverworks" "pata_sil680" "pata_sis"
       "pata_sl82c105" "pata_triflex" "pata_via"
       "pata_winbond"
 

pkgs/applications/audio/minimodem/default.nix

@@ -1,18 +1,29 @@
-{ stdenv, fetchurl, pkgconfig, fftw, fftwSinglePrec, alsaLib, libsndfile, libpulseaudio }:
+{ stdenv, fetchFromGitHub, pkgconfig, autoconf, automake, libtool
+, fftw, fftwSinglePrec, alsaLib, libsndfile, libpulseaudio
+}:
 
 stdenv.mkDerivation rec {
-  version = "0.19";
+  version = "0.24-1";
   pname = "minimodem";
   name = "${pname}-${version}";
 
-  src = fetchurl {
+  src = fetchFromGitHub {
-    url = "http://www.whence.com/${pname}/${name}.tar.gz";
+    owner = "kamalmostafa";
-    sha256 = "003xyqjq59wcjafrdv1b8w34xsn4nvzz51wwd7mqddajh0g4dz4g";
+    repo = "minimodem";
+    rev = "${pname}-${version}";
+    sha256 = "1b5xy36fjcp7vkp115dpx4mlmqg2fc7xvxdy648fb8im953bw7ql";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkgconfig autoconf automake libtool ];
   buildInputs = [ fftw fftwSinglePrec alsaLib libsndfile libpulseaudio ];
 
+  preConfigure = ''
+    aclocal \
+    && autoheader \
+    && automake --gnu --add-missing \
+    && autoconf
+  '';
+
   meta = {
     description = "General-purpose software audio FSK modem";
     longDescription = ''
@@ -28,3 +39,4 @@ stdenv.mkDerivation rec {
     maintainers = with stdenv.lib.maintainers; [ relrod ];
   };
 }
+

pkgs/applications/misc/multimon-ng/default.nix

@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, qt4, qmake4Hook, libpulseaudio }:
 let
-  version = "1.0.0";
+  version = "1.1.4";
 in
 stdenv.mkDerivation {
   name = "multimon-ng-${version}";
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "EliasOenal";
     repo = "multimon-ng";
-    rev = "4cc984f35f859539c94aa56d3fc6218a6de51148";
+    rev = "${version}";
     sha256 = "12z6f0ra2k0qh56pcvnwvlxd3msvr6yr97jvs7w5kf42jqbxdsga";
   };
 

pkgs/applications/misc/subsurface/default.nix

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

pkgs/applications/misc/veracrypt/default.nix

@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Free Open-Source filesystem on-the-fly encryption";
-    homepage = https://veracrypt.codeplex.com/;
+    homepage = https://www.veracrypt.fr/;
     license = "VeraCrypt License";
     maintainers = with maintainers; [ dsferruzza ];
     platforms = platforms.linux;

pkgs/development/compilers/ocaml/generic.nix

@@ -10,14 +10,18 @@ let
   safeX11 = stdenv: !(stdenv.isArm || stdenv.isMips);
 in
 
-{ stdenv, fetchurl, ncurses, buildEnv, libX11, xproto, useX11 ? safeX11 stdenv }:
+{ stdenv, fetchurl, ncurses, buildEnv
+, libX11, xproto, useX11 ? safeX11 stdenv
+, flambdaSupport ? false
+}:
 
 assert useX11 -> !stdenv.isArm && !stdenv.isMips;
+assert flambdaSupport -> stdenv.lib.versionAtLeast version "4.03";
 
 let
    useNativeCompilers = !stdenv.isMips;
-   inherit (stdenv.lib) optionals optionalString;
+   inherit (stdenv.lib) optional optionals optionalString;
-   name = "ocaml-${version}";
+   name = "ocaml${optionalString flambdaSupport "+flambda"}-${version}";
 in
 
 stdenv.mkDerivation (args // rec {
@@ -36,7 +40,9 @@ stdenv.mkDerivation (args // rec {
 
   prefixKey = "-prefix ";
   configureFlags = optionals useX11 [ "-x11lib" x11lib
-                                      "-x11include" x11inc ];
+                                      "-x11include" x11inc ]
+  ++ optional flambdaSupport "-flambda"
+  ;
 
   buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt";
   buildInputs = [ncurses] ++ optionals useX11 [ libX11 xproto ];

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

@@ -502,4 +502,7 @@ self: super: builtins.intersectAttrs super {
   partial-semigroup = dontCheck super.partial-semigroup;
   colour = dontCheck super.colour;
 
+  LDAP = dontCheck (overrideCabal super.LDAP (drv: {
+    librarySystemDepends = drv.librarySystemDepends or [] ++ [ pkgs.cyrus_sasl.dev ];
+  }));
 }

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

@@ -317,8 +317,14 @@ stdenv.mkDerivation ({
       local packageConfFile="$packageConfDir/${pname}-${version}.conf"
       mkdir -p "$packageConfDir"
       ${setupCommand} register --gen-pkg-config=$packageConfFile
-      local pkgId=$( ${gnused}/bin/sed -n -e 's|^id: ||p' $packageConfFile )
+      if [ -d "$packageConfFile" ]; then
-      mv $packageConfFile $packageConfDir/$pkgId.conf
+        mv "$packageConfFile"/* "$packageConfDir"
+        rmdir "$packageConfFile"
+      fi
+      for packageConfFile in "$packageConfDir"/*; do
+        local pkgId=$( ${gnused}/bin/sed -n -e 's|^id: ||p' $packageConfFile )
+        mv $packageConfFile $packageConfDir/$pkgId.conf
+      done
     ''}
     ${optionalString isGhcjs ''
       for exeDir in "$out/bin/"*.jsexe; do

pkgs/development/libraries/libhttpseverywhere/default.nix

@@ -1,7 +1,8 @@
-{stdenv, fetchurl, gnome3, glib, json_glib, libxml2, libarchive, libsoup, gobjectIntrospection, meson, ninja, pkgconfig,  valadoc}:
+{ stdenv, fetchurl, pkgconfig, meson, ninja, valadoc
+, gnome3, glib, json_glib, libarchive, libsoup, gobjectIntrospection }:
 
 stdenv.mkDerivation rec {
-  major = "0.4";
+  major = "0.6";
   minor = "5";
   version = "${major}.${minor}";
 
@@ -9,16 +10,20 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/libhttpseverywhere/${major}/libhttpseverywhere-${version}.tar.xz";
-    sha256 = "07sgcw285rl9wqr5k7srs3fj7fhgrrw6w780jx8wy8jw2bfwlvj2";
+    sha256 = "0ksf6vqjyjii29dvy5147dmgqlqsq4d70xxai0p2prkx4jrwgj3z";
   };
 
-  nativeBuildInputs = [ gnome3.vala valadoc  gobjectIntrospection meson ninja pkgconfig ];
+  nativeBuildInputs = [ gnome3.vala gobjectIntrospection meson ninja pkgconfig valadoc ];
-  buildInputs = [ glib gnome3.libgee libxml2 json_glib libsoup libarchive ];
+  buildInputs = [ glib gnome3.libgee json_glib libsoup libarchive ];
+
+  mesonFlags = "-Denable_valadoc=true";
 
   doCheck = true;
 
   checkPhase = "./httpseverywhere_test";
 
+  outputs = [ "out" "devdoc" ];
+
   meta = {
     description = "library to use HTTPSEverywhere in desktop applications";
     homepage    = https://git.gnome.org/browse/libhttpseverywhere;

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

@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub, ninja, meson, pkgconfig, gcc7, nixUnstable, isPy3k }:
+
+assert isPy3k;
+
+stdenv.mkDerivation rec {
+  name = "pythonix-${version}";
+  version = "0.1.0";
+
+  src = fetchFromGitHub {
+    owner = "Mic92";
+    repo = "pythonix";
+    rev = "v${version}";
+    sha256 = "1piblysypyr442a6najk4mdh87xc377i2fdbfw6fr569z60mnnnj";
+  };
+
+  nativeBuildInputs = [ meson pkgconfig ninja gcc7 ];
+
+  buildInputs = [ nixUnstable ];
+
+  meta = with stdenv.lib; {
+    description = ''
+       Eval nix code from python.
+    '';
+    maintainers = [ maintainers.mic92 ];
+    license = licenses.mit;
+    platforms = platforms.linux;
+  };
+}

pkgs/development/web/woff2/default.nix

@@ -0,0 +1,32 @@
+{ brotli, cmake, fetchFromGitHub, stdenv }:
+
+stdenv.mkDerivation rec {
+  name = "woff2-${version}";
+  version = "1.0.2";
+
+  src = fetchFromGitHub {
+    owner = "google";
+    repo = "woff2";
+    rev = "v${version}";
+    sha256 = "13l4g536h0pr84ww4wxs2za439s0xp1va55g6l478rfbb1spp44y";
+  };
+
+  outputs = [ "out" "dev" "lib" ];
+
+  nativeBuildInputs = [ cmake ];
+
+  buildInputs = [ brotli ];
+
+  # without this binaries only get built if shared libs are disable
+  patchPhase = ''
+    sed 's@^if (NOT BUILD_SHARED_LIBS)$@if (TRUE)@g' -i CMakeLists.txt
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Webfont compression reference code";
+    homepage = https://github.com/google/woff2;
+    license = licenses.mit;
+    maintainers = [ maintainers.hrdinka ];
+    platforms = platforms.unix;
+  };
+}

pkgs/os-specific/linux/wireguard/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libmnl, kernel ? null }:
+{ stdenv, fetchurl, libmnl, libelf, kernel ? null }:
 
 # module requires Linux >= 3.10 https://www.wireguard.io/install/#kernel-requirements
 assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "3.10";
@@ -6,11 +6,11 @@ assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "3.10";
 let
   name = "wireguard-${version}";
 
-  version = "0.0.20171111";
+  version = "0.0.20171221";
 
   src = fetchurl {
     url    = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
-    sha256 = "0mqix3v4qqwwa7hcd0h5rcwhc7yvm9jcl8b3v1vc4sj0m637fd6r";
+    sha256 = "1vf5dbwc2lgcf28k1m919w94hil2gcl0l4h4da1sh6r7kdz6k5rb";
   };
 
   meta = with stdenv.lib; {
@@ -37,6 +37,8 @@ let
 
     NIX_CFLAGS = ["-Wno-error=cpp"];
 
+    buildInputs = [ libelf ];
+
     buildPhase = "make module";
   };
 

pkgs/tools/backup/btrbk/btrbk-Prefix-PATH-instead-of-resetting-it.patch

@@ -1,39 +0,0 @@
-From d5978c207f2b266165140dd21e9746ace5792daf Mon Sep 17 00:00:00 2001
-From: Moritz Ulrich <moritz@tarn-vedra.de>
-Date: Fri, 18 Mar 2016 14:01:22 +0100
-Subject: [PATCH] btrbk: Prefix PATH instead of resetting it.
-
-Some distros don't even install use /usr/bin, /sbin, etc. (notably
-NixOS). Instead, they use PATH to specify which programs are available
-to a given executable.
-
-This patch changes the behavior or `btrbk` so it extends PATH with its
-own search paths instead of resetting it. This allows users and distros
-to specify their own custom location for `btrfs` via `PATH`.
----
- btrbk | 9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/btrbk b/btrbk
-index ab15858..0b91cbe 100755
---- a/btrbk
-+++ b/btrbk
-@@ -2464,10 +2464,11 @@ sub exit_status
- 
- MAIN:
- {
--  # set PATH instead of using absolute "/sbin/btrfs" (for now), as
--  # different distros (and even different versions of btrfs-progs)
--  # install the "btrfs" executable to different locations.
--  $ENV{PATH} = '/sbin:/bin:/usr/sbin:/usr/bin';
-+  # Prefix PATH with /sbin etc. instead of using absolute
-+  # "/sbin/btrfs" (for now), as different distros (and even different
-+  # versions of btrfs-progs) install the "btrfs" executable to
-+  # different locations.
-+  $ENV{PATH} .= '/sbin:/bin:/usr/sbin:/usr/bin';
- 
-   Getopt::Long::Configure qw(gnu_getopt);
-   $Data::Dumper::Sortkeys = 1;
--- 
-2.7.3
-

pkgs/tools/backup/btrbk/btrbk-mail-Use-btrbk-instead-of-unbound-variable-btr.patch

@@ -1,25 +0,0 @@
-From 8abe8a915aa2d0c79c4dbe00dc7d255c32b7b85d Mon Sep 17 00:00:00 2001
-From: Moritz Ulrich <moritz@tarn-vedra.de>
-Date: Fri, 18 Mar 2016 13:20:48 +0100
-Subject: [PATCH] btrbk-mail: Use `btrbk` instead of unbound variable `$btrbk`
-
----
- contrib/cron/btrbk-mail | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/contrib/cron/btrbk-mail b/contrib/cron/btrbk-mail
-index f7e4f12..9143f2d 100755
---- a/contrib/cron/btrbk-mail
-+++ b/contrib/cron/btrbk-mail
-@@ -113,7 +113,7 @@ case $exitcode in
- 	;;
-     10) status="ERROR: At least one backup task aborted!"
- 	;;
--    *)  status="ERROR: $btrbk failed with error code $exitcode"
-+    *)  status="ERROR: btrbk failed with error code $exitcode"
- 	;;
- esac
- 
--- 
-2.7.3
-

pkgs/tools/backup/btrbk/default.nix

@@ -1,25 +1,23 @@
-{ stdenv, fetchurl, coreutils, bash, btrfs-progs, openssh, perl, perlPackages, makeWrapper }:
+{ stdenv, fetchurl, coreutils, bash, btrfs-progs, openssh, perl, perlPackages
+, asciidoc-full, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "btrbk-${version}";
-  version = "0.25.1";
+  version = "0.26.0";
 
   src = fetchurl {
     url = "http://digint.ch/download/btrbk/releases/${name}.tar.xz";
-    sha256 = "02qc9vbd5l0ywnv01p60v9q3dcx2z92dfaf95qf7ccxqaa9zxfr5";
+    sha256 = "1brnh5x3fd91j3v8rz3van08m9i0ym4lv4hqz274s86v1kx4k330";
   };
 
-  patches = [
+  buildInputs = with perlPackages; [ asciidoc-full makeWrapper perl DateCalc ];
-    # https://github.com/digint/btrbk/pull/74
-    ./btrbk-Prefix-PATH-instead-of-resetting-it.patch
-  ];
-
-  buildInputs = with perlPackages; [ makeWrapper perl DateCalc ];
 
   preInstall = ''
-    substituteInPlace Makefile \
+    for f in $(find . -name Makefile); do
-      --replace "/usr" "$out" \
+      substituteInPlace "$f" \
-      --replace "/etc" "$out/etc"
+        --replace "/usr" "$out" \
+        --replace "/etc" "$out/etc"
+    done
 
     # Tainted Mode disables PERL5LIB
     substituteInPlace btrbk --replace "perl -T" "perl"

pkgs/top-level/all-packages.nix

@@ -5030,6 +5030,8 @@ with pkgs;
 
   whois = callPackage ../tools/networking/whois { };
 
+  woff2 = callPackage ../development/web/woff2 { };
+
   wsmancli = callPackage ../tools/system/wsmancli {};
 
   wolfebin = callPackage ../tools/networking/wolfebin {

pkgs/top-level/python-packages.nix

@@ -6646,6 +6646,8 @@ in {
     };
   };
 
+  pythonix = callPackage ../development/python-modules/pythonix { };
+
   pypolicyd-spf = buildPythonPackage rec {
     name = "pypolicyd-spf-${version}";
     majorVersion = "2.0";