Merge remote-tracking branch 'upstream/python-wip' into HEAD

nixos/modules/rename.nix

@@ -25,6 +25,7 @@ with lib;
     (mkRenamedOptionModule [ "services" "sslh" "host" ] [ "services" "sslh" "listenAddress" ])
     (mkRenamedOptionModule [ "services" "statsd" "host" ] [ "services" "statsd" "listenAddress" ])
     (mkRenamedOptionModule [ "services" "subsonic" "host" ] [ "services" "subsonic" "listenAddress" ])
+    (mkRenamedOptionModule [ "services" "tor" "relay" "portSpec" ] [ "services" "tor" "relay" "port" ])
     (mkRenamedOptionModule [ "jobs" ] [ "systemd" "services" ])
 
     (mkRenamedOptionModule [ "services" "gitlab" "stateDir" ] [ "services" "gitlab" "statePath" ])
@@ -195,6 +196,8 @@ with lib;
     (mkRemovedOptionModule [ "services" "openvpn" "enable" ] "")
     (mkRemovedOptionModule [ "services" "printing" "cupsFilesConf" ] "")
     (mkRemovedOptionModule [ "services" "printing" "cupsdConf" ] "")
+    (mkRemovedOptionModule [ "services" "tor" "relay" "isBridge" ] "Use services.tor.relay.role instead.")
+    (mkRemovedOptionModule [ "services" "tor" "relay" "isExit" ] "Use services.tor.relay.role instead.")
     (mkRemovedOptionModule [ "services" "xserver" "startGnuPGAgent" ]
       "See the 16.09 release notes for more information.")
     (mkRemovedOptionModule [ "services" "phpfpm" "phpIni" ] "")

nixos/modules/security/pam.nix

@@ -281,7 +281,7 @@ let
                 "auth optional ${pkgs.pam_mount}/lib/security/pam_mount.so"}
               ${optionalString cfg.enableKwallet
                 ("auth optional ${pkgs.plasma5.kwallet-pam}/lib/security/pam_kwallet5.so" +
-                 " kwalletd=${pkgs.libsForQt5.kwallet}/bin/kwalletd5")}
+                 " kwalletd=${pkgs.libsForQt5.kwallet.bin}/bin/kwalletd5")}
             '') + ''
           ${optionalString cfg.unixAuth
               "auth sufficient pam_unix.so ${optionalString cfg.allowNullPassword "nullok"} likeauth try_first_pass"}
@@ -350,7 +350,7 @@ let
               "session optional ${pkgs.apparmor-pam}/lib/security/pam_apparmor.so order=user,group,default debug"}
           ${optionalString (cfg.enableKwallet)
               ("session optional ${pkgs.plasma5.kwallet-pam}/lib/security/pam_kwallet5.so" +
-               " kwalletd=${pkgs.libsForQt5.kwallet}/bin/kwalletd5")}
+               " kwalletd=${pkgs.libsForQt5.kwallet.bin}/bin/kwalletd5")}
         '');
     };
 

nixos/modules/services/misc/bepasty.nix

@@ -3,7 +3,7 @@
 with lib;
 let
   gunicorn = pkgs.pythonPackages.gunicorn;
-  bepasty = pkgs.pythonPackages.bepasty-server;
+  bepasty = pkgs.bepasty;
   gevent = pkgs.pythonPackages.gevent;
   python = pkgs.pythonPackages.python;
   cfg = config.services.bepasty;

nixos/modules/services/security/tor.nix

@@ -7,7 +7,7 @@ let
   torDirectory = "/var/lib/tor";
 
   opt    = name: value: optionalString (value != null) "${name} ${value}";
-  optint = name: value: optionalString (value != 0)    "${name} ${toString value}";
+  optint = name: value: optionalString (value != null && value != 0)    "${name} ${toString value}";
 
   torRc = ''
     User tor
@@ -17,7 +17,7 @@ let
       GeoIPv6File ${pkgs.tor.geoip}/share/tor/geoip6
     ''}
 
-    ${optint "ControlPort" cfg.controlPort}
+    ${optint "ControlPort" (toString cfg.controlPort)}
   ''
   # Client connection config
   + optionalString cfg.client.enable  ''
@@ -27,7 +27,8 @@ let
   ''
   # Relay config
   + optionalString cfg.relay.enable ''
-    ORPort ${cfg.relay.portSpec}
+    ORPort ${toString cfg.relay.port}
+    ${opt "Address" cfg.relay.address}
     ${opt "Nickname" cfg.relay.nickname}
     ${opt "ContactInfo" cfg.relay.contactInfo}
 
@@ -36,31 +37,32 @@ let
     ${opt "AccountingMax" cfg.relay.accountingMax}
     ${opt "AccountingStart" cfg.relay.accountingStart}
 
