Merge master into staging-next

2019-09-19 16:59:42 +02:00 · 2019-09-19 16:59:42 +02:00 · 0b12d44c06
parent 105abdd52c 6ff8b675e0
commit 0b12d44c06
44 changed files with 2345 additions and 1008 deletions
--- a/doc/cross-compilation.xml
+++ b/doc/cross-compilation.xml
@ -271,14 +271,14 @@
  <para>
   Nixpkgs can be instantiated with <varname>localSystem</varname> alone, in which case there is no cross-compiling and everything is built by and for that system, or also with <varname>crossSystem</varname>, in which case packages run on the latter, but all building happens on the former. Both parameters take the same schema as the 3 (build, host, and target) platforms defined in the previous section. As mentioned above, <literal>lib.systems.examples</literal> has some platforms which are used as arguments for these parameters in practice. You can use them programmatically, or on the command line:
 <programlisting>
-nix-build &lt;nixpkgs&gt; --arg crossSystem '(import &lt;nixpkgs/lib&gt;).systems.examples.fooBarBaz' -A whatever</programlisting>
+nix-build '&lt;nixpkgs&gt;' --arg crossSystem '(import &lt;nixpkgs/lib&gt;).systems.examples.fooBarBaz' -A whatever</programlisting>
  </para>

  <note>
   <para>
    Eventually we would like to make these platform examples an unnecessary convenience so that
 <programlisting>
-nix-build &lt;nixpkgs&gt; --arg crossSystem '{ config = "&lt;arch&gt;-&lt;os&gt;-&lt;vendor&gt;-&lt;abi&gt;"; }' -A whatever</programlisting>
+nix-build '&lt;nixpkgs&gt;' --arg crossSystem '{ config = "&lt;arch&gt;-&lt;os&gt;-&lt;vendor&gt;-&lt;abi&gt;"; }' -A whatever</programlisting>
    works in the vast majority of cases. The problem today is dependencies on other sorts of configuration which aren't given proper defaults. We rely on the examples to crudely to set those configuration parameters in some vaguely sane manner on the users behalf. Issue <link xlink:href="https://github.com/NixOS/nixpkgs/issues/34274">#34274</link> tracks this inconvenience along with its root cause in crufty configuration options.
   </para>
  </note>
--- a/doc/submitting-changes.xml
+++ b/doc/submitting-changes.xml
@ -244,7 +244,7 @@ Additional information.

   <para>
    When sandbox builds are enabled, Nix will setup an isolated environment for each build process. It is used to remove further hidden dependencies set by the build environment to improve reproducibility. This includes access to the network during the build outside of <function>fetch*</function> functions and files outside the Nix store. Depending on the operating system access to other resources are blocked as well (ex. inter process communication is isolated on Linux); see <link
-      xlink:href="https://nixos.org/nix/manual/#description-45">build-use-sandbox</link> in Nix manual for details.
+      xlink:href="https://nixos.org/nix/manual/#conf-sandbox">sandbox</link> in Nix manual for details.
   </para>

   <para>
@ -265,7 +265,7 @@ Additional information.
     <listitem>
      <para>
       <emphasis role="bold">Globally enable sandboxing on non-NixOS platforms</emphasis>: add the following to: <filename>/etc/nix/nix.conf</filename>
-<screen>build-use-sandbox = true</screen>
+<screen>sandbox = true</screen>
      </para>
     </listitem>
    </itemizedlist>
--- a/nixos/modules/config/xdg/icons.nix
+++ b/nixos/modules/config/xdg/icons.nix
@ -19,9 +19,20 @@ with lib;
      "/share/pixmaps"
    ];

-    environment.profileRelativeSessionVariables = {
-      XCURSOR_PATH = [ "/share/icons" ];
-    };
+    # libXcursor looks for cursors in XCURSOR_PATH
+    # it mostly follows the spec for icons
+    # See: https://www.x.org/releases/current/doc/man/man3/Xcursor.3.xhtml Themes
+
+    # These are preferred so they come first in the list
+    environment.sessionVariables.XCURSOR_PATH = [
+      "$HOME/.icons"
+      "$HOME/.local/share/icons"
+    ];
+
+    environment.profileRelativeSessionVariables.XCURSOR_PATH = [
+      "/share/icons"
+      "/share/pixmaps"
+    ];
  };

 }
