diff options
54 files changed, 2570 insertions, 462 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b005a1b9c127..8ccffd9139b3 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4176,6 +4176,11 @@ github = "shlevy"; name = "Shea Levy"; }; + shou = { + email = "x+g@shou.io"; + github = "Shou"; + name = "Benedict Aas"; + }; siddharthist = { email = "langston.barrett@gmail.com"; github = "siddharthist"; diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix index faae4f205443..02b91773f5da 100644 --- a/nixos/doc/manual/default.nix +++ b/nixos/doc/manual/default.nix @@ -265,6 +265,7 @@ in rec { xsltproc \ ${manualXsltprocOptions} \ --stringparam target.database.document "${olinkDB}/olinkdb.xml" \ + --stringparam id.warnings "1" \ --nonet --output $dst/ \ ${docbook_xsl_ns}/xml/xsl/docbook/xhtml/chunktoc.xsl \ ${manual-combined}/manual-combined.xml diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml index d84e57333e98..428f9bef5fbd 100644 --- a/nixos/doc/manual/release-notes/rl-1903.xml +++ b/nixos/doc/manual/release-notes/rl-1903.xml @@ -378,6 +378,23 @@ (<link xlink:href="https://github.com/NixOS/nixpkgs/pull/54637">#54637</link>) </para> </listitem> + <listitem> + <para> + <literal>matrix-synapse</literal> has been updated to version 0.99. It will + <link xlink:href="https://github.com/matrix-org/synapse/pull/4509">no longer generate a self-signed certificate on first launch</link> + and will be <link xlink:href="https://matrix.org/blog/2019/02/05/synapse-0-99-0/">the last version to accept self-signed certificates</link>. + As such, it is now recommended to use a proper certificate verified by a + root CA (for example Let's Encrypt). + </para> + </listitem> + <listitem> + <para> + <literal>mailutils</literal> now works by default when + <literal>sendmail</literal> is not in a setuid wrapper. As a consequence, + the <literal>sendmailPath</literal> argument, having lost its main use, has + been removed. + </para> + </listitem> </itemizedlist> </section> diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 3ee242ab2226..04bcb41cd07a 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -101,6 +101,7 @@ ./programs/gnupg.nix ./programs/gphoto2.nix ./programs/iftop.nix + ./programs/iotop.nix ./programs/java.nix ./programs/kbdlight.nix ./programs/less.nix diff --git a/nixos/modules/programs/iotop.nix b/nixos/modules/programs/iotop.nix new file mode 100644 index 000000000000..5512dbc62f72 --- /dev/null +++ b/nixos/modules/programs/iotop.nix @@ -0,0 +1,17 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.programs.iotop; +in { + options = { + programs.iotop.enable = mkEnableOption "iotop + setcap wrapper"; + }; + config = mkIf cfg.enable { + security.wrappers.iotop = { + source = "${pkgs.iotop}/bin/iotop"; + capabilities = "cap_net_admin+p"; + }; + }; +} diff --git a/nixos/modules/services/misc/matrix-synapse.nix b/nixos/modules/services/misc/matrix-synapse.nix index 18e13f6ac030..a01e34d73629 100644 --- a/nixos/modules/services/misc/matrix-synapse.nix +++ b/nixos/modules/services/misc/matrix-synapse.nix @@ -651,12 +651,16 @@ in { services.postgresql.enable = mkIf usePostgresql (mkDefault true); - systemd.services.matrix-synapse = { + systemd.services.matrix-synapse = + let + python = (pkgs.python3.withPackages (ps: with ps; [ (ps.toPythonModule cfg.package) ])); + in + { description = "Synapse Matrix homeserver"; after = [ "network.target" "postgresql.service" ]; wantedBy = [ "multi-user.target" ]; preStart = '' - ${cfg.package}/bin/homeserver \ + ${python.interpreter} -m synapse.app.homeserver \ --config-path ${configFile} \ --keys-directory ${cfg.dataDir} \ --generate-keys @@ -687,10 +691,11 @@ in { WorkingDirectory = cfg.dataDir; PermissionsStartOnly = true; ExecStart = '' - ${cfg.package}/bin/homeserver \ + ${python.interpreter} -m synapse.app.homeserver \ ${ concatMapStringsSep "\n " (x: "--config-path ${x} \\") ([ configFile ] ++ cfg.extraConfigFiles) } --keys-directory ${cfg.dataDir} ''; + ExecReload = "${pkgs.utillinux}/bin/kill -HUP $MAINPID"; Restart = "on-failure"; }; }; diff --git a/nixos/modules/services/networking/unifi.nix b/nixos/modules/services/networking/unifi.nix index 89b9ac4eadf5..c82e0af2803d 100644 --- a/nixos/modules/services/networking/unifi.nix +++ b/nixos/modules/services/networking/unifi.nix @@ -121,11 +121,12 @@ in }; networking.firewall = mkIf cfg.openPorts { - # https://help.ubnt.com/hc/en-us/articles/204910084-UniFi-Change-Default-Ports-for-Controller-and-UAPs + # https://help.ubnt.com/hc/en-us/articles/218506997 allowedTCPPorts = [ 8080 # Port for UAP to inform controller. 8880 # Port for HTTP portal redirect, if guest portal is enabled. 8843 # Port for HTTPS portal redirect, ditto. + 6789 # Port for UniFi mobile speed test. ]; allowedUDPPorts = [ 3478 # UDP port used for STUN. diff --git a/nixos/tests/hydra/default.nix b/nixos/tests/hydra/default.nix index db4e97e0039b..882bced86d39 100644 --- a/nixos/tests/hydra/default.nix +++ b/nixos/tests/hydra/default.nix @@ -1,77 +1,91 @@ -import ../make-test.nix ({ pkgs, ...} : +{ system ? builtins.currentSystem +, config ? { } +, pkgs ? import ../../.. { inherit system config; } +}: let - trivialJob = pkgs.writeTextDir "trivial.nix" '' - { trivial = builtins.derivation { - name = "trivial"; - system = "x86_64-linux"; - builder = "/bin/sh"; - args = ["-c" "echo success > $out; exit 0"]; - }; - } - ''; - - createTrivialProject = pkgs.stdenv.mkDerivation { - name = "create-trivial-project"; - unpackPhase = ":"; - buildInputs = [ pkgs.makeWrapper ]; - installPhase = "install -m755 -D ${./create-trivial-project.sh} $out/bin/create-trivial-project.sh"; - postFixup = '' - wrapProgram "$out/bin/create-trivial-project.sh" --prefix PATH ":" ${pkgs.stdenv.lib.makeBinPath [ pkgs.curl ]} --set EXPR_PATH ${trivialJob} - ''; - }; - -in { - name = "hydra-init-localdb"; - meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ pstn lewo ma27 ]; - }; - machine = - { pkgs, ... }: - - { - virtualisation.memorySize = 1024; - time.timeZone = "UTC"; - - environment.systemPackages = [ createTrivialProject pkgs.jq ]; - services.hydra = { - enable = true; - - #Hydra needs those settings to start up, so we add something not harmfull. - hydraURL = "example.com"; - notificationSender = "example@example.com"; - }; - nix = { - buildMachines = [{ - hostName = "localhost"; - systems = [ "x86_64-linux" ]; - }]; - - binaryCaches = []; - }; - }; - - testScript = - '' - # let the system boot up - $machine->waitForUnit("multi-user.target"); - # test whether the database is running - $machine->succeed("systemctl status postgresql.service"); - # test whether the actual hydra daemons are running - $machine->succeed("systemctl status hydra-queue-runner.service"); - $machine->succeed("systemctl status hydra-init.service"); - $machine->succeed("systemctl status hydra-evaluator.service"); - $machine->succeed("systemctl status hydra-send-stats.service"); - - $machine->succeed("hydra-create-user admin --role admin --password admin"); - - # create a project with a trivial job - $machine->waitForOpenPort(3000); - - # make sure the build as been successfully built - $machine->succeed("create-trivial-project.sh"); - - $machine->waitUntilSucceeds('curl -L -s http://localhost:3000/build/1 -H "Accept: application/json" | jq .buildstatus | xargs test 0 -eq'); + trivialJob = pkgs.writeTextDir "trivial.nix" '' + { trivial = builtins.derivation { + name = "trivial"; + system = "x86_64-linux"; + builder = "/bin/sh"; + args = ["-c" "echo success > $out; exit 0"]; + }; + } + ''; + + createTrivialProject = pkgs.stdenv.mkDerivation { + name = "create-trivial-project"; + unpackPhase = ":"; + buildInputs = [ pkgs.makeWrapper ]; + installPhase = "install -m755 -D ${./create-trivial-project.sh} $out/bin/create-trivial-project.sh"; + postFixup = '' + wrapProgram "$out/bin/create-trivial-project.sh" --prefix PATH ":" ${pkgs.stdenv.lib.makeBinPath [ pkgs.curl ]} --set EXPR_PATH ${trivialJob} ''; -}) + }; + + callTest = f: f { inherit system pkgs; }; + + hydraPkgs = { + inherit (pkgs) nixStable nixUnstable; + }; + + tests = pkgs.lib.flip pkgs.lib.mapAttrs hydraPkgs (name: nix: + callTest (import ../make-test.nix ({ pkgs, lib, ... }: + { + name = "hydra-with-${name}"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ pstn lewo ma27 ]; + }; + + machine = { pkgs, ... }: + { + virtualisation.memorySize = 1024; + time.timeZone = "UTC"; + + environment.systemPackages = [ createTrivialProject pkgs.jq ]; + services.hydra = { + enable = true; + + #Hydra needs those settings to start up, so we add something not harmfull. + hydraURL = "example.com"; + notificationSender = "example@example.com"; + + package = pkgs.hydra.override { inherit nix; }; + }; + nix = { + buildMachines = [{ + hostName = "localhost"; + systems = [ "x86_64-linux" ]; + }]; + + binaryCaches = []; + }; + }; + + testScript = '' + # let the system boot up + $machine->waitForUnit("multi-user.target"); + # test whether the database is running + $machine->succeed("systemctl status postgresql.service"); + # test whether the actual hydra daemons are running + $machine->succeed("systemctl status hydra-queue-runner.service"); + $machine->succeed("systemctl status hydra-init.service"); + $machine->succeed("systemctl status hydra-evaluator.service"); + $machine->succeed("systemctl status hydra-send-stats.service"); + + $machine->succeed("hydra-create-user admin --role admin --password admin"); + + # create a project with a trivial job + $machine->waitForOpenPort(3000); + + # make sure the build as been successfully built + $machine->succeed("create-trivial-project.sh"); + + $machine->waitUntilSucceeds('curl -L -s http://localhost:3000/build/1 -H "Accept: application/json" | jq .buildstatus | xargs test 0 -eq'); + ''; + }))); + +in + tests diff --git a/nixos/tests/matrix-synapse.nix b/nixos/tests/matrix-synapse.nix index 8504a7c0d057..882e4b75814b 100644 --- a/nixos/tests/matrix-synapse.nix +++ b/nixos/tests/matrix-synapse.nix @@ -1,4 +1,32 @@ -import ./make-test.nix ({ pkgs, ... } : { +import ./make-test.nix ({ pkgs, ... } : let + + + runWithOpenSSL = file: cmd: pkgs.runCommand file { + buildInputs = [ pkgs.openssl ]; + } cmd; + + + ca_key = runWithOpenSSL "ca-key.pem" "openssl genrsa -out $out 2048"; + ca_pem = runWithOpenSSL "ca.pem" '' + openssl req \ + -x509 -new -nodes -key ${ca_key} \ + -days 10000 -out $out -subj "/CN=snakeoil-ca" + ''; + key = runWithOpenSSL "matrix_key.pem" "openssl genrsa -out $out 2048"; + csr = runWithOpenSSL "matrix.csr" '' + openssl req \ + -new -key ${key} \ + -out $out -subj "/CN=localhost" \ + ''; + cert = runWithOpenSSL "matrix_cert.pem" '' + openssl x509 \ + -req -in ${csr} \ + -CA ${ca_pem} -CAkey ${ca_key} \ + -CAcreateserial -out $out \ + -days 365 + ''; + +in { name = "matrix-synapse"; meta = with pkgs.stdenv.lib.maintainers; { @@ -8,23 +36,31 @@ import ./make-test.nix ({ pkgs, ... } : { nodes = { # Since 0.33.0, matrix-synapse doesn't allow underscores in server names serverpostgres = args: { - services.matrix-synapse.enable = true; - services.matrix-synapse.database_type = "psycopg2"; + services.matrix-synapse = { + enable = true; + database_type = "psycopg2"; + tls_certificate_path = "${cert}"; + tls_private_key_path = "${key}"; + }; }; serversqlite = args: { - services.matrix-synapse.enable = true; - services.matrix-synapse.database_type = "sqlite3"; + services.matrix-synapse = { + enable = true; + database_type = "sqlite3"; + tls_certificate_path = "${cert}"; + tls_private_key_path = "${key}"; + }; }; }; testScript = '' startAll; $serverpostgres->waitForUnit("matrix-synapse.service"); - $serverpostgres->waitUntilSucceeds("curl -Lk https://localhost:8448/"); + $serverpostgres->waitUntilSucceeds("curl -L --cacert ${ca_pem} https://localhost:8448/"); $serverpostgres->requireActiveUnit("postgresql.service"); $serversqlite->waitForUnit("matrix-synapse.service"); - $serversqlite->waitUntilSucceeds("curl -Lk https://localhost:8448/"); + $serversqlite->waitUntilSucceeds("curl -L --cacert ${ca_pem} https://localhost:8448/"); $serversqlite->mustSucceed("[ -e /var/lib/matrix-synapse/homeserver.db ]"); ''; diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix index 6e61e0377f80..45006fb8ef62 100644 --- a/pkgs/applications/audio/mopidy/iris.nix +++ b/pkgs/applications/audio/mopidy/iris.nix @@ -2,11 +2,11 @@ pythonPackages.buildPythonApplication rec { pname = "Mopidy-Iris"; - version = "3.32.1"; + version = "3.32.4"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "0cbb3v9gysi0800ls9vva7clilyg295jcvawyvf0czdmv4wxg3mq"; + sha256 = "16b3dkxland4mjzjs2rz5gbqjapzzmap4d1mfhbrj2ch3plmdy7g"; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/misc/apvlv/default.nix b/pkgs/applications/misc/apvlv/default.nix index 2d9ea5e3574b..2da0de9ead8c 100644 --- a/pkgs/applications/misc/apvlv/default.nix +++ b/pkgs/applications/misc/apvlv/default.nix @@ -41,6 +41,7 @@ stdenv.mkDerivation rec { url = "https://github.com/naihe2010/apvlv/commit/a3a895772a27d76dab0c37643f0f4c73f9970e62.patch"; sha256 = "1fpc7wr1ajilvwi5gjsy5g9jcx4bl03gp5dmajg90ljqbhwz2bfi"; }) + ./fix-build-with-poppler-0.73.0.patch ]; installPhase = '' diff --git a/pkgs/applications/misc/apvlv/fix-build-with-poppler-0.73.0.patch b/pkgs/applications/misc/apvlv/fix-build-with-poppler-0.73.0.patch new file mode 100644 index 000000000000..d2a7831dca63 --- /dev/null +++ b/pkgs/applications/misc/apvlv/fix-build-with-poppler-0.73.0.patch @@ -0,0 +1,13 @@ +diff --git a/src/ApvlvPdf.cc b/src/ApvlvPdf.cc +index 765b112..83d133f 100644 +--- a/src/ApvlvPdf.cc ++++ b/src/ApvlvPdf.cc +@@ -29,7 +29,7 @@ + #include "ApvlvPdf.h" + + #ifndef POPPLER_WITH_GDK +-#include <goo/gtypes.h> ++#include <goo/gfile.h> + + static void + copy_cairo_surface_to_pixbuf (cairo_surface_t *surface, diff --git a/pkgs/applications/misc/k2pdfopt/default.nix b/pkgs/applications/misc/k2pdfopt/default.nix index 2a3b2e61fc23..0049e9aca755 100644 --- a/pkgs/applications/misc/k2pdfopt/default.nix +++ b/pkgs/applications/misc/k2pdfopt/default.nix @@ -6,19 +6,29 @@ , enableJPEG2K ? true, jasper , enableDJVU ? true, djvulibre , enableGOCR ? false, gocr # Disabled by default due to crashes -, enableTesseract ? true, leptonica, tesseract +, enableTesseract ? true, leptonica, tesseract4 }: with stdenv.lib; stdenv.mkDerivation rec { name = "k2pdfopt-${version}"; - version = "2.42"; + version = "2.51a"; - src = fetchzip { - url = "http://www.willus.com/k2pdfopt/src/k2pdfopt_v${version}_src.zip"; - sha256 = "1zag4jmkr0qrcpqqb5davmvdrabhdyz87q4zz0xpfkl6xw2dn9bk"; - }; + src = (fetchzip { + url = "http://www.willus.com/k2pdfopt/src/k2pdfopt_v2.51_src.zip"; + sha256 = "133l7xkvi67s6sfk8cfh7rmavbsf7ib5fyksk1ci6b6sch3z2sw9"; + }); + + # Note: the v2.51a zip contains only files to be replaced in the v2.50 zip. + v251a_src = (fetchzip { + url = "http://www.willus.com/k2pdfopt/src/k2pdfopt_v2.51a_src.zip"; + sha256 = "0vvwblii7kgdwfxw8dzk6jbmz4dv94d7rkv18i60y8wkayj6yhl6"; + }); + + postUnpack = '' + cp -r ${v251a_src}/* $sourceRoot + ''; patches = [ ./k2pdfopt.patch ]; @@ -27,65 +37,43 @@ stdenv.mkDerivation rec { buildInputs = let mupdf_modded = mupdf.overrideAttrs (attrs: { - name = "mupdf-1.10a"; - version = "1.10a"; - src = fetchurl { - url = "https://mupdf.com/downloads/archive/mupdf-1.10a-source.tar.gz"; - sha256 = "0dm8wcs8i29aibzkqkrn8kcnk4q0kd1v66pg48h5c3qqp4v1zk5a"; - }; # Excluded the pdf-*.c files, since they mostly just broke the #includes prePatch = '' cp ${src}/mupdf_mod/{font,stext-device,string}.c source/fitz/ cp ${src}/mupdf_mod/font-win32.c source/pdf/ ''; - # Patches from previous 1.10a version in nixpkgs - patches = [ - # Compatibility with new openjpeg - ./load-jpx.patch - - (fetchurl { - name = "CVE-2017-5896.patch"; - url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=2c4e5867ee699b1081527bc6c6ea0e99a35a5c27"; - sha256 = "14k7x47ifx82sds1c06ibzbmcparfg80719jhgwjk6w1vkh4r693"; - }) - - (fetchpatch { - name = "mupdf-1.10a-shared_libs-1.patch"; - url = "https://ftp.osuosl.org/pub/blfs/conglomeration/mupdf/mupdf-1.10a-shared_libs-1.patch"; - sha256 = "0kg4vahp7hlyyj5hl18brk8s8xcbqrx19pqjzkfq6ha8mqa3k4ab"; - }) - ]; - - # Override this since the jpeg directory was renamed libjpeg in mupdf 1.11 - preConfigure = '' - # Don't remove mujs because upstream version is incompatible - rm -rf thirdparty/{curl,freetype,glfw,harfbuzz,jbig2dec,jpeg,openjpeg,zlib} - ''; - postPatch = let - # OpenJPEG version is hardcoded in package source - openJpegVersion = with stdenv; - lib.concatStringsSep "." (lib.lists.take 2 - (lib.splitString "." (lib.getVersion openjpeg))); - in '' - sed -i "s/__OPENJPEG__VERSION__/${openJpegVersion}/" source/fitz/load-jpx.c - ''; }); + leptonica_modded = leptonica.overrideAttrs (attrs: { + name = "leptonica-1.74.4"; + # Modified source files apply to this particular version of leptonica + version = "1.74.4"; + + src = fetchurl { + url = "http://www.leptonica.org/source/leptonica-1.74.4.tar.gz"; + sha256 = "0fw39amgyv8v6nc7x8a4c7i37dm04i6c5zn62d24bgqnlhk59hr9"; + }; + prePatch = '' - cp ${src}/leptonica_mod/* src/ + cp ${src}/leptonica_mod/{allheaders.h,dewarp2.c,leptwin.c} src/ ''; + patches = []; }); - tesseract_modded = tesseract.override { - tesseractBase = tesseract.tesseractBase.overrideAttrs (_: { + tesseract_modded = tesseract4.override { + tesseractBase = tesseract4.tesseractBase.overrideAttrs (_: { prePatch = '' - cp ${src}/tesseract_mod/{ambigs.cpp,ccutil.h,ccutil.cpp} ccutil/ - cp ${src}/tesseract_mod/dawg.cpp api/ - cp ${src}/tesseract_mod/{imagedata.cpp,tessdatamanager.cpp} ccstruct/ - cp ${src}/tesseract_mod/openclwrapper.h opencl/ - cp ${src}/tesseract_mod/{tessedit.cpp,thresholder.cpp} ccmain/ - cp ${src}/tesseract_mod/tess_lang_mod_edge.h cube/ - cp ${src}/tesseract_mod/tesscapi.cpp api/ - cp ${src}/include_mod/{tesseract.h,leptonica.h} api/ + cp ${src}/tesseract_mod/baseapi.{h,cpp} src/api/ + cp ${src}/tesseract_mod/ccutil.{h,cpp} src/ccutil/ + cp ${src}/tesseract_mod/genericvector.h src/ccutil/ + cp ${src}/tesseract_mod/input.cpp src/lstm/ + cp ${src}/tesseract_mod/lstmrecognizer.cpp src/lstm/ + cp ${src}/tesseract_mod/mainblk.cpp src/ccutil/ + cp ${src}/tesseract_mod/params.cpp src/ccutil/ + cp ${src}/tesseract_mod/serialis.{h,cpp} src/ccutil/ + cp ${src}/tesseract_mod/tesscapi.cpp src/api/ + cp ${src}/tesseract_mod/tessdatamanager.cpp src/ccstruct/ + cp ${src}/tesseract_mod/tessedit.cpp src/ccmain/ + cp ${src}/include_mod/{tesseract.h,leptonica.h} src/api/ ''; patches = [ ./tesseract.patch ]; }); diff --git a/pkgs/applications/misc/k2pdfopt/load-jpx.patch b/pkgs/applications/misc/k2pdfopt/load-jpx.patch deleted file mode 100644 index 02a3799d040a..000000000000 --- a/pkgs/applications/misc/k2pdfopt/load-jpx.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/source/fitz/load-jpx.c -+++ b/source/fitz/load-jpx.c -@@ -484,12 +484,16 @@ - /* Without the definition of OPJ_STATIC, compilation fails on windows - * due to the use of __stdcall. We believe it is required on some - * linux toolchains too. */ -+#ifdef __cplusplus -+extern "C" -+{ - #define OPJ_STATIC - #ifndef _MSC_VER - #define OPJ_HAVE_STDINT_H - #endif -+#endif - --#include <openjpeg.h> -+#include <openjpeg-__OPENJPEG__VERSION__/openjpeg.h> - - /* OpenJPEG does not provide a safe mechanism to intercept - * allocations. In the latest version all allocations go -@@ -971,4 +975,8 @@ - fz_drop_pixmap(ctx, img); - } - -+#ifdef __cplusplus -+} -+#endif -+ - #endif /* HAVE_LURATECH */ diff --git a/pkgs/applications/misc/k2pdfopt/tesseract.patch b/pkgs/applications/misc/k2pdfopt/tesseract.patch index 4827daa1a905..b882f5b949c3 100644 --- a/pkgs/applications/misc/k2pdfopt/tesseract.patch +++ b/pkgs/applications/misc/k2pdfopt/tesseract.patch @@ -1,7 +1,7 @@ -diff --git a/api/Makefile.am b/api/Makefile.am +diff --git a/src/api/Makefile.am b/src/api/Makefile.am index d8c1e54..46ead13 100644 ---- a/api/Makefile.am -+++ b/api/Makefile.am +--- a/src/api/Makefile.am ++++ b/src/api/Makefile.am @@ -42,7 +42,7 @@ libtesseract_api_la_CPPFLAGS = $(AM_CPPFLAGS) if VISIBILITY libtesseract_api_la_CPPFLAGS += -DTESS_EXPORTS diff --git a/pkgs/applications/misc/xsuspender/default.nix b/pkgs/applications/misc/xsuspender/default.nix new file mode 100644 index 000000000000..ef9ce3393619 --- /dev/null +++ b/pkgs/applications/misc/xsuspender/default.nix @@ -0,0 +1,36 @@ +{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper, pkgconfig +, glib, libwnck3, procps }: + +with lib; + +stdenv.mkDerivation rec { + name = "xsuspender-${version}"; + version = "1.1"; + + src = fetchFromGitHub { + owner = "kernc"; + repo = "xsuspender"; + rev = version; + sha256 = "03lbga68dxg89d227sdwk1f5xj4r1pmj0qh2kasi2cqh8ll7qv4b"; + }; + + outputs = [ "out" "man" "doc" ]; + + nativeBuildInputs = [ cmake pkgconfig makeWrapper ]; + buildInputs = [ glib libwnck3 ]; + + enableParallelBuilding = true; + + postInstall = '' + wrapProgram $out/bin/xsuspender \ + --prefix PATH : "${makeBinPath [ procps ]}" + ''; + + meta = { + description = "Auto-suspend inactive X11 applications."; + homepage = "https://kernc.github.io/xsuspender/"; + license = licenses.wtfpl; + maintainers = with maintainers; [ offline ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/office/trilium/default.nix b/pkgs/applications/office/trilium/default.nix index 00d8bb0d275b..c09f78cf873b 100644 --- a/pkgs/applications/office/trilium/default.nix +++ b/pkgs/applications/office/trilium/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, p7zip, autoPatchelfHook, atomEnv, makeWrapper, makeDesktopItem }: +{ stdenv, fetchurl, autoPatchelfHook, atomEnv, makeWrapper, makeDesktopItem }: let description = "Trilium Notes is a hierarchical note taking application with focus on building large personal knowledge bases."; @@ -13,15 +13,23 @@ let in stdenv.mkDerivation rec { name = "trilium-${version}"; - version = "0.27.4"; + version = "0.28.3"; src = fetchurl { - url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.7z"; - sha256 = "1qb11axaifw5xjycrc6qsyd8h36rgjd7rjql8895v8agckf3g2c1"; + url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz"; + sha256 = "0bg7fzb0drw6692hcskiwwd4d9s9547cqp3m1s4qj0y7ca3wrx8r"; }; + # Fetch from source repo, no longer included in release. + # (they did special-case icon.png but we want the scalable svg) + # Use the version here to ensure we get any changes. + trilium_svg = fetchurl { + url = "https://raw.githubusercontent.com/zadam/trilium/v${version}/src/public/images/trilium.svg"; + sha256 = "1rgj7pza20yndfp8n12k93jyprym02hqah36fkk2b3if3kcmwnfg"; + }; + + nativeBuildInputs = [ - p7zip /* for unpacking */ autoPatchelfHook makeWrapper ]; @@ -36,7 +44,7 @@ in stdenv.mkDerivation rec { cp -r ./* $out/share/trilium ln -s $out/share/trilium/trilium $out/bin/trilium - ln -s $out/share/trilium/resources/app/src/public/images/trilium.svg $out/share/icons/hicolor/scalable/apps/trilium.svg + ln -s ${trilium_svg} $out/share/icons/hicolor/scalable/apps/trilium.svg cp ${desktopItem}/share/applications/* $out/share/applications ''; diff --git a/pkgs/applications/science/misc/rink/cargo-lock.patch b/pkgs/applications/science/misc/rink/cargo-lock.patch new file mode 100644 index 000000000000..39029713430c --- /dev/null +++ b/pkgs/applications/science/misc/rink/cargo-lock.patch @@ -0,0 +1,1725 @@ +diff --git a/Cargo.lock b/Cargo.lock +new file mode 100644 +index 0000000..c67e9ed +--- /dev/null ++++ b/Cargo.lock +@@ -0,0 +1,1719 @@ ++[[package]] ++name = "MacTypes-sys" ++version = "2.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "aho-corasick" ++version = "0.6.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "memchr 2.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "antidote" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "autocfg" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "base64" ++version = "0.9.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "safemem 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "bincode" ++version = "0.6.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 0.8.23 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "bitflags" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "bitflags" ++version = "0.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "bitflags" ++version = "1.0.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "bodyparser" ++version = "0.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "iron 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "persistent 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "plugin 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 0.8.23 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_json 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "buf_redux" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "byteorder" ++version = "1.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "bytes" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "cc" ++version = "1.0.28" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "cfg-if" ++version = "0.1.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "chrono" ++version = "0.2.25" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "num 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", ++ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "chrono" ++version = "0.4.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.85 (registry+https://github.com/rust-lang/crates.io-index)", ++ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "chrono-humanize" ++version = "0.0.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "chrono 0.2.25 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "chrono-tz" ++version = "0.2.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "chrono 0.2.25 (registry+https://github.com/rust-lang/crates.io-index)", ++ "parse-zoneinfo 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "cloudabi" ++version = "0.0.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "conduit-mime-types" ++version = "0.7.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "core-foundation" ++version = "0.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "core-foundation-sys 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "core-foundation-sys" ++version = "0.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "dtoa" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "encoding" ++version = "0.2.33" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "encoding-index-japanese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "encoding-index-korean 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "encoding-index-simpchinese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "encoding-index-singlebyte 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "encoding-index-tradchinese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "encoding-index-japanese" ++version = "1.20141219.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "encoding-index-korean" ++version = "1.20141219.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "encoding-index-simpchinese" ++version = "1.20141219.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "encoding-index-singlebyte" ++version = "1.20141219.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "encoding-index-tradchinese" ++version = "1.20141219.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "encoding_index_tests" ++version = "0.1.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "error" ++version = "0.1.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "traitobject 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "typeable 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "filetime" ++version = "0.1.15" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", ++ "redox_syscall 0.1.51 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "foreign-types" ++version = "0.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "foreign-types-shared" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "fsevent" ++version = "0.2.17" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "fsevent-sys 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "fsevent-sys" ++version = "0.1.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "fuchsia-cprng" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "glob" ++version = "0.2.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "handlebars" ++version = "0.25.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pest 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "handlebars-iron" ++version = "0.23.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "handlebars 0.25.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "iron 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "notify 3.0.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "plugin 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)", ++ "walkdir 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "httparse" ++version = "1.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "hyper" ++version = "0.10.15" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "httparse 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num_cpus 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", ++ "traitobject 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "typeable 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "hyper-native-tls" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "antidote 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "hyper 0.10.15 (registry+https://github.com/rust-lang/crates.io-index)", ++ "native-tls 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "idna" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-normalization 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "inotify" ++version = "0.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "ipc-channel" ++version = "0.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bincode 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 0.8.23 (registry+https://github.com/rust-lang/crates.io-index)", ++ "uuid 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "irc" ++version = "0.11.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "encoding 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)", ++ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "iron" ++version = "0.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "conduit-mime-types 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "error 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "hyper 0.10.15 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "modifier 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num_cpus 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "plugin 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "typemap 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "itoa" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "json" ++version = "0.10.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "kernel32-sys" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "language-tags" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "lazy_static" ++version = "0.2.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "lazy_static" ++version = "1.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "libc" ++version = "0.2.48" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "limiter" ++version = "0.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "iron 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "linefeed" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", ++ "nix 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "ole32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "shell32-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-normalization 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "log" ++version = "0.3.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "log" ++version = "0.4.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "logger" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "iron 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "matches" ++version = "0.1.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "memchr" ++version = "0.1.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "memchr" ++version = "2.1.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "mime" ++version = "0.2.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "mime_guess" ++version = "1.8.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "phf 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", ++ "phf_codegen 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "mio" ++version = "0.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bytes 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "miow 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", ++ "nix 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "slab 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "miow" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "modifier" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "mount" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "iron 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "sequence_trie 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "multipart" ++version = "0.8.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "buf_redux 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "mime_guess 1.8.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "native-tls" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "openssl 0.10.16 (registry+https://github.com/rust-lang/crates.io-index)", ++ "openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "openssl-sys 0.9.40 (registry+https://github.com/rust-lang/crates.io-index)", ++ "schannel 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", ++ "security-framework 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "security-framework-sys 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tempfile 3.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "net2" ++version = "0.2.33" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "nix" ++version = "0.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bitflags 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "nix" ++version = "0.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bitflags 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rustc_version 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "semver 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)", ++ "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "notify" ++version = "3.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "filetime 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", ++ "fsevent 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", ++ "fsevent-sys 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "inotify 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", ++ "mio 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", ++ "walkdir 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "num" ++version = "0.1.42" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "num-bigint 0.1.44 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-complex 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-iter 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-rational 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "num-bigint" ++version = "0.1.44" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "num-complex" ++version = "0.1.43" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "num-integer" ++version = "0.1.39" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "num-iter" ++version = "0.1.37" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "num-rational" ++version = "0.1.42" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "num-bigint 0.1.44 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "num-traits" ++version = "0.1.43" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "num-traits" ++version = "0.2.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "num_cpus" ++version = "1.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "ole32-sys" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "openssl" ++version = "0.10.16" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", ++ "openssl-sys 0.9.40 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "openssl-probe" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "openssl-sys" ++version = "0.9.40" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", ++ "vcpkg 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "params" ++version = "0.6.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bodyparser 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "iron 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "multipart 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", ++ "plugin 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_json 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "urlencoded 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "parse-zoneinfo" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "regex 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "percent-encoding" ++version = "1.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "persistent" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "iron 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "plugin 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "pest" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "phf" ++version = "0.7.24" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "phf_codegen" ++version = "0.7.24" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "phf_generator 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", ++ "phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "phf_generator" ++version = "0.7.24" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "phf_shared" ++version = "0.7.24" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "pkg-config" ++version = "0.3.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "plugin" ++version = "0.2.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "typemap 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "quick-error" ++version = "1.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "quote" ++version = "0.3.15" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "rand" ++version = "0.3.23" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand" ++version = "0.4.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "fuchsia-cprng 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand" ++version = "0.6.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_jitter 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_os 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_pcg 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_chacha" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_core" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_core" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "rand_hc" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_isaac" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_jitter" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_os" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "fuchsia-cprng 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_pcg" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_xorshift" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rdrand" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "redox_syscall" ++version = "0.1.51" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "regex" ++version = "0.2.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "aho-corasick 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "memchr 2.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex-syntax 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "utf8-ranges 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "regex-syntax" ++version = "0.5.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "ucd-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "remove_dir_all" ++version = "0.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rink" ++version = "0.4.4" ++dependencies = [ ++ "chrono 0.2.25 (registry+https://github.com/rust-lang/crates.io-index)", ++ "chrono-humanize 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "chrono-tz 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "hyper 0.10.15 (registry+https://github.com/rust-lang/crates.io-index)", ++ "hyper-native-tls 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "json 0.10.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", ++ "linefeed 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rust-gmp 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 0.8.23 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_derive 0.8.23 (registry+https://github.com/rust-lang/crates.io-index)", ++ "strsim 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "xml-rs 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rink-irc" ++version = "0.4.0" ++dependencies = [ ++ "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "irc 0.11.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rink 0.4.4", ++] ++ ++[[package]] ++name = "rink-web" ++version = "0.4.0" ++dependencies = [ ++ "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "handlebars 0.25.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "handlebars-iron 0.23.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "iron 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", ++ "limiter 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "logger 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "mount 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "params 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rink 0.4.4", ++ "router 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 0.8.23 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_derive 0.8.23 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_json 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "staticfile 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "toml 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "route-recognizer" ++version = "0.1.12" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "router" ++version = "0.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "iron 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "route-recognizer 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rust-gmp" ++version = "0.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rustc-serialize" ++version = "0.3.24" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "rustc_version" ++version = "0.1.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "semver 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rustc_version" ++version = "0.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "safemem" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "same-file" ++version = "0.1.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "schannel" ++version = "0.1.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "security-framework" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "core-foundation 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "core-foundation-sys 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", ++ "security-framework-sys 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "security-framework-sys" ++version = "0.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "MacTypes-sys 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "core-foundation-sys 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "semver" ++version = "0.1.20" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "semver" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "semver-parser" ++version = "0.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "sequence_trie" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "serde" ++version = "0.8.23" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "serde" ++version = "1.0.85" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "serde_codegen" ++version = "0.8.23" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_codegen_internals 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 0.10.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "serde_codegen_internals" ++version = "0.11.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "syn 0.10.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "serde_derive" ++version = "0.8.23" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "serde_codegen 0.8.23 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "serde_json" ++version = "0.8.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "dtoa 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "itoa 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 0.8.23 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "shell32-sys" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "siphasher" ++version = "0.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "slab" ++version = "0.1.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "smallvec" ++version = "0.6.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "staticfile" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "iron 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "mount 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", ++ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "strsim" ++version = "0.5.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "syn" ++version = "0.10.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "tempdir" ++version = "0.3.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "tempfile" ++version = "3.0.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "redox_syscall 0.1.51 (registry+https://github.com/rust-lang/crates.io-index)", ++ "remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "thread_local" ++version = "0.3.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "time" ++version = "0.1.42" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", ++ "redox_syscall 0.1.51 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "toml" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 0.8.23 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "traitobject" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "typeable" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "typemap" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "unsafe-any 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "ucd-util" ++version = "0.1.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "unicase" ++version = "1.4.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "unicode-bidi" ++version = "0.3.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "unicode-normalization" ++version = "0.1.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "smallvec 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "unicode-width" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "unicode-xid" ++version = "0.0.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "unreachable" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "unsafe-any" ++version = "0.4.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "traitobject 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "url" ++version = "1.7.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "urlencoded" ++version = "0.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bodyparser 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "iron 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "plugin 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "utf8-ranges" ++version = "1.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "uuid" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "vcpkg" ++version = "0.2.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "version_check" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "void" ++version = "1.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "walkdir" ++version = "0.1.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "walkdir" ++version = "1.0.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "same-file 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "winapi" ++version = "0.2.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "winapi" ++version = "0.3.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "winapi-build" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "winapi-i686-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "winapi-x86_64-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "ws2_32-sys" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "xml-rs" ++version = "0.3.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[metadata] ++"checksum MacTypes-sys 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "eaf9f0d0b1cc33a4d2aee14fb4b2eac03462ef4db29c8ac4057327d8a71ad86f" ++"checksum aho-corasick 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)" = "1e9a933f4e58658d7b12defcf96dc5c720f20832deebe3e0a19efd3b6aaeeb9e" ++"checksum antidote 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "34fde25430d87a9388dadbe6e34d7f72a462c8b43ac8d309b42b0a8505d7e2a5" ++"checksum autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a6d640bee2da49f60a4068a7fae53acde8982514ab7bae8b8cea9e88cbcfd799" ++"checksum base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643" ++"checksum bincode 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "55eb0b7fd108527b0c77860f75eca70214e11a8b4c6ef05148c54c05a25d48ad" ++"checksum bitflags 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8dead7461c1127cf637931a1e50934eb6eee8bff2f74433ac7909e9afcee04a3" ++"checksum bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "aad18937a628ec6abcd26d1489012cc0e18c21798210f491af69ded9b881106d" ++"checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12" ++"checksum bodyparser 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6928e817538b74a73d1dd6e9a942a2a35c632a597b6bb14fd009480f859a6bf5" ++"checksum buf_redux 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "861b9d19b9f5cb40647242d10d0cb0a13de0a96d5ff8c8a01ea324fa3956eb7d" ++"checksum byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a019b10a2a7cdeb292db131fc8113e57ea2a908f6e7894b0c3c671893b65dbeb" ++"checksum bytes 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c129aff112dcc562970abb69e2508b40850dd24c274761bb50fb8a0067ba6c27" ++"checksum cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4a8b715cb4597106ea87c7c84b2f1d452c7492033765df7f32651e66fcf749" ++"checksum cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "082bb9b28e00d3c9d39cc03e64ce4cea0f1bb9b3fde493f0cbc008472d22bdf4" ++"checksum chrono 0.2.25 (registry+https://github.com/rust-lang/crates.io-index)" = "9213f7cd7c27e95c2b57c49f0e69b1ea65b27138da84a170133fd21b07659c00" ++"checksum chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "45912881121cb26fad7c38c17ba7daa18764771836b34fab7d3fbd93ed633878" ++"checksum chrono-humanize 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "92afb1436280b0e4ed573c747ad30a1469cd945c201265b4d01e72cfa598da4f" ++"checksum chrono-tz 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "45438695f3f154032951a341ecca7ed200714bea615096885c9e86ca9fa3d66b" ++"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" ++"checksum conduit-mime-types 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "95ca30253581af809925ef68c2641cc140d6183f43e12e0af4992d53768bd7b8" ++"checksum core-foundation 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "286e0b41c3a20da26536c6000a280585d519fd07b3956b43aed8a79e9edce980" ++"checksum core-foundation-sys 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "716c271e8613ace48344f723b60b900a93150271e5be206212d052bbc0883efa" ++"checksum dtoa 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0dd841b58510c9618291ffa448da2e4e0f699d984d436122372f446dae62263d" ++"checksum encoding 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "6b0d943856b990d12d3b55b359144ff341533e516d94098b1d3fc1ac666d36ec" ++"checksum encoding-index-japanese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "04e8b2ff42e9a05335dbf8b5c6f7567e5591d0d916ccef4e0b1710d32a0d0c91" ++"checksum encoding-index-korean 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "4dc33fb8e6bcba213fe2f14275f0963fd16f0a02c878e3095ecfdf5bee529d81" ++"checksum encoding-index-simpchinese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "d87a7194909b9118fc707194baa434a4e3b0fb6a5a757c73c3adb07aa25031f7" ++"checksum encoding-index-singlebyte 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3351d5acffb224af9ca265f435b859c7c01537c0849754d3db3fdf2bfe2ae84a" ++"checksum encoding-index-tradchinese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fd0e20d5688ce3cab59eb3ef3a2083a5c77bf496cb798dc6fcdb75f323890c18" ++"checksum encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569" ++"checksum error 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "a6e606f14042bb87cc02ef6a14db6c90ab92ed6f62d87e69377bc759fd7987cc" ++"checksum filetime 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "714653f3e34871534de23771ac7b26e999651a0a228f47beb324dfdf1dd4b10f" ++"checksum foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" ++"checksum foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" ++"checksum fsevent 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)" = "c4bbbf71584aeed076100b5665ac14e3d85eeb31fdbb45fbd41ef9a682b5ec05" ++"checksum fsevent-sys 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "1a772d36c338d07a032d5375a36f15f9a7043bf0cb8ce7cee658e037c6032874" ++"checksum fuchsia-cprng 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "81f7f8eb465745ea9b02e2704612a9946a59fa40572086c6fd49d6ddcf30bf31" ++"checksum glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb" ++"checksum handlebars 0.25.3 (registry+https://github.com/rust-lang/crates.io-index)" = "15bdf598fc3c2de40c6b340213028301c0d225eea55a2294e6cc148074e557a1" ++"checksum handlebars-iron 0.23.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1f86cf6ff931aa78e61415ad40c48a9af101b9a888eeed6ecf4f48dc52e80b76" ++"checksum httparse 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e8734b0cfd3bc3e101ec59100e101c2eecd19282202e87808b3037b442777a83" ++"checksum hyper 0.10.15 (registry+https://github.com/rust-lang/crates.io-index)" = "df0caae6b71d266b91b4a83111a61d2b94ed2e2bea024c532b933dcff867e58c" ++"checksum hyper-native-tls 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6d375598f442742b0e66208ee12501391f1c7ac0bafb90b4fe53018f81f06068" ++"checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e" ++"checksum inotify 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e8458c07bdbdaf309c80e2c3304d14c3db64e7465d4f07cf589ccb83fd0ff31a" ++"checksum ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "675587430ede6756dd03fdfdf9888f22f83855fd131c8451d842a710b059e571" ++"checksum irc 0.11.8 (registry+https://github.com/rust-lang/crates.io-index)" = "6a45f7136bbfeec4377afc6363b38440ce153d8a61777d56da0c6b1176cf135a" ++"checksum iron 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2440ae846e7a8c7f9b401db8f6e31b4ea5e7d3688b91761337da7e054520c75b" ++"checksum itoa 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ae3088ea4baeceb0284ee9eea42f591226e6beaecf65373e41b38d95a1b8e7a1" ++"checksum json 0.10.3 (registry+https://github.com/rust-lang/crates.io-index)" = "f3fb4510c0dbc38f7f43bdbe8b53defae0cd338b81ef416462a0ef69d600165c" ++"checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" ++"checksum language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a" ++"checksum lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73" ++"checksum lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a374c89b9db55895453a74c1e38861d9deec0b01b405a82516e9d5de4820dea1" ++"checksum libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)" = "e962c7641008ac010fa60a7dfdc1712449f29c44ef2d4702394aea943ee75047" ++"checksum limiter 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "cbc5d8bf63416df5331084dd9883b9598582f0d7ad5e42d53e55b05366931676" ++"checksum linefeed 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1301a570e4e7d2d0f324b7a3fa73eac85b05c81b656a0983b16ebc8c504e53b6" ++"checksum log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b" ++"checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6" ++"checksum logger 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "92ff59f9a797ff30f711fe6b8489ad424953cee17c206de77d3c5957a9182ba7" ++"checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" ++"checksum memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d8b629fb514376c675b98c1421e80b151d3817ac42d7c667717d282761418d20" ++"checksum memchr 2.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e1dd4eaac298c32ce07eb6ed9242eda7d82955b9170b7d6db59b2e02cc63fcb8" ++"checksum mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "ba626b8a6de5da682e1caa06bdb42a335aee5a84db8e5046a3e8ab17ba0a3ae0" ++"checksum mime_guess 1.8.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2d4c0961143b8efdcfa29c3ae63281601b446a4a668165454b6c90f8024954c5" ++"checksum mio 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a637d1ca14eacae06296a008fa7ad955347e34efcb5891cfd8ba05491a37907e" ++"checksum miow 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3e690c5df6b2f60acd45d56378981e827ff8295562fc8d34f573deb267a59cd1" ++"checksum modifier 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "41f5c9112cb662acd3b204077e0de5bc66305fa8df65c8019d5adb10e9ab6e58" ++"checksum mount 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "32245731923cd096899502fc4c4317cfd09f121e80e73f7f576cf3777a824256" ++"checksum multipart 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b16d6498fe5b0c2f6d973fd9753da099948834f96584d628e44a75f0d2955b03" ++"checksum native-tls 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ff8e08de0070bbf4c31f452ea2a70db092f36f6f2e4d897adf5674477d488fb2" ++"checksum net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88" ++"checksum nix 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bfb3ddedaa14746434a02041940495bf11325c22f6d36125d3bdd56090d50a79" ++"checksum nix 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a0d95c5fa8b641c10ad0b8887454ebaafa3c92b5cd5350f8fc693adafd178e7b" ++"checksum notify 3.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "13fdd4a6894329b193f38f03a88823ce721275fdfdb29820c44a30515033524e" ++"checksum num 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "4703ad64153382334aa8db57c637364c322d3372e097840c72000dabdcf6156e" ++"checksum num-bigint 0.1.44 (registry+https://github.com/rust-lang/crates.io-index)" = "e63899ad0da84ce718c14936262a41cee2c79c981fc0a0e7c7beb47d5a07e8c1" ++"checksum num-complex 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)" = "b288631d7878aaf59442cffd36910ea604ecd7745c36054328595114001c9656" ++"checksum num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)" = "e83d528d2677f0518c570baf2b7abdcf0cd2d248860b68507bdcb3e91d4c0cea" ++"checksum num-iter 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)" = "af3fdbbc3291a5464dc57b03860ec37ca6bf915ed6ee385e7c6c052c422b2124" ++"checksum num-rational 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "ee314c74bd753fc86b4780aa9475da469155f3848473a261d2d18e35245a784e" ++"checksum num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)" = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31" ++"checksum num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0b3a5d7cc97d6d30d8b9bc8fa19bf45349ffe46241e8816f50f62f6d6aaabee1" ++"checksum num_cpus 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5a69d464bdc213aaaff628444e99578ede64e9c854025aa43b9796530afa9238" ++"checksum ole32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5d2c49021782e5233cd243168edfa8037574afed4eba4bbaf538b3d8d1789d8c" ++"checksum openssl 0.10.16 (registry+https://github.com/rust-lang/crates.io-index)" = "ec7bd7ca4cce6dbdc77e7c1230682740d307d1218a87fb0349a571272be749f9" ++"checksum openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" ++"checksum openssl-sys 0.9.40 (registry+https://github.com/rust-lang/crates.io-index)" = "1bb974e77de925ef426b6bc82fce15fd45bdcbeb5728bffcfc7cdeeb7ce1c2d6" ++"checksum params 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "421e9f2c30e80365c9672709be664bfc84f73b088720d1cc1f4e99675814bb37" ++"checksum parse-zoneinfo 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f4ee19a3656dadae35a33467f9714f1228dd34766dbe49e10e656b5296867aea" ++"checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" ++"checksum persistent 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d4c9c94f2ef72dc272c6bcc8157ccf2bc7da14f4c58c69059ac2fc48492d6916" ++"checksum pest 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0a6dda33d67c26f0aac90d324ab2eb7239c819fc7b2552fe9faa4fe88441edc8" ++"checksum phf 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "b3da44b85f8e8dfaec21adae67f95d93244b2ecf6ad2a692320598dcc8e6dd18" ++"checksum phf_codegen 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "b03e85129e324ad4166b06b2c7491ae27fe3ec353af72e72cd1654c7225d517e" ++"checksum phf_generator 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "09364cc93c159b8b06b1f4dd8a4398984503483891b0c26b867cf431fb132662" ++"checksum phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "234f71a15de2288bcb7e3b6515828d22af7ec8598ee6d24c3b526fa0a80b67a0" ++"checksum pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)" = "676e8eb2b1b4c9043511a9b7bea0915320d7e502b0a079fb03f9635a5252b18c" ++"checksum plugin 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "1a6a0dc3910bc8db877ffed8e457763b317cf880df4ae19109b9f77d277cf6e0" ++"checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0" ++"checksum quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a" ++"checksum rand 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)" = "64ac302d8f83c0c1974bf758f6b041c6c8ada916fbb44a609158ca8b064cc76c" ++"checksum rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293" ++"checksum rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" ++"checksum rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" ++"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" ++"checksum rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d0e7a549d590831370895ab7ba4ea0c1b6b011d106b5ff2da6eee112615e6dc0" ++"checksum rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" ++"checksum rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" ++"checksum rand_jitter 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "080723c6145e37503a2224f801f252e14ac5531cb450f4502698542d188cb3c0" ++"checksum rand_os 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b7c690732391ae0abafced5015ffb53656abfaec61b342290e5eb56b286a679d" ++"checksum rand_pcg 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "086bd09a33c7044e56bb44d5bdde5a60e7f119a9e95b0775f545de759a32fe05" ++"checksum rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" ++"checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" ++"checksum redox_syscall 0.1.51 (registry+https://github.com/rust-lang/crates.io-index)" = "423e376fffca3dfa06c9e9790a9ccd282fafb3cc6e6397d01dbf64f9bacc6b85" ++"checksum regex 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9329abc99e39129fcceabd24cf5d85b4671ef7c29c50e972bc5afe32438ec384" ++"checksum regex-syntax 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7d707a4fa2637f2dca2ef9fd02225ec7661fe01a53623c1e6515b6916511f7a7" ++"checksum remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3488ba1b9a2084d38645c4c08276a1752dcbf2c7130d74f1569681ad5d2799c5" ++"checksum route-recognizer 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3255338088df8146ba63d60a9b8e3556f1146ce2973bc05a75181a42ce2256" ++"checksum router 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b9b1797ff166029cb632237bb5542696e54961b4cf75a324c6f05c9cf0584e4e" ++"checksum rust-gmp 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c3ddf28998d5730b96a9fe188557953de503d77ff403ae175ad1417921e5d906" ++"checksum rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)" = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda" ++"checksum rustc_version 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "c5f5376ea5e30ce23c03eb77cbe4962b988deead10910c372b226388b594c084" ++"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" ++"checksum safemem 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8dca453248a96cb0749e36ccdfe2b0b4e54a61bfef89fb97ec621eb8e0a93dd9" ++"checksum same-file 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d931a44fdaa43b8637009e7632a02adc4f2b2e0733c08caa4cf00e8da4a117a7" ++"checksum schannel 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "0e1a231dc10abf6749cfa5d7767f25888d484201accbd919b66ab5413c502d56" ++"checksum security-framework 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bfab8dda0e7a327c696d893df9ffa19cadc4bd195797997f5223cf5831beaf05" ++"checksum security-framework-sys 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3d6696852716b589dff9e886ff83778bb635150168e83afa8ac6b8a78cb82abc" ++"checksum semver 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)" = "d4f410fedcf71af0345d7607d246e7ad15faaadd49d240ee3b24e5dc21a820ac" ++"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" ++"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" ++"checksum sequence_trie 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c915714ca833b1d4d6b8f6a9d72a3ff632fe45b40a8d184ef79c81bec6327eed" ++"checksum serde 0.8.23 (registry+https://github.com/rust-lang/crates.io-index)" = "9dad3f759919b92c3068c696c15c3d17238234498bbdcc80f2c469606f948ac8" ++"checksum serde 1.0.85 (registry+https://github.com/rust-lang/crates.io-index)" = "534b8b91a95e0f71bca3ed5824752d558da048d4248c91af873b63bd60519752" ++"checksum serde_codegen 0.8.23 (registry+https://github.com/rust-lang/crates.io-index)" = "a4c5d8a33087d8984f9535daa62a6498a08f6476050b00ab9339dd847e4c25cc" ++"checksum serde_codegen_internals 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)" = "afad7924a009f859f380e4a2e3a509a845c2ac66435fcead74a4d983b21ae806" ++"checksum serde_derive 0.8.23 (registry+https://github.com/rust-lang/crates.io-index)" = "ce44e5f4264b39e9d29c875357b7cc3ebdfb967bb9e22bfb5e44ffa400af5306" ++"checksum serde_json 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)" = "67f7d2e9edc3523a9c8ec8cd6ec481b3a27810aafee3e625d311febd3e656b4c" ++"checksum shell32-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9ee04b46101f57121c9da2b151988283b6beb79b34f5bb29a58ee48cb695122c" ++"checksum siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac" ++"checksum slab 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d807fd58c4181bbabed77cb3b891ba9748241a552bcc5be698faaebefc54f46e" ++"checksum smallvec 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)" = "88aea073965ab29f6edb5493faf96ad662fb18aa9eeb186a3b7057951605ed15" ++"checksum staticfile 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "31493480e073d52522a94cdf56269dd8eb05f99549effd1826b0271690608878" ++"checksum strsim 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "67f84c44fbb2f91db7fef94554e6b2ac05909c9c0b0bc23bb98d3a1aebfe7f7c" ++"checksum syn 0.10.8 (registry+https://github.com/rust-lang/crates.io-index)" = "58fd09df59565db3399efbba34ba8a2fec1307511ebd245d0061ff9d42691673" ++"checksum tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8" ++"checksum tempfile 3.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "7e91405c14320e5c79b3d148e1c86f40749a36e490642202a31689cb1a3452b2" ++"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b" ++"checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f" ++"checksum toml 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "736b60249cb25337bc196faa43ee12c705e426f3d55c214d73a4e7be06f92cb4" ++"checksum traitobject 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "efd1f82c56340fdf16f2a953d7bda4f8fdffba13d93b00844c25572110b26079" ++"checksum typeable 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1410f6f91f21d1612654e7cc69193b0334f909dcf2c790c4826254fbb86f8887" ++"checksum typemap 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "653be63c80a3296da5551e1bfd2cca35227e13cdd08c6668903ae2f4f77aa1f6" ++"checksum ucd-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "535c204ee4d8434478593480b8f86ab45ec9aae0e83c568ca81abf0fd0e88f86" ++"checksum unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7f4765f83163b74f957c797ad9253caf97f103fb064d3999aea9568d09fc8a33" ++"checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" ++"checksum unicode-normalization 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "141339a08b982d942be2ca06ff8b076563cbe223d1befd5450716790d44e2426" ++"checksum unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "882386231c45df4700b275c7ff55b6f3698780a650026380e72dabe76fa46526" ++"checksum unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc" ++"checksum unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56" ++"checksum unsafe-any 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f30360d7979f5e9c6e6cea48af192ea8fab4afb3cf72597154b8f08935bc9c7f" ++"checksum url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a" ++"checksum urlencoded 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8c28708636d6f7298a53b1cdb6af40f1ab523209a7cb83cf4d41b3ebc671d319" ++"checksum utf8-ranges 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "796f7e48bef87609f7ade7e06495a87d5cd06c7866e6a5cbfceffc558a243737" ++"checksum uuid 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1a9ff57156caf7e22f37baf3c9d8f6ce8194842c23419dafcb0716024514d162" ++"checksum vcpkg 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "def296d3eb3b12371b2c7d0e83bfe1403e4db2d7a0bba324a12b21c4ee13143d" ++"checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd" ++"checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" ++"checksum walkdir 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "c66c0b9792f0a765345452775f3adbd28dde9d33f30d13e5dcc5ae17cf6f3780" ++"checksum walkdir 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "bb08f9e670fab86099470b97cd2b252d6527f0b3cc1401acdb595ffc9dd288ff" ++"checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" ++"checksum winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "92c1eb33641e276cfa214a0522acad57be5c56b10cb348b3c5117db75f3ac4b0" ++"checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" ++"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" ++"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" ++"checksum ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" ++"checksum xml-rs 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7ec6c39eaa68382c8e31e35239402c0a9489d4141a8ceb0c716099a0b515b562" diff --git a/pkgs/applications/science/misc/rink/default.nix b/pkgs/applications/science/misc/rink/default.nix new file mode 100644 index 000000000000..0ccb096b8dab --- /dev/null +++ b/pkgs/applications/science/misc/rink/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, rustPlatform, openssl, pkgconfig, gmp, ncurses }: + +rustPlatform.buildRustPackage rec { + version = "0.4.4"; + name = "rink-${version}"; + + src = fetchFromGitHub { + owner = "tiffany352"; + repo = "rink-rs"; + rev = "v${version}"; + sha256 = "0rvck5ahg7s51fdlr2ch698cwnyc6qp84zhfgs3wkszj9r5j470k"; + }; + cargoPatches = [ ./cargo-lock.patch ]; + + cargoSha256 = "0xmmxm7zwmq7w0pspx17glg4mjgh9l61w0h2k7n97x6p35i198d1"; + + buildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ openssl gmp ncurses ]; + + # Some tests fail and/or attempt to use internet servers. + doCheck = false; + + meta = with stdenv.lib; { + description = "Unit-aware calculator"; + homepage = http://rink.tiffnix.com; + license = with licenses; [ mpl20 gpl3 ]; + maintainers = [ maintainers.sb0 ]; + }; +} diff --git a/pkgs/development/coq-modules/iris/default.nix b/pkgs/development/coq-modules/iris/default.nix index 134ea45493df..ea26f3e1ca9d 100644 --- a/pkgs/development/coq-modules/iris/default.nix +++ b/pkgs/development/coq-modules/iris/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { }; passthru = { - compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.6"; + compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" ]; }; } diff --git a/pkgs/development/coq-modules/metalib/default.nix b/pkgs/development/coq-modules/metalib/default.nix index 46a6cafb6ab8..c196bdbcd766 100644 --- a/pkgs/development/coq-modules/metalib/default.nix +++ b/pkgs/development/coq-modules/metalib/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { }; passthru = { - compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.6"; + compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" ]; }; } diff --git a/pkgs/development/coq-modules/stdpp/default.nix b/pkgs/development/coq-modules/stdpp/default.nix index 91801850ebfb..883ed971b083 100644 --- a/pkgs/development/coq-modules/stdpp/default.nix +++ b/pkgs/development/coq-modules/stdpp/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { }; passthru = { - compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.6"; + compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" ]; }; } diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix index 6b55f006cd2a..dc04e72c7411 100644 --- a/pkgs/development/interpreters/groovy/default.nix +++ b/pkgs/development/interpreters/groovy/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "groovy-${version}"; - version = "2.5.5"; + version = "2.5.6"; src = fetchurl { url = "http://dl.bintray.com/groovy/maven/apache-groovy-binary-${version}.zip"; - sha256 = "16hj2v6r89s3qrgbnkinwwzv16mphb6jjw8ijgmmd9y2063nchc2"; + sha256 = "14lfxnc03hmakwagvl3sb6c0b298v3awcdr1gafwnmsqv03hhkdn"; }; buildInputs = [ unzip makeWrapper ]; diff --git a/pkgs/development/libraries/libiio/default.nix b/pkgs/development/libraries/libiio/default.nix index 312257304421..ec025d31ce3f 100644 --- a/pkgs/development/libraries/libiio/default.nix +++ b/pkgs/development/libraries/libiio/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "libiio-${version}"; - version = "0.16"; + version = "0.17"; src = fetchFromGitHub { owner = "analogdevicesinc"; repo = "libiio"; rev = "refs/tags/v${version}"; - sha256 = "1j27kyizdwawskwg1va894qaw3z5dx5s6cla1rd0ngr9kls88q2h"; + sha256 = "15lghy0zlq667abs1ggbvmb1qiw7vzhhzkw8dm9vzix4ffma2igg"; }; outputs = [ "out" "lib" "dev" "python" ]; diff --git a/pkgs/development/libraries/qpdf/default.nix b/pkgs/development/libraries/qpdf/default.nix index 4053afe4beca..30383dda50cf 100644 --- a/pkgs/development/libraries/qpdf/default.nix +++ b/pkgs/development/libraries/qpdf/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, fetchpatch, libjpeg, zlib, perl }: -let version = "8.3.0"; +let version = "8.4.0"; in stdenv.mkDerivation rec { name = "qpdf-${version}"; src = fetchurl { url = "mirror://sourceforge/qpdf/qpdf/${version}/${name}.tar.gz"; - sha256 = "1xwiqf6xkl9glpardak97ycy5f2bwjf8x0hwvf0acsxqj03a3hj6"; + sha256 = "1864p952m8vzxk6v500a42psbqj2g2gyli3d3zj6h33hzwxqy09r"; }; nativeBuildInputs = [ perl ]; diff --git a/pkgs/development/python-modules/braintree/default.nix b/pkgs/development/python-modules/braintree/default.nix index 5bd545db51cc..5e24a880e759 100644 --- a/pkgs/development/python-modules/braintree/default.nix +++ b/pkgs/development/python-modules/braintree/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "braintree"; - version = "3.50.0"; + version = "3.51.0"; src = fetchPypi { inherit pname version; - sha256 = "d1d7a6854b623f2c616451fa474113ac7fb8a2cbeb7dfad36dd3312113484030"; + sha256 = "1aavalwxcpql416f0n6wxq2h5jpvbx5jq4y4nz2wsppgjbsxylcc"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/cfn-flip/default.nix b/pkgs/development/python-modules/cfn-flip/default.nix new file mode 100644 index 000000000000..ab6abc4cd6f6 --- /dev/null +++ b/pkgs/development/python-modules/cfn-flip/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchPypi, six, pyyaml, click, pytestrunner }: + +buildPythonPackage rec { + pname = "cfn-flip"; + version = "1.1.0.post1"; + + src = fetchPypi { + pname = "cfn_flip"; + inherit version; + sha256 = "16r01ijjwnq06ax5xrv6mq9l00f6sgzw776kr43zjai09xsbwwck"; + }; + + propagatedBuildInputs = [ six pyyaml click ]; + nativeBuildInputs = [ pytestrunner ]; + + # No tests in Pypi + doCheck = false; + + meta = with lib; { + description = "Tool for converting AWS CloudFormation templates between JSON and YAML formats"; + homepage = https://github.com/awslabs/aws-cfn-template-flip; + license = licenses.asl20; + maintainers = with maintainers; [ psyanticy ]; + }; +} diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix index 0ea3a9d8ab4d..29460f14eab3 100644 --- a/pkgs/development/python-modules/distributed/default.nix +++ b/pkgs/development/python-modules/distributed/default.nix @@ -19,27 +19,28 @@ , tornado , zict , pyyaml -, pythonOlder +, isPy3k , futures , singledispatch +, mpi4py +, bokeh }: buildPythonPackage rec { pname = "distributed"; - version = "1.25.2"; + version = "1.25.3"; # get full repository need conftest.py to run tests src = fetchPypi { inherit pname version; - sha256 = "0rv5831xv5byx0f8ly3mlji207nb3bzq6qmdf7ishrgy9kpphc68"; + sha256 = "0bvjlw74n0l4rgzhm876f66f7y6j09744i5h3iwlng2jwzyw97gs"; }; checkInputs = [ pytest pytest-repeat pytest-faulthandler pytest-timeout mock joblib ]; propagatedBuildInputs = [ click cloudpickle dask msgpack psutil six - sortedcontainers tblib toolz tornado zict pyyaml - ] ++ lib.optional (pythonOlder "3.2") [ futures ] - ++ lib.optional (pythonOlder "3.4") [ singledispatch ]; + sortedcontainers tblib toolz tornado zict pyyaml mpi4py bokeh + ] ++ lib.optionals (!isPy3k) [ futures singledispatch ]; # tests take about 10-15 minutes # ignore 5 cli tests out of 1000 total tests that fail due to subprocesses diff --git a/pkgs/development/python-modules/future-fstrings/default.nix b/pkgs/development/python-modules/future-fstrings/default.nix index 7df148df09c9..9e49147315b5 100644 --- a/pkgs/development/python-modules/future-fstrings/default.nix +++ b/pkgs/development/python-modules/future-fstrings/default.nix @@ -18,5 +18,6 @@ buildPythonPackage rec { description = "A backport of fstrings to python<3.6"; license = licenses.mit; maintainers = with maintainers; [ nyanloutre ]; + broken = pythonOlder "3.6"; # dependency tokenize-rt not packaged }; } diff --git a/pkgs/development/python-modules/pymacaroons-pynacl/default.nix b/pkgs/development/python-modules/pymacaroons-pynacl/default.nix deleted file mode 100644 index 8bc644252c0f..000000000000 --- a/pkgs/development/python-modules/pymacaroons-pynacl/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pynacl, six }: - -buildPythonPackage rec { - pname = "pymacaroons-pynacl"; - version = "0.9.3"; - - src = fetchFromGitHub { - owner = "matrix-org"; - repo = "pymacaroons"; - rev = "v${version}"; - sha256 = "0bykjk01zdndp6gjr30x46blsn0cvxa7j0zh5g8raxwaawchjhii"; - }; - - propagatedBuildInputs = [ pynacl six ]; - - # Tests require an old version of hypothesis - doCheck = false; - - meta = with lib; { - description = "Macaroon library for Python"; - homepage = https://github.com/matrix-org/pymacaroons; - license = licenses.mit; - }; -} diff --git a/pkgs/development/python-modules/pymacaroons/default.nix b/pkgs/development/python-modules/pymacaroons/default.nix new file mode 100644 index 000000000000..96023c01e1e5 --- /dev/null +++ b/pkgs/development/python-modules/pymacaroons/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchPypi, six, pynacl }: + +buildPythonPackage rec { + pname = "pymacaroons"; + version = "0.13.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1e6bba42a5f66c245adf38a5a4006a99dcc06a0703786ea636098667d42903b8"; + }; + + propagatedBuildInputs = [ + six + pynacl + ]; + + # Tests require an old version of hypothesis + doCheck = false; + + meta = with lib; { + description = "Macaroon library for Python"; + homepage = https://github.com/ecordell/pymacaroons; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/python-jenkins/default.nix b/pkgs/development/python-modules/python-jenkins/default.nix index cdce1b337183..44f1c0d6c39d 100644 --- a/pkgs/development/python-modules/python-jenkins/default.nix +++ b/pkgs/development/python-modules/python-jenkins/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib , buildPythonPackage , fetchPypi , python @@ -11,28 +11,33 @@ , testscenarios , testrepository , kerberos +, requests +, unittest2 +, requests-mock }: buildPythonPackage rec { pname = "python-jenkins"; - version = "1.3.0"; + version = "1.4.0"; src = fetchPypi { inherit pname version; - sha256 = "b44b3c8e0dabed371a1a8a301cc8833c635625faf003fd68c176800c71a6597c"; + sha256 = "1h14hfcwichmppbgxf1k8njw29hchpav1kj574b4lly3j0n2vnag"; }; - patchPhase = '' - sed -i 's@python@${python.interpreter}@' .testr.conf - ''; - buildInputs = [ mock ]; - propagatedBuildInputs = [ pbr pyyaml six multi_key_dict testtools testscenarios testrepository kerberos ]; + propagatedBuildInputs = [ pbr pyyaml six multi_key_dict requests ]; + + checkInputs = [ unittest2 testscenarios requests-mock ]; + checkPhase = '' + unit2 + ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Python bindings for the remote Jenkins API"; homepage = https://pypi.python.org/pypi/python-jenkins; license = licenses.bsd3; + maintainers = with maintainers; [ ma27 ]; }; } diff --git a/pkgs/development/python-modules/shodan/default.nix b/pkgs/development/python-modules/shodan/default.nix new file mode 100644 index 000000000000..0fde898ca04f --- /dev/null +++ b/pkgs/development/python-modules/shodan/default.nix @@ -0,0 +1,35 @@ +{ lib +, fetchPypi +, buildPythonPackage +, click-plugins +, colorama +, requests +, XlsxWriter +}: + +buildPythonPackage rec { + pname = "shodan"; + version = "1.10.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "13966vqxww7v2b5hf2kjismdzvqyjvxlcdvpkzpbsrpxy9pvn2n4"; + }; + + propagatedBuildInputs = [ + click-plugins + colorama + requests + XlsxWriter + ]; + + # The tests require a shodan api key, so skip them. + doCheck = false; + + meta = with lib; { + description = "Python library and command-line utility for Shodan"; + homepage = https://github.com/achillean/shodan-python; + license = licenses.mit; + maintainers = with maintainers; [ lihop ]; + }; +} diff --git a/pkgs/development/python-modules/sly/default.nix b/pkgs/development/python-modules/sly/default.nix new file mode 100644 index 000000000000..011fa1799abd --- /dev/null +++ b/pkgs/development/python-modules/sly/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, pythonOlder +}: + +buildPythonPackage rec { + pname = "sly"; + version = "0.3"; + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "be6a3825b042a9e1b6f5730fc747e6d983c917f0f002d798d0b9f86ca5c05ad9"; + }; + + checkInputs = [ pytest ]; + + # tests not included with pypi release + doCheck = false; + + meta = with lib; { + description = "An improved PLY implementation of lex and yacc for Python 3"; + homepage = https://github.com/dabeaz/sly; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix b/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix index c6d3a21b10ba..da2fd2cd22d1 100644 --- a/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix @@ -1,9 +1,11 @@ -{ lib, buildPythonPackage, fetchPypi, sqlalchemy, telethon }: +{ lib, buildPythonPackage, fetchPypi, isPy3k, sqlalchemy }: buildPythonPackage rec { pname = "telethon-session-sqlalchemy"; version = "0.2.5"; + disabled = !isPy3k; + src = fetchPypi { inherit pname version; sha256 = "b392096b14e5cdc4040d3900cc2be7847b160ed77e5c861a6bd07d75d8e17a85"; diff --git a/pkgs/development/python-modules/yubico-client/default.nix b/pkgs/development/python-modules/yubico-client/default.nix new file mode 100644 index 000000000000..ddd992a51447 --- /dev/null +++ b/pkgs/development/python-modules/yubico-client/default.nix @@ -0,0 +1,24 @@ +{ lib, buildPythonPackage, fetchPypi +, requests }: + +buildPythonPackage rec { + pname = "yubico-client"; + version = "1.10.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0skkmrpvpb1pwyqjf3lh9vq46xagvwdx9kagpdbba2v5dgrk34d1"; + }; + + propagatedBuildInputs = [ requests ]; + + # pypi package missing test_utils and github releases is behind + doCheck = false; + + meta = with lib; { + description = "Verifying Yubico OTPs based on the validation protocol version 2.0"; + homepage = https://github.com/Kami/python-yubico-client/; + maintainers= with maintainers; [ peterromfeldhk ]; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix index 42da07baca66..00f679cfdac8 100644 --- a/pkgs/development/tools/misc/hydra/default.nix +++ b/pkgs/development/tools/misc/hydra/default.nix @@ -1,13 +1,17 @@ { stdenv, nix, perlPackages, buildEnv, releaseTools, fetchFromGitHub , makeWrapper, autoconf, automake, libtool, unzip, pkgconfig, sqlite, libpqxx , gitAndTools, mercurial, darcs, subversion, bazaar, openssl, bzip2, libxslt -, guile, perl, postgresql, nukeReferences, git, boehmgc +, guile, perl, postgresql, nukeReferences, git, boehmgc, nlohmann_json , docbook_xsl, openssh, gnused, coreutils, findutils, gzip, lzma, gnutar , rpm, dpkg, cdrkit, pixz, lib, fetchpatch, boost, autoreconfHook }: with stdenv; +if lib.versions.major nix.version == "1" + then throw "This Hydra version doesn't support Nix 1.x" +else + let isGreaterNix20 = with lib.versions; let @@ -34,8 +38,8 @@ let CatalystViewDownload CatalystViewJSON CatalystViewTT - CatalystXRoleApplicator CatalystXScriptServerStarman + CatalystXRoleApplicator CryptRandPasswd DBDPg DBDSQLite @@ -71,15 +75,15 @@ let }; in releaseTools.nixBuild rec { name = "hydra-${version}"; - version = "2018-08-07"; + version = "2019-02-01"; inherit stdenv; src = fetchFromGitHub { owner = "NixOS"; repo = "hydra"; - rev = "4dca8fe14d3f782bdf927f37efce722acefffff3"; - sha256 = "1yas4psmvfp7lhcp81ia2sy93b78j9hiw9a6n3q2m1a616hwpm25"; + rev = "8b5948f4cf12424c04df67a6eb136c9846fb2cfd"; + sha256 = "0ldk3li394vykl9c4v9bs8pir05pmad24s0rx9bzqgz569zfj2iv"; }; buildInputs = @@ -88,6 +92,7 @@ in releaseTools.nixBuild rec { guile # optional, for Guile + Guix support perlDeps perl nix postgresql # for running the tests + nlohmann_json ] ++ lib.optionals isGreaterNix20 [ boost ]; hydraPath = lib.makeBinPath ( diff --git a/pkgs/development/tools/ocaml/ocp-index/default.nix b/pkgs/development/tools/ocaml/ocp-index/default.nix index 23aeceb41a75..6bc397cffcbe 100644 --- a/pkgs/development/tools/ocaml/ocp-index/default.nix +++ b/pkgs/development/tools/ocaml/ocp-index/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { - version = "1.1.7"; + version = "1.1.8"; name = "ocaml${ocaml.version}-ocp-index-${version}"; src = fetchFromGitHub { owner = "OCamlPro"; repo = "ocp-index"; rev = version; - sha256 = "0i50y033y78wcfgz3b81d34p98azahl94w4b63ac0zyczlwlhvkf"; + sha256 = "0hfiwqi60xnwsmj7fmv1sk2gzr6wxdzbgd5zli2xnfrjvb4ydv12"; }; buildInputs = [ ocaml findlib dune ocp-build cmdliner re ]; diff --git a/pkgs/games/scid-vs-pc/default.nix b/pkgs/games/scid-vs-pc/default.nix index db32cb70d413..94e102e57520 100644 --- a/pkgs/games/scid-vs-pc/default.nix +++ b/pkgs/games/scid-vs-pc/default.nix @@ -1,15 +1,16 @@ -{ stdenv, fetchurl, tcl, tk, libX11, zlib, makeWrapper }: +{ stdenv, fetchurl, tcl, tk, libX11, zlib, makeWrapper, makeDesktopItem }: stdenv.mkDerivation rec { name = "scid-vs-pc-${version}"; - version = "4.18.1"; + version = "4.19"; src = fetchurl { - url = "mirror://sourceforge/scidvspc/scid_vs_pc-4.18.1.tgz"; - sha256 = "01nd88g3wh3avz1yk9fka9zf20ij8dlnpwzz8gnx78i5b06cp459"; + url = "mirror://sourceforge/scidvspc/scid_vs_pc-${version}.tgz"; + sha256 = "1k2cgs6bjyrmxy5x6x1chmrxfmm224p3r9r9mpc37kridk4hshqs"; }; - buildInputs = [ tcl tk libX11 zlib makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ tcl tk libX11 zlib ]; prePatch = '' sed -i -e '/^ *set headerPath *{/a ${tcl}/include ${tk}/include' \ @@ -42,23 +43,33 @@ stdenv.mkDerivation rec { dontPatchShebangs = true; postFixup = '' - for cmd in sc_addmove sc_eco sc_epgn scidpgn \ - sc_import sc_spell sc_tree spliteco - do - sed -i -e '1c#!'"$out"'/bin/tcscid' "$out/bin/$cmd" - done - + sed -i -e '1c#!'"$out"'/bin/tcscid' "$out/bin/scidpgn" sed -i -e '1c#!${tk}/bin/wish' "$out/bin/sc_remote" sed -i -e '1c#!'"$out"'/bin/tkscid' "$out/bin/scid" - for cmd in $out/bin/* - do + for cmd in $out/bin/* ; do wrapProgram "$cmd" \ --set TCLLIBPATH "${tcl}/${tcl.libdir}" \ --set TK_LIBRARY "${tk}/lib/${tk.libPrefix}" done ''; + postInstall = '' + mkdir -p $out/share/applications + cp $desktopItem/share/applications/* $out/share/applications/ + + install -D icons/scid.png "$out"/share/icons/hicolor/128x128/apps/scid.png + ''; + + desktopItem = makeDesktopItem { + name = "scid-vs-pc"; + desktopName = "Scid vs. PC"; + genericName = "Chess Database"; + comment = meta.description; + icon = "scid"; + exec = "scid"; + categories = "Game;BoardGame;"; + }; meta = with stdenv.lib; { description = "Chess database with play and training functionality"; diff --git a/pkgs/games/steam/runtime-generated.nix b/pkgs/games/steam/runtime-generated.nix index f5b79db19158..d5532c051d42 100644 --- a/pkgs/games/steam/runtime-generated.nix +++ b/pkgs/games/steam/runtime-generated.nix @@ -4,9 +4,9 @@ { amd64 = [ rec { - name = "dconf-gsettings-backend_0.12.0-0ubuntu1.1+srt5_amd64"; - sha256 = "074vbkdxaylb36ljkxz586jfcn7ghxzfivyiz703li1dw54jaq87"; - url = "mirror://steamrt/pool/main/d/d-conf/dconf-gsettings-backend_0.12.0-0ubuntu1.1+srt5_amd64.deb"; + name = "dconf-gsettings-backend_0.12.0-0ubuntu1.1+steamrt1.1+srt1_amd64"; + sha256 = "0qbr4jfqyda0fi3giwizfv3ainsvld9fl4vd7sylpi490yw7yymh"; + url = "mirror://steamrt/pool/main/d/d-conf/dconf-gsettings-backend_0.12.0-0ubuntu1.1+steamrt1.1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "dconf-gsettings-backend.deb"; @@ -22,18 +22,18 @@ }; } rec { - name = "gcc-4.6-base_4.6.3-1ubuntu5+steamrt1.1+srt1_amd64"; - sha256 = "1iknyb54mn8l1gcm9pg47hlra7y5x9awrgd431hzvig44c34vv9m"; - url = "mirror://steamrt/pool/main/g/gcc-4.6/gcc-4.6-base_4.6.3-1ubuntu5+steamrt1.1+srt1_amd64.deb"; + name = "gcc-4.6-base_4.6.3-1ubuntu5+steamrt1.2+srt1_amd64"; + sha256 = "16dlf5zdy9njyaj9c9gdqcq73hd49lfm3ivwizs6i4jgfi44a2q0"; + url = "mirror://steamrt/pool/main/g/gcc-4.6/gcc-4.6-base_4.6.3-1ubuntu5+steamrt1.2+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "gcc-4.6-base.deb"; }; } rec { - name = "gcc-5-base_5.4.0-7.really.6+steamrt1.1+srt1_amd64"; - sha256 = "0lgab6qkkx7xzrl349c3xqcajgby6v6l6xq0cn5bzbs2dhn3ggpb"; - url = "mirror://steamrt/pool/main/g/gcc-5/gcc-5-base_5.4.0-7.really.6+steamrt1.1+srt1_amd64.deb"; + name = "gcc-5-base_5.4.0-7.really.6+steamrt1.1+srt2_amd64"; + sha256 = "1vpdmgq0vbh7x4r6n1b5cxlz6yl2lfy5bwp89xph640kip1j1xax"; + url = "mirror://steamrt/pool/main/g/gcc-5/gcc-5-base_5.4.0-7.really.6+steamrt1.1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "gcc-5-base.deb"; @@ -67,9 +67,9 @@ }; } rec { - name = "libacl1_2.2.51-5ubuntu1+steamrt1.1+srt1_amd64"; - sha256 = "0pzm4hpi2rynds21764qhpz8mjbd504as6350qgz5i8rbd3h9gbw"; - url = "mirror://steamrt/pool/main/a/acl/libacl1_2.2.51-5ubuntu1+steamrt1.1+srt1_amd64.deb"; + name = "libacl1_2.2.51-5ubuntu1+steamrt1.1+srt2_amd64"; + sha256 = "0anp6yvp59ian96pkzp899sjxl7l86gp0q5lfmwdiv74asixj52j"; + url = "mirror://steamrt/pool/main/a/acl/libacl1_2.2.51-5ubuntu1+steamrt1.1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libacl1.deb"; @@ -211,27 +211,27 @@ }; } rec { - name = "libcanberra-gtk-module_0.28-3ubuntu3+steamrt1+srt5_amd64"; - sha256 = "1x36zmsb7wcmgli75sfqamw5gmsv47if56f1vljjgak3jn2vlmm2"; - url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra-gtk-module_0.28-3ubuntu3+steamrt1+srt5_amd64.deb"; + name = "libcanberra-gtk-module_0.28-3ubuntu3+steamrt1.1+srt1_amd64"; + sha256 = "10mfqks3zw2cqn2kbcc0abswnx886bnrgaf51q5r919vwrm11vi6"; + url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra-gtk-module_0.28-3ubuntu3+steamrt1.1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libcanberra-gtk-module.deb"; }; } rec { - name = "libcanberra-gtk0_0.28-3ubuntu3+steamrt1+srt5_amd64"; - sha256 = "0g68j9w3xn0vnjgznq2avmzk8rykas0a6749ldq99yq9afccjfcp"; - url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra-gtk0_0.28-3ubuntu3+steamrt1+srt5_amd64.deb"; + name = "libcanberra-gtk0_0.28-3ubuntu3+steamrt1.1+srt1_amd64"; + sha256 = "1im7a6z47dwlwcvcafg3bmh055fjzrar6zl207hj9h8hkw3gdnxq"; + url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra-gtk0_0.28-3ubuntu3+steamrt1.1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libcanberra-gtk0.deb"; }; } rec { - name = "libcanberra0_0.28-3ubuntu3+steamrt1+srt5_amd64"; - sha256 = "0qzyjrr5nmc72pfbalh9s22s51c5c10f0h23viyjrk77kk0ysc3f"; - url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra0_0.28-3ubuntu3+steamrt1+srt5_amd64.deb"; + name = "libcanberra0_0.28-3ubuntu3+steamrt1.1+srt1_amd64"; + sha256 = "1blld717yb6npjswczs06khm3b6vp4r0yzlwfxjp76gvmazgc3iq"; + url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra0_0.28-3ubuntu3+steamrt1.1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libcanberra0.deb"; @@ -265,27 +265,27 @@ }; } rec { - name = "libcups2_1.5.3-0ubuntu8.7+steamrt1.1+srt1_amd64"; - sha256 = "162s3pdgxhjfpg3jdxp4dp4qmn81da21g9hn5fb7karzkgw59mns"; - url = "mirror://steamrt/pool/main/c/cups/libcups2_1.5.3-0ubuntu8.7+steamrt1.1+srt1_amd64.deb"; + name = "libcups2_1.5.3-0ubuntu8.7+steamrt1.2+srt2_amd64"; + sha256 = "012fv3d528iz1xdrqlk1xckaslda6kq1sm64kwb5zzm9bzzgnl29"; + url = "mirror://steamrt/pool/main/c/cups/libcups2_1.5.3-0ubuntu8.7+steamrt1.2+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libcups2.deb"; }; } rec { - name = "libcurl3_7.22.0-3ubuntu4.17+srt1_amd64"; - sha256 = "1nzbxzrkqnnzhml2fyjzpaifsm3whq78bxjqnhs9ljs3jwhl59p5"; - url = "mirror://steamrt/pool/main/c/curl/libcurl3_7.22.0-3ubuntu4.17+srt1_amd64.deb"; + name = "libcurl3_7.22.0-3ubuntu4.17+steamrt1.1+srt4_amd64"; + sha256 = "1zjy6vqay9ssaxvq11gnf9kr8y94idbx7abcrr4nbx7xkdijz0zi"; + url = "mirror://steamrt/pool/main/c/curl/libcurl3_7.22.0-3ubuntu4.17+steamrt1.1+srt4_amd64.deb"; source = fetchurl { inherit url sha256; name = "libcurl3.deb"; }; } rec { - name = "libcurl3-gnutls_7.22.0-3ubuntu4.17+srt1_amd64"; - sha256 = "0mgxy0vninsv7yi3wiqjkdz8ap52y4zlkzxwyijcvbwkxp33rq68"; - url = "mirror://steamrt/pool/main/c/curl/libcurl3-gnutls_7.22.0-3ubuntu4.17+srt1_amd64.deb"; + name = "libcurl3-gnutls_7.22.0-3ubuntu4.17+steamrt1.1+srt4_amd64"; + sha256 = "1599nmpk68cn9awqfq0picwclap7fwfsm8gagz95y5a5nsmldii8"; + url = "mirror://steamrt/pool/main/c/curl/libcurl3-gnutls_7.22.0-3ubuntu4.17+steamrt1.1+srt4_amd64.deb"; source = fetchurl { inherit url sha256; name = "libcurl3-gnutls.deb"; @@ -373,9 +373,9 @@ }; } rec { - name = "libfontconfig1_2.8.0-3ubuntu9.2+srt2_amd64"; - sha256 = "047sq7342mqvc84qx8dayf282yh84zdj4azqp1c0h4hczc73jwv9"; - url = "mirror://steamrt/pool/main/f/fontconfig/libfontconfig1_2.8.0-3ubuntu9.2+srt2_amd64.deb"; + name = "libfontconfig1_2.8.0-3ubuntu9.2+steamrt1.1+srt1_amd64"; + sha256 = "1q3sk9ad8y1x6nbd86i417zp0j624m7b7yj6xp4gm96g8l443asj"; + url = "mirror://steamrt/pool/main/f/fontconfig/libfontconfig1_2.8.0-3ubuntu9.2+steamrt1.1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libfontconfig1.deb"; @@ -391,18 +391,18 @@ }; } rec { - name = "libgcc1_5.4.0-7.really.6+steamrt1.1+srt1_amd64"; - sha256 = "1300z3mjxxcl718mjdfppv53s42ba88gm0izbfn6wqvrj7wrz5wq"; - url = "mirror://steamrt/pool/main/g/gcc-5/libgcc1_5.4.0-7.really.6+steamrt1.1+srt1_amd64.deb"; + name = "libgcc1_5.4.0-7.really.6+steamrt1.1+srt2_amd64"; + sha256 = "1r6nviva9jnkwyg28lxjcr142lda88f3r2312wgdfhry69szw2ld"; + url = "mirror://steamrt/pool/main/g/gcc-5/libgcc1_5.4.0-7.really.6+steamrt1.1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libgcc1.deb"; }; } rec { - name = "libgconf-2-4_3.2.5-0ubuntu2+srt5_amd64"; - sha256 = "163jbgkz66crkkjdqc0axj4sjfmd6kfkglwlk3d52rf3bc7mvimb"; - url = "mirror://steamrt/pool/main/g/gconf/libgconf-2-4_3.2.5-0ubuntu2+srt5_amd64.deb"; + name = "libgconf-2-4_3.2.5-0ubuntu2+steamrt1.1+srt1_amd64"; + sha256 = "1psyh5bcf3k28ziw0b2sxjyy2va6xahb0696rz0r6y9m924n0dn7"; + url = "mirror://steamrt/pool/main/g/gconf/libgconf-2-4_3.2.5-0ubuntu2+steamrt1.1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libgconf-2-4.deb"; @@ -463,9 +463,9 @@ }; } rec { - name = "libgmp10_5.0.2+dfsg-2ubuntu1+srt5_amd64"; - sha256 = "0vmx8ybnbf4rilylk1kxhq6c1z5wbxh77garwf79jm0jx3xamzrh"; - url = "mirror://steamrt/pool/main/g/gmp/libgmp10_5.0.2+dfsg-2ubuntu1+srt5_amd64.deb"; + name = "libgmp10_6.1.0+dfsg-2+srt1_amd64"; + sha256 = "1q0qgpldz25pzbnmhw1vxqd0azp9qai9arydmw66f6kwflx6s7as"; + url = "mirror://steamrt/pool/main/g/gmp/libgmp10_6.1.0+dfsg-2+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libgmp10.deb"; @@ -481,9 +481,18 @@ }; } rec { - name = "libgomp1_5.4.0-7.really.6+steamrt1.1+srt1_amd64"; - sha256 = "06x5j6rvv5g8brsmgpxikjb9fs6gjpd31g2iw3b313k9c6fl7z9x"; - url = "mirror://steamrt/pool/main/g/gcc-5/libgomp1_5.4.0-7.really.6+steamrt1.1+srt1_amd64.deb"; + name = "libgnutls30_3.4.10-4ubuntu1.4+steamrt1.1+srt3_amd64"; + sha256 = "1a1m1h7x0acympf7lsdn9k30crff4gkg31n82fxsf5mwbg5rzsy4"; + url = "mirror://steamrt/pool/main/g/gnutls28/libgnutls30_3.4.10-4ubuntu1.4+steamrt1.1+srt3_amd64.deb"; + source = fetchurl { + inherit url sha256; + name = "libgnutls30.deb"; + }; + } + rec { + name = "libgomp1_5.4.0-7.really.6+steamrt1.1+srt2_amd64"; + sha256 = "1pcc8jj73bgs2ks0pkxhn3hc43yk0h97jsss6ckhmp3j5mg9szq7"; + url = "mirror://steamrt/pool/main/g/gcc-5/libgomp1_5.4.0-7.really.6+steamrt1.1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libgomp1.deb"; @@ -589,6 +598,15 @@ }; } rec { + name = "libhogweed4_3.2-1ubuntu0.16.04.1+srt1_amd64"; + sha256 = "1d9746bfwajafd28292q0fl6mwj51in9qg7mbd583y459jyb0ffd"; + url = "mirror://steamrt/pool/main/n/nettle/libhogweed4_3.2-1ubuntu0.16.04.1+srt1_amd64.deb"; + source = fetchurl { + inherit url sha256; + name = "libhogweed4.deb"; + }; + } + rec { name = "libhx509-5-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64"; sha256 = "0alagksf7h181r86iiddvb9sil9zwf7d8lhnikq2x1i1ncxnwbj9"; url = "mirror://steamrt/pool/main/h/heimdal/libhx509-5-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64.deb"; @@ -607,9 +625,9 @@ }; } rec { - name = "libidn11_1.23-2+steamrt1+srt5_amd64"; - sha256 = "19s5pm1w8idc52hcj07fd52hw4fxl8hda9rm5gdbgginrl1naibp"; - url = "mirror://steamrt/pool/main/libi/libidn/libidn11_1.23-2+steamrt1+srt5_amd64.deb"; + name = "libidn11_1.32-3ubuntu1.2+steamrt1.1+srt1_amd64"; + sha256 = "1qlpfhwvx4m72541rlk934h72hczb0gwiyiav8sd4kcwwkcacqml"; + url = "mirror://steamrt/pool/main/libi/libidn/libidn11_1.32-3ubuntu1.2+steamrt1.1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libidn11.deb"; @@ -715,9 +733,9 @@ }; } rec { - name = "libldap-2.4-2_2.4.28-1.1ubuntu4.6+steamrt1.1+srt1_amd64"; - sha256 = "1nsjgna1m6nk9j23gfgmdmy90vkb0xk06p8z9gkbkjv5h1jn36hl"; - url = "mirror://steamrt/pool/main/o/openldap/libldap-2.4-2_2.4.28-1.1ubuntu4.6+steamrt1.1+srt1_amd64.deb"; + name = "libldap-2.4-2_2.4.28-1.1ubuntu4.6+steamrt1.2+srt3_amd64"; + sha256 = "02w5h7hbapwwsya468v6wcizm9nra5c9nbbf86666mlkgb6y6z20"; + url = "mirror://steamrt/pool/main/o/openldap/libldap-2.4-2_2.4.28-1.1ubuntu4.6+steamrt1.2+srt3_amd64.deb"; source = fetchurl { inherit url sha256; name = "libldap-2.4-2.deb"; @@ -769,6 +787,15 @@ }; } rec { + name = "libnettle6_3.2-1ubuntu0.16.04.1+srt1_amd64"; + sha256 = "18f9ymqkmnnx2hxfms2ph7hajl0ghk8ywav5vaihaii47wfzkdww"; + url = "mirror://steamrt/pool/main/n/nettle/libnettle6_3.2-1ubuntu0.16.04.1+srt1_amd64.deb"; + source = fetchurl { + inherit url sha256; + name = "libnettle6.deb"; + }; + } + rec { name = "libnm-glib4_0.9.4.0-0ubuntu4.2+steamrt2+srt1_amd64"; sha256 = "0dw0mfwia3z6icj01558xgdjmi7g6g4nig4vrjbmlz05f9l2rck3"; url = "mirror://steamrt/pool/main/n/network-manager/libnm-glib4_0.9.4.0-0ubuntu4.2+steamrt2+srt1_amd64.deb"; @@ -841,9 +868,9 @@ }; } rec { - name = "libopusfile0_0.11-0+steamrt1.1+srt2_amd64"; - sha256 = "1iv8w2g440l760gdi17mcq6hvk093f6v9m0v0svjzjc7l6147bmp"; - url = "mirror://steamrt/pool/main/o/opusfile/libopusfile0_0.11-0+steamrt1.1+srt2_amd64.deb"; + name = "libopusfile0_0.11-0+steamrt1.2+srt1_amd64"; + sha256 = "1q5n474br6k0l5xhr1b7bclrmdqpcd98dq4yd92rsybjnf9xiqgq"; + url = "mirror://steamrt/pool/main/o/opusfile/libopusfile0_0.11-0+steamrt1.2+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libopusfile0.deb"; @@ -859,9 +886,9 @@ }; } rec { - name = "libp11-kit0_0.12-2ubuntu1+srt5_amd64"; - sha256 = "00x01l29gh4zl0nfsyh90ixgvln6kcs2963vmmjaql4h1cgvi27g"; - url = "mirror://steamrt/pool/main/p/p11-kit/libp11-kit0_0.12-2ubuntu1+srt5_amd64.deb"; + name = "libp11-kit0_0.23.2-5~ubuntu16.04.1~steamrt1.1+srt1_amd64"; + sha256 = "1hm1lqphdp0vk1zyyyxz78k15lqw7w6vmv64pp27cwm8zkqmvj4q"; + url = "mirror://steamrt/pool/main/p/p11-kit/libp11-kit0_0.23.2-5~ubuntu16.04.1~steamrt1.1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libp11-kit0.deb"; @@ -940,9 +967,9 @@ }; } rec { - name = "librtmp0_2.4~20110711.gitc28f1bab-1+srt5_amd64"; - sha256 = "0g07a8vxxglsh7sswqznsi7lmq5ibchhkhrmfywcdinxniwcr7ha"; - url = "mirror://steamrt/pool/main/r/rtmpdump/librtmp0_2.4~20110711.gitc28f1bab-1+srt5_amd64.deb"; + name = "librtmp0_2.4~20110711.gitc28f1bab-1+steamrt1.1+srt3_amd64"; + sha256 = "05wm9ddpy2axf0a7vsrfc7prhaqf7npbcfrsy57f66aachpj778r"; + url = "mirror://steamrt/pool/main/r/rtmpdump/librtmp0_2.4~20110711.gitc28f1bab-1+steamrt1.1+srt3_amd64.deb"; source = fetchurl { inherit url sha256; name = "librtmp0.deb"; @@ -1102,27 +1129,27 @@ }; } rec { - name = "libssl1.0.0_1.0.1-4ubuntu5.36+steamrt1+srt2_amd64"; - sha256 = "149wrr5k7hx5lbgkyi4rh2sgr15m9k8x075gilab60mj1b6cv439"; - url = "mirror://steamrt/pool/main/o/openssl/libssl1.0.0_1.0.1-4ubuntu5.36+steamrt1+srt2_amd64.deb"; + name = "libssl1.0.0_1.0.1-4ubuntu5.39+steamrt1.1+srt1_amd64"; + sha256 = "1s82s5ylmsbbx567bdjv9dh53nzzwqskfpry3a61naw8nsbxg5kb"; + url = "mirror://steamrt/pool/main/o/openssl/libssl1.0.0_1.0.1-4ubuntu5.39+steamrt1.1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libssl1.0.0.deb"; }; } rec { - name = "libstdc++6_5.4.0-7.really.6+steamrt1.1+srt1_amd64"; - sha256 = "0fnqw21m8byigf4303z7qvficral6ar3lsxrsx4ai9r8d6bmmgdn"; - url = "mirror://steamrt/pool/main/g/gcc-5/libstdc++6_5.4.0-7.really.6+steamrt1.1+srt1_amd64.deb"; + name = "libstdc++6_5.4.0-7.really.6+steamrt1.1+srt2_amd64"; + sha256 = "09gn89qdjpwhh4yzydrpjbpwgbfhc0xmy56113an0rk9hs43ym1i"; + url = "mirror://steamrt/pool/main/g/gcc-5/libstdc++6_5.4.0-7.really.6+steamrt1.1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libstdc++6.deb"; }; } rec { - name = "libstdc++6-4.6-pic_4.6.3-1ubuntu5+steamrt1.1+srt1_amd64"; - sha256 = "0km4v33pzknjq0ah7w03s8xny21qggx6pc2q1ah9dlra5dwv4nsm"; - url = "mirror://steamrt/pool/main/g/gcc-4.6/libstdc++6-4.6-pic_4.6.3-1ubuntu5+steamrt1.1+srt1_amd64.deb"; + name = "libstdc++6-4.6-pic_4.6.3-1ubuntu5+steamrt1.2+srt1_amd64"; + sha256 = "175qkx9blsjidsbg7dkp6anyhfdpv1njqs2hzhjnfnsdz0hsy5pp"; + url = "mirror://steamrt/pool/main/g/gcc-4.6/libstdc++6-4.6-pic_4.6.3-1ubuntu5+steamrt1.2+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libstdc++6-4.6-pic.deb"; @@ -1147,6 +1174,15 @@ }; } rec { + name = "libtasn1-6_4.7-3ubuntu0.16.04.3~steamrt1.1+srt1_amd64"; + sha256 = "0s6rljgvgcawws574ka2kn944w64fwjan1lri1anszg0m274n5na"; + url = "mirror://steamrt/pool/main/libt/libtasn1-6/libtasn1-6_4.7-3ubuntu0.16.04.3~steamrt1.1+srt1_amd64.deb"; + source = fetchurl { + inherit url sha256; + name = "libtasn1-6.deb"; + }; + } + rec { name = "libtbb2_4.0+r233-1+steamrt2+srt1_amd64"; sha256 = "18rc6jhkpqnqvrw29zffahmjihrdrwmh4ydnx3433j6wc29m8p4v"; url = "mirror://steamrt/pool/main/t/tbb/libtbb2_4.0+r233-1+steamrt2+srt1_amd64.deb"; @@ -1210,9 +1246,9 @@ }; } rec { - name = "libuuid1_2.20.1-1ubuntu3.1+steamrt1.1+srt1_amd64"; - sha256 = "03d2jj9l3k31wb2wrvcjpa79cp7yjsqqms58vqh9pksbnmyrddr2"; - url = "mirror://steamrt/pool/main/u/util-linux/libuuid1_2.20.1-1ubuntu3.1+steamrt1.1+srt1_amd64.deb"; + name = "libuuid1_2.20.1-1ubuntu3.1+steamrt1.2+srt1_amd64"; + sha256 = "17f8cqf20fm9yak1i3d25x4a7pznhsc6xj3949zk2pbn4jiz1q3h"; + url = "mirror://steamrt/pool/main/u/util-linux/libuuid1_2.20.1-1ubuntu3.1+steamrt1.2+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libuuid1.deb"; @@ -1779,9 +1815,9 @@ ]; i386 = [ rec { - name = "dconf-gsettings-backend_0.12.0-0ubuntu1.1+srt5_i386"; - sha256 = "1899b2x8kfallda1i0m1hph7v088q7px0rpxm8w6qwp5mwqy4rip"; - url = "mirror://steamrt/pool/main/d/d-conf/dconf-gsettings-backend_0.12.0-0ubuntu1.1+srt5_i386.deb"; + name = "dconf-gsettings-backend_0.12.0-0ubuntu1.1+steamrt1.1+srt1_i386"; + sha256 = "134fv1d73hnlfn14asgmi36pwbs3mlri290jbl0621mih1iq8b7i"; + url = "mirror://steamrt/pool/main/d/d-conf/dconf-gsettings-backend_0.12.0-0ubuntu1.1+steamrt1.1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "dconf-gsettings-backend.deb"; @@ -1797,18 +1833,18 @@ }; } rec { - name = "gcc-4.6-base_4.6.3-1ubuntu5+steamrt1.1+srt1_i386"; - sha256 = "0zsb0kn2kn64hvf33xnp94k5i9c1269qyla8p5q8vzwplcl0qrx9"; - url = "mirror://steamrt/pool/main/g/gcc-4.6/gcc-4.6-base_4.6.3-1ubuntu5+steamrt1.1+srt1_i386.deb"; + name = "gcc-4.6-base_4.6.3-1ubuntu5+steamrt1.2+srt1_i386"; + sha256 = "0lq2bm237vwjkclxjqldw4cy1mirbw6lx6ryqmjwzwq1ya5490sr"; + url = "mirror://steamrt/pool/main/g/gcc-4.6/gcc-4.6-base_4.6.3-1ubuntu5+steamrt1.2+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "gcc-4.6-base.deb"; }; } rec { - name = "gcc-5-base_5.4.0-7.really.6+steamrt1.1+srt1_i386"; - sha256 = "0zp452nqq29d57fl98n7x2vfwjxp1ngjsyfw9nnnwjlpldv41sg6"; - url = "mirror://steamrt/pool/main/g/gcc-5/gcc-5-base_5.4.0-7.really.6+steamrt1.1+srt1_i386.deb"; + name = "gcc-5-base_5.4.0-7.really.6+steamrt1.1+srt2_i386"; + sha256 = "1jlyq99j7rgw6m4rvrxcrpk5l386sps36isld18bg7hb67qm5gzy"; + url = "mirror://steamrt/pool/main/g/gcc-5/gcc-5-base_5.4.0-7.really.6+steamrt1.1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "gcc-5-base.deb"; @@ -1842,9 +1878,9 @@ }; } rec { - name = "libacl1_2.2.51-5ubuntu1+steamrt1.1+srt1_i386"; - sha256 = "1m39sq2zv88922z3h8q8ccwk9fspslzs2rk6g67j4vc30lln6x45"; - url = "mirror://steamrt/pool/main/a/acl/libacl1_2.2.51-5ubuntu1+steamrt1.1+srt1_i386.deb"; + name = "libacl1_2.2.51-5ubuntu1+steamrt1.1+srt2_i386"; + sha256 = "01cmbrlgzx7djy0xgf4950936s596rp8cn51qadbfz0sad5w7sd9"; + url = "mirror://steamrt/pool/main/a/acl/libacl1_2.2.51-5ubuntu1+steamrt1.1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libacl1.deb"; @@ -1986,27 +2022,27 @@ }; } rec { - name = "libcanberra-gtk-module_0.28-3ubuntu3+steamrt1+srt5_i386"; - sha256 = "10bw3fha2nc8lb3md5l8yj8c40rx7gm7vg9lk76359p06z3ypvvf"; - url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra-gtk-module_0.28-3ubuntu3+steamrt1+srt5_i386.deb"; + name = "libcanberra-gtk-module_0.28-3ubuntu3+steamrt1.1+srt1_i386"; + sha256 = "1lg98x7cr66nq48k3klah9apskvk2cqdpj3g52z5yffkrrd1sqci"; + url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra-gtk-module_0.28-3ubuntu3+steamrt1.1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libcanberra-gtk-module.deb"; }; } rec { - name = "libcanberra-gtk0_0.28-3ubuntu3+steamrt1+srt5_i386"; - sha256 = "1yg1hllxp2m5rv6hlgh714yhcb9l5ggg4lfwv33yaw4fnzz387km"; - url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra-gtk0_0.28-3ubuntu3+steamrt1+srt5_i386.deb"; + name = "libcanberra-gtk0_0.28-3ubuntu3+steamrt1.1+srt1_i386"; + sha256 = "0jnqzfshd1f16f3gcq3fw955i6w9pfizli0l0zxl6fl58ad6g9as"; + url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra-gtk0_0.28-3ubuntu3+steamrt1.1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libcanberra-gtk0.deb"; }; } rec { - name = "libcanberra0_0.28-3ubuntu3+steamrt1+srt5_i386"; - sha256 = "03b6rk9gkxx4d75cjr27w229nsc1jjp2fy8ln5gxp2bbhywgxl4a"; - url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra0_0.28-3ubuntu3+steamrt1+srt5_i386.deb"; + name = "libcanberra0_0.28-3ubuntu3+steamrt1.1+srt1_i386"; + sha256 = "0kfw2ghb47ysww9wrp9gjq449j82a22f5w5xn1vk17bq0kk2vg8c"; + url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra0_0.28-3ubuntu3+steamrt1.1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libcanberra0.deb"; @@ -2040,27 +2076,27 @@ }; } rec { - name = "libcups2_1.5.3-0ubuntu8.7+steamrt1.1+srt1_i386"; - sha256 = "0swb4ykw5yh35vdj0s64jhpii7srlkkiawr110zn7y4p8ymcf82w"; - url = "mirror://steamrt/pool/main/c/cups/libcups2_1.5.3-0ubuntu8.7+steamrt1.1+srt1_i386.deb"; + name = "libcups2_1.5.3-0ubuntu8.7+steamrt1.2+srt2_i386"; + sha256 = "02p2svhf5zr2q5pga2qbnk5v6v6isjymli8arfarqcawgw8x8abg"; + url = "mirror://steamrt/pool/main/c/cups/libcups2_1.5.3-0ubuntu8.7+steamrt1.2+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libcups2.deb"; }; } rec { - name = "libcurl3_7.22.0-3ubuntu4.17+srt1_i386"; - sha256 = "14yb0a5cglgqvwa75kb6lbhfpmpj4xjgxz6dm27q27pcxv9xx5km"; - url = "mirror://steamrt/pool/main/c/curl/libcurl3_7.22.0-3ubuntu4.17+srt1_i386.deb"; + name = "libcurl3_7.22.0-3ubuntu4.17+steamrt1.1+srt4_i386"; + sha256 = "18kysm6nj8jfankkarphpzk03cab126pnili4p3kfglw2z7dxci0"; + url = "mirror://steamrt/pool/main/c/curl/libcurl3_7.22.0-3ubuntu4.17+steamrt1.1+srt4_i386.deb"; source = fetchurl { inherit url sha256; name = "libcurl3.deb"; }; } rec { - name = "libcurl3-gnutls_7.22.0-3ubuntu4.17+srt1_i386"; - sha256 = "027dgd9ik9zxy2ixi1272mskbax10cg0k7flljhcx5zmnwvrhxhx"; - url = "mirror://steamrt/pool/main/c/curl/libcurl3-gnutls_7.22.0-3ubuntu4.17+srt1_i386.deb"; + name = "libcurl3-gnutls_7.22.0-3ubuntu4.17+steamrt1.1+srt4_i386"; + sha256 = "166mcqrwh86qx2dpsi5qx9nczzwyyih51d0ssrbnxzabshkyzmsx"; + url = "mirror://steamrt/pool/main/c/curl/libcurl3-gnutls_7.22.0-3ubuntu4.17+steamrt1.1+srt4_i386.deb"; source = fetchurl { inherit url sha256; name = "libcurl3-gnutls.deb"; @@ -2148,9 +2184,9 @@ }; } rec { - name = "libfontconfig1_2.8.0-3ubuntu9.2+srt2_i386"; - sha256 = "1ls25q28jk9znmi0fhm30cqilx9bmm463zfq1jmj5apw96wk64n4"; - url = "mirror://steamrt/pool/main/f/fontconfig/libfontconfig1_2.8.0-3ubuntu9.2+srt2_i386.deb"; + name = "libfontconfig1_2.8.0-3ubuntu9.2+steamrt1.1+srt1_i386"; + sha256 = "19mqzn0p0x282wvh4njykiar10rc5zd43cl7pji9hkrq4xlv0s3j"; + url = "mirror://steamrt/pool/main/f/fontconfig/libfontconfig1_2.8.0-3ubuntu9.2+steamrt1.1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libfontconfig1.deb"; @@ -2166,18 +2202,18 @@ }; } rec { - name = "libgcc1_5.4.0-7.really.6+steamrt1.1+srt1_i386"; - sha256 = "0bsm95m17f9lxrknl11jmaz9mqrbkd40p29z44497fw8miw736r2"; - url = "mirror://steamrt/pool/main/g/gcc-5/libgcc1_5.4.0-7.really.6+steamrt1.1+srt1_i386.deb"; + name = "libgcc1_5.4.0-7.really.6+steamrt1.1+srt2_i386"; + sha256 = "0x9sssiqkdpbya6v5slw6lv3ad0w7k4j25bxh0zqxgjfpf3np8m7"; + url = "mirror://steamrt/pool/main/g/gcc-5/libgcc1_5.4.0-7.really.6+steamrt1.1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libgcc1.deb"; }; } rec { - name = "libgconf-2-4_3.2.5-0ubuntu2+srt5_i386"; - sha256 = "07b1w4ww3xb5r13px85f8rv4nsc08rz8w3741zdk0vacq8scw4pb"; - url = "mirror://steamrt/pool/main/g/gconf/libgconf-2-4_3.2.5-0ubuntu2+srt5_i386.deb"; + name = "libgconf-2-4_3.2.5-0ubuntu2+steamrt1.1+srt1_i386"; + sha256 = "1rf64kxpbjp0dvd0l5ip8qlrla69zj4h4wsx5hjhbrx2qhf9h31z"; + url = "mirror://steamrt/pool/main/g/gconf/libgconf-2-4_3.2.5-0ubuntu2+steamrt1.1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libgconf-2-4.deb"; @@ -2238,9 +2274,9 @@ }; } rec { - name = "libgmp10_5.0.2+dfsg-2ubuntu1+srt5_i386"; - sha256 = "0y6qrw7n41szpi8p2fpilx20wmqk3arw0m7kr35isy0y3icpryka"; - url = "mirror://steamrt/pool/main/g/gmp/libgmp10_5.0.2+dfsg-2ubuntu1+srt5_i386.deb"; + name = "libgmp10_6.1.0+dfsg-2+srt1_i386"; + sha256 = "0x0ipagi7z9s4cf5wsp1h5vbgx1czsnv3z9rvcz289fb88b7vn2f"; + url = "mirror://steamrt/pool/main/g/gmp/libgmp10_6.1.0+dfsg-2+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libgmp10.deb"; @@ -2256,9 +2292,18 @@ }; } rec { - name = "libgomp1_5.4.0-7.really.6+steamrt1.1+srt1_i386"; - sha256 = "0p6gj53jdk3d4nmhkiiqvh8sk3pm2g99iqfmlc7br1gxvmpjjj3s"; - url = "mirror://steamrt/pool/main/g/gcc-5/libgomp1_5.4.0-7.really.6+steamrt1.1+srt1_i386.deb"; + name = "libgnutls30_3.4.10-4ubuntu1.4+steamrt1.1+srt3_i386"; + sha256 = "12xzkh2fzlnqdpyf18a13dc92pk9fmakcsm89zs1lfq68ad7zlb6"; + url = "mirror://steamrt/pool/main/g/gnutls28/libgnutls30_3.4.10-4ubuntu1.4+steamrt1.1+srt3_i386.deb"; + source = fetchurl { + inherit url sha256; + name = "libgnutls30.deb"; + }; + } + rec { + name = "libgomp1_5.4.0-7.really.6+steamrt1.1+srt2_i386"; + sha256 = "0z73ay26wi49hg74lwn13gyraqvdim7q79rpckvk7p7cimb65ina"; + url = "mirror://steamrt/pool/main/g/gcc-5/libgomp1_5.4.0-7.really.6+steamrt1.1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libgomp1.deb"; @@ -2364,6 +2409,15 @@ }; } rec { + name = "libhogweed4_3.2-1ubuntu0.16.04.1+srt1_i386"; + sha256 = "1d3p11al48d1ig6kn74wkx298kizvw9i0s25rs1433k9cx5aissp"; + url = "mirror://steamrt/pool/main/n/nettle/libhogweed4_3.2-1ubuntu0.16.04.1+srt1_i386.deb"; + source = fetchurl { + inherit url sha256; + name = "libhogweed4.deb"; + }; + } + rec { name = "libhx509-5-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386"; sha256 = "0y6awbyl4w56qa8vkn9dzsnb3162x4p5nr1cf7ir119nl05987cp"; url = "mirror://steamrt/pool/main/h/heimdal/libhx509-5-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386.deb"; @@ -2382,9 +2436,9 @@ }; } rec { - name = "libidn11_1.23-2+steamrt1+srt5_i386"; - sha256 = "1wv5rfk5a9y6w5wylvbxj8kbmav61y5w3j413kvf373xnhp79gaf"; - url = "mirror://steamrt/pool/main/libi/libidn/libidn11_1.23-2+steamrt1+srt5_i386.deb"; + name = "libidn11_1.32-3ubuntu1.2+steamrt1.1+srt1_i386"; + sha256 = "0zx078d5ycbmy56lcl3j71r9ygfj1b18msrik36ya5qkqm9335rj"; + url = "mirror://steamrt/pool/main/libi/libidn/libidn11_1.32-3ubuntu1.2+steamrt1.1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libidn11.deb"; @@ -2490,9 +2544,9 @@ }; } rec { - name = "libldap-2.4-2_2.4.28-1.1ubuntu4.6+steamrt1.1+srt1_i386"; - sha256 = "194vaq6g03m32cfar7s7kzk5qxqlfzy0l49hgwg8igx40r7nscqw"; - url = "mirror://steamrt/pool/main/o/openldap/libldap-2.4-2_2.4.28-1.1ubuntu4.6+steamrt1.1+srt1_i386.deb"; + name = "libldap-2.4-2_2.4.28-1.1ubuntu4.6+steamrt1.2+srt3_i386"; + sha256 = "072vkbk177xxr0g50vban143m1r67ana3abkv4ha0wk4z8wvvw13"; + url = "mirror://steamrt/pool/main/o/openldap/libldap-2.4-2_2.4.28-1.1ubuntu4.6+steamrt1.2+srt3_i386.deb"; source = fetchurl { inherit url sha256; name = "libldap-2.4-2.deb"; @@ -2544,6 +2598,15 @@ }; } rec { + name = "libnettle6_3.2-1ubuntu0.16.04.1+srt1_i386"; + sha256 = "0rpw9fg2xfccdvbq0ji66a52rb401r05cs16z9py9r6b0brrxvsf"; + url = "mirror://steamrt/pool/main/n/nettle/libnettle6_3.2-1ubuntu0.16.04.1+srt1_i386.deb"; + source = fetchurl { + inherit url sha256; + name = "libnettle6.deb"; + }; + } + rec { name = "libnm-glib4_0.9.4.0-0ubuntu4.2+steamrt2+srt1_i386"; sha256 = "0vsd00x0wvqw84zqlqrbmdxfmzshrvwbr2az3ynkaz8azkxj1d6d"; url = "mirror://steamrt/pool/main/n/network-manager/libnm-glib4_0.9.4.0-0ubuntu4.2+steamrt2+srt1_i386.deb"; @@ -2616,9 +2679,9 @@ }; } rec { - name = "libopusfile0_0.11-0+steamrt1.1+srt2_i386"; - sha256 = "0dbhzwgjr33xbqaq9015v9h7l6lga002vzrfcyna19ff92d2xg8m"; - url = "mirror://steamrt/pool/main/o/opusfile/libopusfile0_0.11-0+steamrt1.1+srt2_i386.deb"; + name = "libopusfile0_0.11-0+steamrt1.2+srt1_i386"; + sha256 = "19hsl0h0pgx6qc4sizpgj4mcipq2wk6w316mahv05iskkshwb2il"; + url = "mirror://steamrt/pool/main/o/opusfile/libopusfile0_0.11-0+steamrt1.2+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libopusfile0.deb"; @@ -2634,9 +2697,9 @@ }; } rec { - name = "libp11-kit0_0.12-2ubuntu1+srt5_i386"; - sha256 = "1nfcccnsn7x44wqwgkz0h9b3hzy3a0cknc51syniabsqds5w2i8p"; - url = "mirror://steamrt/pool/main/p/p11-kit/libp11-kit0_0.12-2ubuntu1+srt5_i386.deb"; + name = "libp11-kit0_0.23.2-5~ubuntu16.04.1~steamrt1.1+srt1_i386"; + sha256 = "0bvp8xslxfag2kpfyhhgsldb7687q11bj365z2m5xmwlk5ihf0bk"; + url = "mirror://steamrt/pool/main/p/p11-kit/libp11-kit0_0.23.2-5~ubuntu16.04.1~steamrt1.1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libp11-kit0.deb"; @@ -2715,9 +2778,9 @@ }; } rec { - name = "librtmp0_2.4~20110711.gitc28f1bab-1+srt5_i386"; - sha256 = "04wg1b9i77hv87ra7xbhqzcx6m9xdpx72b6d7pxnkrxxxc8sp35d"; - url = "mirror://steamrt/pool/main/r/rtmpdump/librtmp0_2.4~20110711.gitc28f1bab-1+srt5_i386.deb"; + name = "librtmp0_2.4~20110711.gitc28f1bab-1+steamrt1.1+srt3_i386"; + sha256 = "0c9y8m7ynnchs7mj9nmp7y681mkphqy4p7vca7i5vw2cacd7bbv7"; + url = "mirror://steamrt/pool/main/r/rtmpdump/librtmp0_2.4~20110711.gitc28f1bab-1+steamrt1.1+srt3_i386.deb"; source = fetchurl { inherit url sha256; name = "librtmp0.deb"; @@ -2877,27 +2940,27 @@ }; } rec { - name = "libssl1.0.0_1.0.1-4ubuntu5.36+steamrt1+srt2_i386"; - sha256 = "06gc6qpm51jx0x1imf5nccc3r9x2d41xvfi0wl3p9wvrx6nsna7d"; - url = "mirror://steamrt/pool/main/o/openssl/libssl1.0.0_1.0.1-4ubuntu5.36+steamrt1+srt2_i386.deb"; + name = "libssl1.0.0_1.0.1-4ubuntu5.39+steamrt1.1+srt1_i386"; + sha256 = "1kwi96xyjf2gz021zg2hkd6ks9l2087r9ghh8iqgwqivbvcizvr7"; + url = "mirror://steamrt/pool/main/o/openssl/libssl1.0.0_1.0.1-4ubuntu5.39+steamrt1.1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libssl1.0.0.deb"; }; } rec { - name = "libstdc++6_5.4.0-7.really.6+steamrt1.1+srt1_i386"; - sha256 = "13kvxng82xz171y3q0i12bvy8z77cqk6s088bjil4b5fq81aaxns"; - url = "mirror://steamrt/pool/main/g/gcc-5/libstdc++6_5.4.0-7.really.6+steamrt1.1+srt1_i386.deb"; + name = "libstdc++6_5.4.0-7.really.6+steamrt1.1+srt2_i386"; + sha256 = "0l60yc1i7p20gaih1mzjk8c62zq9ba4zvmfmrk5w8xr05dpyq9a6"; + url = "mirror://steamrt/pool/main/g/gcc-5/libstdc++6_5.4.0-7.really.6+steamrt1.1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libstdc++6.deb"; }; } rec { - name = "libstdc++6-4.6-pic_4.6.3-1ubuntu5+steamrt1.1+srt1_i386"; - sha256 = "1xh0hvgw6rrg6k1fbpblxvfdaslwkjlqbgaqjkavkkvl0xmk5k4b"; - url = "mirror://steamrt/pool/main/g/gcc-4.6/libstdc++6-4.6-pic_4.6.3-1ubuntu5+steamrt1.1+srt1_i386.deb"; + name = "libstdc++6-4.6-pic_4.6.3-1ubuntu5+steamrt1.2+srt1_i386"; + sha256 = "1a5hyz5185fhh64hw8kf6mav7jz07l9c9v3m9wwd92xj39sp0vzw"; + url = "mirror://steamrt/pool/main/g/gcc-4.6/libstdc++6-4.6-pic_4.6.3-1ubuntu5+steamrt1.2+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libstdc++6-4.6-pic.deb"; @@ -2922,6 +2985,15 @@ }; } rec { + name = "libtasn1-6_4.7-3ubuntu0.16.04.3~steamrt1.1+srt1_i386"; + sha256 = "11bdwhyzzy5xa4p0rrirh7wqg3q1iwbw460nh4ya5aafysiw71il"; + url = "mirror://steamrt/pool/main/libt/libtasn1-6/libtasn1-6_4.7-3ubuntu0.16.04.3~steamrt1.1+srt1_i386.deb"; + source = fetchurl { + inherit url sha256; + name = "libtasn1-6.deb"; + }; + } + rec { name = "libtbb2_4.0+r233-1+steamrt2+srt1_i386"; sha256 = "0ap5ar8v4ljv138p6kga1vzy96v5ilicxsk8lhp1scvcrcaqfppz"; url = "mirror://steamrt/pool/main/t/tbb/libtbb2_4.0+r233-1+steamrt2+srt1_i386.deb"; @@ -2985,9 +3057,9 @@ }; } rec { - name = "libuuid1_2.20.1-1ubuntu3.1+steamrt1.1+srt1_i386"; - sha256 = "1hi8gq8jws689pacx8m0pzjfhrswh8jng39m7vnx2clj7xzfsk5b"; - url = "mirror://steamrt/pool/main/u/util-linux/libuuid1_2.20.1-1ubuntu3.1+steamrt1.1+srt1_i386.deb"; + name = "libuuid1_2.20.1-1ubuntu3.1+steamrt1.2+srt1_i386"; + sha256 = "1xs58z4431ybrmnks0camc4svqpnd4zd814czchi0cs4h1vfvvb8"; + url = "mirror://steamrt/pool/main/u/util-linux/libuuid1_2.20.1-1ubuntu3.1+steamrt1.2+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libuuid1.deb"; diff --git a/pkgs/games/supertux/default.nix b/pkgs/games/supertux/default.nix index cf6ba4648687..cee65bfa5638 100644 --- a/pkgs/games/supertux/default.nix +++ b/pkgs/games/supertux/default.nix @@ -1,19 +1,22 @@ { stdenv, fetchurl, cmake, pkgconfig, SDL2, SDL2_image , curl , libogg, libvorbis, libGLU_combined, openal, boost, glew +, libpng, freetype }: stdenv.mkDerivation rec { name = "supertux-${version}"; - version = "0.5.1"; + version = "0.6.0"; src = fetchurl { url = "https://github.com/SuperTux/supertux/releases/download/v${version}/SuperTux-v${version}-Source.tar.gz"; - sha256 = "1i8avad7w7ikj870z519j383ldy29r6f956bs38cbr8wk513pp69"; + sha256 = "1h1s4abirkdv4ag22zvyk6zkk64skqbjmcnnba67ps4hdzxfbhy4"; }; nativeBuildInputs = [ pkgconfig cmake ]; - buildInputs = [ SDL2 SDL2_image curl libogg libvorbis libGLU_combined openal boost glew ]; + buildInputs = [ SDL2 SDL2_image curl libogg libvorbis libGLU_combined openal boost glew + libpng freetype + ]; cmakeFlags = [ "-DENABLE_BOOST_STATIC_LIBS=OFF" ]; diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix index 9aae9c6013a9..a8668313465a 100644 --- a/pkgs/os-specific/linux/lxc/default.nix +++ b/pkgs/os-specific/linux/lxc/default.nix @@ -9,11 +9,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "lxc-${version}"; - version = "3.0.3"; + version = "3.1.0"; src = fetchurl { url = "https://linuxcontainers.org/downloads/lxc/lxc-${version}.tar.gz"; - sha256 = "0hcql4srcs2dlf2f67i8v92y2i352zv7nr9hsgs3pih2rhrbh332"; + sha256 = "1igxqgx8q9cp15mcp1y8j564bl85ijw04jcmgb1s5bmfbg1751sd"; }; nativeBuildInputs = [ diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/servers/http/unit/default.nix index a3948bb69088..f250dd5e9bb4 100644 --- a/pkgs/servers/http/unit/default.nix +++ b/pkgs/servers/http/unit/default.nix @@ -16,14 +16,14 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "1.7"; + version = "1.7.1"; name = "unit-${version}"; src = fetchFromGitHub { owner = "nginx"; repo = "unit"; rev = "${version}"; - sha256 = "1klwricr0mxhw5wka35vnl919821vcvaf5w3ixvkbxaisml19qq4"; + sha256 = "1nz5xcwbwpr0jdbx9j052byarnc2qn987pdainy85in1aj0b57kf"; }; nativeBuildInputs = [ which ]; diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index ee52b838aea9..e2ee3e55afb7 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -23,29 +23,24 @@ let in buildPythonApplication rec { pname = "matrix-synapse"; - version = "0.34.1.1"; + version = "0.99.0"; src = fetchPypi { inherit pname version; - sha256 = "13jmbcabll3gk0b6yqwfwpc7aymqhpv6iririzskhm4pgbjcp3yk"; + sha256 = "1xsp60172zvgyjgpjmzz90rj1din8d65ffg73nzid4nd875p45kh"; }; - patches = [ - ./matrix-synapse.patch - ]; - propagatedBuildInputs = [ bcrypt bleach canonicaljson daemonize - dateutil frozendict jinja2 jsonschema lxml matrix-synapse-ldap3 - msgpack-python + msgpack netaddr phonenumbers pillow @@ -59,8 +54,7 @@ in buildPythonApplication rec { psutil psycopg2 pyasn1 - pydenticon - pymacaroons-pynacl + pymacaroons pynacl pyopenssl pysaml2 diff --git a/pkgs/servers/matrix-synapse/matrix-synapse.patch b/pkgs/servers/matrix-synapse/matrix-synapse.patch deleted file mode 100644 index 288e6ff16245..000000000000 --- a/pkgs/servers/matrix-synapse/matrix-synapse.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/homeserver b/homeserver -new file mode 120000 -index 0000000..2f1d413 ---- /dev/null -+++ b/homeserver -@@ -0,0 +1,1 @@ -+synapse/app/homeserver.py -\ No newline at end of file -diff --git a/setup.py b/setup.py -index b00c2af..c7f6e0a 100755 ---- a/setup.py -+++ b/setup.py -@@ -92,6 +92,6 @@ setup( - include_package_data=True, - zip_safe=False, - long_description=long_description, -- scripts=["synctl"] + glob.glob("scripts/*"), -+ scripts=["synctl", "homeserver"] + glob.glob("scripts/*"), - cmdclass={'test': TestCommand}, - ) diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index e48b525caba6..e037541557c7 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -7,13 +7,13 @@ }: buildGoPackage rec { - name = "lxd-3.0.2"; + name = "lxd-3.10"; goPackagePath = "github.com/lxc/lxd"; src = fetchurl { url = "https://github.com/lxc/lxd/releases/download/${name}/${name}.tar.gz"; - sha256 = "1ha8ijzblf15p0kcpgwshswz6s2rdd2b4qnzjw3l72ww620hr84j"; + sha256 = "0vd0p3xf54s7f9vcjfiin29py6hxyyxnisvp6am67l5nwhg7rnnc"; }; preBuild = '' @@ -28,8 +28,8 @@ buildGoPackage rec { buildFlags = [ "-tags libsqlite3" ]; postInstall = '' - # binaries from test/ - rm $bin/bin/{deps,macaroon-identity} + # test binaries, code generation + rm $bin/bin/{deps,macaroon-identity,generate} wrapProgram $bin/bin/lxd --prefix PATH : ${stdenv.lib.makeBinPath [ acl rsync gnutar xz btrfs-progs gzip dnsmasq squashfsTools iproute iptables ebtables bash diff --git a/pkgs/tools/misc/flameshot/default.nix b/pkgs/tools/misc/flameshot/default.nix index 3be418af823c..16a46ac1432b 100644 --- a/pkgs/tools/misc/flameshot/default.nix +++ b/pkgs/tools/misc/flameshot/default.nix @@ -1,25 +1,14 @@ { stdenv, fetchFromGitHub, qtbase, qmake, qttools, qtsvg }: +# To use `flameshot gui`, you will also need to put flameshot in `services.dbus.packages` +# in configuration.nix so that the daemon gets launched properly: +# +# services.dbus.packages = [ pkgs.flameshot ]; +# environment.systemPackages = [ pkgs.flameshot ]; stdenv.mkDerivation rec { name = "flameshot-${version}"; version = "0.6.0"; - nativeBuildInputs = [ qmake qttools qtsvg ]; - buildInputs = [ qtbase ]; - - qmakeFlags = [ - # flameshot.pro assumes qmake is being run in a git checkout and uses it - # to determine the version being built. Let's replace that. - "VERSION=${version}" - "PREFIX=/" - ]; - patchPhase = '' - sed -i 's/VERSION =/#VERSION =/g' flameshot.pro - sed -i 's,USRPATH = /usr/local,USRPATH = /,g' flameshot.pro - ''; - - installFlags = [ "INSTALL_ROOT=$(out)" ]; - src = fetchFromGitHub { owner = "lupoDharkael"; repo = "flameshot"; @@ -27,6 +16,22 @@ stdenv.mkDerivation rec { sha256 = "193szslh55v44jzxzx5g9kxhl8p8di7vbcnxlid4acfidhnvgazm"; }; + nativeBuildInputs = [ qmake qttools qtsvg ]; + buildInputs = [ qtbase ]; + + qmakeFlags = [ "PREFIX=${placeholder "out"}" ]; + + preConfigure = '' + # flameshot.pro assumes qmake is being run in a git checkout. + git() { echo ${version}; } + export -f git + ''; + + postFixup = '' + substituteInPlace $out/share/dbus-1/services/org.dharkael.Flameshot.service \ + --replace "/usr/local" "$out" + ''; + enableParallelBuilding = true; meta = with stdenv.lib; { diff --git a/pkgs/tools/networking/mailutils/default.nix b/pkgs/tools/networking/mailutils/default.nix index d6c670052959..f507e4dc2872 100644 --- a/pkgs/tools/networking/mailutils/default.nix +++ b/pkgs/tools/networking/mailutils/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch, autoreconfHook, dejagnu, gettext, pkgconfig , gdbm, pam, readline, ncurses, gnutls, guile, texinfo, gnum4, sasl, fribidi, nettools -, python, gss, mysql, sendmailPath ? "/run/wrappers/bin/sendmail" }: +, python, gss, mysql, system-sendmail }: stdenv.mkDerivation rec { name = "${project}-${version}"; @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { "--with-gssapi" "--with-gsasl" "--with-mysql" - "--with-path-sendmail=${sendmailPath}" + "--with-path-sendmail=${system-sendmail}/bin/sendmail" ]; readmsg-tests = let diff --git a/pkgs/tools/networking/openapi-generator-cli/default.nix b/pkgs/tools/networking/openapi-generator-cli/default.nix new file mode 100644 index 000000000000..020feb2c43b9 --- /dev/null +++ b/pkgs/tools/networking/openapi-generator-cli/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, jre, makeWrapper }: + +stdenv.mkDerivation rec { + version = "3.3.4"; + pname = "openapi-generator-cli"; + + jarfilename = "${pname}-${version}.jar"; + + nativeBuildInputs = [ + makeWrapper + ]; + + src = fetchurl { + url = "http://central.maven.org/maven2/org/openapitools/${pname}/${version}/${jarfilename}"; + sha256 = "24cb04939110cffcdd7062d2f50c6f61159dc3e0ca3b8aecbae6ade53ad3dc8c"; + }; + + phases = [ "installPhase" ]; + + installPhase = '' + install -D "$src" "$out/share/java/${jarfilename}" + + makeWrapper ${jre}/bin/java $out/bin/${pname} \ + --add-flags "-jar $out/share/java/${jarfilename}" + ''; + + meta = with stdenv.lib; { + description = "Allows generation of API client libraries (SDK generation), server stubs and documentation automatically given an OpenAPI Spec"; + homepage = https://github.com/OpenAPITools/openapi-generator; + license = licenses.asl20; + maintainers = [ maintainers.shou ]; + }; +} + diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix index ae726544453a..36b7709c56a8 100644 --- a/pkgs/tools/security/keybase/default.nix +++ b/pkgs/tools/security/keybase/default.nix @@ -5,7 +5,7 @@ buildGoPackage rec { name = "keybase-${version}"; - version = "2.13.1"; + version = "3.0.0"; goPackagePath = "github.com/keybase/client"; subPackages = [ "go/keybase" ]; @@ -14,7 +14,7 @@ buildGoPackage rec { src = fetchurl { url = "https://github.com/keybase/client/archive/v${version}.tar.gz"; - sha256 = "0avq87y7cs3jipl444ssz1zd5jygpks20hls0fkqxxaikkpdsy4v"; + sha256 = "1mxzihgd3qfahlmnfrpbg2kbixbjmkajrl964kaxmihrkx0fylvf"; }; buildInputs = lib.optionals stdenv.isDarwin [ diff --git a/pkgs/tools/security/keybase/gui.nix b/pkgs/tools/security/keybase/gui.nix index bd8166b214dc..40385940a942 100644 --- a/pkgs/tools/security/keybase/gui.nix +++ b/pkgs/tools/security/keybase/gui.nix @@ -1,18 +1,18 @@ { stdenv, fetchurl, alsaLib, atk, cairo, cups, udev, hicolor-icon-theme -, dbus, expat, fontconfig, freetype, gdk_pixbuf, glib, gnome2, gtk3, gnome3 +, dbus, expat, fontconfig, freetype, gdk_pixbuf, glib, gtk3, gnome3 , libnotify, nspr, nss, pango, systemd, xorg, autoPatchelfHook, wrapGAppsHook }: let - versionSuffix = "20190115203650.eec94506e4"; + versionSuffix = "20190205202117.6394d03e6c"; in stdenv.mkDerivation rec { name = "keybase-gui-${version}"; - version = "2.13.1"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages + version = "3.0.0"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages src = fetchurl { url = "https://s3.amazonaws.com/prerelease.keybase.io/linux_binaries/deb/keybase_${version + "-" + versionSuffix}_amd64.deb"; - sha256 = "01663jknr8s4sp51mclw9llhx07ww6yh22apawxikvpwmw9yg2qr"; + sha256 = "0nwz0v6sqx1gd7spha09pk2bjbb8lgaxbrh0r6j6p0xzgzz6birw"; }; nativeBuildInputs = [ @@ -31,7 +31,6 @@ stdenv.mkDerivation rec { freetype gdk_pixbuf glib - gnome2.GConf gnome3.gsettings-desktop-schemas gtk3 libnotify diff --git a/pkgs/tools/system/inxi/default.nix b/pkgs/tools/system/inxi/default.nix index 02379bcfe5c8..57e6c48867a7 100644 --- a/pkgs/tools/system/inxi/default.nix +++ b/pkgs/tools/system/inxi/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "inxi-${version}"; - version = "3.0.30-1"; + version = "3.0.31-1"; src = fetchFromGitHub { owner = "smxi"; repo = "inxi"; rev = version; - sha256 = "04dkws3716clscl6iq3sy6m822rqzwdg5mn03l0vhcdbqcng46s6"; + sha256 = "13dm8z7j8wg2sj7pzgxvivqhn88iy54aykhpplzqhp2s10smhs46"; }; buildInputs = [ perl ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6ef95ce86dbd..2fcd0ea74363 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4543,6 +4543,8 @@ in inherit (gnome3) defaultIconTheme; }; + openapi-generator-cli = callPackage ../tools/networking/openapi-generator-cli { }; + opencc = callPackage ../tools/text/opencc { }; opencl-info = callPackage ../tools/system/opencl-info { }; @@ -20342,6 +20344,8 @@ in inherit (gnome2) libglade; }; + xsuspender = callPackage ../applications/misc/xsuspender { }; + xss-lock = callPackage ../misc/screensavers/xss-lock { }; xloadimage = callPackage ../tools/X11/xloadimage { }; @@ -22152,6 +22156,8 @@ in inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL; }); + rink = callPackage ../applications/science/misc/rink { }; + simgrid = callPackage ../applications/science/misc/simgrid { }; spyder = callPackage ../applications/science/spyder { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 531488395946..7cc5e187764e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -298,6 +298,8 @@ in { cdecimal = callPackage ../development/python-modules/cdecimal { }; + cfn-flip = callPackage ../development/python-modules/cfn-flip { }; + chalice = callPackage ../development/python-modules/chalice { }; cleo = callPackage ../development/python-modules/cleo { }; @@ -776,6 +778,8 @@ in { slither-analyzer = callPackage ../development/python-modules/slither-analyzer { }; + sly = callPackage ../development/python-modules/sly { }; + snapcast = callPackage ../development/python-modules/snapcast { }; spglib = callPackage ../development/python-modules/spglib { }; @@ -4034,6 +4038,8 @@ in { simplegeneric = callPackage ../development/python-modules/simplegeneric { }; + shodan = callPackage ../development/python-modules/shodan { }; + should-dsl = callPackage ../development/python-modules/should-dsl { }; simplejson = callPackage ../development/python-modules/simplejson { }; @@ -4738,7 +4744,7 @@ in { pygccxml = callPackage ../development/python-modules/pygccxml {}; - pymacaroons-pynacl = callPackage ../development/python-modules/pymacaroons-pynacl { }; + pymacaroons = callPackage ../development/python-modules/pymacaroons { }; pynacl = callPackage ../development/python-modules/pynacl { }; @@ -5067,6 +5073,8 @@ in { yowsup = callPackage ../development/python-modules/yowsup { }; + yubico-client = callPackage ../development/python-modules/yubico-client { }; + wptserve = callPackage ../development/python-modules/wptserve { }; yenc = callPackage ../development/python-modules/yenc { }; |