-    ${if cfg.relay.isExit then
+    ${if (cfg.relay.role == "exit") then
         opt "ExitPolicy" cfg.relay.exitPolicy
       else
         "ExitPolicy reject *:*"}
 
-    ${optionalString cfg.relay.isBridge ''
+    ${optionalString (elem cfg.relay.role ["bridge" "private-bridge"]) ''
       BridgeRelay 1
       ServerTransportPlugin obfs2,obfs3 exec ${pkgs.pythonPackages.obfsproxy}/bin/obfsproxy managed
+      ExtORPort auto
+      ${optionalString (cfg.relay.role == "private-bridge") ''
+        ExtraInfoStatistics 0
+        PublishServerDescriptor 0
+      ''}
     ''}
   ''
-  + hiddenServices
+  # Hidden services
+  + concatStrings (flip mapAttrsToList cfg.hiddenServices (n: v: ''
+    HiddenServiceDir ${torDirectory}/onion/${v.name}
+    ${flip concatMapStrings v.map (p: ''
+      HiddenServicePort ${toString p.port} ${p.destination}
+    '')}
+  ''))
   + cfg.extraConfig;
 
-  hiddenServices = concatStrings (mapAttrsToList (hiddenServiceDir: hs:
-    let
-      hsports = concatStringsSep "\n" (map mkHiddenServicePort hs.hiddenServicePorts);
-    in
-      "HiddenServiceDir ${hiddenServiceDir}\n${hsports}\n${hs.extraConfig}\n"
-    ) cfg.hiddenServices);
-
-    mkHiddenServicePort = hsport: let
-      trgt = optionalString (hsport.target != null) (" " + hsport.target);
-    in "HiddenServicePort ${toString hsport.virtualPort}${trgt}";
-
   torRcFile = pkgs.writeText "torrc" torRc;
+
 in
 {
   options = {
@@ -96,8 +98,8 @@ in
       };
 
       controlPort = mkOption {
-        type = types.int;
+        type = types.nullOr (types.either types.int types.str);
-        default = 0;
+        default = null;
         example = 9051;
         description = ''
           If set, Tor will accept connections on the specified port
@@ -133,9 +135,10 @@ in
           example = "192.168.0.1:9101";
           description = ''
             Bind to this address to listen for connections from
-            Socks-speaking applications. Same as socksListenAddress
+            Socks-speaking applications. Same as
-            but uses weaker circuit isolation to provide performance
+            <option>socksListenAddress</option> but uses weaker
-            suitable for a web browser.
+            circuit isolation to provide performance suitable for a
+            web browser.
            '';
          };
 
@@ -145,9 +148,9 @@ in
           example = "accept 192.168.0.0/16, reject *";
           description = ''
             Entry policies to allow/deny SOCKS requests based on IP
-            address.  First entry that matches wins. If no SocksPolicy
+            address. First entry that matches wins. If no SocksPolicy
             is set, we accept all (and only) requests from
-            SocksListenAddress.
+            <option>socksListenAddress</option>.
           '';
         };
 
@@ -176,45 +179,147 @@ in
           description = ''
             Whether to enable relaying TOR traffic for others.
 
-            See https://www.torproject.org/docs/tor-doc-relay for details.
+            See <link xlink:href="https://www.torproject.org/docs/tor-doc-relay" />
+            for details.
+
+            Setting this to true requires setting
+            <option>services.tor.relay.role</option>
+            and
+            <option>services.tor.relay.port</option>
+            options.
           '';
         };
 
-        isBridge = mkOption {
+        role = mkOption {
-          type = types.bool;
+          type = types.enum [ "exit" "relay" "bridge" "private-bridge" ];
-          default = false;
           description = ''
-            Bridge relays (or "bridges") are Tor relays that aren't
+            Your role in Tor network. There're several options:
-            listed in the main directory. Since there is no complete
-            public list of them, even if an ISP is filtering
-            connections to all the known Tor relays, they probably
-            won't be able to block all the bridges.
 
-            A bridge relay can't be an exit relay.
+            <variablelist>
+            <varlistentry>
+              <term><literal>exit</literal></term>
+              <listitem>
+                <para>
+                  An exit relay. This allows Tor users to access regular
+                  Internet services through your public IP.
+                </para>
 
-            You need to set relay.enable to true for this option to
+                <important><para>
-            take effect.
+                  Running an exit relay may expose you to abuse
+                  complaints. See
+                  <link xlink:href="https://www.torproject.org/faq.html.en#ExitPolicies" />
+                  for more info.
+                </para></important>
 
-            The bridge is set up with an obfuscated transport proxy.
+                <para>
+                  You can specify which services Tor users may access via
+                  your exit relay using <option>exitPolicy</option> option.
+                </para>
+              </listitem>
+            </varlistentry>
 
-            See https://www.torproject.org/bridges.html.en for more info.
+            <varlistentry>
-          '';
+              <term><literal>relay</literal></term>
-        };
+              <listitem>
+                <para>
+                  Regular relay. This allows Tor users to relay onion
+                  traffic to other Tor nodes, but not to public
+                  Internet.
+                </para>
 
-        isExit = mkOption {
+                <important><para>
-          type = types.bool;
+                  Note that some misconfigured and/or disrespectful
-          default = false;
+                  towards privacy sites will block you even if your
-          description = ''
+                  relay is not an exit relay. That is, just being listed
-            An exit relay allows Tor users to access regular Internet
+                  in a public relay directory can have unwanted
-            services.
+                  consequences.
 
-            Unlike running a non-exit relay, running an exit relay may
+                  Which means you might not want to use
-            expose you to abuse complaints. See
+                  this role if you browse public Internet from the same
-            https://www.torproject.org/faq.html.en#ExitPolicies for
+                  network as your relay, unless you want to write
-            more info.
+                  e-mails to those sites (you should!).
+                </para></important>
 
-            You can specify which services Tor users may access via
+                <para>
-            your exit relay using exitPolicy option.
+                  See
+                  <link xlink:href="https://www.torproject.org/docs/tor-doc-relay.html.en" />
+                  for more info.
+                </para>
+              </listitem>
+            </varlistentry>
+
+            <varlistentry>
+              <term><literal>bridge</literal></term>
+              <listitem>
+                <para>
+                  Regular bridge. Works like a regular relay, but
+                  doesn't list you in the public relay directory and
+                  hides your Tor node behind obfsproxy.
+                </para>
+
+                <para>
+                  Using this option will make Tor advertise your bridge
+                  to users through various mechanisms like
+                  <link xlink:href="https://bridges.torproject.org/" />, though.
+                </para>
+
+                <important>
+                  <para>
+                    WARNING: THE FOLLOWING PARAGRAPH IS NOT LEGAL ADVISE.
+                    Consult with your lawer when in doubt.
+                  </para>
+
+                  <para>
+                    This role should be safe to use in most situations
+                    (unless the act of forwarding traffic for others is
+                    a punishable offence under your local laws, which
+                    would be pretty insane as it would make ISP
+                    illegal).
+                  </para>
+                </important>
+
+                <para>
+                  See <link xlink:href="https://www.torproject.org/docs/bridges.html.en" />
+                  for more info.
+                </para>
+              </listitem>
+            </varlistentry>
+
+            <varlistentry>
+              <term><literal>private-bridge</literal></term>
+              <listitem>
+                <para>
+                  Private bridge. Works like regular bridge, but does
+                  not advertise your node in any way.
+                </para>
+
+                <para>
+                  Using this role means that you won't contribute to Tor
+                  network in any way unless you advertise your node
+                  yourself in some way.
+                </para>
+
+                <para>
+                  Use this if you want to run a private bridge, for
+                  example because you'll give out your bridge address
+                  manually to your friends.
+                </para>
+
+                <para>
+                  Switching to this role after measurable time in
+                  "bridge" role is pretty useless as some Tor users
+                  would have learned about your node already. In the
+                  latter case you can still change
+                  <option>port</option> option.
+                </para>
+
+                <para>
+                  See <link xlink:href="https://www.torproject.org/docs/bridges.html.en" />
+                  for more info.
+                </para>
+              </listitem>
+            </varlistentry>
+            </variablelist>
           '';
         };
 
@@ -268,8 +373,8 @@ in
         };
 
         bandwidthRate = mkOption {
-          type = types.int;
+          type = types.nullOr types.int;
-          default = 0;
+          default = null;
           example = 100;
           description = ''
             Specify this to limit the bandwidth usage of relayed (server)
@@ -278,7 +383,7 @@ in
         };
 
         bandwidthBurst = mkOption {
-          type = types.int;
+          type = types.nullOr types.int;
           default = cfg.relay.bandwidthRate;
           example = 200;
           description = ''
@@ -288,9 +393,19 @@ in
           '';
         };
 
-        portSpec = mkOption {
+        address = mkOption {
-          type    = types.str;
+          type    = types.nullOr types.str;
-          example = "143";
+          default = null;
+          example = "noname.example.com";
+          description = ''
+            The IP address or full DNS name for advertised address of your relay.
+            Leave unset and Tor will guess.
+          '';
+        };
+
+        port = mkOption {
+          type    = types.either types.int types.str;
+          example = 143;
           description = ''
             What port to advertise for Tor connections. This corresponds to the
             <literal>ORPort</literal> section in the Tor manual; see
@@ -313,13 +428,15 @@ in
             considered first to last, and the first match wins. If you
             want to _replace_ the default exit policy, end this with
             either a reject *:* or an accept *:*. Otherwise, you're
-            _augmenting_ (prepending to) the default exit
+            _augmenting_ (prepending to) the default exit policy.
-            policy. Leave commented to just use the default, which is
+            Leave commented to just use the default, which is
             available in the man page or at
-            https://www.torproject.org/documentation.html
+            <link xlink:href="https://www.torproject.org/documentation.html" />.
 
-            Look at https://www.torproject.org/faq-abuse.html#TypicalAbuses
+            Look at
-            for issues you might encounter if you use the default exit policy.
+            <link xlink:href="https://www.torproject.org/faq-abuse.html#TypicalAbuses" />
+            for issues you might encounter if you use the default
+            exit policy.
 
             If certain IPs and ports are blocked externally, e.g. by
             your firewall, you should update your exit policy to
@@ -330,79 +447,122 @@ in
       };
 
       hiddenServices = mkOption {
-        type = types.attrsOf (types.submodule ({
+        description = ''
+          A set of static hidden services that terminate their Tor
+          circuits at this node.
+
+          Every element in this set declares a virtual onion host.
+
+          You can specify your onion address by putting corresponding
+          private key to an appropriate place in ${torDirectory}.
+
+          For services without private keys in ${torDirectory} Tor
+          daemon will generate random key pairs (which implies random
+          onion addresses) on restart. The latter could take a while,
+          please be patient.
+
+          <note><para>
+            Hidden services can be useful even if you don't intend to
+            actually <emphasis>hide</emphasis> them, since they can
+            also be seen as a kind of NAT traversal mechanism.
+
+            E.g. the example will make your sshd, whatever runs on
+            "8080" and your mail server available from anywhere where
+            the Tor network is available (which, with the help from
+            bridges, is pretty much everywhere), even if both client
+            and server machines are behind NAT you have no control
+            over.
+          </para></note>
+        '';
+        default = {};
+        example = literalExample ''
+          { "my-hidden-service-example".map = [
+              { port = 22; }                # map ssh port to this machine's ssh
+              { port = 80; toPort = 8080; } # map http port to whatever runs on 8080
+              { port = "sip"; toHost = "mail.example.com"; toPort = "imap"; } # because we can
+            ];
+          }
+        '';
+        type = types.loaOf (types.submodule ({name, config, ...}: {
           options = {
-            hiddenServicePorts = mkOption {
-              type = types.listOf (types.submodule {
-                options = {
-                  virtualPort = mkOption {
-                    type = types.int;
-                    example = 80;
-                    description = "Virtual port.";
-                  };
-                  target = mkOption {
-                    type = types.nullOr types.str;
-                    default = null;
-                    example = "127.0.0.1:8080";
-                    description = ''
-                      Target virtual Port shall be mapped to.
 
-                      You may override the target port, address, or both by
+             name = mkOption {
-                      specifying a target of addr, port, addr:port, or
+               type = types.str;
-                      unix:path. (You can specify an IPv6 target as
+               description = ''
-                      [addr]:port. Unix paths may be quoted, and may use
+                 Name of this tor hidden service.
-                      standard C escapes.)
-                    '';
-                  };
-                };
-              });
-              example = [ { virtualPort = 80; target = "127.0.0.1:8080"; } { virtualPort = 6667; } ];
-              description = ''
-                If target is <literal>null</literal> the virtual port is mapped
-                to the same port on 127.0.0.1 over TCP. You may use
-                <literal>target</literal> to overwrite this behaviour (see
-                description of target).
 
-                This corresponds to the <literal>HiddenServicePort VIRTPORT
+                 This is purely descriptive.
-                [TARGET]</literal> option by looking at the tor manual
+
-                <citerefentry><refentrytitle>tor</refentrytitle>
+                 After restarting Tor daemon you should be able to
-                <manvolnum>1</manvolnum></citerefentry> for more information.
+                 find your .onion address in
-              '';
+                 <literal>${torDirectory}/onion/$name/hostname</literal>.
-            };
+               '';
-            extraConfig = mkOption {
+             };
-              type = types.str;
+
-              default = "";
+             map = mkOption {
-              description = ''
+               default = [];
-                Extra configuration. Contents will be added in the current
+               description = "Port mapping for this hidden service.";
-                hidden service context.
+               type = types.listOf (types.submodule ({config, ...}: {
-              '';
+                 options = {
-            };
+
+                   port = mkOption {
+                     type = types.either types.int types.str;
+                     example = 80;
+                     description = ''
+                       Hidden service port to "bind to".
+                     '';
+                   };
+
+                   destination = mkOption {
+                     internal = true;
+                     type = types.str;
+                     description = "Forward these connections where?";
+                   };
+
+                   toHost = mkOption {
+                     type = types.str;
+                     default = "127.0.0.1";
+                     description = "Mapping destination host.";
+                   };
+
+                   toPort = mkOption {
+                     type = types.either types.int types.str;
+                     example = 8080;
+                     description = "Mapping destination port.";
+                   };
+
+                 };
+
+                 config = {
+                   toPort = mkDefault config.port;
+                   destination = mkDefault "${config.toHost}:${toString config.toPort}";
+                 };
+               }));
+             };
+
+          };
+
+          config = {
+            name = mkDefault name;
           };
         }));
-        default = {};
-        example = {
-          "/var/lib/tor/webserver" = {
-            hiddenServicePorts = [ { virtualPort = 80; } ];
-          };
-        };
-        description = ''
-          Configure hidden services.
-
-          Please consult the tor manual
-          <citerefentry><refentrytitle>tor</refentrytitle>
-          <manvolnum>1</manvolnum></citerefentry> for a more detailed
-          explanation. (search for 'HIDDEN').
-        '';
       };
     };
   };
 
   config = mkIf cfg.enable {
-    assertions = singleton
+    # Not sure if `cfg.relay.role == "private-bridge"` helps as tor
-      { message = "Can't be both an exit and a bridge relay at the same time";
+    # sends a lot of stats
-        assertion =
+    warnings = optional (cfg.relay.enable && cfg.hiddenServices != {})
-          cfg.relay.enable -> !(cfg.relay.isBridge && cfg.relay.isExit);
+      ''
-      };
+        Running Tor hidden services on a public relay makes the
+        presence of hidden services visible through simple statistical
+        analysis of publicly available data.
+
+        You can safely ignore this warning if you don't intend to
+        actually hide your hidden services. In either case, you can
+        always create a container/VM with a separate Tor daemon instance.
+      '';
 
     users.extraGroups.tor.gid = config.ids.gids.tor;
     users.extraUsers.tor =
@@ -422,9 +582,13 @@ in
         restartTriggers = [ torRcFile ];
 
         # Translated from the upstream contrib/dist/tor.service.in
+        preStart = ''
+          install -o tor -g tor -d ${torDirectory}/onion
+          ${pkgs.tor}/bin/tor -f ${torRcFile} --verify-config
+        '';
+
         serviceConfig =
           { Type         = "simple";
-            ExecStartPre = "${pkgs.tor}/bin/tor -f ${torRcFile} --verify-config";
             ExecStart    = "${pkgs.tor}/bin/tor -f ${torRcFile} --RunAsDaemon 0";
             ExecReload   = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
             KillSignal   = "SIGINT";

pkgs/applications/editors/vscode-with-extensions/default.nix

@@ -2,7 +2,7 @@
 , vscodeExtensions ? [] }:
 
 /*
-  `vsixExtensions`
+  `vscodeExtensions`
    :  A set of vscode extensions to be installed alongside the editor. Here's a an
       example:
 
@@ -10,12 +10,12 @@
       vscode-with-extensions.override {
 
         # When the extension is already available in the default extensions set.
-        vscodeExtensions = with vscodeExtensions; [
+        vscodeExtensions = with vscode-extensions; [
-          nix
+          bbenoist.Nix
         ]   
 
         # Concise version from the vscode market place when not available in the default set.
-        ++ vscodeUtils.extensionsFromVscodeMarketplace [
+        ++ vscode-utils.extensionsFromVscodeMarketplace [
           {
             name = "code-runner";
             publisher = "formulahendry";

pkgs/applications/misc/buku/default.nix

@@ -1,6 +1,6 @@
-{ stdenv, pythonPackages, fetchFromGitHub }:
+{ stdenv, python3, fetchFromGitHub }:
 
-with pythonPackages; buildPythonApplication rec {
+with python3.pkgs; buildPythonApplication rec {
   version = "3.0"; # When updating to 3.1, make sure to remove the marked line in preCheck
   name = "buku-${version}";
 

pkgs/applications/networking/dropbox/default.nix

@@ -24,10 +24,10 @@
 let
   # NOTE: When updating, please also update in current stable,
   # as older versions stop working
-  version = "32.4.23";
+  version = "33.4.23";
   sha256 = {
-    "x86_64-linux" = "11jh3cyax652crhvjshi8gnvb8mpp7hfbgwqjx5n1q3j1rswm3d1";
+    "x86_64-linux" = "0z8sd71v0xfbq4x8gw0rjhg7kbd7r0465b1cqk1ls2fivb25qqxz";
-    "i686-linux"   = "0xf0in3ywgd53v19h0v2sg69b6y2lbvr5y6jz10x3cighzr31qfp";
+    "i686-linux"   = "07sj1ixpml56bx83jawslak6scb12wxwn53nnabvgnivhb9vzq97";
   }."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
 
   arch = {

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

@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "quiterss-${version}";
-  version = "0.18.6";
+  version = "0.18.7";
 
   src = fetchFromGitHub {
     owner = "QuiteRSS";
     repo = "quiterss";
     rev = "${version}";
-    sha256 = "0qklgdv6b3zg4xil9yglja33vaa25d4i7vipv5aafhlavjz16mh6";
+    sha256 = "031n07s8dd0n3d5d4v9pza59iyvaim484n1qdnpbgamls2p8iwn6";
   };
 
   nativeBuildInputs = [ pkgconfig qmake ];

pkgs/applications/office/fava/default.nix

@@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec {
     sha256 = "0yn2psbn436g1w5ixn94z8ca6dfd54izg98979arn0k7slpiccvz";
   };
 
-  buildInputs = with python3Packages; [ pytest_30 ];
+  checkInputs = with python3Packages; [ pytest ];
 
   checkPhase = ''
     # pyexcel is optional

pkgs/build-support/fetchurl/mirrors.nix

@@ -159,8 +159,9 @@ rec {
   cpan = [
     http://ftp.gwdg.de/pub/languages/perl/CPAN/
     ftp://download.xs4all.nl/pub/mirror/CPAN/
-    ftp://ftp.nl.uu.net/pub/CPAN/
+    http://ftp.tuwien.ac.at/pub/CPAN/
     http://ftp.funet.fi/pub/CPAN/
+    https://cpan.metacpan.org/
     http://cpan.perl.org/
     http://backpan.perl.org/  # for old releases
   ];
@@ -266,15 +267,14 @@ rec {
   # Apache mirrors (see http://www.apache.org/mirrors/).
   apache = [
     http://www.eu.apache.org/dist/
-    ftp://ftp.inria.fr/pub/Apache/
+    http://wwwftp.ciril.fr/pub/apache/
-    http://apache.cict.fr/
     ftp://ftp.fu-berlin.de/unix/www/apache/
-    ftp://crysys.hit.bme.hu/pub/apache/dist/
+    http://ftp.tudelft.nl/apache/
     http://mirror.cc.columbia.edu/pub/software/apache/
     http://www.apache.org/dist/
     http://archive.apache.org/dist/ # fallback for old releases
     ftp://ftp.funet.fi/pub/mirrors/apache.org/
-    http://apache.cs.uu.nl/dist/
+    http://apache.cs.uu.nl/
     http://apache.cs.utah.edu/
   ];
 

pkgs/development/libraries/ntbtls/default.nix

@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, libgpgerror, libgcrypt, libksba, zlib }:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+  name = "ntbtls-${version}";
+  version = "0.1.1";
+
+  src = fetchurl {
+    url = "mirror://gnupg/ntbtls/ntbtls-${version}.tar.bz2";
+    sha256 = "0d322kgih43vr0gvy7kdj4baql1d6fa71vgpv0z63ira9pk4q9rd";
+  };
+
+  outputs = [ "dev" "out" ];
+
+  buildInputs = [ libgcrypt libgpgerror libksba zlib ];
+
+  postInstall = ''
+    moveToOutput "bin/ntbtls-config" $dev
+  '';
+
+  meta = {
+    description = "A tiny TLS 1.2 only implementation";
+    homepage = https://www.gnupg.org/software/ntbtls/index.html;
+    license = licenses.gpl3Plus;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ joachifm ];
+  };
+}

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

@@ -14,11 +14,11 @@
 buildPythonPackage rec {
   pname = "Cython";
   name = "${pname}-${version}";
-  version = "0.25.2";
+  version = "0.26";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "01h3lrf6d98j07iakifi81qjszh6faa37ibx7ylva1vsqbwx2hgi";
+    sha256 = "4c24e2c22ddaed624d35229dc5db25049e9e225c6f64f3364326836cad8f2c66";
   };
 
   # With Python 2.x on i686-linux or 32-bit ARM this test fails because the

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

@@ -0,0 +1,35 @@
+{ buildPythonPackage
+, fetchPypi
+, flask
+, pymongo
+, lib
+, pytest
+}:
+
+buildPythonPackage rec {
+  pname = "Flask-PyMongo";
+  name = "${pname}-${version}";
+  version = "0.5.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "2baaa2ba5107d72b3a8bd4b5c0c8881316e35340ad1ae979cc13f1f3c8843b3d";
+  };
+
+  checkInputs = [ pytest ];
+
+  checkPhase = ''
+    py.test tests
+  '';
+
+  # Tests seem to hang
+  doCheck = false;
+
+  propagatedBuildInputs = [ flask pymongo ];
+
+  meta = {
+    homepage = "http://flask-pymongo.readthedocs.org/";
+    description = "PyMongo support for Flask applications";
+    license = lib.licenses.bsd2;
+  };
+}

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

@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "aafigure";
-  version = "0.5";
+  version = "0.6";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "090c88beb091d28a233f854e239713aa15d8d1906ea16211855345c912e8a091";
+    sha256 = "49f2c1fd2b579c1fffbac1386a2670b3f6f475cc7ff6cc04d8b984888c2d9e1e";
   };
 
   propagatedBuildInputs = [ pillow ];

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

@@ -3,12 +3,12 @@
 
 buildPythonPackage rec {
   pname = "adal";
-  version = "0.1.0";
+  version = "0.4.6";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1f32k18ck54adqlgvh6fjhy4yavcyrwy813prjyqppqqq4bn1a09";
+    sha256 = "7c5bbf4d8a17d535e6e857b28a41cedddc2767fc57424c15d484fa779bb97325";
   };
 
   propagatedBuildInputs =  [ requests pyjwt ];

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

@@ -3,12 +3,12 @@
 
 buildPythonPackage rec {
   pname = "aiodns";
-  version = "1.0.1";
+  version = "1.1.1";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "595b78b8d54115d937cf60d778c02dad76b6f789fd527dab308f99e5601e7f3d";
+    sha256 = "d8677adc679ce8d0ef706c14d9c3d2f27a0e0cc11d59730cdbaf218ad52dd9ea";
   };
 
   propagatedBuildInputs = with stdenv.lib; [ pycares ] 

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

@@ -6,11 +6,11 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "alembic";
-  version = "0.9.3";
+  version = "0.9.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "57f2ede554c0b18f1cf811cfbb3b02c586a5422df94922e3821883ba0b8c616c";
+    sha256 = "8bdcb4babaa16b9a826f8084949cc2665cb328ecf7b89b3224b0ab85bd16fd05";
   };
 
   buildInputs = [ pytest pytestcov mock coverage ];

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

@@ -4,11 +4,11 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "argcomplete";
-  version = "1.8.2";
+  version = "1.9.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0sslhl1klvh92c8hjsz3y3mmnpcqspcgi49g5cik2rpbfkhcsb3s";
+    sha256 = "d6ea272a93bb0387f758def836e73c36fff0c54170258c212de3e84f7db8d5ed";
   };
 
   doCheck = false; # bash-completion test fails with "compgen: command not found".

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

@@ -2,13 +2,13 @@
   asgiref, msgpack, posix_ipc
 }:
 buildPythonPackage rec {
-  version = "1.4.0";
+  version = "1.4.1";
   pname = "asgi_ipc";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/a/asgi_ipc/${name}.tar.gz";
-    sha256 = "1bae453d771eb92c0ec558b826fc0bce75a2a61bf21187784d4e4dc11710e588";
+    sha256 = "87cc9dda476d28f335261b73f0f3070f28847718de2e64da9a80492638203e43";
   };
 
   propagatedBuildInputs = [ asgiref msgpack posix_ipc ];

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

@@ -9,13 +9,13 @@
 buildPythonPackage rec {
   
   pname = "astropy";
-  version = "1.3.3";
+  version = "2.0.1";
 
   name = "${pname}-${version}";
   doCheck = false; #Some tests are failing. More importantly setup.py hangs on completion. Needs fixing with a proper shellhook.
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ed093e033fcbee5a3ec122420c3376f8a80f74663214560727d3defe82170a99";
+    sha256 = "25e0881a392a2e03b4a705cf9592f01894d23f64797323b21387efa8ea9ec03e";
   };
   propagatedBuildInputs = [ numpy cython h5py scipy ];
 

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

@@ -7,13 +7,13 @@
 
 let
   pname = "async-timeout";
-  version = "1.2.1";
+  version = "1.3.0";
 in buildPythonPackage rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
-    sha256 = "380e9bfd4c009a14931ffe487499b0906b00b3378bb743542cfd9fbb6d8e4657";
+    sha256 = "f4651f122a9877049930ce31a8422bc202a47937627295fe5e411b2c2083481f";
   };
 
   buildInputs = [ pytestrunner ];

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

@@ -6,11 +6,11 @@
 buildPythonPackage rec {
   pname = "audioread";
   name = "${pname}-${version}";
-  version = "2.1.1";
+  version = "2.1.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ffb601de7a9e40850d4ec3256a3a6bbe8fa40466dafb5c65f41b08e4bb963f1e";
+    sha256 = "36c3b118f097c58ba073b7d040c4319eff200756f094295677567e256282d0d7";
   };
 
   # No tests, need to disable or py3k breaks

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

@@ -6,11 +6,11 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "autobahn";
-  version = "17.5.1";
+  version = "17.8.1";
 
   src = fetchurl {
     url = "mirror://pypi/a/${pname}/${name}.tar.gz";
-    sha256 = "0p2xx20g0rj6pnp4h3231mn8zk4ag8msv69f93gai2hzl5vglcia";
+    sha256 = "72b1b1e30bd41d52e7454ef6fe78fe80ebf2341a747616e2cd854a76203a0ec4";
   };
 
   # Upstream claim python2 support, but tests require pytest-asyncio which

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

@@ -9,10 +9,10 @@
 buildPythonPackage rec {
   pname = "Bottleneck";
   name = "Bottleneck-${version}";
-  version = "1.2.0";
+  version = "1.2.1";
   src = fetchPypi {
     inherit pname version;
-    sha256 = "3bec84564a4adbe97c24e875749b949a19cfba4e4588be495cc441db7c6b05e8";
+    sha256 = "6efcde5f830aed64feafca0359b51db0e184c72af8ba6675b4a99f263922eb36";
   };
 
   checkInputs = [ nose ];

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

@@ -1,13 +1,13 @@
 { lib, fetchurl, buildPythonPackage, docutils, six, sphinx, isPy3k }:
 
 buildPythonPackage rec {
-  version = "4.6.0";
+  version = "4.7.2";
   pname = "breathe";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/b/breathe/${name}.tar.gz";
-    sha256 = "9db2ba770f824da323b9ea3db0b98d613a4e0af094c82ccb0a82991da81b736a";
+    sha256 = "dd15efc66d65180e4c994edd15fcb642812ad04ac9c36738b28bf248d7c0be32";
   };
 
   propagatedBuildInputs = [ docutils six sphinx ];

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

@@ -5,12 +5,12 @@
 
 buildPythonPackage rec {
   pname = "certifi";
-  version = "2017.4.17";
+  version = "2017.7.27.1";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "f7527ebf7461582ce95f7a9e03dd141ce810d40590834f4ec20cddd54234c10a";
+    sha256 = "40523d2efb60523e113b44602298f0960e900388cf3bb6043f645cf57ea9e3f5";
   };
 
   meta = {

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

@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "chai";
-  version = "1.1.1";
+  version = "1.1.2";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "016kf3irrclpkpvcm7q0gmkfibq7jgy30a9v73pp42bq9h9a32bl";
+    sha256 = "ff8d2b6855f660cd23cd5ec79bd10264d39f24f6235773331b48e7fcd637d6cc";
   };
 
   meta = with stdenv.lib; {

pkgs/development/python-modules/confluent-kafka/default.nix

@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   name = "${pname}-${version}";
-  version = "0.9.4";
+  version = "0.11.0";
   pname = "confluent-kafka";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1v8apw9f8l01ql42jg1sfqv41yxvcbxn1a3ar01y0ni428swq6wk";
+    sha256 = "4c34bfe8f823ee3777d93820ec6578365d2bde3cd1302cbd0e44c86b68643667";
   };
 
   buildInputs = [ rdkafka requests ] ++ (if isPy3k then [ avro3k ] else [ avro ]) ;

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

@@ -13,12 +13,12 @@
 buildPythonPackage rec {
   pname = "coveralls";
   name = "${pname}-python-${version}";
-  version = "1.1";
+  version = "1.2.0";
 
   # wanted by tests
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0238hgdwbvriqxrj22zwh0rbxnhh9c6hh75i39ll631vq62h65il";
+    sha256 = "510682001517bcca1def9f6252df6ce730fcb9831c62d9fff7c7d55b6fdabdf3";
   };
 
   buildInputs = [

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

@@ -11,13 +11,13 @@
 
 let
   pname = "discord.py";
-  version = "0.16.8";
+  version = "0.16.10";
 in buildPythonPackage rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
-    sha256 = "d775b701383e3a5762accf3816b819f357f299476701615ac30c7715a5ea79aa";
+    sha256 = "cb0b9ad5f5edf2d5afd5f5ce07381a0a089eb036004938126a5582fc8fa0cc88";
   };
 
   propagatedBuildInputs = [ asyncio aiohttp websockets pynacl ];

pkgs/development/python-modules/django-polymorphic/default.nix

@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "django-polymorphic";
-  version = "1.2";
+  version = "1.3";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1bz86711sx2b66rl2xz141xppsfmlxilkgjgq0jsavpw37vg7r3r";
+    sha256 = "8737b465ebf5fad772b4c52272189c352f5904f468d298584a3469187e3207ad";
   };
 
   checkInputs = [ django ];

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

@@ -2,12 +2,12 @@
   rcssmin, rjsmin, django_appconf }:
 buildPythonPackage rec {
     pname = "django_compressor";
-    version = "2.1.1";
+    version = "2.2";
     name = "${pname}-${version}";
 
     src = fetchPypi {
       inherit pname version;
-      sha256 = "1s42dkq3qp1niaf69markd7m3ljgf2bspyz2nk0sa07f8q04004j";
+      sha256 = "9616570e5b08e92fa9eadc7a1b1b49639cce07ef392fc27c74230ab08075b30f";
     };
 
     # Need to setup django testing

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

@@ -1,12 +1,12 @@
 { stdenv, buildPythonPackage, fetchurl, django }:
 buildPythonPackage rec {
-  version = "3.6.3";
+  version = "3.6.4";
   pname = "djangorestframework";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/d/djangorestframework/${name}.tar.gz";
-    sha256 = "6aa6aafdfb7f6152a401873ecae93aff9eb54d7a74266065347cf4de68278ae4";
+    sha256 = "de8ac68b3cf6dd41b98e01dcc92dc0022a5958f096eafc181a17fa975d18ca42";
   };
 
   # Test settings are missing

pkgs/development/python-modules/docker.nix

@@ -3,13 +3,13 @@
 , ipaddress, backports_ssl_match_hostname, docker_pycreds
 }:
 buildPythonPackage rec {
-  version = "2.4.2";
+  version = "2.5.1";
   pname = "docker";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/d/docker/${name}.tar.gz";
-    sha256 = "11kl6kl82056bzcycvc2jpz59ra89vwbyzi0yaamixgcm9nzlvr1";
+    sha256 = "b876e6909d8d2360e0540364c3a952a62847137f4674f2439320ede16d6db880";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/dulwich.nix

@@ -3,13 +3,13 @@
 , git, glibcLocales }:
 
 buildPythonPackage rec {
-  version = "0.17.3";
+  version = "0.18.2";
   pname = "dulwich";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/d/dulwich/${name}.tar.gz";
-    sha256 = "0c3eccac93823e172b05d57aaeab3d6f03c6c0f1867613606d1909a3ab4100ca";
+    sha256 = "284d0000b21ac12f94bcd5eb3d7dcc42da51e5506b9a53a11c615b46da906d9b";
   };
 
   LC_ALL = "en_US.UTF-8";

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

@@ -3,12 +3,12 @@
 
 buildPythonPackage rec {
   pname = "emcee";
-  version = "2.1.0";
+  version = "2.2.1";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0qyafp9jfya0mkxgqfvljf0rkic5fm8nimzwadyrxyvq7nd07qaw";
+    sha256 = "b83551e342b37311897906b3b8acf32979f4c5542e0a25786ada862d26241172";
   };
 
   propagatedBuildInputs = [ numpy ];

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

@@ -6,11 +6,11 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "flake8";
-  version = "3.3.0";
+  version = "3.4.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "04izn1q1lgbr408l9b3vkxqmpi6mq47bxwc0iwypb02mrxns41xr";
+    sha256 = "c20044779ff848f67f89c56a0e4624c04298cd476e25253ac0c36f910a1a11d8";
   };
 
   buildInputs = [ pytest mock pytestrunner ];

pkgs/development/python-modules/flask-migrate/default.nix

@@ -5,12 +5,12 @@ with stdenv.lib;
 
 buildPythonPackage rec {
   pname = "Flask-Migrate";
-  version = "2.0.4";
+  version = "2.1.0";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1e6dc83bed93aef9a4791d5daaa03b186c8ef5d96c99c7d88166da683c86e42d";
+    sha256 = "716d5b68eec53821f80b3fbcb0fd60baed0cb0e320abb30289e83217668cef7f";
   };
 
   checkInputs = optional isPy3k glibcLocales;

pkgs/development/python-modules/flask-testing.nix

@@ -1,14 +1,16 @@
-{ stdenv, fetchurl, buildPythonPackage, pythonOlder
+{ stdenv, fetchPypi, buildPythonPackage, pythonOlder
 , flask, blinker, twill }:
 
 with stdenv.lib;
 
 buildPythonPackage rec {
-  name = "Flask-Testing-0.6.1";
+  pname = "Flask-Testing";
+  version = "0.6.2";
+  name = "${pname}-${version}";
 
-  src = fetchurl {
+  src = fetchPypi {
-    url = "mirror://pypi/F/Flask-Testing/${name}.tar.gz";
+    inherit pname version;
-    sha256 = "1ckmy7kz2qkggdlm9y5wx6gvd2x7qv921dyb059ywfh15hrkkxdb";
+    sha256 = "f25effd266fce9b16482f4ce3423d5a7d25534aab77bc83caace5d9637bf0df0";
   };
 
   buildInputs = optionals (pythonOlder "3.0") [ twill ];

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

@@ -7,12 +7,12 @@
 
 buildPythonPackage rec {
   pname = "fonttools";
-  version = "3.13.1";
+  version = "3.15.1";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ded1f9a6cdd6ed19a3df05ae40066d579ffded17369b976f9e701cf31b7b1f2d";
+    sha256 = "8df4b605a28e313f0f9e0a79502caba4150a521347fdbafc063e52fee34912c2";
     extension = "zip";
   };
 

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

@@ -9,11 +9,11 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "ftfy";
-  version = "4.4.3";
+  version = "5.1.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "152xdb56rhs1q4r0ck1n557sbphw7zq18r75a7kkd159ckdnc01w";        
+    sha256 = "67a29a2fad5f72aec2d8a0a7084e4f499ed040455133ee96b1c458609fc29e78";        
   };
 
   propagatedBuildInputs = [ html5lib wcwidth];

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

@@ -13,10 +13,10 @@
 buildPythonPackage rec {
   pname = "gensim";
   name = "${pname}-${version}";
-  version = "2.1.0";
+  version = "2.3.0";
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1wn7bji9b80wn1yggmh7a0dlwzdjr6cp24x4p33j2rf29lxnm2kc";
+    sha256 = "7d0dccc7d2c576e270037949874800b7cfbc86ef081ff981483f612cd18e223f";
   };
 
   propagatedBuildInputs = [ smart_open numpy six scipy

pkgs/development/python-modules/html5-parser/default.nix

@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "html5-parser";
-  version = "0.4.3";
+  version = "0.4.4";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "173vzg214x7qfq201m4b09wg5nszdgwjw5q02v23k54iqm3kcpnx";
+    sha256 = "b9f3a1d4cdb8742e8e4ecafab04bff541bde4ff09af233293ed0b94028ec1ab5";
   };
 
   buildInputs = [ pkgconfig ];

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

@@ -14,12 +14,12 @@
 
 buildPythonPackage rec {
   pname = "ipywidgets";
-  version = "6.0.0";
+  version = "7.0.0";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "afa6248850cff14ef86117db87aeab0b12237e4eaf740e73716460ed593a43a7";
+    sha256 = "63e454202f72796044e99846881c33767c47fa050735dc1f927657b9cd2b7fcd";
   };
 
   # Tests are not distributed

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

@@ -0,0 +1,26 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, jsonpointer
+}:
+
+buildPythonPackage rec {
+  pname = "jsonpatch";
+  version = "1.16";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "f025c28a08ce747429ee746bb21796c3b6417ec82288f8fe6514db7398f2af8a";
+  };
+
+  # test files are missing
+  doCheck = false;
+  propagatedBuildInputs = [ jsonpointer ];
+
+  meta = {
+    description = "Library to apply JSON Patches according to RFC 6902";
+    homepage = "https://github.com/stefankoegl/python-json-patch";
+    license = lib.licenses.bsd2; # "Modified BSD license, says pypi"
+  };
+}

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

@@ -12,12 +12,12 @@
 
 buildPythonPackage rec {
   pname = "Keras";
-  version = "2.0.6";
+  version = "2.0.7";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0519480abe4ad18b2c2d1bc580eab75edd82c95083d341a1157952f4b00019bb";
+    sha256 = "a6c72ee2b94be1ffefe7e77b69582b9827211f0c356b2189459711844d3634c0";
   };
 
   checkInputs = [

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

@@ -6,13 +6,13 @@
 
 buildPythonPackage rec {
   pname = "keystoneauth1";
-  version = "1.1.0";
+  version = "3.1.0";
   name = "${pname}-${version}";
   disabled = isPyPy; # a test fails
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "05fc6xsp5mal52ijvj84sf7mrw706ihadfdf5mnq9zxn7pfl4118";
+    sha256 = "e5abfa8bbe866d52ca56afbe528d15214a60033cc1dc9804478cae7424f0f8fb";
   };
 
   buildInputs = [ pbr testtools testresources testrepository mock

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

@@ -1,12 +1,12 @@
 { stdenv, buildPythonPackage, fetchPypi }:
 buildPythonPackage rec {
   pname = "kitchen";
-  version = "1.2.4";
+  version = "1.2.5";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0ggv3p4x8jvmmzhp0xm00h6pvh1g0gmycw71rjwagnrj8n23vxrq";
+    sha256 = "af9fbb60f68cbdb2ead402beb8fa7c7edadbe2aa7b5a70138b7c4b0fa88153fd";
   };
 
   meta = with stdenv.lib; {

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

@@ -5,11 +5,11 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "ledgerblue";
-  version = "0.1.13";
+  version = "0.1.15";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "09bsiylvgax6m47w8r0myaf61xj9j0h1spvadx6fx31qy0iqicw0";
+    sha256 = "42cbcd74615576294142d56eb9eaa7e1b67f9dd87eeb24d713336b56e8c01c5c";
   };
 
   buildInputs = [ hidapi pycrypto pillow protobuf future ecpy ];

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

@@ -3,11 +3,11 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "libtmux";
-  version = "0.7.3";
+  version = "0.7.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "111qbgq28za12la5b0aa9rr7hg8235zy0kyzzryn7fa6z3i5k5z8";
+    sha256 = "c7407aa4103d40f50f99432bf4dffe0b4591f976956b2dd7ee7bbf53ad138bd9";
   };
 
   buildInputs = [ pytest_29 ];

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

@@ -11,13 +11,13 @@
 buildPythonPackage rec {
   pname = "llvmlite";
   name = "${pname}-${version}";
-  version = "0.18.0";
+  version = "0.19.0";
 
   disabled = isPyPy;
 
   src = fetchurl {
     url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
-    sha256 = "25a38af925f0523b834b92216d7f7cc997624942d5958287350c254f5e730404";
+    sha256 = "fbaeb3d584e0f6bac82a33776e9b5f0b5b4a3415a03edeff5d66f6176f0edbe2";
   };
 
   propagatedBuildInputs = [ llvm ] ++ stdenv.lib.optional (pythonOlder "3.4") enum34;

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

@@ -3,11 +3,11 @@
 buildPythonPackage rec {
   pname = "m2r";
   name = "${pname}-${version}";
-  version = "0.1.7";
+  version = "0.1.10";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "771631d051a52764fe5b660f97ad028df3aff90c9859d345ccfd17a4c7c2ab39";
+    sha256 = "cfb5b8a37defdd594eb46a794b87d9b4ca1902b0e8e309c9f2623f7275c261d6";
   };
 
   propagatedBuildInputs = [ mistune docutils ];

pkgs/development/python-modules/magic-wormhole/default.nix

@@ -21,12 +21,12 @@
 
 buildPythonPackage rec {
   pname = "magic-wormhole";
-  version = "0.9.2";
+  version = "0.10.2";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "14aed4b453278651d92c3fd8955a105e2d33dcde279fa25d1d759e0e769f16b3";
+    sha256 = "55a423247faee7a0644d25f37760495978cd494ba0274fefd8cd1fad493954ee";
   };
 
   checkInputs = [ mock ];

pkgs/development/python-modules/marionette-harness/default.nix

@@ -13,12 +13,12 @@
 
 buildPythonPackage rec {
   pname = "marionette-harness";
-  version = "4.0.0";
+  version = "4.1.0";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0726zm09nwh4kkd4xirva4596svlifkkpbaywlmq2yb6ayk7d4vl";
+    sha256 = "20c188791e28d586c58acf86ff28cb704c4195a4da6eb10db7b8c6771e3f2983";
   };
 
   propagatedBuildInputs = [ mozprofile mozversion browsermob-proxy moztest 

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

@@ -7,13 +7,13 @@
 
 let
   pname = "multidict";
-  version = "2.1.6";
+  version = "3.1.3";
 in buildPythonPackage rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
-    sha256 = "9ec33a1da4d2096949e29ddd66a352aae57fad6b5483087d54566a2f6345ae10";
+    sha256 = "875f80a046e7799b40df4b015b8fc5dae91697936872a8d7362c909a02ec6d12";
   };
 
   buildInputs = [ pytest ];

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

@@ -16,7 +16,7 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "natsort";
-  version = "5.0.3";
+  version = "5.1.0";
 
   buildInputs = [
     hypothesis
@@ -34,7 +34,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1h87n0jcsi6mgjx1pws6g1lmcn8jwabwxj8hq334jvziaq0plyym";
+    sha256 = "5db0fd17c9f8ef3d54962a6e46159ce4807c630f0931169cd15ce54f2ac395b9";
   };
 
   # do not run checks on nix_run_setup.py

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

@@ -12,12 +12,12 @@
 
 buildPythonPackage rec {
   pname = "nbformat";
-  version = "4.3.0";
+  version = "4.4.0";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "5febcce872672f1c97569e89323992bdcb8573fdad703f835e6521253191478b";
+    sha256 = "f7494ef0df60766b7cabe0a3651556345a963b74dbc16bc7c18479041170d402";
   };
   LC_ALL="en_US.UTF-8";
 

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

@@ -14,13 +14,13 @@
 }:
 
 buildPythonPackage rec {
-  version = "0.33.0";
+  version = "0.34.0";
   pname = "numba";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/n/numba/${name}.tar.gz";
-    sha256 = "56c5fcf3175f72b67ba8998d02870e3ea598e10c41d93289cecb9d89be7669fd";
+    sha256 = "4f86df9212cb2678598e6583973ef1df978f3e3ba497b4dc6f91848887710577";
   };
 
   NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";

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

@@ -0,0 +1,29 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+  pname = "odfpy";
+  version = "1.3.5";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "6f8163f8464868cff9421a058f25566e41d73c8f7e849c021b86630941b44366";
+  };
+
+  checkPhase = ''
+    pushd tests
+    rm runtests
+    for file in test*.py; do
+        python  $file
+    done
+  '';
+
+  meta = {
+    description = "Python API and tools to manipulate OpenDocument files";
+    homepage = "https://joinup.ec.europa.eu/software/odfpy/home";
+    license = lib.licenses.asl20;
+  };
+}

pkgs/development/python-modules/oslo-config/default.nix

@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "oslo.config";
-  version = "2.5.0";
+  version = "4.11.0";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "043mavrzj7vjn7kh1dddci4sf67qwqnnn6cm0k1d19alks9hismz";
+    sha256 = "1be8aaba466a3449fdb21ee8f7025b0d3d252c8c7568b8d5d05ceff58617cd05";
   };
 
   propagatedBuildInputs = [ pbr six netaddr stevedore ];

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

@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "pbr";
-  version = "3.0.1";
+  version = "3.1.1";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d7e8917458094002b9a2e0030ba60ba4c834c456071f2d0c1ccb5265992ada91";
+    sha256 = "05f61c71aaefc02d8e37c0a3eeb9815ff526ea28b3b76324769e6158d7f95be1";
   };
 
   # circular dependencies with fixtures

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

@@ -2,7 +2,7 @@
 
 buildPythonPackage rec {
   pname = "phonenumbers";
-  version = "8.7.1";
+  version = "8.8.0";
   name = "${pname}-${version}";
 
   meta = {
@@ -14,6 +14,6 @@ buildPythonPackage rec {
 
   src = fetchurl {
     url = "mirror://pypi/p/phonenumbers/${name}.tar.gz";
-    sha256 = "1zmi2xvh6v4iyfxmrqhj2byfac9xk733w663a7phib7y6wkvqlgr";
+    sha256 = "f8d5eda55e2acdfeb9db9742e1207a5cfb615ad060cabccf1e06a9ed8efd1e49";
   };
 }

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

@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "plotly";
-  version = "2.0.12";
+  version = "2.0.15";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0050da900e4420c15766f8dfb8d252510896511361bf485b9308bc0287f7add0";
+    sha256 = "0ecd16a11778674c63615a590e22f79307801eaf009b399bf7e46c486dec8f99";
   };
 
   propagatedBuildInputs = [

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

@@ -0,0 +1,20 @@
+{ stdenv, buildPythonPackage, fetchPypi }:
+buildPythonPackage rec {
+  pname = "py";
+  version = "1.4.34";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1qyd5z0hv8ymxy84v5vig3vps2fvhcf4bdlksb3r03h549fmhb8g";
+  };
+
+  # Circular dependency on pytest
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Library with cross-python path, ini-parsing, io, code, log facilities";
+    homepage = http://pylib.readthedocs.org/;
+    license = licenses.mit;
+  };
+}

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

@@ -22,12 +22,12 @@ let
 in
 buildPythonPackage rec {
   pname = "pycuda";
-  version = "2017.1";
+  version = "2017.1.1";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
-    sha256 = "a92725ccd8515b4d7284b9127184b6fdb61f224daa086e7fc6b926e2094b055f";
+    sha256 = "6b5a9384e38c603ee429f8a6bee424532db7b3505027ce22f7e18ad19564b563";
   };
 
   preConfigure = ''

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

@@ -4,11 +4,11 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "pygraphviz";
-  version = "1.4rc1";
+  version = "1.3.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "00ck696rddjnrwfnh1zw87b9xzqfm6sqjy6kqf6kmn1xwsi6f19a";
+    sha256 = "7c294cbc9d88946be671cc0d8602aac176d8c56695c0a7d871eadea75a958408";
   };
 
   buildInputs = [ doctest-ignore-unicode mock nose ];

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

@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "pylast";
-  version = "1.8.0";
+  version = "1.9.0";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "85f8dd96aef0ccba5f80379c3d7bc1fabd72f59aebab040daf40a8b72268f9bd";
+    sha256 = "ae1c4105cbe704d9ac10ba57ac4c26bc576cc33978f1b578101b20c6a2360ca4";
   };
 
   propagatedBuildInputs = [ certifi six ];

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

@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "pyopencl";
-  version = "2017.1.1";
+  version = "2017.2";
   name = "${pname}-${version}";
 
   buildInputs = [ pytest opencl-headers ocl-icd ];
@@ -24,7 +24,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "928c458a463321c6c91e7fa54bf325bf71d7a8aa5ff750ec8fed2472f6aeb323";
+    sha256 = "039b689a58eb98e27a577ac086210deae959f40d657487f3199d2d217c270ff9";
   };
 
   # gcc: error: pygpu_language_opencl.cpp: No such file or directory

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

@@ -3,12 +3,12 @@
 
 buildPythonPackage rec {
   pname = "pypandoc";
-  version = "1.3.3";
+  version = "1.4";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0628f2kn4gqimnhpf251fgzl723hwgyl3idy69dkzyjvi45s5zm6";
+    sha256 = "e914e6d5f84a76764887e4d909b09d63308725f0cbb5293872c2c92f07c11a5b";
   };
 
   # Fix tests: first requires network access, second is a bug (reported upstream)

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

@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "pyroute2";
-  version = "0.4.18";
+  version = "0.4.19";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/p/pyroute2/${name}.tar.gz";
-    sha256 = "bdcff9f598ff4dda7420675ee387426cd9cc79d795ea73eb684a4314d4b00b9e";
+    sha256 = "122a1e34702287b805742a6edd8fe8483608238bd1602df2d5e3274bd8e8030a";
   };
 
   # requires root priviledges

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

@@ -0,0 +1,31 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, rtl-sdr
+}:
+
+buildPythonPackage rec {
+  pname = "pyrtlsdr";
+  version = "0.2.5";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "dd041143b68628c713c2227c78c40b0b4a0cb5d08df116f7bdc5f83c529be0e4";
+  };
+
+  postPatch = ''
+    sed "s|driver_files =.*|driver_files = ['${rtl-sdr}/lib/librtlsdr.so']|" -i rtlsdr/librtlsdr.py
+  '';
+
+  # No tests that can be used.
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Python wrapper for librtlsdr (a driver for Realtek RTL2832U based SDR's)";
+    homepage = https://github.com/roger-/pyrtlsdr;
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ bjornfor ];
+ };
+}

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

@@ -1,13 +1,13 @@
 { stdenv, fetchurl, buildPythonPackage, swig, pcsclite }:
 
 buildPythonPackage rec {
-  version = "1.9.5";
+  version = "1.9.6";
   pname = "pyscard";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/p/pyscard/${name}.tar.gz";
-    sha256 = "7eef027e1939b7595fc13c03616f262f90d118594fdb6f7620af46b54fa06835";
+    sha256 = "6e28143c623e2b34200d2fa9178dbc80a39b9c068b693b2e6527cdae784c6c12";
   };
 
   patchPhase = ''

pkgs/development/python-modules/pytest-asyncio/default.nix

@@ -2,13 +2,13 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "pytest-asyncio";
-  version = "0.5.0";
+  version = "0.6.0";
 
   disabled = !isPy3k;
 
   src = fetchurl {
     url = "mirror://pypi/p/${pname}/${name}.tar.gz";
-    sha256 = "03sxq8fglr4lw4y6wqlbli9ypr65fxzx6hlpn5wpccx8v5472iff";
+    sha256 = "e5c6786ece4b3bbb0cca1bf68bf089756a62760e3764dc84eaee39bfab70289b";
   };
 
   buildInputs = [ pytest ];

pkgs/development/python-modules/pytest-django/default.nix

@@ -19,7 +19,7 @@ buildPythonPackage rec {
     # Unpin setuptools-scm
     (fetchpatch {
       url = "https://github.com/pytest-dev/pytest-django/commit/25cbc3b395dcdeb92bdc9414e296680c2b9d602e.patch";
-      sha256 = "0mz3rcsv44pfzlxy3pv8mx87glmv34gy0d5aknvbzgb2a9niryws";
+      sha256 = "1mx06y4kz2zs41mb2h9bh5p4jc6s6hfsq6fghhsks5b7qak05xjp";
     })
   ];
 

pkgs/development/python-modules/pytest-forked/default.nix

@@ -0,0 +1,33 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, setuptools_scm
+, pytest
+}:
+
+buildPythonPackage rec {
+  pname = "pytest-forked";
+  version = "0.2";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "e4500cd0509ec4a26535f7d4112a8cc0f17d3a41c29ffd4eab479d2a55b30805";
+  };
+
+  buildInputs = [ pytest setuptools_scm ];
+
+  # Do not function
+  doCheck = false;
+
+  checkPhase = ''
+    py.test testing
+  '';
+
+  meta = {
+    description = "Run tests in isolated forked subprocesses";
+    homepage = https://github.com/pytest-dev/pytest-forked;
+    license = lib.licenses.mit;
+  };
+
+}

pkgs/development/python-modules/pytest-xdist/default.nix

@@ -1,16 +1,16 @@
-{ stdenv, fetchPypi, buildPythonPackage, isPy3k, execnet, pytest, setuptools_scm }:
+{ stdenv, fetchPypi, buildPythonPackage, isPy3k, execnet, pytest, setuptools_scm, pytest-forked }:
 
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "pytest-xdist";
-  version = "1.18.2";
+  version = "1.20.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "10468377901b80255cf192c4603a94ffe8b1f071f5c912868da5f5cb91170dae";
+    sha256 = "7924d45c2430191fe3679a58116c74ceea13307d7822c169d65fd59a24b3a4fe";
   };
 
-  buildInputs = [ pytest setuptools_scm ];
+  buildInputs = [ pytest setuptools_scm pytest-forked];
   propagatedBuildInputs = [ execnet ];
 
   postPatch = ''

pkgs/development/python-modules/pytest/3_0.nix

@@ -0,0 +1,27 @@
+{ stdenv, buildPythonPackage, fetchPypi, isPy26, argparse, hypothesis, py
+, setuptools_scm
+}:
+buildPythonPackage rec {
+  version = "3.0.7";
+  pname = "pytest";
+  name = "${pname}-${version}";
+
+  preCheck = ''
+    # don't test bash builtins
+    rm testing/test_argcomplete.py
+  '';
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "b70696ebd1a5e6b627e7e3ac1365a4bc60aaf3495e843c1e70448966c5224cab";
+  };
+
+  buildInputs = [ hypothesis setuptools_scm ];
+  propagatedBuildInputs = [ py ]
+    ++ (stdenv.lib.optional isPy26 argparse);
+
+  meta = with stdenv.lib; {
+    maintainers = with maintainers; [ domenkozar lovek323 madjar lsix ];
+    platforms = platforms.unix;
+  };
+}

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

@@ -1,6 +1,8 @@
-{ stdenv, buildPythonPackage, fetchurl, isPy26, argparse, hypothesis, py }:
+{ stdenv, buildPythonPackage, fetchPypi, isPy26, argparse, hypothesis, py
+, setuptools_scm
+}:
 buildPythonPackage rec {
-  version = "3.0.7";
+  version = "3.2.1";
   pname = "pytest";
   name = "${pname}-${version}";
 
@@ -9,12 +11,12 @@ buildPythonPackage rec {
     rm testing/test_argcomplete.py
   '';
 
-  src = fetchurl {
+  src = fetchPypi {
-    url = "mirror://pypi/p/pytest/${name}.tar.gz";
+    inherit pname version;
-    sha256 = "b70696ebd1a5e6b627e7e3ac1365a4bc60aaf3495e843c1e70448966c5224cab";
+    sha256 = "4c2159d2be2b4e13fa293e7a72bdf2f06848a017150d5c6d35112ce51cfd74ce";
   };
 
-  buildInputs = [ hypothesis ];
+  buildInputs = [ hypothesis setuptools_scm ];
   propagatedBuildInputs = [ py ]
     ++ (stdenv.lib.optional isPy26 argparse);
 

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

@@ -1,17 +1,21 @@
 { stdenv, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
-  version = "0.4";
+  version = "1.0.3";
   pname = "python-editor";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1gykxn16anmsbcrwhx3rrhwjif95mmwvq9gjcrr9bbzkdc8sf8a4";
+    sha256 = "a3c066acee22a1c94f63938341d4fb374e3fdd69366ed6603d7b24bed1efc565";
   };
 
+  # No proper tests
+  doCheck = false;
+
   meta = with stdenv.lib; {
     description = "A library that provides the `editor` module for programmatically";
     homepage = https://github.com/fmoo/python-editor;
+    license = licenses.asl20;
   };
 }

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

@@ -14,12 +14,12 @@
 
 buildPythonPackage rec {
   pname = "qtconsole";
-  version = "4.3.0";
+  version = "4.3.1";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "2821ccf85853b83e4958521f82e36325208787eaf79b19b83905a99cc41aa209";
+    sha256 = "eff8c2faeda567a0bef5781f419a64e9977988db101652b312b9d74ec0a5109c";
   };
 
   buildInputs = [ nose ] ++ lib.optionals isPy27 [mock];

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

@@ -1,16 +1,17 @@
-{ lib, fetchurl, buildPythonPackage, genshi, lxml }:
+{ lib, fetchurl, buildPythonPackage, genshi, lxml, python_magic }:
 
 buildPythonPackage rec {
   pname = "relatorio";
   name = "${pname}-${version}";
-  version = "0.6.4";
+  version = "0.7.0";
   src = fetchurl {
     url = "mirror://pypi/r/relatorio/${name}.tar.gz";
-    sha256 = "0lincq79mzgazwd9gh41dybjh9c3n87r83pl8nk3j79aihyfk84z";
+    sha256 = "efd68d96573b15c59c24a8f420ed14210ce51de535a8470d14381f2bed69d845";
   };
   propagatedBuildInputs = [
     genshi
     lxml
+    python_magic
   ];
   meta = {
     homepage = http://relatorio.tryton.org/;

pkgs/development/python-modules/requests-oauthlib.nix

@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchurl
+{ stdenv, buildPythonPackage, fetchPypi
 , oauthlib, requests }:
 
 buildPythonPackage rec {
@@ -6,8 +6,8 @@ buildPythonPackage rec {
   pname = "requests-oauthlib";
   name = "${pname}-${version}";
 
-  src = fetchurl {
+  src = fetchPypi {
-    url = "http://github.com/requests/requests-oauthlib/archive/v${version}.tar.gz";
+    inherit pname version;
     sha256 = "883ac416757eada6d3d07054ec7092ac21c7f35cb1d2cf82faf205637081f468";
   };
 

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

@@ -3,12 +3,12 @@
 
 buildPythonPackage rec {
   pname = "rfc3986";
-  version = "1.0.0";
+  version = "1.1.0";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "2faacfabcc13ed89b061b5f21cbbf330f82400654b317b5907d311c3478ec4c4";
+    sha256 = "8458571c4c57e1cf23593ad860bb601b6a604df6217f829c2bc70dc4b5af941b";
   };
 
   buildInputs = [ pytest ];

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

@@ -3,13 +3,16 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "semver";
-  version = "2.2.1";
+  version = "2.7.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "161gvsfpw0l8lnf1v19rvqc8b9f8n70cc8ppya4l0n6rwc1c1n4m";
+    sha256 = "20ffbb50248a6141bb9eba907db0e47ee4a239ddb55fe0ada8696fc241495a9d";
   };
 
+  # No tests in archive
+  doCheck = false;
+
   meta = with stdenv.lib; {
     description = "Python package to work with Semantic Versioning (http://semver.org/)";
     homepage = https://github.com/k-bx/python-semver;

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

@@ -8,13 +8,13 @@
 # Should use buildPythonPackage here somehow
 stdenv.mkDerivation rec {
   pname = "setuptools";
-  version = "36.0.1";
+  version = "36.2.7";
   name = "${python.libPrefix}-${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "e17c4687fddd6d70a6604ac0ad25e33324cec71b5137267dd5c45e103c4b288a";
+    sha256 = "b0fe5d432d922df595e918577c51458d63f245115d141b309ac32ecfca329df5";
   };
 
   buildInputs = [ python wrapPython unzip ];

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

@@ -0,0 +1,24 @@
+{ stdenv, buildPythonPackage, fetchPypi, pip }:
+buildPythonPackage rec {
+  pname = "setuptools_scm";
+  name = "${pname}-${version}";
+  version = "1.15.6";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0pzvfmx8s20yrgkgwfbxaspz2x1g38qv61jpm0ns91lrb22ldas9";
+  };
+
+  buildInputs = [ pip ];
+
+  # Seems to fail due to chroot and would cause circular dependency
+  # with pytest
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    homepage = https://bitbucket.org/pypa/setuptools_scm/;
+    description = "Handles managing your python package versions in scm metadata";
+    license = licenses.mit;
+    maintainers = with maintainers; [ jgeerds ];
+  };
+}

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

@@ -6,13 +6,13 @@
 
 buildPythonPackage rec {
   pname = "simplejson";
-  version = "3.10.0";
+  version = "3.11.1";
   name = "${pname}-${version}";
   doCheck = !stdenv.isDarwin;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "953be622e88323c6f43fad61ffd05bebe73b9fd9863a46d68b052d2aa7d71ce2";
+    sha256 = "01a22d49ddd9a168b136f26cac87d9a335660ce07aa5c630b8e3607d6f4325e7";
   };
 
   meta = {

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

@@ -20,18 +20,21 @@
 , whoosh
 , imagesize
 , requests
+, sphinxcontrib-websupport
 }:
 
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "Sphinx";
-  version = "1.5.2";
+  version = "1.6.3";
   src = fetchPypi {
     inherit pname version;
-    sha256 = "049c48393909e4704a6ed4de76fd39c8622e165414660bfb767e981e7931c722";
+    sha256 = "af8bdb8c714552b77d01d4536e3d6d2879d6cb9d25423d29163d5788e27046e6";
   };
   LC_ALL = "en_US.UTF-8";
-  buildInputs = [ pytest simplejson mock glibcLocales html5lib ] ++ lib.optional (pythonOlder "3.4") enum34;
+
+  checkInputs = [ pytest ];
+  buildInputs = [ simplejson mock glibcLocales html5lib ] ++ lib.optional (pythonOlder "3.4") enum34;
   # Disable two tests that require network access.
   checkPhase = ''
     cd tests; ${python.interpreter} run.py --ignore py35 -k 'not test_defaults and not test_anchors_ignored'
@@ -48,8 +51,12 @@ buildPythonPackage rec {
     whoosh
     imagesize
     requests
+    sphinxcontrib-websupport
   ];
 
+  # Lots of tests. Needs network as well at some point.
+  doCheck = false;
+
   # https://github.com/NixOS/nixpkgs/issues/22501
   # Do not run `python sphinx-build arguments` but `sphinx-build arguments`.
   postPatch = ''

pkgs/development/python-modules/sphinxcontrib-websupport/default.nix

@@ -0,0 +1,26 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, six
+}:
+
+buildPythonPackage rec {
+  pname = "sphinxcontrib-websupport";
+  version = "1.0.1";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "7a85961326aa3a400cd4ad3c816d70ed6f7c740acd7ce5d78cd0a67825072eb9";
+  };
+
+  propagatedBuildInputs = [ six ];
+
+  doCheck = false;
+
+  meta = {
+    description = "Sphinx API for Web Apps";
+    homepage = http://sphinx-doc.org/;
+    license = lib.licenses.bsd2;
+  };
+}

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

@@ -1,7 +1,7 @@
 { lib
 , fetchPypi
 , buildPythonPackage
-, pytest
+, pytest_30
 , mock
 , pytest_xdist
 , isPy3k
@@ -11,19 +11,19 @@
 buildPythonPackage rec {
   pname = "SQLAlchemy";
   name = "${pname}-${version}";
-  version = "1.1.12";
+  version = "1.1.13";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d501527319f51a3d9eb639b654222c6f67287228a98ba102b1d0b598eb3266c9";
+    sha256 = "2a98ac87b30eaa2bee1f1044848b9590e476e7f93d033c6542e60b993a5cf898";
   };
 
-  checkInputs = [ pytest mock pytest_xdist ]
+  checkInputs = [
-    ++ lib.optional (!isPy3k) pysqlite;
+    pytest_30
-
+    mock
-  # Test-only dependency pysqlite doesn't build on Python 3. This isn't an
+#     Disable pytest_xdist tests for now, because our version seems to be too new.
-  # acceptable reason to make all dependents unavailable on Python 3 as well
+#     pytest_xdist
-  #doCheck = !(isPyPy || isPy3k);
+  ] ++ lib.optional (!isPy3k) pysqlite;
 
   checkPhase = ''
     py.test

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

@@ -0,0 +1,25 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+  pname = "sqlmap";
+  version = "1.1.8";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "f8f88fc7fe0ba81a7558902f87df31c052e27404caa26a160174747afcaebe49";
+  };
+
+  # No tests in archive
+  doCheck = false;
+
+  meta = with lib; {
+    homepage = "http://sqlmap.org";
+    license = licenses.gpl2;
+    description = "Automatic SQL injection and database takeover tool";
+    maintainers = with maintainers; [ bennofs ];
+  };
+}

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

@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "stevedore";
-  version = "1.21.0";
+  version = "1.25.0";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "12sg88ax0lv2sxr685rqdaxm9gryjrpj4fvax459zvwy1r4n83ma";
+    sha256 = "c8a373b90487b7a1b52ebaa3ca5059315bf68d9ebe15b2203c2fa675bd7e1e7e";
   };
 
   doCheck = false;

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

@@ -3,7 +3,7 @@
 
 buildPythonPackage rec {
   pname = "stripe";
-  version = "1.41.1";
+  version = "1.62.1";
   name = "${pname}-${version}";
 
   # Tests require network connectivity and there's no easy way to disable
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0zvffvq933ia5w5ll6xhx2zgvppgc6zc2mxhc6f0kypw5g2fxvz5";
+    sha256 = "7cc83b8d405a48d8a792640761519c64e373ad3514ea8bb4a9a5128f98b0b679";
   };
 
   buildInputs = [ unittest2 mock ];

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

@@ -11,12 +11,12 @@
 
 buildPythonPackage rec {
   pname = "tqdm";
-  version = "4.11.2";
+  version = "4.15.0";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "14baa7a9ea7723d46f60de5f8c6f20e840baa7e3e193bf0d9ec5fe9103a15254";
+    sha256 = "6ec1dc74efacf2cda936b4a6cf4082ce224c76763bdec9f17e437c8cfcaa9953";
   };
 
   buildInputs = [ nose coverage glibcLocales flake8 ];

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

@@ -4,11 +4,11 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "treq";
-  version = "17.3.1";
+  version = "17.8.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1xhcpvsl3xqw0dq9sixk80iwyiv17djigp3815sy5pfgvvggcfii";
+    sha256 = "ef72d2d5e0b24bdf29267b608fa33df0ac401743af8524438b073e1fb2b66f16";
   };
 
   propagatedBuildInputs = [ twisted requests six incremental service-identity ];

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

@@ -1,17 +1,17 @@
 { stdenv, buildPythonPackage, fetchurl, python,
-  zope_interface, incremental, automat, constantly
+  zope_interface, incremental, automat, constantly, hyperlink
 }:
 buildPythonPackage rec {
   pname = "Twisted";
   name = "${pname}-${version}";
-  version = "17.1.0";
+  version = "17.5.0";
 
   src = fetchurl {
     url = "mirror://pypi/T/Twisted/${name}.tar.bz2";
-    sha256 = "1p245mg15hkxp7hy5cyq2fgvlgjkb4cg0gwkwd148nzy1bbi3wnv";
+    sha256 = "1sh2h23nnizcdyrl2rn7zxijglikxwz7z7grqpvq496zy2aa967i";
   };
 
-  propagatedBuildInputs = [ zope_interface incremental automat constantly ];
+  propagatedBuildInputs = [ zope_interface incremental automat constantly hyperlink ];
 
   # Patch t.p._inotify to point to libc. Without this,
   # twisted.python.runtime.platform.supportsINotify() == False

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

@@ -3,11 +3,11 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "txaio";
-  version = "2.7.1";
+  version = "2.8.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1lmllmjjsqzl3w4faq2qhlgkaqn1yn1m7d99k822ib7qgz18bsly";
+    sha256 = "fe2e0e4d3a06705f86bbd351fdd1f39dae61755e44162375e024acbf32eafddb";
   };
 
   buildInputs = [ pytest mock ];

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

@@ -3,12 +3,12 @@
 
 buildPythonPackage rec {
   pname = "vega";
-  version = "0.4.4";
+  version = "0.5.0";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "08k92afnk0bivm07h1l5nh26xl2rfp7qn03aq17q1hr3fs5r6cdm";
+    sha256 = "9871bce3a00bb775d9f7f8212aa237f99f11ca7cfe6ecf246773f5559f20c38c";
   };
 
   buildInputs = [ pytest ];

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

@@ -6,12 +6,12 @@
 
 buildPythonPackage rec {
   pname = "virtualenv";
-  version = "15.0.3";
+  version = "15.1.0";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "6d9c760d3fc5fa0894b0f99b9de82a4647e1164f0b700a7f99055034bf548b1d";
+    sha256 = "02f8102c2436bb03b3ee6dede1919d1dac8a427541652e5ec95171ec8adbc93a";
   };
 
   # Doubt this is needed - FRidh 2017-07-07

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

@@ -6,13 +6,13 @@
 
 let
   pname = "websockets";
-  version = "3.3";
+  version = "3.4";
 in buildPythonPackage rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
-    sha256 = "305ab7fdd86afd08c2723461c949e153f7b01233f95a108619a15e41b7a74c93";
+    sha256 = "43e5b9f51dd0000a4c6f646e2ade0c886bd14a784ffac08b9e079bd17a63bcc5";
   };
 
   disabled = pythonOlder "3.3";