--- a/nixos/modules/programs/environment.nix
+++ b/nixos/modules/programs/environment.nix
@ -20,7 +20,6 @@ in
      { NIXPKGS_CONFIG = "/etc/nix/nixpkgs-config.nix";
        PAGER = mkDefault "less -R";
        EDITOR = mkDefault "nano";
-        XCURSOR_PATH = [ "$HOME/.icons" ];
        XDG_CONFIG_DIRS = [ "/etc/xdg" ]; # needs to be before profile-relative paths to allow changes through environment.etc
        GTK_DATA_PREFIX = "${config.system.path}"; # needed for gtk2 apps to find themes
        GTK_EXE_PREFIX = "${config.system.path}";
--- a/nixos/modules/services/networking/jormungandr.nix
+++ b/nixos/modules/services/networking/jormungandr.nix
@ -14,8 +14,10 @@ let
    storage = dataDir;
    p2p = {
      public_address = "/ip4/127.0.0.1/tcp/8299";
-      messages = "high";
-      blocks = "high";
+      topics_of_interest = {
+        messages = "high";
+        blocks = "high";
+      };
    };
    rest = {
      listen = "127.0.0.1:8607";
--- a/nixos/modules/system/activation/switch-to-configuration.pl
+++ b/nixos/modules/system/activation/switch-to-configuration.pl
@ -10,6 +10,9 @@ use Cwd 'abs_path';

 my $out = "@out@";

+# FIXME: maybe we should use /proc/1/exe to get the current systemd.
+my $curSystemd = abs_path("/run/current-system/sw/bin");
+
 # To be robust against interruption, record what units need to be started etc.
 my $startListFile = "/run/systemd/start-list";
 my $restartListFile = "/run/systemd/restart-list";
@ -267,7 +270,7 @@ while (my ($unit, $state) = each %{$activePrev}) {
 sub pathToUnitName {
    my ($path) = @_;
    # Use current version of systemctl binary before daemon is reexeced.
-    open my $cmd, "-|", "/run/current-system/sw/bin/systemd-escape", "--suffix=mount", "-p", $path
+    open my $cmd, "-|", "$curSystemd/systemd-escape", "--suffix=mount", "-p", $path
        or die "Unable to escape $path!\n";
    my $escaped = join "", <$cmd>;
    chomp $escaped;
@ -370,7 +373,7 @@ if (scalar (keys %unitsToStop) > 0) {
    print STDERR "stopping the following units: ", join(", ", @unitsToStopFiltered), "\n"
        if scalar @unitsToStopFiltered;
    # Use current version of systemctl binary before daemon is reexeced.
-    system("/run/current-system/sw/bin/systemctl", "stop", "--", sort(keys %unitsToStop)); # FIXME: ignore errors?
+    system("$curSystemd/systemctl", "stop", "--", sort(keys %unitsToStop)); # FIXME: ignore errors?
 }

 print STDERR "NOT restarting the following changed units: ", join(", ", sort(keys %unitsToSkip)), "\n"
@ -382,10 +385,12 @@ my $res = 0;
 print STDERR "activating the configuration...\n";
 system("$out/activate", "$out") == 0 or $res = 2;

-# Restart systemd if necessary.
+# Restart systemd if necessary. Note that this is done using the
+# current version of systemd, just in case the new one has trouble
+# communicating with the running pid 1.
 if ($restartSystemd) {
    print STDERR "restarting systemd...\n";
-    system("@systemd@/bin/systemctl", "daemon-reexec") == 0 or $res = 2;
+    system("$curSystemd/systemctl", "daemon-reexec") == 0 or $res = 2;
 }

 # Forget about previously failed services.
@ -401,8 +406,10 @@ while (my $f = <$listActiveUsers>) {
    my ($uid, $name) = ($+{uid}, $+{user});
    print STDERR "reloading user units for $name...\n";

-    system("@su@", "-s", "@shell@", "-l", $name, "-c", "XDG_RUNTIME_DIR=/run/user/$uid @systemd@/bin/systemctl --user daemon-reload");
-    system("@su@", "-s", "@shell@", "-l", $name, "-c", "XDG_RUNTIME_DIR=/run/user/$uid @systemd@/bin/systemctl --user start nixos-activation.service");
+    system("@su@", "-s", "@shell@", "-l", $name, "-c",
+           "export XDG_RUNTIME_DIR=/run/user/$uid; " .
+           "$curSystemd/systemctl --user daemon-reexec; " .
+           "@systemd@/bin/systemctl --user start nixos-activation.service");
 }

 close $listActiveUsers;
--- a/pkgs/applications/blockchains/jormungandr/default.nix
+++ b/pkgs/applications/blockchains/jormungandr/default.nix
@ -10,16 +10,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "jormungandr";
-  version = "0.3.3";
+  version = "0.3.1415";

  src = fetchgit {
    url = "https://github.com/input-output-hk/${pname}";
    rev = "v${version}";
-    sha256 = "1fw3cl2rxnw9mww1b1z96x2iapwbpdgyp4ra19dhvfzmlvaiml5j";
+    sha256 = "1kg20570ri3bj99gicpp2z272igj9s7m2qw0z1ndk60bxcyghi2x";
    fetchSubmodules = true;
  };

-  cargoSha256 = "1ilp9ffaz3njv38mnqics4b5d7wh52mj4rwi71h5c0wzx4ww3zal";
+  cargoSha256 = "0b5phmvwv5cyjawlxd9rmlc403lxzm4gnw0mclq70g5g0msqzd9m";

  nativeBuildInputs = [ pkgconfig protobuf ];
  buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
--- a/pkgs/applications/misc/hubstaff/revision.json
+++ b/pkgs/applications/misc/hubstaff/revision.json
@ -1,5 +1,5 @@
 {
-  "url": "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.4.10-848554d6/Hubstaff-1.4.10-848554d6.sh",
-  "version": "1.4.10-848554d6",
-  "sha256": "1hwncdzpzawrwswr3ibhxny0aa5k9f8f2qf636bdzqilwhv6342z"
+  "url": "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.4.11-a12e5bad/Hubstaff-1.4.11-a12e5bad.sh",
+  "version": "1.4.11-a12e5bad",
+  "sha256": "0nqmw02spplqppvz2jniq5p5y69l8n5xp9wji4032kn4qsba33jn"
 }
--- a/pkgs/applications/misc/mystem/default.nix
+++ b/pkgs/applications/misc/mystem/default.nix
@ -6,7 +6,7 @@ stdenv.mkDerivation rec {

  src = fetchurl {
    url = "http://download.cdn.yandex.net/mystem/${pname}-${version}-linux-64bit.tar.gz";
-    sha256 = "0q3vxvyj5bqllqnlivy5llss39z7j0bgpn6kv8mrc54vjdhppx10";
+    sha256 = "0qha7jvkdmil3jiwrpsfhkqsbkqn9dzgx3ayxwjdmv73ikmg95j6";
  };

  buildCommand = ''
--- a/pkgs/applications/networking/browsers/vivaldi/default.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/default.nix
@ -17,11 +17,11 @@ let
  vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";
 in stdenv.mkDerivation rec {
  pname = "vivaldi";
-  version = "2.7.1628.33-1";
+  version = "2.8.1664.35-1";

  src = fetchurl {
    url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb";
-    sha256 = "1km5ccxqyd5xgmzm42zca670jf7wd4j7c726fhyj4wjni71zar34";
+    sha256 = "0wrpn2figljvq9xldpqb1wf81fpwj91ppi2lzvcg5ycpl2a90x7j";
  };

  unpackPhase = ''
--- a/pkgs/applications/networking/cluster/kubernetes/default.nix
+++ b/pkgs/applications/networking/cluster/kubernetes/default.nix
@ -15,13 +15,13 @@ with lib;

 stdenv.mkDerivation rec {
  pname = "kubernetes";
-  version = "1.15.3";
+  version = "1.15.4";

  src = fetchFromGitHub {
    owner = "kubernetes";
    repo = "kubernetes";
    rev = "v${version}";
-    sha256 = "0vamr7m8i5svmvb0z01cngv3sffdfjj0bky2zalm7cfnapib8vz1";
+    sha256 = "18wpqrgb1ils4g8ggg217xq4jq30i4m7par2mdjk59pmz7ssm25p";
  };

  buildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ];
--- a/pkgs/applications/video/mkvtoolnix/default.nix
+++ b/pkgs/applications/video/mkvtoolnix/default.nix
@ -50,6 +50,8 @@ stdenv.mkDerivation rec {
    (enableFeature withGUI "qt")
  ];

+  CXXFLAGS = optional stdenv.cc.isClang "-std=c++14";
+
  dontWrapQtApps = true;
  postFixup = optionalString withGUI ''
    wrapQtApp $out/bin/mkvtoolnix-gui
--- a/pkgs/build-support/rust/default.nix
+++ b/pkgs/build-support/rust/default.nix
@ -86,6 +86,10 @@ stdenv.mkDerivation (args // {
    ${stdenv.lib.optionalString (stdenv.buildPlatform.config != stdenv.hostPlatform.config) ''
    [target."${rustHostConfig}"]
    "linker" = "${ccForHost}"
+    ${# https://github.com/rust-lang/rust/issues/46651#issuecomment-433611633
+      stdenv.lib.optionalString (stdenv.hostPlatform.isMusl && stdenv.hostPlatform.isAarch64) ''
+    "rustflags" = [ "-C", "target-feature=+crt-static", "-C", "link-arg=-lgcc" ]
+    ''}
    ''}
    EOF

--- a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix
@ -27,15 +27,15 @@

 stdenv.mkDerivation rec {
  pname = "elementary-greeter";
-  version = "unstable-2019-09-10";
+  version = "5.0";

  repoName = "greeter";

  src = fetchFromGitHub {
    owner = "elementary";
    repo = repoName;
-    rev = "cad7d28d2b40ed04f6ce49ab44408297b5c69468";
-    sha256 = "0m8iq04wdwgg6arm7dzwi7a0snxvss62zpnw2knpr6lp77vd7hqr";
+    rev = version;
+    sha256 = "01c8acarxwpakyq69xm4bjwppjf8v3ijmns8masd8raxligb2v8b";
  };

  passthru = {
--- a/pkgs/development/compilers/scala/2.12.nix
+++ b/pkgs/development/compilers/scala/2.12.nix
@ -1,11 +1,11 @@
 { stdenv, fetchurl, makeWrapper, jre, gnugrep, coreutils }:

 stdenv.mkDerivation rec {
-  name = "scala-2.12.9";
+  name = "scala-2.12.10";

  src = fetchurl {
    url = "https://www.scala-lang.org/files/archive/${name}.tgz";
-    sha256 = "0wpnxrhnhhscfk0k8yxk86akpvxbr5w1i8jb2igj2q4vax7h97sy";
+    sha256 = "0sk5n3ir5zkgr8jayq5pn4l87ia5zmjr2zzwchgxkv8g62ivs4iv";
  };

  propagatedBuildInputs = [ jre ] ;
--- a/pkgs/development/compilers/scala/2.13.nix
+++ b/pkgs/development/compilers/scala/2.13.nix
@ -1,11 +1,11 @@
 { stdenv, fetchurl, makeWrapper, jre, gnugrep, coreutils }:

 stdenv.mkDerivation rec {
-  name = "scala-2.13.0";
+  name = "scala-2.13.1";

  src = fetchurl {
    url = "https://www.scala-lang.org/files/archive/${name}.tgz";
-    sha256 = "12g0a9i0xxqxxcvmimm5w2wgmrdhq80p8bsp52d6yldz4lrnbm7p";
+    sha256 = "1nq49acx3j6vnw0lhyrfqa23f671y3kc9lja4nki0j73jk2cq639";
  };

  propagatedBuildInputs = [ jre ] ;
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@ -69,7 +69,7 @@ self: super: {
      name = "git-annex-${super.git-annex.version}-src";
      url = "git://git-annex.branchable.com/";
      rev = "refs/tags/" + super.git-annex.version;
-      sha256 = "1795sad0jr2da2pn28nbqsvpld6zw8gf9yscywixkbabf7ls66fn";
+      sha256 = "1ackqjkwkfm3kazlyy4nwdjf6wwjlajql1hrznaki5138nw4gxs4";
    };
  }).override {
    dbus = if pkgs.stdenv.isLinux then self.dbus else null;
@ -1197,8 +1197,8 @@ self: super: {
  temporary-resourcet = doJailbreak super.temporary-resourcet;

  # Requires dhall >= 1.23.0
-  ats-pkg = super.ats-pkg.override { dhall = self.dhall_1_25_0; };
-  dhall-to-cabal = super.dhall-to-cabal.override { dhall = self.dhall_1_25_0; };
+  ats-pkg = super.ats-pkg.override { dhall = self.dhall_1_26_0; };
+  dhall-to-cabal = super.dhall-to-cabal.override { dhall = self.dhall_1_26_0; };

  # Test suite doesn't work with current QuickCheck
  # https://github.com/pruvisto/heap/issues/11
@ -1228,4 +1228,7 @@ self: super: {
    '';
  });

+  # The LTS-14.x version of optparse-applicative is too old.
+  cabal-plan = super.cabal-plan.override { optparse-applicative = self.optparse-applicative_0_15_1_0; };
+
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@ -70,11 +70,10 @@ self: super: {
      sha256 = "1p1pinca33vd10iy7hl20c1fc99vharcgcai6z3ngqbq50k2pd3q";
    };
  };
-  vector-th-unbox = appendPatch super.vector-th-unbox (pkgs.fetchpatch {
+  vector-th-unbox = appendPatch (doJailbreak super.vector-th-unbox) (pkgs.fetchpatch {
    url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/vector-th-unbox-0.2.1.6.patch";
    sha256 = "0169yf9ms1g5mmkc5l6hpffzm34zdrqdng4df02nbdmfgba45h19";
  });
-  cabal-doctest = super.cabal-doctest_1_0_7;
  regex-base = overrideCabal (appendPatch super.regex-base (pkgs.fetchpatch {
    url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/regex-base-0.93.2.patch";
    sha256 = "01d1plrdx6hcspwn2h6y9pyi5366qk926vb5cl5qcl6x4m23l6y1";
@ -85,10 +84,6 @@ self: super: {
    url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/regex-posix-0.95.2.patch";
    sha256 = "006yli58jpqp786zm1xlncjsilc38iv3a09r4pv94l587sdzasd2";
  });
-  haskell-src-exts = appendPatch super.haskell-src-exts (pkgs.fetchpatch {
-    url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/haskell-src-exts-1.21.0.patch";
-    sha256 = "0alb28hcsp774c9s73dgrajcb44vgv1xqfg2n5a9y2bpyngqscs3";
-  });
  optparse-applicative = appendPatch (doJailbreak super.optparse-applicative) (pkgs.fetchpatch {
    url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/optparse-applicative-0.14.3.0.patch";
    sha256 = "068sjj98jqiq3h8h03mg4w2pa11q8lxkx2i4lmxivq77xyhlwq3y";
@ -97,23 +92,15 @@ self: super: {
    url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/hackage-security-0.5.3.0.patch";
    sha256 = "0l8x0pbsn18fj5ak5q0g5rva4xw1s9yc4d86a1pfyaz467b9i5a4";
  });
-  happy = appendPatch super.happy (pkgs.fetchpatch {
-    url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/happy-1.19.11.patch";
-    sha256 = "16m659kxbq0s87ak2y1pqggfy67yfvcwc0zi3hcphf3v8735xhkk";
-  });
-  hedgehog = appendPatch super.hedgehog (pkgs.fetchpatch {
-    url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/hedgehog-0.6.1.patch";
-    sha256 = "04xwznd3lfgracfz68ls6vfm19rhq8fb74r6ii0grpv6cx4rr21i";
+  hedgehog = appendPatch (doJailbreak super.hedgehog) (pkgs.fetchpatch {
+    url = "https://gitlab.haskell.org/ghc/head.hackage/raw/master/patches/hedgehog-1.0.patch";
+    sha256 = "16gadh1hb74jqvzc9c893sffb1y2vjglblyrqjwp7xfhccq7g8yw";
  });
  easytest = self.easytest_0_3;
  regex-tdfa = appendPatch super.regex-tdfa (pkgs.fetchpatch {
    url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/regex-tdfa-1.2.3.1.patch";
    sha256 = "1lhas4s2ms666prb475gaw2bqw1v4y8cxi66sy20j727sx7ppjs7";
  });
-  attoparsec = appendPatch (doJailbreak super.attoparsec) (pkgs.fetchpatch {
-    url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/attoparsec-0.13.2.2.patch";
-    sha256 = "13i1p5g0xzxnv966nlyb77mfmxvg9jzbym1d36h1ajn045yf4igl";
-  });
  cassava = appendPatch super.cassava (pkgs.fetchpatch {
    url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/cassava-0.5.1.0.patch";
    sha256 = "11scwwjp94si90vb8v5yr291g9qwv5l223z8y0g0lc63932bp63g";
@ -122,7 +109,7 @@ self: super: {
    url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/shakespeare-2.0.20.patch";
    sha256 = "1dgx41ylahj4wk8r422aik0d7qdpawdga4gqz905nvlnhqjla58y";
  });
-  socks = appendPatch super.socks (pkgs.fetchpatch {
+  socks = appendPatch (doJailbreak super.socks) (pkgs.fetchpatch {
    url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/socks-0.6.0.patch";
    sha256 = "1dsqmx0sw62x4glh43c0sbizd2y00v5xybiqadn96v6pmfrap5cp";
  });
@ -159,14 +146,21 @@ self: super: {
    '';
  });
  system-fileio = doJailbreak super.system-fileio;
-  yaml = self.yaml_0_11_1_2;
+  tasty-hedgehog = doJailbreak super.tasty-hedgehog;
  haskell-src-meta = appendPatch (dontCheck (doJailbreak super.haskell-src-meta)) (pkgs.fetchpatch {
-    url = "https://gitlab.haskell.org/ghc/head.hackage/raw/master/patches/haskell-src-meta-0.8.2.patch";
-    sha256 = "146im1amywyl29kcldvgrxpwj22lrpzxysl7vc8rmn3hrq130dyc";
+    url = "https://gitlab.haskell.org/ghc/head.hackage/raw/master/patches/haskell-src-meta-0.8.3.patch";
+    sha256 = "1asl932mibr5y057xx8v1a7n3qy87lcnclsfh8pbxq1m3iwjkxy8";
  });
  asn1-encoding = appendPatch (dontCheck (doJailbreak super.asn1-encoding)) (pkgs.fetchpatch {
    url = "https://gitlab.haskell.org/ghc/head.hackage/raw/master/patches/asn1-encoding-0.9.5.patch";
    sha256 = "0a3159rnaw6shjzdm46799crd4pxh33s23qy51xa7z6nv5q8wsb5";
  });
  tls = self.tls_1_5_1;
+  vault = dontHaddock super.vault;
+
+  # TODO dont fetch patch if https://github.com/simonmar/alex/issues/140 is resolved
+  alex = appendPatch super.alex (pkgs.fetchpatch {
+    url = "https://github.com/simonmar/alex/commit/deaae6eddef5186bfd0e42e2c3ced39e26afa4d6.patch";
+    sha256 = "1v40gmnw4lqyk271wngdwz8whpfdhmza58srbkka8icwwwrck3l5";
+  });
 }
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@ -43,7 +43,7 @@ core-packages:
  - ghcjs-base-0

 default-package-overrides:
-  # LTS Haskell 14.5
+  # LTS Haskell 14.6
  - abstract-deque ==0.3
  - abstract-deque-tests ==0.3
  - abstract-par ==0.3.3
@ -55,7 +55,7 @@ default-package-overrides:
  - adjunctions ==4.4
  - adler32 ==0.1.2.0
  - advent-of-code-api ==0.1.2.3
-  - aeson ==1.4.4.0
+  - aeson ==1.4.5.0
  - aeson-attoparsec ==0.0.0
  - aeson-better-errors ==0.9.1.0
  - aeson-casing ==0.2.0.0
@ -98,7 +98,7 @@ default-package-overrides:
  - appendmap ==0.1.5
  - apply-refact ==0.6.0.0
  - apportionment ==0.0.0.3
-  - approximate ==0.3.1
+  - approximate ==0.3.2
  - app-settings ==0.2.0.12
  - arbor-lru-cache ==0.1.1.0
  - arithmoi ==0.9.0.0
@ -356,7 +356,7 @@ default-package-overrides:
  - comonad ==5.0.5
  - compact ==0.1.0.1
  - compactmap ==0.1.4.2.1
-  - compensated ==0.7.2
+  - compensated ==0.7.3
  - compiler-warnings ==0.1.0
  - composable-associations ==0.1.0.0
  - composable-associations-aeson ==0.1.0.0
@ -509,7 +509,7 @@ default-package-overrides:
  - dependent-map ==0.2.4.0
  - dependent-sum ==0.4
  - dependent-sum-template ==0.0.0.6
-  - deque ==0.4.2.3
+  - deque ==0.4.3
  - deriveJsonNoPrefix ==0.1.0.1
  - deriving-compat ==0.5.7
  - derulo ==1.0.5
@ -623,7 +623,7 @@ default-package-overrides:
  - eventful-sqlite ==0.2.0
  - eventful-test-helpers ==0.2.0
  - event-list ==0.1.2
-  - eventstore ==1.3.0
+  - eventstore ==1.3.1
  - every ==0.0.1
  - exact-combinatorics ==0.2.0.9
  - exact-pi ==0.5.0.1
@ -775,7 +775,7 @@ default-package-overrides:
  - ghc-lib-parser ==8.8.0.20190424
  - ghc-parser ==0.2.0.3
  - ghc-paths ==0.1.0.12
-  - ghc-prof ==1.4.1.5
+  - ghc-prof ==1.4.1.6
  - ghc-syntax-highlighter ==0.0.4.0
  - ghc-tcplugins-extra ==0.3
  - ghc-typelits-extra ==0.3.1
@ -806,7 +806,7 @@ default-package-overrides:
  - glabrous ==2.0.0
  - glaze ==0.3.0.1
  - glazier ==1.0.0.0
-  - GLFW-b ==3.2.1.0
+  - GLFW-b ==3.2.1.1
  - Glob ==0.10.0
  - gloss ==1.13.0.1
  - gloss-algorithms ==1.13.0.1
@ -863,8 +863,8 @@ default-package-overrides:
  - haskell-gi-base ==0.23.0
  - haskell-gi-overloading ==1.0
  - haskell-lexer ==1.0.2
-  - haskell-lsp ==0.15.0.1
-  - haskell-lsp-types ==0.15.0.1
+  - haskell-lsp ==0.15.0.0
+  - haskell-lsp-types ==0.15.0.0
  - haskell-names ==0.9.6
  - haskell-spacegoo ==0.2.0.1
  - haskell-src ==1.0.3.0
@ -967,7 +967,7 @@ default-package-overrides:
  - hslua-aeson ==1.0.0
  - hslua-module-system ==0.2.1
  - hslua-module-text ==0.2.1
-  - HsOpenSSL ==0.11.4.16
+  - HsOpenSSL ==0.11.4.17
  - HsOpenSSL-x509-system ==0.1.0.3
  - hsp ==0.10.0
  - hspec ==2.7.1
@ -1063,7 +1063,7 @@ default-package-overrides:
  - hxt-unicode ==9.0.2.4
  - hybrid-vectors ==0.2.2
  - hyper ==0.1.0.3
-  - hyperloglog ==0.4.2
+  - hyperloglog ==0.4.3
  - hyphenation ==0.8
  - hyraxAbif ==0.2.3.15
  - iconv ==0.4.1.3
@ -1086,7 +1086,7 @@ default-package-overrides:
  - indexed-list-literals ==0.2.1.2
  - infer-license ==0.2.0
  - inflections ==0.4.0.4
-  - influxdb ==1.7.1
+  - influxdb ==1.7.1.1
  - ini ==0.4.1
  - inj ==1.0
  - inline-c ==0.7.0.1
@ -1201,7 +1201,7 @@ default-package-overrides:
  - leapseconds-announced ==2017.1.0.1
  - learn-physics ==0.6.4
  - lens ==4.17.1
-  - lens-action ==0.2.3
+  - lens-action ==0.2.4
  - lens-aeson ==1.0.2
  - lens-datetime ==0.3
  - lens-family ==1.2.3
@ -1277,10 +1277,10 @@ default-package-overrides:
  - markdown-unlit ==0.5.0
  - markov-chain ==0.0.3.4
  - massiv ==0.4.1.0
-  - massiv-io ==0.1.6.0
+  - massiv-io ==0.1.7.0
  - massiv-test ==0.1.0
  - mathexpr ==0.3.0.0
-  - math-functions ==0.3.2.0
+  - math-functions ==0.3.2.1
  - matplotlib ==0.7.4
  - matrices ==0.5.0
  - matrix ==0.3.6.1
@ -1329,7 +1329,6 @@ default-package-overrides:
  - missing-foreign ==0.1.1
  - MissingH ==1.4.1.0
  - mixed-types-num ==0.4.0.1
-  - mixpanel-client ==0.2.1
  - mltool ==0.2.0.1
  - mmap ==0.5.9
  - mmark ==0.0.7.1
@ -1425,7 +1424,7 @@ default-package-overrides:
  - network-anonymous-i2p ==0.10.0
  - network-attoparsec ==0.12.2
  - network-bsd ==2.8.0.0
-  - network-byte-order ==0.1.1.0
+  - network-byte-order ==0.1.1.1
  - network-conduit-tls ==1.3.2
  - network-house ==0.1.0.2
  - network-info ==0.2.0.10
@ -1437,8 +1436,8 @@ default-package-overrides:
  - network-transport ==0.5.4
  - network-transport-composed ==0.2.1
  - network-uri ==2.6.1.0
-  - newtype ==0.2.1.0
-  - newtype-generics ==0.5.3
+  - newtype ==0.2.2.0
+  - newtype-generics ==0.5.4
  - nicify-lib ==1.0.1
  - NineP ==0.0.2.1
  - nix-paths ==1.0.1
@ -1480,7 +1479,7 @@ default-package-overrides:
  - OneTuple ==0.2.2
  - Only ==0.1
  - oo-prototypes ==0.1.0.0
-  - opaleye ==0.6.7004.0
+  - opaleye ==0.6.7004.1
  - OpenAL ==1.7.0.5
  - open-browser ==0.2.1.0
  - openexr-write ==0.1.0.2
@ -1663,7 +1662,7 @@ default-package-overrides:
  - protocol-buffers ==2.4.12
  - protocol-buffers-descriptor ==2.4.12
  - protocol-radius ==0.0.1.1
-  - protocol-radius-test ==0.1.0.0
+  - protocol-radius-test ==0.1.0.1
  - proto-lens ==0.5.1.0
  - proto-lens-arbitrary ==0.1.2.7
  - proto-lens-optparse ==0.1.1.5
@ -1679,8 +1678,7 @@ default-package-overrides:
  - purescript-bridge ==0.13.0.0
  - pure-zlib ==0.6.6
  - pushbullet-types ==0.4.1.0
-  - pusher-http-haskell ==1.5.1.9
-  - PyF ==0.8.1.0
+  - pusher-http-haskell ==1.5.1.10
  - qchas ==1.1.0.1
  - qm-interpolated-string ==0.3.0.0
  - qnap-decrypt ==0.3.5
@ -1733,7 +1731,7 @@ default-package-overrides:
  - read-editor ==0.1.0.2
  - read-env-var ==1.0.0.0
  - reanimate ==0.1.5.0
-  - reanimate-svg ==0.9.1.0
+  - reanimate-svg ==0.9.1.1
  - rebase ==1.3.1.1
  - record-dot-preprocessor ==0.2
  - record-hasfield ==1.0
@ -1769,6 +1767,8 @@ default-package-overrides:
  - repa ==3.4.1.4
  - repa-algorithms ==3.4.1.3
  - repa-io ==3.4.1.1
+  - replace-attoparsec ==1.0.1.0
+  - replace-megaparsec ==1.1.3.0
  - repline ==0.2.1.0
  - req ==2.1.0
  - req-conduit ==1.0.0
@ -1883,7 +1883,7 @@ default-package-overrides:
  - servant-pipes ==0.15
  - servant-ruby ==0.9.0.0
  - servant-server ==0.16.2
-  - servant-static-th ==0.2.2.0
+  - servant-static-th ==0.2.2.1
  - servant-swagger ==1.1.7.1
  - servant-swagger-ui ==0.3.4.3.22.2
  - servant-swagger-ui-core ==0.3.3
@ -1921,7 +1921,7 @@ default-package-overrides:
  - simple ==0.11.3
  - simple-cabal ==0.0.0.1
  - simple-cmd ==0.2.0.1
-  - simple-cmd-args ==0.1.2
+  - simple-cmd-args ==0.1.3
  - simple-log ==0.9.12
  - simple-reflect ==0.3.3
  - simple-sendfile ==0.2.28
@ -2011,7 +2011,7 @@ default-package-overrides:
  - strict ==0.3.2
  - strict-base-types ==0.6.1
  - strict-concurrency ==0.2.4.3
-  - strict-list ==0.1.4
+  - strict-list ==0.1.5
  - stringbuilder ==0.5.1
  - string-class ==0.1.7.0
  - string-combinators ==0.6.0.5
@ -2180,7 +2180,7 @@ default-package-overrides:
  - tonatona-servant ==0.1.0.2
  - torsor ==0.1
  - tostring ==0.2.1.1
-  - TotalMap ==0.1.0.0
+  - TotalMap ==0.1.1.1
  - tracing ==0.0.4.0
  - transaction ==0.1.1.3
  - transformers-base ==0.4.5.2
@ -2245,11 +2245,11 @@ default-package-overrides:
  - unique-logic ==0.4
  - unique-logic-tf ==0.5.1
  - unit-constraint ==0.0.0
-  - universe ==1.1
+  - universe ==1.1.1
  - universe-base ==1.1.1
  - universe-dependent-sum ==1.1.0.1
  - universe-instances-base ==1.1
-  - universe-instances-extended ==1.1
+  - universe-instances-extended ==1.1.1
  - universe-instances-trans ==1.1
  - universe-reverse-instances ==1.1
  - universum ==1.5.0
@ -2309,7 +2309,7 @@ default-package-overrides:
  - verbosity ==0.3.0.0
  - versions ==3.5.1.1
  - ViennaRNAParser ==1.3.3
-  - viewprof ==0.0.0.29
+  - viewprof ==0.0.0.30
  - vinyl ==0.11.0
  - vivid ==0.4.2.3
  - vivid-osc ==0.5.0.0
@ -2339,7 +2339,7 @@ default-package-overrides:
  - wai-transformers ==0.1.0
  - wai-websockets ==3.0.1.2
  - warp ==3.2.28
-  - warp-tls ==3.2.7
+  - warp-tls ==3.2.8
  - warp-tls-uid ==0.2.0.6
  - wave ==0.2.0
  - wcwidth ==0.0.2
@ -2435,7 +2435,7 @@ default-package-overrides:
  - yesod-csp ==0.2.5.0
  - yesod-eventsource ==1.6.0
  - yesod-fb ==0.5.0
-  - yesod-form ==1.6.6
+  - yesod-form ==1.6.7
  - yesod-form-bootstrap4 ==2.1.2
  - yesod-gitrepo ==0.3.0
  - yesod-gitrev ==0.2.1
@ -3116,6 +3116,7 @@ broken-packages:
  - armor
  - arpa
  - arpack
+  - array-builder
  - array-chunks
  - array-forth
  - array-primops
@ -4741,6 +4742,11 @@ broken-packages:
  - feed-translator
  - feed2lj
  - feed2twitter
+  - fei-base
+  - fei-cocoapi
+  - fei-dataiter
+  - fei-examples
+  - fei-nn
  - feldspar-compiler
  - feldspar-language
  - fenfire
@ -4786,6 +4792,7 @@ broken-packages:
  - findhttp
  - fingertree-psqueue
  - fingertree-tf
+  - finitary-derive
  - FiniteMap
  - firefly-example
  - first-and-last
@ -5087,6 +5094,7 @@ broken-packages:
  - ghci-history-parser
  - ghci-lib
  - ghci-ng
+  - ghcide
  - ghcjs-base-stub
  - ghcjs-dom-jsffi
  - ghcjs-fetch
@ -5709,6 +5717,7 @@ broken-packages:
  - hdbi-tests
  - hdf
  - hDFA
+  - hdiff
  - hdigest
  - hdirect
  - hdis86
@ -6376,6 +6385,7 @@ broken-packages:
  - ide-backend-server
  - ideas
  - ideas-math
+  - ideas-math-types
  - idempotent
  - identifiers
  - idiii
@ -7150,9 +7160,6 @@ broken-packages:
  - marxup
  - masakazu-bot
  - MASMGen
-  - massiv
-  - massiv-io
-  - massiv-test
  - master-plan
  - matchable-th
  - matchers
@ -8691,7 +8698,6 @@ broken-packages:
  - scenegraph
  - schedevr
  - schedule-planner
-  - scheduler
  - schedyield
  - schematic
  - scholdoc
@ -9565,6 +9571,7 @@ broken-packages:
  - through-text
  - throwable-exceptions
  - thumbnail-plus
+  - thumbnail-polish
  - tic-tac-toe
  - tickle
  - TicTacToe
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@ -589,7 +589,7 @@ self: super: builtins.intersectAttrs super {
  snap-server = dontCheck super.snap-server;

  # Tests require internet
-  dhall_1_25_0 = dontCheck super.dhall_1_25_0;
+  dhall_1_26_0 = dontCheck super.dhall_1_26_0;
  http-download = dontCheck super.http-download;
  pantry = dontCheck super.pantry;

--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
--- a/pkgs/development/libraries/packr/default.nix
+++ b/pkgs/development/libraries/packr/default.nix
@ -5,16 +5,18 @@

 buildGoModule rec {
  pname = "packr";
-  version = "2.5.2";
+  version = "2.6.0";

  src = fetchFromGitHub {
    owner = "gobuffalo";
    repo = pname;
    rev = "v${version}";
-    sha256 = "1ciffa5xbd93fylwz93wr4m4fj83dcla55dmdshaqz28rbsapnc1";
+    sha256 = "11bd0s3hyzvhcg1q0iahv2w9f0w1k57jfxgswhz7dyndxvvr2b8i";
  };

-  modSha256 = "086gydrl3i35hawb5m7rsb4a0llcpdpgid1xfw2z9n6jkwkclw4n";
+  subPackages = [ "packr" "v2/packr2" ];
+
+  modSha256 = "0afhkvivma16bi8rz3kwcsz9mhmcn4zm6rrymxkvazx6b844hcdv";

  meta = with lib; {
    description = "The simple and easy way to embed static files into Go binaries";
--- a/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix
@ -4,7 +4,7 @@

 buildDunePackage rec {
  pname = "ppx_deriving_yojson";
-  version = "3.3";
+  version = "3.5.1";

  minimumOCamlVersion = "4.04";

@ -12,7 +12,7 @@ buildDunePackage rec {
    owner = "ocaml-ppx";
    repo = "ppx_deriving_yojson";
    rev = "v${version}";
-    sha256 = "1gbfziw03r9azqlsmyn6izrgrf1xc30s88jgdany1kblpgq41rsz";
+    sha256 = "13nscby635vab9jf5pl1wgmdmqw192nf2r26m3gr01hp3bpn38zh";
  };

  buildInputs = [ ppxfind ounit ];
--- a/pkgs/development/python-modules/premailer/default.nix
+++ b/pkgs/development/python-modules/premailer/default.nix
@ -1,22 +1,22 @@
 { lib, buildPythonPackage, fetchPypi,
-  cssselect, cssutils, lxml, mock, nose, requests
+  cssselect, cssutils, lxml, mock, nose, requests, cachetools
 }:

 buildPythonPackage rec {
  pname = "premailer";
  version = "3.3.0";

-  meta = {
-    description = "Turns CSS blocks into style attributes ";
-    homepage = https://github.com/peterbe/premailer;
-    license = lib.licenses.bsd3;
-  };
-
  src = fetchPypi {
    inherit pname version;
    sha256 = "93be4f197e9d2a87a8fe6b5b6a79b64070dbb523108dfaf2a415b4558fc78ec1";
  };

  buildInputs = [ mock nose ];
-  propagatedBuildInputs = [ cssselect cssutils lxml requests ];
+  propagatedBuildInputs = [ cachetools cssselect cssutils lxml requests ];
+
+  meta = {
+    description = "Turns CSS blocks into style attributes ";
+    homepage = https://github.com/peterbe/premailer;
+    license = lib.licenses.bsd3;
+  };
 }
--- a/pkgs/development/python-modules/pyperf/default.nix
+++ b/pkgs/development/python-modules/pyperf/default.nix
@ -14,12 +14,12 @@
 }:

 buildPythonPackage rec {
-  pname = "perf";
-  version = "1.6.0";
+  pname = "pyperf";
+  version = "1.6.1";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "1vrv83v8rhyl51yaxlqzw567vz5a9qwkymk3vqvcl5sa2yd3mzgp";
+    sha256 = "8d0143a22a13ee10c997a648f30b82cdc40175d5a20b11055ae058a82e45d371";
  };

  checkInputs = [ nose psutil ] ++
@ -36,7 +36,7 @@ buildPythonPackage rec {

  meta = with lib; {
    description = "Python module to generate and modify perf";
-    homepage = https://github.com/vstinner/perf;
+    homepage = "https://pyperf.readthedocs.io/";
    license = licenses.mit;
    maintainers = [ maintainers.costrouc ];
  };
--- a/pkgs/development/tools/analysis/radare2/default.nix
+++ b/pkgs/development/tools/analysis/radare2/default.nix
@ -110,17 +110,17 @@ in {
  #<generated>
  # DO NOT EDIT! Automatically generated by ./update.py
  radare2 = generic {
-    version_commit = "22646";
-    gittap = "3.8.0";
-    gittip = "b4860e4eecad2053202965926f16296864b2f1e5";
-    rev = "3.8.0";
-    version = "3.8.0";
-    sha256 = "0rx6az2vpqy12lvzpxx9pappqj84d88daj8bis3zsffqgmhsafcd";
+    version_commit = "22775";
+    gittap = "3.9.0";
+    gittip = "2afe613741d07f35a5d80bc4e2dade2113ae6a74";
+    rev = "3.9.0";
+    version = "3.9.0";
+    sha256 = "0jzz3fzcr9xm8q6n86mhrf30h6cbh147ss9h993cm34fd4d5z7ah";
    cs_ver = "4.0.1";
    cs_sha256 = "0ijwxxk71nr9z91yxw20zfj4bbsbrgvixps5c7cpj163xlzlwba6";
  };
  r2-for-cutter = generic {
-    version_commit = "22265";
+    version_commit = "22775";
    gittap = "3.6.0";
    gittip = "ff3bb6e3b2e6a519b4c975d05758c171a5186389";
    rev = "ff3bb6e3b2e6a519b4c975d05758c171a5186389";
--- a/pkgs/development/tools/jazzy/Gemfile.lock
+++ b/pkgs/development/tools/jazzy/Gemfile.lock
@ -51,7 +51,7 @@ GEM
    gh_inspector (1.1.3)
    i18n (0.9.5)
      concurrent-ruby (~> 1.0)
-    jazzy (0.11.0)
+    jazzy (0.11.1)
      cocoapods (~> 1.5)
      mustache (~> 1.1)
      open4
@ -69,9 +69,9 @@ GEM
    netrc (0.11.0)
    open4 (1.3.4)
    redcarpet (3.5.0)
-    rouge (3.10.0)
+    rouge (3.11.0)
    ruby-macho (1.4.0)
-    sassc (2.2.0)
+    sassc (2.2.1)
      ffi (~> 1.9)
    sqlite3 (1.4.1)
    thread_safe (0.3.6)
--- a/pkgs/development/tools/jazzy/gemset.nix
+++ b/pkgs/development/tools/jazzy/gemset.nix
@ -209,10 +209,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0cwsmijhb845lrkwq1gxwa6a698vp47gdxcpav30dghrf1ikyzqm";
+      sha256 = "0kdja4bhzak79xvfpwwakqsjw07vfg458d62k08a416im7xcfcmc";
      type = "gem";
    };
-    version = "0.11.0";
+    version = "0.11.1";
  };
  liferaft = {
    source = {
@ -301,10 +301,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "07j29vbgsi9v7kpx4lqpmh0hx59i420jig73dy46wx3id1i7vdqz";
+      sha256 = "1zsyv6abqrk7lpql5f1ja4m88bfy9qndi8xykpss6cpvjdmi3ydb";
      type = "gem";
    };
-    version = "3.10.0";
+    version = "3.11.0";
  };
  ruby-macho = {
    groups = ["default"];
@ -322,10 +322,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "178iflma5z4qk2lfzlxk8kh942skj45q6v6xwllkqng9xbjlyzkf";
+      sha256 = "09bnid7r5z5hcin5hykvpvv8xig27wbbckxwis60z2aaxq4j9siz";
      type = "gem";
    };
-    version = "2.2.0";
+    version = "2.2.1";
  };
  sqlite3 = {
    groups = ["default"];
--- a/pkgs/development/tools/misc/circleci-cli/default.nix
+++ b/pkgs/development/tools/misc/circleci-cli/default.nix
@ -1,22 +1,26 @@
-{ stdenv, fetchFromGitHub, buildGoPackage }:
+{ stdenv, fetchFromGitHub, buildGoModule }:

-let
-  owner = "CircleCI-Public";
+buildGoModule rec {
  pname = "circleci-cli";
-  version = "0.1.2569";
-in
-buildGoPackage {
-  name = "${pname}-${version}";
-  inherit version;
+  version = "0.1.5879";

-  src =  fetchFromGitHub {
-    inherit owner;
+  src = fetchFromGitHub {
+    owner = "CircleCI-Public";
    repo = pname;
    rev = "v${version}";
-    sha256 = "0ixiqx8rmia02r44zbhw149p5x9r9cv1fsnlhl8p2x5zd2bdr18x";
+    sha256 = "1471g56apaw0c5dpa0jrr7hvzh3kbwfr3yr0m4mz2dlf27d481ac";
  };

-  goPackagePath = "github.com/${owner}/${pname}";
+  modSha256 = "0cvmcsl00jfikpkw3f7k5zw65156z5g5l2b6s5803a2i9d613268";
+
+  preBuild = ''
+    substituteInPlace data/data.go \
+      --replace 'packr.New("circleci-cli-box", "../_data")' 'packr.New("circleci-cli-box", "${placeholder "out"}/share/circleci-cli")'
+  '';
+
+  postInstall = ''
+    install -Dm644 -t $out/share/circleci-cli _data/data.yml
+  '';

  meta = with stdenv.lib; {
    # Box blurb edited from the AUR package circleci-cli
@ -25,7 +29,6 @@ buildGoPackage {
      run jobs as if they were running on the hosted CirleCI application.
    '';
    maintainers = with maintainers; [ synthetica ];
-    platforms = platforms.unix;
    license = licenses.mit;
    homepage = https://circleci.com/;
  };
--- a/pkgs/development/tools/qtcreator/default.nix
+++ b/pkgs/development/tools/qtcreator/default.nix
@ -1,9 +1,9 @@
-{ stdenv, fetchurl, fetchgit, fetchpatch, makeWrapper
+{ mkDerivation, lib, fetchurl, fetchgit, fetchpatch
 , qtbase, qtquickcontrols, qtscript, qtdeclarative, qmake, llvmPackages_8
 , withDocumentation ? false
 }:

-with stdenv.lib;
+with lib;

 let
  baseVersion = "4.9";
@ -21,7 +21,7 @@ let
  });
 in

-stdenv.mkDerivation rec {
+mkDerivation rec {
  pname = "qtcreator";
  version = "${baseVersion}.${revision}";

--- a/pkgs/development/web/nodejs/v10.nix
+++ b/pkgs/development/web/nodejs/v10.nix
@ -5,6 +5,6 @@ let
 in
  buildNodejs {
    inherit enableNpm;
-    version = "10.16.0";
-    sha256 = "0236jlb1hxhzqjlmmlxipcycrndiq92c8434iyy7zshh3n4pzqqq";
+    version = "10.16.3";
+    sha256 = "1gbblbmvx7a0wkgp3fs2pf5c1hymdpnfc7zqp1slg5hmfhyi5wbv";
  }
--- a/pkgs/games/openttd/default.nix
+++ b/pkgs/games/openttd/default.nix
@ -29,11 +29,11 @@ let
 in
 stdenv.mkDerivation rec {
  pname = "openttd";
-  version = "1.9.2";
+  version = "1.9.3";

  src = fetchurl {
    url = "https://proxy.binaries.openttd.org/openttd-releases/${version}/${pname}-${version}-source.tar.xz";
-    sha256 = "0jjnnzp1a2l8j1cla28pr460lx6cg4ql3acqfxhxv8a5a4jqrzzr";
+    sha256 = "0ijq72kgx997ggw40i5f4a3nf7y2g72z37l47i18yjvgbdzy320r";
  };

  nativeBuildInputs = [ pkgconfig makeWrapper ];
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@ -3,7 +3,7 @@
 with stdenv.lib;

 buildLinux (args // rec {
-  version = "4.14.144";
+  version = "4.14.145";

  # modDirVersion needs to be x.y.z, will automatically add .0 if needed
  modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {

  src = fetchurl {
    url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0m6a0ggg6sxhpzmmbczwxpil5s0ndlvf4bd6zx4v4q50bdkq92yb";
+    sha256 = "0aa9b7ni6wadm43260vidqy4ngvws25027psbdnkl9hkcy0ba1gb";
  };
 } // (args.argsOverride or {}))
--- a/pkgs/os-specific/linux/kernel/linux-4.19.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix
@ -3,7 +3,7 @@
 with stdenv.lib;

 buildLinux (args // rec {
-  version = "4.19.73";
+  version = "4.19.74";

  # modDirVersion needs to be x.y.z, will automatically add .0 if needed
  modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {

  src = fetchurl {
    url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1asz4zyfw7iyg68x3h8r5pgbqpk4vpblfzcb295xmn52y9zfgdbx";
+    sha256 = "10pfg5sijw9sx66ybrb06nlmlvj0sxxa1yjhg6qwdhi9sgm2yp29";
  };
 } // (args.argsOverride or {}))
--- a/pkgs/os-specific/linux/kernel/linux-5.2.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.2.nix
@ -3,7 +3,7 @@
 with stdenv.lib;

 buildLinux (args // rec {
-  version = "5.2.15";
+  version = "5.2.16";

  # modDirVersion needs to be x.y.z, will automatically add .0 if needed
  modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {

  src = fetchurl {
    url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "0jhc70r2rygm91qifjagg1jgbpjwyyq6m8g1n5iv81l1v84i0mpb";
+    sha256 = "0xg5jnkmc7b552jrhi200ck7q4hql3az2fpjfwxj3ay8xp4n280c";
  };
 } // (args.argsOverride or {}))
--- a/pkgs/os-specific/linux/microcode/intel.nix
+++ b/pkgs/os-specific/linux/microcode/intel.nix
@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  pname = "microcode-intel";
-  version = "20190618";
+  version = "20190918";

  src = fetchFromGitHub {
    owner = "intel";
    repo = "Intel-Linux-Processor-Microcode-Data-Files";
    rev = "microcode-${version}";
-    sha256 = "0fdhrpxvsq0rm5mzj82gvmfb3lm7mhc9hwvimv7dl1jaidbp6lvs";
+    sha256 = "0v668mfqxn6wzyng68aqaffh75gc215k13n6d5g7zisivvv2bgdp";
  };

  nativeBuildInputs = [ iucode-tool libarchive ];
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@ -223,7 +223,7 @@ in stdenv.mkDerivation {
  # in a backwards-incompatible way.  If the interface version of two
  # systemd builds is the same, then we can switch between them at
  # runtime; otherwise we can't and we need to reboot.
-  passthru.interfaceVersion = 3;
+  passthru.interfaceVersion = 2;

  meta = with stdenv.lib; {
    homepage = http://www.freedesktop.org/wiki/Software/systemd;
--- a/pkgs/servers/dns/bind/default.nix
+++ b/pkgs/servers/dns/bind/default.nix
@ -8,15 +8,13 @@
 assert enableSeccomp -> libseccomp != null;
 assert enablePython -> python3 != null;

-let version = "9.14.4"; in
-
 stdenv.mkDerivation rec {
  pname = "bind";
-  inherit version;
+  version = "9.14.6";

  src = fetchurl {
    url = "https://ftp.isc.org/isc/bind9/${version}/${pname}-${version}.tar.gz";
-    sha256 = "0gxqws7ml15lwkjw9mdcd759gv5kk3s9m17j3vrp9448ls1gnbii";
+    sha256 = "1zpd47ckn5lf4qbscfkj7krngwn2gwsp961v5401h3lhxm0a0rw9";
  };

  outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ];
--- a/pkgs/servers/mqtt/mosquitto/default.nix
+++ b/pkgs/servers/mqtt/mosquitto/default.nix
@ -4,13 +4,13 @@

 stdenv.mkDerivation rec {
  pname = "mosquitto";
-  version = "1.6.5";
+  version = "1.6.6";

  src = fetchFromGitHub {
    owner  = "eclipse";
    repo   = "mosquitto";
    rev    = "v${version}";
-    sha256 = "0scgsi3rvs9s8vxv4r7d5d9ixbsfg4dwnjcy6zxwdz9dfn8qnngj";
+    sha256 = "01a1vf0rgncmhk7v9vnj4gdx0j8jfiy95f2hr4iwqdch7jy5q367";
  };

  postPatch = ''
--- a/pkgs/tools/misc/datamash/default.nix
+++ b/pkgs/tools/misc/datamash/default.nix
@ -2,11 +2,11 @@

 stdenv.mkDerivation rec {
  pname = "datamash";
-  version = "1.4";
+  version = "1.5";

  src = fetchurl {
-    url = "mirror://gnu/datamash/${pname}-${version}.tar.gz";
-    sha256 = "fa44dd2d5456bcb94ef49dfc6cfe62c83fd53ac435119a85d34e6812f6e6472a";
+    url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz";
+    sha256 = "1b91pbdarnfmbhid8aa2f50k0fln8n7pg62782b4y0jlzvaljqi2";
  };

  meta = with stdenv.lib; {
--- a/pkgs/tools/networking/ntopng/0003-New-libpcap-defines-SOCKET.patch
+++ b/pkgs/tools/networking/ntopng/0003-New-libpcap-defines-SOCKET.patch
@ -0,0 +1,34 @@
+From 9cb650ea96c0e5063775071cfdae072e92c553b8 Mon Sep 17 00:00:00 2001
+From: emanuele-f <faranda@ntop.org>
+Date: Tue, 18 Sep 2018 12:49:57 +0200
+Subject: [PATCH] Compilation fix with new libpcap
+
+SOCKET and INVALID_SOCKET are now defined in pcap.h
+---
+ third-party/mongoose/mongoose.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/third-party/mongoose/mongoose.c b/third-party/mongoose/mongoose.c
+index 6a61cea9b..634c142e3 100644
+--- a/third-party/mongoose/mongoose.c
+++ b/third-party/mongoose/mongoose.c
+@@ -247,7 +247,9 @@ struct pollfd {
+ #define mg_rename(x, y) rename(x, y)
+ #define mg_sleep(x) usleep((x) * 1000)
+ #define ERRNO errno
+#ifndef INVALID_SOCKET
+ #define INVALID_SOCKET (-1)
+#endif
+ 
+ /* ntop */
+ #if ((ULONG_MAX) == (UINT_MAX))
+@@ -270,7 +272,9 @@ struct pollfd {
+ #endif
+ 
+ //#define INT64_FMT PRId64
+#ifndef SOCKET
+ typedef int SOCKET;
+#endif
+ #define WINCDECL
+ 
+ #endif // End of Windows and UNIX specific includes
--- a/pkgs/tools/networking/ntopng/default.nix
+++ b/pkgs/tools/networking/ntopng/default.nix
@ -20,6 +20,7 @@ stdenv.mkDerivation rec {
  patches = [
    ./0001-Undo-weird-modification-of-data_dir.patch
    ./0002-Remove-requirement-to-have-writeable-callback-dir.patch
+    ./0003-New-libpcap-defines-SOCKET.patch
  ];

  buildInputs = [ libpcap/* gnutls libgcrypt*/ libxml2 glib geoip geolite-legacy
@ -62,6 +63,5 @@ stdenv.mkDerivation rec {
    license = licenses.gpl3Plus;
    platforms = platforms.linux ++ platforms.darwin;
    maintainers = [ maintainers.bjornfor ];
-    broken = true;  # broken since commit "libpcap: 1.8.1 -> 1.9.0"
  };
 }
--- a/pkgs/tools/system/vboot_reference/default.nix
+++ b/pkgs/tools/system/vboot_reference/default.nix
@ -19,6 +19,11 @@ stdenv.mkDerivation rec {

  patches = [ ./dont_static_link.patch ];

+  postPatch = ''
+    substituteInPlace Makefile \
+      --replace "ar qc" '${stdenv.cc.bintools.targetPrefix}ar qc'
+  '';
+
  preBuild = ''
    patchShebangs scripts
  '';
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@ -821,7 +821,7 @@ in {

  pdfx = callPackage ../development/python-modules/pdfx { };

-  perf = callPackage ../development/python-modules/perf { };
+  pyperf = callPackage ../development/python-modules/pyperf { };

  perfplot = callPackage ../development/python-modules/perfplot { };