diff options
220 files changed, 4826 insertions, 1102 deletions
diff --git a/nixpkgs/maintainers/maintainer-list.nix b/nixpkgs/maintainers/maintainer-list.nix index b005a1b9c127..dac1acfefb4c 100644 --- a/nixpkgs/maintainers/maintainer-list.nix +++ b/nixpkgs/maintainers/maintainer-list.nix @@ -241,6 +241,11 @@ email = "nix-commits@lists.science.uu.nl"; name = "Nix Committers"; }; + allonsy = { + email = "linuxbash8@gmail.com"; + github = "allonsy"; + name = "Alec Snyder"; + }; alunduil = { email = "alunduil@gmail.com"; github = "alunduil"; @@ -1305,6 +1310,11 @@ github = "edef1c"; name = "edef"; }; + embr = { + email = "hi@liclac.eu"; + github = "liclac"; + name = "embr"; + }; ederoyd46 = { email = "matt@ederoyd.co.uk"; github = "ederoyd46"; @@ -4176,6 +4186,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/nixpkgs/nixos/doc/manual/default.nix b/nixpkgs/nixos/doc/manual/default.nix index faae4f205443..02b91773f5da 100644 --- a/nixpkgs/nixos/doc/manual/default.nix +++ b/nixpkgs/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/nixpkgs/nixos/doc/manual/release-notes/rl-1903.xml b/nixpkgs/nixos/doc/manual/release-notes/rl-1903.xml index d84e57333e98..428f9bef5fbd 100644 --- a/nixpkgs/nixos/doc/manual/release-notes/rl-1903.xml +++ b/nixpkgs/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/nixpkgs/nixos/modules/module-list.nix b/nixpkgs/nixos/modules/module-list.nix index 3ee242ab2226..04bcb41cd07a 100644 --- a/nixpkgs/nixos/modules/module-list.nix +++ b/nixpkgs/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/nixpkgs/nixos/modules/programs/iotop.nix b/nixpkgs/nixos/modules/programs/iotop.nix new file mode 100644 index 000000000000..5512dbc62f72 --- /dev/null +++ b/nixpkgs/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/nixpkgs/nixos/modules/services/mail/roundcube.nix b/nixpkgs/nixos/modules/services/mail/roundcube.nix index 6d81c7374f4d..66b1c1e3e6f9 100644 --- a/nixpkgs/nixos/modules/services/mail/roundcube.nix +++ b/nixpkgs/nixos/modules/services/mail/roundcube.nix @@ -25,6 +25,20 @@ in description = "Hostname to use for the nginx vhost"; }; + package = mkOption { + type = types.package; + default = pkgs.roundcube; + + example = literalExample '' + roundcube.withPlugins (plugins: [ plugins.persistent_login ]) + ''; + + description = '' + The package which contains roundcube's sources. Can be overriden to create + an environment which contains roundcube and third-party plugins. + ''; + }; + database = { username = mkOption { type = types.str; @@ -86,7 +100,7 @@ in forceSSL = mkDefault true; enableACME = mkDefault true; locations."/" = { - root = pkgs.roundcube; + root = cfg.package; index = "index.php"; extraConfig = '' location ~* \.php$ { @@ -140,12 +154,12 @@ in ${pkgs.sudo}/bin/sudo -u ${pgSuperUser} psql postgres -c "create database ${cfg.database.dbname} with owner ${cfg.database.username}"; fi PGPASSWORD=${cfg.database.password} ${pkgs.postgresql}/bin/psql -U ${cfg.database.username} \ - -f ${pkgs.roundcube}/SQL/postgres.initial.sql \ + -f ${cfg.package}/SQL/postgres.initial.sql \ -h ${cfg.database.host} ${cfg.database.dbname} touch /var/lib/roundcube/db-created fi - ${pkgs.php}/bin/php ${pkgs.roundcube}/bin/update.sh + ${pkgs.php}/bin/php ${cfg.package}/bin/update.sh ''; serviceConfig.Type = "oneshot"; }; diff --git a/nixpkgs/nixos/modules/services/misc/docker-registry.nix b/nixpkgs/nixos/modules/services/misc/docker-registry.nix index 9a3966ab30aa..f3d90e532c88 100644 --- a/nixpkgs/nixos/modules/services/misc/docker-registry.nix +++ b/nixpkgs/nixos/modules/services/misc/docker-registry.nix @@ -18,7 +18,7 @@ let delete.enabled = cfg.enableDelete; }; http = { - addr = ":${builtins.toString cfg.port}"; + addr = "${cfg.listenAddress}:${builtins.toString cfg.port}"; headers.X-Content-Type-Options = ["nosniff"]; }; health.storagedriver = { diff --git a/nixpkgs/nixos/modules/services/misc/home-assistant.nix b/nixpkgs/nixos/modules/services/misc/home-assistant.nix index 4eabda1d4188..4ccfa22c89e7 100644 --- a/nixpkgs/nixos/modules/services/misc/home-assistant.nix +++ b/nixpkgs/nixos/modules/services/misc/home-assistant.nix @@ -53,7 +53,7 @@ let # If you are changing this, please update the description in applyDefaultConfig defaultConfig = { homeassistant.time_zone = config.time.timeZone; - http.server_port = (toString cfg.port); + http.server_port = cfg.port; } // optionalAttrs (cfg.lovelaceConfig != null) { lovelace.mode = "yaml"; }; diff --git a/nixpkgs/nixos/modules/services/misc/matrix-synapse.nix b/nixpkgs/nixos/modules/services/misc/matrix-synapse.nix index 18e13f6ac030..a01e34d73629 100644 --- a/nixpkgs/nixos/modules/services/misc/matrix-synapse.nix +++ b/nixpkgs/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/nixpkgs/nixos/modules/services/networking/unifi.nix b/nixpkgs/nixos/modules/services/networking/unifi.nix index 89b9ac4eadf5..c82e0af2803d 100644 --- a/nixpkgs/nixos/modules/services/networking/unifi.nix +++ b/nixpkgs/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/nixpkgs/nixos/modules/services/x11/xautolock.nix b/nixpkgs/nixos/modules/services/x11/xautolock.nix index a614559970e9..cbe000058dc6 100644 --- a/nixpkgs/nixos/modules/services/x11/xautolock.nix +++ b/nixpkgs/nixos/modules/services/x11/xautolock.nix @@ -21,7 +21,7 @@ in type = types.int; description = '' - Idle time to wait until xautolock locks the computer. + Idle time (in minutes) to wait until xautolock locks the computer. ''; }; diff --git a/nixpkgs/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix b/nixpkgs/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix index 047651dc6426..7db60daa60b8 100644 --- a/nixpkgs/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix +++ b/nixpkgs/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix @@ -33,7 +33,7 @@ let avoid_warnings=1 '' + optional isAarch64 '' # Boot in 64-bit mode. - arm_control=0x200 + arm_64bit=1 '' + (if cfg.uboot.enable then '' kernel=u-boot-rpi.bin '' else '' diff --git a/nixpkgs/nixos/modules/system/boot/systemd.nix b/nixpkgs/nixos/modules/system/boot/systemd.nix index f783daba902a..58812bf33d9b 100644 --- a/nixpkgs/nixos/modules/system/boot/systemd.nix +++ b/nixpkgs/nixos/modules/system/boot/systemd.nix @@ -321,7 +321,9 @@ let in concatMapStrings (n: let s = optionalString (env."${n}" != null) "Environment=${builtins.toJSON "${n}=${env.${n}}"}\n"; - in if stringLength s >= 2048 then throw "The value of the environment variable ‘${n}’ in systemd service ‘${name}.service’ is too long." else s) (attrNames env)} + # systemd max line length is now 1MiB + # https://github.com/systemd/systemd/commit/e6dde451a51dc5aaa7f4d98d39b8fe735f73d2af + in if stringLength s >= 1048576 then throw "The value of the environment variable ‘${n}’ in systemd service ‘${name}.service’ is too long." else s) (attrNames env)} ${if def.reloadIfChanged then '' X-ReloadIfChanged=true '' else if !def.restartIfChanged then '' diff --git a/nixpkgs/nixos/tests/all-tests.nix b/nixpkgs/nixos/tests/all-tests.nix index 4450cafd2800..a847abdc542c 100644 --- a/nixpkgs/nixos/tests/all-tests.nix +++ b/nixpkgs/nixos/tests/all-tests.nix @@ -164,6 +164,7 @@ in opensmtpd = handleTest ./opensmtpd.nix {}; openssh = handleTest ./openssh.nix {}; osquery = handleTest ./osquery.nix {}; + osrm-backend = handleTest ./osrm-backend.nix {}; ostree = handleTest ./ostree.nix {}; pam-oath-login = handleTest ./pam-oath-login.nix {}; pam-u2f = handleTest ./pam-u2f.nix {}; diff --git a/nixpkgs/nixos/tests/hydra/default.nix b/nixpkgs/nixos/tests/hydra/default.nix index db4e97e0039b..882bced86d39 100644 --- a/nixpkgs/nixos/tests/hydra/default.nix +++ b/nixpkgs/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/nixpkgs/nixos/tests/matrix-synapse.nix b/nixpkgs/nixos/tests/matrix-synapse.nix index 8504a7c0d057..882e4b75814b 100644 --- a/nixpkgs/nixos/tests/matrix-synapse.nix +++ b/nixpkgs/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/nixpkgs/nixos/tests/osrm-backend.nix b/nixpkgs/nixos/tests/osrm-backend.nix new file mode 100644 index 000000000000..6e2d098d4adb --- /dev/null +++ b/nixpkgs/nixos/tests/osrm-backend.nix @@ -0,0 +1,53 @@ +import ./make-test.nix ({ pkgs, lib, ... }: +let + port = 5000; +in { + name = "osrm-backend"; + meta.maintainers = [ lib.maintainers.erictapen ]; + + machine = { config, pkgs, ... }:{ + + services.osrm = { + enable = true; + inherit port; + dataFile = let + filename = "monaco"; + osrm-data = pkgs.stdenv.mkDerivation { + name = "osrm-data"; + + buildInputs = [ pkgs.osrm-backend ]; + + # This is a pbf file of monaco, downloaded at 2019-01-04 from + # http://download.geofabrik.de/europe/monaco-latest.osm.pbf + # as apparently no provider of OSM files guarantees immutability, + # this is hosted as a gist on GitHub. + src = pkgs.fetchgit { + url = "https://gist.github.com/erictapen/01e39f73a6c856eac53ba809a94cdb83"; + rev = "9b1ff0f24deb40e5cf7df51f843dbe860637b8ce"; + sha256 = "1scqhmrfnpwsy5i2a9jpggqnvfgj4hv9p4qyvc79321pzkbv59nx"; + }; + + buildCommand = '' + cp $src/${filename}.osm.pbf . + ${pkgs.osrm-backend}/bin/osrm-extract -p ${pkgs.osrm-backend}/share/osrm/profiles/car.lua ${filename}.osm.pbf + ${pkgs.osrm-backend}/bin/osrm-partition ${filename}.osrm + ${pkgs.osrm-backend}/bin/osrm-customize ${filename}.osrm + mkdir -p $out + cp ${filename}* $out/ + ''; + }; + in "${osrm-data}/${filename}.osrm"; + }; + + environment.systemPackages = [ pkgs.jq ]; + }; + + testScript = let + query = "http://localhost:${toString port}/route/v1/driving/7.41720,43.73304;7.42463,43.73886?steps=true"; + in '' + $machine->waitForUnit("osrm.service"); + $machine->waitForOpenPort(${toString port}); + $machine->succeed("curl --silent '${query}' | jq .waypoints[0].name | grep -F 'Boulevard Rainier III'"); + $machine->succeed("curl --silent '${query}' | jq .waypoints[1].name | grep -F 'Avenue de la Costa'"); + ''; +}) diff --git a/nixpkgs/nixos/tests/roundcube.nix b/nixpkgs/nixos/tests/roundcube.nix index 178134fd9b30..ed0ebd7dd19d 100644 --- a/nixpkgs/nixos/tests/roundcube.nix +++ b/nixpkgs/nixos/tests/roundcube.nix @@ -10,6 +10,8 @@ import ./make-test.nix ({ pkgs, ...} : { enable = true; hostName = "roundcube"; database.password = "notproduction"; + package = pkgs.roundcube.withPlugins (plugins: [ plugins.persistent_login ]); + plugins = [ "persistent_login" ]; }; services.nginx.virtualHosts.roundcube = { forceSSL = false; @@ -23,6 +25,6 @@ import ./make-test.nix ({ pkgs, ...} : { $roundcube->waitForUnit("postgresql.service"); $roundcube->waitForUnit("phpfpm-roundcube.service"); $roundcube->waitForUnit("nginx.service"); - $roundcube->succeed("curl -sSfL http://roundcube/"); + $roundcube->succeed("curl -sSfL http://roundcube/ | grep 'Keep me logged in'"); ''; }) diff --git a/nixpkgs/pkgs/applications/audio/lsp-plugins/default.nix b/nixpkgs/pkgs/applications/audio/lsp-plugins/default.nix index d567dc584d8b..2e70bebc88d2 100644 --- a/nixpkgs/pkgs/applications/audio/lsp-plugins/default.nix +++ b/nixpkgs/pkgs/applications/audio/lsp-plugins/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { pname = "lsp-plugins"; - version = "1.1.4"; + version = "1.1.5"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = "sadko4u"; repo = "${pname}"; rev = "${name}"; - sha256 = "0vb8ax0w4d2a153wxrhkpi21fxsv7c24k57vhfgmm1lqwv6pbl69"; + sha256 = "0xcxm47j7mz5vprjqqhi95gz62syp4y737h7cssxd3flqkgar7xr"; }; nativeBuildInputs = [ pkgconfig php expat ]; diff --git a/nixpkgs/pkgs/applications/audio/mopidy/iris.nix b/nixpkgs/pkgs/applications/audio/mopidy/iris.nix index 6e61e0377f80..45006fb8ef62 100644 --- a/nixpkgs/pkgs/applications/audio/mopidy/iris.nix +++ b/nixpkgs/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/nixpkgs/pkgs/applications/audio/x42-plugins/default.nix b/nixpkgs/pkgs/applications/audio/x42-plugins/default.nix index e6041dc9b1c5..e86a690ec6b3 100644 --- a/nixpkgs/pkgs/applications/audio/x42-plugins/default.nix +++ b/nixpkgs/pkgs/applications/audio/x42-plugins/default.nix @@ -3,12 +3,12 @@ , libGLU, lv2, gtk2, cairo, pango, fftwFloat, zita-convolver }: stdenv.mkDerivation rec { - version = "20181103"; + version = "20190105"; name = "x42-plugins-${version}"; src = fetchurl { url = "https://gareus.org/misc/x42-plugins/${name}.tar.xz"; - sha256 = "085d6qjj7nl22f0xamqdrnfxwi8zrfwgkwm1svm73bjkdv270438"; + sha256 = "1bb7k3ly4qa05zgkbpm7d3x9cjch1fklgh279m6hp0ac3hhncdxp"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/applications/editors/android-studio/default.nix b/nixpkgs/pkgs/applications/editors/android-studio/default.nix index 1090bb7d8947..2d5028cf83bc 100644 --- a/nixpkgs/pkgs/applications/editors/android-studio/default.nix +++ b/nixpkgs/pkgs/applications/editors/android-studio/default.nix @@ -8,9 +8,9 @@ let inherit (gnome2) GConf gnome_vfs; }; stableVersion = { - version = "3.3.0.20"; # "Android Studio 3.3" - build = "182.5199772"; - sha256Hash = "0dracganibnkyapn2pk2qqnxpwmii57371ycri4nccaci9v9pcjw"; + version = "3.3.1.0"; # "Android Studio 3.3.1" + build = "182.5264788"; + sha256Hash = "0fghqkc8pkb7waxclm0qq4nlnsvmv9d3fcj5nnvgbfkjyw032q42"; }; betaVersion = { version = "3.4.0.12"; # "Android Studio 3.4 Beta 3" diff --git a/nixpkgs/pkgs/applications/editors/emacs/default.nix b/nixpkgs/pkgs/applications/editors/emacs/default.nix index 948d8cb98672..4f268a3a104e 100644 --- a/nixpkgs/pkgs/applications/editors/emacs/default.nix +++ b/nixpkgs/pkgs/applications/editors/emacs/default.nix @@ -42,6 +42,7 @@ stdenv.mkDerivation rec { patches = [ ./clean-env.patch + ./tramp-detect-wrapped-gvfsd.patch ]; postPatch = lib.optionalString srcRepo '' diff --git a/nixpkgs/pkgs/applications/editors/emacs/tramp-detect-wrapped-gvfsd.patch b/nixpkgs/pkgs/applications/editors/emacs/tramp-detect-wrapped-gvfsd.patch new file mode 100644 index 000000000000..5d16194fd202 --- /dev/null +++ b/nixpkgs/pkgs/applications/editors/emacs/tramp-detect-wrapped-gvfsd.patch @@ -0,0 +1,14 @@ +diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el +index f370abba31..f2806263a9 100644 +--- a/lisp/net/tramp-gvfs.el ++++ b/lisp/net/tramp-gvfs.el +@@ -164,7 +164,8 @@ tramp-gvfs-enabled + (and (featurep 'dbusbind) + (tramp-compat-funcall 'dbus-get-unique-name :system) + (tramp-compat-funcall 'dbus-get-unique-name :session) +- (or (tramp-compat-process-running-p "gvfs-fuse-daemon") ++ (or (tramp-compat-process-running-p ".gvfsd-fuse-wrapped") ++ (tramp-compat-process-running-p "gvfs-fuse-daemon") + (tramp-compat-process-running-p "gvfsd-fuse")))) + "Non-nil when GVFS is available.") + diff --git a/nixpkgs/pkgs/applications/editors/jetbrains/default.nix b/nixpkgs/pkgs/applications/editors/jetbrains/default.nix index b8aa411523b3..08a8b28117e7 100644 --- a/nixpkgs/pkgs/applications/editors/jetbrains/default.nix +++ b/nixpkgs/pkgs/applications/editors/jetbrains/default.nix @@ -250,145 +250,145 @@ in clion = buildClion rec { name = "clion-${version}"; - version = "2018.3.3"; /* updated by script */ + version = "2018.3.4"; /* updated by script */ description = "C/C++ IDE. New. Intelligent. Cross-platform"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"; - sha256 = "1pffxq69ihdc55lsy2q56vlanpgyks0g82n40b29j4m66flmxbkl"; /* updated by script */ + sha256 = "1zglpw9vc3ybdmwymi0c2m6anhcmx9jcqi69gnn06n9f4x1v6gwn"; /* updated by script */ }; wmClass = "jetbrains-clion"; - update-channel = "CLion Release"; # channel's id as in http://www.jetbrains.com/updates/updates.xml + update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml }; datagrip = buildDataGrip rec { name = "datagrip-${version}"; - version = "2018.2.5"; /* updated by script */ + version = "2018.3.2"; /* updated by script */ description = "Your Swiss Army Knife for Databases and SQL"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/datagrip/${name}.tar.gz"; - sha256 = "0ls3qas8z0d1ynn6hh42qipa5br2g2497wf3pgcw3q0m3kp6wida"; /* updated by script */ + sha256 = "0vj1cgmg33626i38x9wmh5hqr1lf0x3m23gzq30rp4q4cbi38806"; /* updated by script */ }; wmClass = "jetbrains-datagrip"; - update-channel = "DataGrip 2018.2"; + update-channel = "DataGrip RELEASE"; }; goland = buildGoland rec { name = "goland-${version}"; - version = "2018.3.2"; /* updated by script */ + version = "2018.3.3"; /* updated by script */ description = "Up and Coming Go IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/go/${name}.tar.gz"; - sha256 = "0vnw6zc23dibpk1z7yg1lrgjznqc7508g1azybml878h6yykm5a4"; /* updated by script */ + sha256 = "065z8084xkv6w8m7pq98rgls1avzrqm23mrxdq5172rs5p1c5r9f"; /* updated by script */ }; wmClass = "jetbrains-goland"; - update-channel = "GoLand Release"; + update-channel = "GoLand RELEASE"; }; idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2018.3.3"; /* updated by script */ + version = "2018.3.4"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "1c9x3m7dknqr6yxqnn2ch3akwm6yskpmy32hcbjg7s87g1n6gy8m"; /* updated by script */ + sha256 = "0j5yc7n04jlyyghmwllpfvcd2g6k1syjp07xb1ljyx7rm4jcf8q6"; /* updated by script */ }; wmClass = "jetbrains-idea-ce"; - update-channel = "IntelliJ IDEA Release"; + update-channel = "IntelliJ IDEA RELEASE"; }; idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2018.3.3"; /* updated by script */ + version = "2018.3.4"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jdk.tar.gz"; - sha256 = "1dj39hs63xba2jfk3sd2yiq7vk7758axrc5549krfd1aaawl4sl8"; /* updated by script */ + sha256 = "0s3r3h1zcwkfqhsfb224fgy62fdhnd4gjgk2h6pyhq1frnh3x5bg"; /* updated by script */ }; wmClass = "jetbrains-idea"; - update-channel = "IntelliJ IDEA Release"; + update-channel = "IntelliJ IDEA RELEASE"; }; phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "2018.2.6"; /* updated by script */ + version = "2018.3.3"; /* updated by script */ description = "Professional IDE for Web and PHP developers"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; - sha256 = "0z627q9mcxlz8a92dndnaz2qa9dkaapimsfqkvc0i8ab88yw75v1"; /* updated by script */ + sha256 = "0znhw83h46a3haspwcin5xjf3ask8ijxla778p9vdbi9xs0zqx39"; /* updated by script */ }; wmClass = "jetbrains-phpstorm"; - update-channel = "PhpStorm 2018.2"; + update-channel = "PhpStorm RELEASE"; }; pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "2018.3.3"; /* updated by script */ + version = "2018.3.4"; /* updated by script */ description = "PyCharm Community Edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0dnjkq1qbxc05cxafi5hw6pw9wya0w44ni32b34sclq26xr6blvj"; /* updated by script */ + sha256 = "11kzzwkp206l466ii6vm6iqmhpx0s594vh37x2lwwsgmg6qzz6vq"; /* updated by script */ }; wmClass = "jetbrains-pycharm-ce"; - update-channel = "PyCharm Release"; + update-channel = "PyCharm RELEASE"; }; pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "2018.3.3"; /* updated by script */ + version = "2018.3.4"; /* updated by script */ description = "PyCharm Professional Edition"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0z6qjc3qh58ds338rlfzi9446y3sghpnccaachkja2q59f97dfma"; /* updated by script */ + sha256 = "1m8lzghs6g57fwcv6bpmnf21d4w2k10gsmi0i2wv2j8ff4hcy7ij"; /* updated by script */ }; wmClass = "jetbrains-pycharm"; - update-channel = "PyCharm Release"; + update-channel = "PyCharm RELEASE"; }; rider = buildRider rec { name = "rider-${version}"; - version = "2018.3.1"; /* updated by script */ + version = "2018.3.2"; /* updated by script */ description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/rider/JetBrains.Rider-${version}.tar.gz"; - sha256 = "0ghk819ik28y9b61vb2h463zbvvq1n2wl778czkakc4qjba2qnks"; /* updated by script */ + sha256 = "1ffzbp2xca2z8g0wlkvmqr0j2f2dnqafpnvzk9zd5asfhhbyrhg5"; /* updated by script */ }; wmClass = "jetbrains-rider"; - update-channel = "Rider 2018.3"; + update-channel = "Rider RELEASE"; }; ruby-mine = buildRubyMine rec { name = "ruby-mine-${version}"; - version = "2018.2.6"; /* updated by script */ + version = "2018.3.3"; /* updated by script */ description = "The Most Intelligent Ruby and Rails IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; - sha256 = "0xbmj7d1ccq2qf1jsvch1zxdrypkvzxdfkr431c8fnabh993yxx1"; /* updated by script */ + sha256 = "1zjcdsr91y07dhqmhqy2yq6c0rhsxg2m52fz14hhmphddlwvhzny"; /* updated by script */ }; wmClass = "jetbrains-rubymine"; - update-channel = "RubyMine 2018.2"; + update-channel = "RubyMine RELEASE"; }; webstorm = buildWebStorm rec { name = "webstorm-${version}"; - version = "2018.3.3"; /* updated by script */ + version = "2018.3.4"; /* updated by script */ description = "Professional IDE for Web and JavaScript development"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"; - sha256 = "0q8njbrll7qgijnxqic2mpca2jb2plpd677xdj5v72mm66mvxmss"; /* updated by script */ + sha256 = "11l39yy8qdrr89y9x3i9acp0am4xb86z6v7wg1kc9fd5p13jr2xs"; /* updated by script */ }; wmClass = "jetbrains-webstorm"; - update-channel = "WebStorm Release"; + update-channel = "WebStorm RELEASE"; }; } diff --git a/nixpkgs/pkgs/applications/editors/texmaker/default.nix b/nixpkgs/pkgs/applications/editors/texmaker/default.nix index 036bd8e546c4..79ece9d62a98 100644 --- a/nixpkgs/pkgs/applications/editors/texmaker/default.nix +++ b/nixpkgs/pkgs/applications/editors/texmaker/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { homepage = http://www.xm1math.net/texmaker/; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ cfouche ]; + maintainers = with maintainers; [ cfouche markuskowa ]; }; } diff --git a/nixpkgs/pkgs/applications/misc/apvlv/default.nix b/nixpkgs/pkgs/applications/misc/apvlv/default.nix index 2d9ea5e3574b..2da0de9ead8c 100644 --- a/nixpkgs/pkgs/applications/misc/apvlv/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/applications/misc/apvlv/fix-build-with-poppler-0.73.0.patch b/nixpkgs/pkgs/applications/misc/apvlv/fix-build-with-poppler-0.73.0.patch new file mode 100644 index 000000000000..d2a7831dca63 --- /dev/null +++ b/nixpkgs/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/nixpkgs/pkgs/applications/misc/cardpeek/default.nix b/nixpkgs/pkgs/applications/misc/cardpeek/default.nix new file mode 100644 index 000000000000..9b2192708090 --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/cardpeek/default.nix @@ -0,0 +1,28 @@ +{ stdenv, lib, fetchFromGitHub, pkgconfig, autoreconfHook, + glib, gtk3, pcsclite, lua5_2, curl, readline }: +let + version = "0.8.4"; +in + stdenv.mkDerivation { + name = "cardpeek-${version}"; + + src = fetchFromGitHub { + owner = "L1L1"; + repo = "cardpeek"; + rev = "cardpeek-${version}"; + sha256 = "1ighpl7nvcvwnsd6r5h5n9p95kclwrq99hq7bry7s53yr57l6588"; + }; + + nativeBuildInputs = [ pkgconfig autoreconfHook ]; + buildInputs = [ glib gtk3 pcsclite lua5_2 curl readline ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = https://github.com/L1L1/cardpeek; + description = "A tool to read the contents of ISO7816 smart cards"; + license = licenses.gpl3Plus; + platforms = with platforms; linux ++ darwin; + maintainers = with maintainers; [ embr ]; + }; + } diff --git a/nixpkgs/pkgs/applications/misc/font-manager/default.nix b/nixpkgs/pkgs/applications/misc/font-manager/default.nix index ee8766f766f1..bf97cff5030d 100644 --- a/nixpkgs/pkgs/applications/misc/font-manager/default.nix +++ b/nixpkgs/pkgs/applications/misc/font-manager/default.nix @@ -49,10 +49,6 @@ stdenv.mkDerivation rec { patchShebangs meson_post_install.py ''; - postInstall = '' - rm $out/share/applications/mimeinfo.cache - ''; - meta = { homepage = https://fontmanager.github.io/; description = "Simple font management for GTK+ desktop environments"; diff --git a/nixpkgs/pkgs/applications/misc/qolibri/default.nix b/nixpkgs/pkgs/applications/misc/qolibri/default.nix new file mode 100644 index 000000000000..e395ae9c070d --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/qolibri/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, pkgconfig, cmake, libeb, lzo, qtbase +, qtmultimedia, qttools, qtwebengine }: + +stdenv.mkDerivation rec { + name = "qolibri-${version}"; + version = "2018-11-14"; + + src = fetchFromGitHub { + owner = "ludios"; + repo = "qolibri"; + rev = "133a1c33e74d931ad54407f70d84a0016d96981f"; + sha256 = "16ifix0q8ww4l3xflgxr9j81c0lzlnkjr8fj961x3nxz7288pdg2"; + }; + + nativeBuildInputs = [ pkgconfig cmake ]; + buildInputs = [ + libeb lzo qtbase qtmultimedia qttools qtwebengine + ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = https://github.com/ludios/qolibri; + description = "EPWING reader for viewing Japanese dictionaries"; + platforms = platforms.linux; + maintainers = with maintainers; [ ivan ]; + license = licenses.gpl2; + }; +} diff --git a/nixpkgs/pkgs/applications/misc/st/default.nix b/nixpkgs/pkgs/applications/misc/st/default.nix index f8340b1bd227..47d7279a47fa 100644 --- a/nixpkgs/pkgs/applications/misc/st/default.nix +++ b/nixpkgs/pkgs/applications/misc/st/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "st-0.8.1"; + name = "st-0.8.2"; src = fetchurl { url = "https://dl.suckless.org/st/${name}.tar.gz"; - sha256 = "09k94v3n20gg32xy7y68p96x9dq5msl80gknf9gbvlyjp3i0zyy4"; + sha256 = "0ddz2mdp1c7q67rd5vrvws9r0493ln0mlqyc3d73dv8im884xdxf"; }; inherit patches; diff --git a/nixpkgs/pkgs/applications/misc/xsuspender/default.nix b/nixpkgs/pkgs/applications/misc/xsuspender/default.nix new file mode 100644 index 000000000000..ef9ce3393619 --- /dev/null +++ b/nixpkgs/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/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 30fadabcdf30..276bfca8bd55 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -56,11 +56,11 @@ let in stdenv.mkDerivation rec { name = "signal-desktop-${version}"; - version = "1.21.0"; + version = "1.21.1"; src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "01fkmav057l7z75g06b2f8h0q6cfa78nv26lnf0kp6a34z0g9a94"; + sha256 = "1vs42kvaacsx8smaqpn1q9i0pb5wcca22a9s4467286b5n0lfc4r"; }; phases = [ "unpackPhase" "installPhase" ]; diff --git a/nixpkgs/pkgs/applications/office/trilium/default.nix b/nixpkgs/pkgs/applications/office/trilium/default.nix index 00d8bb0d275b..a72332f2f338 100644 --- a/nixpkgs/pkgs/applications/office/trilium/default.nix +++ b/nixpkgs/pkgs/applications/office/trilium/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, p7zip, autoPatchelfHook, atomEnv, makeWrapper, makeDesktopItem }: +{ stdenv, fetchurl, autoPatchelfHook, atomEnv, makeWrapper, makeDesktopItem, gtk3, wrapGAppsHook }: let description = "Trilium Notes is a hierarchical note taking application with focus on building large personal knowledge bases."; @@ -13,20 +13,29 @@ 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 + wrapGAppsHook ]; - buildInputs = atomEnv.packages; + buildInputs = [ atomEnv.packages gtk3 ]; installPhase = '' mkdir -p $out/bin @@ -36,14 +45,13 @@ 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 ''; - - # This "shouldn't" be needed, remove when possible :) + # LD_LIBRARY_PATH "shouldn't" be needed, remove when possible :) preFixup = '' - wrapProgram $out/bin/trilium --prefix LD_LIBRARY_PATH : "${atomEnv.libPath}" + gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : ${atomEnv.libPath}) ''; dontStrip = true; diff --git a/nixpkgs/pkgs/applications/misc/airspy/default.nix b/nixpkgs/pkgs/applications/radio/airspy/default.nix index 2042f1047b22..2042f1047b22 100644 --- a/nixpkgs/pkgs/applications/misc/airspy/default.nix +++ b/nixpkgs/pkgs/applications/radio/airspy/default.nix diff --git a/nixpkgs/pkgs/applications/misc/chirp/default.nix b/nixpkgs/pkgs/applications/radio/chirp/default.nix index acc35131e2d5..acc35131e2d5 100644 --- a/nixpkgs/pkgs/applications/misc/chirp/default.nix +++ b/nixpkgs/pkgs/applications/radio/chirp/default.nix diff --git a/nixpkgs/pkgs/applications/misc/dmrconfig/default.nix b/nixpkgs/pkgs/applications/radio/dmrconfig/default.nix index 7125e37f7f95..7125e37f7f95 100644 --- a/nixpkgs/pkgs/applications/misc/dmrconfig/default.nix +++ b/nixpkgs/pkgs/applications/radio/dmrconfig/default.nix diff --git a/nixpkgs/pkgs/applications/audio/fldigi/default.nix b/nixpkgs/pkgs/applications/radio/fldigi/default.nix index ad5b120b7883..ad5b120b7883 100644 --- a/nixpkgs/pkgs/applications/audio/fldigi/default.nix +++ b/nixpkgs/pkgs/applications/radio/fldigi/default.nix diff --git a/nixpkgs/pkgs/applications/misc/fllog/default.nix b/nixpkgs/pkgs/applications/radio/fllog/default.nix index 348b1155e41e..348b1155e41e 100644 --- a/nixpkgs/pkgs/applications/misc/fllog/default.nix +++ b/nixpkgs/pkgs/applications/radio/fllog/default.nix diff --git a/nixpkgs/pkgs/applications/misc/flmsg/default.nix b/nixpkgs/pkgs/applications/radio/flmsg/default.nix index 239d392c374e..239d392c374e 100644 --- a/nixpkgs/pkgs/applications/misc/flmsg/default.nix +++ b/nixpkgs/pkgs/applications/radio/flmsg/default.nix diff --git a/nixpkgs/pkgs/applications/misc/flrig/default.nix b/nixpkgs/pkgs/applications/radio/flrig/default.nix index de4b448b5c37..de4b448b5c37 100644 --- a/nixpkgs/pkgs/applications/misc/flrig/default.nix +++ b/nixpkgs/pkgs/applications/radio/flrig/default.nix diff --git a/nixpkgs/pkgs/applications/misc/flwrap/default.nix b/nixpkgs/pkgs/applications/radio/flwrap/default.nix index b96f3c2b3278..b96f3c2b3278 100644 --- a/nixpkgs/pkgs/applications/misc/flwrap/default.nix +++ b/nixpkgs/pkgs/applications/radio/flwrap/default.nix diff --git a/nixpkgs/pkgs/applications/misc/gnss-sdr/default.nix b/nixpkgs/pkgs/applications/radio/gnss-sdr/default.nix index 6cbdea8c6867..6cbdea8c6867 100644 --- a/nixpkgs/pkgs/applications/misc/gnss-sdr/default.nix +++ b/nixpkgs/pkgs/applications/radio/gnss-sdr/default.nix diff --git a/nixpkgs/pkgs/applications/misc/gnuradio/ais.nix b/nixpkgs/pkgs/applications/radio/gnuradio/ais.nix index dfb8415219c7..dfb8415219c7 100644 --- a/nixpkgs/pkgs/applications/misc/gnuradio/ais.nix +++ b/nixpkgs/pkgs/applications/radio/gnuradio/ais.nix diff --git a/nixpkgs/pkgs/applications/misc/gnuradio/default.nix b/nixpkgs/pkgs/applications/radio/gnuradio/default.nix index f9a50313c472..f9a50313c472 100644 --- a/nixpkgs/pkgs/applications/misc/gnuradio/default.nix +++ b/nixpkgs/pkgs/applications/radio/gnuradio/default.nix diff --git a/nixpkgs/pkgs/applications/misc/gnuradio/gsm.nix b/nixpkgs/pkgs/applications/radio/gnuradio/gsm.nix index dcb50df70520..dcb50df70520 100644 --- a/nixpkgs/pkgs/applications/misc/gnuradio/gsm.nix +++ b/nixpkgs/pkgs/applications/radio/gnuradio/gsm.nix diff --git a/nixpkgs/pkgs/applications/misc/gnuradio/limesdr.nix b/nixpkgs/pkgs/applications/radio/gnuradio/limesdr.nix index 0a5d4f56d278..0a5d4f56d278 100644 --- a/nixpkgs/pkgs/applications/misc/gnuradio/limesdr.nix +++ b/nixpkgs/pkgs/applications/radio/gnuradio/limesdr.nix diff --git a/nixpkgs/pkgs/applications/misc/gnuradio/nacl.nix b/nixpkgs/pkgs/applications/radio/gnuradio/nacl.nix index 2f4b0e4e3eb6..2f4b0e4e3eb6 100644 --- a/nixpkgs/pkgs/applications/misc/gnuradio/nacl.nix +++ b/nixpkgs/pkgs/applications/radio/gnuradio/nacl.nix diff --git a/nixpkgs/pkgs/applications/misc/gnuradio/osmosdr.nix b/nixpkgs/pkgs/applications/radio/gnuradio/osmosdr.nix index 846afe0e95d4..846afe0e95d4 100644 --- a/nixpkgs/pkgs/applications/misc/gnuradio/osmosdr.nix +++ b/nixpkgs/pkgs/applications/radio/gnuradio/osmosdr.nix diff --git a/nixpkgs/pkgs/applications/misc/gnuradio/rds.nix b/nixpkgs/pkgs/applications/radio/gnuradio/rds.nix index 2e5443227fda..2e5443227fda 100644 --- a/nixpkgs/pkgs/applications/misc/gnuradio/rds.nix +++ b/nixpkgs/pkgs/applications/radio/gnuradio/rds.nix diff --git a/nixpkgs/pkgs/applications/misc/gnuradio/wrapper.nix b/nixpkgs/pkgs/applications/radio/gnuradio/wrapper.nix index ffed3da03187..ffed3da03187 100644 --- a/nixpkgs/pkgs/applications/misc/gnuradio/wrapper.nix +++ b/nixpkgs/pkgs/applications/radio/gnuradio/wrapper.nix diff --git a/nixpkgs/pkgs/applications/misc/gqrx/default.nix b/nixpkgs/pkgs/applications/radio/gqrx/default.nix index f7c7ca5472e0..f7c7ca5472e0 100644 --- a/nixpkgs/pkgs/applications/misc/gqrx/default.nix +++ b/nixpkgs/pkgs/applications/radio/gqrx/default.nix diff --git a/nixpkgs/pkgs/applications/misc/hackrf/default.nix b/nixpkgs/pkgs/applications/radio/hackrf/default.nix index 81a66bf503c0..81a66bf503c0 100644 --- a/nixpkgs/pkgs/applications/misc/hackrf/default.nix +++ b/nixpkgs/pkgs/applications/radio/hackrf/default.nix diff --git a/nixpkgs/pkgs/applications/misc/inspectrum/default.nix b/nixpkgs/pkgs/applications/radio/inspectrum/default.nix index e2232c4b2ec8..e2232c4b2ec8 100644 --- a/nixpkgs/pkgs/applications/misc/inspectrum/default.nix +++ b/nixpkgs/pkgs/applications/radio/inspectrum/default.nix diff --git a/nixpkgs/pkgs/tools/misc/kalibrate-hackrf/default.nix b/nixpkgs/pkgs/applications/radio/kalibrate-hackrf/default.nix index 0bd6f573ead0..0bd6f573ead0 100644 --- a/nixpkgs/pkgs/tools/misc/kalibrate-hackrf/default.nix +++ b/nixpkgs/pkgs/applications/radio/kalibrate-hackrf/default.nix diff --git a/nixpkgs/pkgs/tools/misc/kalibrate-rtl/default.nix b/nixpkgs/pkgs/applications/radio/kalibrate-rtl/default.nix index 19ebd05e23c1..19ebd05e23c1 100644 --- a/nixpkgs/pkgs/tools/misc/kalibrate-rtl/default.nix +++ b/nixpkgs/pkgs/applications/radio/kalibrate-rtl/default.nix diff --git a/nixpkgs/pkgs/applications/misc/limesuite/default.nix b/nixpkgs/pkgs/applications/radio/limesuite/default.nix index e1cdc4a0f863..e1cdc4a0f863 100644 --- a/nixpkgs/pkgs/applications/misc/limesuite/default.nix +++ b/nixpkgs/pkgs/applications/radio/limesuite/default.nix diff --git a/nixpkgs/pkgs/applications/audio/minimodem/default.nix b/nixpkgs/pkgs/applications/radio/minimodem/default.nix index 8d179e8eed11..8d179e8eed11 100644 --- a/nixpkgs/pkgs/applications/audio/minimodem/default.nix +++ b/nixpkgs/pkgs/applications/radio/minimodem/default.nix diff --git a/nixpkgs/pkgs/applications/misc/multimon-ng/default.nix b/nixpkgs/pkgs/applications/radio/multimon-ng/default.nix index b58872975aea..b58872975aea 100644 --- a/nixpkgs/pkgs/applications/misc/multimon-ng/default.nix +++ b/nixpkgs/pkgs/applications/radio/multimon-ng/default.nix diff --git a/nixpkgs/pkgs/applications/misc/qradiolink/default.nix b/nixpkgs/pkgs/applications/radio/qradiolink/default.nix index 63906d996ba6..63906d996ba6 100644 --- a/nixpkgs/pkgs/applications/misc/qradiolink/default.nix +++ b/nixpkgs/pkgs/applications/radio/qradiolink/default.nix diff --git a/nixpkgs/pkgs/applications/misc/qsstv/default.nix b/nixpkgs/pkgs/applications/radio/qsstv/default.nix index c8401cdbf49e..c8401cdbf49e 100644 --- a/nixpkgs/pkgs/applications/misc/qsstv/default.nix +++ b/nixpkgs/pkgs/applications/radio/qsstv/default.nix diff --git a/nixpkgs/pkgs/applications/misc/rtl-sdr/default.nix b/nixpkgs/pkgs/applications/radio/rtl-sdr/default.nix index aedc847ee69f..aedc847ee69f 100644 --- a/nixpkgs/pkgs/applications/misc/rtl-sdr/default.nix +++ b/nixpkgs/pkgs/applications/radio/rtl-sdr/default.nix diff --git a/nixpkgs/pkgs/applications/misc/rtl_433/default.nix b/nixpkgs/pkgs/applications/radio/rtl_433/default.nix index 5d012437e6ee..5d012437e6ee 100644 --- a/nixpkgs/pkgs/applications/misc/rtl_433/default.nix +++ b/nixpkgs/pkgs/applications/radio/rtl_433/default.nix diff --git a/nixpkgs/pkgs/applications/misc/soapyairspy/default.nix b/nixpkgs/pkgs/applications/radio/soapyairspy/default.nix index 1d8056ca1e81..1d8056ca1e81 100644 --- a/nixpkgs/pkgs/applications/misc/soapyairspy/default.nix +++ b/nixpkgs/pkgs/applications/radio/soapyairspy/default.nix diff --git a/nixpkgs/pkgs/applications/misc/soapybladerf/default.nix b/nixpkgs/pkgs/applications/radio/soapybladerf/default.nix index bab829e05e3a..bab829e05e3a 100644 --- a/nixpkgs/pkgs/applications/misc/soapybladerf/default.nix +++ b/nixpkgs/pkgs/applications/radio/soapybladerf/default.nix diff --git a/nixpkgs/pkgs/applications/misc/soapyhackrf/default.nix b/nixpkgs/pkgs/applications/radio/soapyhackrf/default.nix index 2c5dd058ced3..2c5dd058ced3 100644 --- a/nixpkgs/pkgs/applications/misc/soapyhackrf/default.nix +++ b/nixpkgs/pkgs/applications/radio/soapyhackrf/default.nix diff --git a/nixpkgs/pkgs/applications/misc/soapyremote/default.nix b/nixpkgs/pkgs/applications/radio/soapyremote/default.nix index f6970c156b8f..f6970c156b8f 100644 --- a/nixpkgs/pkgs/applications/misc/soapyremote/default.nix +++ b/nixpkgs/pkgs/applications/radio/soapyremote/default.nix diff --git a/nixpkgs/pkgs/applications/misc/soapyrtlsdr/default.nix b/nixpkgs/pkgs/applications/radio/soapyrtlsdr/default.nix index d85fe347cd74..d85fe347cd74 100644 --- a/nixpkgs/pkgs/applications/misc/soapyrtlsdr/default.nix +++ b/nixpkgs/pkgs/applications/radio/soapyrtlsdr/default.nix diff --git a/nixpkgs/pkgs/applications/misc/soapysdr/default.nix b/nixpkgs/pkgs/applications/radio/soapysdr/default.nix index 6754e8f2a55c..6754e8f2a55c 100644 --- a/nixpkgs/pkgs/applications/misc/soapysdr/default.nix +++ b/nixpkgs/pkgs/applications/radio/soapysdr/default.nix diff --git a/nixpkgs/pkgs/applications/misc/soapyuhd/default.nix b/nixpkgs/pkgs/applications/radio/soapyuhd/default.nix index 4f2a79c97fe2..4f2a79c97fe2 100644 --- a/nixpkgs/pkgs/applications/misc/soapyuhd/default.nix +++ b/nixpkgs/pkgs/applications/radio/soapyuhd/default.nix diff --git a/nixpkgs/pkgs/development/tools/misc/uhd/default.nix b/nixpkgs/pkgs/applications/radio/uhd/default.nix index 484e8787d50a..484e8787d50a 100644 --- a/nixpkgs/pkgs/development/tools/misc/uhd/default.nix +++ b/nixpkgs/pkgs/applications/radio/uhd/default.nix diff --git a/nixpkgs/pkgs/development/tools/misc/uhd/neon.patch b/nixpkgs/pkgs/applications/radio/uhd/neon.patch index 18ec59c1d64b..18ec59c1d64b 100644 --- a/nixpkgs/pkgs/development/tools/misc/uhd/neon.patch +++ b/nixpkgs/pkgs/applications/radio/uhd/neon.patch diff --git a/nixpkgs/pkgs/applications/misc/unixcw/default.nix b/nixpkgs/pkgs/applications/radio/unixcw/default.nix index 2aeba5fb5f4a..2aeba5fb5f4a 100644 --- a/nixpkgs/pkgs/applications/misc/unixcw/default.nix +++ b/nixpkgs/pkgs/applications/radio/unixcw/default.nix diff --git a/nixpkgs/pkgs/applications/misc/unixcw/remove-use-of-dlopen.patch b/nixpkgs/pkgs/applications/radio/unixcw/remove-use-of-dlopen.patch index 0475c008ba22..0475c008ba22 100644 --- a/nixpkgs/pkgs/applications/misc/unixcw/remove-use-of-dlopen.patch +++ b/nixpkgs/pkgs/applications/radio/unixcw/remove-use-of-dlopen.patch diff --git a/nixpkgs/pkgs/applications/misc/urh/default.nix b/nixpkgs/pkgs/applications/radio/urh/default.nix index 8f490c971c71..8f490c971c71 100644 --- a/nixpkgs/pkgs/applications/misc/urh/default.nix +++ b/nixpkgs/pkgs/applications/radio/urh/default.nix diff --git a/nixpkgs/pkgs/applications/misc/welle-io/default.nix b/nixpkgs/pkgs/applications/radio/welle-io/default.nix index fae591d7ee03..acf0226c0db5 100644 --- a/nixpkgs/pkgs/applications/misc/welle-io/default.nix +++ b/nixpkgs/pkgs/applications/radio/welle-io/default.nix @@ -40,7 +40,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "A DAB/DAB+ Software Radio"; homepage = https://www.welle.io/; - maintainers = with maintainers; [ ck3d ]; + maintainers = with maintainers; [ ck3d markuskowa ]; license = licenses.gpl2; platforms = with platforms; [ "x86_64-linux" "i686-linux" ] ++ darwin; }; diff --git a/nixpkgs/pkgs/applications/misc/wsjtx/default.nix b/nixpkgs/pkgs/applications/radio/wsjtx/default.nix index 930515b93825..930515b93825 100644 --- a/nixpkgs/pkgs/applications/misc/wsjtx/default.nix +++ b/nixpkgs/pkgs/applications/radio/wsjtx/default.nix diff --git a/nixpkgs/pkgs/applications/misc/wsjtx/super.patch b/nixpkgs/pkgs/applications/radio/wsjtx/super.patch index d903171ffc5a..d903171ffc5a 100644 --- a/nixpkgs/pkgs/applications/misc/wsjtx/super.patch +++ b/nixpkgs/pkgs/applications/radio/wsjtx/super.patch diff --git a/nixpkgs/pkgs/applications/misc/wsjtx/wsjtx.patch b/nixpkgs/pkgs/applications/radio/wsjtx/wsjtx.patch index e92b420e58a4..e92b420e58a4 100644 --- a/nixpkgs/pkgs/applications/misc/wsjtx/wsjtx.patch +++ b/nixpkgs/pkgs/applications/radio/wsjtx/wsjtx.patch diff --git a/nixpkgs/pkgs/applications/misc/xlog/default.nix b/nixpkgs/pkgs/applications/radio/xlog/default.nix index 7b9cf0a4ee55..7b9cf0a4ee55 100644 --- a/nixpkgs/pkgs/applications/misc/xlog/default.nix +++ b/nixpkgs/pkgs/applications/radio/xlog/default.nix diff --git a/nixpkgs/pkgs/applications/science/biology/cmtk/default.nix b/nixpkgs/pkgs/applications/science/biology/cmtk/default.nix new file mode 100644 index 000000000000..ed661db23e0a --- /dev/null +++ b/nixpkgs/pkgs/applications/science/biology/cmtk/default.nix @@ -0,0 +1,24 @@ +{stdenv, fetchurl, cmake}: + +stdenv.mkDerivation rec { + name = "cmtk-3.3.1"; + + src = fetchurl { + name = "cmtk-source.tar.gz"; + url = "https://www.nitrc.org/frs/download.php/8198/CMTK-3.3.1-Source.tar.gz//?i_agree=1&download_now=1"; + sha256 = "1nmsga9m7vcc4y4a6zl53ra3mwlgjwdgsq1j291awkn7zr1az6qs"; + }; + + buildInputs = [cmake]; + + meta = with stdenv.lib; { + description = "Computational Morphometry Toolkit "; + longDescription = ''A software toolkit for computational morphometry of + biomedical images, CMTK comprises a set of command line tools and a + back-end general-purpose library for processing and I/O''; + maintainers = with maintainers; [ tbenst ]; + platforms = platforms.all; + license = licenses.gpl3; + homepage = https://www.nitrc.org/projects/cmtk/; + }; +} diff --git a/nixpkgs/pkgs/applications/science/misc/rink/cargo-lock.patch b/nixpkgs/pkgs/applications/science/misc/rink/cargo-lock.patch new file mode 100644 index 000000000000..39029713430c --- /dev/null +++ b/nixpkgs/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/nixpkgs/pkgs/applications/science/misc/rink/default.nix b/nixpkgs/pkgs/applications/science/misc/rink/default.nix new file mode 100644 index 000000000000..0ccb096b8dab --- /dev/null +++ b/nixpkgs/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/nixpkgs/pkgs/applications/version-management/cvs-fast-export/default.nix b/nixpkgs/pkgs/applications/version-management/cvs-fast-export/default.nix index 1a5ce6e369ef..5e1a0cab69d9 100644 --- a/nixpkgs/pkgs/applications/version-management/cvs-fast-export/default.nix +++ b/nixpkgs/pkgs/applications/version-management/cvs-fast-export/default.nix @@ -7,7 +7,7 @@ with stdenv; with lib; mkDerivation rec { name = "cvs-fast-export-${meta.version}"; meta = { - version = "1.32"; + version = "1.45"; description = "Export an RCS or CVS history as a fast-import stream"; license = licenses.gpl2Plus; maintainers = with maintainers; [ dfoxfranke ]; @@ -16,8 +16,8 @@ mkDerivation rec { }; src = fetchurl { - url = "http://www.catb.org/~esr/cvs-fast-export/cvs-fast-export-1.32.tar.gz"; - sha256 = "5bfb9a5650517d337a96a598795b50bc40ce12172854a6581267e7be3dbcfb97"; + url = "http://www.catb.org/~esr/cvs-fast-export/cvs-fast-export-1.45.tar.gz"; + sha256 = "19pxg6p0pcgyd2fbnh3wy1kazv6vcfi5lzc2whhdi1w9kj4r9c4z"; }; buildInputs = [ diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/qgit/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/qgit/default.nix index 0a88fbd09291..0074d44391ef 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/qgit/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/qgit/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { license = licenses.gpl2; homepage = http://libre.tibirna.org/projects/qgit/wiki/QGit; description = "Graphical front-end to Git"; - maintainers = with maintainers; [ peterhoeg ]; + maintainers = with maintainers; [ peterhoeg markuskowa ]; inherit (qtbase.meta) platforms; }; } diff --git a/nixpkgs/pkgs/applications/video/obs-studio/linuxbrowser.nix b/nixpkgs/pkgs/applications/video/obs-studio/linuxbrowser.nix index b8bd6ce07eb9..6d02233be321 100644 --- a/nixpkgs/pkgs/applications/video/obs-studio/linuxbrowser.nix +++ b/nixpkgs/pkgs/applications/video/obs-studio/linuxbrowser.nix @@ -10,12 +10,12 @@ stdenv.mkDerivation rec { name = "obs-linuxbrowser-${version}"; - version = "0.5.2"; + version = "0.6.0"; src = fetchFromGitHub { owner = "bazukas"; repo = "obs-linuxbrowser"; rev = version; - sha256 = "1vwgdgcmab5442wh2rjww6lzij9g2c5ccnv79rs7vx3rdl8wqg4f"; + sha256 = "000ngkiwfjjl25v4hz6lh6mdkf119pnq0qv3jwdmmp6fpd0dxcgh"; }; nativeBuildInputs = [ cmake ]; buildInputs = [ obs-studio ]; diff --git a/nixpkgs/pkgs/applications/virtualization/podman/default.nix b/nixpkgs/pkgs/applications/virtualization/podman/default.nix index 753fada5e7d3..7fc74de1d2ee 100644 --- a/nixpkgs/pkgs/applications/virtualization/podman/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/podman/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchFromGitHub, pkgconfig , buildGoPackage, gpgme, lvm2, btrfs-progs, libseccomp +, go-md2man }: buildGoPackage rec { @@ -15,9 +16,11 @@ buildGoPackage rec { goPackagePath = "github.com/containers/libpod"; + outputs = [ "bin" "out" "man" ]; + # Optimizations break compilation of libseccomp c bindings hardeningDisable = [ "fortify" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig go-md2man ]; buildInputs = [ btrfs-progs libseccomp gpgme lvm2 @@ -26,11 +29,12 @@ buildGoPackage rec { buildPhase = '' pushd $NIX_BUILD_TOP/go/src/${goPackagePath} patchShebangs . - make binaries + make binaries docs ''; installPhase = '' install -Dm555 bin/podman $bin/bin/podman + MANDIR=$man/share/man make install.man ''; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/data/misc/osinfo-db/default.nix b/nixpkgs/pkgs/data/misc/osinfo-db/default.nix index 893707395ae5..d8f5ebf56b97 100644 --- a/nixpkgs/pkgs/data/misc/osinfo-db/default.nix +++ b/nixpkgs/pkgs/data/misc/osinfo-db/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, osinfo-db-tools, intltool, libxml2 }: stdenv.mkDerivation rec { - name = "osinfo-db-20181203"; + name = "osinfo-db-20181214"; src = fetchurl { url = "https://releases.pagure.org/libosinfo/${name}.tar.xz"; - sha256 = "1wimbj3hqp3ni91l7drj24i7z7xxfdpn6svf1szk9qd93cxc65q2"; + sha256 = "18ym54wvhvjk66fqpsfvfd5b7d7743dvfqrcq91w1n71r20fkhcd"; }; nativeBuildInputs = [ osinfo-db-tools intltool libxml2 ]; diff --git a/nixpkgs/pkgs/data/themes/plano/default.nix b/nixpkgs/pkgs/data/themes/plano/default.nix index e878943ff626..ebfafe98e5a6 100644 --- a/nixpkgs/pkgs/data/themes/plano/default.nix +++ b/nixpkgs/pkgs/data/themes/plano/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, gdk_pixbuf, gtk_engines, gtk-engine-murrine }: stdenv.mkDerivation rec { - name = "plano-theme-${version}"; - version = "3.30-2"; + pname = "plano-theme"; + version = "3.30-3"; src = fetchFromGitHub { owner = "lassekongo83"; - repo = "plano-theme"; + repo = pname; rev = "v${version}"; - sha256 = "06yagpb0dpb8nzh3lvs607rzg6y5l6skl4mjcmbxayapsqka45hj"; + sha256 = "1rb9whr5r2pj6fmwa9g0vdrfki3dqldnx85mpyq07jvxkipcdq6g"; }; buildInputs = [ gdk_pixbuf gtk_engines ]; diff --git a/nixpkgs/pkgs/desktops/gnome-3/default.nix b/nixpkgs/pkgs/desktops/gnome-3/default.nix index 7c028656faec..34b3faf71a41 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/default.nix @@ -19,7 +19,7 @@ lib.makeScope pkgs.newScope (self: with self; { in lib.filter (x: !(builtins.elem (pkgName x) namesToRemove)) packages; - maintainers = with pkgs.lib.maintainers; [ lethalman jtojnar hedning ]; + maintainers = with pkgs.lib.maintainers; [ lethalman jtojnar hedning worldofpeace ]; corePackages = with gnome3; [ pkgs.desktop-file-utils diff --git a/nixpkgs/pkgs/development/beam-modules/default.nix b/nixpkgs/pkgs/development/beam-modules/default.nix index f71379459dcb..a1eedaad6a0f 100644 --- a/nixpkgs/pkgs/development/beam-modules/default.nix +++ b/nixpkgs/pkgs/development/beam-modules/default.nix @@ -23,12 +23,8 @@ let hexRegistrySnapshot = callPackage ./hex-registry-snapshot.nix { }; rebar = callPackage ../tools/build-managers/rebar { }; - rebar3-open = callPackage ../tools/build-managers/rebar3 { - hermeticRebar3 = false; - }; - rebar3 = callPackage ../tools/build-managers/rebar3 { - hermeticRebar3 = true; - }; + rebar3-open = callPackage ../tools/build-managers/rebar3 { }; + rebar3 = callPackage ../tools/build-managers/rebar3 { }; # rebar3 port compiler plugin is required by buildRebar3 pc_1_6_0 = callPackage ./pc {}; @@ -36,6 +32,9 @@ let fetchHex = callPackage ./fetch-hex.nix { }; + fetchRebar3Deps = callPackage ./fetch-rebar-deps.nix { }; + rebar3Relx = callPackage ./rebar3-release.nix { }; + buildRebar3 = callPackage ./build-rebar3.nix {}; buildHex = callPackage ./build-hex.nix {}; buildErlangMk = callPackage ./build-erlang-mk.nix {}; @@ -75,25 +74,6 @@ let lfe = lfe_1_2; lfe_1_2 = lib.callLFE ../interpreters/lfe/1.2.nix { inherit erlang buildRebar3 buildHex; }; - # We list all base hex packages for beam tooling explicitly to ensure - # tha the tooling does not break during hex-packages.nix updates. - erlware_commons_1_0_0 = buildHex { - name = "erlware_commons"; - version = "1.0.0"; - sha256 = "0wkphbrjk19lxdwndy92v058qwcaz13bcgdzp33h21aa7vminzx7"; - beamDeps = [ cf_0_2_2 ]; - }; - cf_0_2_2 = buildHex { - name = "cf"; - version = "0.2.2"; - sha256 = "08cvy7skn5d2k4manlx5k3anqgjdvajjhc5jwxbaszxw34q3na28"; - }; - getopt_0_8_2 = buildHex { - name = "getopt"; - version = "0.8.2"; - sha256 = "1xw30h59zbw957cyjd8n50hf9y09jnv9dyry6x3avfwzcyrnsvkk"; - }; - # Non hex packages. Examples how to build Rebar/Mix packages with and # without helper functions buildRebar3 and buildMix. hex = callPackage ./hex {}; diff --git a/nixpkgs/pkgs/development/beam-modules/fetch-rebar-deps.nix b/nixpkgs/pkgs/development/beam-modules/fetch-rebar-deps.nix new file mode 100644 index 000000000000..a94d803f0d32 --- /dev/null +++ b/nixpkgs/pkgs/development/beam-modules/fetch-rebar-deps.nix @@ -0,0 +1,32 @@ +{ stdenv, rebar3, curl }: + +{ name, version, sha256, src +, meta ? {} +}: + +with stdenv.lib; + +stdenv.mkDerivation ({ + name = "rebar-deps-${name}-${version}"; + + phases = [ "downloadPhase" "installPhase" ]; + + downloadPhase = '' + cp ${src} . + HOME='.' DEBUG=1 ${rebar3}/bin/rebar3 get-deps + ''; + + installPhase = '' + mkdir -p "$out/_checkouts" + for i in ./_build/default/lib/* ; do + echo "$i" + cp -R "$i" "$out/_checkouts" + done + ''; + + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = sha256; + + impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars; +}) diff --git a/nixpkgs/pkgs/development/beam-modules/rebar3-release.nix b/nixpkgs/pkgs/development/beam-modules/rebar3-release.nix new file mode 100644 index 000000000000..837d0ccf15cf --- /dev/null +++ b/nixpkgs/pkgs/development/beam-modules/rebar3-release.nix @@ -0,0 +1,85 @@ +{ stdenv, writeText, erlang, rebar3, openssl, libyaml, + pc, lib }: + +{ name, version +, src +, checkouts ? null +, releaseType +, buildInputs ? [] +, setupHook ? null +, profile ? "default" +, installPhase ? null +, buildPhase ? null +, configurePhase ? null +, meta ? {} +, enableDebugInfo ? false +, ... }@attrs: + +with stdenv.lib; + +let + debugInfoFlag = lib.optionalString (enableDebugInfo || erlang.debugInfo) "debug-info"; + + shell = drv: stdenv.mkDerivation { + name = "interactive-shell-${drv.name}"; + buildInputs = [ drv ]; + }; + + customPhases = filterAttrs + (_: v: v != null) + { inherit setupHook configurePhase buildPhase installPhase; }; + + pkg = self: stdenv.mkDerivation (attrs // { + + name = "${name}-${version}"; + inherit version; + + buildInputs = buildInputs ++ [ erlang rebar3 openssl ]; + propagatedBuildInputs = [checkouts]; + + dontStrip = true; + + inherit src; + + setupHook = writeText "setupHook.sh" '' + addToSearchPath ERL_LIBS "$1/lib/erlang/lib/" + ''; + + configurePhase = '' + runHook preConfigure + ${if checkouts != null then + ''cp --no-preserve=all -R ${checkouts}/_checkouts .'' + else + ''''} + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + HOME=. DEBUG=1 rebar3 as ${profile} ${if releaseType == "escript" + then '' escriptize'' + else '' release''} + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + dir=${if releaseType == "escript" + then ''bin'' + else ''rel''} + mkdir -p "$out/$dir" + cp -R --preserve=mode "_build/${profile}/$dir" "$out" + runHook postInstall + ''; + + meta = { + inherit (erlang.meta) platforms; + } // meta; + + passthru = { + packageName = name; + env = shell self; + }; + } // customPhases); +in + fix pkg diff --git a/nixpkgs/pkgs/development/compilers/fasm/bin.nix b/nixpkgs/pkgs/development/compilers/fasm/bin.nix index 9039553e3d1e..0c4a48656b72 100644 --- a/nixpkgs/pkgs/development/compilers/fasm/bin.nix +++ b/nixpkgs/pkgs/development/compilers/fasm/bin.nix @@ -3,11 +3,11 @@ stdenvNoCC.mkDerivation rec { name = "fasm-bin-${version}"; - version = "1.73.06"; + version = "1.73.08"; src = fetchurl { url = "https://flatassembler.net/fasm-${version}.tgz"; - sha256 = "02wqkqxpn3p0iwcagsm92qd9cdfcnbx8a09qg03b3pjppp30hmp6"; + sha256 = "1l4my3fran06h5jiygswx4fsj53dvpfgg9ksfbdzsdg20r672997"; }; installPhase = '' diff --git a/nixpkgs/pkgs/development/compilers/llvm/7/clang/default.nix b/nixpkgs/pkgs/development/compilers/llvm/7/clang/default.nix index a307978f59a5..bc6767e8766e 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/7/clang/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/7/clang/default.nix @@ -43,6 +43,9 @@ let sed -i '1s,^,find_package(Sphinx REQUIRED)\n,' docs/CMakeLists.txt '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/ToolChains/*.cpp + '' + stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace tools/extra/clangd/CMakeLists.txt \ + --replace "NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB" FALSE ''; outputs = [ "out" "lib" "python" ]; diff --git a/nixpkgs/pkgs/development/compilers/solc/default.nix b/nixpkgs/pkgs/development/compilers/solc/default.nix index 48279fd71087..b7a2f602cc63 100644 --- a/nixpkgs/pkgs/development/compilers/solc/default.nix +++ b/nixpkgs/pkgs/development/compilers/solc/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchzip, fetchFromGitHub, boost, cmake, z3 }: let - version = "0.5.2"; - rev = "1df8f40cd2fd7b47698d847907b8ca7b47eb488d"; - sha256 = "009kjyb3r2p64wpdzfcmqr9swm5haaixbzvsbw1nd4wipwbp66y0"; + version = "0.5.3"; + rev = "10d17f245839f208ec5085309022a32cd2502f55"; + sha256 = "1jq41pd3nj534cricy1nq6wgk4wlwg239387n785aswpwd705jbb"; jsoncppURL = https://github.com/open-source-parsers/jsoncpp/archive/1.8.4.tar.gz; jsoncpp = fetchzip { url = jsoncppURL; diff --git a/nixpkgs/pkgs/development/coq-modules/iris/default.nix b/nixpkgs/pkgs/development/coq-modules/iris/default.nix index 134ea45493df..ea26f3e1ca9d 100644 --- a/nixpkgs/pkgs/development/coq-modules/iris/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/coq-modules/mathcomp-analysis/default.nix b/nixpkgs/pkgs/development/coq-modules/mathcomp-analysis/default.nix new file mode 100644 index 000000000000..f90be596fef1 --- /dev/null +++ b/nixpkgs/pkgs/development/coq-modules/mathcomp-analysis/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, coq, mathcomp-bigenough, mathcomp-finmap }: + +stdenv.mkDerivation rec { + version = "0.1.0"; + name = "coq${coq.coq-version}-mathcomp-analysis-${version}"; + + src = fetchFromGitHub { + owner = "math-comp"; + repo = "analysis"; + rev = version; + sha256 = "0hwkr2wzy710pcyh274fcarzdx8sv8myp16pv0vq5978nmih46al"; + }; + + buildInputs = [ coq ]; + propagatedBuildInputs = [ mathcomp-bigenough mathcomp-finmap ]; + + installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; + + meta = { + description = "Analysis library compatible with Mathematical Components"; + inherit (src.meta) homepage; + inherit (coq.meta) platforms; + license = stdenv.lib.licenses.cecill-c; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + }; + + passthru = { + compatibleCoqVersions = v: builtins.elem v [ "8.8" ]; + }; +} diff --git a/nixpkgs/pkgs/development/coq-modules/mathcomp-bigenough/default.nix b/nixpkgs/pkgs/development/coq-modules/mathcomp-bigenough/default.nix new file mode 100644 index 000000000000..fa4a2aaeddba --- /dev/null +++ b/nixpkgs/pkgs/development/coq-modules/mathcomp-bigenough/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, coq, mathcomp }: + +stdenv.mkDerivation rec { + version = "1.0.0"; + name = "coq${coq.coq-version}-mathcomp-bigenough-${version}"; + + src = fetchFromGitHub { + owner = "math-comp"; + repo = "bigenough"; + rev = version; + sha256 = "10g0gp3hk7wri7lijkrqna263346wwf6a3hbd4qr9gn8hmsx70wg"; + }; + + buildInputs = [ coq ]; + propagatedBuildInputs = [ mathcomp ]; + + installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; + + meta = { + description = "A small library to do epsilon - N reasonning"; + inherit (src.meta) homepage; + inherit (mathcomp.meta) platforms license; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + }; + + passthru = { + compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" ]; + }; +} diff --git a/nixpkgs/pkgs/development/coq-modules/mathcomp-finmap/default.nix b/nixpkgs/pkgs/development/coq-modules/mathcomp-finmap/default.nix new file mode 100644 index 000000000000..a5d0d006a38c --- /dev/null +++ b/nixpkgs/pkgs/development/coq-modules/mathcomp-finmap/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, coq, mathcomp }: + +stdenv.mkDerivation rec { + version = "1.1.0"; + name = "coq${coq.coq-version}-mathcomp-finmap-${version}"; + + src = fetchFromGitHub { + owner = "math-comp"; + repo = "finmap"; + rev = version; + sha256 = "05df59v3na8jhpsfp7hq3niam6asgcaipg2wngnzxzqnl86srp2a"; + }; + + buildInputs = [ coq ]; + propagatedBuildInputs = [ mathcomp ]; + + installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; + + meta = { + description = "A finset and finmap library"; + inherit (src.meta) homepage; + inherit (mathcomp.meta) platforms license; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + }; + + passthru = { + compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" ]; + }; +} diff --git a/nixpkgs/pkgs/development/coq-modules/metalib/default.nix b/nixpkgs/pkgs/development/coq-modules/metalib/default.nix index 46a6cafb6ab8..c196bdbcd766 100644 --- a/nixpkgs/pkgs/development/coq-modules/metalib/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/coq-modules/stdpp/default.nix b/nixpkgs/pkgs/development/coq-modules/stdpp/default.nix index 91801850ebfb..883ed971b083 100644 --- a/nixpkgs/pkgs/development/coq-modules/stdpp/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix b/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix index c5ddd18ff49b..74527a759b84 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix @@ -1186,6 +1186,12 @@ self: super: { # Jailbreak tasty < 1.2: https://github.com/phadej/tdigest/issues/30 tdigest = doJailbreak super.tdigest; # until tdigest > 0.2.1 these = doJailbreak super.these; # until these >= 0.7.6 + insert-ordered-containers = appendPatch super.insert-ordered-containers ./patches/insert-ordered-containers-fix-test.patch; + + uri-bytestring = appendPatch super.uri-bytestring (pkgs.fetchpatch { + url = "https://github.com/Soostone/uri-bytestring/commit/e5c5602a97160a6a6304a24947e33e47c9155460.patch"; + sha256 = "1qwy8bj6vywhp0075dza8j90zrzsm3144qz3c703s9c4n6pg3gw4"; + }); # These patches contain fixes for 8.6 that should be safe for # earlier versions, but we need the relaxed version bounds in GHC @@ -1203,4 +1209,13 @@ self: super: { sha256 = "0lrcmcrxp9imj9rfaq7mb0fn9mxms4gq4sz95n4san3dpd0qmj9x"; stripLen = 1; }); + + # Fix for base >= 4.11 + scat = overrideCabal super.scat (drv: { + patches = [(pkgs.fetchpatch { + url = "https://github.com/redelmann/scat/pull/6.diff"; + sha256 = "07nj2p0kg05livhgp1hkkdph0j0a6lb216f8x348qjasy0lzbfhl"; + })]; + }); + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix b/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix index 46c8c3f9f5b8..cf5ba1d6ad4b 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix @@ -153,9 +153,6 @@ self: super: builtins.intersectAttrs super { gtksourceview2 = addPkgconfigDepend super.gtksourceview2 pkgs.gtk2; gtk-traymanager = addPkgconfigDepend super.gtk-traymanager pkgs.gtk3; - # Add necessary reference to gtk3 package, plus specify needed dbus version, plus turn on strictDeps to fix build - taffybar = ((addPkgconfigDepend super.taffybar pkgs.gtk3).overrideDerivation (drv: { strictDeps = true; })); - # Add necessary reference to gtk3 package gi-dbusmenugtk3 = addPkgconfigDepend super.gi-dbusmenugtk3 pkgs.gtk3; diff --git a/nixpkgs/pkgs/development/haskell-modules/patches/insert-ordered-containers-fix-test.patch b/nixpkgs/pkgs/development/haskell-modules/patches/insert-ordered-containers-fix-test.patch new file mode 100644 index 000000000000..1e9ac5aa66a4 --- /dev/null +++ b/nixpkgs/pkgs/development/haskell-modules/patches/insert-ordered-containers-fix-test.patch @@ -0,0 +1,25 @@ +diff --git a/insert-ordered-containers.cabal b/insert-ordered-containers.cabal +index 0e8923a..bfbbec4 100644 +--- a/insert-ordered-containers.cabal ++++ b/insert-ordered-containers.cabal +@@ -21,8 +21,8 @@ tested-with: + GHC==7.10.3, + GHC==8.0.1, + GHC==8.2.2, +- GHC==8.4.3, +- GHC==8.6.1 ++ GHC==8.4.4, ++ GHC==8.6.3 + + extra-source-files: + CHANGELOG.md +@@ -70,7 +70,7 @@ test-suite ins-ord-containers-tests + , unordered-containers + , base + , insert-ordered-containers +- , tasty >= 0.10.1.2 && <1.2 ++ , tasty >= 0.10.1.2 && <1.3 + , tasty-quickcheck >= 0.8.3.2 && <0.11 + , QuickCheck >=2.7.6 && <2.13 + default-language: Haskell2010 + diff --git a/nixpkgs/pkgs/development/interpreters/groovy/default.nix b/nixpkgs/pkgs/development/interpreters/groovy/default.nix index 6b55f006cd2a..dc04e72c7411 100644 --- a/nixpkgs/pkgs/development/interpreters/groovy/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/interpreters/php/default.nix b/nixpkgs/pkgs/development/interpreters/php/default.nix index 3d9235757c6e..39f8d2514108 100644 --- a/nixpkgs/pkgs/development/interpreters/php/default.nix +++ b/nixpkgs/pkgs/development/interpreters/php/default.nix @@ -253,16 +253,16 @@ in { }; php72 = generic { - version = "7.2.14"; - sha256 = "15v5gbdxi6jkgdflpj5rqqzzfvwdb55hls4azh71xgy793934qgm"; + version = "7.2.15"; + sha256 = "0m05dmad138qfxcb2z4czf9pfv1746g9yzlch48kjikajhb7cgn9"; # https://bugs.php.net/bug.php?id=76826 extraPatches = optional stdenv.isDarwin ./php72-darwin-isfinite.patch; }; php73 = generic { - version = "7.3.1"; - sha256 = "13iqfkz9rmx9vy106lvw1nbk88qgwdkvxam0l5s14r7jsw62pvxg"; + version = "7.3.2"; + sha256 = "1p8amf91i6lrrphd6ypfh3kic64bpqf04dxp7dj1xxnjrgd50vwl"; # https://bugs.php.net/bug.php?id=76826 extraPatches = optional stdenv.isDarwin ./php73-darwin-isfinite.patch; diff --git a/nixpkgs/pkgs/development/libraries/hunspell/dictionaries.nix b/nixpkgs/pkgs/development/libraries/hunspell/dictionaries.nix index 836d0128a8c1..aeb4253826b8 100644 --- a/nixpkgs/pkgs/development/libraries/hunspell/dictionaries.nix +++ b/nixpkgs/pkgs/development/libraries/hunspell/dictionaries.nix @@ -250,6 +250,35 @@ let }; }; + mkDictFromLibreOffice = + { shortName + , shortDescription + , dictFileName + , license + , readmeFile ? "README_${dictFileName}.txt" + , sourceRoot ? dictFileName }: + mkDict rec { + name = "hunspell-dict-${shortName}-libreoffice-${version}"; + version = "6.2.0.3"; + inherit dictFileName readmeFile; + src = fetchFromGitHub { + owner = "LibreOffice"; + repo = "dictionaries"; + rev = "libreoffice-${version}"; + sha256 = "0rw9ahhynia5wsgyd67lrhinqqn1s1rizgiykb3palbyk0lv72xj"; + }; + buildPhase = '' + cp -a ${sourceRoot}/* . + ''; + meta = with stdenv.lib; { + homepage = https://wiki.documentfoundation.org/Development/Dictionaries; + description = "Hunspell dictionary for ${shortDescription} from LibreOffice"; + license = license; + maintainers = with maintainers; [ vlaci ]; + platforms = platforms.all; + }; + }; + in { /* ENGLISH */ @@ -510,6 +539,15 @@ in { ]; }; + /* HUNGARIAN */ + + hu-hu = mkDictFromLibreOffice { + shortName = "hu-hu"; + dictFileName = "hu_HU"; + shortDescription = "Hungarian (Hungary)"; + license = with stdenv.lib.licenses; [ mpl20 lgpl3 ]; + }; + /* SWEDISH */ sv-se = mkDictFromDSSO rec { diff --git a/nixpkgs/pkgs/development/libraries/libiio/default.nix b/nixpkgs/pkgs/development/libraries/libiio/default.nix index 312257304421..ec025d31ce3f 100644 --- a/nixpkgs/pkgs/development/libraries/libiio/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/libraries/libtoxcore/default.nix b/nixpkgs/pkgs/development/libraries/libtoxcore/default.nix index 026674e44fc4..1605abf6efa1 100644 --- a/nixpkgs/pkgs/development/libraries/libtoxcore/default.nix +++ b/nixpkgs/pkgs/development/libraries/libtoxcore/default.nix @@ -48,7 +48,7 @@ in rec { }; libtoxcore_0_2 = generic { - version = "0.2.8"; - sha256 = "0xgnraysz25fbws5zwjk92mwnl8k1yih701qam8kgm3rxh50kyhm"; + version = "0.2.9"; + sha256 = "0aljr9hqybla6p61af6fdkv0x8gph7c2wacqqa9hq2z9w0p4fs5j"; }; } diff --git a/nixpkgs/pkgs/development/libraries/libwnck/3.x.nix b/nixpkgs/pkgs/development/libraries/libwnck/3.x.nix index e4bbeacb3624..9c35d3373505 100644 --- a/nixpkgs/pkgs/development/libraries/libwnck/3.x.nix +++ b/nixpkgs/pkgs/development/libraries/libwnck/3.x.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, libX11, gtk3, intltool, gobject-introspection, gnome3}: +{ stdenv, fetchurl, pkgconfig, libX11, gtk3, intltool, gobject-introspection, gnome3 }: let pname = "libwnck"; @@ -33,6 +33,6 @@ in stdenv.mkDerivation rec{ description = "Library to manage X windows and workspaces (via pagers, tasklists, etc.)"; license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = []; + maintainers = [ maintainers.worldofpeace ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/mlt/qt-5.nix b/nixpkgs/pkgs/development/libraries/mlt/qt-5.nix index 804c3f8ed228..1f41696a4e33 100644 --- a/nixpkgs/pkgs/development/libraries/mlt/qt-5.nix +++ b/nixpkgs/pkgs/development/libraries/mlt/qt-5.nix @@ -7,13 +7,13 @@ let inherit (stdenv.lib) getDev; in stdenv.mkDerivation rec { name = "mlt-${version}"; - version = "6.10.0"; + version = "6.12.0"; src = fetchFromGitHub { owner = "mltframework"; repo = "mlt"; rev = "v${version}"; - sha256 = "0ki86yslr5ywa6sz8pjrgd9a4rn2rr4mss2zkmqi7pq8prgsm1fr"; + sha256 = "0pzm3mjbbdl2rkbswgyfkx552xlxh2qrwzsi2a4dicfr92rfgq6w"; }; buildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/openvdb/default.nix b/nixpkgs/pkgs/development/libraries/openvdb/default.nix index c11a93373dd1..8058891615f2 100644 --- a/nixpkgs/pkgs/development/libraries/openvdb/default.nix +++ b/nixpkgs/pkgs/development/libraries/openvdb/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "openvdb-${version}"; - version = "5.2.0"; + version = "6.0.0"; src = fetchFromGitHub { owner = "dreamworksanimation"; repo = "openvdb"; rev = "v${version}"; - sha256 = "1yykrbc3nnnmpmmk0dz4b4y5xl4hl3ayjpqw0baq8yx2614r46b5"; + sha256 = "07m012a966l821f09jmrrhs25cs2rcmhlxcicywibllaac10wk5k"; }; outputs = [ "out" ]; diff --git a/nixpkgs/pkgs/development/libraries/physics/hepmc3/default.nix b/nixpkgs/pkgs/development/libraries/physics/hepmc3/default.nix new file mode 100644 index 000000000000..972dfdd7ad1a --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/physics/hepmc3/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, cmake, coreutils, root }: + +stdenv.mkDerivation rec { + name = "hepmc3-${version}"; + version = "3.1.0"; + + src = fetchurl { + url = "http://hepmc.web.cern.ch/hepmc/releases/HepMC3-${version}.tar.gz"; + sha256 = "12kzdqdbq7md0nn58jvilhh00yddfir65f0q2026k0ym37bfwdyd"; + }; + + buildInputs = [ cmake root ]; + + postInstall = '' + substituteInPlace "$out"/bin/HepMC3-config \ + --replace 'greadlink' '${coreutils}/bin/readlink' + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "The HepMC package is an object oriented, C++ event record for High Energy Physics Monte Carlo generators and simulation"; + license = licenses.gpl3; + homepage = http://hepmc.web.cern.ch/hepmc/; + platforms = platforms.unix; + maintainers = with maintainers; [ veprbl ]; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/qpdf/default.nix b/nixpkgs/pkgs/development/libraries/qpdf/default.nix index 4053afe4beca..30383dda50cf 100644 --- a/nixpkgs/pkgs/development/libraries/qpdf/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/libraries/science/math/nccl/default.nix b/nixpkgs/pkgs/development/libraries/science/math/nccl/default.nix index d3c20258425b..badd08291de4 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/nccl/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/nccl/default.nix @@ -1,24 +1,44 @@ -{ callPackage, cudatoolkit_8, cudatoolkit_9 }: +{ stdenv, fetchFromGitHub, which, cudatoolkit }: -let - generic = args: callPackage (import ./generic.nix (removeAttrs args ["cudatoolkit"])) { - inherit (args) cudatoolkit; +stdenv.mkDerivation rec { + name = "nccl-${version}-cuda-${cudatoolkit.majorVersion}"; + version = "2.4.2-1"; + + src = fetchFromGitHub { + owner = "NVIDIA"; + repo = "nccl"; + rev = "v${version}"; + sha256 = "0aa4gv51nbmmdhx6vp40l249m4arp30sijrn6kwxdfi1k9kajiq5"; }; -in + outputs = [ "out" "dev" ]; -{ - nccl_cudatoolkit_8 = generic rec { - version = "2.1.4"; - cudatoolkit = cudatoolkit_8; - srcName = "nccl_${version}-1+cuda${cudatoolkit.majorVersion}_x86_64.txz"; - sha256 = "1lwwm8kdhna5m318yg304kl2gsz1jwhv4zv4gn8av2m57zh848zi"; - }; + nativeBuildInputs = [ which ]; + + buildInputs = [ cudatoolkit ]; + + preConfigure = '' + patchShebangs src/collectives/device/gen_rules.sh + ''; + + makeFlags = [ + "CUDA_HOME=${cudatoolkit}" + "PREFIX=$(out)" + ]; + + postFixup = '' + moveToOutput lib/libnccl_static.a $dev + ''; + + NIX_CFLAGS_COMPILE = [ "-Wno-unused-function" ]; + + enableParallelBuilding = true; - nccl_cudatoolkit_9 = generic rec { - version = "2.1.4"; - cudatoolkit = cudatoolkit_9; - srcName = "nccl_${version}-1+cuda${cudatoolkit.majorVersion}_x86_64.txz"; - sha256 = "0pajmqzkacpszs63jh2hw2qqc49kj75kcf7r0ky8hdh560q8xn0p"; + meta = with stdenv.lib; { + description = "Multi-GPU and multi-node collective communication primitives for NVIDIA GPUs"; + homepage = https://developer.nvidia.com/nccl; + license = licenses.bsd3; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ mdaiter orivej ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/science/math/nccl/generic.nix b/nixpkgs/pkgs/development/libraries/science/math/nccl/generic.nix deleted file mode 100644 index 609a7df51e58..000000000000 --- a/nixpkgs/pkgs/development/libraries/science/math/nccl/generic.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ version -, srcName -, sha256 -}: - -{ stdenv -, lib -, requireFile -, cudatoolkit -}: - -stdenv.mkDerivation rec { - name = "cudatoolkit-${cudatoolkit.majorVersion}-nccl-${version}"; - - inherit version; - - src = requireFile rec { - name = srcName; - inherit sha256; - message = '' - This nix expression requires that ${name} is already part of the store. - Register yourself to NVIDIA Accelerated Computing Developer Program, retrieve the NCCL library - at https://developer.nvidia.com/nccl, and run the following command in the download directory: - nix-prefetch-url file://\$PWD/${name} - ''; - }; - - unpackCmd = "tar xJf $src"; - - installPhase = '' - function fixRunPath { - p=$(patchelf --print-rpath $1) - patchelf --set-rpath "$p:${lib.makeLibraryPath [ stdenv.cc.cc ]}" $1 - } - fixRunPath lib/libnccl.so - - mkdir -p $out - cp -a include $out/include - cp -a lib $out/lib - ''; - - propagatedBuildInputs = [ - cudatoolkit - ]; - - passthru = { - inherit cudatoolkit; - }; - - meta = with stdenv.lib; { - description = "Multi-GPU and multi-node collective communication primitives that are performance optimized for NVIDIA GPUs"; - homepage = https://developer.nvidia.com/nccl; - license = licenses.unfree; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ mdaiter ]; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/vte/ng.nix b/nixpkgs/pkgs/development/libraries/vte/ng.nix index 3aee9e9dcdf3..6231b8315cd5 100644 --- a/nixpkgs/pkgs/development/libraries/vte/ng.nix +++ b/nixpkgs/pkgs/development/libraries/vte/ng.nix @@ -2,13 +2,13 @@ vte.overrideAttrs (oldAttrs: rec { name = "vte-ng-${version}"; - version = "0.50.2.a"; + version = "0.54.2.a"; src = fetchFromGitHub { owner = "thestinger"; repo = "vte-ng"; rev = version; - sha256 = "0i6hfzw9sq8521kz0l7lld2km56r0bfp1hw6kxq3j1msb8z8svcf"; + sha256 = "1r7d9m07cpdr4f7rw3yx33hmp4jmsk0dn5byq5wgksb2qjbc4ags"; }; preConfigure = oldAttrs.preConfigure + "; NOCONFIGURE=1 ./autogen.sh"; diff --git a/nixpkgs/pkgs/development/libraries/wxSVG/default.nix b/nixpkgs/pkgs/development/libraries/wxSVG/default.nix index 27b95208432e..442e3fca77c3 100644 --- a/nixpkgs/pkgs/development/libraries/wxSVG/default.nix +++ b/nixpkgs/pkgs/development/libraries/wxSVG/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { name = "wxSVG-${version}"; srcName = "wxsvg-${version}"; - version = "1.5.15"; + version = "1.5.16"; src = fetchurl { url = "mirror://sourceforge/project/wxsvg/wxsvg/${version}/${srcName}.tar.bz2"; - sha256 = "1f6fhkdmcfs8w7x08vhiqygss4qzcsimhd91h0j58zw25ky6rzqn"; + sha256 = "1gnajsk73vkj7ii43ynr20ln9qck3f0lshf5gdbxsam3qgmx7gd4"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/eliom/default.nix b/nixpkgs/pkgs/development/ocaml-modules/eliom/default.nix index f82cf33e3079..ec63e58fbb65 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/eliom/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/eliom/default.nix @@ -1,23 +1,22 @@ -{ stdenv, fetchurl, which, ocsigen_server, ocsigen_deriving, ocaml, camlp4, +{ stdenv, fetchurl, which, ocsigen_server, ocsigen_deriving, ocaml, lwt_camlp4, lwt_react, cryptokit, - ipaddr, ocamlnet, lwt_ssl, ocaml_pcre, + ipaddr, ocamlnet, ocaml_pcre, opaline, ppx_tools, ppx_deriving, findlib , js_of_ocaml-ocamlbuild, js_of_ocaml-ppx, js_of_ocaml-ppx_deriving_json , js_of_ocaml-lwt , js_of_ocaml-tyxml +, lwt_ppx }: -assert stdenv.lib.versionAtLeast ocaml.version "4.03"; - stdenv.mkDerivation rec { pname = "eliom"; - version = "6.3.0"; + version = "6.4.0"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/ocsigen/eliom/archive/${version}.tar.gz"; - sha256 = "137hgdzv9fwkzf6xdksqy437lrf8xvrycf5jwc3z4cmpsigs6x7v"; + sha256 = "1ad7ympvj0cb51d9kbp4naxkld3gv8cfp4a037a5dr55761zdhdh"; }; patches = [ ./camlp4.patch ]; @@ -27,15 +26,12 @@ stdenv.mkDerivation rec ]; propagatedBuildInputs = [ - camlp4 - cryptokit - ipaddr js_of_ocaml-lwt js_of_ocaml-ppx js_of_ocaml-tyxml + lwt_camlp4 + lwt_ppx lwt_react - lwt_ssl - ocamlnet ocaml_pcre ocsigen_server ppx_deriving ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/lwt/camlp4.nix b/nixpkgs/pkgs/development/ocaml-modules/lwt/camlp4.nix new file mode 100644 index 000000000000..53f0435f462f --- /dev/null +++ b/nixpkgs/pkgs/development/ocaml-modules/lwt/camlp4.nix @@ -0,0 +1,25 @@ +{ lib, fetchFromGitHub, buildDunePackage, camlp4 }: + +buildDunePackage rec { + pname = "lwt_camlp4"; + version = "git-20180325"; + + src = fetchFromGitHub { + owner = "ocsigen"; + repo = pname; + rev = "45f25a081e01071ab566924b48ba5f7553bb33ac"; + sha256 = "1lv8z6ljfy47yvxmwf5jrvc5d3dc90r1n291x53j161sf22ddrk9"; + }; + + minimumOCamlVersion = "4.02"; + + propagatedBuildInputs = [ camlp4 ]; + + meta = { + description = "Camlp4 syntax extension for Lwt (deprecated)"; + license = lib.licenses.lgpl21; + inherit (src.meta) homepage; + maintainers = [ lib.maintainers.vbgl ]; + }; +} + diff --git a/nixpkgs/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocsigen-server/default.nix index 474f69ba918e..147b4200cf69 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/ocsigen-server/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/ocsigen-server/default.nix @@ -1,42 +1,37 @@ -{ stdenv, fetchurl, ocaml, findlib, which, react, ssl -, ocamlnet, ocaml_pcre, cryptokit, tyxml, ipaddr, zlib, -libev, openssl, ocaml_sqlite3, tree, uutf, makeWrapper, camlp4 -, camlzip, pgocaml, lwt2, lwt_react, lwt_ssl +{ stdenv, fetchFromGitHub, which, ocaml, findlib, lwt_react, ssl, lwt_ssl +, lwt_log, ocamlnet, ocaml_pcre, cryptokit, tyxml, xml-light, ipaddr +, pgocaml, camlzip, ocaml_sqlite3 +, makeWrapper }: +if !stdenv.lib.versionAtLeast ocaml.version "4.03" +then throw "ocsigenserver is not available for OCaml ${ocaml.version}" +else + let mkpath = p: n: - let v = stdenv.lib.getVersion ocaml; in - "${p}/lib/ocaml/${v}/site-lib/${n}"; + "${p}/lib/ocaml/${ocaml.version}/site-lib/${n}"; in -let param = - if stdenv.lib.versionAtLeast ocaml.version "4.03" then { - version = "2.9"; - sha256 = "0na3qa4h89f2wv31li63nfpg4151d0g8fply0bq59j3bhpyc85nd"; - buildInputs = [ lwt_react lwt_ssl ]; - ldpath = ""; - } else { - version = "2.8"; - sha256 = "1v44qv2ixd7i1qinyhlzzqiffawsdl7xhhh6ysd7lf93kh46d5sy"; - buildInputs = [ lwt2 ]; - ldpath = "${mkpath lwt2 "lwt"}"; - } -; in - -stdenv.mkDerivation { - name = "ocsigenserver-${param.version}"; +stdenv.mkDerivation rec { + version = "2.11.0"; + name = "ocsigenserver-${version}"; - src = fetchurl { - url = "https://github.com/ocsigen/ocsigenserver/archive/${param.version}.tar.gz"; - inherit (param) sha256; + src = fetchFromGitHub { + owner = "ocsigen"; + repo = "ocsigenserver"; + rev = version; + sha256 = "0y1ngki7w9s10ip7nj9qb7254bd5sp01xxz16sxyj7l7qz603hy2"; }; - buildInputs = [ocaml which findlib react ssl - ocamlnet ocaml_pcre cryptokit tyxml ipaddr zlib libev openssl - ocaml_sqlite3 tree uutf makeWrapper camlp4 pgocaml camlzip ] - ++ (param.buildInputs or []); + buildInputs = [ which makeWrapper ocaml findlib + lwt_react pgocaml camlzip ocaml_sqlite3 + ]; + + propagatedBuildInputs = [ cryptokit ipaddr lwt_log lwt_ssl ocamlnet + ocaml_pcre tyxml xml-light + ]; - configureFlags = [ "--root $(out) --prefix /" ]; + configureFlags = [ "--root $(out)" "--prefix /" ]; dontAddPrefix = true; @@ -46,7 +41,7 @@ stdenv.mkDerivation { '' rm -rf $out/var/run wrapProgram $out/bin/ocsigenserver \ - --prefix CAML_LD_LIBRARY_PATH : "${mkpath ssl "ssl"}:${param.ldpath}:${mkpath ocamlnet "netsys"}:${mkpath ocamlnet "netstring"}:${mkpath ocaml_pcre "pcre"}:${mkpath cryptokit "cryptokit"}:${mkpath ocaml_sqlite3 "sqlite3"}" + --prefix CAML_LD_LIBRARY_PATH : "${mkpath ssl "ssl"}:${mkpath ocamlnet "netsys"}:${mkpath ocamlnet "netstring"}:${mkpath ocaml_pcre "pcre"}:${mkpath cryptokit "cryptokit"}:${mkpath ocaml_sqlite3 "sqlite3"}" ''; dontPatchShebangs = true; diff --git a/nixpkgs/pkgs/development/ocaml-modules/ocsigen-start/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocsigen-start/default.nix index ba7e3e93c989..4bc9b7f8629e 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/ocsigen-start/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/ocsigen-start/default.nix @@ -1,14 +1,15 @@ -{ stdenv, fetchurl, buildOcaml, ocsigen-toolkit, eliom, ocaml_pcre, pgocaml, macaque, safepass, yojson, ocsigen_deriving, ocsigen_server +{ stdenv, fetchFromGitHub, buildOcaml, ocsigen-toolkit, eliom, ocaml_pcre, pgocaml, macaque, safepass, yojson, ocsigen_deriving, ocsigen_server , js_of_ocaml-camlp4 +, resource-pooling }: buildOcaml rec { name = "ocsigen-start"; - version = "1.1.0"; + version = "1.5.0"; buildInputs = [ eliom js_of_ocaml-camlp4 ]; - propagatedBuildInputs = [ pgocaml macaque safepass ocaml_pcre ocsigen-toolkit yojson ocsigen_deriving ocsigen_server ]; + propagatedBuildInputs = [ pgocaml macaque safepass ocaml_pcre ocsigen-toolkit yojson ocsigen_deriving ocsigen_server resource-pooling ]; patches = [ ./templates-dir.patch ]; @@ -16,13 +17,13 @@ buildOcaml rec substituteInPlace "src/os_db.ml" --replace "citext" "text" ''; - src = fetchurl { - url = "https://github.com/ocsigen/${name}/archive/${version}.tar.gz"; - sha256 = "09cw6qzcld0m1qm66mbjg9gw8l6dynpw3fzhm3kfx5ldh0afgvjq"; + src = fetchFromGitHub { + owner = "ocsigen"; + repo = name; + rev = version; + sha256 = "07478hz5jhxb242hfr808516k81vdbzj4j6cycvls3b9lzbyszha"; }; - createFindlibDestdir = true; - meta = { homepage = http://ocsigen.org/ocsigen-start; description = "Eliom application skeleton"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix index 37c8c8f76c95..4e46c1534d80 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, buildOcaml, ocaml, opaline +{ stdenv, fetchFromGitHub, ocaml, findlib, opaline , calendar, eliom, js_of_ocaml-ppx_deriving_json }: -buildOcaml rec -{ - name = "ocsigen-toolkit"; - version = "1.1.0"; +stdenv.mkDerivation rec { + pname = "ocsigen-toolkit"; + name = "ocaml${ocaml.version}-${pname}-${version}"; + version = "2.0.0"; propagatedBuildInputs = [ calendar eliom js_of_ocaml-ppx_deriving_json ]; - buildInputs = [ opaline ]; + buildInputs = [ ocaml findlib opaline ]; installPhase = '' @@ -17,16 +17,21 @@ buildOcaml rec opaline -prefix $out ''; - src = fetchurl { - sha256 = "1i5806gaqqllgsgjz3lf9fwlffqg3vfl49msmhy7xvq2sncbxp8a"; - url = "https://github.com/ocsigen/${name}/archive/${version}.tar.gz"; + src = fetchFromGitHub { + owner = "ocsigen"; + repo = pname; + rev = version; + sha256 = "0gkiqw3xi31l9q9h89fnr5gfmxi9w9lg9rlv16h4ssjgrgq3y5cw"; }; + createFindlibDestdir = true; + meta = { homepage = http://ocsigen.org/ocsigen-toolkit/; description = " User interface widgets for Ocsigen applications"; license = stdenv.lib.licenses.lgpl21; maintainers = [ stdenv.lib.maintainers.gal_bolle ]; + inherit (ocaml.meta) platforms; }; diff --git a/nixpkgs/pkgs/development/python-modules/aws-sam-translator/default.nix b/nixpkgs/pkgs/development/python-modules/aws-sam-translator/default.nix index 307cd9b84b0a..917a93798820 100644 --- a/nixpkgs/pkgs/development/python-modules/aws-sam-translator/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aws-sam-translator/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "aws-sam-translator"; - version = "1.8.0"; + version = "1.9.0"; src = fetchPypi { inherit pname version; - sha256 = "bdf9ba476a9a7726fe93746670ccae257955352d98b231f32e9529f01db7ef3b"; + sha256 = "1334795a85077cd5741822149260f90104fb2a01699171c9e9567c0db76ed74d"; }; # Tests are not included in the PyPI package diff --git a/nixpkgs/pkgs/development/python-modules/braintree/default.nix b/nixpkgs/pkgs/development/python-modules/braintree/default.nix index 5bd545db51cc..5e24a880e759 100644 --- a/nixpkgs/pkgs/development/python-modules/braintree/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/cfn-flip/default.nix b/nixpkgs/pkgs/development/python-modules/cfn-flip/default.nix new file mode 100644 index 000000000000..ab6abc4cd6f6 --- /dev/null +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/daphne/default.nix b/nixpkgs/pkgs/development/python-modules/daphne/default.nix index 772ca350f132..da85fbb1d9b7 100644 --- a/nixpkgs/pkgs/development/python-modules/daphne/default.nix +++ b/nixpkgs/pkgs/development/python-modules/daphne/default.nix @@ -4,7 +4,7 @@ }: buildPythonPackage rec { pname = "daphne"; - version = "2.2.4"; + version = "2.2.5"; disabled = !isPy3k; @@ -12,7 +12,7 @@ buildPythonPackage rec { owner = "django"; repo = pname; rev = version; - sha256 = "0mpn2xbpx2r67bj5crfvxfwlznxlp7rcfbb2xly6ad3d0c7djkdi"; + sha256 = "0ixgq1rr3s60bmrwx8qwvlvs3lag1c2nrmg4iy7wcmb8i1ddylqr"; }; nativeBuildInputs = [ pytestrunner ]; diff --git a/nixpkgs/pkgs/development/python-modules/distributed/default.nix b/nixpkgs/pkgs/development/python-modules/distributed/default.nix index 0ea3a9d8ab4d..29460f14eab3 100644 --- a/nixpkgs/pkgs/development/python-modules/distributed/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/django/2_0.nix b/nixpkgs/pkgs/development/python-modules/django/2_0.nix deleted file mode 100644 index daabcefb6e92..000000000000 --- a/nixpkgs/pkgs/development/python-modules/django/2_0.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ stdenv, buildPythonPackage, fetchPypi, substituteAll, - isPy3k, - geos, gdal, pytz, - withGdal ? false -}: - -buildPythonPackage rec { - pname = "Django"; - version = "2.0.10"; - - disabled = !isPy3k; - - src = fetchPypi { - inherit pname version; - sha256 = "0292a7ad7d8ffc9cfc6a77f043d2e81f5bbc360c0c4a1686e130ef3432437d23"; - }; - - patches = stdenv.lib.optionals withGdal [ - (substituteAll { - src = ./1.10-gis-libs.template.patch; - geos = geos; - gdal = gdal; - extension = stdenv.hostPlatform.extensions.sharedLibrary; - }) - ]; - - # patch only $out/bin to avoid problems with starter templates (see #3134) - postFixup = '' - wrapPythonProgramsIn $out/bin "$out $pythonPath" - ''; - - propagatedBuildInputs = [ pytz ]; - - # too complicated to setup - doCheck = false; - - meta = with stdenv.lib; { - description = "A high-level Python Web framework"; - homepage = https://www.djangoproject.com/; - license = licenses.bsd3; - maintainers = with maintainers; [ georgewhewell ]; - }; -} diff --git a/nixpkgs/pkgs/development/python-modules/django_reversion/default.nix b/nixpkgs/pkgs/development/python-modules/django_reversion/default.nix index 35879a7bfb49..9dfdf51186fc 100644 --- a/nixpkgs/pkgs/development/python-modules/django_reversion/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django_reversion/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "django-reversion"; - version = "3.0.2"; + version = "3.0.3"; src = fetchPypi { inherit pname version; - sha256 = "9b8a245917e1bae131d3210c9ca7efbc066e60f32efa436e391c9803c3f4b61b"; + sha256 = "0xjs803r5fxaqpkjbpsb17j8racxa4q1nvjjaj1akkgkgw9dj343"; }; # tests assume the availability of a mysql/postgresql database diff --git a/nixpkgs/pkgs/development/python-modules/future-fstrings/default.nix b/nixpkgs/pkgs/development/python-modules/future-fstrings/default.nix index 7df148df09c9..9e49147315b5 100644 --- a/nixpkgs/pkgs/development/python-modules/future-fstrings/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/httmock/default.nix b/nixpkgs/pkgs/development/python-modules/httmock/default.nix index b50753c55864..53447544ca92 100644 --- a/nixpkgs/pkgs/development/python-modules/httmock/default.nix +++ b/nixpkgs/pkgs/development/python-modules/httmock/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "httmock"; - version = "1.2.6"; + version = "1.3.0"; src = fetchFromGitHub { owner = "patrys"; repo = "httmock"; rev = version; - sha256 = "0iya8qsb2jm03s9p6sf1yzgm1irxl3dcq0k0a9ygl0skzjz5pvab"; + sha256 = "1dy7pjq4gz476jcnbbpzk8w8qxr9l8wwgw9x2c7lf6fzsgnf404q"; }; checkInputs = [ requests ]; diff --git a/nixpkgs/pkgs/development/python-modules/keras-applications/default.nix b/nixpkgs/pkgs/development/python-modules/keras-applications/default.nix index a069c205144d..c6fdd21d2ebe 100644 --- a/nixpkgs/pkgs/development/python-modules/keras-applications/default.nix +++ b/nixpkgs/pkgs/development/python-modules/keras-applications/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "Keras_Applications"; - version = "1.0.6"; + version = "1.0.7"; src = fetchPypi { inherit pname version; - sha256 = "a03af60ddc9c5afdae4d5c9a8dd4ca857550e0b793733a5072e0725829b87017"; + sha256 = "1yk9brcvr96s1slpgj9vr6np7fk8limcrw9v2pjq72c6k0mpnq30"; }; # Cyclic dependency: keras-applications requires keras, which requires keras-applications diff --git a/nixpkgs/pkgs/development/python-modules/libcloud/default.nix b/nixpkgs/pkgs/development/python-modules/libcloud/default.nix index 52cac7177803..e6a493f7b641 100644 --- a/nixpkgs/pkgs/development/python-modules/libcloud/default.nix +++ b/nixpkgs/pkgs/development/python-modules/libcloud/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "apache-libcloud"; - version = "2.3.0"; + version = "2.4.0"; src = fetchPypi { inherit pname version; - sha256 = "0e2eee3802163bd0605975ed1e284cafc23203919bfa80c0cc5d3cd2543aaf97"; + sha256 = "0daj3mkzw79v5zin2r1s2wkrz1hplfc16bwj4ss68i5qjq4l2p0j"; }; checkInputs = [ mock pytest pytestrunner requests-mock ]; diff --git a/nixpkgs/pkgs/development/python-modules/libusb1/default.nix b/nixpkgs/pkgs/development/python-modules/libusb1/default.nix index 8a9b5da68ef9..9b268686b8ff 100644 --- a/nixpkgs/pkgs/development/python-modules/libusb1/default.nix +++ b/nixpkgs/pkgs/development/python-modules/libusb1/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "libusb1"; - version = "1.6.6"; + version = "1.7"; src = fetchPypi { inherit pname version; - sha256 = "a49917a2262cf7134396f6720c8be011f14aabfc5cdc53f880cc672c0f39d271"; + sha256 = "03vylg5mdsxp2nyk8sm7yxmb470hcb92q263dfq8d6b9xp96ckwx"; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/nuitka/default.nix b/nixpkgs/pkgs/development/python-modules/nuitka/default.nix index 7d7f7da753e1..ec68cb54afe3 100644 --- a/nixpkgs/pkgs/development/python-modules/nuitka/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nuitka/default.nix @@ -13,13 +13,13 @@ let # Therefore we create a separate env for it. scons = pkgs.python27.withPackages(ps: [ pkgs.scons ]); in buildPythonPackage rec { - version = "0.6.1"; + version = "0.6.1.1"; pname = "Nuitka"; # Latest version is not yet on PyPi src = fetchurl { url = "https://github.com/kayhayen/Nuitka/archive/${version}.tar.gz"; - sha256 = "0ncclbj9qdd88fs26mvgf217m7kgfcy1zgsyzi1j65b6z2wywl9a"; + sha256 = "0dlhbgn90nj110kmylyrzxd301611g63ynbpm5dfsb09s9c569zm"; }; checkInputs = [ vmprof pyqt4 ]; diff --git a/nixpkgs/pkgs/development/python-modules/plotly/default.nix b/nixpkgs/pkgs/development/python-modules/plotly/default.nix index 58ad690ce2df..20a9c7ca9812 100644 --- a/nixpkgs/pkgs/development/python-modules/plotly/default.nix +++ b/nixpkgs/pkgs/development/python-modules/plotly/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "plotly"; - version = "3.4.1"; + version = "3.4.2"; src = fetchPypi { inherit pname version; - sha256 = "5dc85bde91bc80fa05f0d89e9f3a8eaee735b2b404047266874e0ff9c104407f"; + sha256 = "0bv4gq60mrkw0r5kmakxrnfawlim01bjf3khp62p0qmhw0ixk269"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/prawcore/default.nix b/nixpkgs/pkgs/development/python-modules/prawcore/default.nix index 950d478b30f8..f1ce7ba2a087 100644 --- a/nixpkgs/pkgs/development/python-modules/prawcore/default.nix +++ b/nixpkgs/pkgs/development/python-modules/prawcore/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub +{ stdenv, buildPythonPackage, fetchPypi , requests , testfixtures, mock, requests_toolbelt , betamax, betamax-serializers, betamax-matchers @@ -6,19 +6,13 @@ buildPythonPackage rec { pname = "prawcore"; - version = "1.0.0"; + version = "1.0.1"; - src = fetchFromGitHub { - owner = "praw-dev"; - repo = "prawcore"; - rev = "v${version}"; - sha256 = "1j905wi5n2xgik3yk2hrv8dky318ahfjl5k1zs21mrl81jk0907f"; + src = fetchPypi { + inherit pname version; + sha256 = "ab5558efb438aa73fc66c4178bfc809194dea3ce2addf4dec873de7e2fd2824e"; }; - postPatch = '' - sed -i "s/'testfixtures >4.13.2, <6'/'testfixtures >4.13.2'/g" setup.py - ''; - propagatedBuildInputs = [ requests ]; diff --git a/nixpkgs/pkgs/development/python-modules/py3status/default.nix b/nixpkgs/pkgs/development/python-modules/py3status/default.nix index 412b3b2342a5..5f43ae32ea23 100644 --- a/nixpkgs/pkgs/development/python-modules/py3status/default.nix +++ b/nixpkgs/pkgs/development/python-modules/py3status/default.nix @@ -19,11 +19,11 @@ buildPythonPackage rec { pname = "py3status"; - version = "3.15"; + version = "3.16"; src = fetchPypi { inherit pname version; - sha256 = "78aa7fa0af707641e215ea93bfd4bb5fd47f18a7193d84ed60bb9e6cccb75b7f"; + sha256 = "1xrfph277bgjln3jbpzpgkhxad04fjvj7s3xfil42q1sxi4s3q3g"; }; doCheck = false; diff --git a/nixpkgs/pkgs/development/python-modules/pycontracts/default.nix b/nixpkgs/pkgs/development/python-modules/pycontracts/default.nix index 42d19bb87550..6ae90ac55243 100644 --- a/nixpkgs/pkgs/development/python-modules/pycontracts/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pycontracts/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "PyContracts"; - version = "1.8.7"; + version = "1.8.8"; src = fetchPypi { inherit pname version; - sha256 = "1b65jkbk9bcl10s49w9frsjcarfzi8gp22a40cz7zxry8b8yvcf0"; + sha256 = "0njcssvjj2aisb52xp9jmfps43iqg3fw4grj524i911p34yln2va"; }; buildInputs = [ nose ]; diff --git a/nixpkgs/pkgs/development/python-modules/pyfakefs/default.nix b/nixpkgs/pkgs/development/python-modules/pyfakefs/default.nix index 3ec5998cadd7..4b128db82eac 100644 --- a/nixpkgs/pkgs/development/python-modules/pyfakefs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyfakefs/default.nix @@ -1,12 +1,12 @@ { stdenv, buildPythonPackage, fetchPypi, python, pytest, glibcLocales }: buildPythonPackage rec { - version = "3.5.6"; + version = "3.5.7"; pname = "pyfakefs"; src = fetchPypi { inherit pname version; - sha256 = "efe9c318b2a37ae498a555889684c30ccb6a1b06bd391cb3baf0eb5ba68e9062"; + sha256 = "8969435f8e7ca10f60c22096b02b15ad3af143de7d3bb4d73507b812bcdd8e37"; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/pymacaroons-pynacl/default.nix b/nixpkgs/pkgs/development/python-modules/pymacaroons-pynacl/default.nix deleted file mode 100644 index 8bc644252c0f..000000000000 --- a/nixpkgs/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/nixpkgs/pkgs/development/python-modules/pymacaroons/default.nix b/nixpkgs/pkgs/development/python-modules/pymacaroons/default.nix new file mode 100644 index 000000000000..96023c01e1e5 --- /dev/null +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/pynvim/default.nix b/nixpkgs/pkgs/development/python-modules/pynvim/default.nix index 3811e5082c0f..40aae88c3ab7 100644 --- a/nixpkgs/pkgs/development/python-modules/pynvim/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pynvim/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "pynvim"; - version = "0.3.1"; + version = "0.3.2"; src = fetchPypi { inherit pname version; - sha256 = "1yxh8zdigzs330m4gchxk6m323glz81x85q5fzgc4saq0naib26x"; + sha256 = "01dybk4vs452pljn1q3il5z2sd313ki0lgiglc0xmjc6wp290r6g"; }; checkInputs = [ nose ]; diff --git a/nixpkgs/pkgs/development/python-modules/pytest-django/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-django/default.nix index 35b2ac34cabc..e0d60df69984 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-django/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-django/default.nix @@ -10,11 +10,11 @@ }: buildPythonPackage rec { pname = "pytest-django"; - version = "3.4.5"; + version = "3.4.6"; src = fetchPypi { inherit pname version; - sha256 = "0dh7jm1d37p54pgc7cx4izz6khsd860a6hw64gx74c8fjfz36p8s"; + sha256 = "0r190xb707817la5kw5i3m646ijmg025zqy55gz16py94wsnav5y"; }; buildInputs = [ pytest setuptools_scm ]; diff --git a/nixpkgs/pkgs/development/python-modules/python-jenkins/default.nix b/nixpkgs/pkgs/development/python-modules/python-jenkins/default.nix index cdce1b337183..44f1c0d6c39d 100644 --- a/nixpkgs/pkgs/development/python-modules/python-jenkins/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/pywal/default.nix b/nixpkgs/pkgs/development/python-modules/pywal/default.nix index 7f908c943aef..3fd618918781 100644 --- a/nixpkgs/pkgs/development/python-modules/pywal/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pywal/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pywal"; - version = "3.2.1"; + version = "3.3.0"; src = fetchPypi { inherit pname version; - sha256 = "1pj30h19ijwhmbm941yzbkgr19q06dhp9492h9nrqw1wfjfdbdic"; + sha256 = "1drha9kshidw908k7h3gd9ws2bl64ms7bjcsa83pwb3hqa9bkspg"; }; preCheck = '' diff --git a/nixpkgs/pkgs/development/python-modules/qtawesome/default.nix b/nixpkgs/pkgs/development/python-modules/qtawesome/default.nix index 446a86f3c8f5..ff2d8cf0740c 100644 --- a/nixpkgs/pkgs/development/python-modules/qtawesome/default.nix +++ b/nixpkgs/pkgs/development/python-modules/qtawesome/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "QtAwesome"; - version = "0.5.5"; + version = "0.5.6"; src = fetchPypi { inherit pname version; - sha256 = "0yb194c927g9nqknfb49nfqv32l74bb0m71wswijbbybb7syabbl"; + sha256 = "0f6dvqmalzi4q4rrpl1xlrxanibam1nifzsgqb5z4jr4ap7kiyp3"; }; propagatedBuildInputs = [ qtpy six pyside ]; diff --git a/nixpkgs/pkgs/development/python-modules/rpmfluff/default.nix b/nixpkgs/pkgs/development/python-modules/rpmfluff/default.nix index a8997e279b27..bdbc3629ec71 100644 --- a/nixpkgs/pkgs/development/python-modules/rpmfluff/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rpmfluff/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "rpmfluff"; - version = "0.5.5"; + version = "0.5.6"; src = fetchurl { url = "https://releases.pagure.org/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0m92ihii8fgdyma9vn3s6fhq0px8n930c27zs554la0mm4548ss3"; + sha256 = "0bhh8mv2kddhv3fiswg3zdl91d7vh93b33jlh1dmyz63z94rm88l"; }; LC_ALL="en_US.utf-8"; diff --git a/nixpkgs/pkgs/development/python-modules/slixmpp/default.nix b/nixpkgs/pkgs/development/python-modules/slixmpp/default.nix index ed90291ba8a0..53d2006315c1 100644 --- a/nixpkgs/pkgs/development/python-modules/slixmpp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/slixmpp/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "slixmpp"; - version = "1.4.1"; + version = "1.4.2"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "020acd4507fd00c38835b78b5f338db60d3df840187623e0d41ab2ca89d7ae57"; + sha256 = "0rqpmscxjznxyz3dyxpc56gib319k01vl837r8g8w57dinz4y863"; }; patches = [ diff --git a/nixpkgs/pkgs/development/python-modules/sly/default.nix b/nixpkgs/pkgs/development/python-modules/sly/default.nix new file mode 100644 index 000000000000..011fa1799abd --- /dev/null +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix index 700a7fad4aab..2daa9766a3af 100644 --- a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix @@ -3,12 +3,12 @@ }: buildPythonPackage rec { - version = "0.4.1"; + version = "0.4.2"; pname = "sphinxcontrib-bibtex"; src = fetchPypi { inherit pname version; - sha256 = "0kx04bqjf9ilygrzpm2z9078nfnkmywpgwxl7idpzidkzirqsnsr"; + sha256 = "0af7651hfjh4hv97xns4vpf8n3kqy7ghyjlkfda5wxw56hxgp6hn"; }; propagatedBuildInputs = [ oset pybtex pybtex-docutils sphinx ]; diff --git a/nixpkgs/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix b/nixpkgs/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix index c6d3a21b10ba..da2fd2cd22d1 100644 --- a/nixpkgs/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/tenacity/default.nix b/nixpkgs/pkgs/development/python-modules/tenacity/default.nix index 596fa6b825fc..d34231ca9a9e 100644 --- a/nixpkgs/pkgs/development/python-modules/tenacity/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tenacity/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "tenacity"; - version = "5.0.2"; + version = "5.0.3"; src = fetchPypi { inherit pname version; - sha256 = "1rjbj9wks7b7n75mbm01y0g2ngyai8yi05ck9gicmcdyix7vw42c"; + sha256 = "12z36fq6qfn9sgd1snsfwrk5j2cw29bsb7mkb0g818fal41g7dr4"; }; nativeBuildInputs = [ pbr ]; diff --git a/nixpkgs/pkgs/development/python-modules/xarray/default.nix b/nixpkgs/pkgs/development/python-modules/xarray/default.nix index c055618b2e60..997c4a2deeb6 100644 --- a/nixpkgs/pkgs/development/python-modules/xarray/default.nix +++ b/nixpkgs/pkgs/development/python-modules/xarray/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "xarray"; - version = "0.11.2"; + version = "0.11.3"; src = fetchPypi { inherit pname version; - sha256 = "1cnghx1xcgdq675abmrys311vspmzgjgiji4wh8iyw194qalfwdg"; + sha256 = "1pc4p7yxvmhn3x121wgslwclaqnjlx51wxs6ihb4cxynh2vcwgfc"; }; checkInputs = [ pytest ]; diff --git a/nixpkgs/pkgs/development/python-modules/yubico-client/default.nix b/nixpkgs/pkgs/development/python-modules/yubico-client/default.nix new file mode 100644 index 000000000000..ddd992a51447 --- /dev/null +++ b/nixpkgs/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/nixpkgs/pkgs/development/tools/analysis/flow/default.nix b/nixpkgs/pkgs/development/tools/analysis/flow/default.nix index b011cb0b918a..84b74cfe1f32 100644 --- a/nixpkgs/pkgs/development/tools/analysis/flow/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/flow/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, ocamlPackages, cf-private, CoreServices }: stdenv.mkDerivation rec { - version = "0.91.0"; + version = "0.92.0"; name = "flow-${version}"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "refs/tags/v${version}"; - sha256 = "14snr65pbnczkv49lmhgyjzlgrrlfwsxkd7g6xbv9y5xl4sp0309"; + sha256 = "1v83hkkbls5x2062ry3gwrnn9al8rhsmargv2mvanxlpf0a63wx3"; }; installPhase = '' diff --git a/nixpkgs/pkgs/development/tools/build-managers/rebar3/default.nix b/nixpkgs/pkgs/development/tools/build-managers/rebar3/default.nix index e96852602fc7..6d64c82f90ff 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/rebar3/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/rebar3/default.nix @@ -1,46 +1,46 @@ { stdenv, fetchurl, - fetchHex, erlang, hermeticRebar3 ? true, + fetchHex, erlang, tree, hexRegistrySnapshot }: let - version = "3.6.1"; + version = "3.9.0"; bootstrapper = ./rebar3-nix-bootstrap; erlware_commons = fetchHex { pkg = "erlware_commons"; - version = "1.2.0"; - sha256 = "149kkn9gc9cjgvlmakygq475r63q2rry31s29ax0s425dh37sfl7"; + version = "1.3.1"; + sha256 = "7aada93f368d0a0430122e39931b7fb4ac9e94dbf043cdc980ad4330fd9cd166"; }; ssl_verify_fun = fetchHex { pkg = "ssl_verify_fun"; version = "1.1.3"; - sha256 = "1zljxashfhqmiscmf298vhr880ppwbgi2rl3nbnyvsfn0mjhw4if"; + sha256 = "2e120e6505d6e9ededb2836611dfe2f7028432dc280957998e154307b5ea92fe"; }; certifi = fetchHex { pkg = "certifi"; - version = "2.0.0"; - sha256 = "075v7cvny52jbhnskchd3fp68fxgp7qfvdls0haamcycxrn0dipx"; + version = "2.3.1"; + sha256 = "e12d667d042c11d130594bae2b0097e63836fe8b1e6d6b2cc48f8bb7a2cf7d68"; }; providers = fetchHex { pkg = "providers"; version = "1.7.0"; - sha256 = "19p4rbsdx9lm2ihgvlhxyld1q76kxpd7qwyqxxsgmhl5r8ln3rlb"; + sha256 = "8be66129ca85c2fa74efd8737cdaedd31c1c1af51dd2fd601495a6def4cae4a6"; }; getopt = fetchHex { pkg = "getopt"; version = "1.0.1"; - sha256 = "174mb46c2qd1f4a7507fng4vvscjh1ds7rykfab5rdnfp61spqak"; + sha256 = "53e1ab83b9ceb65c9672d3e7a35b8092e9bdc9b3ee80721471a161c10c59959c"; }; bbmustache = fetchHex { pkg = "bbmustache"; - version = "1.5.0"; - sha256 = "0xg3r4lxhqifrv32nm55b4zmkflacc1s964g15p6y6jfx6v4y1zd"; + version = "1.6.0"; + sha256 = "53e02d296512a57be03a98c91541b34d2ca64930268030b2d12364a0332015df"; }; relx = fetchHex { pkg = "relx"; - version = "3.26.0"; - sha256 = "1f810rb01kdidpa985s321ycg3y4hvqpzbk263n6i1bfnqykkvv9"; + version = "3.28.0"; + sha256 = "8afb871c0a2a27f0063d973903fc64d2207bc705ecc3607462920683d24ac7b5"; }; cf = fetchHex { pkg = "cf"; @@ -49,59 +49,71 @@ let }; cth_readable = fetchHex { pkg = "cth_readable"; - version = "1.4.2"; - sha256 = "1pjid4f60pp81ds01rqa6ybksrnzqriw3aibilld1asn9iabxkav"; + version = "1.4.3"; + sha256 = "0wr0hba6ka74s3628jrrd7ynjdh7syxigkh7ildg8fgi20ab88fd"; }; eunit_formatters = fetchHex { pkg = "eunit_formatters"; version = "0.5.0"; sha256 = "1jb3hzb216r29x2h4pcjwfmx1k81431rgh5v0mp4x5146hhvmj6n"; }; - rebar3_hex = fetchHex { - pkg = "rebar3_hex"; - version = "4.0.0"; - sha256 = "0k0ykx1lz62r03dpbi2zxsvrxgnr5hj67yky0hjrls09ynk4682v"; + hex_core = fetchHex { + pkg = "hex_core"; + version = "0.4.0"; + sha256 = "8ace8c6cfa10df4cb8be876f42f7446890e124203c094cc7b4e7616fb8de5d7f"; + }; + parse_trans = fetchHex { + pkg = "parse_trans"; + version = "3.3.0"; + sha256 = "17ef63abde837ad30680ea7f857dd9e7ced9476cdd7b0394432af4bfc241b960"; }; in stdenv.mkDerivation { name = "rebar3-${version}"; - inherit version; + inherit version erlang; src = fetchurl { url = "https://github.com/rebar/rebar3/archive/${version}.tar.gz"; - sha256 = "0cqhqymzh10pfyxqiy4hcg3d2myz3chx0y4m2ixmq8zk81acics0"; + sha256 = "14prx5bkyy9sisnp5rj2058xpylq80xygsj1hq8b7m0awvj3r9wy"; }; inherit bootstrapper; - patches = if hermeticRebar3 == true - then [ ./hermetic-rebar3.patch ] - else []; + buildInputs = [ erlang tree ]; - buildInputs = [ erlang tree ]; + # TODO: Remove registry snapshot propagatedBuildInputs = [ hexRegistrySnapshot ]; postPatch = '' ${erlang}/bin/escript ${bootstrapper} registry-only + mkdir -p _checkouts mkdir -p _build/default/lib/ - mkdir -p _build/default/plugins - cp --no-preserve=mode -R ${erlware_commons} _build/default/lib/erlware_commons - cp --no-preserve=mode -R ${providers} _build/default/lib/providers - cp --no-preserve=mode -R ${getopt} _build/default/lib/getopt - cp --no-preserve=mode -R ${bbmustache} _build/default/lib/bbmustache - cp --no-preserve=mode -R ${certifi} _build/default/lib/certifi - cp --no-preserve=mode -R ${cf} _build/default/lib/cf - cp --no-preserve=mode -R ${cth_readable} _build/default/lib/cth_readable - cp --no-preserve=mode -R ${eunit_formatters} _build/default/lib/eunit_formatters - cp --no-preserve=mode -R ${relx} _build/default/lib/relx - cp --no-preserve=mode -R ${ssl_verify_fun} _build/default/lib/ssl_verify_fun - cp --no-preserve=mode -R ${rebar3_hex} _build/default/plugins/rebar3_hex + + cp --no-preserve=mode -R ${erlware_commons} _checkouts/erlware_commons + cp --no-preserve=mode -R ${providers} _checkouts/providers + cp --no-preserve=mode -R ${getopt} _checkouts/getopt + cp --no-preserve=mode -R ${bbmustache} _checkouts/bbmustache + cp --no-preserve=mode -R ${certifi} _checkouts/certifi + cp --no-preserve=mode -R ${cf} _checkouts/cf + cp --no-preserve=mode -R ${cth_readable} _checkouts/cth_readable + cp --no-preserve=mode -R ${eunit_formatters} _checkouts/eunit_formatters + cp --no-preserve=mode -R ${relx} _checkouts/relx + cp --no-preserve=mode -R ${ssl_verify_fun} _checkouts/ssl_verify_fun + cp --no-preserve=mode -R ${hex_core} _checkouts/hex_core + cp --no-preserve=mode -R ${parse_trans} _checkouts/parse_trans + + # Bootstrap script expects the dependencies in _build/default/lib + # TODO: Make it accept checkouts? + for i in _checkouts/* ; do + ln -s $(pwd)/$i $(pwd)/_build/default/lib/ + done ''; buildPhase = '' HOME=. escript bootstrap ''; + installPhase = '' mkdir -p $out/bin cp rebar3 $out/bin/rebar3 @@ -109,7 +121,7 @@ stdenv.mkDerivation { meta = { homepage = https://github.com/rebar/rebar3; - description = "rebar 3.0 is an Erlang build tool that makes it easy to compile and test Erlang applications, port drivers and releases"; + description = "rebar 3 is an Erlang build tool that makes it easy to compile and test Erlang applications, port drivers and releases"; longDescription = '' rebar is a self-contained Erlang script, so it's easy to distribute or diff --git a/nixpkgs/pkgs/development/tools/build-managers/rebar3/hermetic-rebar3.patch b/nixpkgs/pkgs/development/tools/build-managers/rebar3/hermetic-rebar3.patch deleted file mode 100644 index 59004561126c..000000000000 --- a/nixpkgs/pkgs/development/tools/build-managers/rebar3/hermetic-rebar3.patch +++ /dev/null @@ -1,103 +0,0 @@ -diff --git a/bootstrap b/bootstrap -index 5dedd713..864056c4 100755 ---- a/bootstrap -+++ b/bootstrap -@@ -101,7 +101,7 @@ extract(Binary) -> - request(Url) -> - HttpOptions = [{relaxed, true} | get_proxy_auth()], - -- case httpc:request(get, {Url, []}, -+ case rebar_hermeticity:request(get, {Url, []}, - HttpOptions, - [{body_format, binary}], - rebar) of -diff --git a/src/rebar_hermeticity.erl b/src/rebar_hermeticity.erl -index e69de29b..8f6cc7d0 100644 ---- a/src/rebar_hermeticity.erl -+++ b/src/rebar_hermeticity.erl -@@ -0,0 +1,42 @@ -+%% -*- erlang-indent-level: 4;indent-tabs-mode: nil -*- -+%% ex: ts=4 sw=4 et -+%% ------------------------------------------------------------------- -+%% -+%% rebar: Erlang Build Tools -+%% -+%% Copyright (c) 2016 Eric Merritt (eric@merritt.tech) -+%% -+%% Permission is hereby granted, free of charge, to any person obtaining a copy -+%% of this software and associated documentation files (the "Software"), to deal -+%% in the Software without restriction, including without limitation the rights -+%% to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -+%% copies of the Software, and to permit persons to whom the Software is -+%% furnished to do so, subject to the following conditions: -+%% -+%% The above copyright notice and this permission notice shall be included in -+%% all copies or substantial portions of the Software. -+%% -+%% THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+%% IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+%% FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+%% AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+%% LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -+%% OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -+%% THE SOFTWARE. -+%% ------------------------------------------------------------------- -+-module(rebar_hermeticity). -+ -+-export([request/5]). -+ -+-include("rebar.hrl"). -+ -+%% ==================================================================== -+%% Public API -+%% ==================================================================== -+ -+request(Method, {Url, _Headers}, _HTTPOptions, _Options, _Profile) -> -+ ?ERROR("A request is being made that violates Nix hermicity " -+ "This request has been stopped. Details of the request " -+ "are as follows:", []), -+ ?ERROR("Request: ~p ~s", [Method, Url]), -+ erlang:halt(1). -diff --git a/src/rebar_pkg_resource.erl b/src/rebar_pkg_resource.erl -index 2cf167ee..6080aaca 100644 ---- a/src/rebar_pkg_resource.erl -+++ b/src/rebar_pkg_resource.erl -@@ -127,7 +127,7 @@ make_vsn(_) -> - request(Url, ETag) -> - HttpOptions = [{ssl, ssl_opts(Url)}, - {relaxed, true} | rebar_utils:get_proxy_auth()], -- case httpc:request(get, {Url, [{"if-none-match", "\"" ++ ETag ++ "\""} -+ case rebar_hermeticity:request(get, {Url, [{"if-none-match", "\"" ++ ETag ++ "\""} - || ETag =/= false] ++ - [{"User-Agent", rebar_utils:user_agent()}]}, - HttpOptions, [{body_format, binary}], rebar) of -diff --git a/src/rebar_prv_update.erl b/src/rebar_prv_update.erl -index 17446311..4d44d794 100644 ---- a/src/rebar_prv_update.erl -+++ b/src/rebar_prv_update.erl -@@ -38,6 +38,8 @@ init(State) -> - {ok, State1}. - - -spec do(rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}. -+do(State) -> {ok, State}. -+-ifdef(non_hermetic). - do(State) -> - try - case rebar_packages:registry_dir(State) of -@@ -53,7 +55,7 @@ do(State) -> - {ok, Url} -> - HttpOptions = [{relaxed, true} | rebar_utils:get_proxy_auth()], - ?DEBUG("Fetching registry from ~p", [Url]), -- case httpc:request(get, {Url, [{"User-Agent", rebar_utils:user_agent()}]}, -+ case rebar_hermeticity:request(get, {Url, [{"User-Agent", rebar_utils:user_agent()}]}, - HttpOptions, [{stream, TmpFile}, {sync, true}], - rebar) of - {ok, saved_to_file} -> -@@ -77,6 +79,7 @@ do(State) -> - ?DEBUG("Error creating package index: ~p ~p", [C, S]), - throw(?PRV_ERROR(package_index_write)) - end. -+-endif. - - -spec format_error(any()) -> iolist(). - format_error({package_parse_cdn, Uri}) -> diff --git a/nixpkgs/pkgs/development/tools/dive/default.nix b/nixpkgs/pkgs/development/tools/dive/default.nix new file mode 100644 index 000000000000..c93321638099 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/dive/default.nix @@ -0,0 +1,26 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + pname = "dive"; + version = "0.5.0"; + + goPackagePath = "github.com/wagoodman/dive"; + + src = fetchFromGitHub { + owner = "wagoodman"; + repo = "dive"; + rev = "v${version}"; + sha256 = "159m36p7b0ygdp42qdmmz02rhrkymh8m6yl21m1ixd4c2pjkjhns"; + }; + + goDeps = ./deps.nix; + + doCheck = true; + + meta = with stdenv.lib; { + description = "A tool for exploring each layer in a docker image"; + homepage = https://github.com/wagoodman/dive; + license = licenses.mit; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/dive/deps.nix b/nixpkgs/pkgs/development/tools/dive/deps.nix new file mode 100644 index 000000000000..c140b2ae7748 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/dive/deps.nix @@ -0,0 +1,712 @@ +[ + + { + goPackagePath = "cloud.google.com/go"; + fetch = { + type = "git"; + url = "https://code.googlesource.com/gocloud"; + rev = "v0.26.0"; + sha256 = "149v3ci17g6wd2pm18mzcncq5qpl9hwdjnz3rlbn5rfidyn46la1"; + }; + } + + { + goPackagePath = "github.com/Azure/go-ansiterm"; + fetch = { + type = "git"; + url = "https://github.com/Azure/go-ansiterm"; + rev = "d6e3b3328b78"; + sha256 = "010khrkhkf9cxlvvb6ncqv4c1qcdmpbz9jn38g4fxf4xsma8xx1q"; + }; + } + + { + goPackagePath = "github.com/BurntSushi/toml"; + fetch = { + type = "git"; + url = "https://github.com/BurntSushi/toml"; + rev = "v0.3.1"; + sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; + }; + } + + { + goPackagePath = "github.com/Microsoft/go-winio"; + fetch = { + type = "git"; + url = "https://github.com/Microsoft/go-winio"; + rev = "v0.4.11"; + sha256 = "14y1gryr3pb3zy09v2g8dh89m363rfd9sch0wgbabh531hfx72vn"; + }; + } + + { + goPackagePath = "github.com/Nvveen/Gotty"; + fetch = { + type = "git"; + url = "https://github.com/Nvveen/Gotty"; + rev = "cd527374f1e5"; + sha256 = "1ylvr1p6p036ns3g3wdz8f92f69symshkc8j54fa6gpg4hyk0k6q"; + }; + } + + { + goPackagePath = "github.com/OneOfOne/xxhash"; + fetch = { + type = "git"; + url = "https://github.com/OneOfOne/xxhash"; + rev = "v1.2.2"; + sha256 = "1mjfhrwhvxa48rycjnqpqzm521i38h1hdyz6pdwmhd7xb8j6gwi6"; + }; + } + + { + goPackagePath = "github.com/cespare/xxhash"; + fetch = { + type = "git"; + url = "https://github.com/cespare/xxhash"; + rev = "v1.1.0"; + sha256 = "1qyzlcdcayavfazvi03izx83fvip8h36kis44zr2sg7xf6sx6l4x"; + }; + } + + { + goPackagePath = "github.com/client9/misspell"; + fetch = { + type = "git"; + url = "https://github.com/client9/misspell"; + rev = "v0.3.4"; + sha256 = "1vwf33wsc4la25zk9nylpbp9px3svlmldkm0bha4hp56jws4q9cs"; + }; + } + + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "v1.1.1"; + sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; + }; + } + + { + goPackagePath = "github.com/docker/distribution"; + fetch = { + type = "git"; + url = "https://github.com/docker/distribution"; + rev = "93e082742a009850ac46962150b2f652a822c5ff"; + sha256 = "0cvfxfmilriwdsv3iqy6p5m8m3zya4b8slwyqxljss1bnz0p8z1v"; + }; + } + + { + goPackagePath = "github.com/docker/docker"; + fetch = { + type = "git"; + url = "https://github.com/docker/docker"; + rev = "0b7cb16dde4a20d024c7be59801d63bcfd18611b"; + sha256 = "1sk55s1ghm06d1qq4jic05dvmplvzw2sl6d4j8vamajwa6harlwj"; + }; + } + + { + goPackagePath = "github.com/docker/go-connections"; + fetch = { + type = "git"; + url = "https://github.com/docker/go-connections"; + rev = "v0.4.0"; + sha256 = "0mv6f6b5nljc17dmwmc28hc0y11pqglz7x0d2mjrwdmfxf64hwqq"; + }; + } + + { + goPackagePath = "github.com/docker/go-units"; + fetch = { + type = "git"; + url = "https://github.com/docker/go-units"; + rev = "v0.3.3"; + sha256 = "0npxsb3pp89slwf4a73fxm20hykad8xggij6i6hcd5jy19bjrd93"; + }; + } + + { + goPackagePath = "github.com/dustin/go-humanize"; + fetch = { + type = "git"; + url = "https://github.com/dustin/go-humanize"; + rev = "v1.0.0"; + sha256 = "1kqf1kavdyvjk7f8kx62pnm7fbypn9z1vbf8v2qdh3y7z7a0cbl3"; + }; + } + + { + goPackagePath = "github.com/fatih/color"; + fetch = { + type = "git"; + url = "https://github.com/fatih/color"; + rev = "v1.7.0"; + sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv"; + }; + } + + { + goPackagePath = "github.com/fsnotify/fsnotify"; + fetch = { + type = "git"; + url = "https://github.com/fsnotify/fsnotify"; + rev = "v1.4.7"; + sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; + }; + } + + { + goPackagePath = "github.com/gogo/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/gogo/protobuf"; + rev = "v1.1.1"; + sha256 = "1525pq7r6h3s8dncvq8gxi893p2nq8dxpzvq0nfl5b4p6mq0v1c2"; + }; + } + + { + goPackagePath = "github.com/golang/glog"; + fetch = { + type = "git"; + url = "https://github.com/golang/glog"; + rev = "23def4e6c14b"; + sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; + }; + } + + { + goPackagePath = "github.com/golang/lint"; + fetch = { + type = "git"; + url = "https://github.com/golang/lint"; + rev = "06c8688daad7"; + sha256 = "0xi94dwvz50a66bq1hp9fyqkym5mcpdxdb1hrfvicldgjf37lc47"; + }; + } + + { + goPackagePath = "github.com/golang/mock"; + fetch = { + type = "git"; + url = "https://github.com/golang/mock"; + rev = "v1.1.1"; + sha256 = "0ap8wb6pdl6ccmdb43advjll2ly4sz26wsc3axw0hbrjrybybzgy"; + }; + } + + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "v1.2.0"; + sha256 = "0kf4b59rcbb1cchfny2dm9jyznp8ri2hsb14n8iak1q8986xa0ab"; + }; + } + + { + goPackagePath = "github.com/google/go-cmp"; + fetch = { + type = "git"; + url = "https://github.com/google/go-cmp"; + rev = "v0.2.0"; + sha256 = "1fbv0x27k9sn8svafc0hjwsnckk864lv4yi7bvzrxvmd3d5hskds"; + }; + } + + { + goPackagePath = "github.com/google/uuid"; + fetch = { + type = "git"; + url = "https://github.com/google/uuid"; + rev = "v1.1.0"; + sha256 = "0yx4kiafyshdshrmrqcf2say5mzsviz7r94a0y1l6xfbkkyvnc86"; + }; + } + + { + goPackagePath = "github.com/gorilla/context"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/context"; + rev = "v1.1.1"; + sha256 = "03p4hn87vcmfih0p9w663qbx9lpsf7i7j3lc7yl7n84la3yz63m4"; + }; + } + + { + goPackagePath = "github.com/gorilla/mux"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/mux"; + rev = "v1.6.2"; + sha256 = "0pvzm23hklxysspnz52mih6h1q74vfrdhjfm1l3sa9r8hhqmmld2"; + }; + } + + { + goPackagePath = "github.com/hashicorp/hcl"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/hcl"; + rev = "v1.0.0"; + sha256 = "0q6ml0qqs0yil76mpn4mdx4lp94id8vbv575qm60jzl1ijcl5i66"; + }; + } + + { + goPackagePath = "github.com/inconshreveable/mousetrap"; + fetch = { + type = "git"; + url = "https://github.com/inconshreveable/mousetrap"; + rev = "v1.0.0"; + sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; + }; + } + + { + goPackagePath = "github.com/jroimartin/gocui"; + fetch = { + type = "git"; + url = "https://github.com/jroimartin/gocui"; + rev = "v0.4.0"; + sha256 = "1b1cbjg925l1c5v3ls8amni9716190yzf847cqs9wjnj82z8qa47"; + }; + } + + { + goPackagePath = "github.com/k0kubun/go-ansi"; + fetch = { + type = "git"; + url = "https://github.com/k0kubun/go-ansi"; + rev = "3bf9e2903213"; + sha256 = "117afax4l268rbswf02icbgxncmd1pk2abkz7cv26iyszi8l26dq"; + }; + } + + { + goPackagePath = "github.com/kisielk/gotool"; + fetch = { + type = "git"; + url = "https://github.com/kisielk/gotool"; + rev = "v1.0.0"; + sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn"; + }; + } + + { + goPackagePath = "github.com/konsorten/go-windows-terminal-sequences"; + fetch = { + type = "git"; + url = "https://github.com/konsorten/go-windows-terminal-sequences"; + rev = "v1.0.1"; + sha256 = "1lchgf27n276vma6iyxa0v1xds68n2g8lih5lavqnx5x6q5pw2ip"; + }; + } + + { + goPackagePath = "github.com/lunixbochs/vtclean"; + fetch = { + type = "git"; + url = "https://github.com/lunixbochs/vtclean"; + rev = "2d01aacdc34a"; + sha256 = "1ss88dyx5hr4imvpg5lixvp0cf7c2qm4x9m8mdgshjpm92g5rqmf"; + }; + } + + { + goPackagePath = "github.com/magiconair/properties"; + fetch = { + type = "git"; + url = "https://github.com/magiconair/properties"; + rev = "v1.8.0"; + sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn"; + }; + } + + { + goPackagePath = "github.com/mattn/go-colorable"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-colorable"; + rev = "v0.0.9"; + sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx"; + }; + } + + { + goPackagePath = "github.com/mattn/go-isatty"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-isatty"; + rev = "v0.0.4"; + sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w"; + }; + } + + { + goPackagePath = "github.com/mattn/go-runewidth"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-runewidth"; + rev = "v0.0.3"; + sha256 = "0lc39b6xrxv7h3v3y1kgz49cgi5qxwlygs715aam6ba35m48yi7g"; + }; + } + + { + goPackagePath = "github.com/mitchellh/go-homedir"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/go-homedir"; + rev = "v1.0.0"; + sha256 = "0f0z0aa4wivk4z1y503dmnw0k0g0g403dly8i4q263gfshs82sbq"; + }; + } + + { + goPackagePath = "github.com/mitchellh/mapstructure"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/mapstructure"; + rev = "v1.0.0"; + sha256 = "0f06q4fpzg0c370cvmpsl0iq2apl5nkbz5cd3nba5x5ysmshv1lm"; + }; + } + + { + goPackagePath = "github.com/nsf/termbox-go"; + fetch = { + type = "git"; + url = "https://github.com/nsf/termbox-go"; + rev = "60ab7e3d12ed"; + sha256 = "040064fh7wzdmv8flw6svi007hiqs1cjk1a3k3gpg7gii3npifsl"; + }; + } + + { + goPackagePath = "github.com/opencontainers/go-digest"; + fetch = { + type = "git"; + url = "https://github.com/opencontainers/go-digest"; + rev = "v1.0.0-rc1"; + sha256 = "01gc7fpn8ax429024p2fcx3yb18axwz5bjf2hqxlii1jbsgw4bh9"; + }; + } + + { + goPackagePath = "github.com/opencontainers/image-spec"; + fetch = { + type = "git"; + url = "https://github.com/opencontainers/image-spec"; + rev = "v1.0.1"; + sha256 = "03dvbj3dln8c55v9gp79mgmz2yi2ws3r08iyz2fk41y3i22iaw1q"; + }; + } + + { + goPackagePath = "github.com/pelletier/go-toml"; + fetch = { + type = "git"; + url = "https://github.com/pelletier/go-toml"; + rev = "v1.2.0"; + sha256 = "1fjzpcjng60mc3a4b2ql5a00d5gah84wj740dabv9kq67mpg8fxy"; + }; + } + + { + goPackagePath = "github.com/phayes/permbits"; + fetch = { + type = "git"; + url = "https://github.com/phayes/permbits"; + rev = "59f2482cd460"; + sha256 = "0ydc5d9kqmjvmscik98jvr6n19sj30v33mnw8akmq0s1lxij58hm"; + }; + } + + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "v0.8.0"; + sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; + }; + } + + { + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "v1.0.0"; + sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; + }; + } + + { + goPackagePath = "github.com/sirupsen/logrus"; + fetch = { + type = "git"; + url = "https://github.com/sirupsen/logrus"; + rev = "v1.2.0"; + sha256 = "0r6334x2bls8ddznvzaldx4g88msjjns4mlks95rqrrg7h0ijigg"; + }; + } + + { + goPackagePath = "github.com/spaolacci/murmur3"; + fetch = { + type = "git"; + url = "https://github.com/spaolacci/murmur3"; + rev = "f09979ecbc72"; + sha256 = "1lv3zyz3jy2d76bhvvs8svygx66606iygdvwy5cwc0p5z8yghq25"; + }; + } + + { + goPackagePath = "github.com/spf13/afero"; + fetch = { + type = "git"; + url = "https://github.com/spf13/afero"; + rev = "v1.1.2"; + sha256 = "0miv4faf5ihjfifb1zv6aia6f6ik7h1s4954kcb8n6ixzhx9ck6k"; + }; + } + + { + goPackagePath = "github.com/spf13/cast"; + fetch = { + type = "git"; + url = "https://github.com/spf13/cast"; + rev = "v1.2.0"; + sha256 = "177bk7lq40jbgv9p9r80aydpaccfk8ja3a7jjhfwiwk9r1pa4rr2"; + }; + } + + { + goPackagePath = "github.com/spf13/cobra"; + fetch = { + type = "git"; + url = "https://github.com/spf13/cobra"; + rev = "v0.0.3"; + sha256 = "1q1nsx05svyv9fv3fy6xv6gs9ffimkyzsfm49flvl3wnvf1ncrkd"; + }; + } + + { + goPackagePath = "github.com/spf13/jwalterweatherman"; + fetch = { + type = "git"; + url = "https://github.com/spf13/jwalterweatherman"; + rev = "v1.0.0"; + sha256 = "093fmmvavv84pv4q84hav7ph3fmrq87bvspjj899q0qsx37yvdr8"; + }; + } + + { + goPackagePath = "github.com/spf13/pflag"; + fetch = { + type = "git"; + url = "https://github.com/spf13/pflag"; + rev = "v1.0.2"; + sha256 = "005598piihl3l83a71ahj10cpq9pbhjck4xishx1b4dzc02r9xr2"; + }; + } + + { + goPackagePath = "github.com/spf13/viper"; + fetch = { + type = "git"; + url = "https://github.com/spf13/viper"; + rev = "v1.2.1"; + sha256 = "0y7czxki8zhjhanh5ydnx4sf2darw70z2i5dskgarbk4gjmagx6k"; + }; + } + + { + goPackagePath = "github.com/stretchr/objx"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/objx"; + rev = "v0.1.1"; + sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls"; + }; + } + + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "v1.2.2"; + sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs"; + }; + } + + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "3d3f9f413869"; + sha256 = "0rbkcq48lkiw043sm8hciprqy2d77s4agpj6rwy2qgbqm8gvv3a6"; + }; + } + + { + goPackagePath = "golang.org/x/lint"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/lint"; + rev = "06c8688daad7"; + sha256 = "0xi94dwvz50a66bq1hp9fyqkym5mcpdxdb1hrfvicldgjf37lc47"; + }; + } + + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "adae6a3d119a"; + sha256 = "1fx860zsgzqk28j7lmp96qsfrgb0kzbfjvr294hywswcbwdwkb01"; + }; + } + + { + goPackagePath = "golang.org/x/oauth2"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/oauth2"; + rev = "d2e6202438be"; + sha256 = "0wbn75fd10485nb93bm4kqldqifdim5xqy4v7r5sdvimvf3fyhn7"; + }; + } + + { + goPackagePath = "golang.org/x/sync"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sync"; + rev = "42b317875d0f"; + sha256 = "0mrjhk7al7yyh76x9flvxy4jm5jyqh2fxbxagpaazxn1xdgkaif3"; + }; + } + + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "93218def8b18"; + sha256 = "0v0zdnsi0vw03dcfir7b228g02ag7jr7mgbgv6lnjwbbccxv07pz"; + }; + } + + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "v0.3.0"; + sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; + }; + } + + { + goPackagePath = "golang.org/x/time"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/time"; + rev = "85acf8d2951c"; + sha256 = "0yqnxsrarjk4qkda8kcxzmk7y90kkkxzx9iwryzrk7bzs87ky3xc"; + }; + } + + { + goPackagePath = "golang.org/x/tools"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/tools"; + rev = "6cd1fcedba52"; + sha256 = "00hl0vkmy8impsnmc2dmm55sdhia95k0kqcrjbdpynryn1lamn5d"; + }; + } + + { + goPackagePath = "google.golang.org/appengine"; + fetch = { + type = "git"; + url = "https://github.com/golang/appengine"; + rev = "v1.1.0"; + sha256 = "1pz202zszg8f35dk5pfhwgcdi3r6dx1l4yk6x6ly7nb4j45zi96x"; + }; + } + + { + goPackagePath = "google.golang.org/genproto"; + fetch = { + type = "git"; + url = "https://github.com/google/go-genproto"; + rev = "c66870c02cf8"; + sha256 = "0siq7sv68556ygqi2d2zmvx8l1xjqdc0fylqzci5h1mq2i14bayn"; + }; + } + + { + goPackagePath = "google.golang.org/grpc"; + fetch = { + type = "git"; + url = "https://github.com/grpc/grpc-go"; + rev = "v1.16.0"; + sha256 = "0a9xl6c5j7lvsb4q6ry5p892rjm86p47d4f8xrf0r8lxblf79qbg"; + }; + } + + { + goPackagePath = "gopkg.in/check.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/check.v1"; + rev = "20d25e280405"; + sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np"; + }; + } + + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "v2.2.1"; + sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; + }; + } + + { + goPackagePath = "gotest.tools"; + fetch = { + type = "git"; + url = "https://github.com/gotestyourself/gotest.tools"; + rev = "v2.2.0"; + sha256 = "0yif3gdyckmf8i54jq0xn00kflla5rhib9sarw66ngnbl7bn9kyl"; + }; + } + + { + goPackagePath = "honnef.co/go/tools"; + fetch = { + type = "git"; + url = "https://github.com/dominikh/go-tools"; + rev = "88497007e858"; + sha256 = "0rinkyx3r2bq45mgcasnn5jb07cwbv3p3s2wwcrzxsarsj6wa5lc"; + }; + } +] diff --git a/nixpkgs/pkgs/development/tools/erlang/hex2nix/default.nix b/nixpkgs/pkgs/development/tools/erlang/hex2nix/default.nix index e21749f90d02..5a24c3c95256 100644 --- a/nixpkgs/pkgs/development/tools/erlang/hex2nix/default.nix +++ b/nixpkgs/pkgs/development/tools/erlang/hex2nix/default.nix @@ -1,29 +1,21 @@ -{ fetchFromGitHub, buildRebar3, +{ fetchFromGitHub, fetchRebar3Deps, rebar3Relx }: - # Erlang dependencies: - ibrowse_4_2_2, - getopt_0_8_2, - erlware_commons_1_0_0, - jsx_2_8_0 }: - -buildRebar3 rec { +rebar3Relx rec { name = "hex2nix"; version = "0.0.6-a31eadd7"; + releaseType = "escript"; + + checkouts = fetchRebar3Deps { + inherit name version; + src = "${src}/rebar.config"; + sha256 = "1b59vk6ynakdiwqd1s6axaj9bvkaaq7ll28b48nv613z892h7nm5"; + }; + src = fetchFromGitHub { owner = "erlang-nix"; repo = "hex2nix"; rev = "a31eadd7af2cbdac1b87991b378e98ea4fb40ae0"; sha256 = "1hnkrksyrbpq2gq25rfsrnm86n0g3biab88gswm3zj88ddrz6dyk"; }; - - beamDeps = [ ibrowse_4_2_2 jsx_2_8_0 erlware_commons_1_0_0 getopt_0_8_2 ]; - - enableDebugInfo = true; - - installPhase = '' - runHook preInstall - make PREFIX=$out install - runHook postInstall - ''; - } +} diff --git a/nixpkgs/pkgs/development/tools/erlang/relx-exe/default.nix b/nixpkgs/pkgs/development/tools/erlang/relx-exe/default.nix index 9bbdc8c8334d..2c32cc5c6706 100644 --- a/nixpkgs/pkgs/development/tools/erlang/relx-exe/default.nix +++ b/nixpkgs/pkgs/development/tools/erlang/relx-exe/default.nix @@ -1,49 +1,19 @@ -{ stdenv, buildHex +{ stdenv, fetchHex, fetchRebar3Deps, rebar3Relx }: -, getopt_0_8_2, erlware_commons_1_0_0, cf_0_2_2 }: - -let - providers_1_6_0 = buildHex { - name = "providers"; - version = "1.6.0"; - sha256 = "0byfa1h57n46jilz4q132j0vk3iqc0v1vip89li38gb1k997cs0g"; - beamDeps = [ getopt_0_8_2 ]; - }; - bbmustache_1_0_4 = buildHex { - name = "bbmustache"; - version = "1.0.4"; - sha256 = "04lvwm7f78x8bys0js33higswjkyimbygp4n72cxz1kfnryx9c03"; - }; - -in -buildHex rec { +rebar3Relx rec { name = "relx-exe"; version = "3.23.1"; - hexPkg = "relx"; - sha256 = "13j7wds2d7b8v3r9pwy3zhwhzywgwhn6l9gm3slqzyrs1jld0a9d"; + releaseType = "escript"; - beamDeps = [ - providers_1_6_0 - getopt_0_8_2 - erlware_commons_1_0_0 - cf_0_2_2 - bbmustache_1_0_4 - ]; - - postBuild = '' - HOME=. rebar3 escriptize - ''; - - postInstall = '' - mkdir -p "$out/bin" - cp -r "_build/default/bin/relx" "$out/bin/relx" - ''; - - meta = { - description = "Executable command for Relx"; - license = stdenv.lib.licenses.asl20; - homepage = "https://github.com/erlware/relx"; - maintainers = with stdenv.lib.maintainers; [ ericbmerritt ]; + src = fetchHex { + pkg = "relx"; + sha256 = "13j7wds2d7b8v3r9pwy3zhwhzywgwhn6l9gm3slqzyrs1jld0a9d"; + version = "3.23.1"; }; + checkouts = fetchRebar3Deps { + inherit name version; + src = "${src}/rebar.lock"; + sha256 = "046b1lb9rymndlvzmin3ppa3vkssjqspyfp98869k11s5avg76hd"; + }; } diff --git a/nixpkgs/pkgs/development/tools/kube-prompt/default.nix b/nixpkgs/pkgs/development/tools/kube-prompt/default.nix index 60f53c74bb24..20a26824e5e7 100644 --- a/nixpkgs/pkgs/development/tools/kube-prompt/default.nix +++ b/nixpkgs/pkgs/development/tools/kube-prompt/default.nix @@ -14,6 +14,7 @@ buildGoPackage rec { sha256 = "1c1y0n1yxcaxvhlsj7b0wvhi934b5g0s1mi46hh5amb9j3dhgq1c"; }; + subPackages = ["."]; goDeps = ./deps.nix; meta = { diff --git a/nixpkgs/pkgs/development/tools/misc/ccls/default.nix b/nixpkgs/pkgs/development/tools/misc/ccls/default.nix index 267cd943edd5..11e02eba5663 100644 --- a/nixpkgs/pkgs/development/tools/misc/ccls/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/ccls/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "ccls-${version}"; - version = "0.20181225.7"; + version = "0.20181225.8"; src = fetchFromGitHub { owner = "MaskRay"; repo = "ccls"; rev = version; - sha256 = "1qgb2nk4nsgbx4qwymwlzi202daskk536a5l877fsp878jpp61cm"; + sha256 = "05vih8wi2lzp4zqlqd18fs3va6s8p74ws8sx7vwpcc8vcsdzq5w9"; }; nativeBuildInputs = [ cmake makeWrapper ]; diff --git a/nixpkgs/pkgs/development/tools/misc/hydra/default.nix b/nixpkgs/pkgs/development/tools/misc/hydra/default.nix index 42da07baca66..00f679cfdac8 100644 --- a/nixpkgs/pkgs/development/tools/misc/hydra/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/tools/ocaml/ocp-index/default.nix b/nixpkgs/pkgs/development/tools/ocaml/ocp-index/default.nix index 23aeceb41a75..6bc397cffcbe 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/ocp-index/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/tools/profiling/sysprof/default.nix b/nixpkgs/pkgs/development/tools/profiling/sysprof/default.nix index 3945af2794d5..8cd6a3f09eef 100644 --- a/nixpkgs/pkgs/development/tools/profiling/sysprof/default.nix +++ b/nixpkgs/pkgs/development/tools/profiling/sysprof/default.nix @@ -46,10 +46,6 @@ in stdenv.mkDerivation rec { "-Dsystemdunitdir=lib/systemd/system" ]; - postInstall = '' - rm $out/share/applications/mimeinfo.cache - ''; - passthru = { updateScript = gnome3.updateScript { packageName = pname; diff --git a/nixpkgs/pkgs/development/tools/rust/rls/default.nix b/nixpkgs/pkgs/development/tools/rust/rls/default.nix new file mode 100644 index 000000000000..accdc7678c60 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/rust/rls/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchFromGitHub, rustPlatform +, openssh, openssl, pkgconfig, cmake, zlib, curl }: + +rustPlatform.buildRustPackage rec { + name = "rls-${version}"; + # with rust 1.x you can only build rls version 1.x.y + version = "1.31.7"; + + src = fetchFromGitHub { + owner = "rust-lang"; + repo = "rls"; + rev = version; + sha256 = "0n33pf7sm31y55rllb8wv3mn75srspr4yj2y6cpcdyf15n47c8cf"; + }; + + cargoSha256 = "0jcsggq4ay8f4vb8n6gh8z995icvvbjkzapxf6jq6qkg6jp3vv17"; + + # a nightly compiler is required unless we use this cheat code. + RUSTC_BOOTSTRAP=1; + + # clippy is hard to build with stable rust so we disable clippy lints + cargoBuildFlags = [ "--no-default-features" ]; + + nativeBuildInputs = [ pkgconfig cmake ]; + buildInputs = [ openssh openssl curl zlib ]; + + doCheck = true; + # the default checkPhase has no way to pass --no-default-features + checkPhase = '' + runHook preCheck + echo "Running cargo test" + cargo test --no-default-features + runHook postCheck + ''; + + meta = with stdenv.lib; { + description = "Rust Language Server - provides information about Rust programs to IDEs and other tools"; + homepage = https://github.com/rust-lang/rls/; + license = licenses.mit; + maintainers = with maintainers; [ symphorien ]; + platforms = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/development/tools/rust/rustfmt/default.nix b/nixpkgs/pkgs/development/tools/rust/rustfmt/default.nix index dac00aa4c969..4684841cf478 100644 --- a/nixpkgs/pkgs/development/tools/rust/rustfmt/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/rustfmt/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { name = "rustfmt-${version}"; - version = "1.0.1"; + version = "1.0.0"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rustfmt"; rev = "${version}"; - sha256 = "1l18ycbq3125sq8v3wgma630wd6kclarlf8f51cmi9blk322jg9p"; + sha256 = "17ady2zq4jcbgawgpfszrkp6kxabb2f261g82y2az7nfax1h1pwy"; }; - cargoSha256 = "1557783icdzlwn02c5zl4362yl85r5zj4nkjv80p6896yli9hk9h"; + cargoSha256 = "0v8iq50h9368kai3m710br5cxc3p6mpbwz1v6gaf5802n48liqs8"; buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; diff --git a/nixpkgs/pkgs/development/tools/vagrant/default.nix b/nixpkgs/pkgs/development/tools/vagrant/default.nix index f2e6b00c09b3..b8ba30361aa8 100644 --- a/nixpkgs/pkgs/development/tools/vagrant/default.nix +++ b/nixpkgs/pkgs/development/tools/vagrant/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, buildRubyGem, bundlerEnv, ruby, libarchive, writeText, withLibvirt ? true}: +{ lib, fetchurl, buildRubyGem, bundlerEnv, ruby, libarchive, libguestfs, qemu, writeText, withLibvirt ? true}: let # NOTE: bumping the version and updating the hash is insufficient; @@ -48,10 +48,22 @@ in buildRubyGem rec { # PATH additions: # - libarchive: Make `bsdtar` available for extracting downloaded boxes - postInstall = '' + # withLibvirt only: + # - libguestfs: Make 'virt-sysprep' available for 'vagrant package' + # - qemu: Make 'qemu-img' available for 'vagrant package' + postInstall = + let + pathAdditions = lib.makeSearchPath "bin" + (map (x: "${lib.getBin x}") ([ + libarchive + ] ++ lib.optionals withLibvirt [ + libguestfs + qemu + ])); + in '' wrapProgram "$out/bin/vagrant" \ --set GEM_PATH "${deps}/lib/ruby/gems/${ruby.version.libDir}" \ - --prefix PATH ':' "${lib.getBin libarchive}/bin" + --prefix PATH ':' ${pathAdditions} mkdir -p "$out/vagrant-plugins/plugins.d" echo '{}' > "$out/vagrant-plugins/plugins.json" diff --git a/nixpkgs/pkgs/development/web/nodejs/v11.nix b/nixpkgs/pkgs/development/web/nodejs/v11.nix index 7378729581fc..b2711d29b5ba 100644 --- a/nixpkgs/pkgs/development/web/nodejs/v11.nix +++ b/nixpkgs/pkgs/development/web/nodejs/v11.nix @@ -5,6 +5,6 @@ let in buildNodejs { inherit enableNpm; - version = "11.6.0"; - sha256 = "1czrpxmk6calqn0p92rm0bv2vlgbnx6q4z7n2j8r7aw0khwbxwll"; + version = "11.7.0"; + sha256 = "18md1xz055rxds4i831rmmya0xda7cc0wdmr1jnj8vigfbcbvzh7"; } diff --git a/nixpkgs/pkgs/games/crawl/default.nix b/nixpkgs/pkgs/games/crawl/default.nix index b2015a28947a..8966623e2b82 100644 --- a/nixpkgs/pkgs/games/crawl/default.nix +++ b/nixpkgs/pkgs/games/crawl/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, which, sqlite, lua5_1, perl, zlib, pkgconfig, ncurses -, dejavu_fonts, libpng, SDL2, SDL2_image, libGLU_combined, freetype, pngcrush, advancecomp -, tileMode ? false +, dejavu_fonts, libpng, SDL2, SDL2_image, SDL2_mixer, libGLU_combined, freetype, pngcrush, advancecomp +, tileMode ? false, enableSound ? tileMode }: stdenv.mkDerivation rec { @@ -8,8 +8,8 @@ stdenv.mkDerivation rec { version = "0.22.1"; src = fetchFromGitHub { - owner = "crawl-ref"; - repo = "crawl-ref"; + owner = "crawl"; + repo = "crawl"; rev = version; sha256 = "19yzl241glv2zazifgz59bw3jlh4hj59xx5w002hnh9rp1w15rnr"; }; @@ -21,7 +21,8 @@ stdenv.mkDerivation rec { # Still unstable with luajit buildInputs = [ lua5_1 zlib sqlite ncurses ] - ++ lib.optionals tileMode [ libpng SDL2 SDL2_image freetype libGLU_combined ]; + ++ lib.optionals tileMode [ libpng SDL2 SDL2_image freetype libGLU_combined ] + ++ lib.optional enableSound SDL2_mixer; preBuild = '' cd crawl-ref/source @@ -35,7 +36,8 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=$(out)" "FORCE_CC=cc" "FORCE_CXX=c++" "HOSTCXX=c++" "SAVEDIR=~/.crawl" "sqlite=${sqlite.dev}" - ] ++ lib.optional tileMode "TILES=y"; + ] ++ lib.optional tileMode "TILES=y" + ++ lib.optional enableSound "SOUND=y"; postInstall = lib.optionalString tileMode "mv $out/bin/crawl $out/bin/crawl-tiles"; @@ -45,9 +47,10 @@ stdenv.mkDerivation rec { description = "Open-source, single-player, role-playing roguelike game"; homepage = http://crawl.develz.org/; longDescription = '' - Open-source, single-player, role-playing roguelike game of exploration and - treasure-hunting in dungeons filled with dangerous and unfriendly monsters - in a quest to rescue the mystifyingly fabulous Orb of Zot. + Dungeon Crawl: Stone Soup, an open-source, single-player, role-playing + roguelike game of exploration and treasure-hunting in dungeons filled + with dangerous and unfriendly monsters in a quest to rescue the + mystifyingly fabulous Orb of Zot. ''; platforms = platforms.linux; license = with licenses; [ gpl2Plus bsd2 bsd3 mit licenses.zlib cc0 ]; diff --git a/nixpkgs/pkgs/games/scid-vs-pc/default.nix b/nixpkgs/pkgs/games/scid-vs-pc/default.nix index db32cb70d413..94e102e57520 100644 --- a/nixpkgs/pkgs/games/scid-vs-pc/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/games/steam/runtime-generated.nix b/nixpkgs/pkgs/games/steam/runtime-generated.nix index f5b79db19158..d5532c051d42 100644 --- a/nixpkgs/pkgs/games/steam/runtime-generated.nix +++ b/nixpkgs/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/nixpkgs/pkgs/games/supertux/default.nix b/nixpkgs/pkgs/games/supertux/default.nix index cf6ba4648687..cee65bfa5638 100644 --- a/nixpkgs/pkgs/games/supertux/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/misc/lguf-brightness/default.nix b/nixpkgs/pkgs/misc/lguf-brightness/default.nix new file mode 100644 index 000000000000..180aa9cbe766 --- /dev/null +++ b/nixpkgs/pkgs/misc/lguf-brightness/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, cmake, libusb1, ncurses5 }: + +stdenv.mkDerivation rec { + pname = "lguf-brightness"; + + version = "unstable-2018-02-07"; + + src = fetchFromGitHub { + owner = "periklis"; + repo = pname; + rev = "d194272b7a0374b27f036cbc1a9be7f231d40cbb"; + sha256 = "0zj81bqchms9m7rik1jxp6zylh9dxqzr7krlj9947v0phr4qgah4"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ libusb1 ncurses5 ]; + + installPhase = '' + install -D lguf_brightness $out/bin/lguf_brightness + ''; + + meta = with stdenv.lib; { + description = "Adjust brightness for LG UltraFine 4K display (cross platform)"; + homepage = https://github.com/periklis/lguf-brightness; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ periklis ]; + platforms = with platforms; linux ++ darwin; + }; +} diff --git a/nixpkgs/pkgs/misc/vscode-extensions/cpptools/default.nix b/nixpkgs/pkgs/misc/vscode-extensions/cpptools/default.nix index 06f86582d535..e5b83511e72e 100644 --- a/nixpkgs/pkgs/misc/vscode-extensions/cpptools/default.nix +++ b/nixpkgs/pkgs/misc/vscode-extensions/cpptools/default.nix @@ -68,8 +68,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "cpptools"; publisher = "ms-vscode"; - version = "0.20.1"; - sha256 = "1gmnkrn26n57vx2nm5hhalkkl2irak38m2lklgja0bi10jb6y08l"; + version = "0.21.0"; + sha256 = "0zq81xfj4hyz01kcw131fmql1mfs9yrjzcmw8i0yha0hymrgwngv"; }; buildInputs = [ diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix index 9095a63355b5..8edd744ba66c 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.173"; + version = "4.4.174"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0wj2y6y2ac5m6p6ghb4rmxfdxyx0gq7yv7b0qzmdyh4dkpi7qa0f"; + sha256 = "0fdsxfwhn1xqic56c4aafxw1rdqy7s4w0inmkhcnh98lj3fi2lmy"; }; } // (args.argsOverride or {})) diff --git a/nixpkgs/pkgs/os-specific/linux/lxc/default.nix b/nixpkgs/pkgs/os-specific/linux/lxc/default.nix index 9aae9c6013a9..a8668313465a 100644 --- a/nixpkgs/pkgs/os-specific/linux/lxc/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/computing/slurm/default.nix b/nixpkgs/pkgs/servers/computing/slurm/default.nix index c30ee04623db..5ae985ca0488 100644 --- a/nixpkgs/pkgs/servers/computing/slurm/default.nix +++ b/nixpkgs/pkgs/servers/computing/slurm/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { name = "slurm-${version}"; - version = "18.08.4.1"; + version = "18.08.5.2"; # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php # because the latter does not keep older releases. @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { repo = "slurm"; # The release tags use - instead of . rev = "${builtins.replaceStrings ["."] ["-"] name}"; - sha256 = "1vnlh1fazqa1rhiq5sm3dxgnwf4ipli357686r5w8cgij3m7qj98"; + sha256 = "0x1pdq58sdf0m28cai0lcyzvhhjl7l85gq324pwh8fi3zy2h0n4k"; }; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/servers/http/unit/default.nix b/nixpkgs/pkgs/servers/http/unit/default.nix index a3948bb69088..f250dd5e9bb4 100644 --- a/nixpkgs/pkgs/servers/http/unit/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/matrix-synapse/default.nix b/nixpkgs/pkgs/servers/matrix-synapse/default.nix index ee52b838aea9..e2ee3e55afb7 100644 --- a/nixpkgs/pkgs/servers/matrix-synapse/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/matrix-synapse/matrix-synapse.patch b/nixpkgs/pkgs/servers/matrix-synapse/matrix-synapse.patch deleted file mode 100644 index 288e6ff16245..000000000000 --- a/nixpkgs/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/nixpkgs/pkgs/servers/mattermost/default.nix b/nixpkgs/pkgs/servers/mattermost/default.nix index 2969f723b50a..02aa4fbab7da 100644 --- a/nixpkgs/pkgs/servers/mattermost/default.nix +++ b/nixpkgs/pkgs/servers/mattermost/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fetchFromGitHub, buildGoPackage, buildEnv }: let - version = "5.4.0"; + version = "5.7.1"; mattermost-server = buildGoPackage rec { name = "mattermost-server-${version}"; @@ -10,7 +10,7 @@ let owner = "mattermost"; repo = "mattermost-server"; rev = "v${version}"; - sha256 = "0sal5ydm1cwnvf3acmiy0400ghhd6v0wj64mkxqwqf8ysnbxizwq"; + sha256 = "1k4rd8383bz9q23wgxnqcp69hcixaa0zd256h54wmwqw6fdn3bc0"; }; goPackagePath = "github.com/mattermost/mattermost-server"; @@ -27,7 +27,7 @@ let src = fetchurl { url = "https://releases.mattermost.com/${version}/mattermost-${version}-linux-amd64.tar.gz"; - sha256 = "06dg0f6nrh3a2v3lnyn2s39nj5jpsvfkx3ypq4zjpks0srv4mgfz"; + sha256 = "0rxbgd3cb9m7rf0yg1vpd1af6x6bn0jilb0pfqr46dg42a70dx09"; }; installPhase = '' diff --git a/nixpkgs/pkgs/servers/monitoring/net-snmp/0002-autoconf-version.patch b/nixpkgs/pkgs/servers/monitoring/net-snmp/0002-autoconf-version.patch new file mode 100644 index 000000000000..0ebb1751d6bf --- /dev/null +++ b/nixpkgs/pkgs/servers/monitoring/net-snmp/0002-autoconf-version.patch @@ -0,0 +1,7 @@ +diff --git a/dist/autoconf-version b/dist/autoconf-version +index 264f2ce..5e1b8b0 100644 +--- a/dist/autoconf-version ++++ b/dist/autoconf-version +@@ -1 +1 @@ +-2.68 ++2.69 diff --git a/nixpkgs/pkgs/servers/monitoring/net-snmp/CVE-2018-18065.patch b/nixpkgs/pkgs/servers/monitoring/net-snmp/CVE-2018-18065.patch deleted file mode 100644 index c33f7bb03fa8..000000000000 --- a/nixpkgs/pkgs/servers/monitoring/net-snmp/CVE-2018-18065.patch +++ /dev/null @@ -1,30 +0,0 @@ -commit 7ffb8e25a0db851953155de91f0170e9bf8c457d -Author: Robert Story <rstory@freesnmp.com> -Date: Thu Oct 6 10:43:10 2016 -0400 - - CHANGES: BUG: 2743: snmpd crashes when receiving a GetNext PDU with multiple Varbinds - - skip out-of-range varbinds when calling next handler - -diff --git a/agent/helpers/table.c b/agent/helpers/table.c -index 32a08033a..2666638b5 100644 ---- a/agent/helpers/table.c -+++ b/agent/helpers/table.c -@@ -340,6 +340,8 @@ table_helper_handler(netsnmp_mib_handler *handler, - else if (reqinfo->mode == MODE_GET) - table_helper_cleanup(reqinfo, request, - SNMP_NOSUCHOBJECT); -+ else -+ request->processed = 1; /* skip if next handler called */ - continue; - } - -@@ -409,6 +411,8 @@ table_helper_handler(netsnmp_mib_handler *handler, - else if (reqinfo->mode == MODE_GET) - table_helper_cleanup(reqinfo, request, - SNMP_NOSUCHOBJECT); -+ else -+ request->processed = 1; /* skip if next handler called */ - continue; - } - /* diff --git a/nixpkgs/pkgs/servers/monitoring/net-snmp/default.nix b/nixpkgs/pkgs/servers/monitoring/net-snmp/default.nix index 0e964c25f6a2..2bbab30d9ecd 100644 --- a/nixpkgs/pkgs/servers/monitoring/net-snmp/default.nix +++ b/nixpkgs/pkgs/servers/monitoring/net-snmp/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, fetchpatch, autoreconfHook, file, openssl, perl, unzip }: +{ stdenv, fetchurl, fetchpatch, autoreconfHook, file, openssl, perl, perlPackages, unzip, nettools, ncurses }: stdenv.mkDerivation rec { - name = "net-snmp-5.7.3"; + name = "net-snmp-5.8"; src = fetchurl { - url = "mirror://sourceforge/net-snmp/${name}.zip"; - sha256 = "0gkss3zclm23zwpqfhddca8278id7pk6qx1mydpimdrrcndwgpz8"; + url = "mirror://sourceforge/net-snmp/${name}.tar.gz"; + sha256 = "1pvajzj9gmj56dmwix0ywmkmy2pglh6nny646hkm7ghfhh03bz5j"; }; patches = @@ -14,23 +14,11 @@ stdenv.mkDerivation rec { inherit name sha256; }; in [ - (fetchAlpinePatch "CVE-2015-5621.patch" "05098jyvd9ddr5q26z7scbbvk1bk6x4agpjm6pyprvpc1zpi0y09") - (fetchAlpinePatch "fix-Makefile-PL.patch" "14ilnkj3cr6mpi242hrmmmv8nv4dj0fdgn42qfk9aa7scwsc0lc7") (fetchAlpinePatch "fix-includes.patch" "0zpkbb6k366qpq4dax5wknwprhwnhighcp402mlm7950d39zfa3m") (fetchAlpinePatch "netsnmp-swinst-crash.patch" "0gh164wy6zfiwiszh58fsvr25k0ns14r3099664qykgpmickkqid") - (fetchAlpinePatch "remove-U64-typedef.patch" "1msxyhcqkvhqa03dwb50288g7f6nbrcd9cs036m9xc8jdgjb8k8j") - ./CVE-2018-18065.patch + ./0002-autoconf-version.patch ]; - preConfigure = - '' - perlarchname=$(perl -e 'use Config; print $Config{archname};') - installFlags="INSTALLSITEARCH=$out/${perl.libPrefix}/${perl.version}/$perlarchname INSTALLSITEMAN3DIR=$out/share/man/man3" - - # http://article.gmane.org/gmane.network.net-snmp.user/32434 - substituteInPlace "man/Makefile.in" --replace 'grep -vE' '@EGREP@ -v' - ''; - configureFlags = [ "--with-default-snmp-version=3" "--with-sys-location=Unknown" @@ -38,13 +26,20 @@ stdenv.mkDerivation rec { "--with-logfile=/var/log/net-snmpd.log" "--with-persistent-directory=/var/lib/net-snmp" "--with-openssl=${openssl.dev}" + "--disable-embedded-perl" + "--without-perl-modules" ] ++ stdenv.lib.optional stdenv.isLinux "--with-mnttab=/proc/mounts"; - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ file perl unzip openssl ]; + postPatch = '' + substituteInPlace testing/fulltests/support/simple_TESTCONF.sh --replace "/bin/netstat" "${nettools}/bin/netstat" + ''; + + nativeBuildInputs = [ autoreconfHook nettools ]; + buildInputs = [ file perl unzip openssl ncurses ]; + propagatedBuildInputs = with perlPackages; [ perl JSON Tk TermReadKey ]; enableParallelBuilding = true; - doCheck = false; # fails + doCheck = false; # tries to use networking postInstall = '' for f in "$out/lib/"*.la $out/bin/net-snmp-config $out/bin/net-snmp-create-v3-user; do diff --git a/nixpkgs/pkgs/servers/radarr/default.nix b/nixpkgs/pkgs/servers/radarr/default.nix index 62cb2d7f348b..cd032ce85343 100644 --- a/nixpkgs/pkgs/servers/radarr/default.nix +++ b/nixpkgs/pkgs/servers/radarr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "radarr-${version}"; - version = "0.2.0.1217"; + version = "0.2.0.1293"; src = fetchurl { - url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.v${version}.linux.tar.gz"; - sha256 = "09zzvfqpv58b79a906013pjq42qwbibf16rz24gnqg7wq7az83jy"; + url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.develop.${version}.linux.tar.gz"; + sha256 = "0wzwbgfvi48lq4zadzq3rlsbm6irwz534liw8k7hn69yv0wi3wfd"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/servers/roundcube/default.nix b/nixpkgs/pkgs/servers/roundcube/default.nix index c0648f5183d9..cda5ae1d6c55 100644 --- a/nixpkgs/pkgs/servers/roundcube/default.nix +++ b/nixpkgs/pkgs/servers/roundcube/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip }: +{ lib, stdenv, fetchzip, buildEnv, roundcube, roundcubePlugins }: let version = "1.3.8"; in @@ -13,6 +13,11 @@ fetchzip rec { rm -rf $out/installer ''; + passthru.withPlugins = f: buildEnv { + name = "${roundcube.name}-with-plugins"; + paths = (f roundcubePlugins) ++ [ roundcube ]; + }; + meta = { description = "Open Source Webmail Software"; maintainers = with stdenv.lib.maintainers; [ vskilet ]; @@ -20,4 +25,3 @@ fetchzip rec { platforms = stdenv.lib.platforms.all; }; } - diff --git a/nixpkgs/pkgs/servers/roundcube/plugins/default.nix b/nixpkgs/pkgs/servers/roundcube/plugins/default.nix new file mode 100644 index 000000000000..42333b69eb15 --- /dev/null +++ b/nixpkgs/pkgs/servers/roundcube/plugins/default.nix @@ -0,0 +1,11 @@ +{ newScope, pkgs }: + +let + + callPackage = newScope (pkgs // plugins); + + plugins = import ./plugins.nix { inherit callPackage; }; + +in + + plugins diff --git a/nixpkgs/pkgs/servers/roundcube/plugins/persistent_login/default.nix b/nixpkgs/pkgs/servers/roundcube/plugins/persistent_login/default.nix new file mode 100644 index 000000000000..b66386222f76 --- /dev/null +++ b/nixpkgs/pkgs/servers/roundcube/plugins/persistent_login/default.nix @@ -0,0 +1,13 @@ +{ roundcubePlugin, fetchFromGitHub }: + +roundcubePlugin rec { + pname = "persistent_login"; + version = "5.1.0"; + + src = fetchFromGitHub { + owner = "mfreiholz"; + repo = pname; + rev = "version-${version}"; + sha256 = "1k2jgbshwig8q5l440y59pgwbfbc0pdrjbpihba834a4pm0y6anl"; + }; +} diff --git a/nixpkgs/pkgs/servers/roundcube/plugins/plugins.nix b/nixpkgs/pkgs/servers/roundcube/plugins/plugins.nix new file mode 100644 index 000000000000..4eed1227be68 --- /dev/null +++ b/nixpkgs/pkgs/servers/roundcube/plugins/plugins.nix @@ -0,0 +1,9 @@ +{ callPackage }: + +{ + inherit callPackage; + + roundcubePlugin = callPackage ./roundcube-plugin.nix { }; + + persistent_login = callPackage ./persistent_login { }; +} diff --git a/nixpkgs/pkgs/servers/roundcube/plugins/roundcube-plugin.nix b/nixpkgs/pkgs/servers/roundcube/plugins/roundcube-plugin.nix new file mode 100644 index 000000000000..a756a3140cb2 --- /dev/null +++ b/nixpkgs/pkgs/servers/roundcube/plugins/roundcube-plugin.nix @@ -0,0 +1,7 @@ +{ runCommand }: +{ pname, version, src }: + +runCommand "roundcube-plugin-${pname}-${version}" { } '' + mkdir -p $out/plugins/ + cp -r ${src} $out/plugins/${pname} +'' diff --git a/nixpkgs/pkgs/tools/admin/lego/default.nix b/nixpkgs/pkgs/tools/admin/lego/default.nix index e1964b2f1611..b066ab468974 100644 --- a/nixpkgs/pkgs/tools/admin/lego/default.nix +++ b/nixpkgs/pkgs/tools/admin/lego/default.nix @@ -2,14 +2,14 @@ buildGoPackage rec { name = "lego-${version}"; - version = "2.0.1"; + version = "2.2.0"; rev = "v${version}"; src = fetchFromGitHub { inherit rev; owner = "xenolf"; repo = "lego"; - sha256 = "17q5j2zxc2c0xw8pfhnls67dmwrkicjmd2jdyim3fhi5cgxl9h93"; + sha256 = "1bb4kjkbphay63z83a4z2859qrlrx2h7n3rgia17fhy38xp5zzqp"; }; goPackagePath = "github.com/xenolf/lego"; diff --git a/nixpkgs/pkgs/tools/admin/lxd/default.nix b/nixpkgs/pkgs/tools/admin/lxd/default.nix index e48b525caba6..e037541557c7 100644 --- a/nixpkgs/pkgs/tools/admin/lxd/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/tools/filesystems/tmsu/default.nix b/nixpkgs/pkgs/tools/filesystems/tmsu/default.nix index fef1d0699e73..fd557a7ff565 100644 --- a/nixpkgs/pkgs/tools/filesystems/tmsu/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/tmsu/default.nix @@ -44,11 +44,11 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin mkdir -p $out/sbin - mkdir -p $out/share/man + mkdir -p $out/share/man/man1 mkdir -p $out/share/zsh/site-functions make install INSTALL_DIR=$out/bin \ MOUNT_INSTALL_DIR=$out/sbin \ - MAN_INSTALL_DIR=$out/share/man \ + MAN_INSTALL_DIR=$out/share/man/man1 \ ZSH_COMP_INSTALL_DIR=$out/share/zsh/site-functions ''; diff --git a/nixpkgs/pkgs/tools/misc/chezmoi/default.nix b/nixpkgs/pkgs/tools/misc/chezmoi/default.nix new file mode 100644 index 000000000000..f15dfc2adba7 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/chezmoi/default.nix @@ -0,0 +1,29 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "chezmoi-${version}"; + version = "1.3.0"; + + goPackagePath = "github.com/twpayne/chezmoi"; + + src = fetchFromGitHub { + owner = "twpayne"; + repo = "chezmoi"; + rev = "v${version}"; + sha256 = "0dvdjx5khpw62lprn06k271xfc9fdrw4c1q74vd1vffaz60yfd8d"; + }; + + goDeps = ./deps.nix; + + buildFlagsArray = [ + "-ldflags=-s -w -X ${goPackagePath}/cmd.version=${version}" + ]; + + meta = with stdenv.lib; { + homepage = https://github.com/twpayne/chezmoi; + description = "Manage your dotfiles across multiple machines, securely"; + license = licenses.mit; + maintainers = with maintainers; [ jhillyerd ]; + platforms = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/chezmoi/deps.nix b/nixpkgs/pkgs/tools/misc/chezmoi/deps.nix new file mode 100644 index 000000000000..4fb1bd535528 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/chezmoi/deps.nix @@ -0,0 +1,399 @@ +# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) +[ + { + goPackagePath = "github.com/BurntSushi/toml"; + fetch = { + type = "git"; + url = "https://github.com/BurntSushi/toml"; + rev = "v0.3.1"; + sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; + }; + } + { + goPackagePath = "github.com/Masterminds/semver"; + fetch = { + type = "git"; + url = "https://github.com/Masterminds/semver"; + rev = "v1.4.2"; + sha256 = "0k2fpk2x8jbvqkqxx5hkx1ygrsppzmzypqb90i1r33yq7ac7zlxj"; + }; + } + { + goPackagePath = "github.com/Masterminds/sprig"; + fetch = { + type = "git"; + url = "https://github.com/Masterminds/sprig"; + rev = "v2.17.1"; + sha256 = "0iiwga57100r780k2d509fzx67x6l8z0wjl84pyzg5mpy6zp2y9y"; + }; + } + { + goPackagePath = "github.com/aokoli/goutils"; + fetch = { + type = "git"; + url = "https://github.com/aokoli/goutils"; + rev = "v1.1.0"; + sha256 = "180px47gj936qyk5bkv5mbbgiil9abdjq6kwkf7sq70vyi9mcfiq"; + }; + } + { + goPackagePath = "github.com/armon/consul-api"; + fetch = { + type = "git"; + url = "https://github.com/armon/consul-api"; + rev = "eb2c6b5be1b6"; + sha256 = "1j6fdr1sg36qy4n4xjl7brq739fpm5npq98cmvklzjc9qrx98nk9"; + }; + } + { + goPackagePath = "github.com/blang/semver"; + fetch = { + type = "git"; + url = "https://github.com/blang/semver"; + rev = "v3.5.1"; + sha256 = "13ws259bwcibkclbr82ilhk6zadm63kxklxhk12wayklj8ghhsmy"; + }; + } + { + goPackagePath = "github.com/coreos/etcd"; + fetch = { + type = "git"; + url = "https://github.com/coreos/etcd"; + rev = "v3.3.10"; + sha256 = "1x2ii1hj8jraba8rbxz6dmc03y3sjxdnzipdvg6fywnlq1f3l3wl"; + }; + } + { + goPackagePath = "github.com/coreos/go-etcd"; + fetch = { + type = "git"; + url = "https://github.com/coreos/go-etcd"; + rev = "v2.0.0"; + sha256 = "1xb34hzaa1lkbq5vkzy9vcz6gqwj7hp6cdbvyack2bf28dwn33jj"; + }; + } + { + goPackagePath = "github.com/coreos/go-semver"; + fetch = { + type = "git"; + url = "https://github.com/coreos/go-semver"; + rev = "v0.2.0"; + sha256 = "1gghi5bnqj50hfxhqc1cxmynqmh2yk9ii7ab9gsm75y5cp94ymk0"; + }; + } + { + goPackagePath = "github.com/d4l3k/messagediff"; + fetch = { + type = "git"; + url = "https://github.com/d4l3k/messagediff"; + rev = "v1.2.1"; + sha256 = "104hl8x57ciaz7mzafg1vp9qggxcyfm8hsv9bmlihbz9ml3nyr8v"; + }; + } + { + goPackagePath = "github.com/danieljoos/wincred"; + fetch = { + type = "git"; + url = "https://github.com/danieljoos/wincred"; + rev = "v1.0.1"; + sha256 = "1bb1928nnikx5036aw4152p55g8xgwx42rv0n2i5zydh1031f50m"; + }; + } + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "v1.1.1"; + sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; + }; + } + { + goPackagePath = "github.com/fsnotify/fsnotify"; + fetch = { + type = "git"; + url = "https://github.com/fsnotify/fsnotify"; + rev = "v1.4.7"; + sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; + }; + } + { + goPackagePath = "github.com/godbus/dbus"; + fetch = { + type = "git"; + url = "https://github.com/godbus/dbus"; + rev = "v4.1.0"; + sha256 = "1ckvg15zdsgmbn4mi36cazkb407ixc9mmyf7vwj8b8wi3d00rgn9"; + }; + } + { + goPackagePath = "github.com/google/renameio"; + fetch = { + type = "git"; + url = "https://github.com/google/renameio"; + rev = "v0.1.0"; + sha256 = "1ki2x5a9nrj17sn092d6n4zr29lfg5ydv4xz5cp58z6cw8ip43jx"; + }; + } + { + goPackagePath = "github.com/google/uuid"; + fetch = { + type = "git"; + url = "https://github.com/google/uuid"; + rev = "v1.1.0"; + sha256 = "0yx4kiafyshdshrmrqcf2say5mzsviz7r94a0y1l6xfbkkyvnc86"; + }; + } + { + goPackagePath = "github.com/hashicorp/hcl"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/hcl"; + rev = "v1.0.0"; + sha256 = "0q6ml0qqs0yil76mpn4mdx4lp94id8vbv575qm60jzl1ijcl5i66"; + }; + } + { + goPackagePath = "github.com/huandu/xstrings"; + fetch = { + type = "git"; + url = "https://github.com/huandu/xstrings"; + rev = "v1.2.0"; + sha256 = "0bn1kac5vcspxdpx4bygr4gngdbk67pnbqc04b0f7a4ny25n10iq"; + }; + } + { + goPackagePath = "github.com/imdario/mergo"; + fetch = { + type = "git"; + url = "https://github.com/imdario/mergo"; + rev = "v0.3.7"; + sha256 = "05ir0jj74w0yfi1lrhjd97v759in1dpsma64cgmbiqvyp6hfmmf8"; + }; + } + { + goPackagePath = "github.com/inconshreveable/mousetrap"; + fetch = { + type = "git"; + url = "https://github.com/inconshreveable/mousetrap"; + rev = "v1.0.0"; + sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; + }; + } + { + goPackagePath = "github.com/magiconair/properties"; + fetch = { + type = "git"; + url = "https://github.com/magiconair/properties"; + rev = "v1.8.0"; + sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn"; + }; + } + { + goPackagePath = "github.com/mitchellh/go-homedir"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/go-homedir"; + rev = "v1.0.0"; + sha256 = "0f0z0aa4wivk4z1y503dmnw0k0g0g403dly8i4q263gfshs82sbq"; + }; + } + { + goPackagePath = "github.com/mitchellh/mapstructure"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/mapstructure"; + rev = "v1.1.2"; + sha256 = "03bpv28jz9zhn4947saqwi328ydj7f6g6pf1m2d4m5zdh5jlfkrr"; + }; + } + { + goPackagePath = "github.com/pelletier/go-toml"; + fetch = { + type = "git"; + url = "https://github.com/pelletier/go-toml"; + rev = "v1.2.0"; + sha256 = "1fjzpcjng60mc3a4b2ql5a00d5gah84wj740dabv9kq67mpg8fxy"; + }; + } + { + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "v1.0.0"; + sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; + }; + } + { + goPackagePath = "github.com/spf13/afero"; + fetch = { + type = "git"; + url = "https://github.com/spf13/afero"; + rev = "v1.1.2"; + sha256 = "0miv4faf5ihjfifb1zv6aia6f6ik7h1s4954kcb8n6ixzhx9ck6k"; + }; + } + { + goPackagePath = "github.com/spf13/cast"; + fetch = { + type = "git"; + url = "https://github.com/spf13/cast"; + rev = "v1.3.0"; + sha256 = "0xq1ffqj8y8h7dcnm0m9lfrh0ga7pssnn2c1dnr09chqbpn4bdc5"; + }; + } + { + goPackagePath = "github.com/spf13/cobra"; + fetch = { + type = "git"; + url = "https://github.com/spf13/cobra"; + rev = "v0.0.3"; + sha256 = "1q1nsx05svyv9fv3fy6xv6gs9ffimkyzsfm49flvl3wnvf1ncrkd"; + }; + } + { + goPackagePath = "github.com/spf13/jwalterweatherman"; + fetch = { + type = "git"; + url = "https://github.com/spf13/jwalterweatherman"; + rev = "v1.0.0"; + sha256 = "093fmmvavv84pv4q84hav7ph3fmrq87bvspjj899q0qsx37yvdr8"; + }; + } + { + goPackagePath = "github.com/spf13/pflag"; + fetch = { + type = "git"; + url = "https://github.com/spf13/pflag"; + rev = "v1.0.3"; + sha256 = "1cj3cjm7d3zk0mf1xdybh0jywkbbw7a6yr3y22x9sis31scprswd"; + }; + } + { + goPackagePath = "github.com/spf13/viper"; + fetch = { + type = "git"; + url = "https://github.com/spf13/viper"; + rev = "v1.3.1"; + sha256 = "1190mg04718r03qriav99sf4kx2n7wdgr8vdni15f74bpbzrdjrl"; + }; + } + { + goPackagePath = "github.com/stretchr/objx"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/objx"; + rev = "v0.1.1"; + sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "v1.2.2"; + sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs"; + }; + } + { + goPackagePath = "github.com/twpayne/go-shell"; + fetch = { + type = "git"; + url = "https://github.com/twpayne/go-shell"; + rev = "v0.0.1"; + sha256 = "0nbbfxdwqy14izbfbk8c8ia90l31wbhkcwd2r7v6jhz58iaxcvxk"; + }; + } + { + goPackagePath = "github.com/twpayne/go-vfs"; + fetch = { + type = "git"; + url = "https://github.com/twpayne/go-vfs"; + rev = "v1.0.3"; + sha256 = "138ykzmb4994qwbv3m99536p75804ap15c2drvz6d3k0v95rbw38"; + }; + } + { + goPackagePath = "github.com/twpayne/go-xdg"; + fetch = { + type = "git"; + url = "https://github.com/twpayne/go-xdg"; + rev = "v1.0.0"; + sha256 = "06np468cl8bbpal6x0mf8q6jzlkz65rzma5y65n7wfmrg2k7yn72"; + }; + } + { + goPackagePath = "github.com/ugorji/go"; + fetch = { + type = "git"; + url = "https://github.com/ugorji/go"; + rev = "d75b2dcb6bc8"; + sha256 = "0di1k35gpq9bp958ywranpbskx2vdwlb38s22vl9rybm3wa5g3ps"; + }; + } + { + goPackagePath = "github.com/xordataexchange/crypt"; + fetch = { + type = "git"; + url = "https://github.com/xordataexchange/crypt"; + rev = "b2862e3d0a77"; + sha256 = "04q3856anpzl4gdfgmg7pbp9cx231nkz3ymq2xp27rnmmwhfxr8y"; + }; + } + { + goPackagePath = "github.com/zalando/go-keyring"; + fetch = { + type = "git"; + url = "https://github.com/zalando/go-keyring"; + rev = "6d81c293b3fb"; + sha256 = "1wah726fi08h6ga5wnwxd1zyxq7ckp3qliql44bxgliw2p35kkyb"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "505ab145d0a9"; + sha256 = "1vbsvcvmjz6c00p5vf8ls533p52fx2y3gy6v4k5qrdlzl4wf0i5s"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "a5c9d58dba9a"; + sha256 = "02qv5i7yps35p7fa81345qz7k8i73gkigj69anwmpw9rhpmzayf9"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "v0.3.0"; + sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; + }; + } + { + goPackagePath = "gopkg.in/check.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/check.v1"; + rev = "20d25e280405"; + sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "v2.2.2"; + sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa"; + }; + } +] diff --git a/nixpkgs/pkgs/tools/misc/desktop-file-utils/default.nix b/nixpkgs/pkgs/tools/misc/desktop-file-utils/default.nix index 8dc590c5d6fc..3e47ebd51d74 100644 --- a/nixpkgs/pkgs/tools/misc/desktop-file-utils/default.nix +++ b/nixpkgs/pkgs/tools/misc/desktop-file-utils/default.nix @@ -21,6 +21,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ glib libintl ]; + setupHook = ./setup-hook.sh; + meta = { homepage = http://www.freedesktop.org/wiki/Software/desktop-file-utils; description = "Command line utilities for working with .desktop files"; diff --git a/nixpkgs/pkgs/tools/misc/desktop-file-utils/setup-hook.sh b/nixpkgs/pkgs/tools/misc/desktop-file-utils/setup-hook.sh new file mode 100644 index 000000000000..004d635cff0e --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/desktop-file-utils/setup-hook.sh @@ -0,0 +1,6 @@ +# Remove mimeinfo cache +mimeinfoPreFixupPhase() { + rm -f $out/share/applications/mimeinfo.cache +} + +preFixupPhases="$preFixupPhases mimeinfoPreFixupPhase" diff --git a/nixpkgs/pkgs/tools/misc/flameshot/default.nix b/nixpkgs/pkgs/tools/misc/flameshot/default.nix index 3be418af823c..16a46ac1432b 100644 --- a/nixpkgs/pkgs/tools/misc/flameshot/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/tools/misc/git-town/default.nix b/nixpkgs/pkgs/tools/misc/git-town/default.nix new file mode 100644 index 000000000000..afcf9cf4c781 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/git-town/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + + buildGoPackage rec { + name = "git-town-${version}"; + version = "7.2.0"; + + goPackagePath = "github.com/Originate/git-town"; + + src = fetchFromGitHub { + owner = "Originate"; + repo = "git-town"; + rev = "v${version}"; + sha256 = "0hr0c6iya34lanfhsg9kj03l4ajalcfxkbn4bgwh0749smhi6mrj"; + }; + + buildFlagsArray = [ "-ldflags=-X github.com/Originate/git-town/src/cmd.version=v${version} -X github.com/Originate/git-town/src/cmd.buildDate=nix" ]; + + meta = with stdenv.lib; { + description = "Generic, high-level git support for git-flow workflows"; + homepage = http://www.git-town.com/; + maintainers = [ maintainers.allonsy ]; + license = licenses.mit; + }; + } + diff --git a/nixpkgs/pkgs/tools/misc/lbdb/default.nix b/nixpkgs/pkgs/tools/misc/lbdb/default.nix index 0aadfa580154..a00da33d8c91 100644 --- a/nixpkgs/pkgs/tools/misc/lbdb/default.nix +++ b/nixpkgs/pkgs/tools/misc/lbdb/default.nix @@ -7,7 +7,7 @@ }: let - version = "0.48"; + version = "0.48.1"; in with stdenv.lib; with perlPackages; @@ -15,7 +15,7 @@ stdenv.mkDerivation { name = "lbdb-${version}"; src = fetchurl { url = "http://www.spinnaker.de/lbdb/download/lbdb_${version}.tar.gz"; - sha256 = "1j1ac0nnf6j5mwb6rh61ax9aidj4lvv2vrj5b1p71d4d1m3g180z"; + sha256 = "1gr5l2fr9qbdccga8bhsrpvz6jxigvfkdxrln9wyf2xpps5cdjxh"; }; buildInputs = [ goobook makeWrapper perl ConvertASN1 perlldap AuthenSASL ] diff --git a/nixpkgs/pkgs/tools/misc/nagstamon/default.nix b/nixpkgs/pkgs/tools/misc/nagstamon/default.nix index 3163b78437ec..57036acb58e8 100644 --- a/nixpkgs/pkgs/tools/misc/nagstamon/default.nix +++ b/nixpkgs/pkgs/tools/misc/nagstamon/default.nix @@ -2,18 +2,18 @@ pythonPackages.buildPythonApplication rec { name = "nagstamon-${version}"; - version = "2.0.1"; + version = "3.2.1"; src = fetchurl { url = "https://nagstamon.ifw-dresden.de/files/stable/Nagstamon-${version}.tar.gz"; - sha256 = "3d4b22190d47250b175a4a70b12391c694ba2399832320887e5909e1ce3dfd7b"; + sha256 = "1048x55g3nlyyggn6a36xmj24w4hv08llg58f4hzc0fwg074cd58"; }; # Test assumes darwin doCheck = false; propagatedBuildInputs = with pythonPackages; [ configparser pyqt5 psutil requests - beautifulsoup4 ]; + beautifulsoup4 keyring requests-kerberos kerberos lxml ]; meta = with stdenv.lib; { description = "A status monitor for the desktop"; diff --git a/nixpkgs/pkgs/tools/misc/snapper/default.nix b/nixpkgs/pkgs/tools/misc/snapper/default.nix index 3d1eedab8c47..87fda19a75fe 100644 --- a/nixpkgs/pkgs/tools/misc/snapper/default.nix +++ b/nixpkgs/pkgs/tools/misc/snapper/default.nix @@ -62,6 +62,6 @@ stdenv.mkDerivation rec { homepage = http://snapper.io; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ tstrobel ]; + maintainers = with maintainers; [ tstrobel markuskowa ]; }; } diff --git a/nixpkgs/pkgs/tools/networking/mailutils/default.nix b/nixpkgs/pkgs/tools/networking/mailutils/default.nix index d6c670052959..f507e4dc2872 100644 --- a/nixpkgs/pkgs/tools/networking/mailutils/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/tools/networking/openapi-generator-cli/default.nix b/nixpkgs/pkgs/tools/networking/openapi-generator-cli/default.nix new file mode 100644 index 000000000000..020feb2c43b9 --- /dev/null +++ b/nixpkgs/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/nixpkgs/pkgs/tools/security/keybase/default.nix b/nixpkgs/pkgs/tools/security/keybase/default.nix index ae726544453a..36b7709c56a8 100644 --- a/nixpkgs/pkgs/tools/security/keybase/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/tools/security/keybase/gui.nix b/nixpkgs/pkgs/tools/security/keybase/gui.nix index bd8166b214dc..40385940a942 100644 --- a/nixpkgs/pkgs/tools/security/keybase/gui.nix +++ b/nixpkgs/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/nixpkgs/pkgs/tools/system/cron/default.nix b/nixpkgs/pkgs/tools/system/cron/default.nix index 374f0ac19d89..aa047ca4a681 100644 --- a/nixpkgs/pkgs/tools/system/cron/default.nix +++ b/nixpkgs/pkgs/tools/system/cron/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, sendmailPath ? "/usr/sbin/sendmail"}: +{stdenv, fetchurl, vim, sendmailPath ? "/usr/sbin/sendmail"}: stdenv.mkDerivation { name = "cron-4.1"; @@ -25,6 +25,9 @@ stdenv.mkDerivation { #undef _PATH_SENDMAIL #define _PATH_SENDMAIL "${sendmailPath}" + #undef _PATH_VI + #define _PATH_VI "${vim}/bin/vim" + #undef _PATH_DEFPATH #define _PATH_DEFPATH "/run/wrappers/bin:/nix/var/nix/profiles/default/bin:/run/current-system/sw/bin:/usr/bin:/bin" __EOT__ diff --git a/nixpkgs/pkgs/tools/system/inxi/default.nix b/nixpkgs/pkgs/tools/system/inxi/default.nix index 02379bcfe5c8..d69398e64f14 100644 --- a/nixpkgs/pkgs/tools/system/inxi/default.nix +++ b/nixpkgs/pkgs/tools/system/inxi/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "inxi-${version}"; - version = "3.0.30-1"; + version = "3.0.32-1"; src = fetchFromGitHub { owner = "smxi"; repo = "inxi"; rev = version; - sha256 = "04dkws3716clscl6iq3sy6m822rqzwdg5mn03l0vhcdbqcng46s6"; + sha256 = "171xdip2alkp3g0k0sanaavvdcz6d0wlldj9lgj11xsdbhaaknnv"; }; buildInputs = [ perl ]; diff --git a/nixpkgs/pkgs/tools/text/transifex-client/default.nix b/nixpkgs/pkgs/tools/text/transifex-client/default.nix index 62fdc0c7c84b..376f8ca9f70a 100644 --- a/nixpkgs/pkgs/tools/text/transifex-client/default.nix +++ b/nixpkgs/pkgs/tools/text/transifex-client/default.nix @@ -3,7 +3,7 @@ buildPythonApplication rec { pname = "transifex-client"; - version = "0.13.5"; + version = "0.13.6"; propagatedBuildInputs = [ urllib3 requests python-slugify @@ -11,7 +11,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "00igk35nyzqp1slj7lbhiv4lc42k87ix43ipx2zcrsjf6xxv6l7v"; + sha256 = "0y6pprlmkmi7wfqr3k70sb913qa70p3i90q5mravrai7cr32y1w8"; }; prePatch = '' diff --git a/nixpkgs/pkgs/top-level/all-packages.nix b/nixpkgs/pkgs/top-level/all-packages.nix index 71183323a2a9..dd0642916196 100644 --- a/nixpkgs/pkgs/top-level/all-packages.nix +++ b/nixpkgs/pkgs/top-level/all-packages.nix @@ -452,7 +452,7 @@ in airsonic = callPackage ../servers/misc/airsonic { }; - airspy = callPackage ../applications/misc/airspy { }; + airspy = callPackage ../applications/radio/airspy { }; airtame = callPackage ../applications/misc/airtame { }; @@ -629,6 +629,8 @@ in bunny = callPackage ../tools/package-management/bunny { }; + chezmoi = callPackage ../tools/misc/chezmoi { }; + clair = callPackage ../tools/admin/clair { }; cloud-sql-proxy = callPackage ../tools/misc/cloud-sql-proxy { }; @@ -688,6 +690,8 @@ in git-fire = callPackage ../tools/misc/git-fire { }; + git-town = callPackage ../tools/misc/git-town { }; + github-changelog-generator = callPackage ../development/tools/github-changelog-generator { }; gitless = callPackage ../applications/version-management/gitless { }; @@ -1088,6 +1092,8 @@ in catclock = callPackage ../applications/misc/catclock { }; + cardpeek = callPackage ../applications/misc/cardpeek { }; + cde = callPackage ../tools/package-management/cde { }; cdemu-daemon = callPackage ../misc/emulators/cdemu/daemon.nix { }; @@ -1617,6 +1623,8 @@ in roundcube = callPackage ../servers/roundcube { }; + roundcubePlugins = callPackage ../servers/roundcube/plugins { }; + rsbep = callPackage ../tools/backup/rsbep { }; rsyslog = callPackage ../tools/system/rsyslog { @@ -3579,9 +3587,9 @@ in kazam = callPackage ../applications/video/kazam { }; - kalibrate-rtl = callPackage ../tools/misc/kalibrate-rtl { }; + kalibrate-rtl = callPackage ../applications/radio/kalibrate-rtl { }; - kalibrate-hackrf = callPackage ../tools/misc/kalibrate-hackrf { }; + kalibrate-hackrf = callPackage ../applications/radio/kalibrate-hackrf { }; kakoune = callPackage ../applications/editors/kakoune { }; @@ -3986,7 +3994,7 @@ in lidarr = callPackage ../servers/lidarr { }; - limesuite = callPackage ../applications/misc/limesuite { }; + limesuite = callPackage ../applications/radio/limesuite { }; limesurvey = callPackage ../servers/limesurvey { }; @@ -4305,11 +4313,10 @@ in nbd = callPackage ../tools/networking/nbd { }; xnbd = callPackage ../tools/networking/xnbd { }; - inherit (callPackages ../development/libraries/science/math/nccl { }) - nccl_cudatoolkit_8 - nccl_cudatoolkit_9; - - nccl = nccl_cudatoolkit_9; + nccl = callPackage ../development/libraries/science/math/nccl { }; + nccl_cudatoolkit_9_0 = nccl.override { cudatoolkit = cudatoolkit_9_0; }; + nccl_cudatoolkit_9 = nccl.override { cudatoolkit = cudatoolkit_9; }; + nccl_cudatoolkit_10 = nccl.override { cudatoolkit = cudatoolkit_10; }; ndjbdns = callPackage ../tools/networking/ndjbdns { }; @@ -4545,6 +4552,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 { }; @@ -7499,6 +7508,7 @@ in pyo3-pack = callPackage ../development/tools/rust/pyo3-pack { }; rainicorn = callPackage ../development/tools/rust/rainicorn { }; + rls = callPackage ../development/tools/rust/rls { }; rustfmt = callPackage ../development/tools/rust/rustfmt { }; rustracer = callPackage ../development/tools/rust/racer { }; rustracerd = callPackage ../development/tools/rust/racerd { }; @@ -8591,6 +8601,8 @@ in binutils = binutils; }; + dive = callPackage ../development/tools/dive { }; + doclifter = callPackage ../development/tools/misc/doclifter { }; docutils = with python3Packages; toPythonApplication docutils; @@ -9180,7 +9192,7 @@ in inherit (darwin.apple_sdk.frameworks) CoreFoundation; }; - uhd = callPackage ../development/tools/misc/uhd { }; + uhd = callPackage ../applications/radio/uhd { }; uisp = callPackage ../development/tools/misc/uisp { }; @@ -12089,6 +12101,8 @@ in qoauth = callPackage ../development/libraries/qoauth { }; + qolibri = libsForQt5.callPackage ../applications/misc/qolibri { }; + qt3 = callPackage ../development/libraries/qt-3 { openglSupport = libGLSupported; libpng = libpng12; @@ -12390,7 +12404,7 @@ in lvtk = callPackage ../development/libraries/audio/lvtk { }; - qradiolink = callPackage ../applications/misc/qradiolink { }; + qradiolink = callPackage ../applications/radio/qradiolink { }; qrupdate = callPackage ../development/libraries/qrupdate { }; @@ -12549,17 +12563,17 @@ in snappy = callPackage ../development/libraries/snappy { }; - soapyairspy = callPackage ../applications/misc/soapyairspy { }; + soapyairspy = callPackage ../applications/radio/soapyairspy { }; - soapybladerf = callPackage ../applications/misc/soapybladerf { }; + soapybladerf = callPackage ../applications/radio/soapybladerf { }; - soapyhackrf = callPackage ../applications/misc/soapyhackrf { }; + soapyhackrf = callPackage ../applications/radio/soapyhackrf { }; - soapysdr = callPackage ../applications/misc/soapysdr { inherit (python3Packages) python numpy; }; + soapysdr = callPackage ../applications/radio/soapysdr { inherit (python3Packages) python numpy; }; - soapyremote = callPackage ../applications/misc/soapyremote { }; + soapyremote = callPackage ../applications/radio/soapyremote { }; - soapysdr-with-plugins = callPackage ../applications/misc/soapysdr { + soapysdr-with-plugins = callPackage ../applications/radio/soapysdr { inherit (python3Packages) python numpy; extraPackages = [ limesuite @@ -12572,9 +12586,9 @@ in ]; }; - soapyrtlsdr = callPackage ../applications/misc/soapyrtlsdr { }; + soapyrtlsdr = callPackage ../applications/radio/soapyrtlsdr { }; - soapyuhd = callPackage ../applications/misc/soapyuhd { }; + soapyuhd = callPackage ../applications/radio/soapyuhd { }; socket_wrapper = callPackage ../development/libraries/socket_wrapper { }; @@ -16368,7 +16382,7 @@ in chatzilla = callPackage ../applications/networking/irc/chatzilla { }; - chirp = callPackage ../applications/misc/chirp { + chirp = callPackage ../applications/radio/chirp { inherit (pythonPackages) pyserial pygtk; }; @@ -16585,7 +16599,7 @@ in inherit (python3Packages) buildPythonApplication requests; }; - dmrconfig = callPackage ../applications/misc/dmrconfig { }; + dmrconfig = callPackage ../applications/radio/dmrconfig { }; dmtx-utils = callPackage (callPackage ../tools/graphics/dmtx-utils) { }; @@ -17012,18 +17026,18 @@ in flexget = callPackage ../applications/networking/flexget { }; - fldigi = callPackage ../applications/audio/fldigi { }; + fldigi = callPackage ../applications/radio/fldigi { }; flink = callPackage ../applications/networking/cluster/flink { }; flink_1_5 = flink.override { version = "1.5"; }; - fllog = callPackage ../applications/misc/fllog { }; + fllog = callPackage ../applications/radio/fllog { }; - flmsg = callPackage ../applications/misc/flmsg { }; + flmsg = callPackage ../applications/radio/flmsg { }; - flrig = callPackage ../applications/misc/flrig { }; + flrig = callPackage ../applications/radio/flrig { }; - flwrap = callPackage ../applications/misc/flwrap { }; + flwrap = callPackage ../applications/radio/flwrap { }; fluidsynth = callPackage ../applications/audio/fluidsynth { inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio CoreMIDI CoreServices; @@ -17069,32 +17083,32 @@ in gksu = callPackage ../applications/misc/gksu { }; - gnss-sdr = callPackage ../applications/misc/gnss-sdr { boost=boost166; }; + gnss-sdr = callPackage ../applications/radio/gnss-sdr { boost=boost166; }; - gnuradio = callPackage ../applications/misc/gnuradio { + gnuradio = callPackage ../applications/radio/gnuradio { inherit (python2Packages) cheetah lxml Mako matplotlib numpy python pyopengl pyqt4 scipy wxPython pygtk; inherit (darwin.apple_sdk.frameworks) CoreAudio; fftw = fftwFloat; qwt = qwt6_qt4; }; - gnuradio-with-packages = callPackage ../applications/misc/gnuradio/wrapper.nix { + gnuradio-with-packages = callPackage ../applications/radio/gnuradio/wrapper.nix { inherit (python2Packages) python; extraPackages = [ gnuradio-nacl gnuradio-osmosdr gnuradio-ais gnuradio-rds ] ++ lib.optionals stdenv.isLinux [ gnuradio-gsm gnuradio-limesdr ]; }; - gnuradio-nacl = callPackage ../applications/misc/gnuradio/nacl.nix { }; + gnuradio-nacl = callPackage ../applications/radio/gnuradio/nacl.nix { }; - gnuradio-gsm = callPackage ../applications/misc/gnuradio/gsm.nix { }; + gnuradio-gsm = callPackage ../applications/radio/gnuradio/gsm.nix { }; - gnuradio-ais = callPackage ../applications/misc/gnuradio/ais.nix { }; + gnuradio-ais = callPackage ../applications/radio/gnuradio/ais.nix { }; - gnuradio-limesdr = callPackage ../applications/misc/gnuradio/limesdr.nix { }; + gnuradio-limesdr = callPackage ../applications/radio/gnuradio/limesdr.nix { }; - gnuradio-rds = callPackage ../applications/misc/gnuradio/rds.nix { }; + gnuradio-rds = callPackage ../applications/radio/gnuradio/rds.nix { }; - gnuradio-osmosdr = callPackage ../applications/misc/gnuradio/osmosdr.nix { }; + gnuradio-osmosdr = callPackage ../applications/radio/gnuradio/osmosdr.nix { }; goldendict = libsForQt5.callPackage ../applications/misc/goldendict { }; @@ -17131,7 +17145,7 @@ in gpx = callPackage ../applications/misc/gpx { }; - gqrx = qt5.callPackage ../applications/misc/gqrx { }; + gqrx = qt5.callPackage ../applications/radio/gqrx { }; gpx-viewer = callPackage ../applications/misc/gpx-viewer { }; @@ -17173,7 +17187,7 @@ in wavrsocvt = callPackage ../applications/misc/audio/wavrsocvt { }; - welle-io = libsForQt5.callPackage ../applications/misc/welle-io { }; + welle-io = libsForQt5.callPackage ../applications/radio/welle-io { }; wireshark = callPackage ../applications/networking/sniffers/wireshark { withQt = true; @@ -17549,7 +17563,7 @@ in gxplugins-lv2 = callPackage ../applications/audio/gxplugins-lv2 { }; - hackrf = callPackage ../applications/misc/hackrf { }; + hackrf = callPackage ../applications/radio/hackrf { }; hakuneko = callPackage ../tools/misc/hakuneko { }; @@ -17790,7 +17804,7 @@ in poppler = poppler_0_61; }; - inspectrum = libsForQt5.callPackage ../applications/misc/inspectrum { }; + inspectrum = libsForQt5.callPackage ../applications/radio/inspectrum { }; ion3 = callPackage ../applications/window-managers/ion-3 { lua = lua5_1; @@ -18225,7 +18239,7 @@ in minicom = callPackage ../tools/misc/minicom { }; - minimodem = callPackage ../applications/audio/minimodem { }; + minimodem = callPackage ../applications/radio/minimodem { }; minidjvu = callPackage ../applications/graphics/minidjvu { }; @@ -18413,7 +18427,7 @@ in multimarkdown = callPackage ../tools/typesetting/multimarkdown { }; - multimon-ng = callPackage ../applications/misc/multimon-ng { }; + multimon-ng = callPackage ../applications/radio/multimon-ng { }; inherit (callPackages ../applications/networking/mumble { avahi = avahi.override { @@ -19004,7 +19018,7 @@ in qt = qt4; }; - qsstv = qt5.callPackage ../applications/misc/qsstv { }; + qsstv = qt5.callPackage ../applications/radio/qsstv { }; qsyncthingtray = libsForQt5.callPackage ../applications/misc/qsyncthingtray { }; @@ -19183,9 +19197,9 @@ in }; rrsync = callPackage ../applications/networking/sync/rsync/rrsync.nix {}; - rtl_433 = callPackage ../applications/misc/rtl_433 { }; + rtl_433 = callPackage ../applications/radio/rtl_433 { }; - rtl-sdr = callPackage ../applications/misc/rtl-sdr { }; + rtl-sdr = callPackage ../applications/radio/rtl-sdr { }; rtv = callPackage ../applications/misc/rtv { }; @@ -19779,7 +19793,7 @@ in unpaper = callPackage ../tools/graphics/unpaper { }; - urh = callPackage ../applications/misc/urh { }; + urh = callPackage ../applications/radio/urh { }; uuagc = haskell.lib.justStaticExecutables haskellPackages.uuagc; @@ -20159,7 +20173,7 @@ in ); }; - wsjtx = qt5.callPackage ../applications/misc/wsjtx { }; + wsjtx = qt5.callPackage ../applications/radio/wsjtx { }; wtftw = callPackage ../applications/window-managers/wtftw {}; @@ -20359,6 +20373,8 @@ in inherit (gnome2) libglade; }; + xsuspender = callPackage ../applications/misc/xsuspender { }; + xss-lock = callPackage ../misc/screensavers/xss-lock { }; xloadimage = callPackage ../tools/X11/xloadimage { }; @@ -21506,6 +21522,8 @@ in bftools = callPackage ../applications/science/biology/bftools { }; + cmtk = callPackage ../applications/science/biology/cmtk { }; + conglomerate = callPackage ../applications/science/biology/conglomerate { }; dcm2niix = callPackage ../applications/science/biology/dcm2niix { }; @@ -22169,6 +22187,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 { }; @@ -22210,6 +22230,8 @@ in hepmc = callPackage ../development/libraries/physics/hepmc { }; + hepmc3 = callPackage ../development/libraries/physics/hepmc3 { }; + herwig = callPackage ../development/libraries/physics/herwig { }; lhapdf = callPackage ../development/libraries/physics/lhapdf { }; @@ -22489,6 +22511,8 @@ in kops = callPackage ../applications/networking/cluster/kops { }; + lguf-brightness = callPackage ../misc/lguf-brightness { }; + lilypond = callPackage ../misc/lilypond { guile = guile_1_8; }; lilypond-unstable = callPackage ../misc/lilypond/unstable.nix { }; lilypond-with-fonts = callPackage ../misc/lilypond/with-fonts.nix { @@ -23001,7 +23025,7 @@ in unicode-paracode = callPackage ../tools/misc/unicode { }; - unixcw = callPackage ../applications/misc/unixcw { }; + unixcw = callPackage ../applications/radio/unixcw { }; vault = callPackage ../tools/security/vault { }; @@ -23116,7 +23140,7 @@ in xlayoutdisplay = callPackage ../tools/X11/xlayoutdisplay { }; - xlog = callPackage ../applications/misc/xlog { }; + xlog = callPackage ../applications/radio/xlog { }; xmagnify = callPackage ../tools/X11/xmagnify { }; diff --git a/nixpkgs/pkgs/top-level/coq-packages.nix b/nixpkgs/pkgs/top-level/coq-packages.nix index a624211f79f8..718215fda9d5 100644 --- a/nixpkgs/pkgs/top-level/coq-packages.nix +++ b/nixpkgs/pkgs/top-level/coq-packages.nix @@ -33,6 +33,9 @@ let iris = callPackage ../development/coq-modules/iris {}; math-classes = callPackage ../development/coq-modules/math-classes { }; mathcomp = callPackage ../development/coq-modules/mathcomp { }; + mathcomp-analysis = callPackage ../development/coq-modules/mathcomp-analysis { }; + mathcomp-bigenough = callPackage ../development/coq-modules/mathcomp-bigenough { }; + mathcomp-finmap = callPackage ../development/coq-modules/mathcomp-finmap { }; metalib = callPackage ../development/coq-modules/metalib { }; multinomials = callPackage ../development/coq-modules/multinomials {}; paco = callPackage ../development/coq-modules/paco {}; diff --git a/nixpkgs/pkgs/top-level/emacs-packages.nix b/nixpkgs/pkgs/top-level/emacs-packages.nix index d7c196376cb0..9151975bec75 100644 --- a/nixpkgs/pkgs/top-level/emacs-packages.nix +++ b/nixpkgs/pkgs/top-level/emacs-packages.nix @@ -147,6 +147,32 @@ let }; }; + emacsql-sqlite = melpaBuild rec { + pname = "emacsql-sqlite"; + ename = "emacsql-sqlite"; + version = "20180128.1252"; + src = fetchFromGitHub { + owner = "skeeto"; + repo = "emacsql"; + rev = "62d39157370219a1680265fa593f90ccd51457da"; + sha256 = "0ghl3g8n8wlw8rnmgbivlrm99wcwn93bv8flyalzs0z9j7p7fdq9"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3cfa28c7314fa57fa9a3aaaadf9ef83f8ae541a9/recipes/emacsql-sqlite"; + sha256 = "1y81nabzzb9f7b8azb9giy23ckywcbrrg4b88gw5qyjizbb3h70x"; + name = "recipe"; + }; + preBuild = '' + cd sqlite + make + ''; + packageRequires = [ emacs emacsql ]; + meta = { + homepage = "https://melpa.org/#/emacsql-sqlite"; + license = lib.licenses.free; + }; + }; + elpy = melpaBuild rec { pname = "elpy"; version = external.elpy.version; diff --git a/nixpkgs/pkgs/top-level/ocaml-packages.nix b/nixpkgs/pkgs/top-level/ocaml-packages.nix index 8df57e8d710a..1adf66d5eb78 100644 --- a/nixpkgs/pkgs/top-level/ocaml-packages.nix +++ b/nixpkgs/pkgs/top-level/ocaml-packages.nix @@ -231,16 +231,7 @@ let elina = callPackage ../development/ocaml-modules/elina { }; - eliom = callPackage ../development/ocaml-modules/eliom { - js_of_ocaml-lwt = js_of_ocaml-lwt.override { - ocaml_lwt = lwt3; - lwt_log = lib.overrideDerivation - (lwt_log.override { lwt = lwt3; }) - (_: { inherit (lwt3) src; }); - }; - lwt_react = lwt_react.override { lwt = lwt3; }; - lwt_ssl = lwt_ssl.override { lwt = lwt3; }; - }; + eliom = callPackage ../development/ocaml-modules/eliom { }; elpi = callPackage ../development/ocaml-modules/elpi { }; @@ -412,6 +403,8 @@ let ocaml_lwt = if lib.versionOlder "4.02" ocaml.version then lwt4 else lwt2; + lwt_camlp4 = callPackage ../development/ocaml-modules/lwt/camlp4.nix { }; + lwt_log = callPackage ../development/ocaml-modules/lwt_log { lwt = lwt4; }; @@ -541,10 +534,7 @@ let ocplib-simplex = callPackage ../development/ocaml-modules/ocplib-simplex { }; - ocsigen_server = callPackage ../development/ocaml-modules/ocsigen-server { - lwt_react = lwt_react.override { lwt = lwt3; }; - lwt_ssl = lwt_ssl.override { lwt = lwt3; }; - }; + ocsigen_server = callPackage ../development/ocaml-modules/ocsigen-server { }; ocsigen-start = callPackage ../development/ocaml-modules/ocsigen-start { }; diff --git a/nixpkgs/pkgs/top-level/python-packages.nix b/nixpkgs/pkgs/top-level/python-packages.nix index e485eda2e1d6..ea3e4261293e 100644 --- a/nixpkgs/pkgs/top-level/python-packages.nix +++ b/nixpkgs/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 { }; @@ -2232,10 +2236,6 @@ in { gdal = self.gdal; }; - django_2_0 = callPackage ../development/python-modules/django/2_0.nix { - gdal = self.gdal; - }; - django_2_1 = callPackage ../development/python-modules/django/2_1.nix { gdal = self.gdal; }; @@ -4740,7 +4740,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 { }; @@ -5069,6 +5069,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 { }; |