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

doc/languages-frameworks/haskell.md

@@ -875,12 +875,17 @@ to your own Haskell packages and integrate that in a Continuous Integration
 server like [hydra](https://nixos.org/hydra/) to assure your packages maintain a
 minimum level of quality. This section discusses some of these functions.
 
+#### failOnAllWarnings
+
+Applying `haskell.lib.failOnAllWarnings` to a Haskell package enables the
+`-Wall` and `-Werror` GHC options to turn all warnings into build failures.
+
 #### buildStrictly
 
-Applying `haskell.lib.buildStrictly` to a Haskell package enables the `-Wall`
+Applying `haskell.lib.buildStrictly` to a Haskell package calls
-and `-Werror` GHC options to turn all warnings into build failures. Additionally
+`failOnAllWarnings` on the given package to turn all warnings into build
-the source of your package is gotten from first invoking `cabal sdist` to ensure
+failures. Additionally the source of your package is gotten from first invoking
-all needed files are listed in the Cabal file.
+`cabal sdist` to ensure all needed files are listed in the Cabal file.
 
 #### checkUnusedPackages
 

nixos/doc/manual/configuration/summary.xml

@@ -113,7 +113,8 @@ manual</link> for the rest.</para>
       </row>
       <row>
         <entry><literal>assert 1 + 1 == 2; "yes!"</literal></entry>
-        <entry>Assertion check (evaluates to <literal>"yes!"</literal>)</entry>
+        <entry>Assertion check (evaluates to <literal>"yes!"</literal>). See <xref
+    linkend="sec-assertions"/> for using assertions in modules</entry>
       </row>
       <row>
         <entry><literal>let x = "foo"; y = "bar"; in x + y</literal></entry>

nixos/doc/manual/development/assertions.xml

@@ -0,0 +1,80 @@
+<section xmlns="http://docbook.org/ns/docbook"
+        xmlns:xlink="http://www.w3.org/1999/xlink"
+        xmlns:xi="http://www.w3.org/2001/XInclude"
+        version="5.0"
+        xml:id="sec-assertions">
+
+<title>Warnings and Assertions</title>
+
+<para>
+  When configuration problems are detectable in a module, it is a good
+  idea to write an assertion or warning. Doing so provides clear
+  feedback to the user and prevents errors after the build.
+</para>
+
+<para>
+  Although Nix has the <literal>abort</literal> and
+  <literal>builtins.trace</literal> <link xlink:href="https://nixos.org/nix/manual/#ssec-builtins">functions</link> to perform such tasks,
+  they are not ideally suited for NixOS modules. Instead of these
+  functions, you can declare your warnings and assertions using the
+  NixOS module system.
+</para>
+
+<section>
+
+<title>Warnings</title>
+
+<para>
+  This is an example of using <literal>warnings</literal>.
+</para>
+
+<programlisting>
+<![CDATA[
+{ config, lib, ... }:
+{
+  config = lib.mkIf config.services.foo.enable {
+    warnings =
+      if config.services.foo.bar
+      then [ ''You have enabled the bar feature of the foo service.
+               This is known to cause some specific problems in certain situations.
+               '' ]
+      else [];
+  }
+}
+]]>
+</programlisting>
+
+</section>
+
+<section>
+
+<title>Assertions</title>
+
+
+<para>
+  This example, extracted from the
+  <link xlink:href="https://github.com/NixOS/nixpkgs/blob/release-17.09/nixos/modules/services/logging/syslogd.nix">
+    <literal>syslogd</literal> module
+  </link> shows how to use <literal>assertions</literal>. Since there
+  can only be one active syslog daemon at a time, an assertion is useful to
+  prevent such a broken system from being built.
+</para>
+
+<programlisting>
+<![CDATA[
+{ config, lib, ... }:
+{
+  config = lib.mkIf config.services.syslogd.enable {
+    assertions =
+      [ { assertion = !config.services.rsyslogd.enable;
+          message = "rsyslogd conflicts with syslogd";
+        }
+      ];
+  }
+}
+]]>
+</programlisting>
+
+</section>
+
+</section>

nixos/doc/manual/development/option-declarations.xml

@@ -137,8 +137,8 @@ services.xserver.displayManager.enable = mkOption {
 };</screen></example>
 
 <example xml:id='ex-option-declaration-eot-backend-sddm'><title>Extending
-    <literal>services.foo.backend</literal> in the <literal>sddm</literal>
+    <literal>services.xserver.displayManager.enable</literal> in the 
-    module</title>
+    <literal>sddm</literal> module</title>
 <screen>
 services.xserver.displayManager.enable = mkOption {
   type = with types; nullOr (enum [ "sddm" ]);

nixos/doc/manual/development/option-types.xml

@@ -157,27 +157,26 @@
 
 <section xml:id='section-option-types-submodule'><title>Submodule</title>
 
-  <para>Submodule is a very powerful type that defines a set of sub-options that 
+  <para><literal>submodule</literal> is a very powerful type that defines a set
-    are handled like a separate module.
+    of sub-options that are handled like a separate module.</para>
-    It is especially interesting when used with composed types like 
-    <literal>attrsOf</literal> or <literal>listOf</literal>.</para>
 
-  <para>The submodule type take a parameter <replaceable>o</replaceable>, that 
+  <para>It takes a parameter <replaceable>o</replaceable>, that should be a set,
-    should be a set, or a function returning a set with an 
+    or a function returning a set with an <literal>options</literal> key
-    <literal>options</literal> key defining the sub-options.
+    defining the sub-options.
-    The option set can be defined directly (<xref linkend='ex-submodule-direct' 
+    Submodule option definitions are type-checked accordingly to the
-      />) or as reference (<xref linkend='ex-submodule-reference' />).</para>
+    <literal>options</literal> declarations.
+    Of course, you can nest submodule option definitons for even higher
+    modularity.</para>
 
-  <para>Submodule option definitions are type-checked accordingly to the options 
+  <para>The option set can be defined directly
-    declarations. It is possible to declare submodule options inside a submodule 
+    (<xref linkend='ex-submodule-direct' />) or as reference
-    sub-options for even higher modularity.</para>
+    (<xref linkend='ex-submodule-reference' />).</para>
 
 <example xml:id='ex-submodule-direct'><title>Directly defined submodule</title>
 <screen>
 options.mod = mkOption {
-  name = "mod";
   description = "submodule example";
-  type = with types; listOf (submodule {
+  type = with types; submodule {
     options = {
       foo = mkOption {
         type = int;
@@ -186,10 +185,10 @@ options.mod = mkOption {
         type = str;
       };
     };
-  });
+  };
 };</screen></example>
 
-<example xml:id='ex-submodule-reference'><title>Submodule defined as a 
+<example xml:id='ex-submodule-reference'><title>Submodule defined as a
     reference</title>
 <screen>
 let
@@ -206,16 +205,20 @@ let
 in
 options.mod = mkOption {
   description = "submodule example";
-  type = with types; listOf (submodule modOptions);
+  type = with types; submodule modOptions;
 };</screen></example>
 
-<section><title>Composed with <literal>listOf</literal></title>
+  <para>The <literal>submodule</literal> type is especially interesting when
-
+    used with composed types like <literal>attrsOf</literal> or
-  <para>When composed with <literal>listOf</literal>, submodule allows multiple 
+    <literal>listOf</literal>.
-    definitions of the submodule option set.</para>
+    When composed with <literal>listOf</literal>
+    (<xref linkend='ex-submodule-listof-declaration' />),
+    <literal>submodule</literal> allows multiple definitions of the submodule
+    option set (<xref linkend='ex-submodule-listof-definition' />).</para>
+    
 
 <example xml:id='ex-submodule-listof-declaration'><title>Declaration of a list 
-    of submodules</title>
+    nof submodules</title>
 <screen>
 options.mod = mkOption {
   description = "submodule example";
@@ -239,13 +242,11 @@ config.mod = [
   { foo = 2; bar = "two"; }
 ];</screen></example>
 
-</section>
+  <para>When composed with <literal>attrsOf</literal>
-
+    (<xref linkend='ex-submodule-attrsof-declaration' />),
-
+    <literal>submodule</literal> allows multiple named definitions of the
-<section><title>Composed with <literal>attrsOf</literal></title>
+    submodule option set (<xref linkend='ex-submodule-attrsof-definition' />).
-
+  </para>
-  <para>When composed with <literal>attrsOf</literal>, submodule allows multiple 
-    named definitions of the submodule option set.</para>
 
 <example xml:id='ex-submodule-attrsof-declaration'><title>Declaration of 
     attribute sets of submodules</title>
@@ -270,7 +271,6 @@ options.mod = mkOption {
 config.mod.one = { foo = 1; bar = "one"; };
 config.mod.two = { foo = 2; bar = "two"; };</screen></example>
 
-</section>
 </section>
 
 <section><title>Extending types</title>

nixos/doc/manual/development/writing-modules.xml

@@ -178,6 +178,7 @@ in {
 <xi:include href="option-declarations.xml" />
 <xi:include href="option-types.xml" />
 <xi:include href="option-def.xml" />
+<xi:include href="assertions.xml" />
 <xi:include href="meta-attributes.xml" />
 <xi:include href="replace-modules.xml" />
 

nixos/maintainers/scripts/openstack/nova-image.nix

@@ -1,3 +1,5 @@
+# nix-build '<nixpkgs/nixos>' -A config.system.build.novaImage --arg configuration "{ imports = [ ./nixos/maintainers/scripts/openstack/nova-image.nix ]; }"
+
 { config, lib, pkgs, ... }:
 
 with lib;

nixos/modules/module-list.nix

@@ -363,6 +363,7 @@
   ./services/monitoring/prometheus/default.nix
   ./services/monitoring/prometheus/alertmanager.nix
   ./services/monitoring/prometheus/blackbox-exporter.nix
+  ./services/monitoring/prometheus/collectd-exporter.nix
   ./services/monitoring/prometheus/fritzbox-exporter.nix
   ./services/monitoring/prometheus/json-exporter.nix
   ./services/monitoring/prometheus/nginx-exporter.nix

nixos/modules/services/monitoring/prometheus/collectd-exporter.nix

@@ -0,0 +1,128 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+let
+  cfg = config.services.prometheus.collectdExporter;
+
+  collectSettingsArgs = if (cfg.collectdBinary.enable) then ''
+    -collectd.listen-address ${optionalString (cfg.collectdBinary.listenAddress != null) cfg.collectdBinary.listenAddress}:${toString cfg.collectdBinary.port} \
+    -collectd.security-level ${cfg.collectdBinary.securityLevel} \
+  '' else "";
+
+in {
+  options = {
+    services.prometheus.collectdExporter = {
+      enable = mkEnableOption "prometheus collectd exporter";
+
+      port = mkOption {
+        type = types.int;
+        default = 9103;
+        description = ''
+          Port to listen on.
+          This is used for scraping as well as the to receive collectd data via the write_http plugin.
+        '';
+      };
+
+      listenAddress = mkOption {
+        type = types.nullOr types.str;
+        default = null;
+        example = "0.0.0.0";
+        description = ''
+          Address to listen on for web interface, telemetry and collectd JSON data.
+        '';
+      };
+
+      collectdBinary = {
+        enable = mkEnableOption "collectd binary protocol receiver";
+
+        authFile = mkOption {
+          default = null;
+          type = types.nullOr types.path;
+          description = "File mapping user names to pre-shared keys (passwords).";
+        };
+
+        port = mkOption {
+          type = types.int;
+          default = 25826;
+          description = ''Network address on which to accept collectd binary network packets.'';
+        };
+
+        listenAddress = mkOption {
+          type = types.nullOr types.str;
+          default = null;
+          example = "0.0.0.0";
+          description = ''
+            Address to listen on for binary network packets.
+            '';
+        };
+
+        securityLevel = mkOption {
+          type = types.enum ["None" "Sign" "Encrypt"];
+          default = "None";
+          description = ''
+            Minimum required security level for accepted packets.
+            '';
+        };
+      };
+
+      extraFlags = mkOption {
+        type = types.listOf types.str;
+        default = [];
+        description = ''
+          Extra commandline options when launching the collectd exporter.
+        '';
+      };
+
+      logFormat = mkOption {
+        type = types.str;
+        default = "logger:stderr";
+        example = "logger:syslog?appname=bob&local=7 or logger:stdout?json=true";
+        description = ''
+          Set the log target and format.
+        '';
+      };
+
+      logLevel = mkOption {
+        type = types.enum ["debug" "info" "warn" "error" "fatal"];
+        default = "info";
+        description = ''
+          Only log messages with the given severity or above.
+        '';
+      };
+
+      openFirewall = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Open port in firewall for incoming connections.
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    networking.firewall.allowedTCPPorts = (optional cfg.openFirewall cfg.port) ++
+      (optional (cfg.openFirewall && cfg.collectdBinary.enable) cfg.collectdBinary.port);
+
+    systemd.services.prometheus-collectd-exporter = {
+      description = "Prometheus exporter for Collectd metrics";
+      unitConfig.Documentation = "https://github.com/prometheus/collectd_exporter";
+      wantedBy = [ "multi-user.target" ];
+      serviceConfig = {
+        DynamicUser = true;
+        Restart = "always";
+        PrivateTmp = true;
+        WorkingDirectory = /tmp;
+        ExecStart = ''
+          ${pkgs.prometheus-collectd-exporter}/bin/collectd_exporter \
+            -log.format ${cfg.logFormat} \
+            -log.level ${cfg.logLevel} \
+            -web.listen-address ${optionalString (cfg.listenAddress != null) cfg.listenAddress}:${toString cfg.port} \
+            ${collectSettingsArgs} \
+            ${concatStringsSep " " cfg.extraFlags}
+        '';
+      };
+    };
+  };
+}

nixos/modules/services/networking/znc.nix

@@ -261,7 +261,7 @@ in
             "freenode" = {
               server = "chat.freenode.net";
               port = 6697;
-              ssl = true;
+              useSSL = true;
               modules = [ "simple_away" ];
             };
           };
@@ -276,6 +276,14 @@ in
           '';
         };
 
+        openFirewall = mkOption {
+          type = types.bool;
+          default = false;
+          description = ''
+            Whether to open ports in the firewall for ZNC.
+          '';
+        };
+
         passBlock = mkOption {
           example = defaultPassBlock;
           type = types.string;
@@ -350,6 +358,10 @@ in
 
   config = mkIf cfg.enable {
 
+    networking.firewall = mkIf cfg.openFirewall {
+      allowedTCPPorts = [ cfg.port ];
+    };
+
     systemd.services.znc = {
       description = "ZNC Server";
       wantedBy = [ "multi-user.target" ];

nixos/modules/virtualisation/cloud-image.nix

@@ -1,44 +0,0 @@
-# Usage:
-# $ NIX_PATH=`pwd`:nixos-config=`pwd`/nixpkgs/nixos/modules/virtualisation/cloud-image.nix nix-build '<nixpkgs/nixos>' -A config.system.build.cloudImage
-
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-{
-  system.build.cloudImage = import ../../lib/make-disk-image.nix {
-    inherit pkgs lib config;
-    partitioned = true;
-    diskSize = 1 * 1024;
-    configFile = pkgs.writeText "configuration.nix"
-      ''
-        { config, lib, pkgs, ... }:
-
-        with lib;
-
-        {
-          imports = [ <nixpkgs/nixos/modules/virtualisation/cloud-image.nix> ];
-        }
-      '';
-  };
-
-  imports = [ ../profiles/qemu-guest.nix ];
-
-  fileSystems."/".device = "/dev/disk/by-label/nixos";
-
-  boot = {
-    kernelParams = [ "console=ttyS0" ];
-    loader.grub.device = "/dev/vda";
-    loader.timeout = 0;
-  };
-
-  networking.hostName = mkDefault "";
-
-  services.openssh = {
-    enable = true;
-    permitRootLogin = "without-password";
-    passwordAuthentication = mkDefault false;
-  };
-
-  services.cloud-init.enable = true;
-}

nixos/modules/virtualisation/nova-config.nix

@@ -22,8 +22,13 @@ with lib;
     boot.loader.timeout = 0;
 
     # Allow root logins
-    services.openssh.enable = true;
+    services.openssh = {
-    services.openssh.permitRootLogin = "prohibit-password";
+      enable = true;
+      permitRootLogin = "prohibit-password";
+      passwordAuthentication = mkDefault false;
+    };
+
+    services.cloud-init.enable = true;
 
     # Put /tmp and /var on /ephemeral0, which has a lot more space.
     # Unfortunately we can't do this with the `fileSystems' option

nixos/release-combined.nix

@@ -93,7 +93,7 @@ in rec {
         (all nixos.tests.keymap.dvp)
         (all nixos.tests.keymap.neo)
         (all nixos.tests.keymap.qwertz)
-        (all nixos.tests.plasma5)
+        nixos.tests.plasma5.x86_64-linux # avoid big build on i686
         (all nixos.tests.kernel-latest)
         (all nixos.tests.kernel-lts)
         (all nixos.tests.kernel-params)
@@ -119,10 +119,9 @@ in rec {
         (all nixos.tests.sddm.default)
         (all nixos.tests.simple)
         (all nixos.tests.slim)
-        (all nixos.tests.sysctl)
+        nixos.tests.sysctl.x86_64-linux # i686 fails
         (all nixos.tests.udisks2)
         (all nixos.tests.xfce)
-        (all nixos.tests.xmonad)
 
         nixpkgs.tarball
         (all allSupportedNixpkgs.emacs)

nixos/release.nix

@@ -240,7 +240,7 @@ in rec {
   tests.etcd = hydraJob (import tests/etcd.nix { system = "x86_64-linux"; });
   tests.ec2-nixops = hydraJob (import tests/ec2.nix { system = "x86_64-linux"; }).boot-ec2-nixops;
   tests.ec2-config = hydraJob (import tests/ec2.nix { system = "x86_64-linux"; }).boot-ec2-config;
-  tests.elk = callTest tests/elk.nix {};
+  tests.elk = hydraJob (import tests/elk.nix { system = "x86_64-linux"; });
   tests.env = callTest tests/env.nix {};
   tests.ferm = callTest tests/ferm.nix {};
   tests.firefox = callTest tests/firefox.nix {};

pkgs/applications/altcoins/bitcoin-classic.nix

@@ -7,13 +7,13 @@ with stdenv.lib;
 stdenv.mkDerivation rec {
 
   name = "bitcoin" + (toString (optional (!withGui) "d")) + "-classic-" + version;
-  version = "1.2.5";
+  version = "1.3.6";
 
   src = fetchFromGitHub {
     owner = "bitcoinclassic";
     repo = "bitcoinclassic";
     rev = "v${version}";
-    sha256 = "00spils0gv8krx2nyxrf6j1dl81wmxk8xjkqc22cv7nsdnakzrvm";
+    sha256 = "129gkg035gv7zmc463jl2spvdh0fl4q8v4jdaslfnp34hbwi1p07";
   };
 
   nativeBuildInputs = [ pkgconfig autoreconfHook ];

pkgs/applications/altcoins/default.nix

@@ -1,4 +1,4 @@
-{ callPackage, pkgs }:
+{ callPackage, boost155, boost162, boost163, openssl_1_1_0, haskellPackages }:
 
 rec {
 
@@ -8,8 +8,8 @@ rec {
   bitcoin-unlimited  = callPackage ./bitcoin-unlimited.nix { withGui = true; };
   bitcoind-unlimited = callPackage ./bitcoin-unlimited.nix { withGui = false; };
 
-  bitcoin-classic  = callPackage ./bitcoin-classic.nix { withGui = true; };
+  bitcoin-classic  = callPackage ./bitcoin-classic.nix { withGui = true; boost = boost162; };
-  bitcoind-classic = callPackage ./bitcoin-classic.nix { withGui = false; };
+  bitcoind-classic = callPackage ./bitcoin-classic.nix { withGui = false; boost = boost162; };
 
   bitcoin-xt  = callPackage ./bitcoin-xt.nix { withGui = true; };
   bitcoind-xt = callPackage ./bitcoin-xt.nix { withGui = false; };
@@ -22,12 +22,12 @@ rec {
   dogecoin  = callPackage ./dogecoin.nix { withGui = true; };
   dogecoind = callPackage ./dogecoin.nix { withGui = false; };
 
-  freicoin = callPackage ./freicoin.nix { boost = pkgs.boost155; };
+  freicoin = callPackage ./freicoin.nix { boost = boost155; };
   go-ethereum = callPackage ./go-ethereum.nix { };
   go-ethereum-classic = callPackage ./go-ethereum-classic { };
 
-  hivemind = callPackage ./hivemind.nix { withGui = true; boost = pkgs.boost162; };
+  hivemind = callPackage ./hivemind.nix { withGui = true; boost = boost162; };
-  hivemindd = callPackage ./hivemind.nix { withGui = false; boost = pkgs.boost162; };
+  hivemindd = callPackage ./hivemind.nix { withGui = false; boost = boost162; };
 
   litecoin  = callPackage ./litecoin.nix { withGui = true; };
   litecoind = callPackage ./litecoin.nix { withGui = false; };
@@ -43,7 +43,7 @@ rec {
   seth = callPackage ./seth.nix { };
   dapp = callPackage ./dapp.nix { };
 
-  hsevm = (pkgs.haskellPackages.callPackage ./hsevm.nix {});
+  hsevm = (haskellPackages.callPackage ./hsevm.nix {});
 
   primecoin  = callPackage ./primecoin.nix { withGui = true; };
   primecoind = callPackage ./primecoin.nix { withGui = false; };
@@ -52,7 +52,7 @@ rec {
 
   zcash = callPackage ./zcash {
     withGui = false;
-    openssl = pkgs.openssl_1_1_0;
+    openssl = openssl_1_1_0;
-    boost = pkgs.boost163;
+    boost = boost163;
   };
 }

pkgs/applications/audio/audacity/default.nix

@@ -1,17 +1,18 @@
 { stdenv, fetchurl, wxGTK30, pkgconfig, file, gettext, gtk2, glib, zlib, perl, intltool,
   libogg, libvorbis, libmad, libjack2, lv2, lilv, serd, sord, sratom, suil, alsaLib, libsndfile, soxr, flac, lame, fetchpatch,
-  expat, libid3tag, ffmpeg, soundtouch /*, portaudio - given up fighting their portaudio.patch */
+  expat, libid3tag, ffmpeg, soundtouch, /*, portaudio - given up fighting their portaudio.patch */
+  autoconf, automake, libtool
   }:
 
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  version = "2.1.2";
+  version = "2.1.3";
   name = "audacity-${version}";
 
   src = fetchurl {
     url = "https://github.com/audacity/audacity/archive/Audacity-${version}.tar.gz";
-    sha256 = "1ggr6g0mk36rqj7ahsg8b0b1r9kphwajzvxgn43md263rm87n04h";
+    sha256 = "11mx7gb4dbqrgfp7hm0154x3m76ddnmhf2675q5zkxn7jc5qfc6b";
   };
   patches = [
     (fetchpatch {
@@ -20,19 +21,10 @@ stdenv.mkDerivation rec {
         + "/audacity-ffmpeg.patch?h=packages/audacity&id=0c1e35798d4d70692";
       sha256 = "19fr674mw844zmkp1476yigkcnmb6zyn78av64ccdwi3p68i00rf";
     })
-  ]
+  ];
-    ++ optional (hasPrefix "gcc-6" stdenv.cc.cc.name)
-      (fetchpatch {
-        name = "gcc6.patch";
-        url = "https://github.com/audacity/audacity/commit/60f2322055756e8cacfe96530a12c63e9694482c.patch";
-        sha256 = "07jlxr8y7ap3nsblx3zh8v9rcx7ajbcfnvwzhwykmbwbsyirgqf2";
-      });
 
   preConfigure = /* we prefer system-wide libs */ ''
-    mv lib-src lib-src-rm
+    autoreconf -vi # use system libraries
-    mkdir lib-src
-    mv lib-src-rm/{Makefile*,lib-widget-extra,portaudio-v19,portmixer,portsmf,FileDialog,sbsms,libnyquist} lib-src/
-    rm -r lib-src-rm/
 
     # we will get a (possibly harmless) warning during configure without this
     substituteInPlace configure \
@@ -63,6 +55,7 @@ stdenv.mkDerivation rec {
     pkgconfig file gettext wxGTK30 expat alsaLib
     libsndfile soxr libid3tag libjack2 lv2 lilv serd sord sratom suil gtk2
     ffmpeg libmad lame libvorbis flac soundtouch
+    autoconf automake libtool # for the preConfigure phase
   ]; #ToDo: detach sbsms
 
   enableParallelBuilding = true;

pkgs/applications/audio/mopidy-iris/default.nix

@@ -2,12 +2,12 @@
 
 pythonPackages.buildPythonApplication rec {
   name = "mopidy-iris-${version}";
-  version = "3.3.3";
+  version = "3.4.1";
 
   src = pythonPackages.fetchPypi {
     inherit version;
     pname = "Mopidy-Iris";
-    sha256 = "1lfqkmjvdmc2pb3xx9z21ay095b2bk5cvdwharxqqx8fjq6n27hq";
+    sha256 = "04fjj2n5v53ykxnjgna1y8bvk7g3x0yiqisvzrdva693lfz9cbgx";
   };
 
   propagatedBuildInputs = [

pkgs/applications/audio/qmmp/default.nix

@@ -29,11 +29,11 @@
 # handle that.
 
 stdenv.mkDerivation rec {
-  name = "qmmp-1.1.5";
+  name = "qmmp-1.1.10";
 
   src = fetchurl {
     url = "http://qmmp.ylsoftware.com/files/${name}.tar.bz2";
-    sha256 = "1gfx6nm9v6qrx58gxib6grfhb45mnib1n4wdsnjq16br6bs8h4lv";
+    sha256 = "16hb3s48filq0q18m7x9vmhpirk4fh0aqj8kwbapv8mkcnzq2mqy";
   };
 
   buildInputs =

pkgs/applications/display-managers/sddm/default.nix

@@ -5,13 +5,7 @@
 
 let
 
-  version = "0.14.0";
+  version = "0.15.0";
-
-  /* Fix display of user avatars. */
-  patchFixUserAvatars = fetchpatch {
-    url = https://github.com/sddm/sddm/commit/ecb903e48822bd90650bdd64fe80754e3e9664cb.patch;
-    sha256 = "0zm88944pwdad8grmv0xwnxl23xml85ryc71x2xac233jxdyx6ms";
-  };
 
 in mkDerivation rec {
   name = "sddm-${version}";
@@ -20,12 +14,11 @@ in mkDerivation rec {
     owner = "sddm";
     repo = "sddm";
     rev = "v${version}";
-    sha256 = "0wwid23kw0725zpw67zchalg9mmharr7sn4yzhijq7wqpsczjfxj";
+    sha256 = "1wissgl7wd7fblq8ghz8n2fr6wqip7h88p9fiarfpvi1918fgng8";
   };
 
   patches =
-    copyPathsToStore (lib.readPathsFromFile ./. ./series)
+    copyPathsToStore (lib.readPathsFromFile ./. ./series);
-    ++ [ patchFixUserAvatars ];
 
   postPatch =
     # Module Qt5::Test must be included in `find_package` before it is used.

pkgs/applications/editors/jupp/default.nix

@@ -0,0 +1,44 @@
+{ stdenv, fetchurl
+, ncurses, gpm
+}:
+
+stdenv.mkDerivation rec {
+
+  name = "jupp-${version}";
+  version = "3.1";
+  srcName = "joe-3.1jupp31";
+
+  src = fetchurl {
+    urls = [
+      "https://www.mirbsd.org/MirOS/dist/jupp/${srcName}.tgz"
+      "http://pub.allbsd.org/MirOS/dist/jupp/${srcName}.tgz" ];
+    sha256 = "1fnf9jsd6p4jyybkhjjs328qx38ywy8w029ngc7j7kqp0ixn0l0s";
+  };
+
+  preConfigure = "chmod +x ./configure";
+
+  buildInputs = [ ncurses gpm ];
+
+  configureFlags = [
+    "--enable-curses"
+    "--enable-termcap"
+    "--enable-termidx"
+    "--enable-getpwnam"
+    "--enable-largefile"
+  ];
+
+  meta = with stdenv.lib; {
+    description = "A portable fork of Joe's editor";
+    longDescription = ''
+      This is the portable version of JOE's Own Editor, which is currently
+      developed at sourceforge, licenced under the GNU General Public License,
+      Version 1, using autoconf/automake. This version has been enhanced by
+      several functions intended for programmers or other professional users,
+      and has a lot of bugs fixed. It is based upon an older version of joe
+      because these behave better overall.
+    '';
+    homepage = http://mirbsd.de/jupp;
+    license = licenses.gpl1;
+    maintainers = with maintainers; [ AndersonTorres ];
+  };
+}

pkgs/applications/editors/moe/default.nix

@@ -0,0 +1,36 @@
+{ stdenv, fetchurl
+, lzip, ncurses
+}:
+
+with stdenv.lib;
+stdenv.mkDerivation rec {
+
+  name = "moe-${version}";
+  version = "1.9";
+
+  src = fetchurl {
+    url = "mirror://gnu/moe/${name}.tar.lz";
+    sha256 = "1wsfzy0iia0c89wnx1ilzw54wqcmlp2nz8mkpvc393z0zagrx48q";
+  };
+
+  nativeBuildInputs = [ lzip ];
+  buildInputs = [ ncurses ];
+
+  meta = {
+    description = "A small, 8-bit clean editor";
+    longDescription = ''
+      GNU moe is a powerful, 8-bit clean, console text editor for ISO-8859 and
+      ASCII character encodings. It has a modeless, user-friendly interface,
+      online help, multiple windows, unlimited undo/redo capability, unlimited
+      line length, unlimited buffers, global search/replace (on all buffers at
+      once), block operations, automatic indentation, word wrapping, file name
+      completion, directory browser, duplicate removal from prompt histories,
+      delimiter matching, text conversion from/to UTF-8, romanization, etc.
+    '';
+    homepage = http://www.gnu.org/software/moe/;
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ AndersonTorres ];
+    platforms = platforms.linux;
+  };
+}
+# TODO: a configurable, global moerc file

pkgs/applications/graphics/feh/default.nix

@@ -6,11 +6,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "feh-${version}";
-  version = "2.19.3";
+  version = "2.20";
 
   src = fetchurl {
-    url = "http://feh.finalrewind.org/${name}.tar.bz2";
+    url = "https://feh.finalrewind.org/${name}.tar.bz2";
-    sha256 = "1l3yvv0l0ggwlfyhk84p2g9mrqvzqrg1fgalf88kzppvb9jppjay";
+    sha256 = "02vhdv16nf4kjna4inpbfy4k3p40bhl7xpc4kh4xvily14146l2b";
   };
 
   outputs = [ "out" "man" "doc" ];
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A light-weight image viewer";
-    homepage = https://derf.homelinux.org/projects/feh/;
+    homepage = "https://feh.finalrewind.org/";
     license = licenses.mit;
     maintainers = [ maintainers.viric maintainers.willibutz ];
     platforms = platforms.unix;

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

@@ -1,13 +1,11 @@
 { callPackage, fetchurl, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "1.0.25";
+  version = "1.0.27";
   src = fetchurl {
-    sha256 = "0b3fvhrxl4l82bf3v0j47ypjv6a0k5lqbgknrq1agpmjca6vmmx4";
+    sha256 = "1j9nbqspaj0rlgalafb5z6r606k0i22kz0rcpd744p176yzlfdr9";
     urls = [
-      "http://pkgs.fedoraproject.org/repo/pkgs/sane-backends/sane-backends-${version}.tar.gz/f9ed5405b3c12f07c6ca51ee60225fe7/sane-backends-${version}.tar.gz"
+      "https://alioth.debian.org/frs/download.php/latestfile/176/sane-backends-${version}.tar.gz"
-      "https://alioth.debian.org/frs/download.php/file/4146/sane-backends-${version}.tar.gz"
     ];
-    curlOpts = "--insecure";
   };
 })

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

@@ -20,12 +20,13 @@ stdenv.mkDerivation {
   outputs = [ "out" "doc" "man" ];
 
   configureFlags = []
-    ++ stdenv.lib.optional (avahi != null) "--enable-avahi"
+    ++ stdenv.lib.optional (avahi != null)   "--enable-avahi"
     ++ stdenv.lib.optional (libusb1 != null) "--enable-libusb_1_0"
     ;
 
   buildInputs = [ avahi libusb1 libv4l net_snmp ];
   nativeBuildInputs = [ gettext pkgconfig ];
+  enableParallelBuilding = true;
 
   postInstall = let
 

pkgs/applications/graphics/sane/frontends.nix

@@ -1,10 +1,11 @@
-{ stdenv, fetchurl, sane-backends, libX11, gtk2, pkgconfig, libusb ? null}:
+{ stdenv, fetchurl, sane-backends, libX11, gtk2, pkgconfig, libusb ? null }:
 
 stdenv.mkDerivation rec {
-  name = "sane-frontends-1.0.14";
+  name = "sane-frontends-${version}";
+  version = "1.0.14";
 
   src = fetchurl {
-    url = "https://alioth.debian.org/frs/download.php/file/1140/${name}.tar.gz";
+    url = "https://alioth.debian.org/frs/download.php/latestfile/175/${name}.tar.gz";
     sha256 = "1ad4zr7rcxpda8yzvfkq1rfjgx9nl6lan5a628wvpdbh3fn9v0z7";
   };
 
@@ -12,15 +13,17 @@ stdenv.mkDerivation rec {
     sed -e '/SANE_CAP_ALWAYS_SETTABLE/d' -i src/gtkglue.c
   '';
 
-  buildInputs = [sane-backends libX11 gtk2 pkgconfig] ++
+  buildInputs = [ sane-backends libX11 gtk2 ]
-	(if libusb != null then [libusb] else []);
+    ++ stdenv.lib.optional (libusb != null) libusb;
+  nativeBuildInputs = [ pkgconfig ];
 
-  meta = {
+  enableParallelBuilding = true;
-    homepage = http://www.sane-project.org/;
+
+  meta = with stdenv.lib; {
     description = "Scanner Access Now Easy";
-    license = stdenv.lib.licenses.gpl2Plus;
+    homepage    = http://www.sane-project.org/;
-
+    license     = licenses.gpl2Plus;
-    maintainers = [ stdenv.lib.maintainers.peti ];
+    maintainers = with maintainers; [ peti ];
-    platforms = stdenv.lib.platforms.linux;
+    platforms   = platforms.linux;
   };
 }

pkgs/applications/kde/fetch.sh

@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/applications/17.08.0/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/applications/17.08.1/ -A '*.tar.xz' )

pkgs/applications/kde/khelpcenter.nix

@@ -12,5 +12,4 @@ mkDerivation {
     grantlee kcmutils kconfig kcoreaddons kdbusaddons kdelibs4support khtml
     ki18n kinit kservice xapian
   ];
-  patches = [ ./khelpcenter_kcoreaddons.patch ];
 }

pkgs/applications/kde/khelpcenter_kcoreaddons.patch

@@ -1,13 +0,0 @@
-diff --git a/searchhandlers/CMakeLists.txt b/searchhandlers/CMakeLists.txt
-index 298a32e..b9e06c6 100644
---- a/searchhandlers/CMakeLists.txt
-+++ b/searchhandlers/CMakeLists.txt
-@@ -16,7 +16,7 @@ set(khc_xapianindexer_SOURCES
- add_executable(khc_xapianindexer ${khc_xapianindexer_SOURCES})
- kde_target_enable_exceptions(khc_xapianindexer PRIVATE)
- ecm_mark_nongui_executable(khc_xapianindexer)
--target_link_libraries(khc_xapianindexer Qt5::Core KF5::Archive ${XAPIAN_LIBRARIES} ${LIBXML2_LIBRARIES})
-+target_link_libraries(khc_xapianindexer Qt5::Core KF5::Archive KF5::CoreAddons ${XAPIAN_LIBRARIES} ${LIBXML2_LIBRARIES})
- if (${KF5_VERSION} VERSION_GREATER 5.35.0)
-     # practically means >=5.36
-     target_link_libraries(khc_xapianindexer KF5::DocTools)

pkgs/applications/misc/dmenu/wayland.nix

@@ -6,12 +6,12 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "dmenu-wayland-${version}";
-  version = "git-2014-11-02";
+  version = "git-2017-04-07";
-  rev = "6e08b77428cc3c406ed2e90d4cae6c41df76341e";
+  rev = "f385d9d18813071b4b4257bf8d4d572daeda0e70";
 
   src = fetchurl {
     url = "https://github.com/michaelforney/dmenu/archive/${rev}.tar.gz";
-    sha256 = "d0f73e442baf44a93a3b9d41a72e9cfa14f54af6049c90549f516722e3f88019";
+    sha256 = "0y1jvh2815c005ns0bsjxsmz82smw22n6jsfg2g03a1pacakp6ys";
   };
 
   buildInputs = [ swc wld wayland libxkbcommon pixman fontconfig ];
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   '';
 
   preConfigure = [
-    ''sed -i "s@PREFIX = /usr/local@PREFIX = $out@g; s@/usr/share/swc@$(echo "$nativeBuildInputs" | grep -o '[^ ]*-swc-[^ ]*')/share/swc@g" config.mk''
+    ''sed -i "s@PREFIX = /usr/local@PREFIX = $out@g; s@/usr/share/swc@${swc}/share/swc@g" config.mk''
   ];
 
   meta = {

pkgs/applications/misc/tasksh/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, libuuid, gnutls }:
+{ stdenv, fetchurl, cmake, libuuid, gnutls, readline }:
 
 stdenv.mkDerivation rec {
   name = "tasksh-${version}";
@@ -11,6 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "1z8zw8lld62fjafjvy248dncjk0i4fwygw0ahzjdvyyppx4zjhkf";
   };
 
+  buildInputs = [ readline ];
   nativeBuildInputs = [ cmake ];
 
   meta = with stdenv.lib; {

pkgs/applications/networking/instant-messengers/qtox/default.nix

@@ -2,8 +2,8 @@
   libtoxcore,
   libpthreadstubs, libXdmcp, libXScrnSaver,
   qtbase, qtsvg, qttools, qttranslations,
-  atk, cairo, ffmpeg, filter-audio, gdk_pixbuf, glib, gtk2, libsodium, libopus,
+  ffmpeg, filter-audio, libsodium, libopus,
-  libvpx, openal, opencv, pango, pcre, qrencode, sqlcipher }:
+  libvpx, openal, opencv, pcre, qrencode, sqlcipher }:
 
 mkDerivation rec {
   name = "qtox-${version}";
@@ -20,28 +20,25 @@ mkDerivation rec {
     libtoxcore
     libpthreadstubs libXdmcp libXScrnSaver
     qtbase qtsvg qttools qttranslations
-    atk cairo ffmpeg filter-audio gdk_pixbuf glib gtk2 libopus libsodium
+    ffmpeg filter-audio libopus libsodium
-    libvpx openal opencv pango pcre qrencode sqlcipher
+    libvpx openal opencv pcre qrencode sqlcipher
   ];
 
   nativeBuildInputs = [ cmake pkgconfig ];
 
+  enableParallelBuilding = true;
+
   cmakeFlags = [
     "-DGIT_DESCRIBE=${version}"
+    "-DENABLE_STATUSNOTIFIER=False"
+    "-DENABLE_GTK_SYSTRAY=False"
+    "-DENABLE_APPINDICATOR=False"
   ];
 
-  installPhase = ''
-    runHook preInstall
-
-    install -Dm755 qtox $out/bin/qtox
-
-    runHook postInstall
-  '';
-
   meta = with lib; {
     description = "Qt Tox client";
-    license = licenses.gpl3;
+    license     = licenses.gpl3;
     maintainers = with maintainers; [ viric jgeerds akaWolf peterhoeg ];
-    platforms = platforms.all;
+    platforms   = platforms.all;
   };
 }

pkgs/applications/networking/instant-messengers/riot/riot-web.nix

@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name= "riot-web-${version}";
-  version = "0.12.2";
+  version = "0.12.3";
 
   src = fetchurl {
     url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz";
-    sha256 = "0zyddpnng1vjli12hn1hd0w99g6sfsk80dn2ll5h9276nc677pnh";
+    sha256 = "1v9k9rna9rziis5ld4x4lw3rhgm504cnnafiwk175jpjbbd8h4b3";
   };
 
   installPhase = ''

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

@@ -1,17 +1,15 @@
-{ stdenv, fetchgit, pythonPackages, makeWrapper, nettools, libtorrentRasterbar, imagemagick
+{ stdenv, fetchurl, pythonPackages, makeWrapper, nettools, libtorrentRasterbar, imagemagick
-, enablePlayer ? true, vlc ? null }:
+, enablePlayer ? true, vlc ? null, qt5 }:
 
 stdenv.mkDerivation rec {
   pname = "tribler";
   name = "${pname}-${version}";
-  version = "7.0.0-beta";
+  version = "7.0.0-rc2";
   revision = "1d3ddb8";
 
-  src = fetchgit {
+  src = fetchurl {
-    url = "https://github.com/Tribler/tribler";
+    url = "https://github.com/Tribler/tribler/releases/download/v${version}/Tribler-v${version}.tar.xz";
-    rev = revision;
+    sha256 = "0wlv32cw52c5khnrm218dccgn2l177933p4dhp7m50hipqfb0ly2";
-    sha256 = "16mk76qgg7fgca11yvpygicxqbkc0kn6r82x73fly2310pagd845";
-    fetchSubmodules = true;
   };
 
   buildInputs = [
@@ -41,6 +39,7 @@ stdenv.mkDerivation rec {
     pythonPackages.plyvel
     pythonPackages.decorator
     pythonPackages.feedparser
+    pythonPackages.service-identity
   ];
 
   postPatch = ''
@@ -58,6 +57,7 @@ stdenv.mkDerivation rec {
     wrapPythonPrograms
     cp -prvd ./* $out/
     makeWrapper ${pythonPackages.python}/bin/python $out/bin/tribler \
+        --set QT_QPA_PLATFORM_PLUGIN_PATH ${qt5.qtbase.bin}/lib/qt-*/plugins/platforms \
         --set _TRIBLERPATH $out \
         --set PYTHONPATH $out:$program_PYTHONPATH \
         --set NO_AT_BRIDGE 1 \

pkgs/applications/networking/sniffers/wireshark/add_missing_udpdump_pod.patch

@@ -1,132 +0,0 @@
-diff -Nur wireshark-2.4.0/doc/udpdump.pod wireshark-2.4.0-p/doc/udpdump.pod
---- wireshark-2.4.0/doc/udpdump.pod	1970-01-01 01:00:00.000000000 +0100
-+++ wireshark-2.4.0-p/doc/udpdump.pod	2017-08-01 10:48:40.551431319 +0200
-@@ -0,0 +1,128 @@
-+
-+=head1 NAME
-+
-+udpdump - Provide an UDP receiver that gets packets from network devices (like Aruba routers) and exports them in PCAP format.
-+
-+=head1 SYNOPSIS
-+
-+B<udpdump>
-+S<[ B<--help> ]>
-+S<[ B<--version> ]>
-+S<[ B<--extcap-interfaces> ]>
-+S<[ B<--extcap-dlts> ]>
-+S<[ B<--extcap-interface>=E<lt>interfaceE<gt> ]>
-+S<[ B<--extcap-config> ]>
-+S<[ B<--capture> ]>
-+S<[ B<--fifo>=E<lt>path to file or pipeE<gt> ]>
-+S<[ B<--port>=E<lt>portE<gt> ]>
-+S<[ B<--payload>=E<lt>typeE<gt> ]>
-+
-+=head1 DESCRIPTION
-+
-+B<udpdump> is a extcap tool that provides an UDP receiver that listens for exported datagrams coming from
-+any source (like Aruba routers) and exports them in PCAP format. This provides the user two basic
-+functionalities: the first one is to have a listener that prevents the localhost to send back an ICMP
-+port-unreachable packet. The second one is to strip out the lower layers (layer 2, IP, UDP) that are useless
-+(are used just as export vector). The format of the exported datagrams are EXPORTED_PDU, as specified in
-+https://code.wireshark.org/review/gitweb?p=wireshark.git;a=blob;f=epan/exported_pdu.h;hb=refs/heads/master
-+
-+=head1 OPTIONS
-+
-+=over 4
-+
-+=item --help
-+
-+Print program arguments.
-+
-+=item --version
-+
-+Print program version.
-+
-+=item --extcap-interfaces
-+
-+List available interfaces.
-+
-+=item --extcap-interface=E<lt>interfaceE<gt>
-+
-+Use specified interfaces.
-+
-+=item --extcap-dlts
-+
-+List DLTs of specified interface.
-+
-+=item --extcap-config
-+
-+List configuration options of specified interface.
-+
-+=item --capture
-+
-+Start capturing from specified interface save saved it in place specified by --fifo.
-+
-+=item --fifo=E<lt>path to file or pipeE<gt>
-+
-+Save captured packet to file or send it through pipe.
-+
-+=item --port=E<lt>portE<gt>
-+
-+Set the listerner port. Port 5555 is the default.
-+
-+=item --payload=E<lt>typeE<gt>
-+
-+Set the payload of the exported PDU. Default: data.
-+
-+=back
-+
-+=head1 EXAMPLES
-+
-+To see program arguments:
-+
-+    udpdump --help
-+
-+To see program version:
-+
-+    udpdump --version
-+
-+To see interfaces:
-+
-+    udpdump --extcap-interfaces
-+
-+  Example output:
-+    interface {value=udpdump}{display=UDP Listener remote capture}
-+
-+To see interface DLTs:
-+
-+    udpdump --extcap-interface=udpdump --extcap-dlts
-+
-+  Example output:
-+    dlt {number=252}{name=udpdump}{display=Exported PDUs}
-+
-+To see interface configuration options:
-+
-+    udpdump --extcap-interface=udpdump --extcap-config
-+
-+  Example output:
-+    arg {number=0}{call=--port}{display=Listen port}{type=unsigned}{range=1,65535}{default=5555}{tooltip=The port the receiver listens on}
-+
-+To capture:
-+
-+    udpdump --extcap-interface=randpkt --fifo=/tmp/randpkt.pcapng --capture
-+
-+NOTE: To stop capturing CTRL+C/kill/terminate application.
-+
-+=head1 SEE ALSO
-+
-+wireshark(1), tshark(1), dumpcap(1), extcap(4)
-+
-+=head1 NOTES
-+
-+B<udpdump> is part of the B<Wireshark> distribution.  The latest version
-+of B<Wireshark> can be found at L<https://www.wireshark.org>.
-+
-+HTML versions of the Wireshark project man pages are available at:
-+L<https://www.wireshark.org/docs/man-pages>.
-+
-+=head1 AUTHORS
-+
-+  Original Author
-+  ---------------
-+  Dario Lombardo             <lomato[AT]gmail.com>

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

@@ -12,7 +12,7 @@ assert withQt  -> !withGtk && qt5  != null;
 with stdenv.lib;
 
 let
-  version = "2.4.0";
+  version = "2.4.1";
   variant = if withGtk then "gtk" else if withQt then "qt" else "cli";
 
 in stdenv.mkDerivation {
@@ -20,7 +20,7 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz";
-    sha256 = "011vvrj76z1azkpvyy2j40b1x1z56ymld508zfc4xw3gh8dv82w9";
+    sha256 = "1k8zj44pkb2ny2x46f100y7cxddm1kh0zh7f6qggm78gn7wvrp82";
   };
 
   cmakeFlags = optional withGtk "-DBUILD_wireshark_gtk=TRUE";
@@ -37,19 +37,7 @@ in stdenv.mkDerivation {
     ++ optionals stdenv.isLinux  [ libcap libnl ]
     ++ optionals stdenv.isDarwin [ SystemConfiguration ApplicationServices gmp ];
 
-  patches = [ ./wireshark-lookup-dumpcap-in-path.patch
+  patches = [ ./wireshark-lookup-dumpcap-in-path.patch ];
-
-              # Backported from master. Will probably have to be dropped during next
-              # update.
-              (fetchpatch {
-                 name = "AUTHORS_add_newline_after_bracket";
-                 url = "https://code.wireshark.org/review/gitweb?p=wireshark.git;a=patch;h=27c6b12626d6e7b8e4d7a11784c2c5e2bfb87fde";
-                 sha256 = "1x30rkrq7dzgdlwrjv2r5ibdpdgwnn5wzvki77rdf13b0547vcw3";
-               })
-              # A file is missing from distribution. This should be fixed in upcoming
-              # releases
-              ./add_missing_udpdump_pod.patch
-            ];
 
   postInstall = optionalString (withQt || withGtk) ''
     ${optionalString withGtk ''

pkgs/applications/science/electronics/eagle/default.nix

@@ -14,18 +14,18 @@ in
 
 stdenv.mkDerivation rec {
   name = "eagle-${version}";
-  version = "7.5.0";
+  version = "7.7.0";
 
   src =
     if stdenv.system == "i686-linux" then
       fetchurl {
-        url = "ftp://ftp.cadsoft.de/eagle/program/7.5/eagle-lin32-${version}.run";
+        url = "ftp://ftp.cadsoft.de/eagle/program/7.7/eagle-lin32-${version}.run";
-        sha256 = "1yfpfv2bqppc95964dhn38g0hq198wnz88lq2dmh517z7jlq9j5g";
+        sha256 = "16fa66p77xigc7zvzfm7737mllrcs6nrgk2p7wvkjw3p9lvbz7z1";
       }
     else if stdenv.system == "x86_64-linux" then
       fetchurl {
-        url = "ftp://ftp.cadsoft.de/eagle/program/7.5/eagle-lin64-${version}.run";
+        url = "ftp://ftp.cadsoft.de/eagle/program/7.7/eagle-lin64-${version}.run";
-        sha256 = "0msd0sn8yfln96mf7j5rc3b8amprxn87vmpq4wsz2cnmgd8xq0s9";
+        sha256 = "18dcn6wqph1sqh0ah98qzfi05wip8a8ifbkaq79iskbrsi8iqnrg";
       }
     else
       throw "Unsupported system: ${stdenv.system}";

pkgs/applications/science/electronics/qfsm/default.nix

@@ -10,7 +10,10 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ qt4 cmake graphviz pkgconfig ];
 
-  patches = [ ./drop-hardcoded-prefix.patch ];
+  patches = [
+    ./drop-hardcoded-prefix.patch
+    ./gcc6-fixes.patch
+  ];
 
   hardeningDisable = [ "format" ];
 

pkgs/applications/science/electronics/qfsm/gcc6-fixes.patch

@@ -0,0 +1,20 @@
+--- qfsm-0.54.0-Source-orig/src/FileIO.cpp	2015-01-02 19:01:46.000000000 +0100
++++ qfsm-0.54.0-Source/src/FileIO.cpp	2017-09-11 19:53:30.579488402 +0200
+@@ -1617,7 +1617,7 @@
+   QString ext;
+ 
+   if (!imp)
+-    return FALSE;
++    return NULL;
+ 
+   Project* p=NULL;
+   importdlg->setAcceptMode(QFileDialog::AcceptOpen);
+@@ -1641,7 +1641,7 @@
+   ifstream fin(act_importfile);
+ 
+   if (!fin)
+-    return FALSE;
++    return NULL;
+ 
+   emit setWaitCursor();
+ 

pkgs/applications/science/logic/mcrl2/default.nix

@@ -1,4 +1,4 @@
-{stdenv, fetchurl, xlibs, cmake, subversion, mesa, qt5, boost,
+{stdenv, gcc5, fetchurl, xlibs, cmake, subversion, mesa, qt5, boost,
  python27, python27Packages}:
 
 stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "1c8h94ja7271ph61zrcgnjgblxppld6v22f7f900prjgzbcfy14m";
   };
 
-  buildInputs = [ cmake mesa qt5.qtbase boost ];
+  buildInputs = [ gcc5 cmake mesa qt5.qtbase boost ];
 
   enableParallelBuilding = true;
 

pkgs/applications/virtualization/dynamips/default.nix

@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, cmake, libelf, libpcap }:
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "dynamips";
+  version = "0.2.17";
+
+  src = fetchFromGitHub {
+    owner = "GNS3";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "12c45jcp9isz57dbshxrvvhqbvmf9cnrr7ddac5m6p34in4hk01n";
+  };
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ libelf libpcap ];
+
+  cmakeFlags = [ "-DDYNAMIPS_CODE=stable" ];
+
+  meta = with stdenv.lib; {
+    description = "A Cisco router emulator";
+    longDescription = ''
+      Dynamips is an emulator computer program that was written to emulate Cisco
+      routers.
+    '';
+    inherit (src.meta) homepage;
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ primeos ];
+  };
+}

pkgs/applications/virtualization/vpcs/default.nix

@@ -0,0 +1,41 @@
+{ stdenv, fetchurl, cmake, glibc, buildPlatform }:
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "vpcs";
+  version = "0.8";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/project/${pname}/${version}/${name}-src.tbz";
+    sha256 = "14y9nflcyq486vvw0na0fkfmg5dac004qb332v4m5a0vaz8059nw";
+  };
+
+  unpackCmd = "tar -xjf $src";
+
+  buildInputs = [ glibc.static ];
+
+  buildPhase = ''
+    cd src
+    ./mk.sh ${buildPlatform.platform.kernelArch}
+  '';
+
+  installPhase = ''
+    cd ..
+
+    install -D -m555 src/vpcs $out/bin/vpcs;
+    install -D -m444 man/vpcs.1 $out/share/man/man1/vpcs.1;
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Virtual PC simulator";
+    longDescription = ''
+      The VPCS can simulate up to 9 PCs. You can ping/traceroute them, or
+      ping/traceroute the other hosts/routers from the VPCS when you study the
+      Cisco routers in the dynamips.
+    '';
+    homepage = "https://sourceforge.net/projects/vpcs/";
+    license = licenses.bsd2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ primeos ];
+  };
+}

pkgs/build-support/vm/default.nix

@@ -1689,7 +1689,7 @@ rec {
           })
           (fetchurl {
             url = mirror://ubuntu/dists/trusty-updates/main/binary-amd64/Packages.bz2;
-            sha256 = "0hrrcx9kqszla5qkd31gjm87b7hnvjin9vvpga2skb9wl3h7ys2f";
+            sha256 = "03vd582p8b78s8sq6hz3nynn9vr7syccmn77i5mzayvsadb74cfy";
           })
         ];
       urlPrefix = mirror://ubuntu;

pkgs/development/compilers/dmd/2.067.1.nix

@@ -153,6 +153,7 @@ stdenv.mkDerivation rec {
     # https://github.com/dlang/dmd/pull/6680
     license = licenses.boost;
     platforms = platforms.unix;
+    broken = true;
   };
 }
 

pkgs/development/compilers/dmd/default.nix

@@ -154,6 +154,6 @@ stdenv.mkDerivation rec {
     # https://github.com/dlang/dmd/pull/6680
     license = licenses.boost;
     platforms = platforms.unix;
+    broken = true;
   };
 }
-

pkgs/development/compilers/ghc/8.0.1.nix

@@ -1,91 +0,0 @@
-{ stdenv, fetchurl, fetchpatch, bootPkgs, perl, ncurses, libiconv, binutils, coreutils
-, hscolour, patchutils, sphinx
-
-  # If enabled GHC will be build with the GPL-free but slower integer-simple
-  # library instead of the faster but GPLed integer-gmp library.
-, enableIntegerSimple ? false, gmp
-}:
-
-let
-  inherit (bootPkgs) ghc;
-
-  fetchFilteredPatch = args: fetchurl (args // {
-    downloadToTemp = true;
-    postFetch = ''
-      ${patchutils}/bin/filterdiff --clean --strip-match=1 -x 'testsuite/*' "$downloadedFile" > "$out"
-    '';
-  });
-in
-stdenv.mkDerivation rec {
-  version = "8.0.1";
-  name = "ghc-${version}";
-
-  src = fetchurl {
-    url = "https://downloads.haskell.org/~ghc/8.0.1/${name}-src.tar.xz";
-    sha256 = "1lniqy29djhjkddnailpaqhlqh4ld2mqvb1fxgxw1qqjhz6j1ywh";
-  };
-
-  patches = [
-    ./relocation.patch
-
-    # Fix https://ghc.haskell.org/trac/ghc/ticket/12130
-    (fetchFilteredPatch { url = https://git.haskell.org/ghc.git/patch/4d71cc89b4e9648f3fbb29c8fcd25d725616e265; sha256 = "0syaxb4y4s2dc440qmrggb4vagvqqhb55m6mx12rip4i9qhxl8k0"; })
-    (fetchFilteredPatch { url = https://git.haskell.org/ghc.git/patch/2f8cd14fe909a377b3e084a4f2ded83a0e6d44dd; sha256 = "06zvlgcf50ab58bw6yw3krn45dsmhg4cmlz4nqff8k4z1f1bj01v"; })
-  ] ++ stdenv.lib.optional stdenv.isLinux ./ghc-no-madv-free.patch;
-
-  buildInputs = [ ghc perl hscolour sphinx];
-
-  enableParallelBuilding = true;
-
-  outputs = [ "out" "doc" ];
-
-  preConfigure = ''
-    sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
-  '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
-    export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}"
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
-    export NIX_LDFLAGS+=" -no_dtrace_dof"
-  '' + stdenv.lib.optionalString enableIntegerSimple ''
-    echo "INTEGER_LIBRARY=integer-simple" > mk/build.mk
-  '';
-
-  configureFlags = [
-    "--with-gcc=${stdenv.cc}/bin/cc"
-    "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
-    "--datadir=$doc/share/doc/ghc"
-  ] ++ stdenv.lib.optional (! enableIntegerSimple) [
-    "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib"
-  ] ++ stdenv.lib.optional stdenv.isDarwin [
-    "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib"
-  ];
-
-  # required, because otherwise all symbols from HSffi.o are stripped, and
-  # that in turn causes GHCi to abort
-  stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols";
-
-  postInstall = ''
-    paxmark m $out/lib/${name}/bin/{ghc,haddock}
-
-    # Install the bash completion file.
-    install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/ghc
-
-    # Patch scripts to include "readelf" and "cat" in $PATH.
-    for i in "$out/bin/"*; do
-      test ! -h $i || continue
-      egrep --quiet '^#!' <(head -n 1 $i) || continue
-      sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ binutils coreutils ]}"' $i
-    done
-  '';
-
-  passthru = {
-    inherit bootPkgs;
-  };
-
-  meta = {
-    homepage = http://haskell.org/ghc;
-    description = "The Glasgow Haskell Compiler";
-    maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ];
-    inherit (ghc.meta) license platforms;
-  };
-
-}

pkgs/development/compilers/ghc/8.2.1.nix

@@ -10,12 +10,12 @@
 let
   inherit (bootPkgs) ghc;
   version = "8.2.1";
-  preReleaseName = "ghc-8.2.1";
+
   commonBuildInputs = [ alex autoconf automake ghc happy hscolour perl python3 sphinx ];
   commonPreConfigure =  ''
     sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
   '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
-    export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/${preReleaseName}"
+    export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}"
   '' + stdenv.lib.optionalString stdenv.isDarwin ''
     export NIX_LDFLAGS+=" -no_dtrace_dof"
   '' + stdenv.lib.optionalString enableIntegerSimple ''
@@ -26,7 +26,7 @@ in stdenv.mkDerivation (rec {
   name = "ghc-${version}";
 
   src = fetchurl {
-    url = "https://downloads.haskell.org/~ghc/${version}/${preReleaseName}-src.tar.xz";
+    url = "https://downloads.haskell.org/~ghc/${version}/${name}-src.tar.xz";
     sha256 = "1w4k0n23b9fg8kmarqhfamzpmf91p6jcdr6xlwzfmb4df2bd9hng";
   };
 
@@ -57,7 +57,7 @@ in stdenv.mkDerivation (rec {
   checkTarget = "test";
 
   postInstall = ''
-    paxmark m $out/lib/${preReleaseName}/bin/{ghc,haddock}
+    paxmark m $out/lib/${name}/bin/{ghc,haddock}
 
     # Install the bash completion file.
     install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/ghc

pkgs/development/compilers/ispc/default.nix

@@ -2,11 +2,9 @@
 testedTargets ? ["sse2" "host"] # the default test target is sse4, but that is not supported by all Hydra agents
 }:
 
-# TODO: patch LLVM so Skylake-EX works better (patch included in ispc github) - needed for LLVM 3.9?
-
 stdenv.mkDerivation rec {
-  version = "1.9.1";
+  version = "20170807";
-  rev = "v${version}";
+  rev = "6e0fc2f148e95afad998a7c7f4d7908d29fd8e44";
 
   inherit testedTargets;
 
@@ -16,7 +14,7 @@ stdenv.mkDerivation rec {
     owner = "ispc";
     repo = "ispc";
     inherit rev;
-    sha256 = "1wwsyvn44hd5iyi5779l5378x096307slpyl29wrsmfp66796693";
+    sha256 = "17fwnfm8a329lgfhjwcvji4h1fm4iqmc28wz23hvgqbpj8lk6qgh";
   };
 
   # there are missing dependencies in the Makefile, causing sporadic build failures
@@ -60,8 +58,8 @@ stdenv.mkDerivation rec {
   '';
 
   makeFlags = [
-    "CXX=${llvmPackages.clang}/bin/clang++"
+    "CXX=${stdenv.cc}/bin/clang++"
-    "CLANG=${llvmPackages.clang}/bin/clang"
+    "CLANG=${stdenv.cc}/bin/clang"
     "CLANG_INCLUDE=${llvmPackages.clang-unwrapped}/include"
     ];
 

pkgs/development/compilers/shaderc/default.nix

@@ -27,5 +27,6 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     inherit (src.meta) homepage;
     description = "A collection of tools, libraries and tests for shader compilation.";
+    broken = true;
   };
 }

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

@@ -15,6 +15,13 @@ with haskellLib;
 
 self: super: {
 
+  attoparsec-time_1 = super.attoparsec-time_1.override {
+    doctest = super.doctest_0_13_0;
+  };
+  attoparsec-data = super.attoparsec-data.override {
+    attoparsec-time = self.attoparsec-time_1;
+  };
+
   # This used to be a core package provided by GHC, but then the compiler
   # dropped it. We define the name here to make sure that old packages which
   # depend on this library still evaluate (even though they won't compile
@@ -56,6 +63,13 @@ self: super: {
   # segfault due to missing return: https://github.com/haskell/c2hs/pull/184
   c2hs = dontCheck super.c2hs;
 
+  # https://github.com/gilith/hol/pull/1
+  hol = appendPatch (doJailbreak super.hol) (pkgs.fetchpatch {
+    name = "hol.patch";
+    url = "https://github.com/gilith/hol/commit/a5171bdcacdbe93c46c9f82ec5a38f2a2b69e632.patch";
+    sha256 = "0xkgbhc4in38hspxgz2wcvk56pjalw43gig7lzkjfhgavwxv3jyj";
+  });
+
   # This test keeps being aborted because it runs too quietly for too long
   Lazy-Pbkdf2 = if pkgs.stdenv.isi686 then dontCheck super.Lazy-Pbkdf2 else super.Lazy-Pbkdf2;
 
@@ -95,6 +109,14 @@ self: super: {
   # https://github.com/froozen/kademlia/issues/2
   kademlia = dontCheck super.kademlia;
 
+  # https://github.com/haskell-works/hw-xml/issues/23
+  # Disable building the hw-xml-example executable:
+  hw-xml = (overrideCabal super.hw-xml (drv: {
+    postPatch = "sed -i 's/  hs-source-dirs:       app/" +
+                          "  hs-source-dirs:       app\\n" +
+                          "  buildable:            false/' hw-xml.cabal";
+  }));
+
   hzk = dontCheck super.hzk;
   haskakafka = dontCheck super.haskakafka;
 
@@ -124,6 +146,8 @@ self: super: {
     extraLibraries = [ pkgs.openblasCompat ];
   });
 
+  LambdaHack = super.LambdaHack.override { sdl2-ttf = super.sdl2-ttf_2_0_1; };
+
   # The Haddock phase fails for one reason or another.
   acme-one = dontHaddock super.acme-one;
   attoparsec-conduit = dontHaddock super.attoparsec-conduit;
@@ -899,10 +923,22 @@ self: super: {
     sha256 = "1vss7b99zrhw3r29krl1b60r4qk0m2mpwmrz8q8zdxrh33hb8pd7";
   });
 
-  # happy 1.19.6 and later break some packages.
+  # happy 1.19.6+ broke the Agda build. Sticking with the previous version
-  Agda = super.Agda.override { happy = self.happy_1_19_5; };
+  # avoided that issue, but now the build fails with a segmentation fault
+  # during the install phase for no apparent reason:
+  # https://hydra.nixos.org/build/60678124
+  Agda = markBroken (super.Agda.override { happy = self.happy_1_19_5; });
 
   # https://github.com/jtdaugherty/text-zipper/issues/11
   text-zipper = dontCheck super.text-zipper;
 
+  # https://github.com/graknlabs/grakn-haskell/pull/1
+  grakn = dontCheck (doJailbreak super.grakn);
+
+  # cryptonite == 0.24.x, protolude == 0.2.x
+  wai-secure-cookies = super.wai-secure-cookies.override {
+    cryptonite = super.cryptonite_0_24;
+    protolude = super.protolude_0_2;
+  };
+
 }

pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix

@@ -49,6 +49,9 @@ self: super: {
   transformers = self.transformers_0_4_3_0;
   xhtml = self.xhtml_3000_2_1;
 
+  # Requires ghc 8.2
+  ghc-proofs = dontDistribute super.ghc-proofs;
+
   # We have no working cabal-install at the moment.
   cabal-install = markBroken super.cabal-install;
 

pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix

@@ -43,6 +43,9 @@ self: super: {
   transformers = self.transformers_0_4_3_0;
   xhtml = self.xhtml_3000_2_1;
 
+  # Requires ghc 8.2
+  ghc-proofs = dontDistribute super.ghc-proofs;
+
   # https://github.com/tibbe/hashable/issues/85
   hashable = dontCheck super.hashable;
 

pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix

@@ -48,6 +48,9 @@ self: super: {
     sha256 = "193i1xmq6z0jalwmq0mhqk1khz6zz0i1hs6lgfd7ybd6qyaqnf5f";
   });
 
+  # Requires ghc 8.2
+  ghc-proofs = dontDistribute super.ghc-proofs;
+
   # haddock: No input file(s).
   nats = dontHaddock super.nats;
   bytestring-builder = dontHaddock super.bytestring-builder;

pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix

@@ -44,6 +44,9 @@ self: super: {
   # https://github.com/haskell/cabal/issues/2322
   Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = self.binary_0_8_5_1; process = self.process_1_2_3_0; };
 
+  # Requires ghc 8.2
+  ghc-proofs = dontDistribute super.ghc-proofs;
+
   # https://github.com/tibbe/hashable/issues/85
   hashable = dontCheck super.hashable;
 

pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix

@@ -46,6 +46,9 @@ self: super: {
   # Avoid inconsistent 'binary' versions from 'text' and 'Cabal'.
   cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_8_5_1; });
 
+  # Requires ghc 8.2
+  ghc-proofs = dontDistribute super.ghc-proofs;
+
   # https://github.com/tibbe/hashable/issues/85
   hashable = dontCheck super.hashable;
 

pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix

@@ -42,6 +42,9 @@ self: super: {
   # Avoid inconsistent 'binary' versions from 'text' and 'Cabal'.
   cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_8_5_1; });
 
+  # Requires ghc 8.2
+  ghc-proofs = dontDistribute super.ghc-proofs;
+
   # https://github.com/tibbe/hashable/issues/85
   hashable = dontCheck super.hashable;
 

pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix

@@ -37,6 +37,9 @@ self: super: {
   unix = null;
   xhtml = null;
 
+  # Requires ghc 8.2
+  ghc-proofs = dontDistribute super.ghc-proofs;
+
   # https://github.com/peti/jailbreak-cabal/issues/9
   jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_20_0_4; };
 

pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix

@@ -44,6 +44,9 @@ self: super: {
     sha256 = "026vv2k3ks73jngwifszv8l59clg88pcdr4mz0wr0gamivkfa1zy";
   });
 
+  # Requires ghc 8.2
+  ghc-proofs = dontDistribute super.ghc-proofs;
+
   # http://hub.darcs.net/dolio/vector-algorithms/issue/9#comment-20170112T145715
   vector-algorithms = dontCheck super.vector-algorithms;
 

pkgs/development/haskell-modules/lib.nix

@@ -117,7 +117,9 @@ rec {
     '';
   });
 
-  buildStrictly = pkg: buildFromSdist (appendConfigureFlag pkg "--ghc-option=-Wall --ghc-option=-Werror");
+  buildStrictly = pkg: buildFromSdist (failOnAllWarnings pkg);
+
+  failOnAllWarnings = drv: appendConfigureFlag drv "--ghc-option=-Wall --ghc-option=-Werror";
 
   checkUnusedPackages =
     { ignoreEmptyImports ? false

pkgs/development/libraries/blitz/default.nix

@@ -75,5 +75,7 @@ stdenv.mkDerivation rec {
       random number generators, and small vectors (useful for representing
       multicomponent or vector fields).
     '';
+
+    broken = true; # failing test, ancient version, no library user in nixpkgs => if you care to fix it, go ahead
   };
 }

pkgs/development/libraries/coin3d/default.nix

@@ -16,6 +16,9 @@ stdenv.mkDerivation rec {
       sha256 = "076dyc52swk8qc7ylps53fg6iqmd52x8s7m18i80x49dd109yw20";
     })
     ./gcc-4.8.patch # taken from FC-17 source rpm
+    # see https://bitbucket.org/Coin3D/coin/issues/128/crash-in-cc_memalloc_deallocate
+    # patch adapted from https://bitbucket.org/Coin3D/coin/pull-requests/75/added-fix-for-issue-128-provided-by-fedora/diff
+    ./sbhashentry.patch
   ];
 
   buildInputs = [ mesa ];

pkgs/development/libraries/coin3d/sbhashentry.patch

@@ -0,0 +1,25 @@
+diff -u --label /tmp/Coin-3.1.3/src/misc/SbHash.h --label \#\<buffer\ SbHash.h\> /tmp/Coin-3.1.3/src/misc/SbHash.h /tmp/buffer-content-21756V0
+--- a/src/misc/SbHash.h
++++ b/src/misc/SbHash.h
+@@ -88,8 +88,8 @@
+     SbHashEntry<Type, Key> * entry = static_cast<SbHashEntry<Type, Key> *>( ptr);
+     cc_memalloc_deallocate(entry->memhandler, ptr);
+   }
+-  SbHashEntry(const Key & key, const Type & obj) : key(key), obj(obj) {}
+-
++  SbHashEntry(const Key & key, const Type & obj, cc_memalloc *memhandler)
++		: key(key), obj(obj), memhandler(memhandler) {}
+   Key key;
+   Type obj;
+   SbHashEntry<Type, Key> * next;
+@@ -218,7 +218,7 @@
+     /* Key not already in the hash table; insert a new
+      * entry as the first element in the bucket
+      */
+-    entry = new (this->memhandler) SbHashEntry<Type, Key>(key, obj);
++    entry = new (this->memhandler) SbHashEntry<Type, Key>(key, obj, this->memhandler);
+     entry->next = this->buckets[i];
+     this->buckets[i] = entry;
+
+
+Diff finished.  Sat Sep  9 19:50:32 2017

pkgs/development/libraries/fontconfig/make-fonts-cache.nix

@@ -2,7 +2,7 @@
 
 runCommand "fc-cache"
   rec {
-    buildInputs = [ fontconfig ];
+    buildInputs = [ fontconfig.bin ];
     passAsFile = [ "fontDirs" ];
     fontDirs = ''
       <!-- Font directories -->

pkgs/development/libraries/fox/fox-1.6.nix

@@ -1,5 +1,6 @@
 { stdenv, fetchurl, xlibsWrapper, libpng, libjpeg, libtiff, zlib, bzip2, libXcursor
-, libXrandr, mesa, libXft, libXfixes, xinput }:
+, libXrandr, mesa, libXft, libXfixes, xinput
+, CoreServices }:
 
 let
   version = "1.6.49";
@@ -13,8 +14,10 @@ stdenv.mkDerivation rec {
     sha256 = "03m9wm8hpzh1i0fxx5mpvjr67384pfm9hn7gzdcq55b4639fqy9n";
   };
 
-  buildInputs = [ xlibsWrapper libpng libjpeg libtiff zlib bzip2 libXcursor libXrandr
+  buildInputs = [
-      libXft mesa libXfixes xinput ];
+    xlibsWrapper libpng libjpeg libtiff zlib bzip2 libXcursor libXrandr
+    libXft mesa libXfixes xinput
+  ] ++ stdenv.lib.optional stdenv.isDarwin CoreServices;
 
   doCheck = true;
 

pkgs/development/libraries/gsoap/default.nix

@@ -5,11 +5,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "gsoap-${version}";
-  version = "${majorVersion}.49";
+  version = "${majorVersion}.53";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/gsoap2/gsoap-${majorVersion}/gsoap_${version}.zip";
-    sha256 = "0414q7zabkq3iiccl2yql3vbihbr7ach9d517b37zv3mp7nhj2aj";
+    sha256 = "0n35dh32gidi65c36cwjd91304pwiabfblvd64kg21djpjl06qcr";
   };
 
   buildInputs = [ openssl zlib ];

pkgs/development/libraries/v8/3.30.33.nix

@@ -1,6 +0,0 @@
-{ callPackage, ... } @ args:
-
-callPackage ./generic.nix (args // {
-  version = "3.30.33.16";
-  sha256 = "1azf1b36gqj4z5x0k9wq2dkp99zfyhwb0d6i2cl5fjm3k6js7l45";
-})

pkgs/development/libraries/v8/4.5.nix

@@ -1,145 +0,0 @@
-{ stdenv, lib, fetchgit, fetchFromGitHub, gyp, readline, python, which, icu
-, patchelf, coreutils
-, doCheck ? false
-}:
-
-assert readline != null;
-
-let
-  arch = if stdenv.isArm
-         then if stdenv.is64bit
-              then"arm64"
-              else "arm"
-         else if stdenv.is64bit
-              then"x64"
-              else "ia32";
-  git_url = "https://chromium.googlesource.com";
-  clangFlag = if stdenv.isDarwin then "1" else "0";
-
-  deps = {
-    "build/gyp" = fetchgit {
-      url = "${git_url}/external/gyp.git";
-      rev = "5122240c5e5c4d8da12c543d82b03d6089eb77c5";
-      sha256 = "0mdrrhmfl4jrdmfrxmg7ywhdf9c7gv2x08fiq955fs9z8kvxqgdx";
-    };
-    "third_party/icu" = fetchgit {
-      url = "${git_url}/chromium/deps/icu.git";
-      rev = "c81a1a3989c3b66fa323e9a6ee7418d7c08297af";
-      sha256 = "0xrhig85vpw9hqjrhkxsr69m2xnig2bwmjhylzffrwz0783l7yhw";
-    };
-    "buildtools" = fetchgit {
-      url = "${git_url}/chromium/buildtools.git";
-      rev = "ecc8e253abac3b6186a97573871a084f4c0ca3ae";
-      sha256 = "1ccfnj3dp4i0z2bj09zy8aa4x749id6h058qa330li368417jwci";
-    };
-    "testing/gtest" = fetchgit {
-      url = "${git_url}/external/googletest.git";
-      rev = "23574bf2333f834ff665f894c97bef8a5b33a0a9";
-      sha256 = "1scyrk8d6xrsqma27q0wdrxqfa2n12k8mi9lfbsm5ivim9sr1d75";
-    };
-    "testing/gmock" = fetchgit {
-      url = "${git_url}/external/googlemock.git";
-      rev = "29763965ab52f24565299976b936d1265cb6a271";
-      sha256 = "0n2ajjac7myr5bgqk0x7j8281b4whkzgr1irv5nji9n3xz5i6gz4";
-    };
-    "tools/clang" = fetchgit {
-      url = "${git_url}/chromium/src/tools/clang.git";
-      rev = "73ec8804ed395b0886d6edf82a9f33583f4a7902";
-      sha256 = "0p2w4cgj3d4lqa8arss3j86lk0g8zhbbn5pzlcrhy5pl4xphjbk3";
-    };
-  };
-
-in
-
-stdenv.mkDerivation rec {
-  name = "v8-${version}";
-  version = "4.5.107";
-
-  inherit doCheck;
-
-  src = fetchFromGitHub {
-    owner = "v8";
-    repo = "v8";
-    rev = version;
-    sha256 = "0wbzi4rhm4ygsm1k4x0vwfm42z3j8ww6wz7bcvd0m7mqzayn0bw4";
-  };
-
-  postUnpack = ''
-    ${lib.concatStringsSep "\n" (
-      lib.mapAttrsToList (n: v: ''
-        mkdir -p $sourceRoot/${n}
-        cp -r ${v}/* $sourceRoot/${n}
-      '') deps)}
-  '';
-
-  # Patches pulled from:
-  # https://github.com/cowboyd/libv8/tree/4.5/patches
-  patches = lib.optional (!doCheck) ./disable-building-tests.patch ++ [
-    ./fPIC-for-static.patch
-    ./build-standalone-static-library.patch
-  ];
-
-  postPatch = ''
-    sed -i 's,#!/usr/bin/env python,#!${python}/bin/python,' build/gyp_v8
-    sed -i 's,/bin/echo,${coreutils}/bin/echo,' build/standalone.gypi
-    sed -i '/CR_CLANG_REVISION/ d' build/standalone.gypi
-    sed -i 's/-Wno-format-pedantic//g' build/standalone.gypi
-  '';
-
-  configurePhase = ''
-    PYTHONPATH="tools/generate_shim_headers:$PYTHONPATH" \
-    PYTHONPATH="$(toPythonPath ${gyp}):$PYTHONPATH" \
-      build/gyp_v8 \
-        -f make \
-        --generator-output="out" \
-        -Dflock_index=0 \
-        -Dclang=${clangFlag} \
-        -Dv8_enable_i18n_support=1 \
-        -Duse_system_icu=1 \
-        -Dcomponent=shared_library \
-        -Dconsole=readline \
-        -Dv8_target_arch=${arch} \
-        -Dv8_use_external_startup_data=0
-  '';
-
-  nativeBuildInputs = [ which ];
-  buildInputs = [ readline python icu patchelf ];
-
-  NIX_CFLAGS_COMPILE = "-Wno-error=strict-overflow";
-
-  buildFlags = [
-    "LINK=g++"
-    "-C out"
-    "builddir=$(CURDIR)/Release"
-    "BUILDTYPE=Release"
-  ];
-
-  enableParallelBuilding = true;
-
-  # the `libv8_libplatform` target is _only_ built as a static library,
-  # and is expected to be statically linked in when needed.
-  # see the following link for further commentary:
-  # https://github.com/cowboyd/therubyracer/issues/391
-  installPhase = ''
-    install -vD out/Release/d8 "$out/bin/d8"
-    install -vD out/Release/mksnapshot "$out/bin/mksnapshot"
-    ${if stdenv.isDarwin then ''
-    install -vD out/Release/lib.target/libv8.dylib "$out/lib/libv8.dylib"
-    install_name_tool -change /usr/local/lib/libv8.dylib $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.cc.lib}/lib/libgcc_s.1.dylib $out/bin/d8
-    install_name_tool -id $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.cc.lib}/lib/libgcc_s.1.dylib $out/lib/libv8.dylib
-    '' else ''
-    install -vD out/Release/lib.target/libv8.so "$out/lib/libv8.so"
-    ''}
-    mkdir -p "$out/include"
-    cp -vr include/*.h "$out/include"
-    cp -vr include/libplatform "$out/include"
-    cp -v  out/Release/*.a "$out/lib"
-  '';
-
-  meta = with lib; {
-    description = "Google's open source JavaScript engine";
-    maintainers = with maintainers; [ cstrahan proglodyte ];
-    platforms = platforms.linux;
-    license = licenses.bsd3;
-  };
-}

pkgs/development/libraries/v8/default.nix

@@ -161,7 +161,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ readline python icu patchelf ]
   ++ stdenv.lib.optionals stdenv.isDarwin [ cctools ];
 
-  NIX_CFLAGS_COMPILE = "-Wno-error=strict-overflow";
+  NIX_CFLAGS_COMPILE = "-Wno-error=strict-overflow -Wno-error=unused-function -Wno-error=attributes";
 
   buildFlags = [
     "LINK=c++"

pkgs/development/node-packages/default-v6.nix

@@ -53,4 +53,12 @@ nodePackages // {
       export PATH="$PATH:$tmp"
     '';
   });
+
+  fast-cli = nodePackages.fast-cli.override (oldAttrs: {
+    preRebuild = ''
+      # Simply ignore the phantomjs --version check. It seems to need a display but it is safe to ignore
+      sed -i -e "s|console.error('Error verifying phantomjs, continuing', err)|console.error('Error verifying phantomjs, continuing', err); return true;|" node_modules/phantomjs-prebuilt/lib/util.js
+    '';
+    buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs2 ];
+  });
 }

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

@@ -2,17 +2,17 @@
 
 buildPythonPackage rec {
   pname = "phonenumbers";
-  version = "8.8.0";
+  version = "8.8.1";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0j8yzn7fva863v7vrjk0s1d63yswg8hf2hlpvfwzxk9absjyvmgq";
+    sha256 = "09f4b307v6wn5zs6spvp5icwad3dz9baf7d14hyvpnxn7cdqj2xy";
   };
 
   meta = {
     description = "Python version of Google's common library for parsing, formatting, storing and validating international phone numbers";
-    homepage    = "https://github.com/daviddrysdale/python-phonenumbers";
+    homepage    = https://github.com/daviddrysdale/python-phonenumbers;
     license     = stdenv.lib.licenses.asl20;
     maintainers = with stdenv.lib.maintainers; [ fadenb ];
   };

pkgs/development/python-modules/python-simple-hipchat/default.nix

@@ -0,0 +1,21 @@
+{ stdenv, buildPythonPackage, fetchPypi
+, unzip }:
+
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "python-simple-hipchat";
+  version = "0.4.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0zy6prrj85jjc4xmxgfg8h94j81k6zhfxfffcbvq9b10jis1rgav";
+  };
+
+  buildInputs = [ unzip ];
+
+  meta = with stdenv.lib; {
+    description = "Easy peasy wrapper for HipChat's v1 API";
+    homepage = https://github.com/kurttheviking/simple-hipchat-py;
+    license = licenses.mit;
+  };
+}

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

@@ -0,0 +1,23 @@
+{ stdenv, buildPythonPackage, fetchPypi, isPy3k }:
+
+buildPythonPackage rec {
+  name  = "${pname}-${version}";
+  pname = "unicorn";
+  version = "1.0.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0a5b4vh734b3wfkgapzzf8x18rimpmzvwwkly56da84n27wfw9bg";
+  };
+
+  disabled = isPy3k;
+
+  setupPyBuildFlags = [ "--plat-name" "linux" ];
+
+  meta = with stdenv.lib; {
+    description = "Unicorn CPU emulator engine";
+    homepage = "http://www.unicorn-engine.org/";
+    license = [ licenses.gpl2 ];
+    maintainers = [ maintainers.bennofs ];
+  };
+}

pkgs/development/tools/build-managers/buildbot/default.nix

@@ -3,6 +3,7 @@
 let
   withPlugins = plugins: runCommand "wrapped-${package.name}" {
     buildInputs = [ makeWrapper ] ++ plugins;
+    propagatedBuildInputs = package.propagatedBuildInputs;
     passthru.withPlugins = moarPlugins: withPlugins (moarPlugins ++ plugins);
   } ''
     makeWrapper ${package}/bin/buildbot $out/bin/buildbot \
@@ -10,14 +11,14 @@ let
     ln -sfv ${package}/lib $out/lib
   '';
 
-  package = pythonPackages.buildPythonApplication (rec {
+  package = pythonPackages.buildPythonApplication rec {
     name = "${pname}-${version}";
     pname = "buildbot";
-    version = "0.9.9.post2";
+    version = "0.9.11";
 
     src = pythonPackages.fetchPypi {
       inherit pname version;
-      sha256 = "0g932pvkxqq3ijwkwwa29jd9sp5895gv40c3k7m2acc5dp8ygb9w";
+      sha256 = "1s3y218wry7502xp4zxccf3z996xm8cnp3dcxl7m5ldmmb055qwv";
     };
 
     buildInputs = with pythonPackages; [
@@ -39,7 +40,6 @@ let
     ];
 
     propagatedBuildInputs = with pythonPackages; [
-
       # core
       twisted
       jinja2
@@ -87,5 +87,5 @@ let
       maintainers = with maintainers; [ nand0p ryansydnor ];
       license = licenses.gpl2;
     };
-  });
+  };
 in package

pkgs/development/tools/build-managers/buildbot/worker.nix

@@ -3,11 +3,11 @@
 pythonPackages.buildPythonApplication (rec {
   name = "${pname}-${version}";
   pname = "buildbot-worker";
-  version = "0.9.9.post2";
+  version = "0.9.11";
 
   src = pythonPackages.fetchPypi {
     inherit pname version;
-    sha256 = "1wb2fw0djamhn1sb7rwnf12i4ijdq9y4k33ri7dcwxxcavxsvqa0";
+    sha256 = "0lb8kwg3m9jgrww929d5nrjs4rj489mb4dnsdxcbdb358jbbym22";
   };
 
   buildInputs = with pythonPackages; [ setuptoolsTrial mock ];

pkgs/development/tools/glslviewer/default.nix

@@ -1,6 +1,7 @@
-{ stdenv, fetchFromGitHub, glfw, pkgconfig, libXrandr, libXdamage,
+{ stdenv, fetchFromGitHub, glfw, pkgconfig, libXrandr, libXdamage
-  libXext, libXrender, libXinerama, libXcursor, libXxf86vm, libXi,
+, libXext, libXrender, libXinerama, libXcursor, libXxf86vm, libXi
-  libX11, mesa_glu }:
+, libX11, mesa_glu, Cocoa
+}:
 
 stdenv.mkDerivation rec {
   name = "glslviewer-${version}";
@@ -15,17 +16,21 @@ stdenv.mkDerivation rec {
 
   # Makefile has /usr/local/bin hard-coded for 'make install'
   preConfigure = ''
-    sed s,/usr/local,$out, -i Makefile
+    substituteInPlace Makefile \
+        --replace '/usr/local' "$out" \
+        --replace '/usr/bin/clang++' 'clang++'
   '';
 
   preInstall = ''
     mkdir -p $out/bin
   '';
-  
+
-  buildInputs = [ glfw mesa_glu pkgconfig glfw libXrandr libXdamage
+  buildInputs = [
-                  libXext libXrender libXinerama libXcursor libXxf86vm
+    glfw mesa_glu pkgconfig glfw libXrandr libXdamage
-                  libXi libX11 ];
+    libXext libXrender libXinerama libXcursor libXxf86vm
-  
+    libXi libX11
+  ] ++ stdenv.lib.optional stdenv.isDarwin Cocoa;
+
   meta = with stdenv.lib; {
     description = "Live GLSL coding renderer";
     homepage = http://patriciogonzalezvivo.com/2015/glslViewer/;

pkgs/development/tools/misc/arm-frc-linux-gnueabi-binutils/default.nix

@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.gpl2;
     maintainers = [ stdenv.lib.maintainers.colescott ];
     platforms = stdenv.lib.platforms.linux;
-
+    broken = true; # since 2017-09-10
     priority = 3;
   };
 }

pkgs/development/tools/misc/dbench/default.nix

@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     description = "Filesystem benchmark tool based on load patterns";
     homepage = https://dbench.samba.org/;
     license = licenses.gpl3;
-    platforms = platforms.all;
+    platforms = platforms.linux;
     maintainers = [ maintainers.bjornfor ];
   };
 }

pkgs/development/tools/profiling/oprofile/default.nix

@@ -1,17 +1,23 @@
-{ stdenv, fetchurl, binutils, popt, zlib, pkgconfig, linuxHeaders
+{ stdenv, fetchurl, binutils, popt, zlib, pkgconfig, linuxHeaders, coreutils
 , libiberty_static, withGUI ? false , qt4 ? null}:
 
 # libX11 is needed because the Qt build stuff automatically adds `-lX11'.
 assert withGUI -> qt4 != null;
 
 stdenv.mkDerivation rec {
-  name = "oprofile-1.1.0";
+  name = "oprofile-1.2.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/oprofile/${name}.tar.gz";
-    sha256 = "0v1nn38h227bgxjwqf22rjp2iqgjm4ls3gckzifks0x6w5nrlxfg";
+    sha256 = "0zd5ih6gmm1pkqavd9laa93iff7qv5jkbfjznhlyxl5p826gk5gb";
   };
 
+  postPatch = ''
+    substituteInPlace opjitconv/opjitconv.c \
+      --replace "/bin/rm" "${coreutils}/bin/rm" \
+      --replace "/bin/cp" "${coreutils}/bin/cp"
+  '';
+
   buildInputs = [ binutils zlib popt pkgconfig linuxHeaders libiberty_static ]
     ++ stdenv.lib.optionals withGUI [ qt4 ];
 

pkgs/misc/emulators/desmume/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl
+{ stdenv, fetchurl, fetchpatch
 , pkgconfig, libtool, intltool
 , libXmu
 , lua
@@ -18,6 +18,14 @@ stdenv.mkDerivation rec {
     sha256 = "15l8wdw3q61fniy3h93d84dnm6s4pyadvh95a0j6d580rjk4pcrs";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "gcc6_fixes.patch";
+      url = "https://anonscm.debian.org/viewvc/pkg-games/packages/trunk/desmume/debian/patches/gcc6_fixes.patch?revision=15925";
+      sha256 = "0j3fmxz0mfb3f4biks03pyz8f9hy958ks6qplisl60rzq9v9qpks";
+     })
+  ];
+
   buildInputs =
   [ pkgconfig libtool intltool libXmu lua agg alsaLib soundtouch
     openal desktop_file_utils gtk2 gtkglext libglade pangox_compat

pkgs/misc/emulators/fs-uae/default.nix

@@ -5,11 +5,11 @@ with stdenv.lib;
 stdenv.mkDerivation rec {
 
   name = "fs-uae-${version}";
-  version = "2.8.0";
+  version = "2.8.3";
 
   src = fetchurl {
     url = "http://fs-uae.net/fs-uae/stable/${version}/${name}.tar.gz";
-    sha256 = "1cvvlkzhh4rrpax7505bngw990rx86l1nhad174zpqc9ah93il25";
+    sha256 = "14k2p324sdr662f49299mv0bw5jmpj1i2iqn0xs5pgf80x6l3mg2";
   };
 
   buildInputs = [ pkgconfig gettext gtk2 SDL2 zlib glib openal mesa lua freetype libmpeg2 zip ];
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2Plus;
     homepage = http://fs-uae.net;
     maintainers = with stdenv.lib; [ maintainers.AndersonTorres ];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = [ "i686-linux" "x86_64-linux" ];
   };
 }
 # TODO: testing and Python GUI support

pkgs/misc/emulators/mupen64plus/default.nix

@@ -1,35 +1,27 @@
-{stdenv, fetchurl, which, pkgconfig, SDL, gtk2, mesa, SDL_ttf}:
+{stdenv, lib, fetchurl, boost, dash, freetype, libpng, pkgconfig, SDL, which, zlib }:
+
+stdenv.mkDerivation rec {
+  name = "mupen64plus-${version}";
+  version = "2.5";
 
-stdenv.mkDerivation {
-  name = "mupen64plus-1.5";
   src = fetchurl {
-    url = http://mupen64plus.googlecode.com/files/Mupen64Plus-1-5-src.tar.gz;
+    url = "https://github.com/mupen64plus/mupen64plus-core/releases/download/${version}/mupen64plus-bundle-src-${version}.tar.gz";
-    sha256 = "0gygfgyr2sg4yx77ijk133d1ra0v1yxi4xjxrg6kp3zdjmhdmcjq";
+    sha256 = "0rmsvfn4zfvbhz6gf1xkb7hnwflv6sbklwjz2xk4dlpj4vcbjxcw";
   };
 
-  buildInputs = [ which pkgconfig SDL gtk2 mesa SDL_ttf ];
+  buildInputs = [ boost dash freetype libpng pkgconfig SDL which zlib ];
 
-  hardeningDisable = [ "format" ];
+  buildPhase = ''
-
+    dash m64p_build.sh PREFIX="$out" COREDIR="$out/lib/" PLUGINDIR="$out/lib/mupen64plus" SHAREDIR="$out/share/mupen64plus"
-  preConfigure = ''
+  '';
-    # Some C++ incompatibility fixes
+  installPhase = ''
-    sed -i -e 's|char \* extstr = strstr|const char * extstr = strstr|' glide64/Main.cpp
+    dash m64p_install.sh DESTDIR="$out" PREFIX=""
-    sed -i -e 's|char \* extstr = strstr|const char * extstr = strstr|' glide64/Combine.cpp
-
-    # Fix some hardcoded paths
-    sed -i -e "s|/usr/local|$out|g" main/main.c
-
-    # Remove PATH environment variable from install script
-    sed -i -e "s|export PATH=|#export PATH=|" ./install.sh
   '';
-
-  buildPhase = "make all";
-  installPhase = "PREFIX=$out make install";
 
   meta = {
     description = "A Nintendo 64 Emulator";
     license = stdenv.lib.licenses.gpl2Plus;
-    homepage = http://code.google.com/p/mupen64plus;
+    homepage = http://www.mupen64plus.org/;
     maintainers = [ stdenv.lib.maintainers.sander ];
     platforms = stdenv.lib.platforms.linux;
   };

pkgs/misc/emulators/vice/default.nix

@@ -1,18 +1,19 @@
-{ stdenv, fetchurl, perl, libpng, giflib, libjpeg, alsaLib, readline, mesa, libX11
+{ stdenv, fetchurl, bison, flex, perl, libpng, giflib, libjpeg, alsaLib, readline, mesa, libX11, libXaw
 , pkgconfig, gtk2, SDL, autoreconfHook, makeDesktopItem
 }:
 
 stdenv.mkDerivation rec {
-  name = "vice-2.2";
+  name = "vice-3.1";
 
   src = fetchurl {
-    url = http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-2.2.tar.gz;
+    url = mirror://sourceforge/vice-emu/vice-3.1.tar.gz;
-    sha256 = "0l8mp9ybx494fdqgr1ps4x3c3qzms4yyg4hzcn3ihzy92zw1nn2x";
+    sha256 = "0h0jbml02s2a36hr78dxv1zshmfhxp1wadpcdl09aq416fb1bf1y";
   };
 
-  buildInputs = [ perl libpng giflib libjpeg alsaLib readline mesa
+  buildInputs = [ bison flex perl libpng giflib libjpeg alsaLib readline mesa
-                  pkgconfig gtk2 SDL autoreconfHook ];
+    pkgconfig gtk2 SDL autoreconfHook libXaw ];
-  configureFlags = "--with-sdl --enable-fullscreen --enable-gnomeui";
+  dontDisableStatic = true;
+  configureFlags = "--enable-fullscreen --enable-gnomeui";
 
   desktopItem = makeDesktopItem {
     name = "vice";
@@ -23,12 +24,19 @@ stdenv.mkDerivation rec {
     categories = "Application;Emulator;";
   };
 
+  preBuild = ''
+    for i in src/resid src/resid-dtv
+    do
+        mkdir -pv $i/src
+        ln -sv ../../wrap-u-ar.sh $i/src
+    done
+  '';
   patchPhase = ''
     # Disable font-cache update
     sed -i -e "s|install: install-data-am|install-no: install-data-am|" data/fonts/Makefile.am
   '';
 
-  NIX_LDFLAGS = "-lX11 -L${libX11}/lib";
+  #NIX_LDFLAGS = "-lX11 -L${libX11}/lib";
 
   postInstall = ''
     mkdir -p $out/share/applications

pkgs/misc/emulators/zsnes/default.nix

@@ -58,6 +58,6 @@ in stdenv.mkDerivation {
     license = stdenv.lib.licenses.gpl2Plus;
     maintainers = [ stdenv.lib.maintainers.sander ];
     homepage = http://www.zsnes.com;
-    platforms = stdenv.lib.platforms.linux;
+    platforms = [ "i686-linux" "x86_64-linux" ];
   };
 }

pkgs/misc/themes/greybird/default.nix

@@ -3,13 +3,13 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "greybird";
-  version = "3.22.4";
+  version = "3.22.5";
 
   src = fetchFromGitHub {
     owner = "shimmerproject";
     repo = "${pname}";
     rev = "v${version}";
-    sha256 = "1xh6vi4rmxmkrgy9qskcl8q6014qnsn19xjjwbmwf8n6yr07scl3";
+    sha256 = "0l107q9fcbgp73r4p4fmyy3a7pmc4mi4km5hgp67fm2a4dna7rkd";
   };
 
   nativeBuildInputs = [ autoreconfHook sass glib libxml2 gdk_pixbuf librsvg ];

pkgs/misc/vim-plugins/default.nix

@@ -473,6 +473,17 @@ rec {
 
   };
 
+  flake8-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "flake8-vim-2017-02-17";
+    src = fetchgit {
+      url = "https://github.com/andviro/flake8-vim";
+      rev = "01c4af4c68f33b2b3785314bfbf5b3d8d1451795";
+      sha256 = "14rv0p1vx4njlplkc72gz7r8sy9vc6n8x9l00zc777x5zzrhgz3g";
+    };
+    dependencies = [];
+
+  };
+
   vim-css-color = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-css-color-2017-02-09";
     src = fetchgit {

pkgs/misc/vim-plugins/vim-plugin-names

@@ -29,6 +29,7 @@
 "github:ajh17/Spacegray.vim"
 "github:albfan/nerdtree-git-plugin"
 "github:alvan/vim-closetag"
+"github:andviro/flake8-vim"
 "github:ap/vim-css-color"
 "github:bbchung/clighter8"
 "github:benekastah/neomake"

pkgs/os-specific/linux/kernel/linux-4.12.nix

@@ -1,12 +1,12 @@
 { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.12.11";
+  version = "4.12.12";
   extraMeta.branch = "4.12";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "015kyh0v9lkk4a6sa7ysddi7dm639z5p45v2sh2kswsih4sf7kxf";
+    sha256 = "1d254yxn46ydp0x3s5cpyg4p74zvdwiqfiaaim1m3g6rwjmlkjpa";
   };
 
   kernelPatches = args.kernelPatches;

pkgs/os-specific/linux/kernel/linux-4.13.nix

@@ -1,13 +1,12 @@
 { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.13";
+  version = "4.13.1";
-  modDirVersion = "4.13.0";
   extraMeta.branch = "4.13";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0b4slkcq9pxxwp5sfbzffplsf8p0a4lksflpbfr3xn9sdh3ddcrd";
+    sha256 = "1kp1lsf4314af7crpqkd2x1zx407a97r7rz3zhhskbilvsifgkny";
   };
 
   kernelPatches = args.kernelPatches;

pkgs/os-specific/linux/kernel/linux-4.9.nix

@@ -1,12 +1,12 @@
 { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.9.48";
+  version = "4.9.49";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0y3s5xbh5axdvsx9iwz7sinbm7v6j2dvmj8dz46zj1mziwicagwq";
+    sha256 = "1ywiww2h1gf3ps305irzk7n9xkcgg9bclr2jw6r5cqxmh3qxrv2p";
   };
 
   kernelPatches = args.kernelPatches;

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

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

pkgs/servers/http/tomcat/default.nix

@@ -32,20 +32,20 @@ let
 in {
   tomcat7 = common {
     versionMajor = "7";
-    versionMinor = "0.75";
+    versionMinor = "0.81";
-    sha256 = "0w5adsy4792qkf3ws46f539lrdbpz7lghy79s6b04c9yqaxjz6ni";
+    sha256 = "0mcr3caizqk6qrc0j9p91apdsg65ksawg0l6xpqk1fq6071nd5rq";
   };
 
   tomcat8 = common {
     versionMajor = "8";
-    versionMinor = "0.41";
+    versionMinor = "0.46";
-    sha256 = "1mvnf6m29y3p40vvi9mgghrddlmgwcrcvfwrf9vbama78fsh8wm5";
+    sha256 = "14wb9mgb7z02j6wvvmcsfc2zkcqnijc40gzyg1mnxcy5fvf8nzpk";
   };
 
   tomcat85 = common {
     versionMajor = "8";
-    versionMinor = "5.14";
+    versionMinor = "5.20";
-    sha256 = "0dls16lw7yak3s6cwwcccfg0qb5g8s36waxlg8wgjk8vc57h316w";
+    sha256 = "1l5cgxzaassjnfbr4rbr3wzz45idcqa8aqhphhvlx1xl8xqv6p8a";
   };
 
   tomcatUnstable = common {

pkgs/servers/openafs-client/default.nix

@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "openafs-${version}-${kernel.version}";
-  version = "1.6.20.2";
+  version = "1.6.21";
 
   src = fetchurl {
     url = "http://www.openafs.org/dl/openafs/${version}/openafs-${version}-src.tar.bz2";
-    sha256 = "50234820c3da9752d2ca05fb7e83b7dc5c96a0e96a0b875ebc7ae3c835607614";
+    sha256 = "ba9c1f615edd53b64fc271ad369c49a816acedca70cdd090975033469a84118f";
   };
 
   nativeBuildInputs = [ autoconf automake flex yacc perl which ];
@@ -47,6 +47,7 @@ stdenv.mkDerivation rec {
     platforms = platforms.linux;
     maintainers = [ maintainers.z77z ];
     broken =
-      (builtins.compareVersions kernel.version  "3.18" == -1);
+      (builtins.compareVersions kernel.version  "3.18" == -1) ||
+      (builtins.compareVersions kernel.version "4.13" == 0);
   };
 }

pkgs/servers/plex/default.nix

@@ -6,9 +6,9 @@
 let
   plexPass = throw "Plex pass has been removed at upstream's request; please unset nixpkgs.config.plex.pass";
   plexpkg = if enablePlexPass then plexPass else {
-    version = "1.7.5.4035";
+    version = "1.8.4.4249";
-    vsnHash = "313f93718";
+    vsnHash = "3497d6779";
-    sha256 = "89b8585e561046a8422d520ebcdae784f5dc3c895aac8d313c435cc6b58795b8";
+    sha256 = "ca3db297f4dbc73a5a405ac032ff250e5df97b84da6dcac55165b13e6445ca80";
   };
 
 in stdenv.mkDerivation rec {

pkgs/servers/radarr/default.nix

@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "radarr-${version}";
-  version = "0.2.0.778";
+  version = "0.2.0.846";
 
   src = fetchurl {
     url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.develop.${version}.linux.tar.gz";
-    sha256 = "0145nsdnhsd3nbg2nml5malm4kn28k2siaimqb41dcmc88fws015";
+    sha256 = "1lpr05aaf6a9p2msmsh0j8krxk83sf5d3avrh5qpyjap5j3phvky";
   };
 
   buildInputs = [ makeWrapper ];

pkgs/servers/trezord/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, curl, cmake, boost, gcc, protobuf, pkgconfig, jsoncpp
+{ stdenv, fetchgit, fetchFromGitHub, curl, cmake, boost, gcc, protobuf, pkgconfig, jsoncpp
 , libusb1, libmicrohttpd
 }:
 
@@ -15,6 +15,13 @@ stdenv.mkDerivation rec {
     sha256 = "1iaxmwyidjdcrc6jg0859v6v5x3qnz5b0p78pq0bypvmgyijhpm4";
   };
 
+  common = fetchFromGitHub {
+    owner = "trezor";
+    repo = "trezor-common";
+    rev = "b55fb61218431e9c99c9d6c1673801902fc9e92e";
+    sha256 = "1zanbgz1qjs8wfwp0z91sqcvj77a9iis694k415jyd2dn4riqhdg";
+  };
+
   meta = with stdenv.lib; {
     description = "TREZOR Bridge daemon for TREZOR bitcoin hardware wallet";
     homepage = https://mytrezor.com;
@@ -40,8 +47,15 @@ stdenv.mkDerivation rec {
     jsoncpp
   ];
 
+  preConfigure = ''
+    ( cd src/config
+      ln -s $common/protob/config.proto
+      protoc -I . --cpp_out=. config.proto
+    )
+  '';
+
   LD_LIBRARY_PATH = "${stdenv.lib.makeLibraryPath [ curl ]}";
-  cmakeFlags="-DJSONCPP_LIBRARY='${jsoncpp}/lib/libjsoncpp.so'";
+  cmakeFlags = [ "-DJSONCPP_LIBRARY='${jsoncpp}/lib/libjsoncpp.so'" ];
 
   installPhase = ''
     mkdir -p $out/bin

pkgs/test/cc-wrapper/cc-main.c

@@ -0,0 +1,7 @@
+#include <stdio.h>
+
+int main(int argc, char **argv)
+{
+  fprintf(stderr, "ok\n");
+  return 0;
+}

pkgs/test/cc-wrapper/cflags-main.c

@@ -0,0 +1,10 @@
+#include <stdio.h>
+#include <foo.h>
+
+int main(int argc, char **argv)
+{
+  if (foo() != 42)
+    return 1;
+  fprintf(stderr, "ok\n");
+  return 0;
+}

pkgs/test/cc-wrapper/core-foundation-main.c

@@ -0,0 +1,7 @@
+#include <CoreFoundation/CoreFoundation.h>
+
+int main(int argc, char** argv)
+{
+  CFShow(CFSTR("ok"));
+  return 0;
+}

pkgs/test/cc-wrapper/cxx-main.cc

@@ -0,0 +1,7 @@
+#include <iostream>
+
+int main(int argc, char **argv)
+{
+  std::cerr << "ok" << std::endl;
+  return 0;
+}