diff options
381 files changed, 7300 insertions, 6128 deletions
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 3392fa5dab9..27f4da36f2d 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -31,6 +31,9 @@ /pkgs/build-support/bintools-wrapper @Ericson2314 @orivej /pkgs/build-support/setup-hooks @Ericson2314 +# Nixpkgs build-support +/pkgs/build-support/writers @lassulus @Profpatsch + # NixOS Internals /nixos/default.nix @nbp @infinisil /nixos/lib/from-env.nix @nbp @infinisil diff --git a/doc/builders/images/ocitools.xml b/doc/builders/images/ocitools.xml index f61075b242f..e8cd3472f54 100644 --- a/doc/builders/images/ocitools.xml +++ b/doc/builders/images/ocitools.xml @@ -25,7 +25,7 @@ buildContainer { args = [ (with pkgs; writeScript "run.sh" '' #!${bash}/bin/bash - ${coreutils}/bin/exec ${bash}/bin/bash + exec ${bash}/bin/bash '').outPath ]; <co xml:id='ex-ociTools-buildContainer-1' /> mounts = { diff --git a/doc/languages-frameworks/go.xml b/doc/languages-frameworks/go.xml index e8cf27d0565..84b146532b1 100644 --- a/doc/languages-frameworks/go.xml +++ b/doc/languages-frameworks/go.xml @@ -42,7 +42,7 @@ pet = buildGoModule rec { meta = with lib; { description = "Simple command-line snippet manager, written in Go"; - homepage = https://github.com/knqyf263/pet; + homepage = "https://github.com/knqyf263/pet"; license = licenses.mit; maintainers = with maintainers; [ kalbasit ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/doc/languages-frameworks/idris.section.md b/doc/languages-frameworks/idris.section.md index 8d7962d7fb9..f071b9ce178 100644 --- a/doc/languages-frameworks/idris.section.md +++ b/doc/languages-frameworks/idris.section.md @@ -96,7 +96,7 @@ build-idris-package { meta = { description = "Idris YAML lib"; - homepage = https://github.com/Heather/Idris.Yaml; + homepage = "https://github.com/Heather/Idris.Yaml"; license = lib.licenses.mit; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/doc/languages-frameworks/ocaml.xml b/doc/languages-frameworks/ocaml.xml index a0ea209b493..3f72092ec15 100644 --- a/doc/languages-frameworks/ocaml.xml +++ b/doc/languages-frameworks/ocaml.xml @@ -36,7 +36,7 @@ buildDunePackage rec { doCheck = true; meta = { - homepage = https://github.com/inhabitedtype/angstrom; + homepage = "https://github.com/inhabitedtype/angstrom"; description = "OCaml parser combinators built for speed and memory efficiency"; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ sternenseemann ]; @@ -63,7 +63,7 @@ buildDunePackage rec { }; meta = with stdenv.lib; { - homepage = https://github.com/flowtype/ocaml-wtf8; + homepage = "https://github.com/flowtype/ocaml-wtf8"; description = "WTF-8 is a superset of UTF-8 that allows unpaired surrogates."; license = licenses.mit; maintainers = [ maintainers.eqyiel ]; diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 2f66bf6d610..650ed342858 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -241,7 +241,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - homepage = https://github.com/pytoolz/toolz; + homepage = "https://github.com/pytoolz/toolz"; description = "List processing tools and functional utilities"; license = licenses.bsd3; maintainers = with maintainers; [ fridh ]; @@ -335,7 +335,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy multipledispatch dateutil ]; meta = with lib; { - homepage = https://github.com/ContinuumIO/datashape; + homepage = "https://github.com/ContinuumIO/datashape"; description = "A data description language"; license = licenses.bsd2; maintainers = with maintainers; [ fridh ]; @@ -369,7 +369,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pythonic binding for the libxml2 and libxslt libraries"; - homepage = https://lxml.de; + homepage = "https://lxml.de"; license = licenses.bsd3; maintainers = with maintainers; [ sjourdois ]; }; diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md index 099872fba13..f23926eee3b 100644 --- a/doc/languages-frameworks/rust.section.md +++ b/doc/languages-frameworks/rust.section.md @@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "A fast line-oriented regex search tool, similar to ag and ack"; - homepage = https://github.com/BurntSushi/ripgrep; + homepage = "https://github.com/BurntSushi/ripgrep"; license = licenses.unlicense; maintainers = [ maintainers.tailhook ]; platforms = platforms.all; diff --git a/doc/stdenv/meta.xml b/doc/stdenv/meta.xml index 9371196818a..45f7834eb2c 100644 --- a/doc/stdenv/meta.xml +++ b/doc/stdenv/meta.xml @@ -11,7 +11,7 @@ meta = with stdenv.lib; { GNU Hello is a program that prints "Hello, world!" when you run it. It is fully customizable. ''; - homepage = https://www.gnu.org/software/hello/manual/; + homepage = "https://www.gnu.org/software/hello/manual/"; license = licenses.gpl3Plus; maintainers = [ maintainers.eelco ]; platforms = platforms.all; diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 6cd21475d5a..04f0d882d8d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2257,6 +2257,7 @@ ericdallo = { email = "ercdll1337@gmail.com"; github = "ericdallo"; + githubId = 7820865; name = "Eric Dallo"; }; ericsagnes = { @@ -2795,9 +2796,14 @@ name = "Graham Christensen"; }; grburst = { - email = "grburst@openmailbox.org"; - github = "grburst"; - name = "Julius Elias"; + email = "GRBurst@protonmail.com"; + github = "GRBurst"; + githubId = 4647221; + name = "GRBurst"; + keys = [{ + longkeyid = "rsa4096/0x797F623868CD00C2"; + fingerprint = "7FC7 98AB 390E 1646 ED4D 8F1F 797F 6238 68CD 00C2"; + }]; }; greydot = { email = "lanablack@amok.cc"; @@ -3002,6 +3008,12 @@ githubId = 12491746; name = "Masato Yonekawa"; }; + i077 = { + email = "nixpkgs@imranhossa.in"; + github = "i077"; + githubId = 2789926; + name = "Imran Hossain"; + }; iand675 = { email = "ian@iankduncan.com"; github = "iand675"; @@ -4287,6 +4299,16 @@ githubId = 1784379; name = "Kyohei Kadota"; }; + Luflosi = { + name = "Luflosi"; + email = "luflosi@luflosi.de"; + github = "Luflosi"; + githubId = 15217907; + keys = [{ + longkeyid = "rsa4096/0x6F987CCF224D20B9"; + fingerprint = "66D1 3048 2B5F 2069 81A6 6B83 6F98 7CCF 224D 20B9"; + }]; + }; luispedro = { email = "luis@luispedro.org"; github = "luispedro"; diff --git a/nixos/lib/test-driver/test-driver.py b/nixos/lib/test-driver/test-driver.py index 2b8dffec7d5..c27947bc610 100644 --- a/nixos/lib/test-driver/test-driver.py +++ b/nixos/lib/test-driver/test-driver.py @@ -911,7 +911,7 @@ def subtest(name: str) -> Iterator[None]: if __name__ == "__main__": log = Logger() - vlan_nrs = list(dict.fromkeys(os.environ["VLANS"].split())) + vlan_nrs = list(dict.fromkeys(os.environ.get("VLANS", "").split())) vde_sockets = [create_vlan(v) for v in vlan_nrs] for nr, vde_socket, _, _ in vde_sockets: os.environ["QEMU_VDE_SOCKET_{}".format(nr)] = vde_socket diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix index c2f2578733b..72b5850a4d9 100644 --- a/nixos/modules/installer/tools/nix-fallback-paths.nix +++ b/nixos/modules/installer/tools/nix-fallback-paths.nix @@ -1,6 +1,6 @@ { - x86_64-linux = "/nix/store/0q5qnh10m2sfrriszc1ysmggw659q6qm-nix-2.3.2"; - i686-linux = "/nix/store/i7ad7r5d8a5b3l22hg4a1im2qq05y6vd-nix-2.3.2"; - aarch64-linux = "/nix/store/bv06pavfw0dbqzr8w3l7s71nx27gnxa0-nix-2.3.2"; - x86_64-darwin = "/nix/store/x6mnl1nij7y4v5ihlplr4k937ayr403r-nix-2.3.2"; + x86_64-linux = "/nix/store/68mycwwczrciryylq2a66jwfhxp09zsg-nix-2.3.3-debug"; + i686-linux = "/nix/store/5axys7hsggb4282dsbps5k5p0v59yv13-nix-2.3.3"; + aarch64-linux = "/nix/store/k80nwvi19hxwbz3c9cxgp24f1jjxwmcc-nix-2.3.3"; + x86_64-darwin = "/nix/store/lrnvapsqmf0ja6zfyx4cpxr7ahdr7f9b-nix-2.3.3"; } diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index f7e4ee6cd1e..6734929b9d4 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -820,6 +820,7 @@ ./services/web-apps/icingaweb2/icingaweb2.nix ./services/web-apps/icingaweb2/module-monitoring.nix ./services/web-apps/ihatemoney + ./services/web-apps/jirafeau.nix ./services/web-apps/limesurvey.nix ./services/web-apps/mattermost.nix ./services/web-apps/mediawiki.nix diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix index 4fbdba47b1d..930cc1987a3 100644 --- a/nixos/modules/programs/zsh/zsh.nix +++ b/nixos/modules/programs/zsh/zsh.nix @@ -162,9 +162,8 @@ in # This file is read for all shells. # Only execute this file once per shell. - # But don't clobber the environment of interactive non-login children! if [ -n "$__ETC_ZSHENV_SOURCED" ]; then return; fi - export __ETC_ZSHENV_SOURCED=1 + __ETC_ZSHENV_SOURCED=1 if [ -z "$__NIXOS_SET_ENVIRONMENT_DONE" ]; then . ${config.system.build.setEnvironment} diff --git a/nixos/modules/services/databases/redis.nix b/nixos/modules/services/databases/redis.nix index 70895fa53e4..5c817422aae 100644 --- a/nixos/modules/services/databases/redis.nix +++ b/nixos/modules/services/databases/redis.nix @@ -150,10 +150,20 @@ in requirePass = mkOption { type = with types; nullOr str; default = null; - description = "Password for database (STORED PLAIN TEXT, WORLD-READABLE IN NIX STORE)"; + description = '' + Password for database (STORED PLAIN TEXT, WORLD-READABLE IN NIX STORE). + Use requirePassFile to store it outside of the nix store in a dedicated file. + ''; example = "letmein!"; }; + requirePassFile = mkOption { + type = with types; nullOr path; + default = null; + description = "File with password for the database."; + example = "/run/keys/redis-password"; + }; + appendOnly = mkOption { type = types.bool; default = false; @@ -192,6 +202,10 @@ in ###### implementation config = mkIf config.services.redis.enable { + assertions = [{ + assertion = cfg.requirePass != null -> cfg.requirePassFile == null; + message = "You can only set one services.redis.requirePass or services.redis.requirePassFile"; + }]; boot.kernel.sysctl = (mkMerge [ { "vm.nr_hugepages" = "0"; } ( mkIf cfg.vmOverCommit { "vm.overcommit_memory" = "1"; } ) @@ -208,21 +222,26 @@ in environment.systemPackages = [ cfg.package ]; - systemd.services.redis = - { description = "Redis Server"; + systemd.services.redis = { + description = "Redis Server"; - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; - serviceConfig = { - ExecStart = "${cfg.package}/bin/redis-server ${redisConfig}"; - RuntimeDirectory = "redis"; - StateDirectory = "redis"; - Type = "notify"; - User = "redis"; - }; - }; + preStart = '' + install -m 600 ${redisConfig} /run/redis/redis.conf + '' + optionalString (cfg.requirePassFile != null) '' + password=$(cat ${escapeShellArg cfg.requirePassFile}) + echo "requirePass $password" >> /run/redis/redis.conf + ''; + serviceConfig = { + ExecStart = "${cfg.package}/bin/redis-server /run/redis/redis.conf"; + RuntimeDirectory = "redis"; + StateDirectory = "redis"; + Type = "notify"; + User = "redis"; + }; + }; }; - } diff --git a/nixos/modules/services/networking/i2pd.nix b/nixos/modules/services/networking/i2pd.nix index 326d34f6ca9..93a21fd4c97 100644 --- a/nixos/modules/services/networking/i2pd.nix +++ b/nixos/modules/services/networking/i2pd.nix @@ -158,10 +158,10 @@ let (sec "addressbook") (strOpt "defaulturl" cfg.addressbook.defaulturl) ] ++ (optionalEmptyList "subscriptions" cfg.addressbook.subscriptions) - ++ (flip mapAttrs - (collect (name: proto: proto ? port && proto ? address && proto ? name) cfg.proto) + ++ (flip map + (collect (proto: proto ? port && proto ? address) cfg.proto) (proto: let protoOpts = [ - (sec name) + (sec proto.name) (boolOpt "enabled" proto.enable) (strOpt "address" proto.address) (intOpt "port" proto.port) @@ -181,10 +181,10 @@ let tunnelConf = let opts = [ notice - (flip mapAttrs - (collect (name: tun: tun ? port && tun ? destination) cfg.outTunnels) + (flip map + (collect (tun: tun ? port && tun ? destination) cfg.outTunnels) (tun: let outTunOpts = [ - (sec name) + (sec tun.name) "type = client" (intOpt "port" tun.port) (strOpt "destination" tun.destination) @@ -204,10 +204,10 @@ let ++ (if tun ? crypto.tagsToSend then optionalNullInt "crypto.tagstosend" tun.crypto.tagsToSend else []); in concatStringsSep "\n" outTunOpts)) - (flip mapAttrs - (collect (name: tun: tun ? port && tun ? address) cfg.inTunnels) + (flip map + (collect (tun: tun ? port && tun ? address) cfg.inTunnels) (tun: let inTunOpts = [ - (sec name) + (sec tun.name) "type = server" (intOpt "port" tun.port) (strOpt "host" tun.address) @@ -606,7 +606,7 @@ in outTunnels = mkOption { default = {}; - type = with types; loaOf (submodule ( + type = with types; attrsOf (submodule ( { name, ... }: { options = { destinationPort = mkOption { @@ -627,7 +627,7 @@ in inTunnels = mkOption { default = {}; - type = with types; loaOf (submodule ( + type = with types; attrsOf (submodule ( { name, ... }: { options = { inPort = mkOption { diff --git a/nixos/modules/services/web-apps/jirafeau.nix b/nixos/modules/services/web-apps/jirafeau.nix new file mode 100644 index 00000000000..4f181257ef7 --- /dev/null +++ b/nixos/modules/services/web-apps/jirafeau.nix @@ -0,0 +1,169 @@ +{ config, lib, pkgs, ... }: + +with lib; +let + cfg = config.services.jirafeau; + + group = config.services.nginx.group; + user = config.services.nginx.user; + + withTrailingSlash = str: if hasSuffix "/" str then str else "${str}/"; + + localConfig = pkgs.writeText "config.local.php" '' + <?php + $cfg['admin_password'] = '${cfg.adminPasswordSha256}'; + $cfg['web_root'] = 'http://${withTrailingSlash cfg.hostName}'; + $cfg['var_root'] = '${withTrailingSlash cfg.dataDir}'; + $cfg['maximal_upload_size'] = ${builtins.toString cfg.maxUploadSizeMegabytes}; + $cfg['installation_done'] = true; + + ${cfg.extraConfig} + ''; +in +{ + options.services.jirafeau = { + adminPasswordSha256 = mkOption { + type = types.str; + default = ""; + description = '' + SHA-256 of the desired administration password. Leave blank/unset for no password. + ''; + }; + + dataDir = mkOption { + type = types.path; + default = "/var/lib/jirafeau/data/"; + description = "Location of Jirafeau storage directory."; + }; + + enable = mkEnableOption "Jirafeau file upload application."; + + extraConfig = mkOption { + type = types.lines; + default = ""; + example = '' + $cfg['style'] = 'courgette'; + $cfg['organisation'] = 'ACME'; + ''; + description = let + documentationLink = + "https://gitlab.com/mojo42/Jirafeau/-/blob/${cfg.package.version}/lib/config.original.php"; + in + '' + Jirefeau configuration. Refer to <link xlink:href="${documentationLink}"/> for supported + values. + ''; + }; + + hostName = mkOption { + type = types.str; + default = "localhost"; + description = "URL of instance. Must have trailing slash."; + }; + + maxUploadSizeMegabytes = mkOption { + type = types.int; + default = 0; + description = "Maximum upload size of accepted files."; + }; + + maxUploadTimeout = mkOption { + type = types.str; + default = "30m"; + description = let + nginxCoreDocumentation = "http://nginx.org/en/docs/http/ngx_http_core_module.html"; + in + '' + Timeout for reading client request bodies and headers. Refer to + <link xlink:href="${nginxCoreDocumentation}#client_body_timeout"/> and + <link xlink:href="${nginxCoreDocumentation}#client_header_timeout"/> for accepted values. + ''; + }; + + nginxConfig = mkOption { + type = types.submodule + (import ../web-servers/nginx/vhost-options.nix { inherit config lib; }); + default = {}; + example = { + serverAliases = [ "wiki.\${config.networking.domain}" ]; + }; + description = "Extra configuration for the nginx virtual host of Jirafeau."; + }; + + package = mkOption { + type = types.package; + default = pkgs.jirafeau; + defaultText = "pkgs.jirafeau"; + description = "Jirafeau package to use"; + example = "pkgs.jirafeau"; + }; + + poolConfig = mkOption { + type = with types; attrsOf (oneOf [ str int bool ]); + default = { + "pm" = "dynamic"; + "pm.max_children" = 32; + "pm.start_servers" = 2; + "pm.min_spare_servers" = 2; + "pm.max_spare_servers" = 4; + "pm.max_requests" = 500; + }; + description = '' + Options for Jirafeau PHP pool. See documentation on <literal>php-fpm.conf</literal> for + details on configuration directives. + ''; + }; + }; + + + config = mkIf cfg.enable { + services = { + nginx = { + enable = true; + virtualHosts."${cfg.hostName}" = mkMerge [ + cfg.nginxConfig + { + extraConfig = let + clientMaxBodySize = + if cfg.maxUploadSizeMegabytes == 0 then "0" else "${cfg.maxUploadSizeMegabytes}m"; + in + '' + index index.php; + client_max_body_size ${clientMaxBodySize}; + client_body_timeout ${cfg.maxUploadTimeout}; + client_header_timeout ${cfg.maxUploadTimeout}; + ''; + locations = { + "~ \\.php$".extraConfig = '' + include ${pkgs.nginx}/conf/fastcgi_params; + fastcgi_split_path_info ^(.+\.php)(/.+)$; + fastcgi_index index.php; + fastcgi_pass unix:${config.services.phpfpm.pools.jirafeau.socket}; + fastcgi_param PATH_INFO $fastcgi_path_info; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + ''; + }; + root = mkForce "${cfg.package}"; + } + ]; + }; + + phpfpm.pools.jirafeau = { + inherit group user; + phpEnv."JIRAFEAU_CONFIG" = "${localConfig}"; + settings = { + "listen.mode" = "0660"; + "listen.owner" = user; + "listen.group" = group; + } // cfg.poolConfig; + }; + }; + + systemd.tmpfiles.rules = [ + "d ${cfg.dataDir} 0750 ${user} ${group} - -" + "d ${cfg.dataDir}/files/ 0750 ${user} ${group} - -" + "d ${cfg.dataDir}/links/ 0750 ${user} ${group} - -" + "d ${cfg.dataDir}/async/ 0750 ${user} ${group} - -" + ]; + }; +} diff --git a/nixos/modules/services/x11/desktop-managers/mate.nix b/nixos/modules/services/x11/desktop-managers/mate.nix index 4a6f2ca727d..910a246d776 100644 --- a/nixos/modules/services/x11/desktop-managers/mate.nix +++ b/nixos/modules/services/x11/desktop-managers/mate.nix @@ -86,6 +86,7 @@ in pkgs.shared-mime-info pkgs.xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/ pkgs.mate.mate-settings-daemon + pkgs.yelp # for 'Contents' in 'Help' menus ]; programs.dconf.enable = true; diff --git a/nixos/modules/tasks/encrypted-devices.nix b/nixos/modules/tasks/encrypted-devices.nix index 2c9231f5523..bc0933f16fe 100644 --- a/nixos/modules/tasks/encrypted-devices.nix +++ b/nixos/modules/tasks/encrypted-devices.nix @@ -65,7 +65,7 @@ in boot.initrd = { luks = { devices = - map (dev: { name = dev.encrypted.label; device = dev.encrypted.blkDev; } ) keylessEncDevs; + builtins.listToAttrs (map (dev: { name = dev.encrypted.label; value = { device = dev.encrypted.blkDev; }; }) keylessEncDevs); forceLuksSupportInInitrd = true; }; postMountCommands = diff --git a/nixos/modules/virtualisation/docker-containers.nix b/nixos/modules/virtualisation/docker-containers.nix index cae39a56f52..5ab990a3d7c 100644 --- a/nixos/modules/virtualisation/docker-containers.nix +++ b/nixos/modules/virtualisation/docker-containers.nix @@ -210,7 +210,16 @@ let wantedBy = [] ++ optional (container.autoStart) "multi-user.target"; after = [ "docker.service" "docker.socket" ] ++ mkAfter; requires = after; - + path = [ pkgs.docker ]; + + preStart = '' + docker rm -f ${name} || true + ${optionalString (container.imageFile != null) '' + docker load -i ${container.imageFile} + ''} + ''; + postStop = "docker rm -f ${name} || true"; + serviceConfig = { ExecStart = concatStringsSep " \\\n " ([ "${pkgs.docker}/bin/docker run" @@ -229,12 +238,7 @@ let ++ map escapeShellArg container.cmd ); - ExecStartPre = - ["-${pkgs.docker}/bin/docker rm -f ${name}"] ++ - (optional (container.imageFile != null) "${pkgs.docker}/bin/docker load -i ${container.imageFile}"); - - ExecStop = ''${pkgs.bash}/bin/sh -c "[ $SERVICE_RESULT = success ] || ${pkgs.docker}/bin/docker stop ${name}"''; - ExecStopPost = "-${pkgs.docker}/bin/docker rm -f ${name}"; + ExecStop = ''${pkgs.bash}/bin/sh -c "[ $SERVICE_RESULT = success ] || docker stop ${name}"''; ### There is no generalized way of supporting `reload` for docker ### containers. Some containers may respond well to SIGHUP sent to their diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 41f8c3d9d52..e47e64edb29 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -38,108 +38,90 @@ in rec { nixpkgs = nixpkgsSrc; })) [ "unstable" ]; - tested = pkgs.lib.hydraJob (pkgs.releaseTools.aggregate { + tested = pkgs.releaseTools.aggregate { name = "nixos-${nixos.channel.version}"; meta = { description = "Release-critical builds for the NixOS channel"; maintainers = with pkgs.lib.maintainers; [ eelco fpletz ]; }; - constituents = - let - # Except for the given systems, return the system-specific constituent - except = systems: x: map (system: x.${system}) (pkgs.lib.subtractLists systems supportedSystems); - all = x: except [] x; - in [ - nixos.channel - (all nixos.dummy) - (all nixos.manual) - - nixos.iso_plasma5.x86_64-linux or [] - nixos.iso_minimal.aarch64-linux or [] - nixos.iso_minimal.i686-linux or [] - nixos.iso_minimal.x86_64-linux or [] - nixos.ova.x86_64-linux or [] - nixos.sd_image.aarch64-linux or [] - - #(all nixos.tests.containers) - (all nixos.tests.containers-imperative) - (all nixos.tests.containers-ip) - nixos.tests.chromium.x86_64-linux or [] - (all nixos.tests.firefox) - (all nixos.tests.firefox-esr) - (all nixos.tests.firewall) - (all nixos.tests.fontconfig-default-fonts) - (all nixos.tests.gnome3-xorg) - (all nixos.tests.gnome3) - (all nixos.tests.pantheon) - nixos.tests.installer.zfsroot.x86_64-linux or [] # ZFS is 64bit only - (except ["aarch64-linux"] nixos.tests.installer.lvm) - (except ["aarch64-linux"] nixos.tests.installer.luksroot) - (except ["aarch64-linux"] nixos.tests.installer.separateBoot) - (except ["aarch64-linux"] nixos.tests.installer.separateBootFat) - (except ["aarch64-linux"] nixos.tests.installer.simple) - (except ["aarch64-linux"] nixos.tests.installer.simpleLabels) - (except ["aarch64-linux"] nixos.tests.installer.simpleProvided) - (except ["aarch64-linux"] nixos.tests.installer.simpleUefiSystemdBoot) - (except ["aarch64-linux"] nixos.tests.installer.swraid) - (except ["aarch64-linux"] nixos.tests.installer.btrfsSimple) - (except ["aarch64-linux"] nixos.tests.installer.btrfsSubvols) - (except ["aarch64-linux"] nixos.tests.installer.btrfsSubvolDefault) - (except ["aarch64-linux"] nixos.tests.boot.biosCdrom) - #(except ["aarch64-linux"] nixos.tests.boot.biosUsb) # disabled due to issue #15690 - (except ["aarch64-linux"] nixos.tests.boot.uefiCdrom) - (except ["aarch64-linux"] nixos.tests.boot.uefiUsb) - (all nixos.tests.boot-stage1) - (all nixos.tests.hibernate) - nixos.tests.docker.x86_64-linux or [] - (all nixos.tests.ecryptfs) - (all nixos.tests.env) - (all nixos.tests.ipv6) - (all nixos.tests.i3wm) - (except ["aarch64-linux"] nixos.tests.keymap.azerty) - (except ["aarch64-linux"] nixos.tests.keymap.colemak) - (except ["aarch64-linux"] nixos.tests.keymap.dvorak) - (except ["aarch64-linux"] nixos.tests.keymap.dvp) - (except ["aarch64-linux"] nixos.tests.keymap.neo) - (except ["aarch64-linux"] nixos.tests.keymap.qwertz) - (all nixos.tests.plasma5) - (all nixos.tests.lightdm) - (all nixos.tests.login) - (all nixos.tests.misc) - (all nixos.tests.mutableUsers) - (all nixos.tests.nat.firewall) - (all nixos.tests.nat.firewall-conntrack) - (all nixos.tests.nat.standalone) - (all nixos.tests.networking.scripted.loopback) - (all nixos.tests.networking.scripted.static) - (all nixos.tests.networking.scripted.dhcpSimple) - (all nixos.tests.networking.scripted.dhcpOneIf) - (all nixos.tests.networking.scripted.bond) - (all nixos.tests.networking.scripted.bridge) - (all nixos.tests.networking.scripted.macvlan) - (all nixos.tests.networking.scripted.sit) - (all nixos.tests.networking.scripted.vlan) - (all nixos.tests.nfs3.simple) - (all nixos.tests.nfs4.simple) - (all nixos.tests.openssh) - (all nixos.tests.php-pcre) - (all nixos.tests.predictable-interface-names.predictable) - (all nixos.tests.predictable-interface-names.unpredictable) - (all nixos.tests.predictable-interface-names.predictableNetworkd) - (all nixos.tests.predictable-interface-names.unpredictableNetworkd) - (all nixos.tests.printing) - (all nixos.tests.proxy) - (all nixos.tests.sddm.default) - (all nixos.tests.simple) - (all nixos.tests.switchTest) - (all nixos.tests.udisks2) - (all nixos.tests.xfce) - - nixpkgs.tarball - (all allSupportedNixpkgs.emacs) - # The currently available aarch64 JDK is unfree - (except ["aarch64-linux"] allSupportedNixpkgs.jdk) - ]; - }); + constituents = [ + "nixos.channel" + "nixos.dummy.x86_64-linux" + "nixos.iso_minimal.aarch64-linux" + "nixos.iso_minimal.i686-linux" + "nixos.iso_minimal.x86_64-linux" + "nixos.iso_plasma5.x86_64-linux" + "nixos.manual.x86_64-linux" + "nixos.ova.x86_64-linux" + "nixos.sd_image.aarch64-linux" + "nixos.tests.boot.biosCdrom.x86_64-linux" + "nixos.tests.boot-stage1.x86_64-linux" + "nixos.tests.boot.uefiCdrom.x86_64-linux" + "nixos.tests.boot.uefiUsb.x86_64-linux" + "nixos.tests.chromium.x86_64-linux" + "nixos.tests.containers-imperative.x86_64-linux" + "nixos.tests.containers-ip.x86_64-linux" + "nixos.tests.docker.x86_64-linux" + "nixos.tests.ecryptfs.x86_64-linux" + "nixos.tests.env.x86_64-linux" + "nixos.tests.firefox.x86_64-linux" + "nixos.tests.firewall.x86_64-linux" + "nixos.tests.fontconfig-default-fonts.x86_64-linux" + "nixos.tests.gnome3.x86_64-linux" + "nixos.tests.gnome3-xorg.x86_64-linux" + "nixos.tests.hibernate.x86_64-linux" + "nixos.tests.i3wm.x86_64-linux" + "nixos.tests.installer.btrfsSimple.x86_64-linux" + "nixos.tests.installer.btrfsSubvolDefault.x86_64-linux" + "nixos.tests.installer.btrfsSubvols.x86_64-linux" + "nixos.tests.installer.luksroot.x86_64-linux" + "nixos.tests.installer.lvm.x86_64-linux" + "nixos.tests.installer.separateBootFat.x86_64-linux" + "nixos.tests.installer.separateBoot.x86_64-linux" + "nixos.tests.installer.simpleLabels.x86_64-linux" + "nixos.tests.installer.simpleProvided.x86_64-linux" + "nixos.tests.installer.simpleUefiSystemdBoot.x86_64-linux" + "nixos.tests.installer.simple.x86_64-linux" + "nixos.tests.installer.swraid.x86_64-linux" + "nixos.tests.ipv6.x86_64-linux" + "nixos.tests.lightdm.x86_64-linux" + "nixos.tests.login.x86_64-linux" + "nixos.tests.misc.x86_64-linux" + "nixos.tests.mutableUsers.x86_64-linux" + "nixos.tests.nat.firewall-conntrack.x86_64-linux" + "nixos.tests.nat.firewall.x86_64-linux" + "nixos.tests.nat.standalone.x86_64-linux" + "nixos.tests.networking.scripted.bond.x86_64-linux" + "nixos.tests.networking.scripted.bridge.x86_64-linux" + "nixos.tests.networking.scripted.dhcpOneIf.x86_64-linux" + "nixos.tests.networking.scripted.dhcpSimple.x86_64-linux" + "nixos.tests.networking.scripted.loopback.x86_64-linux" + "nixos.tests.networking.scripted.macvlan.x86_64-linux" + "nixos.tests.networking.scripted.sit.x86_64-linux" + "nixos.tests.networking.scripted.static.x86_64-linux" + "nixos.tests.networking.scripted.vlan.x86_64-linux" + "nixos.tests.nfs3.simple.x86_64-linux" + "nixos.tests.nfs4.simple.x86_64-linux" + "nixos.tests.openssh.x86_64-linux" + "nixos.tests.pantheon.x86_64-linux" + "nixos.tests.php-pcre.x86_64-linux" + "nixos.tests.plasma5.x86_64-linux" + "nixos.tests.predictable-interface-names.predictableNetworkd.x86_64-linux" + "nixos.tests.predictable-interface-names.predictable.x86_64-linux" + "nixos.tests.predictable-interface-names.unpredictableNetworkd.x86_64-linux" + "nixos.tests.predictable-interface-names.unpredictable.x86_64-linux" + "nixos.tests.printing.x86_64-linux" + "nixos.tests.proxy.x86_64-linux" + "nixos.tests.sddm.default.x86_64-linux" + "nixos.tests.simple.x86_64-linux" + "nixos.tests.switchTest.x86_64-linux" + "nixos.tests.udisks2.x86_64-linux" + "nixos.tests.xfce.x86_64-linux" + "nixos.tests.zfs.installer.i686-linux" + "nixpkgs.emacs.x86_64-linux" + "nixpkgs.jdk.x86_64-linux" + "nixpkgs.tarball" + ]; + }; } diff --git a/nixos/release-small.nix b/nixos/release-small.nix index 74c16e990f3..7b86a91357e 100644 --- a/nixos/release-small.nix +++ b/nixos/release-small.nix @@ -82,18 +82,42 @@ in rec { vim; }; - tested = lib.hydraJob (pkgs.releaseTools.aggregate { + tested = pkgs.releaseTools.aggregate { name = "nixos-${nixos.channel.version}"; meta = { description = "Release-critical builds for the NixOS channel"; maintainers = [ lib.maintainers.eelco ]; }; constituents = - let all = x: map (system: x.${system}) supportedSystems; in - [ nixpkgs.tarball - (all nixpkgs.jdk) - ] - ++ lib.collect lib.isDerivation nixos; - }); + [ "nixos.channel" + "nixos.dummy.x86_64-linux" + "nixos.iso_minimal.x86_64-linux" + "nixos.manual.x86_64-linux" + "nixos.tests.boot.biosCdrom.x86_64-linux" + "nixos.tests.containers-imperative.x86_64-linux" + "nixos.tests.containers-ip.x86_64-linux" + "nixos.tests.firewall.x86_64-linux" + "nixos.tests.installer.lvm.x86_64-linux" + "nixos.tests.installer.separateBoot.x86_64-linux" + "nixos.tests.installer.simple.x86_64-linux" + "nixos.tests.ipv6.x86_64-linux" + "nixos.tests.login.x86_64-linux" + "nixos.tests.misc.x86_64-linux" + "nixos.tests.nat.firewall-conntrack.x86_64-linux" + "nixos.tests.nat.firewall.x86_64-linux" + "nixos.tests.nat.standalone.x86_64-linux" + "nixos.tests.nfs3.simple.x86_64-linux" + "nixos.tests.openssh.x86_64-linux" + "nixos.tests.php-pcre.x86_64-linux" + "nixos.tests.predictable-interface-names.predictable.x86_64-linux" + "nixos.tests.predictable-interface-names.predictableNetworkd.x86_64-linux" + "nixos.tests.predictable-interface-names.unpredictable.x86_64-linux" + "nixos.tests.predictable-interface-names.unpredictableNetworkd.x86_64-linux" + "nixos.tests.proxy.x86_64-linux" + "nixos.tests.simple.x86_64-linux" + "nixpkgs.jdk.x86_64-linux" + "nixpkgs.tarball" + ]; + }; } diff --git a/nixos/tests/acme.nix b/nixos/tests/acme.nix index 732f41a4905..e045f3415fa 100644 --- a/nixos/tests/acme.nix +++ b/nixos/tests/acme.nix @@ -75,6 +75,7 @@ in import ./make-test-python.nix { systemd.services."acme-a.example.com" = { wants = [ "acme-finished-a.example.com.target" ]; before = [ "acme-finished-a.example.com.target" ]; + after = [ "nginx.service" ]; }; services.nginx.enable = true; diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index a854365f752..2e547780439 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -137,6 +137,7 @@ in jackett = handleTest ./jackett.nix {}; jellyfin = handleTest ./jellyfin.nix {}; jenkins = handleTest ./jenkins.nix {}; + jirafeau = handleTest ./jirafeau.nix {}; kafka = handleTest ./kafka.nix {}; keepalived = handleTest ./keepalived.nix {}; kerberos = handleTest ./kerberos/default.nix {}; diff --git a/nixos/tests/glusterfs.nix b/nixos/tests/glusterfs.nix index 8f9cb8973d5..cb07bc09511 100644 --- a/nixos/tests/glusterfs.nix +++ b/nixos/tests/glusterfs.nix @@ -4,10 +4,11 @@ let client = { pkgs, ... } : { environment.systemPackages = [ pkgs.glusterfs ]; fileSystems = pkgs.lib.mkVMOverride - [ { mountPoint = "/gluster"; - fsType = "glusterfs"; - device = "server1:/gv0"; - } ]; + { "/gluster" = + { device = "server1:/gv0"; + fsType = "glusterfs"; + }; + }; }; server = { pkgs, ... } : { @@ -22,11 +23,11 @@ let virtualisation.emptyDiskImages = [ 1024 ]; fileSystems = pkgs.lib.mkVMOverride - [ { mountPoint = "/data"; - device = "/dev/disk/by-label/data"; - fsType = "ext4"; - } - ]; + { "/data" = + { device = "/dev/disk/by-label/data"; + fsType = "ext4"; + }; + }; }; in { name = "glusterfs"; diff --git a/nixos/tests/jirafeau.nix b/nixos/tests/jirafeau.nix new file mode 100644 index 00000000000..0f5af7f718a --- /dev/null +++ b/nixos/tests/jirafeau.nix @@ -0,0 +1,22 @@ +import ./make-test-python.nix ({ lib, ... }: + +with lib; + +{ + name = "jirafeau"; + meta.maintainers = with maintainers; [ davidtwco ]; + + nodes.machine = { pkgs, ... }: { + services.jirafeau = { + enable = true; + }; + }; + + testScript = '' + machine.start() + machine.wait_for_unit("phpfpm-jirafeau.service") + machine.wait_for_unit("nginx.service") + machine.wait_for_open_port(80) + machine.succeed("curl -sSfL http://localhost/ | grep 'Jirafeau'") + ''; +}) diff --git a/nixos/tests/nfs/simple.nix b/nixos/tests/nfs/simple.nix index a1a09ee0f45..c49ebddc2fd 100644 --- a/nixos/tests/nfs/simple.nix +++ b/nixos/tests/nfs/simple.nix @@ -5,13 +5,13 @@ let client = { pkgs, ... }: { fileSystems = pkgs.lib.mkVMOverride - [ { mountPoint = "/data"; - # nfs4 exports the export with fsid=0 as a virtual root directory - device = if (version == 4) then "server:/" else "server:/data"; - fsType = "nfs"; - options = [ "vers=${toString version}" ]; - } - ]; + { "/data" = + { # nfs4 exports the export with fsid=0 as a virtual root directory + device = if (version == 4) then "server:/" else "server:/data"; + fsType = "nfs"; + options = [ "vers=${toString version}" ]; + }; + }; networking.firewall.enable = false; # FIXME: only open statd }; diff --git a/nixos/tests/orangefs.nix b/nixos/tests/orangefs.nix index 46d7a6a72f8..24b7737058c 100644 --- a/nixos/tests/orangefs.nix +++ b/nixos/tests/orangefs.nix @@ -10,11 +10,11 @@ let virtualisation.emptyDiskImages = [ 4096 ]; fileSystems = pkgs.lib.mkVMOverride - [ { mountPoint = "/data"; - device = "/dev/disk/by-label/data"; - fsType = "ext4"; - } - ]; + { "/data" = + { device = "/dev/disk/by-label/data"; + fsType = "ext4"; + }; + }; services.orangefs.server = { enable = true; diff --git a/nixos/tests/postgresql-wal-receiver.nix b/nixos/tests/postgresql-wal-receiver.nix index 791b041ba95..372dd9d8c1c 100644 --- a/nixos/tests/postgresql-wal-receiver.nix +++ b/nixos/tests/postgresql-wal-receiver.nix @@ -6,17 +6,24 @@ with import ../lib/testing.nix { inherit system pkgs; }; with pkgs.lib; let + makePostgresqlWalReceiverTest = subTestName: postgresqlPackage: let + postgresqlDataDir = "/var/db/postgresql/test"; replicationUser = "wal_receiver_user"; replicationSlot = "wal_receiver_slot"; replicationConn = "postgresql://${replicationUser}@localhost"; baseBackupDir = "/tmp/pg_basebackup"; walBackupDir = "/tmp/pg_wal"; - recoveryConf = pkgs.writeText "recovery.conf" '' + atLeast12 = versionAtLeast postgresqlPackage.version "12.0"; + restoreCommand = '' restore_command = 'cp ${walBackupDir}/%f %p' ''; - makePostgresqlWalReceiverTest = subTestName: postgresqlPackage: makeTest { + recoveryFile = if atLeast12 + then pkgs.writeTextDir "recovery.signal" "" + else pkgs.writeTextDir "recovery.conf" "${restoreCommand}"; + + in makeTest { name = "postgresql-wal-receiver-${subTestName}"; meta.maintainers = with maintainers; [ pacien ]; @@ -29,6 +36,9 @@ let wal_level = archive # alias for replica on pg >= 9.6 max_wal_senders = 10 max_replication_slots = 10 + '' + optionalString atLeast12 '' + ${restoreCommand} + recovery_end_command = 'touch recovery.done' ''; authentication = '' host replication ${replicationUser} all trust @@ -45,6 +55,9 @@ let slot = replicationSlot; directory = walBackupDir; }; + # This is only to speedup test, it isn't time racing. Service is set to autorestart always, + # default 60sec is fine for real system, but is too much for a test + systemd.services.postgresql-wal-receiver-main.serviceConfig.RestartSec = mkForce 5; }; testScript = '' @@ -70,7 +83,7 @@ let # prepare WAL and recovery $machine->succeed('chmod a+rX -R ${walBackupDir}'); $machine->execute('for part in ${walBackupDir}/*.partial; do mv $part ''${part%%.*}; done'); # make use of partial segments too - $machine->succeed('cp ${recoveryConf} ${postgresqlDataDir}/recovery.conf && chmod 666 ${postgresqlDataDir}/recovery.conf'); + $machine->succeed('cp ${recoveryFile}/* ${postgresqlDataDir}/ && chmod 666 ${postgresqlDataDir}/recovery*'); # replay WAL $machine->systemctl('start postgresql'); diff --git a/nixos/tests/run-in-machine.nix b/nixos/tests/run-in-machine.nix index 339a4b9a740..67840f3e9fe 100644 --- a/nixos/tests/run-in-machine.nix +++ b/nixos/tests/run-in-machine.nix @@ -3,7 +3,7 @@ pkgs ? import ../.. { inherit system config; } }: -with import ../lib/testing.nix { inherit system pkgs; }; +with import ../lib/testing-python.nix { inherit system pkgs; }; let output = runInMachine { diff --git a/nixos/tests/tinydns.nix b/nixos/tests/tinydns.nix index c7740d5ade3..b80e3451700 100644 --- a/nixos/tests/tinydns.nix +++ b/nixos/tests/tinydns.nix @@ -21,6 +21,6 @@ import ./make-test-python.nix ({ lib, ...} : { testScript = '' nameserver.start() nameserver.wait_for_unit("tinydns.service") - nameserver.succeed("host bla.foo.bar | grep '1\.2\.3\.4'") + nameserver.succeed("host bla.foo.bar 192.168.1.1 | grep '1\.2\.3\.4'") ''; }) diff --git a/pkgs/applications/audio/milkytracker/default.nix b/pkgs/applications/audio/milkytracker/default.nix index 7f86e2c2071..bc508f92e3b 100644 --- a/pkgs/applications/audio/milkytracker/default.nix +++ b/pkgs/applications/audio/milkytracker/default.nix @@ -16,6 +16,9 @@ stdenv.mkDerivation rec { buildInputs = [ SDL2 alsaLib libjack2 lhasa perl rtmidi zlib zziplib ]; + # Somehow this does not get set automatically + cmakeFlags = [ "-DSDL2MAIN_LIBRARY=${SDL2}/lib/libSDL2.so" ]; + meta = with stdenv.lib; { description = "Music tracker application, similar to Fasttracker II"; homepage = http://milkytracker.org; diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix index b40ab6d4f7a..d6cf17c159f 100644 --- a/pkgs/applications/audio/picard/default.nix +++ b/pkgs/applications/audio/picard/default.nix @@ -4,13 +4,13 @@ let pythonPackages = python3Packages; in pythonPackages.buildPythonApplication rec { pname = "picard"; - version = "2.2.3"; + version = "2.3"; src = fetchFromGitHub { owner = "metabrainz"; repo = pname; rev = "release-${version}"; - sha256 = "0lb4pzl03mr5hrzrzva99rxqd5yfip62b7sjmlg4j0imw8mxaj16"; + sha256 = "0msdnp6wh97lnm3m084jsvbp95h5d35y5fm71j64cgf4g39zp5ds"; }; nativeBuildInputs = [ gettext qt5.wrapQtAppsHook qt5.qtbase ]; diff --git a/pkgs/applications/audio/sonic-visualiser/default.nix b/pkgs/applications/audio/sonic-visualiser/default.nix index 6164c1cfe93..d1c981de2d5 100644 --- a/pkgs/applications/audio/sonic-visualiser/default.nix +++ b/pkgs/applications/audio/sonic-visualiser/default.nix @@ -2,21 +2,23 @@ { stdenv, fetchurl, alsaLib, bzip2, fftw, libjack2, libX11, liblo , libmad, libogg, librdf, librdf_raptor, librdf_rasqal, libsamplerate -, libsndfile, pkgconfig, libpulseaudio, qtbase, redland -, qmake, rubberband, serd, sord, vampSDK, fftwFloat +, libsndfile, pkgconfig, libpulseaudio, qtbase, qtsvg, redland +, rubberband, serd, sord, vampSDK, fftwFloat +, capnproto, liboggz, libfishsound, libid3tag, opusfile +, wrapQtAppsHook }: stdenv.mkDerivation rec { pname = "sonic-visualiser"; - version = "2.4.1"; + version = "4.0.1"; src = fetchurl { - url = "https://code.soundsoftware.ac.uk/attachments/download/1185/${pname}-${version}.tar.gz"; - sha256 = "06nlha70kgrby16nyhngrv5q846xagnxdinv608v7ga7vpywwmyb"; + url = "https://code.soundsoftware.ac.uk/attachments/download/2607/${pname}-${version}.tar.gz"; + sha256 = "14674adzp3chilymna236qyvci3b1zmi3wyz696wk7bcd3ndpsg6"; }; buildInputs = - [ libsndfile qtbase fftw fftwFloat bzip2 librdf rubberband + [ libsndfile qtbase qtsvg fftw fftwFloat bzip2 librdf rubberband libsamplerate vampSDK alsaLib librdf_raptor librdf_rasqal redland serd sord @@ -26,23 +28,22 @@ stdenv.mkDerivation rec { libpulseaudio libmad libogg # ? - # fishsound + libfishsound liblo libX11 + capnproto + liboggz + libid3tag + opusfile ]; - nativeBuildInputs = [ pkgconfig qmake ]; + nativeBuildInputs = [ pkgconfig wrapQtAppsHook ]; - configurePhase = '' - for i in sonic-visualiser svapp svcore svgui; - do cd $i && qmake PREFIX=$out && cd ..; - done - ''; + enableParallelBuilding = true; - installPhase = '' - mkdir -p $out/{bin,share/sonic-visualiser} - cp sonic-visualiser $out/bin/ - cp -r samples $out/share/sonic-visualiser/ + # comment out the tests + preConfigure = '' + sed -i 's/sub_test_svcore_/#sub_test_svcore_/' sonic-visualiser.pro ''; meta = with stdenv.lib; { @@ -51,6 +52,5 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = [ maintainers.goibhniu maintainers.marcweber ]; platforms = platforms.linux; - broken = true; }; } diff --git a/pkgs/applications/blockchains/clightning.nix b/pkgs/applications/blockchains/clightning.nix index f6c9fee7a1c..0add60cc19e 100644 --- a/pkgs/applications/blockchains/clightning.nix +++ b/pkgs/applications/blockchains/clightning.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "clightning"; - version = "0.8.0"; + version = "0.8.1"; src = fetchurl { url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip"; - sha256 = "053e43bbe71564e9be8b2b56346a88986646ef6849a0af67cece01858b93306a"; + sha256 = "079d3yx7yr7qrilqgaayvn18lxl8h6a1gwwbsgm5xsyxj4vdlz7r"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/blockchains/lnd.nix b/pkgs/applications/blockchains/lnd.nix index fd18b3fa399..dd45746c8df 100644 --- a/pkgs/applications/blockchains/lnd.nix +++ b/pkgs/applications/blockchains/lnd.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "lnd"; - version = "0.8.1-beta"; + version = "0.9.0-beta"; src = fetchFromGitHub { owner = "lightningnetwork"; repo = "lnd"; rev = "v${version}"; - sha256 = "0f9fx2y66l3wxiax2vl2966avamjarkv3vbn9dy0wbxkwg4pfayb"; + sha256 = "1hq105s9ykp6nsn4iicjnl3mwspqkbfsswkx7sgzv3jggg08fkq9"; }; - modSha256 = "1i6xw2amkg4azvzybcl4pqxif9c0mv8ayrhz9hm8x85bz7i6a787"; + modSha256 = "1pvcvpiz6ck8xkgpypchrq9kgkik0jxd7f3jhihbgldsh4zaqiaq"; meta = with lib; { description = "Lightning Network Daemon"; diff --git a/pkgs/applications/editors/aseprite/allegro-glibc-2.30.patch b/pkgs/applications/editors/aseprite/allegro-glibc-2.30.patch new file mode 100644 index 00000000000..94c70da276c --- /dev/null +++ b/pkgs/applications/editors/aseprite/allegro-glibc-2.30.patch @@ -0,0 +1,8 @@ +diff --git a/src/she/CMakeLists.txt b/src/she/CMakeLists.txt +index 4909ff1..02fa145 100644 +--- a/src/she/CMakeLists.txt ++++ b/src/she/CMakeLists.txt +@@ -23,2 +23,3 @@ if(USE_ALLEG4_BACKEND) + add_definitions(-DUSE_MOUSE_POLLER) ++ add_definitions(-DALLEGRO_NO_FIX_ALIASES) + endif() diff --git a/pkgs/applications/editors/aseprite/default.nix b/pkgs/applications/editors/aseprite/default.nix index 170fde7b9ca..6e6d7db8177 100644 --- a/pkgs/applications/editors/aseprite/default.nix +++ b/pkgs/applications/editors/aseprite/default.nix @@ -6,12 +6,16 @@ , cmark }: +# Unfree version is not redistributable: +# https://dev.aseprite.org/2016/09/01/new-source-code-license/ +# Consider supporting the developer: https://aseprite.org/#buy + let skia = callPackage ./skia.nix {}; in stdenv.mkDerivation rec { pname = "aseprite"; - version = if unfree then "1.2.11" else "1.1.7"; + version = if unfree then "1.2.16.3" else "1.1.7"; src = fetchFromGitHub { owner = "aseprite"; @@ -19,7 +23,7 @@ stdenv.mkDerivation rec { rev = "v${version}"; fetchSubmodules = true; sha256 = if unfree - then "1illr51jpg5g6nx29rav9dllyy5lzyyn7lj2fhrnpz1ysqgaq5p8" + then "16yn7y9xdc5jd50cq7bmsm320gv23pp71lr8hg2nmynzc8ibyda8" else "0gd49lns2bpzbkwax5jf9x1xmg1j8ij997kcxr2596cwiswnw4di"; }; @@ -36,7 +40,9 @@ stdenv.mkDerivation rec { skia libGL ]; - patches = lib.optionals unfree [ + patches = if !unfree then [ + ./allegro-glibc-2.30.patch + ] else [ (fetchpatch { url = "https://github.com/lfont/aseprite/commit/f1ebc47012d3fed52306ed5922787b4b98cc0a7b.patch"; sha256 = "03xg7x6b9iv7z18vzlqxhcfphmx4v3qhs9f5rgf38ppyklca5jyw"; diff --git a/pkgs/applications/editors/aseprite/skia.nix b/pkgs/applications/editors/aseprite/skia.nix index 8bf2adf484e..c89ebd4ad0c 100644 --- a/pkgs/applications/editors/aseprite/skia.nix +++ b/pkgs/applications/editors/aseprite/skia.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, fetchgit, python2, gn, ninja -, fontconfig, expat, icu58, libjpeg, libpng, libwebp, zlib +, fontconfig, expat, icu58, libglvnd, libjpeg, libpng, libwebp, zlib , mesa, libX11 }: @@ -21,7 +21,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ python2 gn ninja ]; buildInputs = [ - fontconfig expat icu58 libjpeg libpng libwebp zlib + fontconfig expat icu58 libglvnd libjpeg libpng libwebp zlib mesa libX11 ]; diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index 485f1d0dca3..e5ee1da7580 100644 --- a/pkgs/applications/editors/vim/common.nix +++ b/pkgs/applications/editors/vim/common.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub }: rec { - version = "8.2.0013"; + version = "8.2.0227"; src = fetchFromGitHub { owner = "vim"; repo = "vim"; rev = "v${version}"; - sha256 = "00sc9zdjdww6f3svwf0nxpx8q2zp1n1r978h7ijapgvn2ysx2z1f"; + sha256 = "1yi7l2yd214iv6i8pr52m272mlzps5v3h6xdgr1770xfz4y1yc0h"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index b6861a9023f..cd3e5676e8c 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -11,15 +11,15 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1bb7icdjzprrsxllx2q478m1p3qf5sbs3rs3bavvb3hzyyf4bifn"; - x86_64-darwin = "1hqpfmp5s135kb9777s96sr0zbls002h1980qbgf7r2hmc0mpnx0"; + x86_64-linux = "0c067qp3aa5kqya3y8pzc9cvyzsafizhgjp9dsibnfl08lvz9hbs"; + x86_64-darwin = "0vi94nk8p3vp30nx60mwqcmfqbrmrqwvfdjbah0zm480dcjzz7dv"; }.${system}; in callPackage ./generic.nix rec { # The update script doesn't correctly change the hash for darwin, so please: # nixpkgs-update: no auto update - version = "1.42.0"; + version = "1.42.1"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index d4676d421d0..eafe1718c2f 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -11,8 +11,8 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0f6ic24w6s9wfirzk5rvysn96gj1naj6b81al9743mllaf32ad5q"; - x86_64-darwin = "0fgyhb2wxkvrc90zzw5w2k3ggwbinmax286gbff3sjlrzbs5sj64"; + x86_64-linux = "1pac3rv7ps23ymynvy8dwd5k2154aln33ksr75z1d8w859x3f1dy"; + x86_64-darwin = "1imzgqynbd65c7gbfp2gb1cxjbazx7afvbdvbqnm5qg7pvq22rni"; }.${system}; sourceRoot = { @@ -25,7 +25,7 @@ in # The update script doesn't correctly change the hash for darwin, so please: # nixpkgs-update: no auto update - version = "1.42.0"; + version = "1.42.1"; pname = "vscodium"; executableName = "codium"; diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix index f15804038e7..c5c29459b45 100644 --- a/pkgs/applications/graphics/avocode/default.nix +++ b/pkgs/applications/graphics/avocode/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "avocode"; - version = "4.2.2"; + version = "4.3.0"; src = fetchurl { url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip"; - sha256 = "0f4cmai2d1x7wbqllxp9na6gxgqfxqav8n4g9azyvm6ymd8zjnx8"; + sha256 = "0ifb4nsh1mw61gb0hqphr1fmdkq1rjbrvvc9hvpclqg7wc7awids"; }; libPath = stdenv.lib.makeLibraryPath (with xorg; [ diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix index 2b3b992d24b..d3950c06c33 100644 --- a/pkgs/applications/graphics/gimp/default.nix +++ b/pkgs/applications/graphics/gimp/default.nix @@ -36,7 +36,7 @@ , libmypaint , gexiv2 , harfbuzz -, mypaint-brushes +, mypaint-brushes1 , libwebp , libheif , libgudev @@ -102,7 +102,7 @@ in stdenv.mkDerivation rec { xorg.libXpm glib-networking libmypaint - mypaint-brushes + mypaint-brushes1 ] ++ lib.optionals stdenv.isDarwin [ AppKit Cocoa diff --git a/pkgs/applications/graphics/mypaint/default.nix b/pkgs/applications/graphics/mypaint/default.nix index 1acaf4850eb..5ebbee0e4d6 100644 --- a/pkgs/applications/graphics/mypaint/default.nix +++ b/pkgs/applications/graphics/mypaint/default.nix @@ -7,59 +7,81 @@ , libpng , librsvg , gobject-introspection +, libmypaint +, mypaint-brushes , gdk-pixbuf , pkgconfig -, python2 -, scons +, python3 , swig , wrapGAppsHook }: let - inherit (python2.pkgs) pycairo pygobject3 numpy; -in stdenv.mkDerivation { + inherit (python3.pkgs) pycairo pygobject3 numpy buildPythonApplication; +in buildPythonApplication rec { pname = "mypaint"; - version = "1.2.1"; + version = "2.0.0"; src = fetchFromGitHub { owner = "mypaint"; repo = "mypaint"; - rev = "bcf5a28d38bbd586cc9d4cee223f849fa303864f"; - sha256 = "1zwx7n629vz1jcrqjqmw6vl6sxdf81fq6a5jzqiga8167gg8s9pf"; + rev = "v${version}"; + sha256 = "180kyilhf81ndhwl1hlvy82gh6hxpcvka2d1nkghbpgy431rls6r"; fetchSubmodules = true; }; nativeBuildInputs = [ intltool pkgconfig - scons swig wrapGAppsHook gobject-introspection # for setup hook ]; - buildInputs = [ gtk3 gdk-pixbuf + libmypaint + mypaint-brushes json_c lcms2 libpng librsvg pycairo pygobject3 - python2 ]; propagatedBuildInputs = [ numpy + pycairo + pygobject3 ]; - postInstall = '' - sed -i -e 's|/usr/bin/env python2.7|${python2}/bin/python|' $out/bin/mypaint + checkInputs = [ + gtk3 + ]; + + buildPhase = '' + runHook preBuild + + ${python3.interpreter} setup.py build + + runHook postBuild ''; - preFixup = '' - gappsWrapperArgs+=(--prefix PYTHONPATH : $PYTHONPATH) + installPhase = '' + runHook preInstall + + ${python3.interpreter} setup.py managed_install --prefix=$out + + runHook postInstall + ''; + + checkPhase = '' + runHook preCheck + + HOME=$TEMPDIR ${python3.interpreter} setup.py test + + runHook postCheck ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/kde/kdepim-runtime/00-no-facebook.patch b/pkgs/applications/kde/kdepim-runtime/00-no-facebook.patch deleted file mode 100644 index 46722ff5fba..00000000000 --- a/pkgs/applications/kde/kdepim-runtime/00-no-facebook.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt -index 99f7dbf..03e953b 100644 ---- a/resources/CMakeLists.txt -+++ b/resources/CMakeLists.txt -@@ -45,7 +45,6 @@ add_subdirectory( imap ) - if (Libkolabxml_FOUND) - add_subdirectory( kolab ) - endif() --add_subdirectory( facebook ) - add_subdirectory( maildir ) - - add_subdirectory( openxchange ) diff --git a/pkgs/applications/kde/kdepim-runtime/default.nix b/pkgs/applications/kde/kdepim-runtime/default.nix index 6d7bd0daa96..65719514f96 100644 --- a/pkgs/applications/kde/kdepim-runtime/default.nix +++ b/pkgs/applications/kde/kdepim-runtime/default.nix @@ -14,7 +14,6 @@ mkDerivation { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; }; - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); nativeBuildInputs = [ extra-cmake-modules kdoctools shared-mime-info ]; buildInputs = [ akonadi akonadi-calendar akonadi-contacts akonadi-mime akonadi-notes @@ -22,6 +21,4 @@ mkDerivation { kmailtransport kmbox kmime knotifications knotifyconfig qtwebengine pimcommon libkgapi qtnetworkauth qtspeech qtxmlpatterns ]; - # Attempts to build some files before dependencies have been generated - enableParallelBuilding = false; } diff --git a/pkgs/applications/kde/kdepim-runtime/series b/pkgs/applications/kde/kdepim-runtime/series deleted file mode 100644 index cc3e104775f..00000000000 --- a/pkgs/applications/kde/kdepim-runtime/series +++ /dev/null @@ -1 +0,0 @@ -00-no-facebook.patch diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index 98aebc32dba..e5590bfe855 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "dbeaver-ce"; - version = "6.3.4"; + version = "6.3.5"; desktopItem = makeDesktopItem { name = "dbeaver"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "1b4ac7vsfz3c9vk7yv33pcfflcxl5fcnbzfdva1yfq63v28g38gk"; + sha256 = "1ssxgnd23cy6br7sbfszvx283c5vz9hgfhx0vqyvm13wyr67hk45"; }; installPhase = '' diff --git a/pkgs/applications/misc/doomseeker/default.nix b/pkgs/applications/misc/doomseeker/default.nix index fbe21dd9a5b..da36e89db1f 100644 --- a/pkgs/applications/misc/doomseeker/default.nix +++ b/pkgs/applications/misc/doomseeker/default.nix @@ -1,6 +1,6 @@ -{ stdenv, cmake, fetchFromBitbucket, pkgconfig, qtbase, qttools, qtmultimedia, zlib, bzip2, xxd }: +{ stdenv, mkDerivation, cmake, fetchFromBitbucket, pkgconfig, qtbase, qttools, qtmultimedia, zlib, bzip2, xxd }: -stdenv.mkDerivation { +mkDerivation { pname = "doomseeker"; version = "2018-03-05"; @@ -13,13 +13,10 @@ stdenv.mkDerivation { patches = [ ./fix_paths.patch ./qt_build_fix.patch ]; - buildInputs = [ qtbase qtmultimedia zlib bzip2 ]; - nativeBuildInputs = [ cmake qttools pkgconfig xxd ]; + buildInputs = [ qtbase qtmultimedia zlib bzip2 ]; - enableParallelBuilding = true; - - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=format-security"; + hardeningDisable = stdenv.lib.optional stdenv.isDarwin "format"; meta = with stdenv.lib; { homepage = http://doomseeker.drdteam.org/; diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix index 188e902614f..cdba8c3f686 100644 --- a/pkgs/applications/misc/kitty/default.nix +++ b/pkgs/applications/misc/kitty/default.nix @@ -74,10 +74,12 @@ buildPythonApplication rec { }) ] ++ stdenv.lib.optionals stdenv.isDarwin [ ./no-lto.patch - ./no-werror.patch ./png2icns.patch ]; + # Causes build failure due to warning + hardeningDisable = stdenv.lib.optional stdenv.isDarwin "strictoverflow"; + buildPhase = if stdenv.isDarwin then '' ${python.interpreter} setup.py kitty.app --update-check-interval=0 '' else '' @@ -123,6 +125,6 @@ buildPythonApplication rec { description = "A modern, hackable, featureful, OpenGL based terminal emulator"; license = licenses.gpl3; platforms = platforms.darwin ++ platforms.linux; - maintainers = with maintainers; [ tex rvolosatovs ma27 ]; + maintainers = with maintainers; [ tex rvolosatovs ma27 Luflosi ]; }; } diff --git a/pkgs/applications/misc/kitty/no-werror.patch b/pkgs/applications/misc/kitty/no-werror.patch deleted file mode 100644 index bc1b369d98d..00000000000 --- a/pkgs/applications/misc/kitty/no-werror.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/setup.py -+++ b/setup.py -@@ -217,7 +217,7 @@ def init_env( - cflags = os.environ.get( - 'OVERRIDE_CFLAGS', ( - '-Wextra {} -Wno-missing-field-initializers -Wall -Wstrict-prototypes -std=c11' -- ' -pedantic-errors -Werror {} {} -fwrapv {} {} -pipe {} -fvisibility=hidden' -+ ' {} {} -fwrapv {} {} -pipe {} -fvisibility=hidden' - ).format( - float_conversion, - optimize, diff --git a/pkgs/applications/misc/mapproxy/default.nix b/pkgs/applications/misc/mapproxy/default.nix index efdfbaadd3d..e5826c09d77 100644 --- a/pkgs/applications/misc/mapproxy/default.nix +++ b/pkgs/applications/misc/mapproxy/default.nix @@ -38,6 +38,7 @@ buildPythonApplication rec { substituteInPlace mapproxy/util/ext/serving.py --replace "args = [sys.executable] + sys.argv" "args = sys.argv" ''; propagatedBuildInputs = [ + boto3 # needed for caches service pillow pyyaml pyproj diff --git a/pkgs/applications/misc/mbutil/default.nix b/pkgs/applications/misc/mbutil/default.nix new file mode 100644 index 00000000000..b108d1a5647 --- /dev/null +++ b/pkgs/applications/misc/mbutil/default.nix @@ -0,0 +1,24 @@ +{ lib, buildPythonApplication, fetchFromGitHub, nose }: + +buildPythonApplication rec { + pname = "mbutil"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "mapbox"; + repo = pname; + rev = "v${version}"; + sha256 = "06d62r89h026asaa4ryzb23m86j0cmbvy54kf4zl5f35sgiha45z"; + }; + + checkInputs = [ nose ]; + checkPhase = "nosetests"; + + meta = with lib; { + description = "An importer and exporter for MBTiles"; + homepage = "https://github.com/mapbox/mbutil"; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = with maintainers; [ sikmir ]; + }; +} diff --git a/pkgs/applications/misc/pastel/default.nix b/pkgs/applications/misc/pastel/default.nix index 426c5162500..7b070e32ca5 100644 --- a/pkgs/applications/misc/pastel/default.nix +++ b/pkgs/applications/misc/pastel/default.nix @@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1c47bph1qraq3g0g5bp23jqlz7qdn4f8vh264y937jz17avvacx5"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1pfhwqj9kxm9p0mpdw7qyvivgby2bmah05kavf0a5zhzvq4v4sg0"; + cargoSha256 = "1hkqahsrhmgcpgp0pvfpc0wmwqivnqylsxzjrz63k1s9ssdv9syy"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; diff --git a/pkgs/applications/misc/rsclock/default.nix b/pkgs/applications/misc/rsclock/default.nix index a66f4c9a2cf..4f63ed057b7 100644 --- a/pkgs/applications/misc/rsclock/default.nix +++ b/pkgs/applications/misc/rsclock/default.nix @@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1i93qkz6d8sbk78i4rvx099hnn4lklp4cjvanpm9ssv8na4rqvh2"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "03mhlp5hi3nlybb9dkwf1gxgsg056mjq2zsxnb5qh8pdxw7fmdxk"; + cargoSha256 = "01dhkis6zswq1y40n7sdq9xv1sp61f2v7nfqbkicyjngmdrmcgrl"; meta = with stdenv.lib; { description = "A simple terminal clock written in Rust"; diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix index 69c2e37e352..645ed7433b3 100644 --- a/pkgs/applications/misc/synergy/default.nix +++ b/pkgs/applications/misc/synergy/default.nix @@ -1,6 +1,6 @@ -{ stdenv, lib, fetchFromGitHub, cmake, avahi-compat +{ stdenv, lib, fetchFromGitHub, cmake, openssl , ApplicationServices, Carbon, Cocoa, CoreServices, ScreenSaver -, xlibsWrapper, libX11, libXi, libXtst, libXrandr, xinput, openssl +, xlibsWrapper, libX11, libXi, libXtst, libXrandr, xinput, avahi-compat , withGUI ? true, wrapQtAppsHook }: stdenv.mkDerivation rec { @@ -35,20 +35,19 @@ stdenv.mkDerivation rec { chmod -R +w ext/ ''; - cmakeFlags = lib.optionals stdenv.isDarwin [ - "-DOSX_TARGET_MAJOR=10" - "-DOSX_TARGET_MINOR=7" - ] ++ lib.optional (!withGUI) "-DSYNERGY_BUILD_LEGACY_GUI=OFF"; + cmakeFlags = lib.optional (!withGUI) "-DSYNERGY_BUILD_LEGACY_GUI=OFF"; nativeBuildInputs = [ cmake ] ++ lib.optional withGUI wrapQtAppsHook; dontWrapQtApps = true; buildInputs = [ - openssl avahi-compat + openssl ] ++ lib.optionals stdenv.isDarwin [ ApplicationServices Carbon Cocoa CoreServices ScreenSaver - ] ++ lib.optionals stdenv.isLinux [ xlibsWrapper libX11 libXi libXtst libXrandr xinput ]; + ] ++ lib.optionals stdenv.isLinux [ + xlibsWrapper libX11 libXi libXtst libXrandr xinput avahi-compat + ]; installPhase = '' mkdir -p $out/bin @@ -56,10 +55,15 @@ stdenv.mkDerivation rec { '' + lib.optionalString withGUI '' cp bin/synergy $out/bin/ wrapQtApp $out/bin/synergy --prefix PATH : ${lib.makeBinPath [ openssl ]} + '' + lib.optionalString stdenv.isLinux '' mkdir -p $out/share/icons/hicolor/scalable/apps cp ../res/synergy.svg $out/share/icons/hicolor/scalable/apps/ mkdir -p $out/share/applications substitute ../res/synergy.desktop $out/share/applications/synergy.desktop --replace /usr/bin $out/bin + '' + lib.optionalString stdenv.isDarwin '' + mkdir -p $out/Applications/ + mv bundle/Synergy.app $out/Applications/ + ln -s $out/bin $out/Applications/Synergy.app/Contents/MacOS ''; doCheck = true; diff --git a/pkgs/applications/misc/taizen/default.nix b/pkgs/applications/misc/taizen/default.nix index 1eb4123a4cc..bf9770acacd 100644 --- a/pkgs/applications/misc/taizen/default.nix +++ b/pkgs/applications/misc/taizen/default.nix @@ -14,10 +14,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ ncurses openssl ] ++ lib.optional stdenv.isDarwin Security; nativeBuildInputs = [ pkgconfig ]; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "0h8ybhb17pqhhfjcmq1l70kp8g1yyq38228lcf86byk3r2ar2rkg"; + cargoSha256 = "0chrgwm97y1a3gj218x25yqk1y1h74a6gzyxjdm023msvs58nkni"; meta = with lib; { homepage = https://crates.io/crates/taizen; diff --git a/pkgs/applications/misc/todiff/default.nix b/pkgs/applications/misc/todiff/default.nix index d4321e3b88e..f55b3852e5b 100644 --- a/pkgs/applications/misc/todiff/default.nix +++ b/pkgs/applications/misc/todiff/default.nix @@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1y0v8nkaqb8kn61xwarpbyrq019gxx1f5f5p1hzw73nqxadc1rcm"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "0xn5p71qk0ahd2drklja16xwv7zw0797kkzpiv563kffzvd1p8id"; + cargoSha256 = "1vyc230a2b0dry2057mkdkrjb7s9d0p43fnz4q67aqrpyr4jxwx2"; checkPhase = "cargo test --features=integration_tests"; diff --git a/pkgs/applications/misc/todoist-electron/default.nix b/pkgs/applications/misc/todoist-electron/default.nix new file mode 100644 index 00000000000..cb0ee20f555 --- /dev/null +++ b/pkgs/applications/misc/todoist-electron/default.nix @@ -0,0 +1,61 @@ +{ stdenv, lib, fetchurl, makeDesktopItem, dpkg, atk, at-spi2-atk, glib, pango, gdk-pixbuf +, gtk3, cairo, freetype, fontconfig, dbus, xorg, nss, nspr, alsaLib, cups, expat +, udev, libpulseaudio, utillinux, makeWrapper }: + +stdenv.mkDerivation rec { + pname = "todoist-electron"; + version = "1.19"; + + src = fetchurl { + url = "https://github.com/KryDos/todoist-linux/releases/download/${version}/Todoist_${version}.0_amd64.deb"; + sha256 = "1w0l7k7wmbhwzv71cffsir0q7zg9m0617fmyvd4a01b6flpxrpfx"; + }; + + desktopItem = makeDesktopItem { + name = "Todoist"; + exec = "todoist"; + desktopName = "Todoist"; + categories = "Utility;Productivity"; + }; + + nativeBuildInputs = [ makeWrapper dpkg ]; + unpackPhase = '' + mkdir pkg + dpkg-deb -x $src pkg + sourceRoot=pkg + ''; + installPhase = let + libPath = lib.makeLibraryPath ([ + stdenv.cc.cc gtk3 atk at-spi2-atk glib pango gdk-pixbuf cairo freetype fontconfig dbus + nss nspr alsaLib libpulseaudio cups expat udev utillinux + ] ++ (with xorg; [ + libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libxcb + libXrender libX11 libXtst libXScrnSaver + ])); + in '' + mkdir -p "$out/bin" + mv opt "$out/" + + # Patch binary + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${libPath}:\$ORIGIN" \ + $out/opt/Todoist/todoist + + # Hacky workaround for RPATH problems + makeWrapper $out/opt/Todoist/todoist $out/bin/todoist \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpulseaudio udev ]} + + # Desktop item + mkdir -p "$out/share" + ln -s "${desktopItem}/share/applications" "$out/share/applications" + ''; + + meta = with lib; { + homepage = "https://github.com/KryDos/todoist-linux"; + description = "The Linux wrapper for Todoist web version"; + platforms = [ "x86_64-linux" ]; + license = licenses.isc; + maintainers = with maintainers; [ i077 ]; + }; +} diff --git a/pkgs/applications/misc/waybar/default.nix b/pkgs/applications/misc/waybar/default.nix index 212013fb655..69d6ff84268 100644 --- a/pkgs/applications/misc/waybar/default.nix +++ b/pkgs/applications/misc/waybar/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchFromGitHub, meson, pkgconfig, ninja, wrapGAppsHook , wayland, wlroots, gtkmm3, libinput, libsigcxx, jsoncpp, fmt, scdoc, spdlog, gtk-layer-shell +, howard-hinnant-date, cmake , traySupport ? true, libdbusmenu-gtk3 , pulseSupport ? false, libpulseaudio , nlSupport ? true, libnl @@ -9,21 +10,21 @@ }: stdenv.mkDerivation rec { pname = "waybar"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "Alexays"; repo = "Waybar"; rev = version; - sha256 = "1w8a6jih872ry288k8ic6mjfi9ccf1jwc24wnh9p5c7w73247c2c"; + sha256 = "0drlv8im5phz39jxp3gxkc40b6f85bb3piff2v3hmnfzh7ib915s"; }; nativeBuildInputs = [ - meson ninja pkgconfig scdoc wrapGAppsHook + meson ninja pkgconfig scdoc wrapGAppsHook cmake ]; buildInputs = with stdenv.lib; - [ wayland wlroots gtkmm3 libinput libsigcxx jsoncpp fmt spdlog gtk-layer-shell ] + [ wayland wlroots gtkmm3 libinput libsigcxx jsoncpp fmt spdlog gtk-layer-shell howard-hinnant-date ] ++ optional traySupport libdbusmenu-gtk3 ++ optional pulseSupport libpulseaudio ++ optional nlSupport libnl @@ -50,5 +51,6 @@ license = licenses.mit; maintainers = with maintainers; [ FlorianFranzen minijackson synthetica ]; platforms = platforms.unix; + homepage = "https://github.com/alexays/waybar"; }; } diff --git a/pkgs/applications/misc/zola/cargo-lock.patch b/pkgs/applications/misc/zola/cargo-lock.patch deleted file mode 100644 index b9d97e3c328..00000000000 --- a/pkgs/applications/misc/zola/cargo-lock.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index df5fef3..80f071a 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -2158,12 +2158,12 @@ version = "0.2.2" - source = "registry+https://github.com/rust-lang/crates.io-index" - dependencies = [ - "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", -- "sass-sys 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)", -+ "sass-sys 0.4.15 (registry+https://github.com/rust-lang/crates.io-index)", - ] - - [[package]] - name = "sass-sys" --version = "0.4.13" -+version = "0.4.15" - source = "registry+https://github.com/rust-lang/crates.io-index" - dependencies = [ - "cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)", -@@ -3410,7 +3410,7 @@ dependencies = [ - "checksum safemem 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d2b08423011dae9a5ca23f07cf57dac3857f5c885d352b76f6d95f4aea9434d0" - "checksum same-file 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "585e8ddcedc187886a30fa705c47985c3fa88d06624095856b36ca0b82ff4421" - "checksum sass-rs 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "cabcf7c6e55053f359911187ac401409aad2dc14338cae972dec266fee486abd" --"checksum sass-sys 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6e16ac97c2335bc367e2d675f54c1823558f1b19a6c67671d48b70e30ae22972" -+"checksum sass-sys 0.4.15 (registry+https://github.com/rust-lang/crates.io-index)" = "304b6f9501d1da13f17404aeee85486d7383d06074906669b3ea032f81e83d22" - "checksum schannel 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "87f550b06b6cba9c8b8be3ee73f391990116bf527450d2556e9b9ce263b9a021" - "checksum scoped_threadpool 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8" - "checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27" diff --git a/pkgs/applications/misc/zola/default.nix b/pkgs/applications/misc/zola/default.nix index be00070d2a5..201a3eda3cc 100644 --- a/pkgs/applications/misc/zola/default.nix +++ b/pkgs/applications/misc/zola/default.nix @@ -1,23 +1,19 @@ -{ stdenv, fetchFromGitHub, rustPlatform, cmake, pkgconfig, openssl, CoreServices }: +{ stdenv, fetchFromGitHub, rustPlatform, cmake, pkg-config, openssl, CoreServices }: rustPlatform.buildRustPackage rec { pname = "zola"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "getzola"; repo = pname; rev = "v${version}"; - sha256 = "13kbgxh7r6124d1fjdf0x599j1kpgixp1y9d299zb5vrd6rf5wy5"; + sha256 = "112aqv21gy1fbly5v2x3ph32pr82d1mwh0q57yfaaqygz2madypb"; }; - cargoPatches = [ ./cargo-lock.patch ]; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; + cargoSha256 = "0hqa60bx8pxhgad7x6r4zbwddrkcspnnp53bl94zbf3j47p10ggz"; - cargoSha256 = "03rwf5l1l3ap03qi0xqcxsbyvpg3cqmr50j8ql6c5v55xl0ki9w8"; - - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ openssl ] ++ stdenv.lib.optional stdenv.isDarwin CoreServices; @@ -32,7 +28,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "A fast static site generator with everything built-in"; - homepage = https://www.getzola.org/; + homepage = "https://www.getzola.org/"; license = licenses.mit; maintainers = with maintainers; [ dywedir ]; platforms = platforms.all; diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index c4a09c8063d..e600d134e9c 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -45,11 +45,11 @@ let flash = stdenv.mkDerivation rec { pname = "flashplayer-ppapi"; - version = "32.0.0.314"; + version = "32.0.0.330"; src = fetchzip { url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz"; - sha256 = "05xcscpzglpfpiiqc3ngs5snxli99irjk18g5vdhw91jk9808gnl"; + sha256 = "08gpx0fq0r1sz5smfdgv4fkfwq1hdijv4dw432d6jdz8lq09y1nk"; stripRoot = false; }; diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index dd9222fef03..2a5a82aed6a 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -16,10 +16,10 @@ in rec { firefox = common rec { pname = "firefox"; - ffversion = "73.0"; + ffversion = "73.0.1"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "2da2jn3gwck6qys3ys146jsjl9fgq10s3ii62y4ssnhl76ryir8f1mv9i1d6hyv8381hplasnxb553d5bgwnq87ymgqabakmr48n2p1"; + sha512 = "1vdz711v44xdiry5vm4rrg7fjkrlnyn5jjkaq0bcf98jwrn9bjklmgwblrrnvmpc9pjd2ff3m7354q7vy6gd6c3yh2jhbq91v2w5yl9"; }; patches = [ diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix index 5ecb6bfb076..3d711f92d1c 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix @@ -74,7 +74,7 @@ let in stdenv.mkDerivation rec { pname = "flashplayer"; - version = "32.0.0.314"; + version = "32.0.0.330"; src = fetchurl { url = @@ -85,14 +85,14 @@ stdenv.mkDerivation rec { sha256 = if debug then if arch == "x86_64" then - "076l93wjcy15sic88cyq6msp87gdhcvbk4ym2vbvvjz2bav2z456" + "1k7h1p6g1vf96v31j1n8638jdxacap0729n0dnmh6l0h5q518k1b" else - "0kxr8d6fh00akqgk3lwv0z6rk7xswislicsbh9b9p33f19mj7c8a" + "0gabgllx79s6rhv0zivfj6z79rcsdrzrdm94xdr19c11dsbqxd6b" else if arch == "x86_64" then - "0a3hvp0qmqlann8k875ajf0i70cv0an1a3mr8kbgji46dxqvwjxz" + "1pf3k1x8c2kbkc9pf9y5n4jilp3g41v8v0q5ng77sbnl92s35zsj" else - "0jyywas2z7ssgzng82qgnp01gy6nccqavkbx9529m07xrclvqbxn"; + "1xibm6ffm09c553g100cgb6grnk21dfq8m81yy0jskph157vg962"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix index 353aff7e707..b003a1b3f5c 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation { pname = "flashplayer-standalone"; - version = "32.0.0.314"; + version = "32.0.0.330"; src = fetchurl { url = @@ -60,9 +60,9 @@ stdenv.mkDerivation { "https://fpdownload.macromedia.com/pub/flashplayer/updaters/32/flash_player_sa_linux.x86_64.tar.gz"; sha256 = if debug then - "0zlin94rip13rn58m7v5l6m20ylnw59l77rbg5j5qyxkr53zawdz" + "0wrkg2in4c0bnbifm06m4rdggzs8zbaxwrh6z3mpbf4p3bl6xg84" else - "0pfrm02iwa01pqx3adqj0sw27p1ddlz9knjky6x248ak8zywsqr2"; + "08qxa3zanlgmn8sn7crz242adx10jqymd4gzf1m0zlczw20ar09c"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 4824e6aabdd..12cf9b30fa6 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -21,12 +21,12 @@ let in mkDerivationWith python3Packages.buildPythonApplication rec { pname = "qutebrowser"; - version = "1.10.0"; + version = "1.10.1"; # the release tarballs are different from the git checkout! src = fetchurl { url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "1prvd3cysmcjfybn0dmr3ih0bl6lm5ml9i7wd09fn8hb7047mkby"; + sha256 = "06bcnsfb4kz92bh8xjxwaghhy9x2mmcb76wk3fv868jb1ga75vd8"; }; # Needs tox diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index c925483147b..4fafe19b379 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -90,19 +90,19 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "9.0.4"; + version = "9.0.5"; lang = "en-US"; srcs = { x86_64-linux = fetchurl { url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"; - sha256 = "14zlf02i447hcdr4qap8af1k4aziznfp9m2ygqz05zsy8icm1j2k"; + sha256 = "1d4c3mrvqd6v086mwn3rnv776y2j3y45agnd0k5njqnmr53ybn2s"; }; i686-linux = fetchurl { url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"; - sha256 = "1bmih91gsh698fp2mbnjcq8vmwhg822wanmn99r0xhkmgpi4zw2s"; + sha256 = "040nh79hjkg5afvzshzhp7588dbi1pcpjsyk8phfqaapds74ma8y"; }; }; in diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index ce3530728aa..d2de889bf7b 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -17,11 +17,11 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "2.11.1811.33-1"; + version = "2.11.1811.38-1"; src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb"; - sha256 = "1z0cscvmhxh1wjs7r0sjdr3f3mcg8i6avpal6spp0ymkxp2rn0h3"; + sha256 = "0nz7yhxp7fxv6pj1i2684di1wgk4k78hw4icfjqzjwmvc3i710jw"; }; unpackPhase = '' diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix index 4842f31c40d..7f9ebda93c0 100644 --- a/pkgs/applications/networking/cluster/argocd/default.nix +++ b/pkgs/applications/networking/cluster/argocd/default.nix @@ -3,6 +3,7 @@ buildGoModule rec { pname = "argocd"; version = "1.4.2"; + commit = "48cced9d925b5bc94f6aa9fa4a8a19b2a59e128a"; src = fetchFromGitHub { owner = "argoproj"; @@ -16,6 +17,14 @@ buildGoModule rec { nativeBuildInputs = [ packr ]; patches = [ ./use-go-module.patch ]; + + buildFlagsArray = '' + -ldflags= + -X github.com/argoproj/argo-cd/common.version=${version} + -X github.com/argoproj/argo-cd/common.buildDate=unknown + -X github.com/argoproj/argo-cd/common.gitCommit=${commit} + -X github.com/argoproj/argo-cd/common.gitTreeState=clean + ''; # run packr to embed assets preBuild = '' diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index ddeb5851037..49f55370bc4 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "terragrunt"; - version = "0.17.4"; + version = "0.21.11"; goPackagePath = "github.com/gruntwork-io/terragrunt"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "gruntwork-io"; repo = "terragrunt"; rev = "v${version}"; - sha256 = "13hlv0ydmv8gpzgg6bfr7rp89xfw1bkgd0j684armw8zq29cmv3a"; + sha256 = "1w64skk67i0sxjd2mkyqh3nglc32wc7schk7h8fwszpa1rw4dfcn"; }; goDeps = ./deps.nix; @@ -18,6 +18,7 @@ buildGoPackage rec { buildInputs = [ makeWrapper ]; preBuild = '' + find go/src -name vendor | xargs -I % sh -c 'echo Removing %; rm -rf %' buildFlagsArray+=("-ldflags" "-X main.VERSION=v${version}") ''; diff --git a/pkgs/applications/networking/cluster/terragrunt/deps.nix b/pkgs/applications/networking/cluster/terragrunt/deps.nix index 8432a8366b7..51cb455ce7c 100644 --- a/pkgs/applications/networking/cluster/terragrunt/deps.nix +++ b/pkgs/applications/networking/cluster/terragrunt/deps.nix @@ -1,129 +1,453 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) [ { - goPackagePath = "github.com/aws/aws-sdk-go"; + goPackagePath = "cloud.google.com/go"; + fetch = { + type = "git"; + url = "https://code.googlesource.com/gocloud"; + rev = "28a4bc8c44b3acbcc482cff0cdf7de29a4688b61"; + sha256 = "0j40msxm72m8gs87rpwkk19iagjj387r42xwxszmrna7il8g0sbl"; + }; + } + { + goPackagePath = "github.com/agext/levenshtein"; + fetch = { + type = "git"; + url = "https://github.com/agext/levenshtein"; + rev = "0ded9c86537917af2ff89bc9c78de6bd58477894"; + sha256 = "19d7q69yhcg7gl81j038rkbjz8yjb4qwnsqrmxa4zvhgzlc7d130"; + }; + } + { + goPackagePath = "github.com/apparentlymart/go-cidr"; + fetch = { + type = "git"; + url = "https://github.com/apparentlymart/go-cidr"; + rev = "b1115bf8e14a60131a196f908223e4506b0ddc35"; + sha256 = "0r938rb18c9cr2k417cwwd4pfq74aabpjp9pzvk4qkxc5279igl3"; + }; + } + { + goPackagePath = "github.com/apparentlymart/go-textseg"; + fetch = { + type = "git"; + url = "https://github.com/apparentlymart/go-textseg"; + rev = "fb01f485ebef760e5ee06d55e1b07534dda2d295"; + sha256 = "0n9xcyj7p5y8mbqilk9zprfyqvgm2y9f1g440wqw9dnn3s4fi1k4"; + }; + } + { + goPackagePath = "github.com/aws/aws-sdk-go"; fetch = { type = "git"; url = "https://github.com/aws/aws-sdk-go"; - rev = "25253087ea42da08900c4c1fc34c04bdb4a97d5a"; - sha256 = "0p6mf53f4l9b26yc4qlm1s7yls73hsw8klyfhmnxhk2mq8k6ix4m"; + rev = "572908275ed4e38fef7ccb7d507f2faacaa7ab36"; + sha256 = "07bn3v0c4pd38qdp0a0kgmsvh7q30f14qp7pbbls3jzmvpxh49zs"; }; } { - goPackagePath = "github.com/bgentry/go-netrc"; + goPackagePath = "github.com/bgentry/go-netrc"; fetch = { type = "git"; url = "https://github.com/bgentry/go-netrc"; - rev = "9fd32a8b3d3d3f9d43c341bfe098430e07609480"; + rev = "9fd32a8b3d3d3f9d43c341bfe098430e07609480"; sha256 = "0dn2h8avgavqdzdqnph8bkhj35bx0wssczry1zdczr22xv650g1l"; }; } { - goPackagePath = "github.com/go-errors/errors"; + goPackagePath = "github.com/bmatcuk/doublestar"; + fetch = { + type = "git"; + url = "https://github.com/bmatcuk/doublestar"; + rev = "2437321e1473408f122a95f65df3d8841fec4fba"; + sha256 = "0z1jg4l746825qs95sffbc69av1yj0l37n8rjmmnwf7hxh5glxzp"; + }; + } + { + goPackagePath = "github.com/creack/pty"; + fetch = { + type = "git"; + url = "https://github.com/creack/pty"; + rev = "3a6a957789163cacdfe0e291617a1c8e80612c11"; + sha256 = "1v52599qq76dwq742mffakzj6mxqqccv2szn3hjicjld56nmd2d3"; + }; + } + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "8991bc29aa16c548c550c7ff78260e27b9ab7c73"; + sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; + }; + } + { + goPackagePath = "github.com/fatih/color"; + fetch = { + type = "git"; + url = "https://github.com/fatih/color"; + rev = "5b77d2a35fb0ede96d138fc9a99f5c9b6aef11b4"; + sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv"; + }; + } + { + goPackagePath = "github.com/go-errors/errors"; fetch = { type = "git"; url = "https://github.com/go-errors/errors"; - rev = "a6af135bd4e28680facf08a3d206b454abc877a4"; + rev = "a6af135bd4e28680facf08a3d206b454abc877a4"; sha256 = "0rznpknk19rxkr7li6dqs52c26pjazp69lh493l4ny4sxn5922lp"; }; } { - goPackagePath = "github.com/hashicorp/go-cleanhttp"; + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "b5d812f8a3706043e23a9cd5babf2e5423744d30"; + sha256 = "15am4s4646qy6iv0g3kkqq52rzykqjhm4bf08dk0fy2r58knpsyl"; + }; + } + { + goPackagePath = "github.com/google/go-cmp"; + fetch = { + type = "git"; + url = "https://github.com/google/go-cmp"; + rev = "6f77996f0c42f7b84e5a2b252227263f93432e9b"; + sha256 = "1hyxx3434zshl2m9ja78gwlkg1rx9yl6diqa7dnjb31xz5x4gbjj"; + }; + } + { + goPackagePath = "github.com/google/uuid"; + fetch = { + type = "git"; + url = "https://github.com/google/uuid"; + rev = "0cd6bf5da1e1c83f8b45653022c74f71af0538a4"; + sha256 = "0hfxcf9frkb57k6q0rdkrmnfs78ms21r1qfk9fhlqga2yh5xg8zb"; + }; + } + { + goPackagePath = "github.com/googleapis/gax-go"; + fetch = { + type = "git"; + url = "https://github.com/googleapis/gax-go"; + rev = "beaecbbdd8af86aa3acf14180d53828ce69400b2"; + sha256 = "1iwnm6ky1x53lgs44mw3hpdkjzrm5qd0kfs50m0qcq2ml5m1cwdm"; + }; + } + { + goPackagePath = "github.com/gruntwork-io/terratest"; + fetch = { + type = "git"; + url = "https://github.com/gruntwork-io/terratest"; + rev = "a02960d4ef0711ae95ae2651271b4e073f88da4e"; + sha256 = "0mywsimj8if8j2jbp8sf4igl5lcdlj81hd3lif86fsmyrma090vw"; + }; + } + { + goPackagePath = "github.com/hashicorp/errwrap"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/errwrap"; + rev = "8a6fb523712970c966eefc6b39ed2c5e74880354"; + sha256 = "0slfb6w3b61xz04r32bi0a1bygc82rjzhqkxj2si2074wynqnr1c"; + }; + } + { + goPackagePath = "github.com/hashicorp/go-cleanhttp"; fetch = { type = "git"; url = "https://github.com/hashicorp/go-cleanhttp"; - rev = "d5fe4b57a186c716b0e00b8c301cbd9b4182694d"; - sha256 = "1m20y90syky4xr81sm3980jpil81nnpzmi6kv0vjr6p584gl1hn8"; + rev = "eda1e5db218aad1db63ca4642c8906b26bcf2744"; + sha256 = "07kx3fhryqmaw3czacmm11qwx63js2q8cfq967vphk7xg9q377kk"; }; } { - goPackagePath = "github.com/hashicorp/go-getter"; + goPackagePath = "github.com/hashicorp/go-getter"; fetch = { type = "git"; url = "https://github.com/hashicorp/go-getter"; - rev = "64040d90d4ab861e7e833d689dc76a0f176d8dec"; - sha256 = "0g25nx42z6ykd7jqzlrxf161h8lqrpxpddmbspl4w3a84wphhgms"; + rev = "f9ec369200fd2163b8f452e5e45696d83ae3f4b6"; + sha256 = "1h69946nsmpp06iqg85whwvjrfqlk1gf9q7y01f0r3sf0cb28f30"; + }; + } + { + goPackagePath = "github.com/hashicorp/go-multierror"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/go-multierror"; + rev = "886a7fbe3eb1c874d46f623bfa70af45f425b3d1"; + sha256 = "00nyn8llqzbfm8aflr9kwsvpzi4kv8v45c141v88xskxp5xf6z49"; + }; + } + { + goPackagePath = "github.com/hashicorp/go-safetemp"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/go-safetemp"; + rev = "c9a55de4fe06c920a71964b53cfe3dd293a3c743"; + sha256 = "0gydks8bkq88adlzmv8qj3rvljx15j94c8lyrp88ji2jn6dvv643"; + }; + } + { + goPackagePath = "github.com/hashicorp/go-uuid"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/go-uuid"; + rev = "4f571afc59f3043a65f8fe6bf46d887b10a01d43"; + sha256 = "0jvb88m0rq41bwgirsadgw7mnayl27av3gd2vqa3xvxp3fy0hp5k"; }; } { - goPackagePath = "github.com/hashicorp/go-version"; + goPackagePath = "github.com/hashicorp/go-version"; fetch = { type = "git"; url = "https://github.com/hashicorp/go-version"; - rev = "23480c0665776210b5fbbac6eaaee40e3e6a96b7"; - sha256 = "056zs67diq3m7skmmq3pnz6wymfcg55dfs5zf86xkfqqpj10kyf7"; + rev = "ac23dc3fea5d1a983c43f6a0f6e2c13f0195d8bd"; + sha256 = "1bwi6y6111xq8ww8kjq0w1cmz15l1h9hb2id6596l8l0ag1vjj1z"; + }; + } + { + goPackagePath = "github.com/hashicorp/golang-lru"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/golang-lru"; + rev = "7087cb70de9f7a8bc0a10c375cb0d2280a8edf9c"; + sha256 = "13f870cvk161bzjj6x41l45r5x9i1z9r2ymwmvm7768kg08zznpy"; }; } { - goPackagePath = "github.com/hashicorp/hcl"; + goPackagePath = "github.com/hashicorp/hcl2"; fetch = { type = "git"; - url = "https://github.com/hashicorp/hcl"; - rev = "f40e974e75af4e271d97ce0fc917af5898ae7bda"; - sha256 = "1w5w3m40xv85gngw8g1kjbcgah1vl4ardbpg2cxgj1svf80zazxx"; + url = "https://github.com/hashicorp/hcl2"; + rev = "318e80eefe28c3aa01b434c61bcf4c83a0cc6b25"; + sha256 = "1wlm47qk84ggn6lanafirc49kaq998r1nw2xdcv4ghdxy2ijc0rj"; }; } { - goPackagePath = "github.com/mattn/go-zglob"; + goPackagePath = "github.com/hashicorp/terraform"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/terraform"; + rev = "abec0acf40d8e31ac612a244cf3886fb3bcce0bb"; + sha256 = "14js4n08rg30y0jrm0na79syglpb64cb7cxys0x3w47pcbgymrka"; + }; + } + { + goPackagePath = "github.com/jmespath/go-jmespath"; + fetch = { + type = "git"; + url = "https://github.com/jmespath/go-jmespath"; + rev = "c2b33e84"; + sha256 = "1r6w7ydx8ydryxk3sfhzsk8m6f1nsik9jg3i1zhi69v4kfl4d5cz"; + }; + } + { + goPackagePath = "github.com/mattn/go-colorable"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-colorable"; + rev = "167de6bfdfba052fa6b2d3664c8f5272e23c9072"; + sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx"; + }; + } + { + goPackagePath = "github.com/mattn/go-isatty"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-isatty"; + rev = "e1f7b56ace729e4a73a29a6b4fac6cd5fcda7ab3"; + sha256 = "0i3km37lajahh1y2392g4hpgvq05arcgiiv93yhzxxyv0fpqj72m"; + }; + } + { + goPackagePath = "github.com/mattn/go-zglob"; fetch = { type = "git"; url = "https://github.com/mattn/go-zglob"; - rev = "4959821b481786922ac53e7ef25c61ae19fb7c36"; - sha256 = "0rwkdw143kphpmingsrw1zp030zf3p08f64h347jpdm4lz8z5449"; + rev = "2ea3427bfa539cca900ca2768d8663ecc8a708c1"; + sha256 = "1sncdyq5fbd42al4amyy91h7vlzm3wm6c9vl8za2pjgfgsd581fz"; }; } { - goPackagePath = "github.com/mitchellh/go-homedir"; + goPackagePath = "github.com/mitchellh/go-homedir"; fetch = { type = "git"; url = "https://github.com/mitchellh/go-homedir"; - rev = "b8bc1bf767474819792c23f32d8286a45736f1c6"; - sha256 = "13ry4lylalkh4g2vny9cxwvryslzyzwp9r92z0b10idhdq3wad1q"; + rev = "af06845cf3004701891bf4fdb884bfe4920b3727"; + sha256 = "0ydzkipf28hwj2bfxqmwlww47khyk6d152xax4bnyh60f4lq3nx1"; }; } { - goPackagePath = "github.com/mitchellh/go-testing-interface"; + goPackagePath = "github.com/mitchellh/go-testing-interface"; fetch = { type = "git"; url = "https://github.com/mitchellh/go-testing-interface"; - rev = "a61a99592b77c9ba629d254a693acffaeb4b7e28"; - sha256 = "139hq835jpgk9pjg94br9d08nka8bfm7zyw92zxlwrkska4pgigx"; + rev = "6d0b8010fcc857872e42fc6c931227569016843c"; + sha256 = "1dl2js8di858bawg7dadlf1qjpkl2g3apziihjyf5imri3znyfpw"; }; } { - goPackagePath = "github.com/mitchellh/mapstructure"; + goPackagePath = "github.com/mitchellh/go-wordwrap"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/go-wordwrap"; + rev = "9e67c67572bc5dd02aef930e2b0ae3c02a4b5a5c"; + sha256 = "1jffbwcr3nnq6c12c5856bwzv2nxjzqk3jwgvxkwi1xhpd2by0bf"; + }; + } + { + goPackagePath = "github.com/mitchellh/mapstructure"; fetch = { type = "git"; url = "https://github.com/mitchellh/mapstructure"; - rev = "00c29f56e2386353d58c599509e8dc3801b0d716"; - sha256 = "1vw8fvhax0d567amgvxr7glcl12lvzg2sbzs007q5k5bbwn1szyb"; + rev = "3536a929edddb9a5b34bd6861dc4a9647cb459fe"; + sha256 = "03bpv28jz9zhn4947saqwi328ydj7f6g6pf1m2d4m5zdh5jlfkrr"; }; } { - goPackagePath = "github.com/stretchr/testify"; + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "792786c7400a136282c1664665ae0a8db921c6c2"; + sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; fetch = { type = "git"; url = "https://github.com/stretchr/testify"; - rev = "c679ae2cc0cb27ec3293fea7e254e47386f05d69"; - sha256 = "1rrdn7k83j492rzhqwkh6956sj8m2nbk44d7r1xa9nsn3hfwj691"; + rev = "ffdc059bfe9ce6a4e144ba849dbedead332c6053"; + sha256 = "0wjchp2c8xbgcbbq32w3kvblk6q6yn533g78nxl6iskq6y95lxsy"; }; } { - goPackagePath = "github.com/ulikunitz/xz"; + goPackagePath = "github.com/ulikunitz/xz"; fetch = { type = "git"; url = "https://github.com/ulikunitz/xz"; - rev = "0c6b41e72360850ca4f98dc341fd999726ea007f"; - sha256 = "0a6l7sp67ipxim093qh6fvw8knbxj24l7bj5lykcddi5gwfi78n3"; + rev = "6f934d456d51e742b4eeab20d925a827ef22320a"; + sha256 = "1qpk02c0nfgfyg110nmbaiy5x12fpn0pm8gy7h1s8pwns133n831"; }; } { - goPackagePath = "github.com/urfave/cli"; + goPackagePath = "github.com/urfave/cli"; fetch = { type = "git"; url = "https://github.com/urfave/cli"; - rev = "8e01ec4cd3e2d84ab2fe90d8210528ffbb06d8ff"; - sha256 = "0cpr10n4ps3gcdbcink71ry9hzhdb5rrcysmylybs8h2lzxqgc1i"; + rev = "cfb38830724cc34fedffe9a2a29fb54fa9169cd1"; + sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj"; + }; + } + { + goPackagePath = "github.com/zclconf/go-cty"; + fetch = { + type = "git"; + url = "https://github.com/zclconf/go-cty"; + rev = "6fd39ad70c3a6bbdb1b4e47444e4cce72f901200"; + sha256 = "0mb0ws70jg93vlamzhdvyvyfq6x0s0ll5gf44yanb1dhlz6i1f90"; + }; + } + { + goPackagePath = "github.com/zclconf/go-cty-yaml"; + fetch = { + type = "git"; + url = "https://github.com/zclconf/go-cty-yaml"; + rev = "bc34c981dadb5ed30af852693e3aba8fb6546f42"; + sha256 = "0dams5g61n88rk7zq7sy0yap873ksjafhf81hn2fg2dpfjhcd3y2"; + }; + } + { + goPackagePath = "go.opencensus.io"; + fetch = { + type = "git"; + url = "https://github.com/census-instrumentation/opencensus-go"; + rev = "9c377598961b706d1542bd2d84d538b5094d596e"; + sha256 = "05jr8gkr2w34i5wwki4zhl5ch0qrgi7cdgag5iy5gpxplhbrvbg9"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "5c40567a22f818bd14a1ea7245dad9f8ef0691aa"; + sha256 = "17g8fb9vy2sqq8vgz8jdvf6c6d2290gm2qs0i4yzsd86mgn4dlrg"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "461777fb6f67e8cb9d70cda16573678d085a74cf"; + sha256 = "0sc0llch05q6h7nqgayi3sgismsznpnlsz4gh89y4klpymdcpbh2"; + }; + } + { + goPackagePath = "golang.org/x/oauth2"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/oauth2"; + rev = "0f29369cfe4552d0e4bcddc57cc75f4d7e672a33"; + sha256 = "06jwpvx0x2gjn2y959drbcir5kd7vg87k0r1216abk6rrdzzrzi2"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "93c9922d18aeb82498a065f07aec7ad7fa60dfb7"; + sha256 = "0hv96nwbv0li3nrv43ldfzmf12yrrbji2cf8n44iibv8ps5kfssx"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "342b2e1fbaa52c93f31447ad2c6abc048c63e475"; + sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"; + }; + } + { + goPackagePath = "google.golang.org/api"; + fetch = { + type = "git"; + url = "https://code.googlesource.com/google-api-go-client"; + rev = "890e5eb51fe205e56dc55eb68d63e82039730816"; + sha256 = "05r2wsjnmszsz4y59w8q6qknc7zq1mc56kya61i2133dqxyc55ai"; + }; + } + { + goPackagePath = "google.golang.org/appengine"; + fetch = { + type = "git"; + url = "https://github.com/golang/appengine"; + rev = "b2f4a3cf3c67576a2ee09e1fe62656a5086ce880"; + sha256 = "0zxlvwzxwkwz4bs4h9zc9979dx76y4xf9ks4d22bclg47dv59yry"; + }; + } + { + goPackagePath = "google.golang.org/genproto"; + fetch = { + type = "git"; + url = "https://github.com/google/go-genproto"; + rev = "eb0b1bdb6ae60fcfc41b8d907b50dfb346112301"; + sha256 = "0g00wfxd4z886bglyszcvfpgzak0476axqyfaqv3va62ndbqpk90"; + }; + } + { + goPackagePath = "google.golang.org/grpc"; + fetch = { + type = "git"; + url = "https://github.com/grpc/grpc-go"; + rev = "501c41df7f472c740d0674ff27122f3f48c80ce7"; + sha256 = "0hla9rjvyi6wjak4cw39ic8jkdcd0lsymhrz9sa52bfybxsczf38"; }; } -] +] \ No newline at end of file diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index a509d9be329..4361679fc88 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "FlexGet"; - version = "3.1.21"; + version = "3.1.26"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "ea2c9225bbf565215fc97eed97e718f426b4b7b3c8628bbd8edcc96e7bfe7e4e"; + sha256 = "0bd8ccc9ae8e9fd9d5aa4f61a1a5d8b62ff30257fc0f5b2ec61b2f4b26275eee"; }; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/fractal/default.nix b/pkgs/applications/networking/instant-messengers/fractal/default.nix index 9e052c101ad..896ca4f38a6 100644 --- a/pkgs/applications/networking/instant-messengers/fractal/default.nix +++ b/pkgs/applications/networking/instant-messengers/fractal/default.nix @@ -35,10 +35,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0r98km3c8naj3mdr1wppzj823ir7jnsia7r3cbg3vsq8q52i480r"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1n9n4d057cz44sh1iy2hb2adplhnrhvr8drnp0v2h8yw73a5shvv"; + cargoSha256 = "10fgw9m6gdazrca73g43sgvsghhac7xc3bg7hr0vpynzqyfigwa9"; nativeBuildInputs = [ cargo diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json index c49934b96f7..11e2cf5c7e4 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "src/electron-main.js", - "version": "1.5.6", + "version": "1.5.9", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "dependencies": { diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix index 9b6f591bd42..bf0feda4278 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix @@ -6,12 +6,12 @@ let executableName = "riot-desktop"; - version = "1.5.6"; + version = "1.5.9"; riot-web-src = fetchFromGitHub { owner = "vector-im"; repo = "riot-web"; rev = "v${version}"; - sha256 = "148rg6wc84xy53bj16v5riw78s999ridid59x6v9jas827l0bdpk"; + sha256 = "13bskp8nj1h44y7x4dibnfa8sdnzl744x4xckcw5lxnlkccfr69m"; }; in mkYarnPackage rec { @@ -29,7 +29,6 @@ in mkYarnPackage rec { # resources mkdir -p "$out/share/riot" ln -s '${riot-web}' "$out/share/riot/webapp" - cp -r '${riot-web-src}/origin_migrator' "$out/share/riot/origin_migrator" cp -r './deps/riot-web' "$out/share/riot/electron" cp -r './deps/riot-web/img' "$out/share/riot" rm "$out/share/riot/electron/node_modules" diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix index 2156214db6b..ee86ba65891 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix @@ -1,27 +1,30 @@ -{ lib, stdenv, fetchurl, writeText, conf ? null }: +{ lib, stdenv, fetchurl, writeText, jq, conf ? {} }: # Note for maintainers: # Versions of `riot-web` and `riot-desktop` should be kept in sync. -stdenv.mkDerivation rec { +let + noPhoningHome = { + disable_guests = true; # disable automatic guest account registration at matrix.org + piwik = false; # disable analytics + }; + configOverrides = writeText "riot-config-overrides.json" (builtins.toJSON (noPhoningHome // conf)); + +in stdenv.mkDerivation rec { pname = "riot-web"; - version = "1.5.8"; + version = "1.5.10"; src = fetchurl { url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; - sha256 = "112zjlmxy2s8qcd227laf1lfvbbwwcipn51xb779hy2dci48kpkx"; + sha256 = "1c11x8903p38c0f9k3ff4pnpb3n7hzs4pj6g65a4cvp6jgg1zfnn"; }; - installPhase = let - configFile = if (conf != null) - then writeText "riot-config.json" conf - else "$out/config.sample.json"; - in '' + installPhase = '' runHook preInstall mkdir -p $out/ cp -R . $out/ - ln -s ${configFile} $out/config.json + ${jq}/bin/jq -s '.[0] * .[1]' "config.sample.json" "${configOverrides}" > "$out/config.json" runHook postInstall ''; @@ -29,7 +32,7 @@ stdenv.mkDerivation rec { meta = { description = "A glossy Matrix collaboration client for the web"; homepage = http://riot.im/; - maintainers = with stdenv.lib.maintainers; [ bachp pacien ]; + maintainers = with stdenv.lib.maintainers; [ bachp pacien ma27 ]; license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.all; hydraPlatforms = []; diff --git a/pkgs/applications/networking/mullvad-vpn/default.nix b/pkgs/applications/networking/mullvad-vpn/default.nix index 4ec37dc5b54..d673c75764a 100644 --- a/pkgs/applications/networking/mullvad-vpn/default.nix +++ b/pkgs/applications/networking/mullvad-vpn/default.nix @@ -40,11 +40,11 @@ in stdenv.mkDerivation rec { pname = "mullvad-vpn"; - version = "2019.10"; + version = "2020.2"; src = fetchurl { url = "https://www.mullvad.net/media/app/MullvadVPN-${version}_amd64.deb"; - sha256 = "0nckbhfpf4r5l5h22jcv93b5i9y2sc8lhcaffsg2ld804h5ygbbq"; + sha256 = "4f5970714684a86fba44b742d77f9bbe1147a111330e487d160d9844f34ae3d5"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index 86ef850e291..da7c5d4af74 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -19,7 +19,9 @@ let pname = overrides.type; version = source.version; - patches = (source.patches or []) ++ optional jackSupport ./mumble-jack-support.patch; + patches = (source.patches or []) + ++ optional jackSupport ./mumble-jack-support.patch + ++ [ ./fix-rnnoise-argument.patch ]; nativeBuildInputs = [ pkgconfig python qt5.qmake ] ++ (overrides.nativeBuildInputs or [ ]); diff --git a/pkgs/applications/networking/mumble/fix-rnnoise-argument.patch b/pkgs/applications/networking/mumble/fix-rnnoise-argument.patch new file mode 100644 index 00000000000..78e8ed24d58 --- /dev/null +++ b/pkgs/applications/networking/mumble/fix-rnnoise-argument.patch @@ -0,0 +1,16 @@ +nixpkgs has a more recent rnnoise than the one used by mumble, and rnnoise +changed the argument rnnoise_create[1], + +[1] https://github.com/xiph/rnnoise/commit/231b9c02d14a74cb449a98004cb7a2cf1bdeca2f + +--- old/src/mumble/AudioInput.cpp 2020-02-18 22:55:32.000000000 -0500 ++++ new/src/mumble/AudioInput.cpp 2020-02-18 22:58:08.000000000 -0500 +@@ -106,7 +106,7 @@ + #endif + + #ifdef USE_RNNOISE +- denoiseState = rnnoise_create(); ++ denoiseState = rnnoise_create(NULL); + #endif + + qWarning("AudioInput: %d bits/s, %d hz, %d sample", iAudioQuality, iSampleRate, iFrameSize); diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index c362de2daa3..53d073caee4 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -17,13 +17,13 @@ mkDerivation rec { pname = "nextcloud-client"; - version = "2.6.2"; + version = "2.6.3"; src = fetchFromGitHub { owner = "nextcloud"; repo = "desktop"; rev = "v${version}"; - sha256 = "1adicl0msjwbvvi0nxqb1zmka51nn2b88plsynrap5fm0xp40j39"; + sha256 = "17w1bx305w656jkiv55lwncxwdly8rf2dsisqw3c9bc7vz19l6p8"; }; patches = [ diff --git a/pkgs/applications/networking/sync/rclone/browser.nix b/pkgs/applications/networking/sync/rclone/browser.nix index 00edcd411fd..fb2020f0d3a 100644 --- a/pkgs/applications/networking/sync/rclone/browser.nix +++ b/pkgs/applications/networking/sync/rclone/browser.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchFromGitHub, cmake, qtbase }: +{ stdenv, fetchFromGitHub, cmake, wrapQtAppsHook, qtbase }: stdenv.mkDerivation rec { pname = "rclone-browser"; - version = "1.2"; + version = "1.8.0"; src = fetchFromGitHub { - owner = "mmozeiko"; + owner = "kapitainsky"; repo = "RcloneBrowser"; rev = version; - sha256 = "1ldradd5c606mfkh46y4mhcvf9kbjhamw0gahksp9w43h5dh3ir7"; + sha256 = "14ckkdypkfyiqpnz0y2b73wh1py554iyc3gnymj4smy0kg70ai33"; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake wrapQtAppsHook ]; buildInputs = [ qtbase ]; diff --git a/pkgs/applications/office/atlassian-cli/default.nix b/pkgs/applications/office/atlassian-cli/default.nix index 021eadb6476..88da2442ecf 100644 --- a/pkgs/applications/office/atlassian-cli/default.nix +++ b/pkgs/applications/office/atlassian-cli/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "atlassian-cli"; - version = "9.1.0"; + version = "9.1.1"; src = fetchzip { url = "https://bobswift.atlassian.net/wiki/download/attachments/16285777/${pname}-${version}-distribution.zip"; - sha256 = "06431nmz2k1d7vdpnyr88j777sfaa0vrfvxbr9zikn65176mkw7k"; + sha256 = "0mdf4ybp0a6c816210g76lx901qwxw727ipyiph5kbdzl4jlrpgm"; extraPostFetch = "chmod go-w $out"; }; diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index c8bb58d2921..a7d8f4c7d40 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -57,23 +57,11 @@ in (stdenv.mkDerivation rec { # For some reason librdf_redland sometimes refers to rasqal.h instead # of rasqal/rasqal.h - NIX_CFLAGS_COMPILE = "-I${librdf_rasqal}/include/rasqal"; + NIX_CFLAGS_COMPILE = "-I${librdf_rasqal}/include/rasqal" + + stdenv.lib.optionalString stdenv.isx86_64 " -mno-fma"; patches = [ ./xdg-open-brief.patch - - # Poppler-0.82 compatibility - # https://gerrit.libreoffice.org/81545 - (fetchpatch { - url = "https://github.com/LibreOffice/core/commit/2eadd46ab81058087af95bdfc1fea28fcdb65998.patch"; - sha256 = "1mpipdfxvixjziizbhfbpybpzlg1ijw7s0yqjpmq5d7pf3pvkm4n"; - }) - # Poppler-0.83 compatibility - # https://gerrit.libreoffice.org/84384 - (fetchpatch { - url = "https://github.com/LibreOffice/core/commit/9065cd8d9a19864f6b618f2dc10daf577badd9ee.patch"; - sha256 = "0nd0gck8ra3ffw936a7ri0s6a0ii5cyglnhip2prcjh5yf7vw2i2"; - }) ]; tarballPath = "external/tarballs"; @@ -235,7 +223,6 @@ in (stdenv.mkDerivation rec { sed -e '/CPPUNIT_TEST(testEmbeddedDataSource);/d' -i './sw/qa/extras/uiwriter/uiwriter.cxx' sed -e '/CPPUNIT_TEST(testTdf96479);/d' -i './sw/qa/extras/uiwriter/uiwriter.cxx' sed -e '/CPPUNIT_TEST(testInconsistentBookmark);/d' -i './sw/qa/extras/uiwriter/uiwriter.cxx' - sed -e '/CPPUNIT_TEST(Import_Export_Import);/d' -i './sw/qa/extras/inc/swmodeltestbase.hxx' sed -e "s/DECLARE_SW_ROUNDTRIP_TEST(\([_a-zA-Z0-9.]\+\)[, ].*, *\([_a-zA-Z0-9.]\+\))/class \\1: public \\2 { public: void verify() override; }; void \\1::verify() /" -i "sw/qa/extras/ooxmlexport/ooxmlexport9.cxx" sed -e "s/DECLARE_SW_ROUNDTRIP_TEST(\([_a-zA-Z0-9.]\+\)[, ].*, *\([_a-zA-Z0-9.]\+\))/class \\1: public \\2 { public: void verify() override; }; void \\1::verify() /" -i "sw/qa/extras/ooxmlexport/ooxmlencryption.cxx" sed -e "s/DECLARE_SW_ROUNDTRIP_TEST(\([_a-zA-Z0-9.]\+\)[, ].*, *\([_a-zA-Z0-9.]\+\))/class \\1: public \\2 { public: void verify() override; }; void \\1::verify() /" -i "sw/qa/extras/odfexport/odfexport.cxx" @@ -296,7 +283,6 @@ in (stdenv.mkDerivation rec { "--enable-python=system" "--enable-dbus" "--enable-release-build" - (lib.enableFeature kdeIntegration "kde4") "--enable-epm" "--with-jdk-home=${jdk.home}" "--with-ant-home=${ant}/lib/ant" @@ -310,8 +296,6 @@ in (stdenv.mkDerivation rec { "--with-system-openldap" "--with-system-coinmp" - "--with-alloc=system" - # Without these, configure does not finish "--without-junit" @@ -349,6 +333,7 @@ in (stdenv.mkDerivation rec { "--without-system-mdds" # https://github.com/NixOS/nixpkgs/commit/5c5362427a3fa9aefccfca9e531492a8735d4e6f "--without-system-orcus" + "--without-system-qrcodegen" "--without-system-xmlsec" ]; @@ -390,4 +375,4 @@ in (stdenv.mkDerivation rec { maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; }; -}).overrideAttrs ((importVariant "override.nix") args) +}).overrideAttrs ((importVariant "override.nix") (args // { inherit kdeIntegration; })) diff --git a/pkgs/applications/office/libreoffice/src-fresh/download.nix b/pkgs/applications/office/libreoffice/src-fresh/download.nix index 4df8ce1059b..bc329e5a8f8 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/download.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/download.nix @@ -1,10 +1,10 @@ [ { - name = "libabw-0.1.2.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libabw-0.1.2.tar.xz"; - sha256 = "0b72944d5af81dda0a5c5803ee84cbac4b81441a4d767aa57029adc6744c2485"; + name = "libabw-0.1.3.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libabw-0.1.3.tar.xz"; + sha256 = "e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed"; md5 = ""; - md5name = "0b72944d5af81dda0a5c5803ee84cbac4b81441a4d767aa57029adc6744c2485-libabw-0.1.2.tar.xz"; + md5name = "e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed-libabw-0.1.3.tar.xz"; } { name = "commons-logging-1.2-src.tar.gz"; @@ -147,11 +147,11 @@ md5name = "e61677e8799ce6e55b25afc11aa5339113f6a49cff031f336e32fa58635b1a4a-libetonyek-0.1.9.tar.xz"; } { - name = "expat-2.2.5.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/expat-2.2.5.tar.bz2"; - sha256 = "d9dc32efba7e74f788fcc4f212a43216fc37cf5f23f4c2339664d473353aedf6"; + name = "expat-2.2.8.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/expat-2.2.8.tar.bz2"; + sha256 = "9a130948b05a82da34e4171d5f5ae5d321d9630277af02c8fa51e431f6475102"; md5 = ""; - md5name = "d9dc32efba7e74f788fcc4f212a43216fc37cf5f23f4c2339664d473353aedf6-expat-2.2.5.tar.bz2"; + md5name = "9a130948b05a82da34e4171d5f5ae5d321d9630277af02c8fa51e431f6475102-expat-2.2.8.tar.bz2"; } { name = "Firebird-3.0.0.32483-0.tar.bz2"; @@ -336,11 +336,11 @@ md5name = "d47d387161db7f7ebade1920aa7cbdc797e79772597d8b55e80b58d1071bcc36-graphite2-minimal-1.3.13.tgz"; } { - name = "harfbuzz-2.3.1.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/harfbuzz-2.3.1.tar.bz2"; - sha256 = "f205699d5b91374008d6f8e36c59e419ae2d9a7bb8c5d9f34041b9a5abcae468"; + name = "harfbuzz-2.6.0.tar.xz"; + url = "http://dev-www.libreoffice.org/src/harfbuzz-2.6.0.tar.xz"; + sha256 = "9cf7d117548265f95ca884e2f4c9fafaf4e17d45a67b11107147b79eed76c966"; md5 = ""; - md5name = "f205699d5b91374008d6f8e36c59e419ae2d9a7bb8c5d9f34041b9a5abcae468-harfbuzz-2.3.1.tar.bz2"; + md5name = "9cf7d117548265f95ca884e2f4c9fafaf4e17d45a67b11107147b79eed76c966-harfbuzz-2.6.0.tar.xz"; } { name = "hsqldb_1_8_0.zip"; @@ -364,18 +364,18 @@ md5name = "5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz"; } { - name = "icu4c-63_1-src.tgz"; - url = "http://dev-www.libreoffice.org/src/icu4c-63_1-src.tgz"; - sha256 = "05c490b69454fce5860b7e8e2821231674af0a11d7ef2febea9a32512998cb9d"; + name = "icu4c-65_1-src.tgz"; + url = "http://dev-www.libreoffice.org/src/icu4c-65_1-src.tgz"; + sha256 = "53e37466b3d6d6d01ead029e3567d873a43a5d1c668ed2278e253b683136d948"; md5 = ""; - md5name = "05c490b69454fce5860b7e8e2821231674af0a11d7ef2febea9a32512998cb9d-icu4c-63_1-src.tgz"; + md5name = "53e37466b3d6d6d01ead029e3567d873a43a5d1c668ed2278e253b683136d948-icu4c-65_1-src.tgz"; } { - name = "icu4c-63_1-data.zip"; - url = "http://dev-www.libreoffice.org/src/icu4c-63_1-data.zip"; - sha256 = "9bef2bf28ec4fdc86a3bd88d7ac4d509fef6dfbe9c6798299e55b9d4343e960c"; + name = "icu4c-65_1-data.zip"; + url = "http://dev-www.libreoffice.org/src/icu4c-65_1-data.zip"; + sha256 = "06359a7c4ad125ba11d3ac30617cd4b932f1214f611db96573032726574896b6"; md5 = ""; - md5name = "9bef2bf28ec4fdc86a3bd88d7ac4d509fef6dfbe9c6798299e55b9d4343e960c-icu4c-63_1-data.zip"; + md5name = "06359a7c4ad125ba11d3ac30617cd4b932f1214f611db96573032726574896b6-icu4c-65_1-data.zip"; } { name = "flow-engine-0.9.4.zip"; @@ -462,11 +462,11 @@ md5name = "b24890e2bb46e12e72a79f7e965f409f4e16466d00e1dd15d93d73ee6b592523-libjpeg-turbo-1.5.3.tar.gz"; } { - name = "language-subtag-registry-2019-04-03.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2019-04-03.tar.bz2"; - sha256 = "a1d7fb901764bb8f251d4f686cdf565764f9987d0fb5d9315d54a7366a84822d"; + name = "language-subtag-registry-2019-09-16.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2019-09-16.tar.bz2"; + sha256 = "07b66bc0f2786fde55f6bbcbcb4a455a846eb8e2351c8ce3d0a219a73693736a"; md5 = ""; - md5name = "a1d7fb901764bb8f251d4f686cdf565764f9987d0fb5d9315d54a7366a84822d-language-subtag-registry-2019-04-03.tar.bz2"; + md5name = "07b66bc0f2786fde55f6bbcbcb4a455a846eb8e2351c8ce3d0a219a73693736a-language-subtag-registry-2019-09-16.tar.bz2"; } { name = "JLanguageTool-1.7.0.tar.bz2"; @@ -511,6 +511,13 @@ md5name = "13fdbc9d4c489a4d0519e51933a1aa21fe3fb9eb7da191b87f7a63e82797dac8-libexttextcat-3.4.5.tar.xz"; } { + name = "libffi-3.3.tar.gz"; + url = "http://dev-www.libreoffice.org/src/libffi-3.3.tar.gz"; + sha256 = "72fba7922703ddfa7a028d513ac15a85c8d54c8d67f55fa5a4802885dc652056"; + md5 = ""; + md5name = "72fba7922703ddfa7a028d513ac15a85c8d54c8d67f55fa5a4802885dc652056-libffi-3.3.tar.gz"; + } + { name = "libgpg-error-1.27.tar.bz2"; url = "http://dev-www.libreoffice.org/src/libgpg-error-1.27.tar.bz2"; sha256 = "4f93aac6fecb7da2b92871bb9ee33032be6a87b174f54abf8ddf0911a22d29d2"; @@ -546,18 +553,18 @@ md5name = "13eec4811ea30e3f0e16a734d1dbf7f9d246a71d540b48d143a07b489f6222d4-xmlsec1-1.2.28.tar.gz"; } { - name = "libxml2-2.9.9.tar.gz"; - url = "http://dev-www.libreoffice.org/src/libxml2-2.9.9.tar.gz"; - sha256 = "94fb70890143e3c6549f265cee93ec064c80a84c42ad0f23e85ee1fd6540a871"; + name = "libxml2-2.9.10.tar.gz"; + url = "http://dev-www.libreoffice.org/src/libxml2-2.9.10.tar.gz"; + sha256 = "aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f"; md5 = ""; - md5name = "94fb70890143e3c6549f265cee93ec064c80a84c42ad0f23e85ee1fd6540a871-libxml2-2.9.9.tar.gz"; + md5name = "aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f-libxml2-2.9.10.tar.gz"; } { - name = "libxslt-1.1.33.tar.gz"; - url = "http://dev-www.libreoffice.org/src/libxslt-1.1.33.tar.gz"; - sha256 = "8e36605144409df979cab43d835002f63988f3dc94d5d3537c12796db90e38c8"; + name = "libxslt-1.1.34.tar.gz"; + url = "http://dev-www.libreoffice.org/src/libxslt-1.1.34.tar.gz"; + sha256 = "98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f"; md5 = ""; - md5name = "8e36605144409df979cab43d835002f63988f3dc94d5d3537c12796db90e38c8-libxslt-1.1.33.tar.gz"; + md5name = "98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f-libxslt-1.1.34.tar.gz"; } { name = "lp_solve_5.5.tar.gz"; @@ -581,11 +588,11 @@ md5name = "a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz"; } { - name = "mdds-1.4.3.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/mdds-1.4.3.tar.bz2"; - sha256 = "25ce3d5af9f6609e1de05bb22b2316e57b74a72a5b686fbb2da199da72349c81"; + name = "mdds-1.5.0.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/mdds-1.5.0.tar.bz2"; + sha256 = "144d6debd7be32726f332eac14ef9f17e2d3cf89cb3250eb31a7127e0789680d"; md5 = ""; - md5name = "25ce3d5af9f6609e1de05bb22b2316e57b74a72a5b686fbb2da199da72349c81-mdds-1.4.3.tar.bz2"; + md5name = "144d6debd7be32726f332eac14ef9f17e2d3cf89cb3250eb31a7127e0789680d-mdds-1.5.0.tar.bz2"; } { name = "mDNSResponder-878.200.35.tar.gz"; @@ -623,11 +630,11 @@ md5name = "db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca-neon-0.30.2.tar.gz"; } { - name = "nss-3.45-with-nspr-4.21.tar.gz"; - url = "http://dev-www.libreoffice.org/src/nss-3.45-with-nspr-4.21.tar.gz"; - sha256 = "fae11751100510d26f16a245f0db9a5b3d638ab28ce0bccd50d4314f7e526ba1"; + name = "nss-3.47.1-with-nspr-4.23.tar.gz"; + url = "http://dev-www.libreoffice.org/src/nss-3.47.1-with-nspr-4.23.tar.gz"; + sha256 = "07d4276168f59bb3038c7826dabb5fbfbab8336ddf65e4e6e43bce89ada78c64"; md5 = ""; - md5name = "fae11751100510d26f16a245f0db9a5b3d638ab28ce0bccd50d4314f7e526ba1-nss-3.45-with-nspr-4.21.tar.gz"; + md5name = "07d4276168f59bb3038c7826dabb5fbfbab8336ddf65e4e6e43bce89ada78c64-nss-3.47.1-with-nspr-4.23.tar.gz"; } { name = "libodfgen-0.1.6.tar.bz2"; @@ -658,18 +665,18 @@ md5name = "cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824-openldap-2.4.45.tgz"; } { - name = "openssl-1.0.2r.tar.gz"; - url = "http://dev-www.libreoffice.org/src/openssl-1.0.2r.tar.gz"; - sha256 = "ae51d08bba8a83958e894946f15303ff894d75c2b8bbd44a852b64e3fe11d0d6"; + name = "openssl-1.0.2t.tar.gz"; + url = "http://dev-www.libreoffice.org/src/openssl-1.0.2t.tar.gz"; + sha256 = "14cb464efe7ac6b54799b34456bd69558a749a4931ecfd9cf9f71d7881cac7bc"; md5 = ""; - md5name = "ae51d08bba8a83958e894946f15303ff894d75c2b8bbd44a852b64e3fe11d0d6-openssl-1.0.2r.tar.gz"; + md5name = "14cb464efe7ac6b54799b34456bd69558a749a4931ecfd9cf9f71d7881cac7bc-openssl-1.0.2t.tar.gz"; } { - name = "liborcus-0.14.1.tar.gz"; - url = "http://dev-www.libreoffice.org/src/liborcus-0.14.1.tar.gz"; - sha256 = "3f48cfbc21ad74787218284939c04d42cb836c73bc393f27f538b668e4d78a5f"; + name = "liborcus-0.15.3.tar.gz"; + url = "http://dev-www.libreoffice.org/src/liborcus-0.15.3.tar.gz"; + sha256 = "0dd26f3f2e611c51df9ee02d6dbf08887989eaa417b73f6877cd0d94df795fc2"; md5 = ""; - md5name = "3f48cfbc21ad74787218284939c04d42cb836c73bc393f27f538b668e4d78a5f-liborcus-0.14.1.tar.gz"; + md5name = "0dd26f3f2e611c51df9ee02d6dbf08887989eaa417b73f6877cd0d94df795fc2-liborcus-0.15.3.tar.gz"; } { name = "owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; @@ -686,11 +693,11 @@ md5name = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d-libpagemaker-0.0.4.tar.xz"; } { - name = "pdfium-3794.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/pdfium-3794.tar.bz2"; - sha256 = "e3faddcf741336c64ca2e6f72b23e9e60979969b2cf67c878c9a5bc38328cfc4"; + name = "pdfium-3963.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/pdfium-3963.tar.bz2"; + sha256 = "80d4d6bd8faec226936fcde5521c6e92c0c645126ac3ae72dd2c160ca1749895"; md5 = ""; - md5name = "e3faddcf741336c64ca2e6f72b23e9e60979969b2cf67c878c9a5bc38328cfc4-pdfium-3794.tar.bz2"; + md5name = "80d4d6bd8faec226936fcde5521c6e92c0c645126ac3ae72dd2c160ca1749895-pdfium-3963.tar.bz2"; } { name = "pixman-0.34.0.tar.gz"; @@ -707,11 +714,11 @@ md5name = "505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca-libpng-1.6.37.tar.xz"; } { - name = "poppler-0.74.0.tar.xz"; - url = "http://dev-www.libreoffice.org/src/poppler-0.74.0.tar.xz"; - sha256 = "92e09fd3302567fd36146b36bb707db43ce436e8841219025a82ea9fb0076b2f"; + name = "poppler-0.82.0.tar.xz"; + url = "http://dev-www.libreoffice.org/src/poppler-0.82.0.tar.xz"; + sha256 = "234f8e573ea57fb6a008e7c1e56bfae1af5d1adf0e65f47555e1ae103874e4df"; md5 = ""; - md5name = "92e09fd3302567fd36146b36bb707db43ce436e8841219025a82ea9fb0076b2f-poppler-0.74.0.tar.xz"; + md5name = "234f8e573ea57fb6a008e7c1e56bfae1af5d1adf0e65f47555e1ae103874e4df-poppler-0.82.0.tar.xz"; } { name = "postgresql-9.2.24.tar.bz2"; @@ -721,11 +728,18 @@ md5name = "a754c02f7051c2f21e52f8669a421b50485afcde9a581674d6106326b189d126-postgresql-9.2.24.tar.bz2"; } { - name = "Python-3.5.7.tar.xz"; - url = "http://dev-www.libreoffice.org/src/Python-3.5.7.tar.xz"; - sha256 = "285892899bf4d5737fd08482aa6171c6b2564a45b9102dfacfb72826aebdc7dc"; + name = "Python-3.7.6.tar.xz"; + url = "http://dev-www.libreoffice.org/src/Python-3.7.6.tar.xz"; + sha256 = "55a2cce72049f0794e9a11a84862e9039af9183603b78bc60d89539f82cf533f"; + md5 = ""; + md5name = "55a2cce72049f0794e9a11a84862e9039af9183603b78bc60d89539f82cf533f-Python-3.7.6.tar.xz"; + } + { + name = "QR-Code-generator-1.4.0.tar.gz"; + url = "http://dev-www.libreoffice.org/src/QR-Code-generator-1.4.0.tar.gz"; + sha256 = "fcdf9fd69fde07ae4dca2351d84271a9de8093002f733b77c70f52f1630f6e4a"; md5 = ""; - md5name = "285892899bf4d5737fd08482aa6171c6b2564a45b9102dfacfb72826aebdc7dc-Python-3.5.7.tar.xz"; + md5name = "fcdf9fd69fde07ae4dca2351d84271a9de8093002f733b77c70f52f1630f6e4a-QR-Code-generator-1.4.0.tar.gz"; } { name = "libqxp-0.0.2.tar.xz"; @@ -805,11 +819,11 @@ md5name = "0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz"; } { - name = "libvisio-0.1.6.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libvisio-0.1.6.tar.xz"; - sha256 = "fe1002d3671d53c09bc65e47ec948ec7b67e6fb112ed1cd10966e211a8bb50f9"; + name = "libvisio-0.1.7.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libvisio-0.1.7.tar.xz"; + sha256 = "8faf8df870cb27b09a787a1959d6c646faa44d0d8ab151883df408b7166bea4c"; md5 = ""; - md5name = "fe1002d3671d53c09bc65e47ec948ec7b67e6fb112ed1cd10966e211a8bb50f9-libvisio-0.1.6.tar.xz"; + md5name = "8faf8df870cb27b09a787a1959d6c646faa44d0d8ab151883df408b7166bea4c-libvisio-0.1.7.tar.xz"; } { name = "libwpd-0.10.3.tar.xz"; diff --git a/pkgs/applications/office/libreoffice/src-fresh/override.nix b/pkgs/applications/office/libreoffice/src-fresh/override.nix index 464965121d9..60e08735d2e 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/override.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/override.nix @@ -1,4 +1,10 @@ -{ stdenv, ... }: -attrs: { - NIX_CFLAGS_COMPILE = attrs.NIX_CFLAGS_COMPILE + stdenv.lib.optionalString stdenv.isx86_64 " -mno-fma"; +{ stdenv, kdeIntegration, ... }: +attrs: +{ + postConfigure = attrs.postConfigure + '' + sed -e '/CPPUNIT_TEST(Import_Export_Import);/d' -i './sw/qa/inc/swmodeltestbase.hxx' + ''; + configureFlags = attrs.configureFlags ++ [ + (stdenv.lib.enableFeature kdeIntegration "kf5") + ]; } diff --git a/pkgs/applications/office/libreoffice/src-fresh/primary.nix b/pkgs/applications/office/libreoffice/src-fresh/primary.nix index 28bf127c398..ec7f9e52bbb 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/primary.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/primary.nix @@ -7,9 +7,9 @@ rec { }; major = "6"; - minor = "3"; - patch = "0"; - tweak = "4"; + minor = "4"; + patch = "1"; + tweak = "1"; subdir = "${major}.${minor}.${patch}"; @@ -17,19 +17,19 @@ rec { src = fetchurl { url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "1mxflzrcm04djkj8ifyy4rwgl8bxirrvzrn864w6rgvzn43h30w7"; + sha256 = "03fqpkilz4yi35l447hb9r8gjwj23l61bpdkwg21jm8blm8kkvyj"; }; # FIXME rename translations = fetchSrc { name = "translations"; - sha256 = "0730fw2kr00b2d56jkdzjdz49c4k4mxiz879c7ikw59c5zvrh009"; + sha256 = "0a7arjlxxy7hjm1brxwd124bf1gkbl92bgygi3sbbhbsv07pjdcr"; }; # TODO: dictionaries help = fetchSrc { name = "help"; - sha256 = "1w9bqwzz75vvxxy9dgln0v6p6isf8mkqnkg1nzlaykvdgsn5sp4z"; + sha256 = "1hfllrdyxrg5mgqry3dcrhjbdrd0d27k5mvv4sfj7nwjlmjh8rqq"; }; } diff --git a/pkgs/applications/office/libreoffice/src-still/download.nix b/pkgs/applications/office/libreoffice/src-still/download.nix index b5a721b5679..78482326be2 100644 --- a/pkgs/applications/office/libreoffice/src-still/download.nix +++ b/pkgs/applications/office/libreoffice/src-still/download.nix @@ -1,10 +1,10 @@ [ { - name = "libabw-0.1.2.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libabw-0.1.2.tar.xz"; - sha256 = "0b72944d5af81dda0a5c5803ee84cbac4b81441a4d767aa57029adc6744c2485"; + name = "libabw-0.1.3.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libabw-0.1.3.tar.xz"; + sha256 = "e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed"; md5 = ""; - md5name = "0b72944d5af81dda0a5c5803ee84cbac4b81441a4d767aa57029adc6744c2485-libabw-0.1.2.tar.xz"; + md5name = "e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed-libabw-0.1.3.tar.xz"; } { name = "commons-logging-1.2-src.tar.gz"; @@ -28,11 +28,11 @@ md5name = "976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19-apr-util-1.5.4.tar.gz"; } { - name = "boost_1_66_0.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/boost_1_66_0.tar.bz2"; - sha256 = "5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9"; + name = "boost_1_69_0.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/boost_1_69_0.tar.bz2"; + sha256 = "8f32d4617390d1c2d16f26a27ab60d97807b35440d45891fa340fc2648b04406"; md5 = ""; - md5name = "5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9-boost_1_66_0.tar.bz2"; + md5name = "8f32d4617390d1c2d16f26a27ab60d97807b35440d45891fa340fc2648b04406-boost_1_69_0.tar.bz2"; } { name = "breakpad.zip"; @@ -147,11 +147,11 @@ md5name = "e61677e8799ce6e55b25afc11aa5339113f6a49cff031f336e32fa58635b1a4a-libetonyek-0.1.9.tar.xz"; } { - name = "expat-2.2.5.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/expat-2.2.5.tar.bz2"; - sha256 = "d9dc32efba7e74f788fcc4f212a43216fc37cf5f23f4c2339664d473353aedf6"; + name = "expat-2.2.8.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/expat-2.2.8.tar.bz2"; + sha256 = "9a130948b05a82da34e4171d5f5ae5d321d9630277af02c8fa51e431f6475102"; md5 = ""; - md5name = "d9dc32efba7e74f788fcc4f212a43216fc37cf5f23f4c2339664d473353aedf6-expat-2.2.5.tar.bz2"; + md5name = "9a130948b05a82da34e4171d5f5ae5d321d9630277af02c8fa51e431f6475102-expat-2.2.8.tar.bz2"; } { name = "Firebird-3.0.0.32483-0.tar.bz2"; @@ -231,11 +231,11 @@ md5name = "edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz"; } { - name = "source-serif-font-2.007R.tar.gz"; - url = "http://dev-www.libreoffice.org/src/source-serif-font-2.007R.tar.gz"; - sha256 = "10b2bbb357d52bf0f516d3e0ac0a09b5f7901470fbf649b69dad9ccc2d29f7cb"; + name = "source-serif-pro-3.000R.tar.gz"; + url = "http://dev-www.libreoffice.org/src/source-serif-pro-3.000R.tar.gz"; + sha256 = "826a2b784d5cdb4c2bbc7830eb62871528360a61a52689c102a101623f1928e3"; md5 = ""; - md5name = "10b2bbb357d52bf0f516d3e0ac0a09b5f7901470fbf649b69dad9ccc2d29f7cb-source-serif-font-2.007R.tar.gz"; + md5name = "826a2b784d5cdb4c2bbc7830eb62871528360a61a52689c102a101623f1928e3-source-serif-pro-3.000R.tar.gz"; } { name = "EmojiOneColor-SVGinOT-1.3.tar.gz"; @@ -308,11 +308,11 @@ md5name = "0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac-libfreehand-0.1.2.tar.xz"; } { - name = "freetype-2.8.1.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/freetype-2.8.1.tar.bz2"; - sha256 = "e5435f02e02d2b87bb8e4efdcaa14b1f78c9cf3ab1ed80f94b6382fb6acc7d78"; + name = "freetype-2.9.1.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/freetype-2.9.1.tar.bz2"; + sha256 = "db8d87ea720ea9d5edc5388fc7a0497bb11ba9fe972245e0f7f4c7e8b1e1e84d"; md5 = ""; - md5name = "e5435f02e02d2b87bb8e4efdcaa14b1f78c9cf3ab1ed80f94b6382fb6acc7d78-freetype-2.8.1.tar.bz2"; + md5name = "db8d87ea720ea9d5edc5388fc7a0497bb11ba9fe972245e0f7f4c7e8b1e1e84d-freetype-2.9.1.tar.bz2"; } { name = "glm-0.9.4.6-libreoffice.zip"; @@ -329,18 +329,18 @@ md5name = "1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb-gpgme-1.9.0.tar.bz2"; } { - name = "graphite2-minimal-1.3.10.tgz"; - url = "http://dev-www.libreoffice.org/src/graphite2-minimal-1.3.10.tgz"; - sha256 = "aa5e58356cd084000609ebbd93fef456a1bc0ab9e46fea20e81552fb286232a9"; + name = "graphite2-minimal-1.3.13.tgz"; + url = "http://dev-www.libreoffice.org/src/graphite2-minimal-1.3.13.tgz"; + sha256 = "d47d387161db7f7ebade1920aa7cbdc797e79772597d8b55e80b58d1071bcc36"; md5 = ""; - md5name = "aa5e58356cd084000609ebbd93fef456a1bc0ab9e46fea20e81552fb286232a9-graphite2-minimal-1.3.10.tgz"; + md5name = "d47d387161db7f7ebade1920aa7cbdc797e79772597d8b55e80b58d1071bcc36-graphite2-minimal-1.3.13.tgz"; } { - name = "harfbuzz-1.8.4.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/harfbuzz-1.8.4.tar.bz2"; - sha256 = "3c592f86fa0da69e2e0e98cae9f5d5b61def3bb7948aa00ca45748f27fa545fd"; + name = "harfbuzz-2.3.1.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/harfbuzz-2.3.1.tar.bz2"; + sha256 = "f205699d5b91374008d6f8e36c59e419ae2d9a7bb8c5d9f34041b9a5abcae468"; md5 = ""; - md5name = "3c592f86fa0da69e2e0e98cae9f5d5b61def3bb7948aa00ca45748f27fa545fd-harfbuzz-1.8.4.tar.bz2"; + md5name = "f205699d5b91374008d6f8e36c59e419ae2d9a7bb8c5d9f34041b9a5abcae468-harfbuzz-2.3.1.tar.bz2"; } { name = "hsqldb_1_8_0.zip"; @@ -462,11 +462,11 @@ md5name = "b24890e2bb46e12e72a79f7e965f409f4e16466d00e1dd15d93d73ee6b592523-libjpeg-turbo-1.5.3.tar.gz"; } { - name = "language-subtag-registry-2019-04-03.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2019-04-03.tar.bz2"; - sha256 = "a1d7fb901764bb8f251d4f686cdf565764f9987d0fb5d9315d54a7366a84822d"; + name = "language-subtag-registry-2019-09-16.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2019-09-16.tar.bz2"; + sha256 = "07b66bc0f2786fde55f6bbcbcb4a455a846eb8e2351c8ce3d0a219a73693736a"; md5 = ""; - md5name = "a1d7fb901764bb8f251d4f686cdf565764f9987d0fb5d9315d54a7366a84822d-language-subtag-registry-2019-04-03.tar.bz2"; + md5name = "07b66bc0f2786fde55f6bbcbcb4a455a846eb8e2351c8ce3d0a219a73693736a-language-subtag-registry-2019-09-16.tar.bz2"; } { name = "JLanguageTool-1.7.0.tar.bz2"; @@ -539,25 +539,25 @@ md5name = "083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483-ltm-1.0.zip"; } { - name = "xmlsec1-1.2.27.tar.gz"; - url = "http://dev-www.libreoffice.org/src/xmlsec1-1.2.27.tar.gz"; - sha256 = "97d756bad8e92588e6997d2227797eaa900d05e34a426829b149f65d87118eb6"; + name = "xmlsec1-1.2.28.tar.gz"; + url = "http://dev-www.libreoffice.org/src/xmlsec1-1.2.28.tar.gz"; + sha256 = "13eec4811ea30e3f0e16a734d1dbf7f9d246a71d540b48d143a07b489f6222d4"; md5 = ""; - md5name = "97d756bad8e92588e6997d2227797eaa900d05e34a426829b149f65d87118eb6-xmlsec1-1.2.27.tar.gz"; + md5name = "13eec4811ea30e3f0e16a734d1dbf7f9d246a71d540b48d143a07b489f6222d4-xmlsec1-1.2.28.tar.gz"; } { - name = "libxml2-2.9.9.tar.gz"; - url = "http://dev-www.libreoffice.org/src/libxml2-2.9.9.tar.gz"; - sha256 = "94fb70890143e3c6549f265cee93ec064c80a84c42ad0f23e85ee1fd6540a871"; + name = "libxml2-2.9.10.tar.gz"; + url = "http://dev-www.libreoffice.org/src/libxml2-2.9.10.tar.gz"; + sha256 = "aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f"; md5 = ""; - md5name = "94fb70890143e3c6549f265cee93ec064c80a84c42ad0f23e85ee1fd6540a871-libxml2-2.9.9.tar.gz"; + md5name = "aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f-libxml2-2.9.10.tar.gz"; } { - name = "libxslt-1.1.33.tar.gz"; - url = "http://dev-www.libreoffice.org/src/libxslt-1.1.33.tar.gz"; - sha256 = "8e36605144409df979cab43d835002f63988f3dc94d5d3537c12796db90e38c8"; + name = "libxslt-1.1.34.tar.gz"; + url = "http://dev-www.libreoffice.org/src/libxslt-1.1.34.tar.gz"; + sha256 = "98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f"; md5 = ""; - md5name = "8e36605144409df979cab43d835002f63988f3dc94d5d3537c12796db90e38c8-libxslt-1.1.33.tar.gz"; + md5name = "98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f-libxslt-1.1.34.tar.gz"; } { name = "lp_solve_5.5.tar.gz"; @@ -602,11 +602,11 @@ md5name = "ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba-libmspub-0.1.4.tar.xz"; } { - name = "libmwaw-0.3.14.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libmwaw-0.3.14.tar.xz"; - sha256 = "aca8bf1ce55ed83adbea82c70d4c8bebe8139f334b3481bf5a6e407f91f33ce9"; + name = "libmwaw-0.3.15.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libmwaw-0.3.15.tar.xz"; + sha256 = "0440bb09f05e3419423d8dfa36ee847056ebfd837f9cbc091fdb5b057daab0b1"; md5 = ""; - md5name = "aca8bf1ce55ed83adbea82c70d4c8bebe8139f334b3481bf5a6e407f91f33ce9-libmwaw-0.3.14.tar.xz"; + md5name = "0440bb09f05e3419423d8dfa36ee847056ebfd837f9cbc091fdb5b057daab0b1-libmwaw-0.3.15.tar.xz"; } { name = "mythes-1.2.4.tar.gz"; @@ -623,11 +623,11 @@ md5name = "db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca-neon-0.30.2.tar.gz"; } { - name = "nss-3.45-with-nspr-4.21.tar.gz"; - url = "http://dev-www.libreoffice.org/src/nss-3.45-with-nspr-4.21.tar.gz"; - sha256 = "fae11751100510d26f16a245f0db9a5b3d638ab28ce0bccd50d4314f7e526ba1"; + name = "nss-3.47.1-with-nspr-4.23.tar.gz"; + url = "http://dev-www.libreoffice.org/src/nss-3.47.1-with-nspr-4.23.tar.gz"; + sha256 = "07d4276168f59bb3038c7826dabb5fbfbab8336ddf65e4e6e43bce89ada78c64"; md5 = ""; - md5name = "fae11751100510d26f16a245f0db9a5b3d638ab28ce0bccd50d4314f7e526ba1-nss-3.45-with-nspr-4.21.tar.gz"; + md5name = "07d4276168f59bb3038c7826dabb5fbfbab8336ddf65e4e6e43bce89ada78c64-nss-3.47.1-with-nspr-4.23.tar.gz"; } { name = "libodfgen-0.1.6.tar.bz2"; @@ -658,11 +658,11 @@ md5name = "cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824-openldap-2.4.45.tgz"; } { - name = "openssl-1.0.2r.tar.gz"; - url = "http://dev-www.libreoffice.org/src/openssl-1.0.2r.tar.gz"; - sha256 = "ae51d08bba8a83958e894946f15303ff894d75c2b8bbd44a852b64e3fe11d0d6"; + name = "openssl-1.0.2t.tar.gz"; + url = "http://dev-www.libreoffice.org/src/openssl-1.0.2t.tar.gz"; + sha256 = "14cb464efe7ac6b54799b34456bd69558a749a4931ecfd9cf9f71d7881cac7bc"; md5 = ""; - md5name = "ae51d08bba8a83958e894946f15303ff894d75c2b8bbd44a852b64e3fe11d0d6-openssl-1.0.2r.tar.gz"; + md5name = "14cb464efe7ac6b54799b34456bd69558a749a4931ecfd9cf9f71d7881cac7bc-openssl-1.0.2t.tar.gz"; } { name = "liborcus-0.14.1.tar.gz"; @@ -686,11 +686,11 @@ md5name = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d-libpagemaker-0.0.4.tar.xz"; } { - name = "pdfium-3550.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/pdfium-3550.tar.bz2"; - sha256 = "572460f7f9e2f86d022a9c6a82f1e2ded6c3c29ba352d4b9fac60b87e2159679"; + name = "pdfium-3794.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/pdfium-3794.tar.bz2"; + sha256 = "e3faddcf741336c64ca2e6f72b23e9e60979969b2cf67c878c9a5bc38328cfc4"; md5 = ""; - md5name = "572460f7f9e2f86d022a9c6a82f1e2ded6c3c29ba352d4b9fac60b87e2159679-pdfium-3550.tar.bz2"; + md5name = "e3faddcf741336c64ca2e6f72b23e9e60979969b2cf67c878c9a5bc38328cfc4-pdfium-3794.tar.bz2"; } { name = "pixman-0.34.0.tar.gz"; @@ -707,11 +707,11 @@ md5name = "505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca-libpng-1.6.37.tar.xz"; } { - name = "poppler-0.74.0.tar.xz"; - url = "http://dev-www.libreoffice.org/src/poppler-0.74.0.tar.xz"; - sha256 = "92e09fd3302567fd36146b36bb707db43ce436e8841219025a82ea9fb0076b2f"; + name = "poppler-0.82.0.tar.xz"; + url = "http://dev-www.libreoffice.org/src/poppler-0.82.0.tar.xz"; + sha256 = "234f8e573ea57fb6a008e7c1e56bfae1af5d1adf0e65f47555e1ae103874e4df"; md5 = ""; - md5name = "92e09fd3302567fd36146b36bb707db43ce436e8841219025a82ea9fb0076b2f-poppler-0.74.0.tar.xz"; + md5name = "234f8e573ea57fb6a008e7c1e56bfae1af5d1adf0e65f47555e1ae103874e4df-poppler-0.82.0.tar.xz"; } { name = "postgresql-9.2.24.tar.bz2"; @@ -721,11 +721,11 @@ md5name = "a754c02f7051c2f21e52f8669a421b50485afcde9a581674d6106326b189d126-postgresql-9.2.24.tar.bz2"; } { - name = "Python-3.5.7.tar.xz"; - url = "http://dev-www.libreoffice.org/src/Python-3.5.7.tar.xz"; - sha256 = "285892899bf4d5737fd08482aa6171c6b2564a45b9102dfacfb72826aebdc7dc"; + name = "Python-3.5.9.tar.xz"; + url = "http://dev-www.libreoffice.org/src/Python-3.5.9.tar.xz"; + sha256 = "c24a37c63a67f53bdd09c5f287b5cff8e8b98f857bf348c577d454d3f74db049"; md5 = ""; - md5name = "285892899bf4d5737fd08482aa6171c6b2564a45b9102dfacfb72826aebdc7dc-Python-3.5.7.tar.xz"; + md5name = "c24a37c63a67f53bdd09c5f287b5cff8e8b98f857bf348c577d454d3f74db049-Python-3.5.9.tar.xz"; } { name = "libqxp-0.0.2.tar.xz"; @@ -805,11 +805,11 @@ md5name = "0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz"; } { - name = "libvisio-0.1.6.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libvisio-0.1.6.tar.xz"; - sha256 = "fe1002d3671d53c09bc65e47ec948ec7b67e6fb112ed1cd10966e211a8bb50f9"; + name = "libvisio-0.1.7.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libvisio-0.1.7.tar.xz"; + sha256 = "8faf8df870cb27b09a787a1959d6c646faa44d0d8ab151883df408b7166bea4c"; md5 = ""; - md5name = "fe1002d3671d53c09bc65e47ec948ec7b67e6fb112ed1cd10966e211a8bb50f9-libvisio-0.1.6.tar.xz"; + md5name = "8faf8df870cb27b09a787a1959d6c646faa44d0d8ab151883df408b7166bea4c-libvisio-0.1.7.tar.xz"; } { name = "libwpd-0.10.3.tar.xz"; diff --git a/pkgs/applications/office/libreoffice/src-still/override.nix b/pkgs/applications/office/libreoffice/src-still/override.nix index 7192af01949..c0880aa3ecb 100644 --- a/pkgs/applications/office/libreoffice/src-still/override.nix +++ b/pkgs/applications/office/libreoffice/src-still/override.nix @@ -1,6 +1,12 @@ -{ stdenv, ... }: +{ stdenv, kdeIntegration, ... }: attrs: { - configureFlags = stdenv.lib.lists.remove "--without-export-validation" attrs.configureFlags; + postConfigure = attrs.postConfigure + '' + sed -e '/CPPUNIT_TEST(Import_Export_Import);/d' -i './sw/qa/extras/inc/swmodeltestbase.hxx' + ''; + configureFlags = stdenv.lib.remove "--without-system-qrcodegen" + (attrs.configureFlags ++ [ + (stdenv.lib.enableFeature kdeIntegration "kde5") + ]); meta = attrs.meta // { description = "Comprehensive, professional-quality productivity suite (Still/Stable release)"; }; } diff --git a/pkgs/applications/office/libreoffice/src-still/primary.nix b/pkgs/applications/office/libreoffice/src-still/primary.nix index a27087a1b05..d3da7d09b70 100644 --- a/pkgs/applications/office/libreoffice/src-still/primary.nix +++ b/pkgs/applications/office/libreoffice/src-still/primary.nix @@ -7,8 +7,8 @@ rec { }; major = "6"; - minor = "2"; - patch = "6"; + minor = "3"; + patch = "5"; tweak = "2"; subdir = "${major}.${minor}.${patch}"; @@ -17,18 +17,19 @@ rec { src = fetchurl { url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "1nzvdb6yq8bpybz7lrppr237cws6dajk3r9hc9qd0zi55kcddjpq"; + sha256 = "0jnayv1i0iq1gpf3q3z9nfq6jid77d0c76675lkqb3gi07f63nzz"; }; + # FIXME rename translations = fetchSrc { name = "translations"; - sha256 = "1l5v9bb7n9s6i24q4mdyqyp5v4f8iy0a9dmpgw649vngj1zxdxfh"; + sha256 = "01g09bbn1ixrsfj4l0x6x8p06dz9hnlrhnr3f3xb42drmi9ipvjv"; }; # TODO: dictionaries help = fetchSrc { name = "help"; - sha256 = "0h4jvdbvxvgy7w2bzf4k4knqbshlr4v2ic2jsaygy52530z9xifz"; + sha256 = "1p38wlclv6cbjpkkq7n2mjpxy84pxi4vxc9s5kjp4dm63zzxafd6"; }; } diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index 30569512129..fa2c67709fb 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "qownnotes"; - version = "19.12.15"; + version = "20.2.5"; src = fetchurl { url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz"; # Can grab official version like so: - # $ curl https://download.tuxfamily.org/qownnotes/src/qownnotes-19.1.8.tar.xz.sha256 - sha256 = "11i3cn1j365nwinaksfpi1hn7j6bqgjzhawkl6c294lzahngba9w"; + # $ curl https://download.tuxfamily.org/qownnotes/src/qownnotes-20.2.5.tar.xz.sha256 + sha256 = "c26d2a86a521cd243ec0a4788e7627e91cb5877dace73d93dd7d35dd02e9e4c5"; }; nativeBuildInputs = [ qmake qttools ]; diff --git a/pkgs/applications/qubes/qubes-core-vchan-xen/default.nix b/pkgs/applications/qubes/qubes-core-vchan-xen/default.nix index e8241ede96c..ecb9403be36 100644 --- a/pkgs/applications/qubes/qubes-core-vchan-xen/default.nix +++ b/pkgs/applications/qubes/qubes-core-vchan-xen/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { description = "Libraries required for the higher-level Qubes daemons and tools"; homepage = "https://qubes-os.org"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ "0x4A6F" ]; + maintainers = [ maintainers."0x4A6F" ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/version-management/cvs-fast-export/default.nix b/pkgs/applications/version-management/cvs-fast-export/default.nix index 81b779f0206..fd4c9793d38 100644 --- a/pkgs/applications/version-management/cvs-fast-export/default.nix +++ b/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.50"; + version = "1.51"; 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.50.tar.gz"; - sha256 = "01m5l9xnl387hpyik5jvyhghkffj5v1wyxqpxpjxv69q9ly905yk"; + url = "http://www.catb.org/~esr/cvs-fast-export/cvs-fast-export-1.51.tar.gz"; + sha256 = "0nn5cf8syb5nbjvkn8w561pk25clv187h4hs9pnc700g9w56chzf"; }; buildInputs = [ diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 0ea406aca81..0f6dea75c6f 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -44,6 +44,10 @@ let git-fame = callPackage ./git-fame {}; + git-filter-repo = callPackage ./git-filter-repo { + pythonPackages = python3Packages; + }; + gita = python3Packages.callPackage ./gita {}; # The full-featured Git. diff --git a/pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix b/pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix new file mode 100644 index 00000000000..af21296cffa --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, pythonPackages }: + +stdenv.mkDerivation rec { + pname = "git-filter-repo"; + version = "2.25.0"; + + src = fetchurl { + url = "https://github.com/newren/git-filter-repo/releases/download/v${version}/${pname}-${version}.tar.xz"; + sha256 = "1772if8ajaw80dsdw4ic6vjw24dq0b9w87qlkn0iw4b8r9yxp37a"; + }; + + buildInputs = [ pythonPackages.python ]; + + dontBuild = true; + + installPhase = '' + install -Dm755 -t $out/bin git-filter-repo + install -Dm644 -t $out/share/man/man1 Documentation/man1/git-filter-repo.1 + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/newren/git-filter-repo"; + description = "Quickly rewrite git repository history (filter-branch replacement)"; + license = licenses.mit; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix b/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix index ff0f702269c..4e6e450657d 100644 --- a/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { pname = "git-remote-gcrypt"; - version = "1.2"; + version = "1.3"; rev = version; src = fetchFromGitHub { inherit rev; owner = "spwhitton"; repo = "git-remote-gcrypt"; - sha256 = "0isfg0vlmcphxzj4jm32dycprhym26ina1b28jgc4j57kiqqrdcy"; + sha256 = "0n8fzvr6y0pxrbvkywlky2bd8jvi0ayp4n9hwi84l1ldmv4a40dh"; }; outputs = [ "out" "man" ]; diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index d448f7b9c16..a7f13905e7c 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -234,6 +234,7 @@ stdenv.mkDerivation { for prog in bin/gitk libexec/git-core/{git-gui,git-citool,git-gui--askpass}; do sed -i -e "s|exec 'wish'|exec '${tk}/bin/wish'|g" \ -e "s|exec wish|exec '${tk}/bin/wish'|g" \ + -e "s|exec \"[^\"]*/MacOS/Wish\"|exec '${tk}/bin/wish'|g" \ "$out/$prog" done ln -s $out/share/git/contrib/completion/git-completion.bash $out/share/bash-completion/completions/gitk diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix index c2df8c971b0..c6c0f0a52f4 100644 --- a/pkgs/applications/version-management/pijul/default.nix +++ b/pkgs/applications/version-management/pijul/default.nix @@ -20,8 +20,18 @@ in rustPlatform.buildRustPackage rec { sha256 = "1rm787kkh3ya8ix0rjvj7sbrg9armm0rnpkga6gjmsbg5bx20y4q"; }; + cargoSha256 = "0rf8qmgzgyl718yznbskzafyg963ygibjmqncd93zdandgl9nj5v"; + + # N.B. The cargo depfile checker expects us to have unpacked the src tarball + # into the standard dirname "source". + cargoDepsHook = '' + ln -s ${pname}-${version} source + ''; + + # TODO: Delete once pijul fixes upstream: + # https://nest.pijul.com/pijul_org/pijul/discussions/447 postPatch = '' - pushd ../${pname}-${version}-vendor/thrussh/ + pushd ../${pname}-${version}-vendor.tar.gz/thrussh/ patch -p1 < ${./thrussh-build-fix.patch} substituteInPlace .cargo-checksum.json --replace \ 9696ed2422a483cd8de48ac241178a0441be6636909c76174c536b8b1cba9d45 \ @@ -45,11 +55,6 @@ in rustPlatform.buildRustPackage rec { doCheck = false; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1w77s5q18yr1gqqif15wmrfdvv2chq8rq3w4dnmxg2gn0r7bmz2k"; - meta = with stdenv.lib; { description = "A distributed version control system"; homepage = https://pijul.org; diff --git a/pkgs/applications/version-management/yadm/default.nix b/pkgs/applications/version-management/yadm/default.nix index f3ddf8059b2..aab47ed1327 100644 --- a/pkgs/applications/version-management/yadm/default.nix +++ b/pkgs/applications/version-management/yadm/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, git, gnupg }: -let version = "2.3.0"; in +let version = "2.4.0"; in stdenv.mkDerivation { pname = "yadm"; inherit version; @@ -11,7 +11,7 @@ stdenv.mkDerivation { owner = "TheLocehiliosan"; repo = "yadm"; rev = version; - sha256 = "1by21dh48qbi33wlyyvdwz7ac1lxrblzcr5v7hlnc4cbcgvgs1a0"; + sha256 = "0kpahznrkxkyj92vrhwjvldg2affi1askgwvpgbs4mg40f92szlp"; }; dontConfigure = true; diff --git a/pkgs/applications/video/jftui/default.nix b/pkgs/applications/video/jftui/default.nix new file mode 100644 index 00000000000..82774ada09e --- /dev/null +++ b/pkgs/applications/video/jftui/default.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchFromGitHub, fetchpatch, clang, + pkg-config, curl, mpv, yajl }: + +stdenv.mkDerivation rec { + pname = "jftui"; + version = "0.2.2"; + + src = fetchFromGitHub { + owner = "Aanok"; + repo = pname; + rev = "v${version}"; + sha256 = "0g93w8ahyh2v0cv2fyj5a7v6qyznavwk0dcxx1qw4kczdgmlxnkx"; + }; + + patches = [ + # Remove this patch with next version + (fetchpatch { + name = "curl-capability-check-fix"; + url = "https://github.com/Aanok/jftui/commit/d63996b8bc0d2ac4b04c5de4169bc7f8ec9b2a30.patch"; + sha256 = "1d595mkzgx3carq2cykxpvmf5klgdlyaq94fk9wj8812yswqlsr7"; + }) + ]; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + clang + curl + mpv + yajl + ]; + + installPhase = '' + install -Dm555 build/jftui $out/bin/jftui + ''; + + meta = with stdenv.lib; { + description = "Jellyfin Terminal User Interface "; + homepage = "https://github.com/Aanok/jftui"; + license = licenses.unlicense; + maintainers = [ maintainers.nyanloutre ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index f7ac5ef58cd..f1713fe29d4 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -1,7 +1,8 @@ { config, stdenv, fetchurl, fetchFromGitHub, makeWrapper , addOpenGLRunpath, docutils, perl, pkgconfig, python3, wafHook, which , ffmpeg_4, freefont_ttf, freetype, libass, libpthreadstubs, mujs -, nv-codec-headers, lua, libuchardet, libiconv ? null, darwin +, nv-codec-headers, lua, libuchardet, libiconv ? null +, CoreFoundation, Cocoa, CoreAudio, MediaPlayer , waylandSupport ? stdenv.isLinux , wayland ? null @@ -38,11 +39,12 @@ , libpngSupport ? true, libpng ? null , pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio ? null , rubberbandSupport ? stdenv.isLinux, rubberband ? null -, screenSaverSupport ? true, libXScrnSaver ? null , sambaSupport ? stdenv.isLinux, samba ? null +, screenSaverSupport ? true, libXScrnSaver ? null , sdl2Support ? true, SDL2 ? null , sndioSupport ? true, sndio ? null , speexSupport ? true, speex ? null +, swiftSupport ? false, swift ? null , theoraSupport ? true, libtheora ? null , vaapiSupport ? stdenv.isLinux, libva ? null , vdpauSupport ? true, libvdpau ? null @@ -119,7 +121,6 @@ in stdenv.mkDerivation rec { "--disable-libmpv-static" "--disable-static-build" "--disable-build-date" # Purity - "--disable-macos-cocoa-cb" # Disable whilst Swift isn't supported (enableFeature archiveSupport "libarchive") (enableFeature cddaSupport "cdda") (enableFeature dvdnavSupport "dvdnav") @@ -130,11 +131,13 @@ in stdenv.mkDerivation rec { (enableFeature vaapiSupport "vaapi") (enableFeature waylandSupport "wayland") (enableFeature stdenv.isLinux "dvbin") - ]; + ] # Disable whilst Swift isn't supported + ++ stdenv.lib.optional (!swiftSupport) "--disable-macos-cocoa-cb"; nativeBuildInputs = [ addOpenGLRunpath docutils makeWrapper perl pkgconfig python3 wafHook which - ]; + ] + ++ optional swiftSupport swift; buildInputs = [ ffmpeg_4 freetype libass libpthreadstubs @@ -171,9 +174,7 @@ in stdenv.mkDerivation rec { ++ optionals waylandSupport [ wayland wayland-protocols libxkbcommon ] ++ optionals x11Support [ libX11 libXext libGLU libGL libXxf86vm libXrandr ] ++ optionals vulkanSupport [ libplacebo shaderc vulkan-headers vulkan-loader ] - ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ - CoreFoundation Cocoa CoreAudio - ]); + ++ optionals stdenv.isDarwin [ CoreFoundation Cocoa CoreAudio MediaPlayer ]; enableParallelBuilding = true; diff --git a/pkgs/applications/virtualization/cntr/default.nix b/pkgs/applications/virtualization/cntr/default.nix index c5bbab39643..f046e0e44b2 100644 --- a/pkgs/applications/virtualization/cntr/default.nix +++ b/pkgs/applications/virtualization/cntr/default.nix @@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0dhfz7aj3cqi974ybf0axchih40rzrs9m8bxhwz1hgig57aisfc0"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "0xkwza9fx61pvlsm0s3dxc9i09mqp6c9df8w63fyiq7174vjxryx"; + cargoSha256 = "088drkpkgq8psv5j6igxyhfvvbalzg6nd98r9z0nxkawck5i2clz"; meta = with stdenv.lib; { description = "A container debugging tool based on FUSE"; diff --git a/pkgs/applications/virtualization/crun/default.nix b/pkgs/applications/virtualization/crun/default.nix index f976ede79c4..9eaf2d6c5c2 100644 --- a/pkgs/applications/virtualization/crun/default.nix +++ b/pkgs/applications/virtualization/crun/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "crun"; - version = "0.12.1"; + version = "0.12.2.1"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = version; - sha256 = "0dj6lf5yflbsybv7qkx19xvcfy5pv46k9mys7imr7akr9r1bcl5s"; + sha256 = "16hjkkr1fp542ycyp87pj626mzfrza5mcb82hhkp4a8m8bqmpzp4"; fetchSubmodules = true; }; diff --git a/pkgs/applications/window-managers/cwm/default.nix b/pkgs/applications/window-managers/cwm/default.nix index 53489eca3a0..0e57643c64d 100644 --- a/pkgs/applications/window-managers/cwm/default.nix +++ b/pkgs/applications/window-managers/cwm/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A lightweight and efficient window manager for X11"; homepage = "https://github.com/leahneukirchen/cwm"; - maintainers = with maintainers; [ "0x4A6F" mkf ]; + maintainers = with maintainers; [ maintainers."0x4A6F" mkf ]; license = licenses.isc; platforms = platforms.linux; }; diff --git a/pkgs/applications/window-managers/i3/gaps.nix b/pkgs/applications/window-managers/i3/gaps.nix index e5c478987df..731555ce9f8 100644 --- a/pkgs/applications/window-managers/i3/gaps.nix +++ b/pkgs/applications/window-managers/i3/gaps.nix @@ -3,12 +3,12 @@ i3.overrideAttrs (oldAttrs : rec { name = "i3-gaps-${version}"; - version = "4.17.1"; + version = "4.18"; releaseDate = "2019-01-27"; src = fetchurl { url = "https://github.com/Airblader/i3/archive/${version}.tar.gz"; - sha256 = "02jpvwmfwv58dfdwvcvkdfcyca7l7zw7hx18aj4cqm3gg0r5pmqh"; + sha256 = "04sq2sik7j09kgnn1k87yg3vzy56pk4688bmxh49l6drl0wr1m2v"; }; nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ autoreconfHook ]; diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git index 8020ba46f3f..abba76bd1ac 100755 --- a/pkgs/build-support/fetchgit/nix-prefetch-git +++ b/pkgs/build-support/fetchgit/nix-prefetch-git @@ -25,7 +25,7 @@ commitDateStrict8601= if test -n "$deepClone"; then deepClone=true else - deepClone=false + deepClone= fi if test "$leaveDotGit" != 1; then @@ -53,6 +53,11 @@ Options: exit 1 } +# some git commands print to stdout, which would contaminate our JSON output +clean_git(){ + git "$@" >&2 +} + argi=0 argfun="" for arg; do @@ -65,7 +70,7 @@ for arg; do --branch-name) argfun=set_branchName;; --deepClone) deepClone=true;; --quiet) QUIET=true;; - --no-deepClone) deepClone=false;; + --no-deepClone) deepClone=;; --leave-dotGit) leaveDotGit=true;; --fetch-submodules) fetchSubmodules=true;; --builder) builder=true;; @@ -98,9 +103,9 @@ fi init_remote(){ local url=$1 - git init - git remote add origin "$url" - ( [ -n "$http_proxy" ] && git config http.proxy "$http_proxy" ) || true + clean_git init + clean_git remote add origin "$url" + ( [ -n "$http_proxy" ] && clean_git config http.proxy "$http_proxy" ) || true } # Return the reference of an hash if it exists on the remote repository. @@ -141,8 +146,8 @@ checkout_hash(){ hash=$(hash_from_ref "$ref") fi - git fetch -t ${builder:+--progress} origin || return 1 - git checkout -b "$branchName" "$hash" || return 1 + clean_git fetch -t ${builder:+--progress} origin || return 1 + clean_git checkout -b "$branchName" "$hash" || return 1 } # Fetch only a branch/tag and checkout it. @@ -150,7 +155,7 @@ checkout_ref(){ local hash="$1" local ref="$2" - if "$deepClone"; then + if [[ -n "$deepClone" ]]; then # The caller explicitly asked for a deep clone. Deep clones # allow "git describe" and similar tools to work. See # https://marc.info/?l=nix-dev&m=139641582514772 @@ -164,8 +169,8 @@ checkout_ref(){ if test -n "$ref"; then # --depth option is ignored on http repository. - git fetch ${builder:+--progress} --depth 1 origin +"$ref" || return 1 - git checkout -b "$branchName" FETCH_HEAD || return 1 + clean_git fetch ${builder:+--progress} --depth 1 origin +"$ref" || return 1 + clean_git checkout -b "$branchName" FETCH_HEAD || return 1 else return 1 fi @@ -174,7 +179,7 @@ checkout_ref(){ # Update submodules init_submodules(){ # Add urls into .git/config file - git submodule init + clean_git submodule init # list submodule directories and their hashes git submodule status | @@ -248,7 +253,7 @@ make_deterministic_repo(){ # Remove all remote branches. git branch -r | while read -r branch; do - git branch -rD "$branch" >&2 + clean_git branch -rD "$branch" done # Remove tags not reachable from HEAD. If we're exactly on a tag, don't @@ -256,19 +261,19 @@ make_deterministic_repo(){ maybe_tag=$(git tag --points-at HEAD) git tag --contains HEAD | while read -r tag; do if [ "$tag" != "$maybe_tag" ]; then - git tag -d "$tag" >&2 + clean_git tag -d "$tag" fi done # Do a full repack. Must run single-threaded, or else we lose determinism. - git config pack.threads 1 - git repack -A -d -f + clean_git config pack.threads 1 + clean_git repack -A -d -f rm -f .git/config # Garbage collect unreferenced objects. # Note: --keep-largest-pack prevents non-deterministic ordering of packs # listed in .git/objects/info/packs by only using a single pack - git gc --prune=all --keep-largest-pack + clean_git gc --prune=all --keep-largest-pack ) } @@ -369,7 +374,9 @@ print_results() { "rev": "$(json_escape "$fullRev")", "date": "$(json_escape "$commitDateStrict8601")", "$(json_escape "$hashType")": "$(json_escape "$hash")", - "fetchSubmodules": $([[ -n "$fetchSubmodules" ]] && echo true || echo false) + "fetchSubmodules": $([[ -n "$fetchSubmodules" ]] && echo true || echo false), + "deepClone": $([[ -n "$deepClone" ]] && echo true || echo false), + "leaveDotGit": $([[ -n "$leaveDotGit" ]] && echo true || echo false) } EOF fi diff --git a/pkgs/build-support/rust/build-rust-crate/default.nix b/pkgs/build-support/rust/build-rust-crate/default.nix index 569b48d25ae..94b64a1225c 100644 --- a/pkgs/build-support/rust/build-rust-crate/default.nix +++ b/pkgs/build-support/rust/build-rust-crate/default.nix @@ -62,9 +62,6 @@ let crate = crate_ // (lib.attrByPath [ crate_.crateName ] (attr: {}) crateOverr extraRustcOpts_ = extraRustcOpts; buildTests_ = buildTests; - # take a list of crates that we depend on and override them to fit our overrides, rustc, release, … - makeDependencies = map (dep: lib.getLib (dep.override { inherit release verbose crateOverrides; })); - # crate2nix has a hack for the old bash based build script that did split # entries at `,`. No we have to work around that hack. # https://github.com/kolloch/crate2nix/blame/5b19c1b14e1b0e5522c3e44e300d0b332dc939e7/crate2nix/templates/build.nix.tera#L89 @@ -93,8 +90,8 @@ stdenv.mkDerivation (rec { name = "rust_${crate.crateName}-${crate.version}${lib.optionalString buildTests_ "-test"}"; depsBuildBuild = [ rust stdenv.cc ]; buildInputs = (crate.buildInputs or []) ++ buildInputs_; - dependencies = makeDependencies dependencies_; - buildDependencies = makeDependencies buildDependencies_; + dependencies = map lib.getLib dependencies_; + buildDependencies = map lib.getLib buildDependencies_; completeDeps = lib.unique (dependencies ++ lib.concatMap (dep: dep.completeDeps) dependencies); completeBuildDeps = lib.unique ( diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix index 5210b7d7ba2..c67f5845135 100644 --- a/pkgs/build-support/trivial-builders.nix +++ b/pkgs/build-support/trivial-builders.nix @@ -234,17 +234,48 @@ rec { ''; /* - * Create a forest of symlinks to the files in `paths'. - * - * Examples: - * # adds symlinks of hello to current build. - * { symlinkJoin, hello }: - * symlinkJoin { name = "myhello"; paths = [ hello ]; } - * - * # adds symlinks of hello to current build and prints "links added" - * { symlinkJoin, hello }: - * symlinkJoin { name = "myhello"; paths = [ hello ]; postBuild = "echo links added"; } - */ + * Create a forest of symlinks to the files in `paths'. + * + * This creates a single derivation that replicates the directory structure + * of all the input paths. + * + * Examples: + * # adds symlinks of hello to current build. + * symlinkJoin { name = "myhello"; paths = [ pkgs.hello ]; } + * + * # adds symlinks of hello and stack to current build and prints "links added" + * symlinkJoin { name = "myexample"; paths = [ pkgs.hello pkgs.stack ]; postBuild = "echo links added"; } + * + * This creates a derivation with a directory structure like the following: + * + * /nix/store/sglsr5g079a5235hy29da3mq3hv8sjmm-myexample + * |-- bin + * | |-- hello -> /nix/store/qy93dp4a3rqyn2mz63fbxjg228hffwyw-hello-2.10/bin/hello + * | `-- stack -> /nix/store/6lzdpxshx78281vy056lbk553ijsdr44-stack-2.1.3.1/bin/stack + * `-- share + * |-- bash-completion + * | `-- completions + * | `-- stack -> /nix/store/6lzdpxshx78281vy056lbk553ijsdr44-stack-2.1.3.1/share/bash-completion/completions/stack + * |-- fish + * | `-- vendor_completions.d + * | `-- stack.fish -> /nix/store/6lzdpxshx78281vy056lbk553ijsdr44-stack-2.1.3.1/share/fish/vendor_completions.d/stack.fish + * ... + * + * symlinkJoin and linkFarm are similar functions, but they output + * derivations with different structure. + * + * symlinkJoin is used to create a derivation with a familiar directory + * structure (top-level bin/, share/, etc), but with all actual files being symlinks to + * the files in the input derivations. + * + * symlinkJoin is used many places in nixpkgs to create a single derivation + * that appears to contain binaries, libraries, documentation, etc from + * multiple input derivations. + * + * linkFarm is instead used to create a simple derivation with symlinks to + * other derivations. A derivation created with linkFarm is often used in CI + * as a easy way to build multiple derivations at once. + */ symlinkJoin = args_@{ name , paths @@ -255,16 +286,73 @@ rec { }: let args = removeAttrs args_ [ "name" "postBuild" ] - // { inherit preferLocalBuild allowSubstitutes; }; # pass the defaults + // { + inherit preferLocalBuild allowSubstitutes; + passAsFile = [ "paths" ]; + }; # pass the defaults in runCommand name args '' mkdir -p $out - for i in $paths; do + for i in $(cat $pathsPath); do ${lndir}/bin/lndir -silent $i $out done ${postBuild} ''; + /* + * Quickly create a set of symlinks to derivations. + * + * This creates a simple derivation with symlinks to all inputs. + * + * entries is a list of attribute sets like + * { name = "name" ; path = "/nix/store/..."; } + * + * Example: + * + * # Symlinks hello and stack paths in store to current $out/hello-test and + * # $out/foobar. + * linkFarm "myexample" [ { name = "hello-test"; path = pkgs.hello; } { name = "foobar"; path = pkgs.stack; } ] + * + * This creates a derivation with a directory structure like the following: + * + * /nix/store/qc5728m4sa344mbks99r3q05mymwm4rw-myexample + * |-- foobar -> /nix/store/6lzdpxshx78281vy056lbk553ijsdr44-stack-2.1.3.1 + * `-- hello-test -> /nix/store/qy93dp4a3rqyn2mz63fbxjg228hffwyw-hello-2.10 + * + * See the note on symlinkJoin for the difference between linkFarm and symlinkJoin. + */ + linkFarm = name: entries: runCommand name { preferLocalBuild = true; allowSubstitutes = false; } + ''mkdir -p $out + cd $out + ${lib.concatMapStrings (x: '' + mkdir -p "$(dirname ${lib.escapeShellArg x.name})" + ln -s ${lib.escapeShellArg x.path} ${lib.escapeShellArg x.name} + '') entries} + ''; + + /* + * Easily create a linkFarm from a set of derivations. + * + * This calls linkFarm with a list of entries created from the list of input + * derivations. It turns each input derivation into an attribute set + * like { name = drv.name ; path = drv }, and passes this to linkFarm. + * + * Example: + * + * # Symlinks the hello, gcc, and ghc derivations in $out + * linkFarmFromDrvs "myexample" [ pkgs.hello pkgs.gcc pkgs.ghc ] + * + * This creates a derivation with a directory structure like the following: + * + * /nix/store/m3s6wkjy9c3wy830201bqsb91nk2yj8c-myexample + * |-- gcc-wrapper-9.2.0 -> /nix/store/fqhjxf9ii4w4gqcsx59fyw2vvj91486a-gcc-wrapper-9.2.0 + * |-- ghc-8.6.5 -> /nix/store/gnf3s07bglhbbk4y6m76sbh42siym0s6-ghc-8.6.5 + * `-- hello-2.10 -> /nix/store/k0ll91c4npk4lg8lqhx00glg2m735g74-hello-2.10 + */ + linkFarmFromDrvs = name: drvs: + let mkEntryFromDrv = drv: { name = drv.name; path = drv; }; + in linkFarm name (map mkEntryFromDrv drvs); + /* * Make a package that just contains a setup hook with the given contents. @@ -312,27 +400,6 @@ rec { ''; - /* - * Quickly create a set of symlinks to derivations. - * entries is a list of attribute sets like - * { name = "name" ; path = "/nix/store/..."; } - * - * Example: - * - * # Symlinks hello path in store to current $out/hello - * linkFarm "hello" [ { name = "hello"; path = pkgs.hello; } ]; - * - */ - linkFarm = name: entries: runCommand name { preferLocalBuild = true; allowSubstitutes = false; } - ''mkdir -p $out - cd $out - ${lib.concatMapStrings (x: '' - mkdir -p "$(dirname ${lib.escapeShellArg x.name})" - ln -s ${lib.escapeShellArg x.path} ${lib.escapeShellArg x.name} - '') entries} - ''; - - /* Print an error message if the file with the specified name and * hash doesn't exist in the Nix store. This function should only * be used by non-redistributable software with an unfree license diff --git a/pkgs/build-support/writers/default.nix b/pkgs/build-support/writers/default.nix index b90c6490e4a..af492d80db0 100644 --- a/pkgs/build-support/writers/default.nix +++ b/pkgs/build-support/writers/default.nix @@ -15,7 +15,7 @@ rec { name = last (builtins.split "/" nameOrPath); in - pkgs.runCommand name (if (types.str.check content) then { + pkgs.runCommandLocal name (if (types.str.check content) then { inherit content interpreter; passAsFile = [ "content" ]; } else { @@ -192,7 +192,7 @@ rec { {id="";for(i=idx;i<ctx;i++)id=sprintf("%s%s", id, "\t");printf "%s%s\n", id, $0} ''; - writeNginxConfig = name: text: pkgs.runCommand name { + writeNginxConfig = name: text: pkgs.runCommandLocal name { inherit text; passAsFile = [ "text" ]; } /* sh */ '' diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix index e2111065826..e6e3aeba9de 100644 --- a/pkgs/data/fonts/iosevka/default.nix +++ b/pkgs/data/fonts/iosevka/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { buildPhase = '' runHook preBuild - npm run build -- ttf::$pname + npm run build -- ttf::$pname >/dev/null runHook postBuild ''; diff --git a/pkgs/data/fonts/siji/default.nix b/pkgs/data/fonts/siji/default.nix index a0acf78d855..336fe48f54d 100644 --- a/pkgs/data/fonts/siji/default.nix +++ b/pkgs/data/fonts/siji/default.nix @@ -1,26 +1,44 @@ -{ lib, fetchzip }: +{ stdenv, fetchzip, libfaketime, fonttosfnt, mkfontscale }: -let - date = "2016-05-13"; -in fetchzip { - name = "siji-${date}"; +stdenv.mkDerivation rec { + name = "siji-${version}"; + version = "2016-05-13"; - url = https://github.com/stark/siji/archive/95369afac3e661cb6d3329ade5219992c88688c1.zip; + src = fetchzip { + url = https://github.com/stark/siji/archive/95369afac3e661cb6d3329ade5219992c88688c1.zip; + sha256 = "1408g4nxwdd682vjqpmgv0cp0bfnzzzwls62cjs9zrds16xa9dpf"; + }; + + nativeBuildInputs = [ libfaketime fonttosfnt mkfontscale ]; - postFetch = '' - unzip -j $downloadedFile + buildPhase = '' + # compress pcf fonts + gzip -n -9 pcf/* + + # convert bdf fonts to otb + for i in bdf/*; do + name=$(basename $i .bdf) + faketime -f "1970-01-01 00:00:01" \ + fonttosfnt -v -o "$name.otb" "$i" + done + ''; - install -D *.pcf -t $out/share/fonts/pcf - install -D *.bdf -t $out/share/fonts/bdf + postInstall = '' + install -m 644 -D pcf/* -t "$out/share/fonts/misc" + install -m 644 -D bdf/* -t "$bdf/share/fonts/misc" + install -m 644 -D *.otb -t "$otb/share/fonts/misc" + mkfontdir "$out/share/fonts/misc" + mkfontdir "$bdf/share/fonts/misc" + mkfontdir "$otb/share/fonts/misc" ''; - sha256 = "1ymcbirdbkqaf0xs2y00l0wachb4yxh1fgqm5avqwvccs0lsfj1d"; + outputs = [ "out" "bdf" "otb" ]; - meta = { + meta = with stdenv.lib; { homepage = https://github.com/stark/siji; description = "An iconic bitmap font based on Stlarch with additional glyphs"; - license = lib.licenses.gpl2; - platforms = lib.platforms.all; - maintainers = [ lib.maintainers.asymmetric ]; + license = licenses.gpl2; + platforms = platforms.all; + maintainers = [ maintainers.asymmetric ]; }; } diff --git a/pkgs/data/fonts/tamsyn/default.nix b/pkgs/data/fonts/tamsyn/default.nix index 380024e7e1a..10f96b2b17a 100644 --- a/pkgs/data/fonts/tamsyn/default.nix +++ b/pkgs/data/fonts/tamsyn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, mkfontdir, mkfontscale }: +{ stdenv, fetchurl, fontforge, mkfontscale }: let version = "1.11"; @@ -11,27 +11,32 @@ in stdenv.mkDerivation { sha256 = "0kpjzdj8sv5871b8827mjgj9dswk75h94jj5iia2bds18ih1pglp"; }; - nativeBuildInputs = [ mkfontdir mkfontscale ]; + nativeBuildInputs = [ fontforge mkfontscale ]; unpackPhase = '' tar -xzf $src --strip-components=1 ''; + postBuild = '' + # convert pcf fonts to otb + for i in *.pcf; do + name=$(basename "$i" .pcf) + fontforge -lang=ff -c "Open(\"$i\"); Generate(\"$name.otb\")" + done + + # compress pcf fonts + gzip -n -9 *.pcf + ''; + installPhase = '' - # install the pcf fonts (for xorg applications) - fontDir="$out/share/fonts/tamsyn" - mkdir -p "$fontDir" - mv *.pcf "$fontDir" - mv *.psf.gz "$fontDir" - - cd "$fontDir" - mkfontdir - mkfontscale + install -m 644 -D *.pcf.gz -t "$out/share/fonts/misc" + install -m 644 -D *.psf.gz -t "$out/share/consolefonts" + install -m 644 -D *.otb -t "$otb/share/fonts/misc" + mkfontdir "$out/share/fonts/misc" + mkfontdir "$otb/share/fonts/misc" ''; - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "13l7ighfmn3kmqmchlksfg8ss22ndjk71rs0f9fn5p5zk7s4dn5x"; + outputs = [ "out" "otb" ]; meta = with stdenv.lib; { description = "A monospace bitmap font aimed at programmers"; diff --git a/pkgs/data/fonts/terminus-font/default.nix b/pkgs/data/fonts/terminus-font/default.nix index 358ab959cd0..88ae9ac72c2 100644 --- a/pkgs/data/fonts/terminus-font/default.nix +++ b/pkgs/data/fonts/terminus-font/default.nix @@ -1,4 +1,7 @@ -{ stdenv, fetchurl, python3, bdftopcf, mkfontdir, mkfontscale }: +{ stdenv, fetchurl, python3 +, libfaketime, fonttosfnt +, bdftopcf, mkfontscale +}: stdenv.mkDerivation rec { pname = "terminus-font"; @@ -9,16 +12,36 @@ stdenv.mkDerivation rec { sha256 = "1bwlkj39rqbyq57v5yssayav6hzv1n11b9ml2s0dpiyfsn6rqy9l"; }; - nativeBuildInputs = [ python3 bdftopcf mkfontdir mkfontscale ]; + nativeBuildInputs = + [ python3 bdftopcf libfaketime + fonttosfnt mkfontscale + ]; - patchPhase = '' + enableParallelBuilding = true; + + postPatch = '' substituteInPlace Makefile --replace 'fc-cache' '#fc-cache' ''; - enableParallelBuilding = true; + postBuild = '' + # convert unicode bdf fonts to otb + for i in *.bdf; do + name=$(basename $i .bdf) + faketime -f "1970-01-01 00:00:01" \ + fonttosfnt -v -o "$name.otb" "$i" + done + ''; + + postInstall = '' + # install otb fonts (for GTK applications) + install -m 644 -D *.otb -t "$otb/share/fonts/misc"; + mkfontdir "$otb/share/fonts/misc" + ''; installTargets = [ "install" "fontdir" ]; + outputs = [ "out" "otb" ]; + meta = with stdenv.lib; { description = "A clean fixed width font"; longDescription = '' diff --git a/pkgs/data/fonts/tewi/default.nix b/pkgs/data/fonts/tewi/default.nix index fbc29cdf5fb..6245032246c 100644 --- a/pkgs/data/fonts/tewi/default.nix +++ b/pkgs/data/fonts/tewi/default.nix @@ -1,37 +1,52 @@ -{stdenv, fetchgit, bdftopcf, mkfontdir, mkfontscale}: +{ stdenv, fetchFromGitHub, python3 +, bdftopcf, mkfontscale +, libfaketime, fonttosfnt +}: stdenv.mkDerivation rec { - date = "2015-06-07"; - name = "tewi-font-${date}"; + pname = "tewi-font"; + version = "2.0.2"; - src = fetchgit { - url = "https://github.com/lucy/tewi-font"; - rev = "ff930e66ae471da4fdc226ffe65fd1ccd13d4a69"; - sha256 = "0c7k847cp68w20frzsdknpss2cwv3lp970asyybv65jxyl2jz3iq"; + src = fetchFromGitHub { + owner = "lucy"; + repo = pname; + rev = version; + sha256 = "1axv9bv10xlcmgfyjh3z5kn5fkg3m6n1kskcs5hvlmyb6m1zk91j"; }; - nativeBuildInputs = [ bdftopcf mkfontdir mkfontscale ]; - buildPhase = '' + nativeBuildInputs = + [ python3 bdftopcf mkfontscale + libfaketime fonttosfnt + ]; + + postPatch = '' + # make gzip deterministic + sed 's/gzip -9/gzip -9 -n/g' -i Makefile + + # fix python not found + patchShebangs scripts/merge + ''; + + postBuild = '' + # convert bdf fonts to otb for i in *.bdf; do - bdftopcf -o ''${i/bdf/pcf} $i + name=$(basename "$i" .bdf) + faketime -f "1970-01-01 00:00:01" \ + fonttosfnt -v -o "$name.otb" "$i" done - - gzip -n *.pcf ''; installPhase = '' fontDir="$out/share/fonts/misc" - mkdir -p "$fontDir" - mv *.pcf.gz "$fontDir" + install -m 644 -D out/* -t "$fontDir" + mkfontdir "$fontDir" - cd "$fontDir" - mkfontdir - mkfontscale + fontDir="$otb/share/fonts/misc" + install -m 644 -D *.otb -t "$fontDir" + mkfontdir "$fontDir" ''; - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "14dv3m1svahjyb9c1x1570qrmlnynzg0g36b10bqqs8xvhix34yq"; + outputs = [ "out" "otb" ]; meta = with stdenv.lib; { description = "A nice bitmap font, readable even at small sizes"; diff --git a/pkgs/data/fonts/ucs-fonts/default.nix b/pkgs/data/fonts/ucs-fonts/default.nix index 0ea0363763d..d363f01309b 100644 --- a/pkgs/data/fonts/ucs-fonts/default.nix +++ b/pkgs/data/fonts/ucs-fonts/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, mkfontdir, mkfontscale }: +{ stdenv, fetchurl, bdftopcf +, libfaketime, fonttosfnt, mkfontscale +}: stdenv.mkDerivation { pname = "ucs-fonts"; @@ -21,24 +23,40 @@ stdenv.mkDerivation { sourceRoot = "."; - nativeBuildInputs = [ mkfontdir mkfontscale ]; + nativeBuildInputs = + [ bdftopcf libfaketime fonttosfnt + mkfontscale + ]; - phases = [ "unpackPhase" "installPhase" ]; + buildPhase = '' + for i in *.bdf; do + name=$(basename "$i" .bdf) + + # generate pcf fonts (for X11 applications) + bdftopcf -t "$i" | gzip -n -9 -c > "$name.pcf.gz" + + # generate otb fonts (for GTK applications) + faketime -f "1970-01-01 00:00:01" \ + fonttosfnt -v -o "$name.otb" "$i" + done + ''; installPhase = '' - mkdir -p $out/share/fonts - cp *.bdf $out/share/fonts - cd $out/share/fonts - mkfontdir - mkfontscale + install -m 644 -D *.pcf.gz -t "$out/share/fonts/misc" + install -m 644 -D *.bdf -t "$bdf/share/fonts/misc" + install -m 644 -D *.otb -t "$otb/share/fonts/misc" + + mkfontdir "$out/share/fonts/misc" + mkfontdir "$bdf/share/fonts/misc" + mkfontdir "$otb/share/fonts/misc" ''; - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "12fh3kbsib0baqwk6148fnzqrj9gs4vnl7yd5n9km72sic1z1xwk"; + outputs = [ "out" "bdf" "otb" ]; meta = with stdenv.lib; { + homepage = "https://www.cl.cam.ac.uk/~mgk25/ucs-fonts.html"; description = "Unicode bitmap fonts"; + license = licenses.publicDomain; maintainers = [ maintainers.raskin ]; platforms = platforms.all; }; diff --git a/pkgs/data/fonts/uni-vga/default.nix b/pkgs/data/fonts/uni-vga/default.nix index cd719a62d99..9cc0fb9adcc 100644 --- a/pkgs/data/fonts/uni-vga/default.nix +++ b/pkgs/data/fonts/uni-vga/default.nix @@ -1,4 +1,8 @@ -{ stdenv, fetchurl, mkfontdir, mkfontscale }: +{ stdenv, fetchurl, perl, kbd, bdftopcf +, libfaketime, fonttosfnt, mkfontscale +}: + +with stdenv.lib; stdenv.mkDerivation { name = "uni-vga"; @@ -8,24 +12,50 @@ stdenv.mkDerivation { sha256 = "05sns8h5yspa7xkl81ri7y1yxf5icgsnl497f3xnaryhx11s2rv6"; }; - nativeBuildInputs = [ mkfontdir mkfontscale ]; + nativeBuildInputs = + [ bdftopcf libfaketime + fonttosfnt mkfontscale + ] ++ optionals stdenv.isLinux [ perl kbd ]; + + postPatch = "patchShebangs ."; + + buildPhase = '' + # convert font to compressed pcf + bdftopcf u_vga16.bdf | gzip -c -9 -n > u_vga16.pcf.gz + + # convert bdf font to otb + faketime -f "1970-01-01 00:00:01" \ + fonttosfnt -v -o u_vga16.otb u_vga16.bdf + '' + optionalString stdenv.isLinux '' + # convert font to compressed psf + ./bdf2psf.pl -s UniCyrX.sfm u_vga16.bdf \ + | psfaddtable - UniCyrX.sfm - \ + | gzip -c -9 -n > u_vga16.psf.gz + ''; installPhase = '' - mkdir -p $out/share/fonts - cp *.bdf $out/share/fonts - cd $out/share/fonts - mkfontdir - mkfontscale + # install pcf (for X11 applications) + install -m 644 -D *.pcf.gz -t "$out/share/fonts" + mkfontdir "$out/share/fonts" + + # install bdf font + install -m 644 -D *.bdf -t "$bdf/share/fonts" + mkfontdir "$bdf/share/fonts" + + # install otb font (for GTK applications) + install -m 644 -D *.otb -t "$otb/share/fonts" + mkfontdir "$otb/share/fonts" + '' + optionalString stdenv.isLinux '' + # install psf (for linux virtual terminal) + install -m 644 -D *.psf.gz -t "$out/share/consolefonts" ''; - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "0rfly7r6blr2ykxlv0f6my2w41vvxcw85chspljd2p1fxlr28jd7"; + outputs = [ "out" "bdf" "otb" ]; meta = { description = "Unicode VGA font"; - maintainers = [stdenv.lib.maintainers.ftrvxmtrx]; + maintainers = [ maintainers.ftrvxmtrx ]; homepage = http://www.inp.nsk.su/~bolkhov/files/fonts/univga/; - license = stdenv.lib.licenses.mit; + license = licenses.mit; }; } diff --git a/pkgs/data/fonts/unifont/default.nix b/pkgs/data/fonts/unifont/default.nix index a80beee342b..fc41263fee7 100644 --- a/pkgs/data/fonts/unifont/default.nix +++ b/pkgs/data/fonts/unifont/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, mkfontscale, mkfontdir }: +{ stdenv, fetchurl, mkfontscale +, libfaketime, fonttosfnt +}: stdenv.mkDerivation rec { pname = "unifont"; @@ -14,23 +16,32 @@ stdenv.mkDerivation rec { sha256 = "1cd1fnk3m7giqp099kynnjj4m7q00lqm4ybqb1vzd2wi3j4a1awf"; }; - nativeBuildInputs = [ mkfontscale mkfontdir ]; + nativeBuildInputs = [ libfaketime fonttosfnt mkfontscale ]; - phases = "installPhase"; + phases = [ "buildPhase" "installPhase" ]; + + buildPhase = + '' + # convert pcf font to otb + faketime -f "1970-01-01 00:00:01" \ + fonttosfnt -g 2 -m 2 -v -o "unifont.otb" "${pcf}" + ''; installPhase = '' - mkdir -p $out/share/fonts $out/share/fonts/truetype - cp -v ${pcf} $out/share/fonts/unifont.pcf.gz - cp -v ${ttf} $out/share/fonts/truetype/unifont.ttf - cd $out/share/fonts + # install otb fonts + install -m 644 -D unifont.otb "$otb/share/fonts/unifont.otb" + mkfontdir "$otb/share/fonts" + + # install pcf and ttf fonts + install -m 644 -D ${pcf} $out/share/fonts/unifont.pcf.gz + install -m 644 -D ${ttf} $out/share/fonts/truetype/unifont.ttf + cd "$out/share/fonts" mkfontdir mkfontscale ''; - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "0n3ms2k2mk7j6144l05c45smggwf3j5cwkaxhw93wf9hd1lhpwq1"; + outputs = [ "out" "otb" ]; meta = with stdenv.lib; { description = "Unicode font for Base Multilingual Plane"; diff --git a/pkgs/data/fonts/unscii/default.nix b/pkgs/data/fonts/unscii/default.nix index cd4d0dc42cd..93fe8cdfb74 100644 --- a/pkgs/data/fonts/unscii/default.nix +++ b/pkgs/data/fonts/unscii/default.nix @@ -1,32 +1,55 @@ -{stdenv, fetchurl, perl, bdftopcf, perlPackages, fontforge, SDL, SDL_image}: +{ stdenv, fetchurl, perl, bdftopcf +, fontforge, SDL, SDL_image, mkfontscale +}: + stdenv.mkDerivation rec { pname = "unscii"; version = "1.1"; - # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev) + src = fetchurl { url = "http://pelulamu.net/${pname}/${pname}-${version}-src.tar.gz"; sha256 = "0qcxcnqz2nlwfzlrn115kkp3n8dd7593h762vxs6vfqm13i39lq1"; }; - nativeBuildInputs = [perl bdftopcf perlPackages.TextCharWidth fontforge - SDL SDL_image]; + + nativeBuildInputs = + [ (perl.withPackages (p: [ p.TextCharWidth ])) + bdftopcf fontforge SDL SDL_image + mkfontscale + ]; + preConfigure = '' patchShebangs . ''; + + postBuild = '' + # compress pcf fonts + gzip -9 -n *.pcf + ''; + installPhase = '' - install -m444 -Dt $out/share/fonts *.hex *.pcf - install -m444 -Dt $out/share/fonts/truetype *.ttf - install -m444 -Dt $out/share/fonts/opentype *.otf - install -m444 -Dt $out/share/fonts/svg *.svg - install -m444 -Dt $out/share/fonts/web *.woff + # install fonts for use in X11 and GTK applications + install -m444 -Dt "$out/share/fonts/misc" *.pcf.gz + install -m444 -Dt "$out/share/fonts/opentype" *.otf + mkfontdir "$out/share/fonts/misc" + mkfontscale "$out/share/fonts/opentype" + + # install other formats in $extra + install -m444 -Dt "$extra/share/fonts/truetype" *.ttf + install -m444 -Dt "$extra/share/fonts/svg" *.svg + install -m444 -Dt "$extra/share/fonts/web" *.woff + install -m444 -Dt "$extra/share/fonts/misc" *.hex + mkfontscale "$extra"/share/fonts/* ''; + outputs = [ "out" "extra" ]; + meta = { inherit version; description = ''Bitmapped character-art-friendly Unicode fonts''; # Basically GPL2+ with font exception — because of the Unifont-augmented # version. The reduced version is public domain. license = http://unifoundry.com/LICENSE.txt; - maintainers = [stdenv.lib.maintainers.raskin]; + maintainers = [ stdenv.lib.maintainers.raskin ]; homepage = http://pelulamu.net/unscii/; }; } diff --git a/pkgs/data/themes/pop-gtk/default.nix b/pkgs/data/themes/pop-gtk/default.nix index 151fadddc16..9bb2beae4d3 100644 --- a/pkgs/data/themes/pop-gtk/default.nix +++ b/pkgs/data/themes/pop-gtk/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "pop-gtk-theme"; - version = "2019-12-17"; + version = "2020-02-10"; src = fetchFromGitHub { owner = "pop-os"; repo = "gtk-theme"; - rev = "77601545f049251bce9c63a07f0d9819aa27cb60"; - sha256 = "0bmkcdr1z9m3inrw33zprq2a4jawql4724a84nr89r19xllj2z1s"; + rev = "ed888e9dd5de142cb899e362beedaf694594cc7e"; + sha256 = "0ryr1jx9pzij6pkv7sam07f90w5lbrzx0fj5vdxl94612mh76aad"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/apps/accerciser/default.nix b/pkgs/desktops/gnome-3/apps/accerciser/default.nix index 8fd4a092376..41b40244f57 100644 --- a/pkgs/desktops/gnome-3/apps/accerciser/default.nix +++ b/pkgs/desktops/gnome-3/apps/accerciser/default.nix @@ -17,13 +17,13 @@ python3.pkgs.buildPythonApplication rec { name = "accerciser-${version}"; - version = "3.34.3"; + version = "3.34.4"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/accerciser/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1ixyxfv2h5921x82d0r39v952ggclnf2xba5li01qmshl6b21kcc"; + sha256 = "0f1dixq5hc55dl3y0fr85bkrc2zk08n4dacqcjifij1dys4ks3z1"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/atril/default.nix b/pkgs/desktops/mate/atril/default.nix index ecb9ea2e377..e71ca81142a 100644 --- a/pkgs/desktops/mate/atril/default.nix +++ b/pkgs/desktops/mate/atril/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk3, glib, libxml2, libsecret, poppler, itstool, hicolor-icon-theme, mate, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, gettext, gtk3, glib, libxml2, libsecret, poppler, itstool, hicolor-icon-theme, texlive, mate, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "atril"; - version = "1.22.3"; + version = "1.24.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "06hmyw7fwdrdyl3n79b8qxlrwbzf240n82arzmlg62q9zxzdc0is"; + sha256 = "0967gxw7h2qh2kpwl0jgv58hicz6aa92kr12mnykbpikad25s95y"; }; nativeBuildInputs = [ pkgconfig - intltool + gettext wrapGAppsHook ]; @@ -25,16 +25,20 @@ stdenv.mkDerivation rec { mate.caja mate.mate-desktop hicolor-icon-theme + texlive.bin.core # for synctex, used by the pdf back-end ]; NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; makeFlags = [ "cajaextensiondir=$$out/lib/caja/extensions-2.0" ]; - meta = { + enableParallelBuilding = true; + + meta = with stdenv.lib; { description = "A simple multi-page document viewer for the MATE desktop"; - homepage = https://mate-desktop.org; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; + homepage = "https://mate-desktop.org"; + license = licenses.gpl2; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; }; } diff --git a/pkgs/desktops/mate/caja-dropbox/default.nix b/pkgs/desktops/mate/caja-dropbox/default.nix index 820b1e905ec..7b2387721dc 100644 --- a/pkgs/desktops/mate/caja-dropbox/default.nix +++ b/pkgs/desktops/mate/caja-dropbox/default.nix @@ -7,11 +7,11 @@ let in stdenv.mkDerivation rec { pname = "caja-dropbox"; - version = "1.22.1"; + version = "1.24.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "18cnd3yw2ingvl38mhmfbl5k0kfg8pzcf2649j00i6v90cwiril5"; + sha256 = "1rcn82q58mv9hn5xamvzay2pw1szfk6zns94362476fcp786lji2"; }; patches = [ @@ -41,6 +41,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-caja-extension-dir=$$out/lib/caja/extensions-2.0" ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "Dropbox extension for Caja file manager"; homepage = "https://github.com/mate-desktop/caja-dropbox"; diff --git a/pkgs/desktops/mate/caja-extensions/default.nix b/pkgs/desktops/mate/caja-extensions/default.nix index 10595bbbaec..89191dc302b 100644 --- a/pkgs/desktops/mate/caja-extensions/default.nix +++ b/pkgs/desktops/mate/caja-extensions/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk3, gupnp, mate, imagemagick, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, gettext, gtk3, gupnp, mate, imagemagick, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "caja-extensions"; - version = "1.22.1"; + version = "1.24.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0xzhphzvaxbwyyp242pnhl5zjrkiznj90i0xjmy7pvi155pmp16h"; + sha256 = "175v5c05nrdliya23rbqma49alldq67dklmvpq18nq71sfry4pp6"; }; nativeBuildInputs = [ pkgconfig - intltool + gettext wrapGAppsHook ]; @@ -31,9 +31,11 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-cajadir=$$out/lib/caja/extensions-2.0" ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "Set of extensions for Caja file manager"; - homepage = https://mate-desktop.org; + homepage = "https://mate-desktop.org"; license = licenses.gpl2; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/desktops/mate/caja/caja-extension-dirs.patch b/pkgs/desktops/mate/caja/caja-extension-dirs.patch index 7490a368efd..0b1453bd468 100644 --- a/pkgs/desktops/mate/caja/caja-extension-dirs.patch +++ b/pkgs/desktops/mate/caja/caja-extension-dirs.patch @@ -1,11 +1,24 @@ +From 35e9e6a6f3ba6cbe62a3957044eb67864f5d8e66 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com> +Date: Tue, 11 Feb 2020 17:49:13 -0300 +Subject: [PATCH] Look for caja extentions at $CAJA_EXTENTSION_DIRS + +CAJA_EXTENSION_DIRS is a list of paths where caja extensions are +looked for. It is needed for distributions like NixOS that do not +install all extensions in the same directory. In NixOS each package is +installed in a self contained directory. +--- + libcaja-private/caja-module.c | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + diff --git a/libcaja-private/caja-module.c b/libcaja-private/caja-module.c -index 023c22e..414913b 100644 +index d54d7cf..9794e56 100644 --- a/libcaja-private/caja-module.c +++ b/libcaja-private/caja-module.c -@@ -258,11 +258,25 @@ caja_module_setup (void) +@@ -258,11 +258,25 @@ void + caja_module_setup (void) { static gboolean initialized = FALSE; - GList *res; + gchar *caja_extension_dirs; + gchar **dir_vector; @@ -28,3 +41,6 @@ index 023c22e..414913b 100644 load_module_dir (CAJA_EXTENSIONDIR); eel_debug_call_at_shutdown (free_module_objects); +-- +2.25.0 + diff --git a/pkgs/desktops/mate/caja/default.nix b/pkgs/desktops/mate/caja/default.nix index c460a2cf2dc..9f1ec9f587b 100644 --- a/pkgs/desktops/mate/caja/default.nix +++ b/pkgs/desktops/mate/caja/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libnotify, libxml2, libexif, exempi, mate, hicolor-icon-theme, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, gettext, gtk3, libnotify, libxml2, libexif, exempi, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "caja"; - version = "1.22.3"; + version = "1.24.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1w2liq9h1kr5zyaaq82xz8pic04qi5sra8kaycfg1iddmknkfqn7"; + sha256 = "1cnfy481hcwjv3ia3kw0d4h7ga8cng0pqm3z349v4qcmfdapmqc0"; }; nativeBuildInputs = [ pkgconfig - intltool + gettext wrapGAppsHook ]; @@ -31,9 +31,11 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-update-mimedb" ]; + enableParallelBuilding = true; + meta = { description = "File manager for the MATE desktop"; - homepage = https://mate-desktop.org; + homepage = "https://mate-desktop.org"; license = with stdenv.lib.licenses; [ gpl2 lgpl2 ]; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.romildo ]; diff --git a/pkgs/desktops/mate/engrampa/default.nix b/pkgs/desktops/mate/engrampa/default.nix index 9569b1919e4..1f1be3e2857 100644 --- a/pkgs/desktops/mate/engrampa/default.nix +++ b/pkgs/desktops/mate/engrampa/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gtk3, mate, hicolor-icon-theme, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, gettext, itstool, libxml2, gtk3, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "engrampa"; - version = "1.22.3"; + version = "1.24.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "17pn1qgr1a13jxv50qcnzqcw8gr96g7jz2z2y1wbwy7i44bknv6n"; + sha256 = "13cak3qgrzqj74x9jq1sf155793v2bqqz4mk4i04g9f9xn3g85fl"; }; nativeBuildInputs = [ pkgconfig - intltool + gettext itstool wrapGAppsHook ]; @@ -26,9 +26,11 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-cajadir=$$out/lib/caja/extensions-2.0" ]; + enableParallelBuilding = true; + meta = { description = "Archive Manager for MATE"; - homepage = https://mate-desktop.org; + homepage = "https://mate-desktop.org"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.romildo ]; diff --git a/pkgs/desktops/mate/eom/default.nix b/pkgs/desktops/mate/eom/default.nix index 457a9e56c5d..d7c54604089 100644 --- a/pkgs/desktops/mate/eom/default.nix +++ b/pkgs/desktops/mate/eom/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, exempi, lcms2, libexif, libjpeg, librsvg, libxml2, libpeas, shared-mime-info, gtk3, mate, hicolor-icon-theme, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, gettext, itstool, exempi, lcms2, libexif, libjpeg, librsvg, libxml2, libpeas, shared-mime-info, gtk3, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "eom"; - version = "1.22.2"; + version = "1.24.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0za1lw4awg1i0ls0r9iw0ail2hqa34y1dx65b50bw9kx9kbfyl9l"; + sha256 = "0zzximp2534bky0vac219alafblw6m0lis0gncq92017s6c1mb77"; }; nativeBuildInputs = [ pkgconfig - intltool + gettext itstool wrapGAppsHook ]; @@ -30,9 +30,11 @@ stdenv.mkDerivation rec { hicolor-icon-theme ]; + enableParallelBuilding = true; + meta = { description = "An image viewing and cataloging program for the MATE desktop"; - homepage = https://mate-desktop.org; + homepage = "https://mate-desktop.org"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.romildo ]; diff --git a/pkgs/desktops/mate/libmatekbd/default.nix b/pkgs/desktops/mate/libmatekbd/default.nix index 6364b89204a..4c70c252806 100644 --- a/pkgs/desktops/mate/libmatekbd/default.nix +++ b/pkgs/desktops/mate/libmatekbd/default.nix @@ -1,21 +1,23 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libxklavier }: +{ stdenv, fetchurl, pkgconfig, gettext, gtk3, libxklavier }: stdenv.mkDerivation rec { pname = "libmatekbd"; - version = "1.22.0"; + version = "1.24.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1dsr7618c92mhwabwhgxqsfp7gnf9zrz2z790jc5g085dxhg13y8"; + sha256 = "1sq7gwr9q3hq4q0vx32qqa68qcqf5by9mqyxnq6lwgaq8ydq16ab"; }; - nativeBuildInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ pkgconfig gettext ]; buildInputs = [ gtk3 libxklavier ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "Keyboard management library for MATE"; - homepage = https://github.com/mate-desktop/libmatekbd; + homepage = "https://github.com/mate-desktop/libmatekbd"; license = licenses.gpl2; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/desktops/mate/libmatemixer/default.nix b/pkgs/desktops/mate/libmatemixer/default.nix index 9c2dc412d4d..6bc9fe54ec3 100644 --- a/pkgs/desktops/mate/libmatemixer/default.nix +++ b/pkgs/desktops/mate/libmatemixer/default.nix @@ -1,4 +1,4 @@ -{ config, stdenv, fetchurl, pkgconfig, intltool, glib +{ config, stdenv, fetchurl, pkgconfig, gettext, glib , alsaSupport ? stdenv.isLinux, alsaLib , pulseaudioSupport ? config.pulseaudio or true, libpulseaudio , ossSupport ? false @@ -6,14 +6,14 @@ stdenv.mkDerivation rec { pname = "libmatemixer"; - version = "1.22.0"; + version = "1.24.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1v0gpr55gj4mj8hzxbhgzrmhaxvs2inxhsmirvjw39sc7iplvrh9"; + sha256 = "08vkdp2kzy27xwscwp2jj5nz0yblrka2482l6cx3wl4dnk0rpznm"; }; - nativeBuildInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ pkgconfig gettext ]; buildInputs = [ glib ] ++ stdenv.lib.optional alsaSupport alsaLib @@ -21,9 +21,11 @@ stdenv.mkDerivation rec { configureFlags = stdenv.lib.optional ossSupport "--enable-oss"; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "Mixer library for MATE"; - homepage = https://github.com/mate-desktop/libmatemixer; + homepage = "https://github.com/mate-desktop/libmatemixer"; license = with licenses; [ gpl2 lgpl2 ]; platforms = platforms.linux; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/desktops/mate/libmateweather/default.nix b/pkgs/desktops/mate/libmateweather/default.nix index 0c14cdb96b5..4774339db8b 100644 --- a/pkgs/desktops/mate/libmateweather/default.nix +++ b/pkgs/desktops/mate/libmateweather/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libsoup, tzdata }: +{ stdenv, fetchurl, pkgconfig, gettext, gtk3, libsoup, tzdata }: stdenv.mkDerivation rec { pname = "libmateweather"; - version = "1.22.1"; + version = "1.24.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1y3z82ymc7q6z8ly9f6nys0hbs373fjnvr6j7zwlgf6zc88f71h3"; + sha256 = "094mnlczxq9crjj8z7dzs1zmwscdkbp54l3qjaf4a4bhd8lihv8d"; }; - nativeBuildInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ pkgconfig gettext ]; buildInputs = [ gtk3 libsoup tzdata ]; @@ -20,9 +20,11 @@ stdenv.mkDerivation rec { preFixup = "rm -f $out/share/icons/mate/icon-theme.cache"; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "Library to access weather information from online services for MATE"; - homepage = https://github.com/mate-desktop/libmateweather; + homepage = "https://github.com/mate-desktop/libmateweather"; license = licenses.gpl2; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/desktops/mate/marco/default.nix b/pkgs/desktops/mate/marco/default.nix index fd551c0cc78..3d36f51ab14 100644 --- a/pkgs/desktops/mate/marco/default.nix +++ b/pkgs/desktops/mate/marco/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, libcanberra-gtk3, libgtop, libstartup_notification, gnome3, gtk3, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, gettext, itstool, libxml2, libcanberra-gtk3, libgtop, libstartup_notification, gnome3, gtk3, mate-settings-daemon, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "marco"; - version = "1.22.4"; + version = "1.24.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0z8q4nwm43imbnbxz348ylgzfl25sknb19kml57d6z6flxws19k3"; + sha256 = "0hcbyv8czymhwz5q9rwig7kkhlhik6y080bls736f3wsbqnnirc2"; }; nativeBuildInputs = [ pkgconfig - intltool + gettext itstool wrapGAppsHook ]; @@ -23,11 +23,14 @@ stdenv.mkDerivation rec { libstartup_notification gtk3 gnome3.zenity + mate-settings-daemon ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "MATE default window manager"; - homepage = https://github.com/mate-desktop/marco; + homepage = "https://github.com/mate-desktop/marco"; license = [ licenses.gpl2 ]; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/desktops/mate/mate-applets/default.nix b/pkgs/desktops/mate/mate-applets/default.nix index 3b5a4ccf2a2..7f77a566807 100644 --- a/pkgs/desktops/mate/mate-applets/default.nix +++ b/pkgs/desktops/mate/mate-applets/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, gnome3, glib, gtk3, gtksourceview3, libwnck3, libgtop, libxml2, libnotify, polkit, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, gettext, itstool, gnome3, glib, gtk3, gtksourceview3, libwnck3, libgtop, libxml2, libnotify, polkit, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-applets"; - version = "1.22.2"; + version = "1.24.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1c32rkkry6kka2arrx5psjj037j79icp5jr1s0qh596dvsgxciqc"; + sha256 = "0nm3amb3v458mxv1mbz9y8f4230gldmydmkkm7vqxsrxbccynkxq"; }; nativeBuildInputs = [ pkgconfig - intltool + gettext itstool wrapGAppsHook ]; @@ -36,9 +36,11 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "Applets for use with the MATE panel"; - homepage = https://mate-desktop.org; + homepage = "https://mate-desktop.org"; license = with licenses; [ gpl2Plus lgpl2Plus ]; platforms = platforms.linux; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/desktops/mate/mate-backgrounds/default.nix b/pkgs/desktops/mate/mate-backgrounds/default.nix index 4b41caba710..85bf57ff1c0 100644 --- a/pkgs/desktops/mate/mate-backgrounds/default.nix +++ b/pkgs/desktops/mate/mate-backgrounds/default.nix @@ -1,19 +1,21 @@ -{ stdenv, fetchurl, intltool }: +{ stdenv, fetchurl, gettext }: stdenv.mkDerivation rec { pname = "mate-backgrounds"; - version = "1.22.0"; + version = "1.24.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1j9ch04qi2q4mdcvb92w667ra9hpfdf2bfpi1dpw0nbph7r6qvj9"; + sha256 = "16rmsy02fyq6mj6xgc5mdyh146z3zmkn7iwsi44s962aqwbpn4i8"; }; - nativeBuildInputs = [ intltool ]; + nativeBuildInputs = [ gettext ]; + + enableParallelBuilding = true; meta = with stdenv.lib; { description = "Background images and data for MATE"; - homepage = https://mate-desktop.org; + homepage = "https://mate-desktop.org"; license = licenses.gpl2; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/desktops/mate/mate-calc/default.nix b/pkgs/desktops/mate/mate-calc/default.nix index d89e1e35d92..2de156d02de 100644 --- a/pkgs/desktops/mate/mate-calc/default.nix +++ b/pkgs/desktops/mate/mate-calc/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, libxml2, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, gettext, itstool, gtk3, libxml2, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-calc"; - version = "1.22.2"; + version = "1.24.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1as4gshydcf84vynq8ijd9n8pslz5jpw6aj18ri4bdc91a6q3rpg"; + sha256 = "0f7hc1gg41kcwcyvsqqg79qylrp0qqymris8qizk2x3cfvvg7261"; }; nativeBuildInputs = [ pkgconfig - intltool + gettext itstool wrapGAppsHook ]; @@ -21,9 +21,11 @@ stdenv.mkDerivation rec { libxml2 ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "Calculator for the MATE desktop"; - homepage = https://mate-desktop.org; + homepage = "https://mate-desktop.org"; license = [ licenses.gpl2Plus ]; platforms = platforms.linux; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/desktops/mate/mate-common/default.nix b/pkgs/desktops/mate/mate-common/default.nix index b0a7096c5e7..d2bd073e4a2 100644 --- a/pkgs/desktops/mate/mate-common/default.nix +++ b/pkgs/desktops/mate/mate-common/default.nix @@ -2,16 +2,18 @@ stdenv.mkDerivation rec { pname = "mate-common"; - version = "1.22.2"; + version = "1.24.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1xx7qrw8kc6355r1a1nybncf8s2rxjb2nqzw0gv2r5j5sqx8fzgf"; + sha256 = "06w25mk2w7rfnkwpnav8pcrvip1zdd0zd1qc6d975ksmg66r1vz7"; }; + enableParallelBuilding = true; + meta = { description = "Common files for development of MATE packages"; - homepage = https://mate-desktop.org; + homepage = "https://mate-desktop.org"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.romildo ]; diff --git a/pkgs/desktops/mate/mate-control-center/0001-Search-system-themes-in-system-data-dirs.patch b/pkgs/desktops/mate/mate-control-center/0001-Search-system-themes-in-system-data-dirs.patch deleted file mode 100644 index fb2917b36bb..00000000000 --- a/pkgs/desktops/mate/mate-control-center/0001-Search-system-themes-in-system-data-dirs.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 74fb65a2574c93a2b20a51875a5e336f727ff4bc Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com> -Date: Wed, 25 Dec 2019 18:48:38 -0300 -Subject: [PATCH] Search system themes in system data dirs - ---- - capplets/common/gtkrc-utils.c | 20 ++++++++++++-------- - capplets/common/mate-theme-info.c | 18 +++++++++++------- - 2 files changed, 23 insertions(+), 15 deletions(-) - -diff --git a/capplets/common/gtkrc-utils.c b/capplets/common/gtkrc-utils.c -index 011c8a1..27e01da 100644 ---- a/capplets/common/gtkrc-utils.c -+++ b/capplets/common/gtkrc-utils.c -@@ -60,15 +60,19 @@ gchar* gtkrc_find_named(const gchar* name) - - if (!path) - { -- gchar* theme_dir = gtk_rc_get_theme_dir(); -- path = g_build_filename(theme_dir, name, subpath, NULL); -- g_free(theme_dir); -+ const gchar * const * dirs = g_get_system_data_dirs(); - -- if (!g_file_test(path, G_FILE_TEST_EXISTS)) -- { -- g_free (path); -- path = NULL; -- } -+ if (dirs != NULL) -+ for (; !path && *dirs != NULL; ++dirs) -+ { -+ path = g_build_filename(*dirs, "themes", name, subpath, NULL); -+ -+ if (!g_file_test(path, G_FILE_TEST_EXISTS)) -+ { -+ g_free (path); -+ path = NULL; -+ } -+ } - } - - return path; -diff --git a/capplets/common/mate-theme-info.c b/capplets/common/mate-theme-info.c -index 54ae3ae..a738f0b 100644 ---- a/capplets/common/mate-theme-info.c -+++ b/capplets/common/mate-theme-info.c -@@ -1763,6 +1763,7 @@ mate_theme_color_scheme_equal (const gchar *s1, const gchar *s2) - void - mate_theme_init () - { -+ const gchar * const * dirs; - GFile *top_theme_dir; - gchar *top_theme_dir_string; - static gboolean initted = FALSE; -@@ -1783,13 +1784,16 @@ mate_theme_init () - theme_hash_by_uri = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); - theme_hash_by_name = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); - -- /* Add all the toplevel theme dirs. */ -- /* $datadir/themes */ -- top_theme_dir_string = gtk_rc_get_theme_dir (); -- top_theme_dir = g_file_new_for_path (top_theme_dir_string); -- g_free (top_theme_dir_string); -- add_top_theme_dir_monitor (top_theme_dir, 1, NULL); -- g_object_unref (top_theme_dir); -+ /* Add all the toplevel theme dirs following the XDG Base Directory Specification */ -+ dirs = g_get_system_data_dirs (); -+ if (dirs != NULL) -+ for (; *dirs != NULL; ++dirs) { -+ top_theme_dir_string = g_build_filename (*dirs, "themes", NULL); -+ top_theme_dir = g_file_new_for_path (top_theme_dir_string); -+ g_free (top_theme_dir_string); -+ add_top_theme_dir_monitor (top_theme_dir, 1, NULL); -+ g_object_unref (top_theme_dir); -+ } - - /* ~/.themes */ - top_theme_dir_string = g_build_filename (g_get_home_dir (), ".themes", NULL); --- -2.24.1 - diff --git a/pkgs/desktops/mate/mate-control-center/default.nix b/pkgs/desktops/mate/mate-control-center/default.nix index 2451c403c82..c8119a923d1 100644 --- a/pkgs/desktops/mate/mate-control-center/default.nix +++ b/pkgs/desktops/mate/mate-control-center/default.nix @@ -1,20 +1,20 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, dbus-glib, +{ stdenv, fetchurl, pkgconfig, gettext, itstool, libxml2, dbus-glib, libxklavier, libcanberra-gtk3, librsvg, libappindicator-gtk3, - desktop-file-utils, dconf, gtk3, mate, hicolor-icon-theme, wrapGAppsHook + desktop-file-utils, dconf, gtk3, polkit, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-control-center"; - version = "1.22.2"; + version = "1.24.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1ybdjibi6wgqn3587a66ckxp2qkvl4mcvv2smhflyxksl5djrjgh"; + sha256 = "192plsh83m2qz7jgakns2yvhqbj53v7i54iwb0z26i2awy0j9rcd"; }; nativeBuildInputs = [ pkgconfig - intltool + gettext itstool desktop-file-utils wrapGAppsHook @@ -29,6 +29,7 @@ stdenv.mkDerivation rec { libappindicator-gtk3 gtk3 dconf + polkit hicolor-icon-theme mate.mate-desktop mate.libmatekbd @@ -37,13 +38,6 @@ stdenv.mkDerivation rec { mate.mate-settings-daemon ]; - patches = [ - # see https://github.com/mate-desktop/mate-control-center/pull/528 - ./0001-Search-system-themes-in-system-data-dirs.patch - # look up keyboard shortcuts in system data dirs - ./mate-control-center.keybindings-dir.patch - ]; - configureFlags = [ "--disable-update-mimedb" ]; preFixup = '' @@ -57,7 +51,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Utilities to configure the MATE desktop"; - homepage = https://github.com/mate-desktop/mate-control-center; + homepage = "https://github.com/mate-desktop/mate-control-center"; license = licenses.gpl2; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/desktops/mate/mate-control-center/mate-control-center.keybindings-dir.patch b/pkgs/desktops/mate/mate-control-center/mate-control-center.keybindings-dir.patch deleted file mode 100644 index 4a3036ae16e..00000000000 --- a/pkgs/desktops/mate/mate-control-center/mate-control-center.keybindings-dir.patch +++ /dev/null @@ -1,106 +0,0 @@ -From faeb322b01d3856f3cf163470cc38f4e88a8527c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com> -Date: Sun, 28 Apr 2019 21:45:39 -0300 -Subject: [PATCH] Use system data dirs to locate key bindings - ---- - capplets/keybindings/Makefile.am | 3 +- - .../keybindings/mate-keybinding-properties.c | 58 ++++++++++++------- - 2 files changed, 39 insertions(+), 22 deletions(-) - -diff --git a/capplets/keybindings/Makefile.am b/capplets/keybindings/Makefile.am -index e5efb109..9501dd8f 100644 ---- a/capplets/keybindings/Makefile.am -+++ b/capplets/keybindings/Makefile.am -@@ -33,8 +33,7 @@ AM_CPPFLAGS = \ - $(MATECC_CAPPLETS_CFLAGS) \ - -DMATELOCALEDIR="\"$(datadir)/locale\"" \ - -DMATECC_DATA_DIR="\"$(pkgdatadir)\"" \ -- -DMATECC_UI_DIR="\"$(uidir)\"" \ -- -DMATECC_KEYBINDINGS_DIR="\"$(pkgdatadir)/keybindings\"" -+ -DMATECC_UI_DIR="\"$(uidir)\"" - CLEANFILES = \ - $(MATECC_CAPPLETS_CLEANFILES) \ - $(desktop_DATA) \ -diff --git a/capplets/keybindings/mate-keybinding-properties.c b/capplets/keybindings/mate-keybinding-properties.c -index 4f257333..cf1891d2 100644 ---- a/capplets/keybindings/mate-keybinding-properties.c -+++ b/capplets/keybindings/mate-keybinding-properties.c -@@ -1033,39 +1033,57 @@ static void - reload_key_entries (GtkBuilder *builder) - { - gchar **wm_keybindings; -- GDir *dir; -- const char *name; - GList *list, *l; -+ const gchar * const * data_dirs; -+ GHashTable *loaded_files; -+ guint i; - - wm_keybindings = wm_common_get_current_keybindings(); - - clear_old_model (builder); - -- dir = g_dir_open (MATECC_KEYBINDINGS_DIR, 0, NULL); -- if (!dir) -- return; -- -- list = NULL; -- for (name = g_dir_read_name (dir) ; name ; name = g_dir_read_name (dir)) -+ loaded_files = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free); -+ data_dirs = g_get_system_data_dirs (); -+ for (i = 0; data_dirs[i] != NULL; i++) - { -- if (g_str_has_suffix (name, ".xml")) -+ g_autofree gchar *dir_path = NULL; -+ GDir *dir; -+ const gchar *name; -+ -+ dir_path = g_build_filename (data_dirs[i], "mate-control-center", "keybindings", NULL); -+ g_debug ("Keybinding dir: %s", dir_path); -+ -+ dir = g_dir_open (dir_path, 0, NULL); -+ if (!dir) -+ continue; -+ -+ for (name = g_dir_read_name (dir) ; name ; name = g_dir_read_name (dir)) - { -- list = g_list_insert_sorted (list, g_strdup (name), -- (GCompareFunc) g_ascii_strcasecmp); -- } -- } -- g_dir_close (dir); -+ if (g_str_has_suffix (name, ".xml") == FALSE) -+ continue; -+ -+ if (g_hash_table_lookup (loaded_files, name) != NULL) -+ { -+ g_debug ("Not loading %s, it was already loaded from another directory", name); -+ continue; -+ } - -+ g_hash_table_insert (loaded_files, g_strdup (name), g_strdup (dir_path)); -+ } -+ -+ g_dir_close (dir); -+ } -+ list = g_hash_table_get_keys (loaded_files); -+ list = g_list_sort(list, (GCompareFunc) g_str_equal); - for (l = list; l != NULL; l = l->next) - { -- gchar *path; -- -- path = g_build_filename (MATECC_KEYBINDINGS_DIR, l->data, NULL); -- append_keys_to_tree_from_file (builder, path, wm_keybindings); -- g_free (l->data); -- g_free (path); -+ g_autofree gchar *path = NULL; -+ path = g_build_filename (g_hash_table_lookup (loaded_files, l->data), l->data, NULL); -+ g_debug ("Keybinding file: %s", path); -+ append_keys_to_tree_from_file (builder, path, wm_keybindings); - } - g_list_free (list); -+ g_hash_table_destroy (loaded_files); - - /* Load custom shortcuts _after_ system-provided ones, - * since some of the custom shortcuts may also be listed diff --git a/pkgs/desktops/mate/mate-desktop/default.nix b/pkgs/desktops/mate/mate-desktop/default.nix index 2dca83bcd46..6a5f8b13bf1 100644 --- a/pkgs/desktops/mate/mate-desktop/default.nix +++ b/pkgs/desktops/mate/mate-desktop/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchurl, pkgconfig, intltool, isocodes, gnome3, gtk3, dconf, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, gettext, isocodes, gnome3, gtk3, dconf, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-desktop"; - version = "1.22.2"; + version = "1.24.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "18w5r9p3bqpvxqqy2am7z686xf65cz5vhj247kki8s2yvvap6rlh"; + sha256 = "0l4bbj6nz315s5ndq5sw1jcgi3s1whk59bj12c4mbpsvmlb33adg"; }; nativeBuildInputs = [ pkgconfig - intltool + gettext wrapGAppsHook ]; @@ -21,9 +21,11 @@ stdenv.mkDerivation rec { isocodes ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "Library with common API for various MATE modules"; - homepage = https://mate-desktop.org; + homepage = "https://mate-desktop.org"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix index a4fa6fedae3..26d8f86985b 100644 --- a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix +++ b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix @@ -25,9 +25,11 @@ stdenv.mkDerivation rec { done ''; + enableParallelBuilding = true; + meta = { description = "Faenza icon theme from MATE"; - homepage = https://mate-desktop.org; + homepage = "https://mate-desktop.org"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.romildo ]; diff --git a/pkgs/desktops/mate/mate-icon-theme/default.nix b/pkgs/desktops/mate/mate-icon-theme/default.nix index d374092c48a..4a1ea4c41fc 100644 --- a/pkgs/desktops/mate/mate-icon-theme/default.nix +++ b/pkgs/desktops/mate/mate-icon-theme/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, librsvg, gtk3, hicolor-icon-theme }: +{ stdenv, fetchurl, pkgconfig, gettext, iconnamingutils, librsvg, gtk3, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "mate-icon-theme"; - version = "1.22.2"; + version = "1.24.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0r2bk4flb6kjj97badj2lnml4lfwpl2ym5hkf7r6f7cj8g6pzc4r"; + sha256 = "0a2lz61ivwwcdznmwlmgjr6ipr9sdl5g2czbagnpxkwz8f3m77na"; }; - nativeBuildInputs = [ pkgconfig intltool iconnamingutils ]; + nativeBuildInputs = [ pkgconfig gettext iconnamingutils ]; buildInputs = [ librsvg ]; @@ -25,9 +25,11 @@ stdenv.mkDerivation rec { done ''; + enableParallelBuilding = true; + meta = { description = "Icon themes from MATE"; - homepage = https://mate-desktop.org; + homepage = "https://mate-desktop.org"; license = stdenv.lib.licenses.lgpl3; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.romildo ]; diff --git a/pkgs/desktops/mate/mate-indicator-applet/default.nix b/pkgs/desktops/mate/mate-indicator-applet/default.nix index b2e07d0a3e7..235929dce0c 100644 --- a/pkgs/desktops/mate/mate-indicator-applet/default.nix +++ b/pkgs/desktops/mate/mate-indicator-applet/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libindicator-gtk3, mate, hicolor-icon-theme, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, gettext, gtk3, libindicator-gtk3, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-indicator-applet"; - version = "1.22.1"; + version = "1.24.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "05j5s6r4kx1rbz0j7a7xv38d0kbdi1r8iv8b6nx3lkbkdzq1x0w2"; + sha256 = "0m7pvbs5hhy5f400wqb8wp0dw3pyjpjnjax9qzc73j97l1k3zawf"; }; nativeBuildInputs = [ pkgconfig - intltool + gettext wrapGAppsHook ]; @@ -22,8 +22,10 @@ stdenv.mkDerivation rec { hicolor-icon-theme ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { - homepage = https://github.com/mate-desktop/mate-indicator-applet; + homepage = "https://github.com/mate-desktop/mate-indicator-applet"; description = "MATE panel indicator applet"; longDescription = '' A small applet to display information from various applications diff --git a/pkgs/desktops/mate/mate-media/default.nix b/pkgs/desktops/mate/mate-media/default.nix index 156a305a63f..c02201c855f 100644 --- a/pkgs/desktops/mate/mate-media/default.nix +++ b/pkgs/desktops/mate/mate-media/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libtool, libxml2, libcanberra-gtk3, gtk3, mate, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, gettext, libtool, libxml2, libcanberra-gtk3, gtk3, mate, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-media"; - version = "1.22.2"; + version = "1.24.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0m8q2rqbxzvh82yj63syd8sbfjrc8y4a8caa42zs66j9x60d1agw"; + sha256 = "1d5dx79yfqghjaxrdrdh053nfnvkbx8p3ma7j87s7rsvy5irs963"; }; buildInputs = [ @@ -20,14 +20,16 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig - intltool + gettext libtool wrapGAppsHook ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "Media tools for MATE"; - homepage = https://mate-desktop.org; + homepage = "https://mate-desktop.org"; license = licenses.gpl3; platforms = platforms.unix; maintainers = [ maintainers.romildo maintainers.chpatrick ]; diff --git a/pkgs/desktops/mate/mate-menus/default.nix b/pkgs/desktops/mate/mate-menus/default.nix index 299c9b0e60f..7d418c90b4a 100644 --- a/pkgs/desktops/mate/mate-menus/default.nix +++ b/pkgs/desktops/mate/mate-menus/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, gobject-introspection, python3 }: +{ stdenv, fetchurl, pkgconfig, gettext, glib, gobject-introspection, python3 }: stdenv.mkDerivation rec { pname = "mate-menus"; - version = "1.22.1"; + version = "1.24.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0kh6y76f1rhp3nr22rp93bx77wcgqnygag2ir076cqkppayjc3c0"; + sha256 = "1vv4j38h7mrbfrsj99k25z6y7b5dg30fzd2qnhk7pl8ca8s1jhrd"; }; - nativeBuildInputs = [ pkgconfig intltool gobject-introspection ]; + nativeBuildInputs = [ pkgconfig gettext gobject-introspection ]; buildInputs = [ glib python3 ]; @@ -18,9 +18,11 @@ stdenv.mkDerivation rec { "INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0" ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "Menu system for MATE"; - homepage = https://github.com/mate-desktop/mate-menus; + homepage = "https://github.com/mate-desktop/mate-menus"; license = with licenses; [ gpl2 lgpl2 ]; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/desktops/mate/mate-netbook/default.nix b/pkgs/desktops/mate/mate-netbook/default.nix index 337e2bfdb3b..4c3338ef907 100644 --- a/pkgs/desktops/mate/mate-netbook/default.nix +++ b/pkgs/desktops/mate/mate-netbook/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libwnck3, libfakekey, libXtst, mate, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, gettext, gtk3, libwnck3, libfakekey, libXtst, mate, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-netbook"; - version = "1.22.2"; + version = "1.24.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0m38v2276s2d3zs7smxyf70nyl7bcwp5665zgva28lvs8ip3gijx"; + sha256 = "1bmk9gq5gcqkvfppa7i1hqfph8sajc3xs189s4ha97g0ifwd98a8"; }; nativeBuildInputs = [ pkgconfig - intltool + gettext wrapGAppsHook ]; @@ -23,6 +23,8 @@ stdenv.mkDerivation rec { mate.mate-panel ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "MATE utilities for netbooks"; longDescription = '' @@ -32,7 +34,7 @@ stdenv.mkDerivation rec { Installing these utilities is recommended for netbooks and similar devices with low resolution displays. ''; - homepage = https://mate-desktop.org; + homepage = "https://mate-desktop.org"; license = with licenses; [ gpl3 lgpl2Plus ]; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/desktops/mate/mate-notification-daemon/default.nix b/pkgs/desktops/mate/mate-notification-daemon/default.nix index a83bbcb3ffb..32d0cc9ed8e 100644 --- a/pkgs/desktops/mate/mate-notification-daemon/default.nix +++ b/pkgs/desktops/mate/mate-notification-daemon/default.nix @@ -1,18 +1,19 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, libcanberra-gtk3, - libnotify, libwnck3, gtk3, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, gettext, glib, libcanberra-gtk3, + libnotify, libwnck3, gtk3, libxml2, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-notification-daemon"; - version = "1.22.1"; + version = "1.24.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0f8m3m94iqj2x61dzwwvwq2qlsl2ma8pqr6rfns5pzd0nj0waz0m"; + sha256 = "0y362b51lb8nq2cw254qc39x8hpficn5rxddzp0fxqxakrh7vcif"; }; nativeBuildInputs = [ pkgconfig - intltool + gettext + libxml2 # for xmllint wrapGAppsHook ]; @@ -25,9 +26,11 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; + enableParallelBuilding = true; + meta = with stdenv.lib; { - description = "Notification daemon for MATE"; - homepage = https://github.com/mate-desktop/mate-notification-daemon; + description = "Notification daemon for MATE Desktop"; + homepage = "https://github.com/mate-desktop/mate-notification-daemon"; license = licenses.gpl2; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/desktops/mate/mate-panel/default.nix b/pkgs/desktops/mate/mate-panel/default.nix index 06e9b386adb..dce65675189 100644 --- a/pkgs/desktops/mate/mate-panel/default.nix +++ b/pkgs/desktops/mate/mate-panel/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, glib, libwnck3, librsvg, libxml2, dconf, gtk3, mate, hicolor-icon-theme, gobject-introspection, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, gettext, itstool, glib, libwnck3, librsvg, libxml2, dconf, gtk3, mate, hicolor-icon-theme, gobject-introspection, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-panel"; - version = "1.22.2"; + version = "1.24.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1sm0fniywcxg8rbakhhc37bamwq1x3jqqyaqcvqwxvm6jg1hc97y"; + sha256 = "1hrh10pqk8mva1ix2nmsp3cbbn81cgqy0b9lqhsl0b5p0s40i7in"; }; nativeBuildInputs = [ gobject-introspection - intltool + gettext itstool pkgconfig wrapGAppsHook @@ -37,9 +37,11 @@ stdenv.mkDerivation rec { "INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0" ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "The MATE panel"; - homepage = https://github.com/mate-desktop/mate-panel; + homepage = "https://github.com/mate-desktop/mate-panel"; license = with licenses; [ gpl2 lgpl2 ]; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/desktops/mate/mate-polkit/default.nix b/pkgs/desktops/mate/mate-polkit/default.nix index e11bcb10257..2ab52624041 100644 --- a/pkgs/desktops/mate/mate-polkit/default.nix +++ b/pkgs/desktops/mate/mate-polkit/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk3, gobject-introspection, libappindicator-gtk3, libindicator-gtk3, polkit }: +{ stdenv, fetchurl, pkgconfig, gettext, gtk3, gobject-introspection, libappindicator-gtk3, libindicator-gtk3, polkit }: stdenv.mkDerivation rec { pname = "mate-polkit"; - version = "1.22.0"; + version = "1.24.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "02r8n71xflhvw2hsf6g4svdahzyg3r4n6xamasyzqfhyn0mqmjy0"; + sha256 = "1450bqzlnvwy3xa98lj102j2cf7piqbxcd1cy2zp41rdl8ri3gvn"; }; nativeBuildInputs = [ gobject-introspection - intltool + gettext pkgconfig ]; @@ -22,9 +22,11 @@ stdenv.mkDerivation rec { polkit ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "Integrates polkit authentication for MATE desktop"; - homepage = https://mate-desktop.org; + homepage = "https://mate-desktop.org"; license = [ licenses.gpl2Plus ]; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/desktops/mate/mate-power-manager/default.nix b/pkgs/desktops/mate/mate-power-manager/default.nix index 3f84e60f9b6..37ff34e081a 100644 --- a/pkgs/desktops/mate/mate-power-manager/default.nix +++ b/pkgs/desktops/mate/mate-power-manager/default.nix @@ -1,14 +1,21 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, itstool, libxml2, mate, libnotify, libcanberra-gtk3, dbus-glib, upower, gnome3, gtk3, libtool, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, gettext, glib, itstool, libxml2, mate, libnotify, libcanberra-gtk3, dbus-glib, upower, gnome3, gtk3, libtool, polkit, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-power-manager"; - version = "1.22.2"; + version = "1.24.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "12pnj7y01k1fhfhswxmf6q9yyb0772am5anm338hzfhjp0lcxlbn"; + sha256 = "1h6wm8vna97iayhwqh7rfsc87715np12nxa72w27p4zl54bdkdlg"; }; + nativeBuildInputs = [ + pkgconfig + gettext + libtool + wrapGAppsHook + ]; + buildInputs = [ glib itstool @@ -19,23 +26,19 @@ stdenv.mkDerivation rec { libnotify dbus-glib upower + polkit mate.mate-panel ]; - nativeBuildInputs = [ - pkgconfig - intltool - libtool - wrapGAppsHook - ]; - configureFlags = [ "--enable-applets" ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "The MATE Power Manager"; - homepage = https://mate-desktop.org; + homepage = "https://mate-desktop.org"; license = licenses.gpl3; platforms = platforms.unix; - maintainers = [ maintainers.romildo maintainers.chpatrick ]; + maintainers = with maintainers; [ romildo chpatrick ]; }; } diff --git a/pkgs/desktops/mate/mate-screensaver/default.nix b/pkgs/desktops/mate/mate-screensaver/default.nix index 23e8080f01f..1c80b19aa5b 100644 --- a/pkgs/desktops/mate/mate-screensaver/default.nix +++ b/pkgs/desktops/mate/mate-screensaver/default.nix @@ -1,17 +1,18 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk3, dbus-glib, libXScrnSaver, libnotify, pam, systemd, mate, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, gettext, gtk3, dbus-glib, libXScrnSaver, libnotify, libxml2, pam, systemd, mate, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-screensaver"; - version = "1.22.2"; + version = "1.24.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1y8828g4bys8y4r5y478z6i7dgdqm2wkymi5fq75vxx4lzq919cb"; + sha256 = "0gpw6x9d0b77f14vjl7ghq5dya1mwcnvmgigg00manfwlksr5zby"; }; nativeBuildInputs = [ pkgconfig - intltool + gettext + libxml2 # provides xmllint wrapGAppsHook ]; @@ -30,9 +31,11 @@ stdenv.mkDerivation rec { makeFlags = [ "DBUS_SESSION_SERVICE_DIR=$(out)/etc" ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "Screen saver and locker for the MATE desktop"; - homepage = https://mate-desktop.org; + homepage = "https://mate-desktop.org"; license = with licenses; [ gpl2Plus lgpl2Plus ]; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/desktops/mate/mate-sensors-applet/default.nix b/pkgs/desktops/mate/mate-sensors-applet/default.nix index 0c20880d7ec..c7b7d5ba191 100644 --- a/pkgs/desktops/mate/mate-sensors-applet/default.nix +++ b/pkgs/desktops/mate/mate-sensors-applet/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, libxml2, libxslt, libatasmart, libnotify, lm_sensors, mate, hicolor-icon-theme, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, gettext, itstool, gtk3, libxml2, libxslt, libatasmart, libnotify, lm_sensors, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-sensors-applet"; - version = "1.22.1"; + version = "1.24.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0rv19jxxviqqwk2wlhxlm98jsxa26scvs7ilp2i6plhn3ap2alq3"; + sha256 = "1izjgzj3xb93arim8w891x8as85phdmlhdnr2yc8ixg7xpblsq2s"; }; nativeBuildInputs = [ pkgconfig - intltool + gettext itstool wrapGAppsHook ]; @@ -28,8 +28,10 @@ stdenv.mkDerivation rec { hicolor-icon-theme ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { - homepage = https://github.com/mate-desktop/mate-sensors-applet; + homepage = "https://github.com/mate-desktop/mate-sensors-applet"; description = "MATE panel applet for hardware sensors"; license = with licenses; [ gpl2Plus ]; platforms = platforms.linux; diff --git a/pkgs/desktops/mate/mate-session-manager/default.nix b/pkgs/desktops/mate/mate-session-manager/default.nix index 61dec6b3484..1db0947bf2a 100644 --- a/pkgs/desktops/mate/mate-session-manager/default.nix +++ b/pkgs/desktops/mate/mate-session-manager/default.nix @@ -1,20 +1,20 @@ -{ stdenv, fetchurl, pkgconfig, intltool, xtrans, dbus-glib, systemd, - libSM, libXtst, gtk3, hicolor-icon-theme, mate, +{ stdenv, fetchurl, pkgconfig, gettext, xtrans, dbus-glib, systemd, + libSM, libXtst, gtk3, epoxy, polkit, hicolor-icon-theme, mate, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-session-manager"; - version = "1.22.3"; + version = "1.24.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1ys26af75xl1psck8v32gygxipd8ms1xgpvdhwmnj7bqhabhh249"; + sha256 = "01scj5d1xlri9b2id8gm9kfni9nzhdjdf7rag7fvcxwqp7baz3h3"; }; nativeBuildInputs = [ pkgconfig - intltool + gettext xtrans wrapGAppsHook ]; @@ -27,11 +27,15 @@ stdenv.mkDerivation rec { gtk3 mate.mate-desktop hicolor-icon-theme + epoxy + polkit ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "MATE Desktop session manager"; - homepage = https://github.com/mate-desktop/mate-session-manager; + homepage = "https://github.com/mate-desktop/mate-session-manager"; license = with licenses; [ gpl2 lgpl2 ]; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/desktops/mate/mate-settings-daemon/default.nix b/pkgs/desktops/mate/mate-settings-daemon/default.nix index f126918afca..30db743c276 100644 --- a/pkgs/desktops/mate/mate-settings-daemon/default.nix +++ b/pkgs/desktops/mate/mate-settings-daemon/default.nix @@ -1,28 +1,19 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, dbus-glib, libxklavier, +{ stdenv, fetchurl, pkgconfig, gettext, glib, dbus-glib, libxklavier, libcanberra-gtk3, libnotify, nss, polkit, dconf, gtk3, mate, pulseaudioSupport ? stdenv.config.pulseaudio or true, libpulseaudio, - wrapGAppsHook, fetchpatch, autoreconfHook }: + wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-settings-daemon"; - version = "1.22.1"; + version = "1.24.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0idw02z0iig0pfxvlhc4dq4sr7kl1w50xscvg0jzzswnxid2l4ip"; + sha256 = "1hc5a36wqpjv9i2lgrn1h12s8y910xab3phx5vzbzq47kj6m3gw9"; }; - patches = [ - # Don't use etc/dbus-1/system.d - (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/mate-desktop/mate-settings-daemon/pull/296.patch"; - sha256 = "00dfn8h47zw3wr7yya82vvp19wsw51whn8jwgayn4hkjd161s9nm"; - }) - ]; - nativeBuildInputs = [ - autoreconfHook # drop with the above patch - intltool + gettext pkgconfig wrapGAppsHook ]; @@ -45,9 +36,11 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "MATE settings daemon"; - homepage = https://github.com/mate-desktop/mate-settings-daemon; + homepage = "https://github.com/mate-desktop/mate-settings-daemon"; license = with licenses; [ gpl2 lgpl21 ]; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/desktops/mate/mate-system-monitor/default.nix b/pkgs/desktops/mate/mate-system-monitor/default.nix index 982d2d77b3e..480cf8de1de 100644 --- a/pkgs/desktops/mate/mate-system-monitor/default.nix +++ b/pkgs/desktops/mate/mate-system-monitor/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtkmm3, libxml2, libgtop, libwnck3, librsvg, systemd, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, gettext, itstool, gtkmm3, libxml2, libgtop, libwnck3, librsvg, polkit, systemd, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-system-monitor"; - version = "1.22.2"; + version = "1.24.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1d4l5rv01343jf8bk2j5hxvrbp3d705nd4v2pdrjn4h5dw8nxsl1"; + sha256 = "1cb36lrsn4fhsryl2kl4yq0qhp1p4r7k21w3fc2ywjga8fdxx6y5"; }; nativeBuildInputs = [ pkgconfig - intltool + gettext itstool wrapGAppsHook ]; @@ -22,14 +22,17 @@ stdenv.mkDerivation rec { libgtop libwnck3 librsvg + polkit systemd ]; configureFlags = [ "--enable-systemd" ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "System monitor for the MATE desktop"; - homepage = https://mate-desktop.org; + homepage = "https://mate-desktop.org"; license = [ licenses.gpl2Plus ]; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/desktops/mate/mate-terminal/default.nix b/pkgs/desktops/mate/mate-terminal/default.nix index 905e5643898..fc030152bcd 100644 --- a/pkgs/desktops/mate/mate-terminal/default.nix +++ b/pkgs/desktops/mate/mate-terminal/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, itstool, libxml2, mate, dconf, gtk3, vte, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, gettext, glib, itstool, libxml2, mate, dconf, gtk3, vte, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-terminal"; - version = "1.22.1"; + version = "1.24.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "08210ry5lrivsgzqpdaxrchhpj0n5s1q0x4pxmwdpnksjpcj11mn"; + sha256 = "0nc23nmbkya2fgf7j65z85dcibwi5akkr8nscqrvk039ckirhk97"; }; buildInputs = [ @@ -23,14 +23,17 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig - intltool + gettext wrapGAppsHook ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "The MATE Terminal Emulator"; - homepage = https://mate-desktop.org; + homepage = "https://mate-desktop.org"; license = licenses.gpl3; platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; }; } diff --git a/pkgs/desktops/mate/mate-themes/default.nix b/pkgs/desktops/mate/mate-themes/default.nix index c994513273b..b2a0eea6d5e 100644 --- a/pkgs/desktops/mate/mate-themes/default.nix +++ b/pkgs/desktops/mate/mate-themes/default.nix @@ -20,9 +20,11 @@ stdenv.mkDerivation rec { gtk-update-icon-cache "$out"/share/icons/ContrastHigh ''; + enableParallelBuilding = true; + meta = { description = "A set of themes from MATE"; - homepage = https://mate-desktop.org; + homepage = "https://mate-desktop.org"; license = stdenv.lib.licenses.lgpl21; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.romildo ]; diff --git a/pkgs/desktops/mate/mate-user-guide/default.nix b/pkgs/desktops/mate/mate-user-guide/default.nix index 386b53837b1..20ab8a9a361 100644 --- a/pkgs/desktops/mate/mate-user-guide/default.nix +++ b/pkgs/desktops/mate/mate-user-guide/default.nix @@ -1,21 +1,28 @@ -{ stdenv, fetchurl, intltool, itstool, libxml2, yelp }: +{ stdenv, fetchurl, gettext, itstool, libxml2, yelp }: stdenv.mkDerivation rec { pname = "mate-user-guide"; - version = "1.22.3"; + version = "1.24.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0zv8arsxnbab0qk3ck9i1wp3d4gfclcv6vq6nh5i8zjz6rpp9cjs"; + sha256 = "0ddxya84iydvy85dbqls0wmz2rph87wri3rsdhv4rkbhh5g4sd7f"; }; - nativeBuildInputs = [ itstool intltool libxml2 ]; + nativeBuildInputs = [ itstool gettext libxml2 ]; buildInputs = [ yelp ]; + postPatch = '' + substituteInPlace mate-user-guide.desktop.in.in \ + --replace "Exec=yelp" "Exec=${yelp}/bin/yelp" + ''; + + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "MATE User Guide"; - homepage = https://mate-desktop.org; + homepage = "https://mate-desktop.org"; license = with licenses; [ gpl2Plus fdl12 ]; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/desktops/mate/mate-user-share/default.nix b/pkgs/desktops/mate/mate-user-share/default.nix index 7f5e4e10f14..ba27ae6ce10 100644 --- a/pkgs/desktops/mate/mate-user-share/default.nix +++ b/pkgs/desktops/mate/mate-user-share/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, dbus-glib, libnotify, libxml2, libcanberra-gtk3, mod_dnssd, apacheHttpd, hicolor-icon-theme, mate, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, gettext, itstool, gtk3, dbus-glib, libnotify, libxml2, libcanberra-gtk3, mod_dnssd, apacheHttpd, hicolor-icon-theme, mate, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-user-share"; - version = "1.22.1"; + version = "1.24.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1krsar1pwa8720qz2dckcg0f6z9mvfk49djdxaz1afvi7blmqd6k"; + sha256 = "1h4aabcby96nsg557brzzb0an1qvnawhim2rinzlzg4fhkvdfnr5"; }; nativeBuildInputs = [ pkgconfig - intltool + gettext itstool libxml2 wrapGAppsHook @@ -42,9 +42,11 @@ stdenv.mkDerivation rec { "--with-cajadir=$(out)/lib/caja/extensions-2.0" ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "User level public file sharing for the MATE desktop"; - homepage = https://github.com/mate-desktop/mate-user-share; + homepage = "https://github.com/mate-desktop/mate-user-share"; license = with licenses; [ gpl2Plus ]; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/desktops/mate/mate-utils/default.nix b/pkgs/desktops/mate/mate-utils/default.nix index 0afeb00610b..e36ff69a6fa 100644 --- a/pkgs/desktops/mate/mate-utils/default.nix +++ b/pkgs/desktops/mate/mate-utils/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, libxml2, libgtop, libcanberra-gtk3, inkscape, mate, hicolor-icon-theme, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, gettext, itstool, glib, gtk3, libxml2, libgtop, libcanberra-gtk3, inkscape, udisks2, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-utils"; - version = "1.22.2"; + version = "1.24.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1i6fnm3y1hj8r57x4jpc4ixqs77zln8f7477d0haypflxm3s4kjr"; + sha256 = "1b16n1628gcsym5mph6lr9x5xm4rgkxsa8xwr2wlx8g2gw2775i1"; }; nativeBuildInputs = [ pkgconfig - intltool + gettext itstool inkscape wrapGAppsHook @@ -22,13 +22,18 @@ stdenv.mkDerivation rec { libgtop libcanberra-gtk3 libxml2 + udisks2 mate.mate-panel hicolor-icon-theme ]; + NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; + + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "Utilities for the MATE desktop"; - homepage = https://mate-desktop.org; + homepage = "https://mate-desktop.org"; license = with licenses; [ gpl2Plus lgpl2Plus ]; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/desktops/mate/mozo/default.nix b/pkgs/desktops/mate/mozo/default.nix index 365a471dd7a..7bad399623a 100644 --- a/pkgs/desktops/mate/mozo/default.nix +++ b/pkgs/desktops/mate/mozo/default.nix @@ -1,26 +1,28 @@ -{ stdenv, python3, fetchurl, pkgconfig, intltool, mate, gtk3, glib, wrapGAppsHook, gobject-introspection }: +{ stdenv, python3, fetchurl, pkgconfig, gettext, mate, gtk3, glib, wrapGAppsHook, gobject-introspection }: python3.pkgs.buildPythonApplication rec { pname = "mozo"; - version = "1.22.2"; + version = "1.24.0"; format = "other"; doCheck = false; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1lzcwsz940v218frwzhpywp1an9x3cgfvqr7r8dplpdapvd0khrs"; + sha256 = "01lyi47a04xk0by5bvnfmqgv5sysk2wdlri6a4ssmy1qhgwh9zr3"; }; - nativeBuildInputs = [ pkgconfig intltool gobject-introspection wrapGAppsHook ]; + nativeBuildInputs = [ pkgconfig gettext gobject-introspection wrapGAppsHook ]; propagatedBuildInputs = [ mate.mate-menus python3.pkgs.pygobject3 ]; buildInputs = [ gtk3 glib ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "MATE Desktop menu editor"; - homepage = https://github.com/mate-desktop/mozo; + homepage = "https://github.com/mate-desktop/mozo"; license = with licenses; [ lgpl2Plus ]; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/desktops/mate/pluma/default.nix b/pkgs/desktops/mate/pluma/default.nix index cb1e3de376e..5a12ffc3782 100644 --- a/pkgs/desktops/mate/pluma/default.nix +++ b/pkgs/desktops/mate/pluma/default.nix @@ -1,17 +1,18 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, isocodes, enchant, libxml2, python3, gnome3, gtksourceview3, libpeas, mate, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, gettext, perl, itstool, isocodes, enchant, libxml2, python3, gnome3, gtksourceview3, libpeas, mate, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "pluma"; - version = "1.22.2"; + version = "1.24.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1gsj8grdhzb1jvl5zwd8zjc9cj9ys2ndny04gy4bbh80sjaj6xva"; + sha256 = "1vmndhlhy3qkf3xs5kkv0xhbv5ar25pqz0kp17hc4qhgjzycfr0r"; }; nativeBuildInputs = [ pkgconfig - intltool + gettext + perl itstool isocodes wrapGAppsHook @@ -27,9 +28,11 @@ stdenv.mkDerivation rec { mate.mate-desktop ]; + enableParallelBuilding = true; + meta = { description = "Powerful text editor for the MATE desktop"; - homepage = https://mate-desktop.org; + homepage = "https://mate-desktop.org"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.romildo ]; diff --git a/pkgs/desktops/mate/python-caja/default.nix b/pkgs/desktops/mate/python-caja/default.nix index c566c8a6953..570eaefb599 100644 --- a/pkgs/desktops/mate/python-caja/default.nix +++ b/pkgs/desktops/mate/python-caja/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk3, mate, python3Packages }: +{ stdenv, fetchurl, pkgconfig, gettext, gtk3, mate, python3Packages }: stdenv.mkDerivation rec { pname = "python-caja"; - version = "1.22.1"; + version = "1.24.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "07hkvs4a6anrvh28zjsrj8anbcz32p19hslhq66yhcvh0hh4kvqk"; + sha256 = "1wp61q64cgzr3syd3niclj6rjk87wlib5m86i0myf5ph704r3qgg"; }; nativeBuildInputs = [ pkgconfig - intltool + gettext python3Packages.wrapPython ]; @@ -24,9 +24,11 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-cajadir=$$out/lib/caja/extensions-2.0" ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "Python binding for Caja components"; - homepage = https://github.com/mate-desktop/python-caja; + homepage = "https://github.com/mate-desktop/python-caja"; license = [ licenses.gpl2Plus ]; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/desktops/mate/update.sh b/pkgs/desktops/mate/update.sh index fe294ae4985..d214e07f8cd 100755 --- a/pkgs/desktops/mate/update.sh +++ b/pkgs/desktops/mate/update.sh @@ -7,7 +7,7 @@ cd "$(dirname "${BASH_SOURCE[0]}")" root=../../.. export NIXPKGS_ALLOW_UNFREE=1 -mate_version=1.22 +mate_version=1.24 theme_version=3.22 materepo=https://pub.mate-desktop.org/releases/${mate_version} themerepo=https://pub.mate-desktop.org/releases/themes/${theme_version} diff --git a/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/pkgs/desktops/pantheon/apps/elementary-files/default.nix index ae43a372acc..858e49900c5 100644 --- a/pkgs/desktops/pantheon/apps/elementary-files/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-files/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { pname = "elementary-files"; - version = "4.3.0"; + version = "4.4.0"; repoName = "files"; @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "0brckm0vi9lh8l4g3cy37pbyrdh6g0mdsv3cpii069y2drrh8mz5"; + sha256 = "1l5ki203agy3wkhnxf89ziy4xfmn7m3q0qz1hyrzy7a7qaslq3bg"; }; passthru = { diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index 12464344348..5253d6e5a9e 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -178,15 +178,6 @@ let })); in rec { - binaryCrystal_0_26 = genericBinary { - version = "0.26.1"; - sha256s = { - x86_64-linux = "1xban102yiiwmlklxvn3xp3q546bp8hlxxpakayajkhhnpl6yv45"; - i686-linux = "1igspf1lrv7wpmz0pfrkbx8m1ykvnv4zhic53cav4nicppm2v0ic"; - x86_64-darwin = "1mri8bfrcldl69gczxpihxpv1shn4bijx28m3qby8vnk0ii63n9s"; - }; - }; - binaryCrystal_0_27 = genericBinary { version = "0.27.2"; sha256s = { @@ -223,20 +214,6 @@ in rec { }; }; - crystal_0_25 = generic { - version = "0.25.1"; - sha256 = "15xmbkalsdk9qpc6wfpkly3sifgw6a4ai5jzlv78dh3jp7glmgyl"; - doCheck = false; - binary = binaryCrystal_0_26; - }; - - crystal_0_26 = generic { - version = "0.26.1"; - sha256 = "0jwxrqm99zcjj82gyl6bzvnfj79nwzqf8sa1q3f66q9p50v44f84"; - doCheck = false; # about 20 tests out of more than 14000 are failing - binary = binaryCrystal_0_26; - }; - crystal_0_27 = generic { version = "0.27.2"; sha256 = "0vxqnpqi85yh0167nrkbksxsni476iwbh6y3znbvbjbbfhsi3nsj"; diff --git a/pkgs/development/compilers/go-jsonnet/default.nix b/pkgs/development/compilers/go-jsonnet/default.nix index 94919090367..a39ee351f21 100644 --- a/pkgs/development/compilers/go-jsonnet/default.nix +++ b/pkgs/development/compilers/go-jsonnet/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "go-jsonnet"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "google"; repo = "go-jsonnet"; rev = "v${version}"; - sha256 = "1q0mpydh8h0zrml605q9r259y8584kbwcr9g4sqcb1n13b4d1sgp"; + sha256 = "0l6cwky2xl7m8nnc9abp76bhkdcf2ldbbv3r8p30xv2yr5wd1j8i"; }; modSha256 = "1b6hz5a66hhlzpcv1badxr1b4nmk4lw0507d5jks7lqzvvwd0sxq"; diff --git a/pkgs/development/compilers/go/1.12.nix b/pkgs/development/compilers/go/1.12.nix index 8f02de2cddb..78ffa965875 100644 --- a/pkgs/development/compilers/go/1.12.nix +++ b/pkgs/development/compilers/go/1.12.nix @@ -30,11 +30,11 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.12.16"; + version = "1.12.17"; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "1y0x10fsvgpc1x24b9q9y6kv9b0kwf7879am3p0gym2abgc5wvnf"; + sha256 = "09cbl90maxry713wd18jdqrms3ivbvcm472csnxc78rsqhc851yy"; }; # perl is used for testing go vet @@ -242,7 +242,7 @@ stdenv.mkDerivation rec { homepage = http://golang.org/; description = "The Go Programming language"; license = licenses.bsd3; - maintainers = with maintainers; [ cstrahan orivej velovix mic92 rvolosatovs ]; + maintainers = with maintainers; [ cstrahan orivej velovix mic92 rvolosatovs Frostman ]; platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/development/compilers/go/1.13.nix b/pkgs/development/compilers/go/1.13.nix index 9006725f639..71a05610922 100644 --- a/pkgs/development/compilers/go/1.13.nix +++ b/pkgs/development/compilers/go/1.13.nix @@ -30,11 +30,11 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.13.7"; + version = "1.13.8"; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "1x21kfpzfkvmqd42pan6nl862m7jjl4niqxxpcgm46awbz645bg4"; + sha256 = "0d7cxffk72568h46srzswrxd0bsdip7amgkf499wzn6l6d3g0fxi"; }; # perl is used for testing go vet @@ -239,7 +239,7 @@ stdenv.mkDerivation rec { homepage = http://golang.org/; description = "The Go Programming language"; license = licenses.bsd3; - maintainers = with maintainers; [ cstrahan orivej velovix mic92 rvolosatovs kalbasit ]; + maintainers = with maintainers; [ cstrahan orivej velovix mic92 rvolosatovs kalbasit Frostman ]; platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/development/compilers/graalvm/enterprise-edition.nix b/pkgs/development/compilers/graalvm/enterprise-edition.nix index c34c4695a23..f8271baa588 100644 --- a/pkgs/development/compilers/graalvm/enterprise-edition.nix +++ b/pkgs/development/compilers/graalvm/enterprise-edition.nix @@ -5,33 +5,40 @@ let let graalvmXXX-ee = stdenv.mkDerivation rec { pname = "graalvm${javaVersion}-ee"; - version = "19.3.1"; + version = "20.0.0"; srcs = [ (requireFile { name = "graalvm-ee-java${javaVersion}-linux-amd64-${version}.tar.gz"; - sha256 = { "8" = "b4833f1996e0e271d8abde1d0af3420e2bc6797624515a3720bdbedfa99b1e82"; - "11" = "a965abb093934712f31cd2183f3f0d68ed1410a50365489f665a30e5382908dc"; + sha256 = { "8" = "2df9b31b96f7a24b6a2fe3ecea0b5e819d5d058fde6320016dba1787ce59e99e"; + "11" = "b704fd27b5993584a1ad659b41f42ff0ae8893c066b64a6f6a1719fbee382536"; }.${javaVersion}; url = "https://www.oracle.com/technetwork/graalvm/downloads/index.html"; }) (requireFile { name = "native-image-installable-svm-svmee-java${javaVersion}-linux-amd64-${version}.jar"; - sha256 = { "8" = "fe3447dd60fbe3da39c650654594796873cd6bc9995d1430a421363e71d41702"; - "11" = "53357b7facb36c7b38857a2369471d0e869c0ff45555aa8baf2ab84de0c4782c"; + sha256 = { "8" = "a9f3f86d880d133bd24ad3b1d95129a96e80ea1d8fbc865d09e9410b921e6897"; + "11" = "57086123a95f1e9d4e67b92f830bad9325431908c69a40ef10f28ed586d8bd35"; + }.${javaVersion}; + url = "https://www.oracle.com/technetwork/graalvm/downloads/index.html"; + }) + (requireFile { + name = "ruby-installable-svm-svmee-java${javaVersion}-linux-amd64-${version}.jar"; + sha256 = { "8" = "28b2910736f41070c84b97f1b1a3c5fa43ebdcd926ec92c8f145550b5b975b3c"; + "11" = "27ff1befa67fe5cc9eb0216b6b1105876f44d13eff6137f36f29f13377ea687b"; }.${javaVersion}; url = "https://www.oracle.com/technetwork/graalvm/downloads/index.html"; }) (requireFile { name = "python-installable-svm-svmee-java${javaVersion}-linux-amd64-${version}.jar"; - sha256 = { "8" = "003e9574e18656a82626aa5d310fac31979abc04955587d68ff977808829a91d"; - "11" = "65558e14a25802001f3c79571a09170fa11564de34df6987724163416d3889bf"; + sha256 = { "8" = "9c83bcd71e316805c2914c9002ce348ae44829606adc2375d9188b1eaaaf82f9"; + "11" = "5ca51478bcb5ea5bd9be35856dd7fb2ef03b888cd1b7284a8c15531979025fb4"; }.${javaVersion}; url = "https://www.oracle.com/technetwork/graalvm/downloads/index.html"; }) (requireFile { - name = "ruby-installable-svm-svmee-java${javaVersion}-linux-amd64-${version}.jar"; - sha256 = { "8" = "45abe74d10e09680f1e40101f93def5615e65f29ced328054a40c8517e054290"; - "11" = "3d4de372b78b68dbd966b36489d1c6d84a326990e91a0314fb77404eed0741ad"; + name = "wasm-installable-svm-svmee-java${javaVersion}-linux-amd64-${version}.jar"; + sha256 = { "8" = "e8bd14d3f9bf652104e4346e0899a0351afaecae030a9c0ce0f91b1f93d9e660"; + "11" = "d24eeb84625bb7a5e330b897fd6dde7fc579a687997b64625199c33fa83c40b4"; }.${javaVersion}; url = "https://www.oracle.com/technetwork/graalvm/downloads/index.html"; }) @@ -62,6 +69,7 @@ let unpack_jar ''${arr[1]} unpack_jar ''${arr[2]} unpack_jar ''${arr[3]} + unpack_jar ''${arr[4]} ''; installPhase = { diff --git a/pkgs/development/compilers/julia/1.3.nix b/pkgs/development/compilers/julia/1.3.nix new file mode 100644 index 00000000000..5b1300ba240 --- /dev/null +++ b/pkgs/development/compilers/julia/1.3.nix @@ -0,0 +1,170 @@ +{ stdenv, fetchurl, fetchzip, fetchFromGitHub +# build tools +, gfortran, m4, makeWrapper, patchelf, perl, which, python2 +, cmake +# libjulia dependencies +, libunwind, readline, utf8proc, zlib +# standard library dependencies +, curl, fftwSinglePrec, fftw, gmp, libgit2, mpfr, openlibm, openspecfun, pcre2 +# linear algebra +, openblas, arpack +# Darwin frameworks +, CoreServices, ApplicationServices +}: + +with stdenv.lib; + +# All dependencies must use the same OpenBLAS. +let + arpack_ = arpack; +in +let + arpack = arpack_.override { inherit openblas; }; +in + +let + majorVersion = "1"; + minorVersion = "3"; + maintenanceVersion = "1"; + src_sha256 = "0q9a7yc3b235psrwl5ghyxgwly25lf8n818l8h6bkf2ymdbsv5p6"; + version = "${majorVersion}.${minorVersion}.${maintenanceVersion}"; +in + +stdenv.mkDerivation rec { + pname = "julia"; + inherit version; + + src = fetchzip { + url = "https://github.com/JuliaLang/julia/releases/download/v${majorVersion}.${minorVersion}.${maintenanceVersion}/julia-${majorVersion}.${minorVersion}.${maintenanceVersion}-full.tar.gz"; + sha256 = src_sha256; + }; + + prePatch = '' + export PATH=$PATH:${cmake}/bin + ''; + + patches = [ + ./use-system-utf8proc-julia-1.3.patch + + # Julia recompiles a precompiled file if the mtime stored *in* the + # .ji file differs from the mtime of the .ji file. This + # doesn't work in Nix because Nix changes the mtime of files in + # the Nix store to 1. So patch Julia to accept mtimes of 1. + ./allow_nix_mtime.patch + ]; + + postPatch = '' + patchShebangs . contrib + for i in backtrace cmdlineargs; do + mv test/$i.jl{,.off} + touch test/$i.jl + done + rm stdlib/Sockets/test/runtests.jl && touch stdlib/Sockets/test/runtests.jl + rm stdlib/Distributed/test/runtests.jl && touch stdlib/Distributed/test/runtests.jl + sed -e 's/Invalid Content-Type:/invalid Content-Type:/g' -i ./stdlib/LibGit2/test/libgit2.jl + sed -e 's/Failed to resolve /failed to resolve /g' -i ./stdlib/LibGit2/test/libgit2.jl + ''; + + buildInputs = [ + arpack fftw fftwSinglePrec gmp libgit2 libunwind mpfr + pcre2.dev openblas openlibm openspecfun readline utf8proc + zlib + ] + ++ stdenv.lib.optionals stdenv.isDarwin [CoreServices ApplicationServices] + ; + + nativeBuildInputs = [ curl gfortran m4 makeWrapper patchelf perl python2 which ]; + + makeFlags = + let + arch = head (splitString "-" stdenv.system); + march = { x86_64 = stdenv.hostPlatform.platform.gcc.arch or "x86-64"; i686 = "pentium4"; }.${arch} + or (throw "unsupported architecture: ${arch}"); + # Julia requires Pentium 4 (SSE2) or better + cpuTarget = { x86_64 = "x86-64"; i686 = "pentium4"; }.${arch} + or (throw "unsupported architecture: ${arch}"); + # Julia applies a lot of patches to its dependencies, so for now do not use the system LLVM + # https://github.com/JuliaLang/julia/tree/master/deps/patches + in [ + "ARCH=${arch}" + "MARCH=${march}" + "JULIA_CPU_TARGET=${cpuTarget}" + "PREFIX=$(out)" + "prefix=$(out)" + "SHELL=${stdenv.shell}" + + "USE_SYSTEM_BLAS=1" + "USE_BLAS64=${if openblas.blas64 then "1" else "0"}" + "LIBBLAS=-lopenblas" + "LIBBLASNAME=libopenblas" + + "USE_SYSTEM_LAPACK=1" + "LIBLAPACK=-lopenblas" + "LIBLAPACKNAME=libopenblas" + + "USE_SYSTEM_ARPACK=1" + "USE_SYSTEM_FFTW=1" + "USE_SYSTEM_GMP=1" + "USE_SYSTEM_LIBGIT2=1" + "USE_SYSTEM_LIBUNWIND=1" + + "USE_SYSTEM_MPFR=1" + "USE_SYSTEM_OPENLIBM=1" + "USE_SYSTEM_OPENSPECFUN=1" + "USE_SYSTEM_PATCHELF=1" + "USE_SYSTEM_PCRE=1" + "PCRE_CONFIG=${pcre2.dev}/bin/pcre2-config" + "PCRE_INCL_PATH=${pcre2.dev}/include/pcre2.h" + "USE_SYSTEM_READLINE=1" + "USE_SYSTEM_UTF8PROC=1" + "USE_SYSTEM_ZLIB=1" + + "USE_BINARYBUILDER=0" + ]; + + LD_LIBRARY_PATH = makeLibraryPath [ + arpack fftw fftwSinglePrec gmp libgit2 mpfr openblas openlibm + openspecfun pcre2 + ]; + + enableParallelBuilding = true; + + doCheck = !stdenv.isDarwin; + checkTarget = "testall"; + # Julia's tests require read/write access to $HOME + preCheck = '' + export HOME="$NIX_BUILD_TOP" + ''; + + preBuild = '' + sed -e '/^install:/s@[^ ]*/doc/[^ ]*@@' -i Makefile + sed -e '/[$](DESTDIR)[$](docdir)/d' -i Makefile + export LD_LIBRARY_PATH=${LD_LIBRARY_PATH} + ''; + + postInstall = '' + # Symlink shared libraries from LD_LIBRARY_PATH into lib/julia, + # as using a wrapper with LD_LIBRARY_PATH causes segmentation + # faults when program returns an error: + # $ julia -e 'throw(Error())' + find $(echo $LD_LIBRARY_PATH | sed 's|:| |g') -maxdepth 1 -name '*.${if stdenv.isDarwin then "dylib" else "so"}*' | while read lib; do + if [[ ! -e $out/lib/julia/$(basename $lib) ]]; then + ln -sv $lib $out/lib/julia/$(basename $lib) + fi + done + ''; + + passthru = { + inherit majorVersion minorVersion maintenanceVersion; + site = "share/julia/site/v${majorVersion}.${minorVersion}"; + }; + + meta = { + description = "High-level performance-oriented dynamical language for technical computing"; + homepage = https://julialang.org/; + license = stdenv.lib.licenses.mit; + maintainers = with stdenv.lib.maintainers; [ raskin rob garrison ]; + platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; + broken = stdenv.isi686; + }; +} diff --git a/pkgs/development/compilers/julia/use-system-utf8proc-julia-1.3.patch b/pkgs/development/compilers/julia/use-system-utf8proc-julia-1.3.patch new file mode 100644 index 00000000000..63e0ba9ab05 --- /dev/null +++ b/pkgs/development/compilers/julia/use-system-utf8proc-julia-1.3.patch @@ -0,0 +1,24 @@ +--- + src/flisp/Makefile | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + + +diff --git a/src/flisp/Makefile b/src/flisp/Makefile +index d97075e..6bebca7 100644 +--- a/src/flisp/Makefile ++++ b/src/flisp/Makefile +@@ -32,9 +32,9 @@ OBJS := $(SRCS:%.c=$(BUILDDIR)/%.o) + DOBJS := $(SRCS:%.c=$(BUILDDIR)/%.dbg.obj) + LLT_release := $(LLT_BUILDDIR)/libsupport.a + LLT_debug := $(LLT_BUILDDIR)/libsupport-debug.a +-LIBFILES_release := $(LLT_release) $(LIBUV) $(LIBUTF8PROC) +-LIBFILES_debug := $(LLT_debug) $(LIBUV) $(LIBUTF8PROC) +-LIBS := ++LIBFILES_release := $(LLT_release) $(LIBUV) ++LIBFILES_debug := $(LLT_debug) $(LIBUV) ++LIBS := $(LIBUTF8PROC) + ifneq ($(OS),WINNT) + LIBS += -lpthread + endif + +-- diff --git a/pkgs/development/compilers/mint/default.nix b/pkgs/development/compilers/mint/default.nix index 5f72bd3649b..78cce113e9b 100644 --- a/pkgs/development/compilers/mint/default.nix +++ b/pkgs/development/compilers/mint/default.nix @@ -1,15 +1,15 @@ -{ lib, fetchFromGitHub, crystal, zlib, openssl_1_0_2, duktape, which, libyaml }: +{ lib, fetchFromGitHub, crystal, zlib, openssl, duktape, which, libyaml }: crystal.buildCrystalPackage rec { - version = "0.5.0"; + version = "0.7.1"; pname = "mint"; src = fetchFromGitHub { owner = "mint-lang"; repo = "mint"; rev = version; - sha256 = "0vxbx38c390rd2ysvbwgh89v2232sh5rbsp3nk9wzb70jybpslvl"; + sha256 = "18cg96kl4dn89bj6fm3080zzyd1r7rsfi17agdjjayd2v9fgs95l"; }; - buildInputs = [ openssl_1_0_2 ]; + buildInputs = [ openssl ]; # Update with # nix-shell -p crystal2nix --run crystal2nix diff --git a/pkgs/development/compilers/mint/shards.nix b/pkgs/development/compilers/mint/shards.nix index dc6866e3af3..b3583ac2cba 100644 --- a/pkgs/development/compilers/mint/shards.nix +++ b/pkgs/development/compilers/mint/shards.nix @@ -8,8 +8,8 @@ ameba = { owner = "veelenga"; repo = "ameba"; - rev = "v0.9.1"; - sha256 = "05q2ki9dpg23pllalv5p27f1m287kiicp97ziz0z7vv0vg1r8smj"; + rev = "v0.10.1"; + sha256 = "0dcw7px7g0c5pxpdlirhirqzhcc7gdwdfiwb9kgm4x1k74ghjgxq"; }; baked_file_system = { owner = "schovi"; @@ -26,8 +26,8 @@ dotenv = { owner = "gdotdesign"; repo = "cr-dotenv"; - rev = "v0.2.0"; - sha256 = "0zi2y1j2546xjhdzn7icmry0cjv82cx2cqmpgx5ml37c2pnb7kp7"; + rev = "v0.3.1"; + sha256 = "1xp7c3g8dj1hqk2b885qr4y0s8661gpp9q28lv6rhr0ckllc6zgz"; }; exception_page = { owner = "crystal-loot"; @@ -47,6 +47,12 @@ rev = "v0.4.0"; sha256 = "1w9ib6j4xhwxdxx58nzc06gw7ci7vga03vgj1z1bnklamb0b0l0k"; }; + markd = { + owner = "icyleaf"; + repo = "markd"; + rev = "v0.2.0"; + sha256 = "0n27fndd77mlkgw1r4pf0sa8fz4gwsh7dpnjck95c0ml91cr8j1a"; + }; radix = { owner = "luislavena"; repo = "radix"; diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix index 4231845792a..f47d7939e48 100644 --- a/pkgs/development/compilers/openjdk/8.nix +++ b/pkgs/development/compilers/openjdk/8.nix @@ -29,49 +29,49 @@ let jdk8 = fetchurl { name = "jdk8-${repover}.tar.gz"; url = "${baseurl}/archive/${repover}.tar.gz"; - sha256 = if stdenv.isAarch64 then "ca978112ca1bbdcafac231b39a23dc4da786eff8147c4e72b9807785afee48bb" + sha256 = if stdenv.isAarch64 then "0qpmr267qcxhmw398zbl1axd161yxn4k4hfz1jlxlmdvg70p7h90" else "1crs4hmzmgm6fkwfq0d3xz9lph0nd33fngrqv2rz1mkkqcrjx18z"; }; langtools = fetchurl { name = "langtools-${repover}.tar.gz"; url = "${baseurl}/langtools/archive/${repover}.tar.gz"; - sha256 = if stdenv.isAarch64 then "ca978112ca1bbdcafac231b39a23dc4da786eff8147c4e72b9807785afee48bb" + sha256 = if stdenv.isAarch64 then "1rhhi4kgmxvnyl3ic5p008p1n7zyji5nw99blm1lr5fw7ry7df24" else "1aaxd1rl7dlk4kxdivvqvripsbn0d5vny0jvjksycsm97vrfiry4"; }; hotspot = fetchurl { name = "hotspot-${repover}.tar.gz"; url = "${baseurl}/hotspot/archive/${repover}.tar.gz"; - sha256 = if stdenv.isAarch64 then "ca978112ca1bbdcafac231b39a23dc4da786eff8147c4e72b9807785afee48bb" + sha256 = if stdenv.isAarch64 then "0lphrhjqlavd6qlkh7h4sd2bqf5gd0cchkcnvy87703fbd7gy5ii" else "18i4if16zikgda9k5bgqyx0p2104db23zlnclq512178z0p9yycb"; }; corba = fetchurl { name = "corba-${repover}.tar.gz"; url = "${baseurl}/corba/archive/${repover}.tar.gz"; - sha256 = if stdenv.isAarch64 then "ca978112ca1bbdcafac231b39a23dc4da786eff8147c4e72b9807785afee48bb" + sha256 = if stdenv.isAarch64 then "18h0v566v420d00na6x4jrs41v4aa39byk15fi8k6dcn0dmirhvg" else "1298k8p2dsj7xc4h2ayk5nl4ssrcgncn06ysyqrmnwrb8gj8s1w4"; }; jdk = fetchurl { name = "jdk-${repover}.tar.gz"; url = "${baseurl}/jdk/archive/${repover}.tar.gz"; - sha256 = if stdenv.isAarch64 then "ca978112ca1bbdcafac231b39a23dc4da786eff8147c4e72b9807785afee48bb" + sha256 = if stdenv.isAarch64 then "0xxy7rkj8ah263nnzkd4mg9dai5qix3l9cyilm47dig5hv7g8aq0" else "0vqlbks3cy3cnmnrnhbjkqinvp8bcy2h96xvx81cvlza4s2hszvz"; }; jaxws = fetchurl { name = "jaxws-${repover}.tar.gz"; url = "${baseurl}/jaxws/archive/${repover}.tar.gz"; - sha256 = if stdenv.isAarch64 then "ca978112ca1bbdcafac231b39a23dc4da786eff8147c4e72b9807785afee48bb" + sha256 = if stdenv.isAarch64 then "0ajqm2l9g5w5ag5s4vl4ldpbm99pqa6d342hrzvv7psqn3zf6ar5" else "1wg9fbiz09arj0llavnzrmbhw8nx0dw8dcjkrzxw78rj1cadflzc"; }; jaxp = fetchurl { name = "jaxp-${repover}.tar.gz"; url = "${baseurl}/jaxp/archive/${repover}.tar.gz"; - sha256 = if stdenv.isAarch64 then "ca978112ca1bbdcafac231b39a23dc4da786eff8147c4e72b9807785afee48bb" + sha256 = if stdenv.isAarch64 then "03zjh6xvza05abxz9d9j2w9xndw9n07f8lrn6dymj7f4imals831" else "1i5xrk8r8pcgnc68zrgp3hd1a1nzcm99swpmdnlb424qlg5nnrcf"; }; nashorn = fetchurl { name = "nashorn-${repover}.tar.gz"; url = "${baseurl}/nashorn/archive/${repover}.tar.gz"; - sha256 = if stdenv.isAarch64 then "ca978112ca1bbdcafac231b39a23dc4da786eff8147c4e72b9807785afee48bb" + sha256 = if stdenv.isAarch64 then "0n809w264ndxksva9c81x0m1fsyg8c627w571f72xxxl9c1bnrmp" else "0qlxaz7sriy709vcyzz48s2v4p5h4d31my33whip018c4j5gkfqq"; }; openjdk8 = stdenv.mkDerivation { diff --git a/pkgs/development/compilers/rust/clippy.nix b/pkgs/development/compilers/rust/clippy.nix index 56b70f21d4c..4857b587847 100644 --- a/pkgs/development/compilers/rust/clippy.nix +++ b/pkgs/development/compilers/rust/clippy.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage { # changes hash of vendor directory otherwise dontUpdateAutotoolsGnuConfigScripts = true; - buildInputs = [ rustc ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = [ rustc rustc.llvm ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; # fixes: error: the option `Z` is only accepted on the nightly compiler RUSTC_BOOTSTRAP = 1; @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage { ''; meta = with stdenv.lib; { - homepage = https://rust-lang.github.io/rust-clippy/; + homepage = "https://rust-lang.github.io/rust-clippy/"; description = "A bunch of lints to catch common mistakes and improve your Rust code"; maintainers = with maintainers; [ basvandijk ]; license = with licenses; [ mit asl20 ]; diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index b0c26f3dffd..7857dbc7ee6 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -155,8 +155,10 @@ in stdenv.mkDerivation rec { requiredSystemFeatures = [ "big-parallel" ]; + passthru.llvm = llvmShared; + meta = with stdenv.lib; { - homepage = https://www.rust-lang.org/; + homepage = "https://www.rust-lang.org/"; description = "A safe, concurrent, practical language"; maintainers = with maintainers; [ madjar cstrahan globin havvy ]; license = [ licenses.mit licenses.asl20 ]; diff --git a/pkgs/development/idris-modules/tparsec.nix b/pkgs/development/idris-modules/tparsec.nix index 599ca72c615..67020898ff3 100644 --- a/pkgs/development/idris-modules/tparsec.nix +++ b/pkgs/development/idris-modules/tparsec.nix @@ -5,7 +5,7 @@ }: build-idris-package { name = "tparsec"; - version = "2019-09-19"; + version = "2020-02-11"; ipkgName = "TParsec"; @@ -14,8 +14,8 @@ build-idris-package { src = fetchFromGitHub { owner = "gallais"; repo = "idris-tparsec"; - rev = "cbaea6ec7e5b62536666329940f3ffb5b8b59036"; - sha256 = "0bzdv90a83irn7ca268acl19mjg9vxjmc4saa4naj4hdmg7srb2v"; + rev = "943c64dfcb4e1582696f68312fad88145dc3a8e4"; + sha256 = "0pyhkafhx2pwim91ada6qrgacvahl9bpv5m486y8fph4qzf4z6mx"; }; meta = { diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 0fa605a4cac..911795cc192 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -263,23 +263,23 @@ let in { php72 = generic { - version = "7.2.26"; - sha256 = "0yw49v3rk3cd0fb4gsli74pgd4qrykhn9c37dyfr3zsprzp8cvgk"; + version = "7.2.27"; + sha256 = "0jbhc8x2i6xx6p7zc30ahg9xplsqlz334m1w13mhr1qv2xdnkh2v"; # https://bugs.php.net/bug.php?id=76826 extraPatches = optional stdenv.isDarwin ./php72-darwin-isfinite.patch; }; php73 = generic { - version = "7.3.13"; - sha256 = "1g376b9caw21mw8738z354llbzb3shzgc60m7naw7wql5038jysw"; + version = "7.3.14"; + sha256 = "0wn2qsfrnch90l8nxbpcjd2q0ijzdiiyhvcpbycngki9r6xwppxr"; # https://bugs.php.net/bug.php?id=76826 extraPatches = optional stdenv.isDarwin ./php73-darwin-isfinite.patch; }; php74 = generic { - version = "7.4.1"; - sha256 = "0klfwhm2935ariwzqdri1fwh4a0vbrk3jis53qzi18isp3qa073b"; + version = "7.4.2"; + sha256 = "05p8z0ld058yjanxaphy3ka20hn7x7d6nak5sm782w4wprs9k402"; }; } diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index f12d1f1090f..3e9716af550 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -46,7 +46,7 @@ in stdenv.mkDerivation rec { pname = "racket"; - version = "7.5"; # always change at once with ./minimal.nix + version = "7.6"; # always change at once with ./minimal.nix src = (stdenv.lib.makeOverridable ({ name, sha256 }: fetchurl { @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { } )) { name = "${pname}-${version}"; - sha256 = "0b74v0pqkx57x2gk0m4sp94jaf6bi1mci4ix9vx4sh2442sbds1j"; + sha256 = "0yagy7qrnz96gwafnj3whh2vs54788k1ci3vkm100h68gsw638b8"; }; FONTCONFIG_FILE = fontsConf; diff --git a/pkgs/development/interpreters/racket/minimal.nix b/pkgs/development/interpreters/racket/minimal.nix index df7c72c4a68..9e817b76000 100644 --- a/pkgs/development/interpreters/racket/minimal.nix +++ b/pkgs/development/interpreters/racket/minimal.nix @@ -5,7 +5,7 @@ racket.overrideAttrs (oldAttrs: rec { name = "racket-minimal-${oldAttrs.version}"; src = oldAttrs.src.override { inherit name; - sha256 = "0478f0phkjch10ncsl8lm8a1m8qvgchrkgzpcaxyhmg2clyjgn8r"; + sha256 = "0id094q9024hj2n3907l7dblp3iix1v5289xzskmh5c26xfygp9y"; }; meta = oldAttrs.meta // { diff --git a/pkgs/development/interpreters/wasm-gc/default.nix b/pkgs/development/interpreters/wasm-gc/default.nix deleted file mode 100644 index 585a90c505b..00000000000 --- a/pkgs/development/interpreters/wasm-gc/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchFromGitHub, rustPlatform }: - -rustPlatform.buildRustPackage rec { - pname = "wasm-gc"; - version = "0.1.6"; - - src = fetchFromGitHub { - owner = "alexcrichton"; - repo = "wasm-gc"; - rev = version; - sha256 = "1lc30xxqp3vv1r269xzznh2lf2dzdq89bi5f1vmqjw4yc3xmawm7"; - }; - - cargoPatches = [ ./fix-build.patch ]; # Cargo.lock is not up-to-date - - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "073dnn80sl4adh7vi6q9sx2vkmy27gxy7ysxz17iz12p7pfcagm2"; - - meta = with stdenv.lib; { - description = "gc-sections for wasm"; - homepage = "https://github.com/alexcrichton/wasm-gc"; - maintainers = with maintainers; [ ekleog ]; - platforms = platforms.all; - license = with licenses; [ mit asl20 ]; - }; -} diff --git a/pkgs/development/interpreters/wasm-gc/fix-build.patch b/pkgs/development/interpreters/wasm-gc/fix-build.patch deleted file mode 100644 index 3144dd89837..00000000000 --- a/pkgs/development/interpreters/wasm-gc/fix-build.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index 923ed91..71f17c8 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -212,16 +212,16 @@ dependencies = [ - - [[package]] - name = "wasm-gc" --version = "0.1.1" -+version = "0.1.6" - dependencies = [ - "env_logger 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)", - "getopts 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", -- "wasm-gc-api 0.1.5", -+ "wasm-gc-api 0.1.6", - ] - - [[package]] - name = "wasm-gc-api" --version = "0.1.5" -+version = "0.1.6" - dependencies = [ - "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-wasm 0.31.0 (registry+https://github.com/rust-lang/crates.io-index)", -@@ -234,7 +234,7 @@ version = "0.1.0" - dependencies = [ - "cfg-if 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "wasm-bindgen 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", -- "wasm-gc-api 0.1.5", -+ "wasm-gc-api 0.1.6", - ] - - [[package]] - diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix index 5f5368f2866..d2021e23b53 100644 --- a/pkgs/development/libraries/allegro/5.nix +++ b/pkgs/development/libraries/allegro/5.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "allegro"; - version = "5.2.5.0"; + version = "5.2.6.0"; src = fetchFromGitHub { owner = "liballeg"; repo = "allegro5"; rev = version; - sha256 = "1jrnizpwznyxz2c7zb75lfy7l51ww5jlqfaahcrycfj1xay9mpqp"; + sha256 = "1xbhvriyh10ka2j7jgjkpa6mlzp6av909hhr9sk317vjvf0z0mqz"; }; buildInputs = [ diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix index 2c44b045a2f..205bcd7c600 100644 --- a/pkgs/development/libraries/flatpak/default.nix +++ b/pkgs/development/libraries/flatpak/default.nix @@ -55,14 +55,14 @@ stdenv.mkDerivation rec { pname = "flatpak"; - version = "1.6.1"; + version = "1.6.2"; # TODO: split out lib once we figure out what to do with triggerdir - outputs = [ "out" "man" "doc" "installedTests" ]; + outputs = [ "out" "dev" "man" "doc" "installedTests" ]; src = fetchurl { url = "https://github.com/flatpak/flatpak/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "1x3zh2xashsq1nh4s85qq45hcnwfbnwzln2wlk10g7149nia6f7w"; + sha256 = "02k9p5n60gz2k85n805n9niic4miw0mfh0i7yk1vrc8vaa5h69wd"; }; patches = [ @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { # Hardcode paths used by Flatpak itself. (substituteAll { src = ./fix-paths.patch; - p11 = p11-kit; + p11kit = "${p11-kit.dev}/bin/p11-kit"; }) # Adapt paths exposed to sandbox for NixOS. @@ -128,7 +128,6 @@ stdenv.mkDerivation rec { bzip2 dbus dconf - glib gpgme json-glib libarchive @@ -136,7 +135,6 @@ stdenv.mkDerivation rec { libseccomp libsoup lzma - ostree polkit python3 systemd @@ -148,6 +146,12 @@ stdenv.mkDerivation rec { librsvg # for flatpak-validate-icon ]; + # Required by flatpak.pc + propagatedBuildInputs = [ + glib + ostree + ]; + checkInputs = [ valgrind ]; diff --git a/pkgs/development/libraries/flatpak/fix-paths.patch b/pkgs/development/libraries/flatpak/fix-paths.patch index 746b4382864..67f0d4eba71 100644 --- a/pkgs/development/libraries/flatpak/fix-paths.patch +++ b/pkgs/development/libraries/flatpak/fix-paths.patch @@ -7,7 +7,7 @@ index 5dd7629e..ddc71a4c 100644 int i; char *p11_argv[] = { - "p11-kit", "server", -+ "@p11@/bin/p11-kit", "server", ++ "@p11kit@", "server", /* We explicitly request --sh here, because we then fail on earlier versions that doesn't support * this flag. This is good, because those earlier versions did not properly daemonize and caused * the spawn_sync to hang forever, waiting for the pipe to close. diff --git a/pkgs/development/libraries/freenect/default.nix b/pkgs/development/libraries/freenect/default.nix index 9520542481c..17b2a6b7c99 100644 --- a/pkgs/development/libraries/freenect/default.nix +++ b/pkgs/development/libraries/freenect/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "freenect"; - version = "0.5.7"; + version = "0.6.0"; src = fetchFromGitHub { owner = "OpenKinect"; repo = "libfreenect"; rev = "v${version}"; - sha256 = "0vnc7z2avckh4mccqq6alsd2z7xvsh3kaslc5b0gnfxw0j269gl6"; + sha256 = "1963xndbiwgj01q17zv6xbqlsbhfd236dkbdwkbjw4b0gr8kqzq9"; }; buildInputs = [ libusb freeglut libGLU libGL libXi libXmu ] diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 7ccba0072e2..d1ff681097d 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -24,7 +24,7 @@ , gd ? null, libpng ? null , libidn2 , bison -, python3 +, python3Minimal }: { name @@ -155,7 +155,7 @@ stdenv.mkDerivation ({ outputs = [ "out" "bin" "dev" "static" ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ bison python3 ]; + nativeBuildInputs = [ bison python3Minimal ]; buildInputs = [ linuxHeaders ] ++ lib.optionals withGd [ gd libpng ]; # Needed to install share/zoneinfo/zone.tab. Set to impure /bin/sh to diff --git a/pkgs/development/libraries/howard-hinnant-date/default.nix b/pkgs/development/libraries/howard-hinnant-date/default.nix new file mode 100644 index 00000000000..30e5c92b8f0 --- /dev/null +++ b/pkgs/development/libraries/howard-hinnant-date/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, cmake, curl, fetchpatch }: + +stdenv.mkDerivation rec { + pname = "howard-hinnant-date-unstable"; + version = "2020-01-24"; + + src = fetchFromGitHub { + owner = "HowardHinnant"; + repo = "date"; + rev = "9a0ee2542848ab8625984fc8cdbfb9b5414c0082"; + sha256 = "0yxsn0hj22n61bjywysxqgfv7hj5xvsl6isma95fl8xrimpny083"; + }; + + patches = [ + (fetchpatch { + url = "https://github.com/HowardHinnant/date/commit/e56b2dce7e89a92e1b9b35caa13b3e938c4cedea.patch"; + sha256 = "0m3qbhq7kmm9qa3jm6d2px7c1dxdj5k9lffgdvqnrwmhxwj1p9n2"; + }) + ]; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ curl ]; + + cmakeFlags = [ + "-DBUILD_TZ_LIB=true" + "-DBUILD_SHARED_LIBS=true" + ]; + + outputs = [ "out" "dev" ]; + + meta = with stdenv.lib; { + license = licenses.mit; + description = "A date and time library based on the C++11/14/17 <chrono> header"; + homepage = "https://github.com/HowardHinnant/date"; + platforms = platforms.linux; + maintainers = with maintainers; [ ma27 ]; + }; +} diff --git a/pkgs/development/libraries/http-parser/default.nix b/pkgs/development/libraries/http-parser/default.nix index 4b1a695ca55..7c3b313dd60 100644 --- a/pkgs/development/libraries/http-parser/default.nix +++ b/pkgs/development/libraries/http-parser/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: let - version = "2.9.2"; + version = "2.9.3"; in stdenv.mkDerivation { pname = "http-parser"; inherit version; @@ -10,7 +10,7 @@ in stdenv.mkDerivation { owner = "nodejs"; repo = "http-parser"; rev = "v${version}"; - sha256 = "1qs6x3n2nrcj1wiik5pg5i16inykf7rcfdfdy7rwyzf40pvdl3c2"; + sha256 = "189zi61vczqgmqjd2myjcjbbi5icrk7ccs0kn6nj8hxqiv5j3811"; }; NIX_CFLAGS_COMPILE = "-Wno-error"; diff --git a/pkgs/development/libraries/hunspell/default.nix b/pkgs/development/libraries/hunspell/default.nix index f2f8cdcab20..a9b28253171 100644 --- a/pkgs/development/libraries/hunspell/default.nix +++ b/pkgs/development/libraries/hunspell/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, readline, autoreconfHook }: +{ stdenv, fetchurl, fetchpatch, ncurses, readline, autoreconfHook }: stdenv.mkDerivation rec { version = "1.7.0"; @@ -14,7 +14,14 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses readline ]; nativeBuildInputs = [ autoreconfHook ]; - patches = [ ./0001-Make-hunspell-look-in-XDG_DATA_DIRS-for-dictionaries.patch ]; + patches = [ + ./0001-Make-hunspell-look-in-XDG_DATA_DIRS-for-dictionaries.patch + (fetchpatch { + name = "CVE-2019-16707.patch"; + url = "https://github.com/hunspell/hunspell/commit/ac938e2ecb48ab4dd21298126c7921689d60571b.patch"; + sha256 = "0bwfksz87iy7ikx3fb54zd5ww169qfm9kl076hsch3cs8p30s8az"; + }) + ]; postPatch = '' patchShebangs tests diff --git a/pkgs/development/libraries/jose/default.nix b/pkgs/development/libraries/jose/default.nix new file mode 100644 index 00000000000..4c3095681ed --- /dev/null +++ b/pkgs/development/libraries/jose/default.nix @@ -0,0 +1,28 @@ +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +, zlib, jansson, openssl +}: + +stdenv.mkDerivation rec { + pname = "jose"; + version = "10"; + + src = fetchFromGitHub { + owner = "latchset"; + repo = pname; + rev = "v${version}"; + sha256 = "15ac8a656m66rd9qg4dj53smykwaagqv606h18w7fiqn0ykxl4vi"; + }; + + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ zlib jansson openssl ]; + + outputs = [ "out" "dev" "man" ]; + enableParallelBuilding = true; + + meta = { + description = "C-language implementation of Javascript Object Signing and Encryption"; + homepage = "https://github.com/latchset/jose"; + maintainers = with lib.maintainers; [ fpletz ]; + license = lib.licenses.asl20; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks/kinit/kinit-libpath.patch b/pkgs/development/libraries/kde-frameworks/kinit/0001-kinit-libpath.patch index b949723fb54..21477394c91 100644 --- a/pkgs/development/libraries/kde-frameworks/kinit/kinit-libpath.patch +++ b/pkgs/development/libraries/kde-frameworks/kinit/0001-kinit-libpath.patch @@ -1,8 +1,17 @@ -Index: kinit-5.32.0/src/kdeinit/kinit.cpp -=================================================================== ---- kinit-5.32.0.orig/src/kdeinit/kinit.cpp -+++ kinit-5.32.0/src/kdeinit/kinit.cpp -@@ -623,19 +623,15 @@ static pid_t launch(int argc, const char +From 715c5f461b4992dac066601202a673bc551a5e33 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel <ttuegel@mailbox.org> +Date: Sun, 16 Feb 2020 14:23:31 -0600 +Subject: [PATCH 1/4] kinit-libpath + +--- + src/kdeinit/kinit.cpp | 22 +++++++++------------- + 1 file changed, 9 insertions(+), 13 deletions(-) + +diff --git a/src/kdeinit/kinit.cpp b/src/kdeinit/kinit.cpp +index 8fff17a..0801b75 100644 +--- a/src/kdeinit/kinit.cpp ++++ b/src/kdeinit/kinit.cpp +@@ -622,19 +622,15 @@ static pid_t launch(int argc, const char *_name, const char *args, if (!libpath.isEmpty()) { if (libpath_relative) { @@ -31,3 +40,6 @@ Index: kinit-5.32.0/src/kdeinit/kinit.cpp } } else { l.load(); +-- +2.23.1 + diff --git a/pkgs/development/libraries/kde-frameworks/kinit/0002-start_kdeinit-path.patch b/pkgs/development/libraries/kde-frameworks/kinit/0002-start_kdeinit-path.patch new file mode 100644 index 00000000000..bf25b98d6c5 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks/kinit/0002-start_kdeinit-path.patch @@ -0,0 +1,25 @@ +From 129cd0ae1e983adc10dbe84e87bcc6f31cb13db8 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel <ttuegel@mailbox.org> +Date: Sun, 16 Feb 2020 14:23:44 -0600 +Subject: [PATCH 2/4] start_kdeinit-path + +--- + src/start_kdeinit/start_kdeinit_wrapper.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/start_kdeinit/start_kdeinit_wrapper.c b/src/start_kdeinit/start_kdeinit_wrapper.c +index 891f50c..ef664ad 100644 +--- a/src/start_kdeinit/start_kdeinit_wrapper.c ++++ b/src/start_kdeinit/start_kdeinit_wrapper.c +@@ -23,7 +23,7 @@ + #include <string.h> + #include <unistd.h> + +-#define EXECUTE CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "/start_kdeinit" ++#define EXECUTE "/run/wrappers/bin/start_kdeinit" + + #if KDEINIT_OOM_PROTECT + +-- +2.23.1 + diff --git a/pkgs/development/libraries/kde-frameworks/kinit/kdeinit-extra_libs.patch b/pkgs/development/libraries/kde-frameworks/kinit/0003-kdeinit-extra-libs.patch index d5b1a4accaa..9df8505b292 100644 --- a/pkgs/development/libraries/kde-frameworks/kinit/kdeinit-extra_libs.patch +++ b/pkgs/development/libraries/kde-frameworks/kinit/0003-kdeinit-extra-libs.patch @@ -1,7 +1,16 @@ -Index: kinit-5.32.0/src/kdeinit/kinit.cpp -=================================================================== ---- kinit-5.32.0.orig/src/kdeinit/kinit.cpp -+++ kinit-5.32.0/src/kdeinit/kinit.cpp +From 4f5d0de7e35744cdbfa9e280ee7e15a54cf21abb Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel <ttuegel@mailbox.org> +Date: Sun, 16 Feb 2020 14:24:07 -0600 +Subject: [PATCH 3/4] kdeinit-extra-libs + +--- + src/kdeinit/kinit.cpp | 22 ++++------------------ + 1 file changed, 4 insertions(+), 18 deletions(-) + +diff --git a/src/kdeinit/kinit.cpp b/src/kdeinit/kinit.cpp +index 0801b75..622dd5f 100644 +--- a/src/kdeinit/kinit.cpp ++++ b/src/kdeinit/kinit.cpp @@ -96,9 +96,9 @@ static const char *extra_libs[] = { "libKF5Parts.5.dylib", "libKF5Plasma.5.dylib" @@ -15,7 +24,7 @@ Index: kinit-5.32.0/src/kdeinit/kinit.cpp #endif }; #endif -@@ -1533,20 +1531,6 @@ static int initXconnection() +@@ -1524,20 +1524,6 @@ static int initXconnection() } #endif @@ -36,7 +45,8 @@ Index: kinit-5.32.0/src/kdeinit/kinit.cpp extern "C" { static void secondary_child_handler(int) -@@ -1692,7 +1676,7 @@ int main(int argc, char **argv) +@@ -1679,7 +1665,7 @@ int main(int argc, char **argv) + #if defined(Q_OS_UNIX) && !defined(Q_OS_OSX) if (!d.suicide && qEnvironmentVariableIsEmpty("KDE_IS_PRELINKED")) { for (const char *extra_lib : extra_libs) { - const QString extra = findSharedLib(QString::fromLatin1(extra_lib)); @@ -44,3 +54,6 @@ Index: kinit-5.32.0/src/kdeinit/kinit.cpp if (!extra.isEmpty()) { QLibrary l(extra); l.setLoadHints(QLibrary::ExportExternalSymbolsHint); +-- +2.23.1 + diff --git a/pkgs/development/libraries/kde-frameworks/kinit/0004-start_kdeinit-environ-hard-limit.patch b/pkgs/development/libraries/kde-frameworks/kinit/0004-start_kdeinit-environ-hard-limit.patch new file mode 100644 index 00000000000..34d4726150c --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks/kinit/0004-start_kdeinit-environ-hard-limit.patch @@ -0,0 +1,29 @@ +From 41e94983dcfbc1667f1b18c5b566aa5c5975edcb Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel <ttuegel@mailbox.org> +Date: Mon, 17 Feb 2020 04:45:03 -0600 +Subject: [PATCH 4/4] start_kdeinit-environ-hard-limit + +--- + src/start_kdeinit/start_kdeinit.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src/start_kdeinit/start_kdeinit.c b/src/start_kdeinit/start_kdeinit.c +index f2db3e9..4ff2602 100644 +--- a/src/start_kdeinit/start_kdeinit.c ++++ b/src/start_kdeinit/start_kdeinit.c +@@ -148,7 +148,11 @@ int main(int argc, char **argv) + ++i) { + unsigned len; + if (read(0, &len, sizeof(unsigned)) == sizeof(unsigned) +- && len && len < (1 << 12)) { ++ && len) { ++ if (len >= (1 << 14)) { ++ fprintf(stderr, "%s: exceeded environment length limit", argv[0]); ++ return 1; ++ } + env[ i ] = malloc(len + 1); + if ((unsigned) read(0, env[ i ], len) == len) { + env[ i ][ len ] = '\0'; +-- +2.23.1 + diff --git a/pkgs/development/libraries/kde-frameworks/kinit/default.nix b/pkgs/development/libraries/kde-frameworks/kinit/default.nix index 42a1e157a91..116f475e2f8 100644 --- a/pkgs/development/libraries/kde-frameworks/kinit/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kinit/default.nix @@ -14,7 +14,12 @@ mkDerivation { buildInputs = [ kconfig kcrash ki18n kio kservice kwindowsystem ]; - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); + patches = [ + ./0001-kinit-libpath.patch + ./0002-start_kdeinit-path.patch + ./0003-kdeinit-extra-libs.patch + ./0004-start_kdeinit-environ-hard-limit.patch + ]; CXXFLAGS = [ ''-DNIXPKGS_KF5_KIOCORE=\"${getLib kio}/lib/libKF5KIOCore.so.5\"'' ''-DNIXPKGS_KF5_PARTS=\"${getLib kparts}/lib/libKF5Parts.so.5\"'' diff --git a/pkgs/development/libraries/kde-frameworks/kinit/start_kdeinit-path.patch b/pkgs/development/libraries/kde-frameworks/kinit/start_kdeinit-path.patch deleted file mode 100644 index e3bfc2ebe6b..00000000000 --- a/pkgs/development/libraries/kde-frameworks/kinit/start_kdeinit-path.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: kinit-5.24.0/src/start_kdeinit/start_kdeinit_wrapper.c -=================================================================== ---- kinit-5.24.0.orig/src/start_kdeinit/start_kdeinit_wrapper.c -+++ kinit-5.24.0/src/start_kdeinit/start_kdeinit_wrapper.c -@@ -23,7 +23,7 @@ - #include <string.h> - #include <unistd.h> - --#define EXECUTE CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "/start_kdeinit" -+#define EXECUTE "/run/wrappers/bin/start_kdeinit" - - #if KDEINIT_OOM_PROTECT - diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix index 04b4e409b9b..779ddfeb589 100644 --- a/pkgs/development/libraries/libarchive/default.nix +++ b/pkgs/development/libraries/libarchive/default.nix @@ -10,13 +10,13 @@ assert xarSupport -> libxml2 != null; stdenv.mkDerivation rec { pname = "libarchive"; - version = "3.4.1"; + version = "3.4.2"; src = fetchFromGitHub { owner = "libarchive"; repo = "libarchive"; rev = "v${version}"; - sha256 = "0g0kzfl01zy1aabr5jcrh8480mb16vh3pacdhg6mm2bdv2f5w8z1"; + sha256 = "0mjm77wbqs8sbn9j44lj39nwbg6anmgz6pkyfxsww54a4rs0p3iz"; }; outputs = [ "out" "lib" "dev" ]; diff --git a/pkgs/development/libraries/libfishsound/default.nix b/pkgs/development/libraries/libfishsound/default.nix new file mode 100644 index 00000000000..fae96c8d3f7 --- /dev/null +++ b/pkgs/development/libraries/libfishsound/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, libvorbis, speex, flac, pkgconfig }: + +stdenv.mkDerivation rec { + name = "libfishsound-1.0.0"; + + src = fetchurl { + url = "http://downloads.xiph.org/releases/libfishsound/${name}.tar.gz"; + sha256 = "1iz7mn6hw2wg8ljaw74f4g2zdj68ib88x4vjxxg3gjgc5z75f2rf"; + }; + + propagatedBuildInputs = [ libvorbis speex flac ]; + + nativeBuildInputs = [ pkgconfig ]; + + meta = with stdenv.lib; { + homepage = https://xiph.org/fishsound/; + description = ''libfishsound by itself is designed to handle raw codec streams from a lower level layer such as UDP datagrams. When these codecs are used in files, they are commonly encapsulated in Ogg to produce Ogg FLAC, Speex and Ogg Vorbis files. + +libfishsound is a wrapper around the existing codec libraries and provides a consistent, higher-level programming interface. It has been designed for use in a wide variety of applications; it has no direct dependencies on Ogg encapsulation, though it is most commonly used in conjunction with liboggz to decode or encode FLAC, Speex or Vorbis audio tracks in Ogg files, including Ogg Theora and Annodex. + +FishSound has been developed and tested on GNU/Linux, Darwin/MacOSX and Win32. It probably also works on other Unix-like systems via GNU autoconf. For Win32: nmake Makefiles, Visual Studio .NET 2003 solution files and Visual C++ 6.0 workspace files are all provided in the source distribution.''; + platforms = platforms.unix; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/libraries/libgee/default.nix b/pkgs/development/libraries/libgee/default.nix index b9e1d668cd3..92c9f214ab4 100644 --- a/pkgs/development/libraries/libgee/default.nix +++ b/pkgs/development/libraries/libgee/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libgee"; - version = "0.20.2"; + version = "0.20.3"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0g1mhl7nidg82v4cikkk8dakzc18hg7wv0dsf2pbyijzfm5mq0wy"; + sha256 = "1pm525wm11dhwz24m8bpcln9547lmrigl6cxf3qsbg4cr3pyvdfh"; }; doCheck = true; diff --git a/pkgs/development/libraries/libgnurl/default.nix b/pkgs/development/libraries/libgnurl/default.nix index a1e8ef76394..339146da2b9 100644 --- a/pkgs/development/libraries/libgnurl/default.nix +++ b/pkgs/development/libraries/libgnurl/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A fork of libcurl used by GNUnet"; homepage = "https://gnunet.org/en/gnurl.html"; - maintainers = with maintainers; [ falsifian vrthra ]; + maintainers = with maintainers; [ vrthra ]; platforms = platforms.linux; license = licenses.curl; }; diff --git a/pkgs/development/libraries/libiio/default.nix b/pkgs/development/libraries/libiio/default.nix index 9392061a269..461c6f11164 100644 --- a/pkgs/development/libraries/libiio/default.nix +++ b/pkgs/development/libraries/libiio/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "libiio"; - version = "0.18"; + version = "0.19"; src = fetchFromGitHub { owner = "analogdevicesinc"; repo = "libiio"; rev = "refs/tags/v${version}"; - sha256 = "1cmg3ipam101iy9yncwz2y48idaqaw4fg7i9i4c8vfjisfcycnkk"; + sha256 = "1r67h5mayx9krh3mmzs5vz20mvwb2lw04hpbyyisygl01ndc77kq"; }; outputs = [ "out" "lib" "dev" "python" ]; diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 5cbf7c9145d..4c3fb670484 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -27,11 +27,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { pname = "libinput"; - version = "1.15.0"; + version = "1.15.1"; src = fetchurl { url = "https://www.freedesktop.org/software/libinput/${pname}-${version}.tar.xz"; - sha256 = "1qa3b2fd4pv8ysf0mgwnyhqv9v48zgy3sy0q3a3vxcmwcvpizgxz"; + sha256 = "05hcjlsrc38yn1g1n7kia9m93nc703hx66gf977kw5vgbi4mfbvb"; }; outputs = [ "bin" "out" "dev" ]; diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/pkgs/development/libraries/libmicrohttpd/default.nix index ba4d74e4d48..e3bce805d29 100644 --- a/pkgs/development/libraries/libmicrohttpd/default.nix +++ b/pkgs/development/libraries/libmicrohttpd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libmicrohttpd"; - version = "0.9.69"; + version = "0.9.70"; src = fetchurl { url = "mirror://gnu/libmicrohttpd/${pname}-${version}.tar.gz"; - sha256 = "0zp34zgcahym5kp2r83gfb5wnr8yf643a26k6zk96x3qica6p6zv"; + sha256 = "01vkjy89b1ylmh22dy5yza2r414nfwcfixxh3v29nvzrjv9s7l4h"; }; outputs = [ "out" "dev" "devdoc" "info" ]; diff --git a/pkgs/development/libraries/libsixel/default.nix b/pkgs/development/libraries/libsixel/default.nix index 9973f337398..3c3beb5f1a7 100644 --- a/pkgs/development/libraries/libsixel/default.nix +++ b/pkgs/development/libraries/libsixel/default.nix @@ -1,13 +1,13 @@ {stdenv, fetchFromGitHub}: stdenv.mkDerivation rec { - version = "1.8.4"; + version = "1.8.6"; pname = "libsixel"; src = fetchFromGitHub { repo = "libsixel"; rev = "v${version}"; owner = "saitoha"; - sha256 = "1zckahfl0j7k68jf87iwdc4yx7fkfhxwa7lrf22dnz36d2iq785v"; + sha256 = "1saxdj6sldv01g6w6yk8vr7px4bl31xca3a82j6v1j3fw5rbfphy"; }; configureFlags = [ diff --git a/pkgs/development/libraries/libuninameslist/default.nix b/pkgs/development/libraries/libuninameslist/default.nix new file mode 100644 index 00000000000..5d4cc61fe7a --- /dev/null +++ b/pkgs/development/libraries/libuninameslist/default.nix @@ -0,0 +1,28 @@ +{ stdenv +, fetchFromGitHub +, autoreconfHook +}: + +stdenv.mkDerivation rec { + pname = "libuninameslist"; + version = "20190701"; + + src = fetchFromGitHub { + owner = "fontforge"; + repo = pname; + rev = version; + sha256 = "sha256:034c8clnskvqbwyiq7si4dad1kbngi3jmnrj064i39msqixmpdzb"; + }; + + nativeBuildInputs = [ + autoreconfHook + ]; + + meta = with stdenv.lib; { + homepage = https://github.com/fontforge/libuninameslist/; + description = "A Library of Unicode names and annotation data"; + license = licenses.bsd3; + maintainers = with maintainers; [ erictapen ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/luksmeta/default.nix b/pkgs/development/libraries/luksmeta/default.nix new file mode 100644 index 00000000000..9e01605d2df --- /dev/null +++ b/pkgs/development/libraries/luksmeta/default.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, asciidoc +, cryptsetup +}: + +stdenv.mkDerivation rec { + pname = "luksmeta"; + version = "9"; + + src = fetchFromGitHub { + owner = "latchset"; + repo = pname; + rev = "v${version}"; + sha256 = "10nslwk7m1qwskd12c204ipa3cbad0q6fn0v084z2f7q6xxbkd2d"; + }; + + nativeBuildInputs = [ autoreconfHook pkgconfig asciidoc ]; + buildInputs = [ cryptsetup ]; + + meta = { + description = "Simple library for storing metadata in the LUKSv1 header"; + homepage = "https://github.com/latchset/luksmeta/"; + maintainers = with lib.maintainers; [ fpletz ]; + license = lib.licenses.lgpl21Plus; + }; +} diff --git a/pkgs/development/libraries/mimalloc/default.nix b/pkgs/development/libraries/mimalloc/default.nix index b3f63ec7e9b..03a1e77e7bf 100644 --- a/pkgs/development/libraries/mimalloc/default.nix +++ b/pkgs/development/libraries/mimalloc/default.nix @@ -7,39 +7,42 @@ let in stdenv.mkDerivation rec { pname = "mimalloc"; - version = "1.1.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "microsoft"; repo = pname; - rev = "refs/tags/v${version}"; - sha256 = "1i8pwzpcmbf7dxncb984xrnczn1737xqhf1jaizlyw0k1hpiam4v"; + rev = "v${version}"; + sha256 = "1zql498587wvb0gaavnzxj2zm535sgm22x0sjgl4ncfk7ragnv9c"; }; nativeBuildInputs = [ cmake ninja ]; enableParallelBuilding = true; cmakeFlags = stdenv.lib.optional secureBuild [ "-DMI_SECURE=ON" ]; - postInstall = '' + postInstall = let + rel = stdenv.lib.versions.majorMinor version; + in '' # first, install headers, that's easy mkdir -p $dev mv $out/lib/*/include $dev/include # move .a and .o files into place - mv $out/lib/mimalloc-1.0/libmimalloc*.a $out/lib/libmimalloc.a - mv $out/lib/mimalloc-1.0/mimalloc*.o $out/lib/mimalloc.o + find $out/lib + mv $out/lib/mimalloc-${rel}/libmimalloc*.a $out/lib/libmimalloc.a + mv $out/lib/mimalloc-${rel}/mimalloc*.o $out/lib/mimalloc.o '' + (if secureBuild then '' - mv $out/lib/mimalloc-1.0/libmimalloc-secure${soext}.1.0 $out/lib/libmimalloc-secure${soext}.1.0 - ln -sfv $out/lib/libmimalloc-secure${soext}.1.0 $out/lib/libmimalloc-secure${soext} - ln -sfv $out/lib/libmimalloc-secure${soext}.1.0 $out/lib/libmimalloc${soext} + mv $out/lib/mimalloc-${rel}/libmimalloc-secure${soext}.${rel} $out/lib/libmimalloc-secure${soext}.${rel} + ln -sfv $out/lib/libmimalloc-secure${soext}.${rel} $out/lib/libmimalloc-secure${soext} + ln -sfv $out/lib/libmimalloc-secure${soext}.${rel} $out/lib/libmimalloc${soext} '' else '' - mv $out/lib/mimalloc-1.0/libmimalloc${soext}.1.0 $out/lib/libmimalloc${soext}.1.0 - ln -sfv $out/lib/libmimalloc${soext}.1.0 $out/lib/libmimalloc${soext} + mv $out/lib/mimalloc-${rel}/libmimalloc${soext}.${rel} $out/lib/libmimalloc${soext}.${rel} + ln -sfv $out/lib/libmimalloc${soext}.${rel} $out/lib/libmimalloc${soext} '') + '' # remote duplicate dir. FIXME: try to fix the .cmake file distribution # so we can re-use it for dependencies... - rm -rf $out/lib/mimalloc-1.0 + rm -rf $out/lib/mimalloc-${rel} ''; outputs = [ "out" "dev" ]; @@ -50,5 +53,6 @@ stdenv.mkDerivation rec { license = licenses.bsd2; platforms = platforms.unix; maintainers = with maintainers; [ thoughtpolice ]; + badPlatforms = platforms.darwin; }; } diff --git a/pkgs/development/libraries/mypaint-brushes/1.0.nix b/pkgs/development/libraries/mypaint-brushes/1.0.nix new file mode 100644 index 00000000000..115d818d936 --- /dev/null +++ b/pkgs/development/libraries/mypaint-brushes/1.0.nix @@ -0,0 +1,43 @@ +{ stdenv +, fetchpatch +, autoconf +, automake +, fetchFromGitHub +, pkgconfig +}: + +stdenv.mkDerivation rec { + pname = "mypaint-brushes"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "mypaint"; + repo = pname; + rev = "v${version}"; + sha256 = "1iz89z6v2mp8j1lrf942k561s8311i3s34ap36wh4rybb2lq15m0"; + }; + + patches = [ + # build with automake 1.16 + (fetchpatch { + url = https://github.com/Jehan/mypaint-brushes/commit/1e9109dde3bffd416ed351c3f30ecd6ffd0ca2cd.patch; + sha256 = "0mi8rwbirl0ib22f2hz7kdlgi4hw8s3ab29b003dsshdyzn5iha9"; + }) + ]; + + nativeBuildInputs = [ + autoconf + automake + pkgconfig + ]; + + preConfigure = "./autogen.sh"; + + meta = with stdenv.lib; { + homepage = "http://mypaint.org/"; + description = "Brushes used by MyPaint and other software using libmypaint."; + license = licenses.cc0; + maintainers = with maintainers; [ jtojnar ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/mypaint-brushes/default.nix b/pkgs/development/libraries/mypaint-brushes/default.nix index 115d818d936..20caf6e5775 100644 --- a/pkgs/development/libraries/mypaint-brushes/default.nix +++ b/pkgs/development/libraries/mypaint-brushes/default.nix @@ -1,5 +1,4 @@ { stdenv -, fetchpatch , autoconf , automake , fetchFromGitHub @@ -8,23 +7,15 @@ stdenv.mkDerivation rec { pname = "mypaint-brushes"; - version = "1.3.0"; + version = "2.0.2"; src = fetchFromGitHub { owner = "mypaint"; repo = pname; rev = "v${version}"; - sha256 = "1iz89z6v2mp8j1lrf942k561s8311i3s34ap36wh4rybb2lq15m0"; + sha256 = "0kcqz13vzpy24dhmrx9hbs6s7hqb8y305vciznm15h277sabpmw9"; }; - patches = [ - # build with automake 1.16 - (fetchpatch { - url = https://github.com/Jehan/mypaint-brushes/commit/1e9109dde3bffd416ed351c3f30ecd6ffd0ca2cd.patch; - sha256 = "0mi8rwbirl0ib22f2hz7kdlgi4hw8s3ab29b003dsshdyzn5iha9"; - }) - ]; - nativeBuildInputs = [ autoconf automake diff --git a/pkgs/development/libraries/nco/default.nix b/pkgs/development/libraries/nco/default.nix index 7b03c32ada5..321e4e0560d 100644 --- a/pkgs/development/libraries/nco/default.nix +++ b/pkgs/development/libraries/nco/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip, netcdf, netcdfcxx4, gsl, udunits, antlr, which, curl, flex }: stdenv.mkDerivation rec { - version = "4.9.1"; + version = "4.9.2"; pname = "nco"; nativeBuildInputs = [ flex which ]; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/nco/nco/archive/${version}.tar.gz"; - sha256 = "14r44wi9ina8h8gh5cmkcddxl5ziwv42mv60sp4l5wfmjz5xwa4x"; + sha256 = "0nip9dmdx3d5nc30bz1d2w9his1dph136l53r160aa3bmb29xwqn"; }; meta = { diff --git a/pkgs/development/libraries/ogdf/default.nix b/pkgs/development/libraries/ogdf/default.nix new file mode 100644 index 00000000000..bbef1d8b93d --- /dev/null +++ b/pkgs/development/libraries/ogdf/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchFromGitHub, cmake, doxygen }: + +stdenv.mkDerivation rec { + pname = "ogdf"; + version = "2020.02"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "catalpa-202002"; + sha256 = "0drrs8zh1097i5c60z9g658vs9k1iinkav8crlwk722ihfm1vxqd"; + }; + + nativeBuildInputs = [ cmake doxygen ]; + + cmakeFlags = [ "-DCMAKE_CXX_FLAGS=-fPIC" ]; + + # Without disabling hardening for format, the build fails with + # the following error. + #> /build/source/src/coin/CoinUtils/CoinMessageHandler.cpp:766:35: error: format not a string literal and no format arguments [-Werror=format-security] + #> 766 | sprintf(messageOut_,format_+2); + hardeningDisable = [ "format" ]; + + meta = with stdenv.lib; { + description = "Open Graph Drawing Framework/Open Graph algorithms and Data structure Framework"; + homepage = "http://www.ogdf.net"; + license = licenses.gpl2; + maintainers = [ maintainers.ianwookim ]; + platforms = platforms.i686 ++ platforms.x86_64; + longDescription = '' + OGDF stands both for Open Graph Drawing Framework (the original name) and + Open Graph algorithms and Data structures Framework. + + OGDF is a self-contained C++ library for graph algorithms, in particular + for (but not restricted to) automatic graph drawing. It offers sophisticated + algorithms and data structures to use within your own applications or + scientific projects. + + OGDF is developed and supported by Osnabrück University, TU Dortmund, + University of Cologne, University of Konstanz, and TU Ilmenau. + ''; + }; +} diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 9986c2217f7..63657cfc5e6 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -36,9 +36,7 @@ let outputs = [ "bin" "dev" "out" "man" ] ++ optional withDocs "doc"; setOutputFlags = false; - separateDebugInfo = !(stdenv.hostPlatform.useLLVM or false) - && stdenv.hostPlatform == stdenv.buildPlatform # unable to fix infinite recursion on stdenv.cc - && stdenv.cc.isGNU; + separateDebugInfo = !(stdenv.hostPlatform.useLLVM or false) && stdenv.cc.isGNU; nativeBuildInputs = [ perl ]; buildInputs = stdenv.lib.optional withCryptodev cryptodev; diff --git a/pkgs/development/libraries/physics/geant4/datasets.nix b/pkgs/development/libraries/physics/geant4/datasets.nix index 5e783b0e950..df44fa275f5 100644 --- a/pkgs/development/libraries/physics/geant4/datasets.nix +++ b/pkgs/development/libraries/physics/geant4/datasets.nix @@ -42,8 +42,8 @@ in { name = "G4EMLOW"; - version = "7.9"; - sha256 = "1zrsvk2ahlwss6mgjrma6d2ii49vlzcd5r3ccw94c7m9rnk9mgsa"; + version = "7.9.1"; + sha256 = "1jrw0izw732bywq1k1srs3x2z0m3y2h377kcvwbwcr0wa1p10342"; envvar = "LE"; } diff --git a/pkgs/development/libraries/physics/geant4/default.nix b/pkgs/development/libraries/physics/geant4/default.nix index 97e8cf9c7c4..1897071b125 100644 --- a/pkgs/development/libraries/physics/geant4/default.nix +++ b/pkgs/development/libraries/physics/geant4/default.nix @@ -36,23 +36,14 @@ }: stdenv.mkDerivation rec { - version = "10.6.0"; + version = "10.6.1"; pname = "geant4"; src = fetchurl{ - url = "https://geant4-data.web.cern.ch/geant4-data/releases/geant4.10.06.tar.gz"; - sha256 = "169ikv2sssfbqml7bs146dj035xifxm9b12r4rzmgpvswfhca90l"; + url = "https://geant4-data.web.cern.ch/geant4-data/releases/geant4.10.06.p01.tar.gz"; + sha256 = "0ssxg7dd7vxljb3fdyb0llg7gsxack21qjfsb3n23k107a19yibk"; }; - # This patch fixes crash when set -u is enabled - patches = [ - (fetchpatch { - name = "bash-variable-fix.patch"; - url = "https://bugzilla-geant4.kek.jp/attachment.cgi?id=606&action=diff&collapsed=&headers=1&format=raw"; - sha256 = "1bg9wg174fbqbjsjm1gz9584a7rq9p1szxr2fq9yfvqaf78289k6"; - }) - ]; - cmakeFlags = [ "-DGEANT4_INSTALL_DATA=OFF" "-DGEANT4_USE_GDML=${if enableGDML then "ON" else "OFF"}" diff --git a/pkgs/development/libraries/qt-5/modules/qttools.nix b/pkgs/development/libraries/qt-5/modules/qttools.nix index 573472a8b5a..c38eb0105e1 100644 --- a/pkgs/development/libraries/qt-5/modules/qttools.nix +++ b/pkgs/development/libraries/qt-5/modules/qttools.nix @@ -4,7 +4,7 @@ with lib; qtModule { name = "qttools"; - qtInputs = [ qtbase ]; + qtInputs = [ qtbase qtdeclarative ]; outputs = [ "out" "dev" "bin" ]; # fixQtBuiltinPaths overwrites a builtin path we should keep diff --git a/pkgs/development/libraries/rnnoise/default.nix b/pkgs/development/libraries/rnnoise/default.nix index fe6b75446b2..7a1f69e86c7 100644 --- a/pkgs/development/libraries/rnnoise/default.nix +++ b/pkgs/development/libraries/rnnoise/default.nix @@ -1,21 +1,25 @@ { stdenv, lib, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation (rec { - name = "rnnoise-${version}"; - version = "0.0.1"; + pname = "rnnoise"; + version = "2019-04-24"; src = fetchFromGitHub { owner = "xiph"; repo = "rnnoise"; - rev = "91ef401f4c3536c6de999ac609262691ec888c4c"; - sha256 = "1h2ibg67gfcwnpvkq1rx0sngf9lk9j8pqsmsmmk5hclvrr2lp3yb"; + rev = "9acc1e5a633e0961a5895a73204df24744f199b6"; + sha256 = "17xip4z0skpzas7wrdyi87j46mbz9jncpj554m8654bqpkxis0pr"; }; nativeBuildInputs = [ autoreconfHook ]; + postInstall = '' + install -Dt $out/bin examples/.libs/rnnoise_demo + ''; + meta = with lib; { homepage = https://people.xiph.org/~jm/demo/rnnoise/; - description = "Recurrent neural network for audio noise reduction."; + description = "Recurrent neural network for audio noise reduction"; license = licenses.bsd3; maintainers = [ maintainers.nh2 ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/science/math/ecos/default.nix b/pkgs/development/libraries/science/math/ecos/default.nix index 77973a95449..2ba69a34a4a 100644 --- a/pkgs/development/libraries/science/math/ecos/default.nix +++ b/pkgs/development/libraries/science/math/ecos/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ecos"; - version = "2.0.6"; + version = "2.0.7"; src = fetchFromGitHub { owner = "embotech"; repo = "ecos"; - rev = "v${version}"; - sha256 = "11v958j66wq30gxpjpkgl7n3rvla845lygz8fl39pgf1vk9sdyc7"; + rev = version; + sha256 = "1hsndim5kjvcwk5svqa4igawzahj982180xj1d7yd0dbjlgxc7w7"; }; buildPhase = '' @@ -29,9 +29,10 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A lightweight conic solver for second-order cone programming"; - homepage = https://www.embotech.com/ECOS; + homepage = "https://www.embotech.com/ECOS"; + downloadPage = "https://github.com/embotech/ecos/releases"; license = licenses.gpl3; platforms = platforms.all; - maintainers = [ maintainers.bhipple ]; + maintainers = with maintainers; [ bhipple ]; }; } diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index a26cf38a9d0..9c411234357 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -88,12 +88,12 @@ let in stdenv.mkDerivation rec { pname = "openblas"; - version = "0.3.7"; + version = "0.3.8"; src = fetchFromGitHub { owner = "xianyi"; repo = "OpenBLAS"; rev = "v${version}"; - sha256 = "0vs1dlzyla02wajpkfzz8x3lfpgmwiaaizq2nmdjbkzkb7jnxhhz"; + sha256 = "0s017qqi4n6jzrxl9cyx625wj26smnyn5g8s699s7h8v1srlrw6p"; }; inherit blas64; diff --git a/pkgs/development/libraries/science/math/scalapack/default.nix b/pkgs/development/libraries/science/math/scalapack/default.nix index fda902f320c..a226dd2fc63 100644 --- a/pkgs/development/libraries/science/math/scalapack/default.nix +++ b/pkgs/development/libraries/science/math/scalapack/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "scalapack"; - version = "2.1"; + version = "2.1.0"; src = fetchFromGitHub { owner = "Reference-ScaLAPACK"; repo = pname; rev = "v${version}"; - sha256 = "042q9kc383h7y0had9a37702z4s0szavss063ljvfdsbjy07gzb1"; + sha256 = "1c10d18gj3kvpmyv5q246x35hjxaqn4ygy1cygaydhyxnm4klzdj"; }; nativeBuildInputs = [ cmake openssh ]; diff --git a/pkgs/development/libraries/sundials/default.nix b/pkgs/development/libraries/sundials/default.nix index d19ecf34ab9..fb6f773459e 100644 --- a/pkgs/development/libraries/sundials/default.nix +++ b/pkgs/development/libraries/sundials/default.nix @@ -10,14 +10,14 @@ let openblas32 = openblas.override { blas64 = false; }; in stdenv.mkDerivation rec { pname = "sundials"; - version = "5.0.0"; + version = "5.1.0"; buildInputs = [ python ] ++ stdenv.lib.optionals (lapackSupport) [ gfortran openblas32 ]; nativeBuildInputs = [ cmake ]; src = fetchurl { url = "https://computation.llnl.gov/projects/${pname}/download/${pname}-${version}.tar.gz"; - sha256 = "1lvx5pddjxgyr8kqlira36kxckz7nxwc8xilzfyx0hf607n42l9l"; + sha256 = "08cvzmbr2qc09ayq4f5j07lw97hl06q4dl26vh4kh822mm7x28pv"; }; patches = [ @@ -26,11 +26,6 @@ in stdenv.mkDerivation rec { url = "https://github.com/LLNL/sundials/commit/1350421eab6c5ab479de5eccf6af2dcad1eddf30.patch"; sha256 = "0g67lixp9m85fqpb9rzz1hl1z8ibdg0ldwq5z6flj5zl8a7cw52l"; }) - (fetchurl { - # https://github.com/LLNL/sundials/pull/20 - url = "https://github.com/LLNL/sundials/pull/20/commits/2d951bbe1ff7842fcd0dafa28c61b0aa94015f66.patch"; - sha256 = "0lcr6m4lk14yqrxah4rdscpczny5l7m1zpfsjh8bgspadfsgk512"; - }) ]; cmakeFlags = [ diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix index 60d240552d4..ef88e690067 100644 --- a/pkgs/development/libraries/wayland/default.nix +++ b/pkgs/development/libraries/wayland/default.nix @@ -1,43 +1,66 @@ -{ lib, stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, meson, pkgconfig, ninja , libffi, libxml2, wayland , expat ? null # Build wayland-scanner (currently cannot be disabled as of 1.7.0) +, withDocumentation ? false, graphviz-nox, doxygen, libxslt, xmlto, python3 +, docbook_xsl, docbook_xml_dtd_45, docbook_xml_dtd_42 }: # Require the optional to be enabled until upstream fixes or removes the configure flag assert expat != null; -stdenv.mkDerivation rec { +let + isCross = stdenv.buildPlatform != stdenv.hostPlatform; +in stdenv.mkDerivation rec { pname = "wayland"; - version = "1.17.0"; + version = "1.18.0"; src = fetchurl { url = "https://wayland.freedesktop.org/releases/${pname}-${version}.tar.xz"; - sha256 = "194ibzwpdcn6fvk4xngr4bf5axpciwg2bj82fdvz88kfmjw13akj"; + sha256 = "0k995rn96xkplrapz5k648j651wc43kq817xk1x8280h16gsfxa6"; }; separateDebugInfo = true; - configureFlags = [ - "--disable-documentation" - ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ - "--with-host-scanner" - ]; + mesonFlags = [ "-Ddocumentation=${lib.boolToString withDocumentation}" ]; + + patches = lib.optional isCross ./fix-wayland-cross-compilation.patch; + + postPatch = lib.optionalString withDocumentation '' + patchShebangs doc/doxygen/gen-doxygen.py + '' + lib.optionalString isCross '' + substituteInPlace egl/meson.build --replace \ + "find_program('nm').path()" \ + "find_program('${stdenv.cc.targetPrefix}nm').path()" + ''; nativeBuildInputs = [ - pkgconfig - ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ - # for wayland-scanner during build - wayland + meson pkgconfig ninja + ] ++ lib.optionals isCross [ + wayland # For wayland-scanner during the build + ] ++ lib.optionals withDocumentation [ + (graphviz-nox.override { pango = null; }) # To avoid an infinite recursion + doxygen libxslt xmlto python3 docbook_xml_dtd_45 ]; - buildInputs = [ libffi /* docbook_xsl doxygen graphviz libxslt xmlto */ expat libxml2 ]; + buildInputs = [ libffi expat libxml2 + ] ++ lib.optionals withDocumentation [ + docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_42 + ]; meta = { - description = "Reference implementation of the wayland protocol"; + description = "Core Wayland window system code and protocol"; + longDescription = '' + Wayland is a project to define a protocol for a compositor to talk to its + clients as well as a library implementation of the protocol. + The wayland protocol is essentially only about input handling and buffer + management, but also handles drag and drop, selections, window management + and other interactions that must go through the compositor (but not + rendering). + ''; homepage = https://wayland.freedesktop.org/; - license = lib.licenses.mit; + license = lib.licenses.mit; # Expat version platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ codyopel ]; + maintainers = with lib.maintainers; [ primeos codyopel ]; }; passthru.version = version; diff --git a/pkgs/development/libraries/wayland/fix-wayland-cross-compilation.patch b/pkgs/development/libraries/wayland/fix-wayland-cross-compilation.patch new file mode 100644 index 00000000000..77639acb653 --- /dev/null +++ b/pkgs/development/libraries/wayland/fix-wayland-cross-compilation.patch @@ -0,0 +1,14 @@ +diff --git a/src/meson.build b/src/meson.build +index 3e8c9bf..75241cb 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -55,8 +55,7 @@ pkgconfig.generate( + ) + + if meson.is_cross_build() +- scanner_dep = dependency('wayland-scanner', native: true, version: '>=1.14.0') +- wayland_scanner_for_build = find_program(scanner_dep.get_pkgconfig_variable('wayland_scanner')) ++ wayland_scanner_for_build = find_program('wayland-scanner', native: true, version: '>=1.14.0') + else + wayland_scanner_for_build = wayland_scanner + endif diff --git a/pkgs/development/libraries/wayland/protocols.nix b/pkgs/development/libraries/wayland/protocols.nix index 0b367f4a930..8c2823d74b0 100644 --- a/pkgs/development/libraries/wayland/protocols.nix +++ b/pkgs/development/libraries/wayland/protocols.nix @@ -17,10 +17,17 @@ stdenv.mkDerivation rec { meta = { description = "Wayland protocol extensions"; - homepage = https://wayland.freedesktop.org/; - license = lib.licenses.mit; + longDescription = '' + wayland-protocols contains Wayland protocols that add functionality not + available in the Wayland core protocol. Such protocols either add + completely new functionality, or extend the functionality of some other + protocol either in Wayland core, or some other protocol in + wayland-protocols. + ''; + homepage = https://gitlab.freedesktop.org/wayland/wayland-protocols; + license = lib.licenses.mit; # Expat version platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ ]; + maintainers = with lib.maintainers; [ primeos ]; }; passthru.version = version; diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 58af59c1971..2a4146577ff 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -1326,11 +1326,11 @@ luuid = buildLuarocksPackage { }; luv = buildLuarocksPackage { pname = "luv"; - version = "1.30.0-0"; + version = "1.34.1-1"; src = fetchurl { - url = https://luarocks.org/luv-1.30.0-0.src.rock; - sha256 = "1z5sdq9ld4sm5pws9qxpk9cadv9i7ycwad1zwsa57pj67gly11vi"; + url = https://luarocks.org/luv-1.34.1-1.src.rock; + sha256 = "044cyp25xn35nj5qp1hx04lfkzrpa6adhqjshq2g7wvbga77p1q0"; }; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; diff --git a/pkgs/development/node-packages/node-packages-v10.json b/pkgs/development/node-packages/node-packages-v10.json index d5f7b95ab97..cbae97149d3 100644 --- a/pkgs/development/node-packages/node-packages-v10.json +++ b/pkgs/development/node-packages/node-packages-v10.json @@ -158,6 +158,8 @@ , "web-ext" , "webpack" , "webpack-cli" +, "webpack-dev-server" +, "copy-webpack-plugin" , "webtorrent-cli" , "wring" , "write-good" diff --git a/pkgs/development/node-packages/node-packages-v10.nix b/pkgs/development/node-packages/node-packages-v10.nix index c97f9d7ab49..5497679f4f6 100644 --- a/pkgs/development/node-packages/node-packages-v10.nix +++ b/pkgs/development/node-packages/node-packages-v10.nix @@ -22,31 +22,31 @@ let sha512 = "t4WmWoGV9gyzypwG3y3JlcK2t8fKLtvzBA7xEoFTj9SMPvOuLsf13uh4ikK0RRaaa9RPPWLgFUdOyIRaQvCpwQ=="; }; }; - "@angular-devkit/architect-0.900.1" = { + "@angular-devkit/architect-0.900.2" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.900.1"; + version = "0.900.2"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.900.1.tgz"; - sha512 = "zzB3J0fXFoYeJpgF5tsmZ7byygzjJn1IPiXBdnbNqcMbil1OPOhq+KdD4ZFPyXNwBQ3w02kOwPdNqB++jbPmlQ=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.900.2.tgz"; + sha512 = "uClqp4QEY/m6CB7SsNZGdVNTEgMzkI1Fkt0TOdE9huN1iCi/0+h3nQb+NZ1vBqD2afg9EqDwIPu2KCU0p1BR2A=="; }; }; - "@angular-devkit/core-9.0.1" = { + "@angular-devkit/core-9.0.2" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "9.0.1"; + version = "9.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-9.0.1.tgz"; - sha512 = "HboJI/x+SJD9clSOAMjHRv0eXAGRAdEaqJGmjDfdFMP2wznfsBiC6cgcHC17oM4jRWFhmWMR8Omc7CjLZJawJg=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-9.0.2.tgz"; + sha512 = "lEmfYs7+oHmXEQ3y97QGm73zs7i6chpx+ZSaBUvMM9oCKj/lytcn+diVG+t4hMavH6TK0lai7DO1rAbYkbmdrA=="; }; }; - "@angular-devkit/schematics-9.0.1" = { + "@angular-devkit/schematics-9.0.2" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "9.0.1"; + version = "9.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-9.0.1.tgz"; - sha512 = "Cuub9eJm1TWygKTOowRbxMASA8QWeHWzNEU2V3TqUF1Tqy/iPf4cpuMijkFysXjTn2bi2HA9t26AwQkwymbliA=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-9.0.2.tgz"; + sha512 = "+MiSBWErz8hxcbyHioCQtTnFpbqaoCEQEknK0vCb15fFEY2Hi3u2TXK59QNKsqn8w+Mye5dHYhwmpsAC8Wcgtw=="; }; }; "@antora/asciidoc-loader-2.2.0" = { @@ -157,13 +157,13 @@ let sha512 = "3d6SqtknM3PiLRw2wLtcMVVfmyHtfNuWo8+ZBRmUrZs8HfhGteV8/s4vpiOJZmLYhW4KLFgIgG09lFdD5t78Ow=="; }; }; - "@apollo/federation-0.11.3" = { + "@apollo/federation-0.12.0" = { name = "_at_apollo_slash_federation"; packageName = "@apollo/federation"; - version = "0.11.3"; + version = "0.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/@apollo/federation/-/federation-0.11.3.tgz"; - sha512 = "6KK9noDoWXujIgmp7RHcA9quQTByM8b4saxmujeO4RnZmMQq4bcpN8AJAykulE1x3DuHqeUbLNl3s7gGlEhOWw=="; + url = "https://registry.npmjs.org/@apollo/federation/-/federation-0.12.0.tgz"; + sha512 = "jJb4CzJDLWghkVkhQE5go9XvekQZgL8MsHAGWHzrgHXfUNHZhAjkxODH0duPEq2WunGSp6rSu4rerW1cC89JvA=="; }; }; "@apollo/protobufjs-1.0.3" = { @@ -1111,13 +1111,13 @@ let sha512 = "neAp3zt80trRVBI1x0azq6c57aNBqYZH8KhMm3TaB7wEI5Q4A2SHfBHE8w9gOhI/lrqxtEbXZgQIrHP+wvSGwQ=="; }; }; - "@babel/runtime-corejs2-7.8.4" = { - name = "_at_babel_slash_runtime-corejs2"; - packageName = "@babel/runtime-corejs2"; + "@babel/runtime-corejs3-7.8.4" = { + name = "_at_babel_slash_runtime-corejs3"; + packageName = "@babel/runtime-corejs3"; version = "7.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime-corejs2/-/runtime-corejs2-7.8.4.tgz"; - sha512 = "7jU2FgNqNHX6yTuU/Dr/vH5/O8eVL9U85MG5aDw1LzGfCvvhXC1shdXfVzCQDsoY967yrAKeLujRv7l8BU+dZA=="; + url = "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.8.4.tgz"; + sha512 = "+wpLqy5+fbQhvbllvlJEVRIpYj+COUWnnsm+I4jZlA8Lo7/MJmBhGTCHyk1/RWfOqBRJ2MbadddG6QltTKTlrg=="; }; }; "@babel/template-7.8.3" = { @@ -2137,13 +2137,13 @@ let sha512 = "6+iaCMh/JXJaB2QWikqvGE9//wLEVYYwZd5sud8aLoLKog1Q75naZh2vlGVtg5Mq/NqpqGQvdIjJb3Bm+64AUQ=="; }; }; - "@oclif/config-1.13.3" = { + "@oclif/config-1.14.0" = { name = "_at_oclif_slash_config"; packageName = "@oclif/config"; - version = "1.13.3"; + version = "1.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/config/-/config-1.13.3.tgz"; - sha512 = "qs5XvGRw+1M41abOKCjd0uoeHCgsMxa2MurD2g2K8CtQlzlMXl0rW5idVeimIg5208LLuxkfzQo8TKAhhRCWLg=="; + url = "https://registry.npmjs.org/@oclif/config/-/config-1.14.0.tgz"; + sha512 = "KsOP/mx9lzTah+EtGqLUXN3PDL0J3zb9/dTneFyiUK2K6T7vFEGhV6OasmqTh4uMZHGYTGrNPV8x/Yw6qZNL6A=="; }; }; "@oclif/errors-1.2.2" = { @@ -2479,22 +2479,22 @@ let sha512 = "MI4Xx6LHs4Webyvi6EbspgyAb4D2Q2VtnCQ1blOJcoLS6mVa8lNN2rkIy1CVxfTUpoyIbCTkXES1rLXztFD1lg=="; }; }; - "@schematics/angular-9.0.1" = { + "@schematics/angular-9.0.2" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "9.0.1"; + version = "9.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-9.0.1.tgz"; - sha512 = "lQ8Qc697ef2jvEf1+tElAUsbOnbUAMo3dnOUVw9RlYO90pHeG3/OdWBMH1kjn3jbjuKuvCVZH3voJUUcLDx6eg=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-9.0.2.tgz"; + sha512 = "H6ZyxLYoIN68bbNKnUjBCPtB0fcwnpIyTkqXQHa3B4HITcU3uee4PLAl3xCkTS2NGv8m/0eWND9zt5wryGf8PQ=="; }; }; - "@schematics/update-0.900.1" = { + "@schematics/update-0.900.2" = { name = "_at_schematics_slash_update"; packageName = "@schematics/update"; - version = "0.900.1"; + version = "0.900.2"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/update/-/update-0.900.1.tgz"; - sha512 = "p2xfctTtT5kMAaCTBENxi69m5IhsvdTwwwokb9zVHJYAC6D1K//q1bl30mTe6U2YE3hSPWND2S14ahXw8PyN8g=="; + url = "https://registry.npmjs.org/@schematics/update/-/update-0.900.2.tgz"; + sha512 = "CRDb2pax8DtSyO32b2D5uKlQZ+s5h9feD4oEMvm2zU7z/4wcoTNC0T9ols20aHYeNhKYD9FuMI3KQWlgMTPgbw=="; }; }; "@serverless/cli-1.4.0" = { @@ -2524,13 +2524,13 @@ let sha512 = "PY7gH+7aQ+MltcUD7SRDuQODJ9Sav9HhFJsgOiyf8IVo7XVD6FxZIsSnpMI6paSkptOB7n+0Jz03gNlEkKetQQ=="; }; }; - "@serverless/enterprise-plugin-3.3.0" = { + "@serverless/enterprise-plugin-3.4.0" = { name = "_at_serverless_slash_enterprise-plugin"; packageName = "@serverless/enterprise-plugin"; - version = "3.3.0"; + version = "3.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-3.3.0.tgz"; - sha512 = "hj0lkoi3uJsxVu8V2dkfVZL2HS7GNGW1N5Sa3SRKxnHrGKpErTZGEnIHzPp5dw7H2Q4lE8LD191O4JdTk7GE9A=="; + url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-3.4.0.tgz"; + sha512 = "QaJUQwtej6LsBlmPldPYNHOApjrHrpGvreVcXy2GBqr0hpPFy+o2xmSKek+NDjmpyzHraeHKb5DoKemTWUxsTg=="; }; }; "@serverless/event-mocks-1.1.1" = { @@ -3163,13 +3163,13 @@ let sha512 = "MPtoySlAZQ37VoLaPcTHCu1RWJ4llDkULYZIzOYxlhxBqYPB0RsRlmMU0R6tahtFe27mIdkHV+551ZWV4PLmVw=="; }; }; - "@types/koa-2.11.0" = { + "@types/koa-2.11.1" = { name = "_at_types_slash_koa"; packageName = "@types/koa"; - version = "2.11.0"; + version = "2.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/koa/-/koa-2.11.0.tgz"; - sha512 = "Hgx/1/rVlJvqYBrdeCsS7PDiR2qbxlMt1RnmNWD4Uxi5FF9nwkYqIldo7urjc+dfNpk+2NRGcnAYd4L5xEhCcQ=="; + url = "https://registry.npmjs.org/@types/koa/-/koa-2.11.1.tgz"; + sha512 = "/kqQs+8Qd9GL0cdl39HEhK91k7xq6+Zci76RUdqtTLj1Mg1aVG7zwJm3snkeyFUeAvY8noY27eMXgqg1wHZgwA=="; }; }; "@types/koa-compose-3.2.5" = { @@ -3226,22 +3226,22 @@ let sha1 = "69a23a3ad29caf0097f06eda59b361ee2f0639f6"; }; }; - "@types/node-10.17.14" = { + "@types/node-10.17.15" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "10.17.14"; + version = "10.17.15"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-10.17.14.tgz"; - sha512 = "G0UmX5uKEmW+ZAhmZ6PLTQ5eu/VPaT+d/tdLd5IFsKRPcbe6lPxocBtcYBFSaLaCW8O60AX90e91Nsp8lVHCNw=="; + url = "https://registry.npmjs.org/@types/node/-/node-10.17.15.tgz"; + sha512 = "daFGV9GSs6USfPgxceDA8nlSe48XrVCJfDeYm7eokxq/ye7iuOH87hKXgMtEAVLFapkczbZsx868PMDT1Y0a6A=="; }; }; - "@types/node-13.7.0" = { + "@types/node-13.7.1" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "13.7.0"; + version = "13.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-13.7.0.tgz"; - sha512 = "GnZbirvmqZUzMgkFn70c74OQpTTUcCzlhQliTzYjQMqg+hVKcDnxdL19Ne3UdYzdMA/+W3eb646FWn/ZaT1NfQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-13.7.1.tgz"; + sha512 = "Zq8gcQGmn4txQEJeiXo/KiLpon8TzAl0kmKH4zdWctPj05nWwp1ClMdAVEloqrQKfaC48PNLdgN/aVaLqUrluA=="; }; }; "@types/node-6.14.9" = { @@ -4252,13 +4252,13 @@ let sha512 = "7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA=="; }; }; - "acorn-walk-7.0.0" = { + "acorn-walk-7.1.1" = { name = "acorn-walk"; packageName = "acorn-walk"; - version = "7.0.0"; + version = "7.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.0.0.tgz"; - sha512 = "7Bv1We7ZGuU79zZbb6rRqcpxo3OY+zrdtloZWoyD8fmGX+FeXRjE+iuGkZjSXLVovLzrsvMGMy0EkwA0E0umxg=="; + url = "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.1.1.tgz"; + sha512 = "wdlPY2tm/9XBr7QkKlq0WQVgiuGTX6YWPyRyBviSoScBuLfTVQhvwg6wJ369GJ/1nPfTLMfnrFIfjqVg6d+jQQ=="; }; }; "adbkit-2.11.1" = { @@ -4297,13 +4297,13 @@ let sha1 = "f291be701a2efc567a63fc7aa6afcded31430be1"; }; }; - "addons-linter-1.19.0" = { + "addons-linter-1.20.0" = { name = "addons-linter"; packageName = "addons-linter"; - version = "1.19.0"; + version = "1.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/addons-linter/-/addons-linter-1.19.0.tgz"; - sha512 = "pnfrdQqatZeEnBcRcMq9KWZJRmS9YiPyWu3gZbJl12Ee3dUlvke+2C0DcYhNfm4hciRB4wrr4OiQTYAXh1CyzA=="; + url = "https://registry.npmjs.org/addons-linter/-/addons-linter-1.20.0.tgz"; + sha512 = "EIyJnIkvXhBKgOzVFR873uGa4ny07odIl8i8qWxHAuVJWM/ZQtLouAbndA+cVRDbD66sK6HsO1oWN6WkdCr/uA=="; }; }; "addr-to-ip-port-1.5.1" = { @@ -4423,15 +4423,6 @@ let sha512 = "CW/n1wxF8RpEuuiq6Vbn9S8m0VSYDMnZESqaJ6F2cWN9fY8rei2qaxweIaRgq+ek8TqfoFIsUjaGNKGGEHElSg=="; }; }; - "aggregate-error-1.0.0" = { - name = "aggregate-error"; - packageName = "aggregate-error"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/aggregate-error/-/aggregate-error-1.0.0.tgz"; - sha1 = "888344dad0220a72e3af50906117f48771925fac"; - }; - }; "aggregate-error-3.0.1" = { name = "aggregate-error"; packageName = "aggregate-error"; @@ -4675,6 +4666,15 @@ let sha512 = "LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw=="; }; }; + "ansi-colors-3.2.4" = { + name = "ansi-colors"; + packageName = "ansi-colors"; + version = "3.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz"; + sha512 = "hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA=="; + }; + }; "ansi-colors-4.1.1" = { name = "ansi-colors"; packageName = "ansi-colors"; @@ -4747,6 +4747,15 @@ let sha1 = "2962cf54ec9792c48510a3deb524436861ef7251"; }; }; + "ansi-html-0.0.7" = { + name = "ansi-html"; + packageName = "ansi-html"; + version = "0.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz"; + sha1 = "813584021962a9e9e6fd039f940d12f56ca7859e"; + }; + }; "ansi-red-0.1.1" = { name = "ansi-red"; packageName = "ansi-red"; @@ -4981,13 +4990,13 @@ let sha512 = "sbLEIMQrkV7RkIruqTPXxeCMkAAycv4yzTkBzRgOR1BrR5UB7qZtupqxkersTJSf0HZ3sbaNRrNV80TnnM7cUw=="; }; }; - "apollo-2.22.0" = { + "apollo-2.22.1" = { name = "apollo"; packageName = "apollo"; - version = "2.22.0"; + version = "2.22.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo/-/apollo-2.22.0.tgz"; - sha512 = "9Xmfdx/q0YU1LkcZIV1chAy1iY+bNTsgzamhw71gMg6qto94qnEYBX531Cv+80V+Bx6/f0ZGgofmgPPJx4KCTA=="; + url = "https://registry.npmjs.org/apollo/-/apollo-2.22.1.tgz"; + sha512 = "FONVPKvK0gg+loWCh7KOAAa/HlvbKcR7pdiC3Mtpohe3RWKqKb/QLsBPHjCgz1mjVyVL+05Cv/SjnQ9WHUO6/g=="; }; }; "apollo-cache-1.3.4" = { @@ -5044,13 +5053,13 @@ let sha512 = "sanUIqXWyyDpxY3fYOVU+Hsxwxdj5fmn3Zcy6CcMGnWmh9o7tautQAuod2a63wrDs1jcNQcFq3EKIpeB+2xECw=="; }; }; - "apollo-codegen-core-0.36.0" = { + "apollo-codegen-core-0.36.1" = { name = "apollo-codegen-core"; packageName = "apollo-codegen-core"; - version = "0.36.0"; + version = "0.36.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-core/-/apollo-codegen-core-0.36.0.tgz"; - sha512 = "RorGvym1AFZzrPwLCWznMcyHCfzCWZb7IktC1TyvvgSuKA9whAGLbkLB9tXk7gE3bcmkRmNaWJUWfb+8iZ+rRg=="; + url = "https://registry.npmjs.org/apollo-codegen-core/-/apollo-codegen-core-0.36.1.tgz"; + sha512 = "PSucYRG29+BAnQE8A4KhGqUK0LdFfAiep8az1qNDq6RDfqVhdqzMF32ZpQWuEx7cz4YTRcBs9cg2/ZjXxAgJwA=="; }; }; "apollo-codegen-flow-0.20.0" = { @@ -5062,13 +5071,13 @@ let sha512 = "XgKE19B0Q74PBLVqHP/77NcCFrcvrN9wi3CcotH+FV8BeHTjvpHlilTsQMmd2STPt19cCvY2Qtz0EOeLXTUQ2Q=="; }; }; - "apollo-codegen-flow-0.34.0" = { + "apollo-codegen-flow-0.34.1" = { name = "apollo-codegen-flow"; packageName = "apollo-codegen-flow"; - version = "0.34.0"; + version = "0.34.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-flow/-/apollo-codegen-flow-0.34.0.tgz"; - sha512 = "Vc4i0lV9O0D3vrwWvKkiFWqeUxgl81jAGNGSy2pOhfDut84kS85GbR0fO4eQ8JTLYqh/PquT3Oq6Q5UfSQQE9w=="; + url = "https://registry.npmjs.org/apollo-codegen-flow/-/apollo-codegen-flow-0.34.1.tgz"; + sha512 = "q28f5rY+KwVWNoPyTJHSSJfA+y9JdXFxvzDZNQ7odUKuLZRDJSswYZkBYk/Nq/rkl7RwOJ7qgwEG6AxhPMvH1g=="; }; }; "apollo-codegen-flow-legacy-0.20.0" = { @@ -5089,13 +5098,13 @@ let sha512 = "NbnMOfUXXovlTGRj4mIZGXB9HvidQhwKfAmdYHox5peHPkjjsqEzxGCIuWCSnubWiCF2uHZnQoIkg4sXWf0KLw=="; }; }; - "apollo-codegen-scala-0.35.0" = { + "apollo-codegen-scala-0.35.1" = { name = "apollo-codegen-scala"; packageName = "apollo-codegen-scala"; - version = "0.35.0"; + version = "0.35.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-scala/-/apollo-codegen-scala-0.35.0.tgz"; - sha512 = "QBhaYX+F4B0nESLP+n1GvDZ03EWRo31dfEA2eu+DUx+Nez1kMzbohFOFDaN7h1DADIarPyELQ3CQb5yDrzFMMw=="; + url = "https://registry.npmjs.org/apollo-codegen-scala/-/apollo-codegen-scala-0.35.1.tgz"; + sha512 = "9yywcpwZiclKRXXSFGYuJcQIOTlPyPKSYH/+Rls1Vu5CafPGgkhIJQLtvtc80PJMaK1vmYVvsrDsAO91Tu/frw=="; }; }; "apollo-codegen-swift-0.20.0" = { @@ -5107,13 +5116,13 @@ let sha512 = "L9Y4StbXw0t/nuF+miz0ybSt/io6tsLc063Yeh1A8GCvhFFQyXE/yK0Rf3nO1Bl5Z9UZ5o8Aae9kK4GSWYIGNQ=="; }; }; - "apollo-codegen-swift-0.36.0" = { + "apollo-codegen-swift-0.36.1" = { name = "apollo-codegen-swift"; packageName = "apollo-codegen-swift"; - version = "0.36.0"; + version = "0.36.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-swift/-/apollo-codegen-swift-0.36.0.tgz"; - sha512 = "i6AoxYunQhUeXauZdsY9DunvdGMAd83DwRHxH/XCbwOcjSWTflnSxd8JJzNA6uMOI7lN276k8XpYQMB+xaNKig=="; + url = "https://registry.npmjs.org/apollo-codegen-swift/-/apollo-codegen-swift-0.36.1.tgz"; + sha512 = "no5bq4xiTqeT591bpGTdy3ATfflmmQXc9h6q935lVrak5uqGigd72RPWHNeN/BbnGg6khaL9jBbSs2+VqrOGug=="; }; }; "apollo-codegen-typescript-0.20.0" = { @@ -5125,13 +5134,13 @@ let sha512 = "mzlIJXz+5WPwzeALqRHHR9aPPEf6IlhSrjCawpUHmFU1NK9hgwbguYCEYZv9mKkYBUUgDY+9cGFK1cafJX70AQ=="; }; }; - "apollo-codegen-typescript-0.36.0" = { + "apollo-codegen-typescript-0.36.1" = { name = "apollo-codegen-typescript"; packageName = "apollo-codegen-typescript"; - version = "0.36.0"; + version = "0.36.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-typescript/-/apollo-codegen-typescript-0.36.0.tgz"; - sha512 = "mnhUXrZ1Ynqvav7mWxQHNWg+ShtgRsub7z4NwlURQjI1UfQRtrQKRQzY8Q/3ihTUSTYoD0tHeBv8ZJcVXq0dWw=="; + url = "https://registry.npmjs.org/apollo-codegen-typescript/-/apollo-codegen-typescript-0.36.1.tgz"; + sha512 = "iQ2FGxA9Neb5728eqtvC9J4Ig6heOEMdgVcfsIrUQRTRKiPp7iIKc2DS8ReMX6LMdRhm000ldcquJFQJldFjLg=="; }; }; "apollo-codegen-typescript-legacy-0.20.0" = { @@ -5143,15 +5152,6 @@ let sha512 = "0/h5hce2FIGn6Y4+EHMeMINQxFwcgjw1vU+xV3KGaaEgyEAEQ3/n9pyz43M8mOm/JVgg8Eb4CtM1AtCkRQuFGw=="; }; }; - "apollo-datasource-0.6.4" = { - name = "apollo-datasource"; - packageName = "apollo-datasource"; - version = "0.6.4"; - src = fetchurl { - url = "https://registry.npmjs.org/apollo-datasource/-/apollo-datasource-0.6.4.tgz"; - sha512 = "u4eu6Q94q6KuZacZfdo4vCevA81F4QWeTYEXUvoksQMJpiacPHHe0DJrofKVKvxngUp5kCi1RnPXSc6kBY+/oA=="; - }; - }; "apollo-datasource-0.7.0" = { name = "apollo-datasource"; packageName = "apollo-datasource"; @@ -5161,13 +5161,13 @@ let sha512 = "Yja12BgNQhzuFGG/5Nw2MQe0hkuQy2+9er09HxeEyAf2rUDIPnhPrn1MDoZTB8MU7UGfjwITC+1ofzKkkrZobA=="; }; }; - "apollo-engine-reporting-1.5.0" = { + "apollo-engine-reporting-1.6.0" = { name = "apollo-engine-reporting"; packageName = "apollo-engine-reporting"; - version = "1.5.0"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-engine-reporting/-/apollo-engine-reporting-1.5.0.tgz"; - sha512 = "Pe2DelijZ2QHqkqv8E97iOb32l+FIMT2nxpQsuH+nWi+96cCFJJJHjm3RLAPEUuvGOgW9dFYQP3J91EyC5O0tQ=="; + url = "https://registry.npmjs.org/apollo-engine-reporting/-/apollo-engine-reporting-1.6.0.tgz"; + sha512 = "prA17Tp/WYBJdCd4ey1CnGX8d4Xis1n9PsFmT7x8PV/oNpxG21/x3yNw5kPBZuKAoKz8yEggYtHhkYie1ZBjPQ=="; }; }; "apollo-engine-reporting-protobuf-0.4.4" = { @@ -5188,15 +5188,6 @@ let sha512 = "B9BgpQGR1ndeDtb4Gtor0J4CITQ+OPACZrVW6lgStnljKEe9ZB76DZ1dAd3OCeizAswW6Lo9uvfK8jhVS5nBhQ=="; }; }; - "apollo-graphql-0.3.7" = { - name = "apollo-graphql"; - packageName = "apollo-graphql"; - version = "0.3.7"; - src = fetchurl { - url = "https://registry.npmjs.org/apollo-graphql/-/apollo-graphql-0.3.7.tgz"; - sha512 = "ghW16xx9tRcyL38Pw6G5OidMnYn+CNUGZWmvqQgEO2nRy4T0ONPZZBOvGrIMtJQ70oEykNMKGm0zm6PdHdxd8Q=="; - }; - }; "apollo-graphql-0.4.0" = { name = "apollo-graphql"; packageName = "apollo-graphql"; @@ -5206,13 +5197,13 @@ let sha512 = "abCHcKln1EGbzSItW087EjBI5wnluikyUqEn4VsdeWHCtdENWpHCn/MnM0+jJa1prNasxN7tCukp4nMpJYYVqg=="; }; }; - "apollo-language-server-1.19.0" = { + "apollo-language-server-1.19.1" = { name = "apollo-language-server"; packageName = "apollo-language-server"; - version = "1.19.0"; + version = "1.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-language-server/-/apollo-language-server-1.19.0.tgz"; - sha512 = "BkrfKs0k+Pr3GXnnS1pbuX9qKhFLBRbImFwO1fka2fmeQ8J2uZc8oSHR3TZ7jWEYA7DQsTPNu1SD4GFfE750UA=="; + url = "https://registry.npmjs.org/apollo-language-server/-/apollo-language-server-1.19.1.tgz"; + sha512 = "Xq9DL+7rl1I78hU5TTJG1zxfPWbz08l/XOthI+rCEhzhIFafzOlUjrtJziuYr1AmAAjA9CJLzaaUDC9ixm+Sfw=="; }; }; "apollo-link-1.2.13" = { @@ -5296,13 +5287,13 @@ let sha512 = "L7LHZ3k9Ao5OSf2WStvQhxdsNVplRQi7kCAPfqf9Z3GBEnQ2uaL0EgO0hSmtVHfXTbk5CTRziMT1Pe87bXrFIw=="; }; }; - "apollo-server-core-2.10.0" = { + "apollo-server-core-2.10.1" = { name = "apollo-server-core"; packageName = "apollo-server-core"; - version = "2.10.0"; + version = "2.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.10.0.tgz"; - sha512 = "x/UK6XvU307W8D/pzTclU04JIjRarcbg5mFPe0nVmO4OTc26uQgKi1WlZkcewXsAUnn+nDwKVn2c2G3dHEgXzQ=="; + url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.10.1.tgz"; + sha512 = "BVITSJRMnj+CWFkjt7FMcaoqg/Ni9gfyVE9iu8bUc1IebBfFDcQj652Iolr7dTqyUziN2jbf0wfcybKYJLQHQQ=="; }; }; "apollo-server-env-2.4.3" = { @@ -5323,13 +5314,13 @@ let sha512 = "Y0PKQvkrb2Kd18d1NPlHdSqmlr8TgqJ7JQcNIfhNDgdb45CnqZlxL1abuIRhr8tiw8OhVOcFxz2KyglBi8TKdA=="; }; }; - "apollo-server-express-2.10.0" = { + "apollo-server-express-2.10.1" = { name = "apollo-server-express"; packageName = "apollo-server-express"; - version = "2.10.0"; + version = "2.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.10.0.tgz"; - sha512 = "adDQts4QmkX2ENU7JibV1EwRl3ESnpnpImXIMvg8Cm7kX2wSbzwm8LecQNujwWJtkAPTCEAcnPBDyKwWjTQ6/g=="; + url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.10.1.tgz"; + sha512 = "NkuWGBOCTiju/aDjfvDImm+4yzfrM0dwiRxu9fKwwh2h1oYBUKJNqjQ1mzJRi0ks6Sn1egwl/fQkTBTkWwGx7Q=="; }; }; "apollo-server-plugin-base-0.6.10" = { @@ -6466,13 +6457,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.614.0" = { + "aws-sdk-2.620.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.614.0"; + version = "2.620.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.614.0.tgz"; - sha512 = "o7utaxDMo9ri1VyPKw8Kcmpy5uZOqMeok2cgur70iZ94zsLIRnHKrBv1wMBbyRGuUbfJRq76HGAS9QxdiSqQHw=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.620.0.tgz"; + sha512 = "j+PGKbYwk5OjzbCFbxzRkcJVEvfdn9YFkrU8dJdjleYf9AzUSUpTjMyZsyUPOKxJxdNdA9FYTs43WdtSKHZa0A=="; }; }; "aws-sign2-0.6.0" = { @@ -7870,13 +7861,13 @@ let sha1 = "68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"; }; }; - "boolean-3.0.0" = { + "boolean-3.0.1" = { name = "boolean"; packageName = "boolean"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/boolean/-/boolean-3.0.0.tgz"; - sha512 = "OElxJ1lUSinuoUnkpOgLmxp0DC4ytEhODEL6QJU0NpxE/mI4rUSh8h1P1Wkvfi3xQEBcxXR2gBIPNYNuaFcAbQ=="; + url = "https://registry.npmjs.org/boolean/-/boolean-3.0.1.tgz"; + sha512 = "HRZPIjPcbwAVQvOTxR4YE3o8Xs98NqbbL1iEZDCz7CL8ql0Lt5iOyJFxfnAB0oFs8Oh02F/lLlg30Mexv46LjA=="; }; }; "boom-2.10.1" = { @@ -8221,13 +8212,13 @@ let sha512 = "Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA=="; }; }; - "browserslist-4.8.6" = { + "browserslist-4.8.7" = { name = "browserslist"; packageName = "browserslist"; - version = "4.8.6"; + version = "4.8.7"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.8.6.tgz"; - sha512 = "ZHao85gf0eZ0ESxLfCp73GG9O/VTytYDIkIiZDlURppLTI9wErSM/5yAKEq6rcUdxBLjMELmrYUJGg5sxGKMHg=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.8.7.tgz"; + sha512 = "gFOnZNYBHrEyUML0xr5NJ6edFaaKbTFX9S9kQHlYfCP0Rit/boRIz4G+Avq6/4haEKJXdGGUnoolx+5MWW2BoA=="; }; }; "btoa-lite-1.0.0" = { @@ -8941,13 +8932,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001025" = { + "caniuse-lite-1.0.30001027" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001025"; + version = "1.0.30001027"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001025.tgz"; - sha512 = "SKyFdHYfXUZf5V85+PJgLYyit27q4wgvZuf8QTOk1osbypcROihMBlx9GRar2/pIcKH2r4OehdlBr9x6PXetAQ=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001027.tgz"; + sha512 = "7xvKeErvXZFtUItTHgNtLgS9RJpVnwBlWX8jSo/BO8VsF6deszemZSkJJJA1KOKrXuzZH4WALpAJdq5EyfgMLg=="; }; }; "capture-stack-trace-1.0.1" = { @@ -9427,13 +9418,13 @@ let sha1 = "2f9aebf746f90808ce00607b72ba73b41604c485"; }; }; - "chownr-1.1.3" = { + "chownr-1.1.4" = { name = "chownr"; packageName = "chownr"; - version = "1.1.3"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/chownr/-/chownr-1.1.3.tgz"; - sha512 = "i70fVHhmV3DtTl6nqvZOnIjbY0Pe4kAUjwHj8z0zAdgBtYrJyYwLKCCuRBQ5ppkyL0AkN7HKRnETdmdp1zqNXw=="; + url = "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz"; + sha512 = "jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="; }; }; "chroma-js-2.1.0" = { @@ -9823,6 +9814,15 @@ let sha512 = "bAtZo0u82gCfaAGfSNxUdTI9mNyza7D8w4CVCcaOsy7sgwDzvx6ekr6cuWJqY3UGzgnQ1+4wgENup5eIhgxEYA=="; }; }; + "cli-truncate-2.1.0" = { + name = "cli-truncate"; + packageName = "cli-truncate"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz"; + sha512 = "n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg=="; + }; + }; "cli-ux-4.9.3" = { name = "cli-ux"; packageName = "cli-ux"; @@ -10903,13 +10903,13 @@ let sha512 = "CmquAXFBocrzaSM8mtGPMM/HiWmyIpr4CcJl/rgY2uCObZ/S7cKU0silxslqJejl+t/T9HS8E0PUNQD81JGUEQ=="; }; }; - "configstore-5.0.0" = { + "configstore-5.0.1" = { name = "configstore"; packageName = "configstore"; - version = "5.0.0"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/configstore/-/configstore-5.0.0.tgz"; - sha512 = "eE/hvMs7qw7DlcB5JPRnthmrITuHMmACUJAp89v6PT6iOqzoLS7HRWhBtuHMlhNHo2AhUSA/3Dh1bKNJHcublQ=="; + url = "https://registry.npmjs.org/configstore/-/configstore-5.0.1.tgz"; + sha512 = "aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA=="; }; }; "connect-1.9.2" = { @@ -10948,6 +10948,15 @@ let sha512 = "ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ=="; }; }; + "connect-history-api-fallback-1.6.0" = { + name = "connect-history-api-fallback"; + packageName = "connect-history-api-fallback"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz"; + sha512 = "e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg=="; + }; + }; "connect-multiparty-2.2.0" = { name = "connect-multiparty"; packageName = "connect-multiparty"; @@ -11479,15 +11488,6 @@ let sha512 = "5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg=="; }; }; - "core-js-3.6.0" = { - name = "core-js"; - packageName = "core-js"; - version = "3.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.6.0.tgz"; - sha512 = "AHPTNKzyB+YwgDWoSOCaid9PUSEF6781vsfiK8qUz62zRR448/XgK2NtCbpiUGizbep8Lrpt0Du19PpGGZvw3Q=="; - }; - }; "core-js-3.6.4" = { name = "core-js"; packageName = "core-js"; @@ -11506,6 +11506,15 @@ let sha512 = "zAa3IZPvsJ0slViBQ2z+vgyyTuhd3MFn1rBQjZSKVEgB0UMYhUkCj9jJUVPgGTGqWvsBVmfnruXgTcNyTlEiSA=="; }; }; + "core-js-pure-3.6.4" = { + name = "core-js-pure"; + packageName = "core-js-pure"; + version = "3.6.4"; + src = fetchurl { + url = "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.6.4.tgz"; + sha512 = "epIhRLkXdgv32xIUFaaAry2wdxZYBi6bgM7cB136dzzXXa+dFyRLTZeLUJxnd8ShrmyVXBub63n2NHo2JAt8Cw=="; + }; + }; "core-util-is-1.0.2" = { name = "core-util-is"; packageName = "core-util-is"; @@ -12982,6 +12991,15 @@ let sha512 = "QWfXlM0EkAbqOCbD/6HjdwT19j7WCkMyiRhWilc4H9/5h/RzTF9gv5LYh1+CmDV5d1rki6KAWLtQale0xt20eQ=="; }; }; + "default-gateway-4.2.0" = { + name = "default-gateway"; + packageName = "default-gateway"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/default-gateway/-/default-gateway-4.2.0.tgz"; + sha512 = "h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA=="; + }; + }; "default-resolution-2.0.0" = { name = "default-resolution"; packageName = "default-resolution"; @@ -13108,6 +13126,15 @@ let sha1 = "fcf490a37ece266464d9cc431ab98c5819ced095"; }; }; + "del-4.1.1" = { + name = "del"; + packageName = "del"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/del/-/del-4.1.1.tgz"; + sha512 = "QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ=="; + }; + }; "delay-4.3.0" = { name = "delay"; packageName = "delay"; @@ -13594,13 +13621,13 @@ let sha1 = "57ddacb47324ae5f58d2cc0da886db4ce9eeb718"; }; }; - "dispensary-0.48.1" = { + "dispensary-0.49.0" = { name = "dispensary"; packageName = "dispensary"; - version = "0.48.1"; + version = "0.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/dispensary/-/dispensary-0.48.1.tgz"; - sha512 = "oC9ItJ7YtO/DKsp24T90k7z0NxfkZQkvJ3USTxUoVjBKrfMRz1/kMd+NcFgDG+KrJg14GChiv1sbdFdxeKRUUw=="; + url = "https://registry.npmjs.org/dispensary/-/dispensary-0.49.0.tgz"; + sha512 = "szH0vDORmGWEfwQgIqrhmrMpSGU2yXL3z7oe0NGx4sCbmnJdXXr5SQvRccPNCPrRuRPn2zPIITvwD9Lf+pcOew=="; }; }; "diveSync-0.3.0" = { @@ -13711,31 +13738,31 @@ let sha512 = "cIV8oXkAxpIuN5XgG0TGg07nLDgrj4olkfrdT77OTA3VypscsYHBUg/FjHxW9K3oA+CyH4Th/qtoMgTVpzSobw=="; }; }; - "dockerfile-ast-0.0.16" = { + "dockerfile-ast-0.0.18" = { name = "dockerfile-ast"; packageName = "dockerfile-ast"; - version = "0.0.16"; + version = "0.0.18"; src = fetchurl { - url = "https://registry.npmjs.org/dockerfile-ast/-/dockerfile-ast-0.0.16.tgz"; - sha512 = "+HZToHjjiLPl46TqBrok5dMrg5oCkZFPSROMQjRmvin0zG4FxK0DJXTpV/CUPYY2zpmEvVza55XLwSHFx/xZMw=="; + url = "https://registry.npmjs.org/dockerfile-ast/-/dockerfile-ast-0.0.18.tgz"; + sha512 = "SEp95qCox1KAzf8BBtjHoBDD0a7/eNlZJ6fgDf9RxqeSEDwLuEN9YjdZ/tRlkrYLxXR4i+kqZzS4eDRSqs8VKQ=="; }; }; - "dockerfile-ast-0.0.18" = { + "dockerfile-ast-0.0.20" = { name = "dockerfile-ast"; packageName = "dockerfile-ast"; - version = "0.0.18"; + version = "0.0.20"; src = fetchurl { - url = "https://registry.npmjs.org/dockerfile-ast/-/dockerfile-ast-0.0.18.tgz"; - sha512 = "SEp95qCox1KAzf8BBtjHoBDD0a7/eNlZJ6fgDf9RxqeSEDwLuEN9YjdZ/tRlkrYLxXR4i+kqZzS4eDRSqs8VKQ=="; + url = "https://registry.npmjs.org/dockerfile-ast/-/dockerfile-ast-0.0.20.tgz"; + sha512 = "VGFMBT0Av1Sk4SCjafsv2S/MCVy6+AuhLW+958wS2df86wb90JPl+WJXhTTGHk5DQVwQX0NoQQBzQQP1U7GaWg=="; }; }; - "dockerfile-language-service-0.0.8" = { + "dockerfile-language-service-0.0.9" = { name = "dockerfile-language-service"; packageName = "dockerfile-language-service"; - version = "0.0.8"; + version = "0.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/dockerfile-language-service/-/dockerfile-language-service-0.0.8.tgz"; - sha512 = "peko1rQtZ81e3QK3VLZgkCKkCMnuoSqZxCQuudyEbtYqqAe6jJ4r0bwOnWD9hyH/FMg7jMvI5uLsoo7/dHLNYw=="; + url = "https://registry.npmjs.org/dockerfile-language-service/-/dockerfile-language-service-0.0.9.tgz"; + sha512 = "g+TFMRG/Vv+yKqYJ2EE5KZlmwbPShWhlGhyG6tFEhUlHUt2Cd3wMr35popmc5Y9ra3OPwR3nY9cQFWIt8OP1Kw=="; }; }; "dockerfile-utils-0.0.11" = { @@ -13747,13 +13774,13 @@ let sha512 = "LNdPIgcl58343dF4KNCHvFzUScUhgLI9BRAR+Vln6D1tVBGvv1k5/qHuxWRCAM2uyFbj73QVkKMScXPhY7TqfQ=="; }; }; - "dockerfile-utils-0.0.13" = { + "dockerfile-utils-0.0.14" = { name = "dockerfile-utils"; packageName = "dockerfile-utils"; - version = "0.0.13"; + version = "0.0.14"; src = fetchurl { - url = "https://registry.npmjs.org/dockerfile-utils/-/dockerfile-utils-0.0.13.tgz"; - sha512 = "+MAmhEnQ16B7+3C2UDWpmIS1D8EiKvpl4LDRjrMv94bOusaeRcLagRR0AvgV6NWT+oiRxDMLDyay6yjm6LESsw=="; + url = "https://registry.npmjs.org/dockerfile-utils/-/dockerfile-utils-0.0.14.tgz"; + sha512 = "9S77f18SmnI4hJ1Ndv1h1/gPxm74uV/n9E/2JMp6I9D3cSLrNdBZwq3FpNiXX1TRJQAn+Ufl/5b7YzH63NZ6jA=="; }; }; "doctrine-2.1.0" = { @@ -14341,13 +14368,13 @@ let sha512 = "7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA=="; }; }; - "electron-to-chromium-1.3.346" = { + "electron-to-chromium-1.3.353" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.346"; + version = "1.3.353"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.346.tgz"; - sha512 = "Yy4jF5hJd57BWmGPt0KjaXc25AmWZeQK75kdr4zIzksWVtiT6DwaNtvTb9dt+LkQKwUpvBfCyyPsXXtbY/5GYw=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.353.tgz"; + sha512 = "CkG24biyy9qQTQs8U2vGQaiyWSFDxAXP/UGHBveXZ1TGoWOAw+eYZXryrX0UeIMKnQjcaHx33hzYuydv98kqGQ=="; }; }; "elegant-spinner-1.0.1" = { @@ -15044,6 +15071,15 @@ let sha512 = "VHDcDg9AwFoeQU9ULPCJCw6P95gr9Er65M+bccefEVD/OOb+WMyQIYw58rpm0F+zcfRJNf394I+BMH8JeU97Hw=="; }; }; + "escape-goat-2.1.1" = { + name = "escape-goat"; + packageName = "escape-goat"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/escape-goat/-/escape-goat-2.1.1.tgz"; + sha512 = "8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q=="; + }; + }; "escape-html-1.0.1" = { name = "escape-html"; packageName = "escape-html"; @@ -15197,13 +15233,13 @@ let sha1 = "7d02878c8e9bf7916b88836d5ac122b42f151932"; }; }; - "eslint-plugin-vue-6.1.2" = { + "eslint-plugin-vue-6.2.1" = { name = "eslint-plugin-vue"; packageName = "eslint-plugin-vue"; - version = "6.1.2"; + version = "6.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-6.1.2.tgz"; - sha512 = "M75oAB+2a/LNkLKRbeEaS07EjzjIUaV7/hYoHAfRFeeF8ZMmCbahUn8nQLsLP85mkar24+zDU3QW2iT1JRsACw=="; + url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-6.2.1.tgz"; + sha512 = "MiIDOotoWseIfLIfGeDzF6sDvHkVvGd2JgkvjyHtN3q4RoxdAXrAMuI3SXTOKatljgacKwpNAYShmcKZa4yZzw=="; }; }; "eslint-scope-3.7.1" = { @@ -15368,13 +15404,13 @@ let sha1 = "633acdb40d9bd4db8a1c1d68c06a942959fad2b0"; }; }; - "esquery-1.0.1" = { + "esquery-1.1.0" = { name = "esquery"; packageName = "esquery"; - version = "1.0.1"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/esquery/-/esquery-1.0.1.tgz"; - sha512 = "SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA=="; + url = "https://registry.npmjs.org/esquery/-/esquery-1.1.0.tgz"; + sha512 = "MxYW9xKmROWF672KqjO75sszsA8Mxhw06YFeS5VHlB98KDHbOSurm3ArsjO60Eaf3QmGMCP1yn+0JQkNLo/97Q=="; }; }; "esrecurse-4.2.1" = { @@ -15683,6 +15719,15 @@ let sha1 = "82998ea749501145fd2da7cf8ecbe6420fac02a4"; }; }; + "eventsource-1.0.7" = { + name = "eventsource"; + packageName = "eventsource"; + version = "1.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/eventsource/-/eventsource-1.0.7.tgz"; + sha512 = "4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ=="; + }; + }; "everyauth-0.4.5" = { name = "everyauth"; packageName = "everyauth"; @@ -15719,15 +15764,6 @@ let sha1 = "b09c2a9309bc0ef0501479472db3180f8d4c3edd"; }; }; - "execa-0.10.0" = { - name = "execa"; - packageName = "execa"; - version = "0.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/execa/-/execa-0.10.0.tgz"; - sha512 = "7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw=="; - }; - }; "execa-0.7.0" = { name = "execa"; packageName = "execa"; @@ -16412,6 +16448,15 @@ let sha512 = "CJ0HCB5tL5fYTEA7ToAq5+kTwd++Borf1/bifxd9iT70QcXr4MRrO3Llf8Ifs70q+SJcGHFtnIE/Nw6giCtECA=="; }; }; + "faye-websocket-0.10.0" = { + name = "faye-websocket"; + packageName = "faye-websocket"; + version = "0.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz"; + sha1 = "4e492f8d04dfb6f89003507f6edbf2d501e7c6f4"; + }; + }; "faye-websocket-0.11.3" = { name = "faye-websocket"; packageName = "faye-websocket"; @@ -16511,13 +16556,13 @@ let sha1 = "3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"; }; }; - "figures-3.1.0" = { + "figures-3.2.0" = { name = "figures"; packageName = "figures"; - version = "3.1.0"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/figures/-/figures-3.1.0.tgz"; - sha512 = "ravh8VRXqHuMvZt/d8GblBeqDMkdJMBdv/2KntFH+ra5MXkO7nxNKpzQ3n6QD/2da1kH0aWmNISdvhM7gl2gVg=="; + url = "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz"; + sha512 = "yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg=="; }; }; "file-entry-cache-2.0.0" = { @@ -16898,22 +16943,22 @@ let sha512 = "LNRvR4hr/S8cXXkIY5pTgVP7L3tq6LlYWcg9nWBuW7o1NMxKZo6oOVa/6GIekMGI0Iw7uC+HWimMe9u/VAeKqw=="; }; }; - "fkill-5.3.0" = { + "fkill-6.2.0" = { name = "fkill"; packageName = "fkill"; - version = "5.3.0"; + version = "6.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/fkill/-/fkill-5.3.0.tgz"; - sha512 = "AHe4x/k9xHlSNPRya0FOCd42qa6ggmW4gtdy6mR0R1vdWtNq9zMd8nmMR5LB7fTNOA1f1nOU+uqaQHP7NMWmVA=="; + url = "https://registry.npmjs.org/fkill/-/fkill-6.2.0.tgz"; + sha512 = "VoPpKScAzvZ07jtciOY0bJieJwyd/VVCuo4fn3nBLh4iBagzYED7GLQeFBpMpy7HP5edEKTDo8yxaIrYrwb7hg=="; }; }; - "fkill-6.2.0" = { + "fkill-7.0.0" = { name = "fkill"; packageName = "fkill"; - version = "6.2.0"; + version = "7.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/fkill/-/fkill-6.2.0.tgz"; - sha512 = "VoPpKScAzvZ07jtciOY0bJieJwyd/VVCuo4fn3nBLh4iBagzYED7GLQeFBpMpy7HP5edEKTDo8yxaIrYrwb7hg=="; + url = "https://registry.npmjs.org/fkill/-/fkill-7.0.0.tgz"; + sha512 = "i61SqvPdfCxl1/VQulh9SXrC+4dudCtINzTHbKaEx3Jr0kD9SvxKDeXzej7Saurnj3al/jMJwQnsUc62VrBMHQ=="; }; }; "flagged-respawn-1.0.1" = { @@ -18618,6 +18663,15 @@ let sha1 = "f5a6d70e8395e21c858fb0489d64df02424d506c"; }; }; + "globby-7.1.1" = { + name = "globby"; + packageName = "globby"; + version = "7.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/globby/-/globby-7.1.1.tgz"; + sha1 = "fb2ccff9401f8600945dfada97440cca972b8680"; + }; + }; "globby-8.0.2" = { name = "globby"; packageName = "globby"; @@ -18654,13 +18708,13 @@ let sha1 = "d9c8edde1da79d125a151b79533b978676346ae5"; }; }; - "globule-1.3.0" = { + "globule-1.3.1" = { name = "globule"; packageName = "globule"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/globule/-/globule-1.3.0.tgz"; - sha512 = "YlD4kdMqRCQHrhVdonet4TdRtv1/sZKepvoxNT4Nrhrp5HI8XFfc8kFlGlBn2myBo80aGp8Eft259mbcUJhgSg=="; + url = "https://registry.npmjs.org/globule/-/globule-1.3.1.tgz"; + sha512 = "OVyWOHgw29yosRHCHo7NncwR1hW5ew0W/UrvtwvjefVJeQ26q4/8r8FmPsSF1hJ93IgWkyv16pCTz6WblMzm/g=="; }; }; "glogg-1.0.2" = { @@ -19077,13 +19131,13 @@ let sha512 = "CgXlq3PGpBRj8RMnLSYs46Hvl5q9Up9kwuMAcYlvS4sNgH5j4Ao7hbY+HI62PaYTeIdffiJidLEIeZVCmZCrFA=="; }; }; - "grouped-queue-0.3.3" = { + "grouped-queue-1.0.0" = { name = "grouped-queue"; packageName = "grouped-queue"; - version = "0.3.3"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/grouped-queue/-/grouped-queue-0.3.3.tgz"; - sha1 = "c167d2a5319c5a0e0964ef6a25b7c2df8996c85c"; + url = "https://registry.npmjs.org/grouped-queue/-/grouped-queue-1.0.0.tgz"; + sha512 = "XslfWrAGCYovQjveHODR0hllUrsn3UtvPFTkamHbgVHmkUA6eCIDmw3JDWVLJvuntTvYjwaPGamlyzK4/HAEOA=="; }; }; "growl-1.10.5" = { @@ -19212,6 +19266,15 @@ let sha1 = "e28c4d45d05ecbbed818363ce8f9c5926229ffe5"; }; }; + "handle-thing-2.0.0" = { + name = "handle-thing"; + packageName = "handle-thing"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.0.tgz"; + sha512 = "d4sze1JNC454Wdo2fkuyzCr6aHcbL6PGGuFAz0Li/NcOm1tCHGnWDRmJP85dh9IhQErTc2svWFEX5xHIOo//kQ=="; + }; + }; "handlebars-4.5.3" = { name = "handlebars"; packageName = "handlebars"; @@ -19851,6 +19914,15 @@ let sha512 = "ezZMWtHXm7Eb7Rq4Mwnx2vs79WUx2QmRg3+ZqeGroKzfDO+EprOcgRPYghsOP9JuYBfK18VojmRTGCg8Ma+ktw=="; }; }; + "hpack.js-2.1.6" = { + name = "hpack.js"; + packageName = "hpack.js"; + version = "2.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz"; + sha1 = "87774c0949e513f42e84575b3c45681fade2a0b2"; + }; + }; "hsl-regex-1.0.0" = { name = "hsl-regex"; packageName = "hsl-regex"; @@ -20004,13 +20076,13 @@ let sha512 = "5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w=="; }; }; - "http-cache-semantics-4.0.3" = { + "http-cache-semantics-4.0.4" = { name = "http-cache-semantics"; packageName = "http-cache-semantics"; - version = "4.0.3"; + version = "4.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.0.3.tgz"; - sha512 = "TcIMG3qeVLgDr1TEd2XvHaTnMPwYQUQMIBLy+5pLSDKYFc7UIqj39w8EGzZkaxoLv/l2K8HaI0t5AVA+YYgUew=="; + url = "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.0.4.tgz"; + sha512 = "Z2EICWNJou7Tr9Bd2M2UqDJq3A9F2ePG9w3lIpjoyuSyXFP9QbniJVu3XQYytuw5ebmG7dXSXO9PgAjJG8DDKA=="; }; }; "http-call-5.3.0" = { @@ -20022,6 +20094,15 @@ let sha512 = "ahwimsC23ICE4kPl9xTBjKB4inbRaeLyZeRunC/1Jy/Z6X8tv22MEAjK+KBOMSVLaqXPTTmd8638waVIKLGx2w=="; }; }; + "http-deceiver-1.2.7" = { + name = "http-deceiver"; + packageName = "http-deceiver"; + version = "1.2.7"; + src = fetchurl { + url = "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz"; + sha1 = "fa7168944ab9a519d337cb0bec7284dc3e723d87"; + }; + }; "http-errors-1.6.3" = { name = "http-errors"; packageName = "http-errors"; @@ -20122,6 +20203,15 @@ let sha512 = "uGuJaBWQWDQCJI5ip0d/VTYZW0nRrlLWXA4A7P1jrsa+f77rW2yXz315oBt6zGCF6l8C2tlMxY7ffULCj+5FhA=="; }; }; + "http-proxy-middleware-0.19.1" = { + name = "http-proxy-middleware"; + packageName = "http-proxy-middleware"; + version = "0.19.1"; + src = fetchurl { + url = "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz"; + sha512 = "yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q=="; + }; + }; "http-signature-0.11.0" = { name = "http-signature"; packageName = "http-signature"; @@ -21013,6 +21103,15 @@ let sha1 = "ae9fbf93b984878785d50a8de1b356956058cf5c"; }; }; + "internal-ip-4.3.0" = { + name = "internal-ip"; + packageName = "internal-ip"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/internal-ip/-/internal-ip-4.3.0.tgz"; + sha512 = "S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg=="; + }; + }; "interpret-1.1.0" = { name = "interpret"; packageName = "interpret"; @@ -21958,6 +22057,24 @@ let sha512 = "2Xj8sA0zDrAcaoWfBiNmc6VPWAgKDpim0T3J9Djq7vbm1UjwbUWzeuLu/FwC46g3cBbAn0E5R0xwVtOobM6Xxg=="; }; }; + "is-path-cwd-2.2.0" = { + name = "is-path-cwd"; + packageName = "is-path-cwd"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz"; + sha512 = "w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ=="; + }; + }; + "is-path-in-cwd-2.1.0" = { + name = "is-path-in-cwd"; + packageName = "is-path-in-cwd"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz"; + sha512 = "rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ=="; + }; + }; "is-path-inside-1.0.1" = { name = "is-path-inside"; packageName = "is-path-inside"; @@ -21967,6 +22084,15 @@ let sha1 = "8ef5b7de50437a3fdca6b4e865ef7aa55cb48036"; }; }; + "is-path-inside-2.1.0" = { + name = "is-path-inside"; + packageName = "is-path-inside"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-path-inside/-/is-path-inside-2.1.0.tgz"; + sha512 = "wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg=="; + }; + }; "is-path-inside-3.0.2" = { name = "is-path-inside"; packageName = "is-path-inside"; @@ -22759,13 +22885,13 @@ let sha1 = "d6be2e4c377494e2378b1cae2920a91d1182d8c4"; }; }; - "js-base64-2.5.1" = { + "js-base64-2.5.2" = { name = "js-base64"; packageName = "js-base64"; - version = "2.5.1"; + version = "2.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/js-base64/-/js-base64-2.5.1.tgz"; - sha512 = "M7kLczedRMYX4L8Mdh4MzyAMM9O5osx+4FcOQuTvr3A9F2D9S5JXheN0ewNbrvK2UatkTRhL5ejGmGSjNMiZuw=="; + url = "https://registry.npmjs.org/js-base64/-/js-base64-2.5.2.tgz"; + sha512 = "Vg8czh0Q7sFBSUMWWArX/miJeBWYBPpdU/3M/DKSaekLMqrqVPaedp+5mZhie/r0lgrcaYBfwXatEew6gwgiQQ=="; }; }; "js-beautify-1.10.3" = { @@ -23182,6 +23308,15 @@ let sha1 = "f6efc93c06a04de9aec53053df2559bb19e2038b"; }; }; + "json3-3.3.3" = { + name = "json3"; + packageName = "json3"; + version = "3.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/json3/-/json3-3.3.3.tgz"; + sha512 = "c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA=="; + }; + }; "json5-0.5.1" = { name = "json5"; packageName = "json5"; @@ -23651,6 +23786,15 @@ let sha512 = "U7ioE8AimvRVLfw4LffyOIRhL2xVgmE8T22L6i0BucSnBUyv4w+I7VN/zVZwRKHOI6ZRUcdMdWHQ8KSUvGpEog=="; }; }; + "killable-1.0.1" = { + name = "killable"; + packageName = "killable"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz"; + sha512 = "LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg=="; + }; + }; "kind-of-1.1.0" = { name = "kind-of"; packageName = "kind-of"; @@ -25586,13 +25730,13 @@ let sha512 = "+lZh4OpERDBLqjiwDLpAWNQu6KMjnlXH2ByZwCuSqVPJletw0kTWJf5CgSNAUKn1KUkv3m2cUz/LK8zyEy7wzQ=="; }; }; - "loglevel-1.6.6" = { + "loglevel-1.6.7" = { name = "loglevel"; packageName = "loglevel"; - version = "1.6.6"; + version = "1.6.7"; src = fetchurl { - url = "https://registry.npmjs.org/loglevel/-/loglevel-1.6.6.tgz"; - sha512 = "Sgr5lbboAUBo3eXCSPL4/KoVz3ROKquOjcctxmHIt+vol2DrqTQe3SwkKKuYhEiWB5kYa13YyopJ69deJ1irzQ=="; + url = "https://registry.npmjs.org/loglevel/-/loglevel-1.6.7.tgz"; + sha512 = "cY2eLFrQSAfVPhCgH1s7JI73tMbg9YC3v3+ZHVW67sBS7UxWzNEk/ZBbSfLykBWHp33dqqtOv82gjhKEi81T/A=="; }; }; "loglevel-colored-level-prefix-1.0.0" = { @@ -26054,13 +26198,13 @@ let sha512 = "LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA=="; }; }; - "make-dir-3.0.0" = { + "make-dir-3.0.2" = { name = "make-dir"; packageName = "make-dir"; - version = "3.0.0"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/make-dir/-/make-dir-3.0.0.tgz"; - sha512 = "grNJDhb8b1Jm1qeqW5R/O63wUo4UXo2v2HMic6YT9i/HBlF93S8jkMgH7yugvY9ABDShH4VZMn8I+U8+fCNegw=="; + url = "https://registry.npmjs.org/make-dir/-/make-dir-3.0.2.tgz"; + sha512 = "rYKABKutXa6vXTXhoV18cBE7PaewPXHe/Bdq4v+ZLMhxbWApkFFplT0LcbMW+6BbjnQXzZ/sAvSE/JdguApG5w=="; }; }; "make-error-1.3.5" = { @@ -26576,13 +26720,13 @@ let sha1 = "c04891883c28c83602e1d06b05a11037e359b4c8"; }; }; - "mdn-browser-compat-data-1.0.1" = { + "mdn-browser-compat-data-1.0.3" = { name = "mdn-browser-compat-data"; packageName = "mdn-browser-compat-data"; - version = "1.0.1"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/mdn-browser-compat-data/-/mdn-browser-compat-data-1.0.1.tgz"; - sha512 = "FxRIu4UYu4rRdFs5JFf6del6J+OpbOq2tYfIEK7N/PtEtz6yGVcWcytmh5L5hZxe58kuxUzjgR8+/0TRyRzRqA=="; + url = "https://registry.npmjs.org/mdn-browser-compat-data/-/mdn-browser-compat-data-1.0.3.tgz"; + sha512 = "5n7c20IVrUiuOPSuhbkd5xoJPSzEEGsoMrmrdEtPHIw6gRPzonydcsguAmqGfSBd4d2DRoDQg533sijLUpeJLg=="; }; }; "mdn-data-2.0.4" = { @@ -26792,6 +26936,15 @@ let sha512 = "rYRjVukgBR9sptGI3IfpAjZc4SkupddhAenUhPTGprnqM8Qh863PxfXxXWlfvHpMIAkJCok28Bm7ZlOKB4U+MA=="; }; }; + "memorystore-1.6.2" = { + name = "memorystore"; + packageName = "memorystore"; + version = "1.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/memorystore/-/memorystore-1.6.2.tgz"; + sha512 = "HQM+cZB/kY1+jj57It22FsptJ3nuZRYxnwh3rWZEvDZO1zuzhIrX9uyFcjP9AhFQvM5WS6vZKtn3veohDH4S7w=="; + }; + }; "memorystream-0.3.1" = { name = "memorystream"; packageName = "memorystream"; @@ -26837,13 +26990,13 @@ let sha512 = "CbTqYU17ABaLefO8vCU153ZZlprKYWDljcndKKDCFcYQITzWCXZAVk4QMFZPgvzrnUQ3uItnIE/LoUOwrT15Ig=="; }; }; - "meow-6.0.0" = { + "meow-6.0.1" = { name = "meow"; packageName = "meow"; - version = "6.0.0"; + version = "6.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/meow/-/meow-6.0.0.tgz"; - sha512 = "x4rYsjigPBDAxY+BGuK83YLhUIqui5wYyZoqb6QJCUOs+0fiYq+i/NV4Jt8OgIfObZFxG9iTyvLDu4UTohGTFw=="; + url = "https://registry.npmjs.org/meow/-/meow-6.0.1.tgz"; + sha512 = "kxGTFgT/b7/oSRSQsJ0qsT5IMU+bgZ1eAdSA3kIV7onkW0QWo/hL5RbGlMfvBjHJKPE1LaPX0kdecYFiqYWjUw=="; }; }; "merge-1.2.1" = { @@ -27188,13 +27341,13 @@ let sha512 = "j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ=="; }; }; - "mimic-response-2.0.0" = { + "mimic-response-2.1.0" = { name = "mimic-response"; packageName = "mimic-response"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/mimic-response/-/mimic-response-2.0.0.tgz"; - sha512 = "8ilDoEapqA4uQ3TwS0jakGONKXVJqpy+RpM+3b7pLdOjghCrEiGp9SRkFbUHAmZW9vdnrENWHjaweIoTIJExSQ=="; + url = "https://registry.npmjs.org/mimic-response/-/mimic-response-2.1.0.tgz"; + sha512 = "wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA=="; }; }; "min-document-2.19.0" = { @@ -27836,13 +27989,13 @@ let sha512 = "ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g=="; }; }; - "multicast-dns-7.2.0" = { + "multicast-dns-7.2.1" = { name = "multicast-dns"; packageName = "multicast-dns"; - version = "7.2.0"; + version = "7.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.2.0.tgz"; - sha512 = "Tu2QORGOFANB124NWQ/JTRhMf/ODouVLEuvu5Dz8YWEU55zQgRgFGnBHfIh5PbfNDAuaRl7yLB+pgWhSqVxi2Q=="; + url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.2.1.tgz"; + sha512 = "qJaNecNV4wV5FqZ+aBHOgUcHaJXpEMZhiERmuu7CM0YrCyIsgevVLZJGXeyxMAiofN+jby8oAGr8BpQk6xmptw=="; }; }; "multicast-dns-service-types-1.1.0" = { @@ -28178,13 +28331,13 @@ let sha512 = "Hv9USGyH8EsPy0o8pPWE7x3YRIfuZDgMBirzjU6XLebhiSK2g53JlfqgolD0c39ne6wXAfaBNcIAvYe22Bav+Q=="; }; }; - "nanoguard-1.2.2" = { + "nanoguard-1.3.0" = { name = "nanoguard"; packageName = "nanoguard"; - version = "1.2.2"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/nanoguard/-/nanoguard-1.2.2.tgz"; - sha512 = "IMVIZkHP7Ep01foXurcJR59Hj/0yyApNK3JWpVHq2QVdLgo8wGU/ZsodlpL7jJ/m24+lxT0eyavrLCEuYQK2fg=="; + url = "https://registry.npmjs.org/nanoguard/-/nanoguard-1.3.0.tgz"; + sha512 = "K/ON5wyflyPyZskdeT3m7Y2gJVkm3QLdKykMCquAbK8A2erstyMpZUc3NG8Nz5jKdfatiYndONrlmLF8+pGl+A=="; }; }; "nanoid-2.1.11" = { @@ -28650,6 +28803,15 @@ let sha1 = "ca86d1fe8828169b0120208e3dc8424b9db8342c"; }; }; + "next-tick-1.1.0" = { + name = "next-tick"; + packageName = "next-tick"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz"; + sha512 = "CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ=="; + }; + }; "nextgen-events-1.3.0" = { name = "nextgen-events"; packageName = "nextgen-events"; @@ -28740,13 +28902,13 @@ let sha512 = "iEOqDAOFl6uN5jZGRj39Jdo8qALzf2HPXtpFso8+BMaDylDrUMYMwhFbfYGgxdnMlsRnxYTwv68kaXEpsHIapg=="; }; }; - "node-abi-2.14.0" = { + "node-abi-2.15.0" = { name = "node-abi"; packageName = "node-abi"; - version = "2.14.0"; + version = "2.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-abi/-/node-abi-2.14.0.tgz"; - sha512 = "y54KGgEOHnRHlGQi7E5UiryRkH8bmksmQLj/9iLAjoje743YS+KaKB/sDYXgqtT0J16JT3c3AYJZNI98aU/kYg=="; + url = "https://registry.npmjs.org/node-abi/-/node-abi-2.15.0.tgz"; + sha512 = "FeLpTS0F39U7hHZU1srAK4Vx+5AHNVOTP+hxBNQknR/54laTHSFIJkDWDqiquY1LeLUgTfPN7sLPhMubx0PLAg=="; }; }; "node-addon-api-1.7.1" = { @@ -28903,6 +29065,15 @@ let sha512 = "sol30LUpz1jQFBjOKwbjxijiE3b6pjd74YwfD0fJOKPjF+fONKb2Yg8rYgS6+bK6VDl+/wfr4IYpC7jDzLUIfw=="; }; }; + "node-forge-0.9.0" = { + name = "node-forge"; + packageName = "node-forge"; + version = "0.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-forge/-/node-forge-0.9.0.tgz"; + sha512 = "7ASaDa3pD+lJ3WvXFsxekJQelBKRpne+GOVbLbtHYdd7pFspyeuJHnWfLplGf3SwKGbfs/aYl5V/JCIaHVUKKQ=="; + }; + }; "node-gyp-3.8.0" = { name = "node-gyp"; packageName = "node-gyp"; @@ -29074,13 +29245,13 @@ let sha512 = "wEiT7bSeU9oVHPK7S+mHb3cR6cIf9l205wTiHzhnUAuoDJS+IdwQkkpFgKTYmkL4Py2LvqCU90h85YpQul7QFQ=="; }; }; - "node-releases-1.1.48" = { + "node-releases-1.1.49" = { name = "node-releases"; packageName = "node-releases"; - version = "1.1.48"; + version = "1.1.49"; src = fetchurl { - url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.48.tgz"; - sha512 = "Hr8BbmUl1ujAST0K0snItzEA5zkJTQup8VNTKNfT6Zw8vTJkIiagUPNfxHmgDOyfFYNfKAul40sD0UEYTvwebw=="; + url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.49.tgz"; + sha512 = "xH8t0LS0disN0mtRCh+eByxFPie+msJUBL/lJDBuap53QGiYPa9joh83K4pCZgWJ+2L4b9h88vCVdXQ60NO2bg=="; }; }; "node-request-by-swagger-1.1.4" = { @@ -29452,13 +29623,13 @@ let sha512 = "5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A=="; }; }; - "npm-packlist-2.0.3" = { + "npm-packlist-2.1.0" = { name = "npm-packlist"; packageName = "npm-packlist"; - version = "2.0.3"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-2.0.3.tgz"; - sha512 = "geT5P1y+58INE/jlxBHNsucRX7jpZAgW+XkxAe1NWN7N9SNwpueWTUPRoVdJH+hFpqcdAChRUE/HWsXQI+8JaQ=="; + url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-2.1.0.tgz"; + sha512 = "XXqrT4WXVc8M1cdL7LCOUflEdyvCu9lKmM5j5mFwXAK8hUMRxzClNml8ox2d8YIDhS7p51AP6zYWNsgNiWuSLQ=="; }; }; "npm-path-2.0.4" = { @@ -29524,22 +29695,22 @@ let sha512 = "Qs6P6nnopig+Y8gbzpeN/dkt+n7IyVd8f45NTMotGk6Qo7GfBmzwYx6jRLoOOgKiMnaQfYxsuyQlD8Mc3guBhg=="; }; }; - "npm-registry-fetch-4.0.2" = { + "npm-registry-fetch-4.0.3" = { name = "npm-registry-fetch"; packageName = "npm-registry-fetch"; - version = "4.0.2"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-4.0.2.tgz"; - sha512 = "Z0IFtPEozNdeZRPh3aHHxdG+ZRpzcbQaJLthsm3VhNf6DScicTFRHZzK82u8RsJUsUHkX+QH/zcB/5pmd20H4A=="; + url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-4.0.3.tgz"; + sha512 = "WGvUx0lkKFhu9MbiGFuT9nG2NpfQ+4dCJwRwwtK2HK5izJEvwDxMeUyqbuMS7N/OkpVCqDorV6rO5E4V9F8lJw=="; }; }; - "npm-registry-fetch-6.0.0" = { + "npm-registry-fetch-6.0.2" = { name = "npm-registry-fetch"; packageName = "npm-registry-fetch"; - version = "6.0.0"; + version = "6.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-6.0.0.tgz"; - sha512 = "TSzEzudrky0ArPskchM/7F5SrawBY5acMNtRqFuacEI2lCKEyfBjaENuuIU5Uq2CyHfJ+gWp5QlCprolKa5wKg=="; + url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-6.0.2.tgz"; + sha512 = "fffWUYR6J5u11URMuCSOsrr35YO3lNa41ckzIj1XPaznsRTFemIcLCU59A347xQcliUFSB2CJJeQVy5OiIVBcg=="; }; }; "npm-run-4.1.2" = { @@ -29650,13 +29821,13 @@ let sha512 = "WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg=="; }; }; - "num-sort-1.0.0" = { + "num-sort-2.0.0" = { name = "num-sort"; packageName = "num-sort"; - version = "1.0.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/num-sort/-/num-sort-1.0.0.tgz"; - sha1 = "cabec1fd5f4da4aca995af90b7a0f379944e1dbd"; + url = "https://registry.npmjs.org/num-sort/-/num-sort-2.0.0.tgz"; + sha512 = "tqzBd1/b4CPp94zlhOmWDEZ9kUue6Kmg6CpRp7RKJPZQKjNve8Ui3DkqOeZCIlmGrAzJDpdZP9ZEANC4EqYPsw=="; }; }; "number-is-nan-1.0.1" = { @@ -29993,6 +30164,15 @@ let sha1 = "304e97c85adda70ecd7f08da450678ef90f0b707"; }; }; + "obuf-1.1.2" = { + name = "obuf"; + packageName = "obuf"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz"; + sha512 = "PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg=="; + }; + }; "obv-0.0.1" = { name = "obv"; packageName = "obv"; @@ -30461,6 +30641,15 @@ let sha1 = "77c0cb37c41525d64166d990ffad7ec6a0e1363e"; }; }; + "original-1.0.2" = { + name = "original"; + packageName = "original"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/original/-/original-1.0.2.tgz"; + sha512 = "hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg=="; + }; + }; "os-browserify-0.3.0" = { name = "os-browserify"; packageName = "os-browserify"; @@ -30785,13 +30974,13 @@ let sha512 = "3cRXXn3/O0o3+eVmUroJPSj/esxoEFIm0ZOno/T+NzG/VZgPOqQ8WKmlNqubSEpZmCIngEy34unkHGg83ZIBmg=="; }; }; - "p-queue-6.2.1" = { + "p-queue-6.3.0" = { name = "p-queue"; packageName = "p-queue"; - version = "6.2.1"; + version = "6.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/p-queue/-/p-queue-6.2.1.tgz"; - sha512 = "wV8yC/rkuWpgu9LGKJIb48OynYSrE6lVl2Bx6r8WjbyVKrFAzzQ/QevAvwnDjlD+mLt8xy0LTDOU1freOvMTCg=="; + url = "https://registry.npmjs.org/p-queue/-/p-queue-6.3.0.tgz"; + sha512 = "fg5dJlFpd5+3CgG3/0ogpVZUeJbjiyXFg0nu53hrOYsybqSiDyxyOpad0Rm6tAiGjgztAwkyvhlYHC53OiAJOA=="; }; }; "p-reduce-1.0.0" = { @@ -30803,6 +30992,15 @@ let sha1 = "18c2b0dd936a4690a529f8231f58a0fdb6a47dfa"; }; }; + "p-retry-3.0.1" = { + name = "p-retry"; + packageName = "p-retry"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/p-retry/-/p-retry-3.0.1.tgz"; + sha512 = "XE6G4+YTTkT2a0UWb2kjZe8xNwf8bIbnqpc/IS/idOBVhyves0mK5OJgeocjx7q5pvX/6m23xuzVPYT1uGM73w=="; + }; + }; "p-some-4.1.0" = { name = "p-some"; packageName = "p-some"; @@ -31955,13 +32153,13 @@ let sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa"; }; }; - "pino-5.14.0" = { + "pino-5.15.0" = { name = "pino"; packageName = "pino"; - version = "5.14.0"; + version = "5.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/pino/-/pino-5.14.0.tgz"; - sha512 = "Vj1f2wAojTGesogT0hsA/ua8ALltCOBCcA1nkEoDfnTsVWpgBu5UVSY7OdjiGmrMOKHBm24nd3nKXzyPUYJ3ig=="; + url = "https://registry.npmjs.org/pino/-/pino-5.15.0.tgz"; + sha512 = "7+FXMTA3H3sNP5+2miY2K9JKnAAW5GKuhHfNWsukFCsPprGQY3ctqpwbV74wAHW3Nl93cEEQ1G82MgOLM8P7TQ=="; }; }; "pino-std-serializers-2.4.2" = { @@ -32253,15 +32451,6 @@ let sha512 = "soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag=="; }; }; - "postcss-7.0.24" = { - name = "postcss"; - packageName = "postcss"; - version = "7.0.24"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-7.0.24.tgz"; - sha512 = "Xl0XvdNWg+CblAXzNvbSOUvgJXwSjmbAKORqyw9V2AlHrm1js2gFw9y3jibBAhpKZi8b5JzJCVh/FyzPsTtgTA=="; - }; - }; "postcss-7.0.26" = { name = "postcss"; packageName = "postcss"; @@ -32532,13 +32721,13 @@ let sha512 = "EEVig1Q2QJ4ELpJXMZR8Vt5DQx8/mo+dGWSR7vWXqcob2gQLyQGsionYcGKATXvQzMPn6DSN1vTN7yFximdIAg=="; }; }; - "postcss-selector-parser-3.1.1" = { + "postcss-selector-parser-3.1.2" = { name = "postcss-selector-parser"; packageName = "postcss-selector-parser"; - version = "3.1.1"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.1.tgz"; - sha1 = "4f875f4afb0c96573d5cf4d74011aee250a7e865"; + url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz"; + sha512 = "h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA=="; }; }; "postcss-selector-parser-5.0.0" = { @@ -32892,6 +33081,15 @@ let sha512 = "X11vso1oNLtyDa2j8fsMol2fph1+5PoQ4vpEc1it/rM8eLuRTmrmTg4jfn82WhNur241AYitgjKCgmlgMRZesw=="; }; }; + "process-exists-4.0.0" = { + name = "process-exists"; + packageName = "process-exists"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/process-exists/-/process-exists-4.0.0.tgz"; + sha512 = "BnlcYPiZjSW+fye12g9B7UeCzMAOdMkxuTz3zcytJ2BHwYZf2RoKvuuwUcJLeXlGj58x9YQrvhT21PmKhUc4UQ=="; + }; + }; "process-nextick-args-1.0.7" = { name = "process-nextick-args"; packageName = "process-nextick-args"; @@ -33036,13 +33234,13 @@ let sha1 = "8e57123c396ab988897fb327fd3aedc3e735e4fe"; }; }; - "prompts-2.3.0" = { + "prompts-2.3.1" = { name = "prompts"; packageName = "prompts"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/prompts/-/prompts-2.3.0.tgz"; - sha512 = "NfbbPPg/74fT7wk2XYQ7hAIp9zJyZp5Fu19iRbORqqy1BhtrkZ0fPafBU+7bmn8ie69DpT0R6QpJIN2oisYjJg=="; + url = "https://registry.npmjs.org/prompts/-/prompts-2.3.1.tgz"; + sha512 = "qIP2lQyCwYbdzcqHIUi2HAxiWixhoM9OdLCWf8txXsapC/X9YdsCoeyRIXE/GP+Q0J37Q7+XN/MFqbUa7IzXNA=="; }; }; "promzard-0.3.0" = { @@ -33243,13 +33441,22 @@ let sha512 = "DSpMj8PI5W7v2G4+rE+BymTKZPjlu6t/M1N6rPAa6Hwn+/e8jDmFJaq8/kpoGCvwd75g2h5DbjF2MduOMNyrsQ=="; }; }; - "ps-list-5.0.1" = { + "ps-list-6.3.0" = { name = "ps-list"; packageName = "ps-list"; - version = "5.0.1"; + version = "6.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/ps-list/-/ps-list-5.0.1.tgz"; - sha512 = "HfafYofNB+Ud+/xdptoYPCkDQ6u1jo9bpgbcyiPtBQ2z+mr1Bb3zGeeXQ30ymBUq3aEJrKLnnvpSZU7WKEiihA=="; + url = "https://registry.npmjs.org/ps-list/-/ps-list-6.3.0.tgz"; + sha512 = "qau0czUSB0fzSlBOQt0bo+I2v6R+xiQdj78e1BR/Qjfl5OHWJ/urXi8+ilw1eHe+5hSeDI1wrwVTgDp2wst4oA=="; + }; + }; + "ps-list-7.0.0" = { + name = "ps-list"; + packageName = "ps-list"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ps-list/-/ps-list-7.0.0.tgz"; + sha512 = "ZDhdxqb+kE895BAvqIdGnWwfvB43h7KHMIcJC0hw7xLbbiJoprS+bqZxuGZ0jWdDxZEvB3jpnfgJyOn3lmsH+Q=="; }; }; "ps-tree-0.0.3" = { @@ -33981,6 +34188,15 @@ let sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; }; }; + "pupa-2.0.1" = { + name = "pupa"; + packageName = "pupa"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pupa/-/pupa-2.0.1.tgz"; + sha512 = "hEJH0s8PXLY/cdXh66tNEQGndDrIKNqNC5xmrysZy3i5C3oEoLna7YAOad+7u125+zH1HNXUmGEkrhb3c2VriA=="; + }; + }; "purgecss-1.4.2" = { name = "purgecss"; packageName = "purgecss"; @@ -34791,13 +35007,13 @@ let sha512 = "Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw=="; }; }; - "readable-stream-3.5.0" = { + "readable-stream-3.6.0" = { name = "readable-stream"; packageName = "readable-stream"; - version = "3.5.0"; + version = "3.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.5.0.tgz"; - sha512 = "gSz026xs2LfxBPudDuI41V1lka8cxg64E66SGe78zJlsUofOg/yqwezdIcdfwik6B4h8LFmWPA9ef9X3FiNFLA=="; + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz"; + sha512 = "BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA=="; }; }; "readdir-scoped-modules-1.1.0" = { @@ -35178,13 +35394,13 @@ let sha1 = "7ee8f84dc6fa792d3fd0ae228d24bd949ead205c"; }; }; - "regjsparser-0.6.2" = { + "regjsparser-0.6.3" = { name = "regjsparser"; packageName = "regjsparser"; - version = "0.6.2"; + version = "0.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.2.tgz"; - sha512 = "E9ghzUtoLwDekPT0DYCp+c4h+bvuUpe6rRHCTYn6eGoqj1LgKXxT6I0Il4WbjhQkOghzi/V+y03bPKvbllL93Q=="; + url = "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.3.tgz"; + sha512 = "8uZvYbnfAtEm9Ab8NTb3hdLwL4g/LQzEYP7Xs27T96abJCCE2d6r3cPZPQEsLKy0vRSGVNG+/zVGtLr86HQduA=="; }; }; "rehype-sort-attribute-values-2.0.1" = { @@ -35466,6 +35682,15 @@ let sha512 = "NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg=="; }; }; + "request-2.88.2" = { + name = "request"; + packageName = "request"; + version = "2.88.2"; + src = fetchurl { + url = "https://registry.npmjs.org/request/-/request-2.88.2.tgz"; + sha512 = "MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw=="; + }; + }; "request-2.9.203" = { name = "request"; packageName = "request"; @@ -36636,6 +36861,24 @@ let sha1 = "0e7350acdec80b1108528786ec1d4418d11b396d"; }; }; + "select-hose-2.0.0" = { + name = "select-hose"; + packageName = "select-hose"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz"; + sha1 = "625d8658f865af43ec962bfc376a37359a4994ca"; + }; + }; + "selfsigned-1.10.7" = { + name = "selfsigned"; + packageName = "selfsigned"; + version = "1.10.7"; + src = fetchurl { + url = "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.7.tgz"; + sha512 = "8M3wBCzeWIJnQfl43IKwOmC4H/RAp50S8DF60znzjW5GVqTcSe2vWclt7hmYVPkKPlHWOu5EaWOMZ2Y6W8ZXTA=="; + }; + }; "semaphore-async-await-1.5.1" = { name = "semaphore-async-await"; packageName = "semaphore-async-await"; @@ -36789,13 +37032,13 @@ let sha512 = "WfuG+fl6eh3eZ2qAf6goB7nhiCd7NPXhmyFxigB/TOkQyeLP8w8GsVehvtGNtnNmyboz4TgeK40B1Kbql/8c5A=="; }; }; - "semver-7.1.2" = { + "semver-7.1.3" = { name = "semver"; packageName = "semver"; - version = "7.1.2"; + version = "7.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-7.1.2.tgz"; - sha512 = "BJs9T/H8sEVHbeigqzIEo57Iu/3DG6c4QoqTfbQB3BPA4zgzAomh/Fk9E7QtjWQ8mx2dgA9YCfSF4y9k9bHNpQ=="; + url = "https://registry.npmjs.org/semver/-/semver-7.1.3.tgz"; + sha512 = "ekM0zfiA9SCBlsKa2X1hxyxiI4L3B6EbVJkkdgQXnSEEaHlGdvyodMruTiulSRWMMB4NeIuYNMC9rTKTz97GxA=="; }; }; "semver-compare-1.0.0" = { @@ -37122,13 +37365,13 @@ let sha512 = "JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="; }; }; - "seventh-0.7.30" = { + "seventh-0.7.34" = { name = "seventh"; packageName = "seventh"; - version = "0.7.30"; + version = "0.7.34"; src = fetchurl { - url = "https://registry.npmjs.org/seventh/-/seventh-0.7.30.tgz"; - sha512 = "GDX4eZEZXQFqURkUA802R3GkawzGA8zm2QS9AfFqPcJKakoytxhI0soTRfhEqNhqh0RrRFO/EraffrAULaxiQQ=="; + url = "https://registry.npmjs.org/seventh/-/seventh-0.7.34.tgz"; + sha512 = "9YR6YjZIckltwsfomtsUuyHEGSx7gNHdXDX+hPmvVeHJLiGpFnLRm3izKWCVjb70cYZYUfdlA9osUEqtH/J6uQ=="; }; }; "sha.js-2.4.11" = { @@ -37329,13 +37572,13 @@ let sha1 = "3ff21f198cad2175f9f3b781853fd94d0d19b590"; }; }; - "sign-addon-2.0.4" = { + "sign-addon-2.0.5" = { name = "sign-addon"; packageName = "sign-addon"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/sign-addon/-/sign-addon-2.0.4.tgz"; - sha512 = "QKfE558nIQ2o9VACAIMQBI4I+IhlL+k9bxhVsQUb4B6Bu+tC8IDSlnHrydcYPf3AB6K+g+BVzbDD1JlSw4bRDg=="; + url = "https://registry.npmjs.org/sign-addon/-/sign-addon-2.0.5.tgz"; + sha512 = "dVjIWe1VJ2VQCdScREWXWECmJhgjpJMqwPKkW+L78PPx2Jyr/t+//kNHqG1hYrmIsvQN7vGjAjv9s7ix0vw0zA=="; }; }; "signal-exit-3.0.2" = { @@ -37797,13 +38040,13 @@ let sha512 = "A+CCyBSa4IKok5uEhqT+hV/35RO6APFNLqk9DRRHg7xW2/j//nPX8wTSZUPF8QeRNEk/sX+6df7M1y6PBHGSHA=="; }; }; - "snyk-mvn-plugin-2.8.0" = { + "snyk-mvn-plugin-2.9.0" = { name = "snyk-mvn-plugin"; packageName = "snyk-mvn-plugin"; - version = "2.8.0"; + version = "2.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-2.8.0.tgz"; - sha512 = "Jt6lsVOFOYj7rp0H2IWz/BZS9xxaO0jEFTAoafLCocJIWWuGhPpVocCqmh/hrYAdKY9gS4gVOViMJ3EvcC1r1Q=="; + url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-2.9.0.tgz"; + sha512 = "FBl78wCHNm0P/QOlipvOxzN2LrXlS6NBN0zXWYZ09P0hG65rmA3gKTg0QsHUjIBh1Pg9bw5aG4r/AHle6a6g6w=="; }; }; "snyk-nodejs-lockfile-parser-1.17.0" = { @@ -38040,6 +38283,24 @@ let sha512 = "/G/VOI+3DBp0+DJKW4KesGnQkQPFmUCbA/oO2QGT6CWxU7hLGWqU3tyuzeSK/dqcyeHsQg1vTe9jiZI8GU9SCQ=="; }; }; + "sockjs-0.3.19" = { + name = "sockjs"; + packageName = "sockjs"; + version = "0.3.19"; + src = fetchurl { + url = "https://registry.npmjs.org/sockjs/-/sockjs-0.3.19.tgz"; + sha512 = "V48klKZl8T6MzatbLlzzRNhMepEys9Y4oGFpypBFFn1gLI/QQ9HtLLyWJNbPlwGLelOVOEijUbTTJeLLI59jLw=="; + }; + }; + "sockjs-client-1.4.0" = { + name = "sockjs-client"; + packageName = "sockjs-client"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.4.0.tgz"; + sha512 = "5zaLyO8/nri5cua0VtOrFXBPK1jbL4+1cebT/mmKA1E1ZXOvJrII75bPu0l0k843G/+iAbhEqzyKr0w/eCCj7g=="; + }; + }; "socks-2.3.3" = { name = "socks"; packageName = "socks"; @@ -38463,6 +38724,24 @@ let sha1 = "70eff23cde4e97d52a445f65afddcc5695eb5edb"; }; }; + "spdy-4.0.1" = { + name = "spdy"; + packageName = "spdy"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/spdy/-/spdy-4.0.1.tgz"; + sha512 = "HeZS3PBdMA+sZSu0qwpCxl3DeALD5ASx8pAX0jZdKXSpPWbQ6SYGnlg3BBmYLx5LtiZrmkAZfErCm2oECBcioA=="; + }; + }; + "spdy-transport-3.0.0" = { + name = "spdy-transport"; + packageName = "spdy-transport"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz"; + sha512 = "hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw=="; + }; + }; "speedometer-0.1.4" = { name = "speedometer"; packageName = "speedometer"; @@ -38670,13 +38949,13 @@ let sha512 = "qe3qpvchJ+gnH8M/ge4rpL+7eRbSmsEAzNwHkDdrW06OBcziQ6/KuAdmcR6joxCbNeoAXAZF+inkefgE16okXA=="; }; }; - "ssb-client-4.8.0" = { + "ssb-client-4.9.0" = { name = "ssb-client"; packageName = "ssb-client"; - version = "4.8.0"; + version = "4.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-client/-/ssb-client-4.8.0.tgz"; - sha512 = "5nfx08Cgl176IyK1uQrHO3SBord1rUDKUJvrz9ddgYWIL78+/puk3zs26rt3BqDTPWBtd/Txdy9OLHBYNDhK8A=="; + url = "https://registry.npmjs.org/ssb-client/-/ssb-client-4.9.0.tgz"; + sha512 = "5wPrVA82Uk3deV2oiCZEbm1kMp9r/5xTT2VvwwMLZS3fDD9FnLOi0kjUUh3OTP+jGBK7bVHRmnvXIVy6ETnSpA=="; }; }; "ssb-config-2.3.9" = { @@ -40407,13 +40686,13 @@ let sha512 = "YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w=="; }; }; - "systeminformation-4.21.1" = { + "systeminformation-4.22.0" = { name = "systeminformation"; packageName = "systeminformation"; - version = "4.21.1"; + version = "4.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.21.1.tgz"; - sha512 = "IQMy+ieSThY+MfLZaCdQsGCteMah4nhsDQcnT9DhocoJnhMKVUqDY025j1i+MSm7qdUCMXS5oV7dvttr+pSodw=="; + url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.22.0.tgz"; + sha512 = "Sq6H99xxvBeN54kUdM9DCdbesSLb+S5MZnUD2qy7gutyfS0REYZ4QN6tfsWbYhcsaocrvcpCwoOHblbO+caN4A=="; }; }; "syswide-cas-5.3.0" = { @@ -40642,15 +40921,6 @@ let sha512 = "+DAn4Nb4+gz6WZigRzKEZl1QuJVOLtAwwF+WUxy1fJ6X63CaGaUAxJRD2KEn1OMfcbCjySTYpNC6WmfQoIEOdw=="; }; }; - "taskkill-2.0.0" = { - name = "taskkill"; - packageName = "taskkill"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/taskkill/-/taskkill-2.0.0.tgz"; - sha1 = "a354305702a964357033027aa949eaed5331b784"; - }; - }; "taskkill-3.1.0" = { name = "taskkill"; packageName = "taskkill"; @@ -40804,13 +41074,13 @@ let sha512 = "a6sumDlzyHVJWb8+YofY4TW112G6p2FCPEAFk+59gIYHv3XHRhm9ltVQ9kli4hNWeQBwSpe8cRN25x0ROunMOw=="; }; }; - "terminal-kit-1.32.3" = { + "terminal-kit-1.33.10" = { name = "terminal-kit"; packageName = "terminal-kit"; - version = "1.32.3"; + version = "1.33.10"; src = fetchurl { - url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.32.3.tgz"; - sha512 = "9iRH+8HbY6KSjOUVF7Ja9s8SyYEJ2eMNI9vfsNvMnDOG9iXly2bLyK1WIwZF7mSZZCZshUiNkuM25BDN3Nj81Q=="; + url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.33.10.tgz"; + sha512 = "xKJAeyfm9EIkHWWz0C/GXbYW5LytAMzuVT9xZdI9kgLnm9Z7lNkly0WdBCH8WOPD4inZpKjNzBKr0StEOJXBNA=="; }; }; "terser-3.17.0" = { @@ -41704,6 +41974,15 @@ let sha1 = "a8b13fd6bfd2489519674ccde55ba3693b706d09"; }; }; + "tr46-2.0.0" = { + name = "tr46"; + packageName = "tr46"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tr46/-/tr46-2.0.0.tgz"; + sha512 = "LrErSqfhdUw73AC/eXV2fEmNkvgSYxfm5lvxnLvuVgoVDknvD28Pa5FeDGc8RuVouDxUD3GnHHFv7xnBp7As5w=="; + }; + }; "transliteration-1.6.6" = { name = "transliteration"; packageName = "transliteration"; @@ -42073,13 +42352,13 @@ let sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; }; }; - "tweetnacl-1.0.2" = { + "tweetnacl-1.0.3" = { name = "tweetnacl"; packageName = "tweetnacl"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-1.0.2.tgz"; - sha512 = "+8aPRjmXgf1VqvyxSlBUzKzeYqVS9Ai8vZ28g+mL7dNQl1jlUTCMDZnvNQdAS1xTywMkIXwJsfipsR/6s2+syw=="; + url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-1.0.3.tgz"; + sha512 = "6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw=="; }; }; "tweetnacl-auth-0.3.1" = { @@ -42487,13 +42766,13 @@ let sha1 = "e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"; }; }; - "uncss-0.17.2" = { + "uncss-0.17.3" = { name = "uncss"; packageName = "uncss"; - version = "0.17.2"; + version = "0.17.3"; src = fetchurl { - url = "https://registry.npmjs.org/uncss/-/uncss-0.17.2.tgz"; - sha512 = "hu2HquwDItuGDem4YsJROdAD8SknmWtM24zwhQax6J1se8tPjV1cnwPKhtjodzBaUhaL8Zb3hlGdZ2WAUpbAOg=="; + url = "https://registry.npmjs.org/uncss/-/uncss-0.17.3.tgz"; + sha512 = "ksdDWl81YWvF/X14fOSw4iu8tESDHFIeyKIeDrK6GEVTQvqJc1WlOEXqostNwOCi3qAj++4EaLsdAgPmUbEyog=="; }; }; "undeclared-identifiers-1.1.3" = { @@ -42505,13 +42784,13 @@ let sha512 = "pJOW4nxjlmfwKApE4zvxLScM/njmwj/DiUBv7EabwE4O8kRUy+HIwxQtZLBPll/jx1LJyBcqNfB3/cpv9EZwOw=="; }; }; - "undefsafe-2.0.2" = { + "undefsafe-2.0.3" = { name = "undefsafe"; packageName = "undefsafe"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.2.tgz"; - sha1 = "225f6b9e0337663e0d8e7cfd686fc2836ccace76"; + url = "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.3.tgz"; + sha512 = "nrXZwwXrD/T/JXeygJqdCO6NZZ1L66HrxM/Z7mIq2oPanoN0F1nLx3lwJMu6AwJY69hdixaFQOuoYsMjE5/C2A=="; }; }; "underscore-1.2.1" = { @@ -42883,22 +43162,22 @@ let sha512 = "dFil/AN6vqhnQWNCZk0GF/G3+Q5YwsB+PqjnzvpO2wzdRtUJ1E8PN+XRE/PRr/G3FzKjRTJU0haqE0Ekl+O3Ag=="; }; }; - "unist-util-modify-children-1.1.5" = { + "unist-util-modify-children-1.1.6" = { name = "unist-util-modify-children"; packageName = "unist-util-modify-children"; - version = "1.1.5"; + version = "1.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/unist-util-modify-children/-/unist-util-modify-children-1.1.5.tgz"; - sha512 = "XeL5qqyoS3TEueCKEzHusWXE9JBDJPE4rl6LmcLOwlzv0RIZrcMNqKx02GSK3Ms4v45ldu+ltPxG42FBMVdPZw=="; + url = "https://registry.npmjs.org/unist-util-modify-children/-/unist-util-modify-children-1.1.6.tgz"; + sha512 = "TOA6W9QLil+BrHqIZNR4o6IA5QwGOveMbnQxnWYq+7EFORx9vz/CHrtzF36zWrW61E2UKw7sM1KPtIgeceVwXw=="; }; }; - "unist-util-position-3.0.4" = { + "unist-util-position-3.1.0" = { name = "unist-util-position"; packageName = "unist-util-position"; - version = "3.0.4"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/unist-util-position/-/unist-util-position-3.0.4.tgz"; - sha512 = "tWvIbV8goayTjobxDIr4zVTyG+Q7ragMSMeKC3xnPl9xzIc0+she8mxXLM3JVNDDsfARPbCd3XdzkyLdo7fF3g=="; + url = "https://registry.npmjs.org/unist-util-position/-/unist-util-position-3.1.0.tgz"; + sha512 = "w+PkwCbYSFw8vpgWD0v7zRCl1FpY3fjDSQ3/N/wNd9Ffa4gPi8+4keqt99N3XW6F99t/mUzp2xAhNmfKWp95QA=="; }; }; "unist-util-remove-position-1.1.4" = { @@ -42937,13 +43216,13 @@ let sha512 = "AvGNk7Bb//EmJZyhtRUnNMEpId/AZ5Ph/KUpTI09WHQuDZHKovQ1oEv3mfmKpWKtoMzyMC4GLBm1Zy5k12fjIw=="; }; }; - "unist-util-visit-children-1.1.3" = { + "unist-util-visit-children-1.1.4" = { name = "unist-util-visit-children"; packageName = "unist-util-visit-children"; - version = "1.1.3"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/unist-util-visit-children/-/unist-util-visit-children-1.1.3.tgz"; - sha512 = "/GQ8KNRrG+qD30H76FZNc6Ok+8XTu8lxJByN5LnQ4eQfqxda2gP0CPsCX63BRB26ZRMNf6i1c+jlvNlqysEoFg=="; + url = "https://registry.npmjs.org/unist-util-visit-children/-/unist-util-visit-children-1.1.4.tgz"; + sha512 = "sA/nXwYRCQVRwZU2/tQWUqJ9JSFM1X3x7JIOsIgSzrFHcfVt6NkzDtKzyxg2cZWkCwGF9CO8x4QNZRJRMK8FeQ=="; }; }; "unist-util-visit-parents-2.1.2" = { @@ -43162,6 +43441,15 @@ let sha512 = "p9zf71hWt5GVXM4iEBujpUgx8mK9AWiCCapEJm/O1z5ntCim83Z1ATqzZFBHFYqx03laMqv8LiDgs/7ikXjf/g=="; }; }; + "update-notifier-4.1.0" = { + name = "update-notifier"; + packageName = "update-notifier"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/update-notifier/-/update-notifier-4.1.0.tgz"; + sha512 = "w3doE1qtI0/ZmgeoDoARmI5fjDoT93IfKgEGqm26dGUOh8oNpaSTsGNdYRN/SjOuo10jcJGwkEL3mroKzktkew=="; + }; + }; "upnp-device-client-1.0.2" = { name = "upnp-device-client"; packageName = "upnp-device-client"; @@ -44359,6 +44647,15 @@ let sha512 = "QL7Fe1FT6PdLtVzwJeZ78pTic4eZbzLRy7yAQgPb9xalqqgZESR0+yDZPwJrM3E7PzOmwHBceYcJR54eQZ7Kng=="; }; }; + "vscode-languageserver-6.1.1" = { + name = "vscode-languageserver"; + packageName = "vscode-languageserver"; + version = "6.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-6.1.1.tgz"; + sha512 = "DueEpkUAkD5XTR4MLYNr6bQIp/UFR0/IPApgXU3YfCBCB08u2sm9hRCs6DxYZELkk++STPjpcjksR2H8qI3cDQ=="; + }; + }; "vscode-languageserver-protocol-3.14.1" = { name = "vscode-languageserver-protocol"; packageName = "vscode-languageserver-protocol"; @@ -44368,13 +44665,13 @@ let sha512 = "IL66BLb2g20uIKog5Y2dQ0IiigW0XKrvmWiOvc0yXw80z3tMEzEnHjaGAb3ENuU7MnQqgnYJ1Cl2l9RvNgDi4g=="; }; }; - "vscode-languageserver-protocol-3.15.2" = { + "vscode-languageserver-protocol-3.15.3" = { name = "vscode-languageserver-protocol"; packageName = "vscode-languageserver-protocol"; - version = "3.15.2"; + version = "3.15.3"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.15.2.tgz"; - sha512 = "GdL05JKOgZ76RDg3suiGCl9enESM7iQgGw4x93ibTh4sldvZmakHmTeZ4iUApPPGKf6O3OVBtrsksBXnHYaxNg=="; + url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.15.3.tgz"; + sha512 = "zrMuwHOAQRhjDSnflWdJG+O2ztMWss8GqUUB8dXLR/FPenwkiBNkMIJJYfSN6sgskvsF0rHAoBowNQfbyZnnvw=="; }; }; "vscode-languageserver-protocol-3.6.0" = { @@ -44629,6 +44926,15 @@ let sha512 = "i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA=="; }; }; + "wbuf-1.7.3" = { + name = "wbuf"; + packageName = "wbuf"; + version = "1.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz"; + sha512 = "O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA=="; + }; + }; "wcwidth-1.0.1" = { name = "wcwidth"; packageName = "wcwidth"; @@ -44692,22 +44998,31 @@ let sha512 = "YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg=="; }; }; - "webpack-4.41.5" = { + "webidl-conversions-5.0.0" = { + name = "webidl-conversions"; + packageName = "webidl-conversions"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz"; + sha512 = "VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA=="; + }; + }; + "webpack-4.41.6" = { name = "webpack"; packageName = "webpack"; - version = "4.41.5"; + version = "4.41.6"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-4.41.5.tgz"; - sha512 = "wp0Co4vpyumnp3KlkmpM5LWuzvZYayDwM2n17EHFr4qxBBbRokC7DJawPJC7TfSFZ9HZ6GsdH40EBj4UV0nmpw=="; + url = "https://registry.npmjs.org/webpack/-/webpack-4.41.6.tgz"; + sha512 = "yxXfV0Zv9WMGRD+QexkZzmGIh54bsvEs+9aRWxnN8erLWEOehAKUTeNBoUbA6HPEZPlRo7KDi2ZcNveoZgK9MA=="; }; }; - "webpack-cli-3.3.10" = { + "webpack-cli-3.3.11" = { name = "webpack-cli"; packageName = "webpack-cli"; - version = "3.3.10"; + version = "3.3.11"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.10.tgz"; - sha512 = "u1dgND9+MXaEt74sJR4PR7qkPxXUSQ0RXYq8x1L6Jg1MYVEmGPrH6Ah6C4arD4r0J1P5HKjRqpab36k0eIzPqg=="; + url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.11.tgz"; + sha512 = "dXlfuml7xvAFwYUPsrtQAA9e4DOe58gnzSxhgrO/ZM/gyXTBowrsYeubyN4mqGhYdpXMFNyQ6emjJS9M7OBd4g=="; }; }; "webpack-core-0.6.9" = { @@ -44719,6 +45034,24 @@ let sha1 = "fc571588c8558da77be9efb6debdc5a3b172bdc2"; }; }; + "webpack-dev-middleware-3.7.2" = { + name = "webpack-dev-middleware"; + packageName = "webpack-dev-middleware"; + version = "3.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.7.2.tgz"; + sha512 = "1xC42LxbYoqLNAhV6YzTYacicgMZQTqRd27Sim9wn5hJrX3I5nxYy1SxSd4+gjUFsz1dQFj+yEe6zEVmSkeJjw=="; + }; + }; + "webpack-log-2.0.0" = { + name = "webpack-log"; + packageName = "webpack-log"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack-log/-/webpack-log-2.0.0.tgz"; + sha512 = "cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg=="; + }; + }; "webpack-sources-1.4.3" = { name = "webpack-sources"; packageName = "webpack-sources"; @@ -44818,6 +45151,15 @@ let sha512 = "WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg=="; }; }; + "whatwg-url-8.0.0" = { + name = "whatwg-url"; + packageName = "whatwg-url"; + version = "8.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.0.0.tgz"; + sha512 = "41ou2Dugpij8/LPO5Pq64K5q++MnRCBpEHvQr26/mArEKTkCV5aoXIqyhuYtE0pkqScXwhf2JP57rkRTYM29lQ=="; + }; + }; "whatwg-url-compat-0.6.5" = { name = "whatwg-url-compat"; packageName = "whatwg-url-compat"; @@ -45737,13 +46079,13 @@ let sha1 = "52a63e56ca0b84a7f3a5f3d61872f126ad7a5943"; }; }; - "xregexp-4.2.4" = { + "xregexp-4.3.0" = { name = "xregexp"; packageName = "xregexp"; - version = "4.2.4"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/xregexp/-/xregexp-4.2.4.tgz"; - sha512 = "sO0bYdYeJAJBcJA8g7MJJX7UrOZIfJPd8U2SC7B2Dd/J24U0aQNoGp33shCaBSWeb0rD5rh6VBUIXOkGal1TZA=="; + url = "https://registry.npmjs.org/xregexp/-/xregexp-4.3.0.tgz"; + sha512 = "7jXDIFXh5yJ/orPn4SXjuVrWWoi4Cr8jfV1eHv9CixKSbU+jY4mxfrBwAuDvupPNKpMUY+FeIqsVw/JLT9+B8g=="; }; }; "xsalsa20-1.1.0" = { @@ -45953,15 +46295,6 @@ let sha512 = "2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA=="; }; }; - "yargs-14.0.0" = { - name = "yargs"; - packageName = "yargs"; - version = "14.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-14.0.0.tgz"; - sha512 = "ssa5JuRjMeZEUjg7bEL99AwpitxU/zWGAGpdj0di41pOEmJti8NR6kyUIJBkR78DTYNPZOU08luUo0GTHuB+ow=="; - }; - }; "yargs-14.2.2" = { name = "yargs"; packageName = "yargs"; @@ -45971,13 +46304,13 @@ let sha512 = "/4ld+4VV5RnrynMhPZJ/ZpOCGSCeghMykZ3BhdFBDa9Wy/RH6uEGNWDJog+aUlq+9OM1CFTgtYRW5Is1Po9NOA=="; }; }; - "yargs-15.0.2" = { + "yargs-15.1.0" = { name = "yargs"; packageName = "yargs"; - version = "15.0.2"; + version = "15.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-15.0.2.tgz"; - sha512 = "GH/X/hYt+x5hOat4LMnCqMd8r5Cv78heOMIJn1hr7QPPBqfeC6p89Y78+WB9yGDvfpCvgasfmWLzNzEioOUD9Q=="; + url = "https://registry.npmjs.org/yargs/-/yargs-15.1.0.tgz"; + sha512 = "T39FNN1b6hCW4SOIk1XyTOWxtXdcen0t+XYrysQmChzSipvhBO8Bj0nK1ozAasdk24dNWuMZvr4k24nz+8HHLg=="; }; }; "yargs-3.10.0" = { @@ -46223,13 +46556,13 @@ let sha512 = "CP0fwGk5Y+jel+A0AQbyqnIFZRRpkKOeYUibiTSmlgV9PcgNFFVwn86VcUIpDLOqVjF+9v+O9FWQMo+IUcV2mA=="; }; }; - "yeoman-environment-2.7.0" = { + "yeoman-environment-2.8.0" = { name = "yeoman-environment"; packageName = "yeoman-environment"; - version = "2.7.0"; + version = "2.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-2.7.0.tgz"; - sha512 = "YNzSUWgJVSgnm0qgLON4Gb2nTm+kywBiWjK4MbvosjUP2YJJ30lNhEx7ukyzKRPUlsavd5IsuALtF6QaVrq81A=="; + url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-2.8.0.tgz"; + sha512 = "BbJeEna23Qx90fBiJt1awcZ9okfPY/rP3xZYsk1rD3x8LuQgpo4BfegPvQT1sqqh2+gYVZmYZMv5pS8+Muyr9Q=="; }; }; "yn-3.1.1" = { @@ -46346,17 +46679,17 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "9.0.1"; + version = "9.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-9.0.1.tgz"; - sha512 = "/nykTIqZq1plxaXVoMzAqjnExGhkYoSoq88AE4Mb31d6n/SW2DFh62C3hze+atI6YLqeFaPhYuA5zG+z3oOXbQ=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-9.0.2.tgz"; + sha512 = "ih3bnvav94MXI9YpwJ4AaETfUGwzc+S2jg4vkfYMuBeWO8kJ7Ma4f2ZriIwWyfHWHlBLHDF6OjAVdisBKPpQag=="; }; dependencies = [ - sources."@angular-devkit/architect-0.900.1" - sources."@angular-devkit/core-9.0.1" - sources."@angular-devkit/schematics-9.0.1" - sources."@schematics/angular-9.0.1" - (sources."@schematics/update-0.900.1" // { + sources."@angular-devkit/architect-0.900.2" + sources."@angular-devkit/core-9.0.2" + sources."@angular-devkit/schematics-9.0.2" + sources."@schematics/angular-9.0.2" + (sources."@schematics/update-0.900.2" // { dependencies = [ (sources."npm-package-arg-7.0.0" // { dependencies = [ @@ -46395,7 +46728,7 @@ in sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chardet-0.7.0" - sources."chownr-1.1.3" + sources."chownr-1.1.4" sources."cli-cursor-3.1.0" sources."cli-spinners-2.2.0" sources."cli-width-2.2.0" @@ -46436,7 +46769,7 @@ in sources."fast-deep-equal-2.0.1" sources."fast-json-stable-stringify-2.0.0" sources."figgy-pudding-3.5.1" - sources."figures-3.1.0" + sources."figures-3.2.0" sources."flush-write-stream-1.1.1" sources."forever-agent-0.6.1" sources."form-data-2.3.3" @@ -46541,7 +46874,7 @@ in sources."semver-5.7.1" ]; }) - sources."npm-registry-fetch-4.0.2" + sources."npm-registry-fetch-4.0.3" sources."oauth-sign-0.9.0" sources."object-inspect-1.7.0" sources."object-keys-1.1.1" @@ -46585,7 +46918,7 @@ in ]; }) sources."readdir-scoped-modules-1.1.0" - sources."request-2.88.0" + sources."request-2.88.2" sources."resolve-1.15.1" sources."restore-cursor-3.1.0" sources."retry-0.10.1" @@ -46639,11 +46972,7 @@ in sources."through-2.3.8" sources."through2-2.0.5" sources."tmp-0.0.33" - (sources."tough-cookie-2.4.3" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) + sources."tough-cookie-2.5.0" sources."tslib-1.10.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" @@ -46875,7 +47204,7 @@ in }) sources."handlebars-4.5.3" sources."has-symbols-1.0.1" - sources."http-cache-semantics-4.0.3" + sources."http-cache-semantics-4.0.4" sources."ignore-5.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -46914,7 +47243,7 @@ in sources."matcher-2.0.0" sources."mime-db-1.43.0" sources."mime-types-2.1.26" - sources."mimic-response-2.0.0" + sources."mimic-response-2.1.0" sources."minimatch-3.0.4" sources."minimatch-all-1.1.0" sources."minimist-1.2.0" @@ -46956,7 +47285,7 @@ in sources."pumpify-1.5.1" sources."queue-4.5.1" sources."quick-lru-4.0.1" - sources."readable-stream-3.5.0" + sources."readable-stream-3.6.0" sources."remove-bom-buffer-3.0.0" (sources."remove-bom-stream-1.2.0" // { dependencies = [ @@ -47156,12 +47485,7 @@ in sources."psl-1.7.0" sources."punycode-2.1.1" sources."qs-6.5.2" - (sources."request-2.88.0" // { - dependencies = [ - sources."punycode-1.4.1" - sources."tough-cookie-2.4.3" - ]; - }) + sources."request-2.88.2" sources."request-promise-core-1.1.3" sources."request-promise-native-1.0.8" sources."restore-cursor-2.0.0" @@ -47227,14 +47551,10 @@ in }; dependencies = [ sources."@akryum/winattr-3.0.0" - (sources."@apollo/federation-0.11.3" // { - dependencies = [ - sources."apollo-graphql-0.3.7" - ]; - }) + sources."@apollo/federation-0.12.0" (sources."@apollo/protobufjs-1.0.3" // { dependencies = [ - sources."@types/node-10.17.14" + sources."@types/node-10.17.15" ]; }) sources."@apollographql/apollo-tools-0.4.3" @@ -47377,7 +47697,7 @@ in sources."semver-5.7.1" ]; }) - sources."@oclif/config-1.13.3" + sources."@oclif/config-1.14.0" (sources."@oclif/errors-1.2.2" // { dependencies = [ sources."clean-stack-1.3.0" @@ -47442,12 +47762,12 @@ in sources."@types/graphql-upload-8.0.3" sources."@types/http-assert-1.5.1" sources."@types/keygrip-1.0.2" - sources."@types/koa-2.11.0" + sources."@types/koa-2.11.1" sources."@types/koa-compose-3.2.5" sources."@types/long-4.0.1" sources."@types/mime-2.0.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.7.0" + sources."@types/node-13.7.1" sources."@types/node-fetch-2.5.4" sources."@types/normalize-package-data-2.4.0" sources."@types/range-parser-1.2.3" @@ -47479,7 +47799,7 @@ in sources."normalize-path-2.1.1" ]; }) - (sources."apollo-2.22.0" // { + (sources."apollo-2.22.1" // { dependencies = [ sources."graphql-tag-2.10.1" sources."strip-ansi-5.2.0" @@ -47489,21 +47809,17 @@ in sources."apollo-cache-control-0.8.11" sources."apollo-cache-inmemory-1.6.5" sources."apollo-client-2.6.8" - sources."apollo-codegen-core-0.36.0" - sources."apollo-codegen-flow-0.34.0" - sources."apollo-codegen-scala-0.35.0" - sources."apollo-codegen-swift-0.36.0" - sources."apollo-codegen-typescript-0.36.0" + sources."apollo-codegen-core-0.36.1" + sources."apollo-codegen-flow-0.34.1" + sources."apollo-codegen-scala-0.35.1" + sources."apollo-codegen-swift-0.36.1" + sources."apollo-codegen-typescript-0.36.1" sources."apollo-datasource-0.7.0" - sources."apollo-engine-reporting-1.5.0" + sources."apollo-engine-reporting-1.6.0" sources."apollo-engine-reporting-protobuf-0.4.4" sources."apollo-env-0.6.1" sources."apollo-graphql-0.4.0" - (sources."apollo-language-server-1.19.0" // { - dependencies = [ - sources."apollo-datasource-0.6.4" - ]; - }) + sources."apollo-language-server-1.19.1" sources."apollo-link-1.2.13" sources."apollo-link-context-1.0.19" sources."apollo-link-error-1.1.12" @@ -47513,10 +47829,10 @@ in sources."apollo-link-state-0.4.2" sources."apollo-link-ws-1.0.19" sources."apollo-server-caching-0.5.1" - sources."apollo-server-core-2.10.0" + sources."apollo-server-core-2.10.1" sources."apollo-server-env-2.4.3" sources."apollo-server-errors-2.3.4" - sources."apollo-server-express-2.10.0" + sources."apollo-server-express-2.10.1" sources."apollo-server-plugin-base-0.6.10" sources."apollo-server-types-0.2.10" sources."apollo-tracing-0.8.11" @@ -47611,7 +47927,7 @@ in }) sources."brace-expansion-1.1.11" sources."braces-2.3.2" - sources."browserslist-4.8.6" + sources."browserslist-4.8.7" sources."buffer-5.4.3" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" @@ -47629,7 +47945,7 @@ in sources."callsites-2.0.0" sources."camel-case-3.0.0" sources."camelcase-4.1.0" - sources."caniuse-lite-1.0.30001025" + sources."caniuse-lite-1.0.30001027" sources."capture-stack-trace-1.0.1" sources."cardinal-2.1.1" sources."caseless-0.12.0" @@ -47794,7 +48110,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.346" + sources."electron-to-chromium-1.3.353" sources."elegant-spinner-1.0.1" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" @@ -47929,7 +48245,7 @@ in sources."slash-2.0.0" ]; }) - sources."globule-1.3.0" + sources."globule-1.3.1" sources."good-listener-1.2.2" (sources."got-6.7.1" // { dependencies = [ @@ -47976,7 +48292,7 @@ in sources."hosted-git-info-2.8.5" (sources."htmlparser2-3.10.1" // { dependencies = [ - sources."readable-stream-3.5.0" + sources."readable-stream-3.6.0" ]; }) (sources."http-call-5.3.0" // { @@ -48201,7 +48517,7 @@ in sources."is-wsl-2.1.1" ]; }) - sources."node-releases-1.1.48" + sources."node-releases-1.1.49" (sources."nodemon-1.19.4" // { dependencies = [ sources."debug-3.2.6" @@ -48353,7 +48669,7 @@ in sources."registry-auth-token-3.4.0" sources."registry-url-3.1.0" sources."regjsgen-0.5.1" - (sources."regjsparser-0.6.2" // { + (sources."regjsparser-0.6.3" // { dependencies = [ sources."jsesc-0.5.0" ]; @@ -48361,7 +48677,7 @@ in sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" - sources."request-2.88.0" + sources."request-2.88.2" sources."request-promise-core-1.1.3" sources."request-promise-native-1.0.8" sources."resolve-1.15.1" @@ -48587,11 +48903,7 @@ in sources."to-regex-range-2.1.1" sources."toidentifier-1.0.0" sources."touch-3.1.0" - (sources."tough-cookie-2.4.3" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) + sources."tough-cookie-2.5.0" sources."treeify-1.1.0" sources."trim-repeated-1.0.0" sources."ts-invariant-0.4.4" @@ -48604,7 +48916,7 @@ in sources."type-is-1.6.18" sources."typescript-3.7.5" sources."unbzip2-stream-1.3.3" - (sources."undefsafe-2.0.2" // { + (sources."undefsafe-2.0.3" // { dependencies = [ sources."debug-2.6.9" ]; @@ -49169,7 +49481,7 @@ in sources."psl-1.7.0" sources."punycode-2.1.1" sources."qs-6.5.2" - sources."request-2.88.0" + sources."request-2.88.2" sources."request-promise-core-1.1.3" sources."request-promise-native-1.0.8" sources."safe-buffer-5.2.0" @@ -49179,11 +49491,7 @@ in sources."sshpk-1.16.1" sources."stealthy-require-1.1.1" sources."symbol-tree-3.2.4" - (sources."tough-cookie-2.4.3" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) + sources."tough-cookie-2.5.0" sources."tr46-1.0.1" sources."tunnel-agent-0.6.0" sources."turndown-4.0.2" @@ -49383,7 +49691,7 @@ in sources."JSONStream-1.3.5" sources."acorn-7.1.0" sources."acorn-node-1.8.2" - sources."acorn-walk-7.0.0" + sources."acorn-walk-7.1.1" sources."asn1.js-4.10.1" (sources."assert-1.5.0" // { dependencies = [ @@ -49510,7 +49818,7 @@ in sources."stream-combiner2-1.1.1" (sources."stream-http-3.1.0" // { dependencies = [ - sources."readable-stream-3.5.0" + sources."readable-stream-3.6.0" ]; }) sources."stream-splicer-2.0.1" @@ -49573,7 +49881,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-10.17.14" + sources."@types/node-10.17.15" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.2.16" sources."ajv-6.11.0" @@ -49639,7 +49947,7 @@ in sources."concat-map-0.0.1" (sources."concat-stream-2.0.0" // { dependencies = [ - sources."readable-stream-3.5.0" + sources."readable-stream-3.6.0" sources."string_decoder-1.3.0" ]; }) @@ -49858,7 +50166,7 @@ in sources."readline2-0.1.1" sources."redent-1.0.0" sources."repeating-2.0.1" - sources."request-2.88.0" + sources."request-2.88.2" sources."resolve-1.15.1" sources."rimraf-2.7.1" sources."router-0.6.2" @@ -49926,11 +50234,7 @@ in sources."thirty-two-0.0.2" ]; }) - (sources."tough-cookie-2.4.3" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) + sources."tough-cookie-2.5.0" sources."trim-newlines-1.0.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" @@ -50106,7 +50410,7 @@ in sources."ms-2.1.2" sources."one-time-0.0.4" sources."process-nextick-args-2.0.1" - sources."readable-stream-3.5.0" + sources."readable-stream-3.6.0" sources."requires-port-1.0.0" sources."safe-buffer-5.2.0" sources."simple-swizzle-0.2.2" @@ -50150,7 +50454,7 @@ in sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.7.0" + sources."@types/node-13.7.1" sources."abbrev-1.1.1" sources."accepts-1.3.7" sources."ajv-6.11.0" @@ -50582,11 +50886,10 @@ in sources."registry-url-3.1.0" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" - (sources."request-2.88.0" // { + (sources."request-2.88.2" // { dependencies = [ - sources."punycode-1.4.1" sources."qs-6.5.2" - sources."tough-cookie-2.4.3" + sources."tough-cookie-2.5.0" ]; }) sources."resolve-1.14.2" @@ -50775,10 +51078,10 @@ in cpy-cli = nodeEnv.buildNodePackage { name = "cpy-cli"; packageName = "cpy-cli"; - version = "3.0.0"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/cpy-cli/-/cpy-cli-3.0.0.tgz"; - sha512 = "fxNNpGrnuVMbaDBpHdgwReMy48BelhAoS6OUUX6Zv5nMwSPZOMxL/kB5VxM9xQoB1vvw38zG9drLRS8gvavxeg=="; + url = "https://registry.npmjs.org/cpy-cli/-/cpy-cli-3.1.0.tgz"; + sha512 = "LJhHvFragWvIsJH1kjhzZwGSagukewJZ5nV5yjMc5TILs+Z/CbZSvX0W9t9XC26Mw32j56UHjR3co5kAXaeTwg=="; }; dependencies = [ sources."@mrmlnc/readdir-enhanced-2.2.1" @@ -50786,7 +51089,7 @@ in sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.7.0" + sources."@types/node-13.7.1" sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" sources."arr-union-3.1.0" @@ -50936,7 +51239,7 @@ in }) sources."locate-path-2.0.0" sources."loud-rejection-1.6.0" - sources."make-dir-3.0.0" + sources."make-dir-3.0.2" sources."map-cache-0.2.2" sources."map-obj-2.0.0" sources."map-visit-1.0.0" @@ -51127,7 +51430,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.1" - sources."@types/node-13.7.0" + sources."@types/node-13.7.1" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -51269,10 +51572,10 @@ in create-react-app = nodeEnv.buildNodePackage { name = "create-react-app"; packageName = "create-react-app"; - version = "3.3.1"; + version = "3.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/create-react-app/-/create-react-app-3.3.1.tgz"; - sha512 = "ORmuc0m6zCt65Vqh5c/h0Z0RbWBqMssEHjD4Zx/j/L4+KvdkXqKFuwfU0I/bDpGMqSqpSq1AzuPy67KCxA/TkA=="; + url = "https://registry.npmjs.org/create-react-app/-/create-react-app-3.4.0.tgz"; + sha512 = "BR5jXjJH6Bz0vHAIoF0pH2K+hX+Frd93UGZjjCUB1k1JJDZbM+QyigTXZ08ddJ02AQ+iYfNyM77WgDwKQBl00g=="; }; dependencies = [ sources."@types/color-name-1.1.1" @@ -51304,7 +51607,7 @@ in sources."tmp-0.0.33" ]; }) - sources."figures-3.1.0" + sources."figures-3.2.0" sources."fs-extra-8.1.0" sources."fs.realpath-1.0.0" sources."fstream-1.0.12" @@ -51818,7 +52121,7 @@ in sources."mime-2.4.4" sources."mime-db-1.43.0" sources."mime-types-2.1.26" - sources."mimic-response-2.0.0" + sources."mimic-response-2.1.0" sources."min-document-2.19.0" sources."minimatch-3.0.4" sources."minimist-1.2.0" @@ -51835,14 +52138,14 @@ in }) sources."ms-2.1.2" sources."multi-random-access-2.1.1" - sources."multicast-dns-7.2.0" + sources."multicast-dns-7.2.1" sources."multistream-2.1.1" sources."mute-stream-0.0.8" sources."mutexify-1.2.0" sources."nan-2.14.0" sources."nanoassert-1.1.0" sources."nanobus-4.4.0" - sources."nanoguard-1.2.2" + sources."nanoguard-1.3.0" sources."nanomatch-1.2.13" sources."nanoscheduler-1.0.3" sources."nanotiming-7.3.1" @@ -51923,7 +52226,7 @@ in sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" - sources."request-2.88.0" + sources."request-2.88.2" sources."resolve-url-0.2.1" sources."ret-0.1.15" sources."revalidator-0.1.8" @@ -52056,11 +52359,7 @@ in sources."ms-2.0.0" ]; }) - (sources."tough-cookie-2.4.3" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) + sources."tough-cookie-2.5.0" (sources."township-client-1.3.2" // { dependencies = [ sources."is-number-2.1.0" @@ -52099,7 +52398,7 @@ in (sources."utp-native-2.1.7" // { dependencies = [ sources."node-gyp-build-4.2.0" - sources."readable-stream-3.5.0" + sources."readable-stream-3.6.0" sources."unordered-set-2.0.1" ]; }) @@ -52302,16 +52601,16 @@ in dockerfile-language-server-nodejs = nodeEnv.buildNodePackage { name = "dockerfile-language-server-nodejs"; packageName = "dockerfile-language-server-nodejs"; - version = "0.0.21"; + version = "0.0.22"; src = fetchurl { - url = "https://registry.npmjs.org/dockerfile-language-server-nodejs/-/dockerfile-language-server-nodejs-0.0.21.tgz"; - sha512 = "lZ7VFAlS4vTm5MvxmwpREcYMARB3RQaGX0OZdcY8oSytsu4i5mMGVa6mi9/pZ9soqcUC08uxEA8EcqIeL3lyAA=="; + url = "https://registry.npmjs.org/dockerfile-language-server-nodejs/-/dockerfile-language-server-nodejs-0.0.22.tgz"; + sha512 = "Vf/Zieb/BBs/VQnaxntshlTExR3FyE6FO1NxS+yO3SVqzcEVHYkHMC8f/+XRRROVHFh41YfzVfPhSxdCxfbviQ=="; }; dependencies = [ - sources."dockerfile-ast-0.0.16" - (sources."dockerfile-language-service-0.0.8" // { + sources."dockerfile-ast-0.0.20" + (sources."dockerfile-language-service-0.0.9" // { dependencies = [ - (sources."dockerfile-utils-0.0.13" // { + (sources."dockerfile-utils-0.0.14" // { dependencies = [ sources."vscode-languageserver-types-3.6.0" ]; @@ -52324,15 +52623,10 @@ in sources."vscode-languageserver-types-3.6.0" ]; }) - sources."vscode-jsonrpc-4.0.0" - sources."vscode-languageserver-5.2.1" - (sources."vscode-languageserver-protocol-3.14.1" // { - dependencies = [ - sources."vscode-languageserver-types-3.14.0" - ]; - }) + sources."vscode-jsonrpc-5.0.1" + sources."vscode-languageserver-6.1.1" + sources."vscode-languageserver-protocol-3.15.3" sources."vscode-languageserver-types-3.15.1" - sources."vscode-uri-1.0.8" ]; buildInputs = globalBuildInputs; meta = { @@ -52347,10 +52641,10 @@ in elasticdump = nodeEnv.buildNodePackage { name = "elasticdump"; packageName = "elasticdump"; - version = "6.20.1"; + version = "6.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.20.1.tgz"; - sha512 = "nolk1wEQZOETEq8x6eBVHRhBPNUsLRS1Z4zjzjsf8lK6S1DO9e1dNMMgTdFq2LwNNhIxdSkFyQjie4382UbgQg=="; + url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.21.0.tgz"; + sha512 = "Ym6TP6yWNXwueViA0e2cByyGfbr1sFThsI3vzQHy3xiDKZVDcMCE2eFiUen342VksZznzM0R8L61SQ3T39hBTw=="; }; dependencies = [ sources."JSONStream-1.3.5" @@ -52359,7 +52653,7 @@ in sources."assert-plus-1.0.0" sources."async-2.6.3" sources."asynckit-0.4.0" - sources."aws-sdk-2.614.0" + sources."aws-sdk-2.620.0" sources."aws-sign2-0.7.0" sources."aws4-1.9.1" sources."base64-js-1.3.1" @@ -52415,7 +52709,7 @@ in sources."once-1.4.0" sources."optimist-0.6.1" sources."p-finally-1.0.0" - sources."p-queue-6.2.1" + sources."p-queue-6.3.0" sources."p-timeout-3.2.0" sources."performance-now-2.1.0" sources."process-nextick-args-2.0.1" @@ -52429,7 +52723,7 @@ in sources."safe-buffer-5.1.2" ]; }) - sources."request-2.88.0" + sources."request-2.88.2" sources."requestretry-4.1.0" sources."s3-stream-upload-2.0.2" sources."s3signed-0.1.0" @@ -52452,9 +52746,9 @@ in ]; }) sources."through-2.3.8" - (sources."tough-cookie-2.4.3" // { + (sources."tough-cookie-2.5.0" // { dependencies = [ - sources."punycode-1.4.1" + sources."punycode-2.1.1" ]; }) sources."tunnel-agent-0.6.0" @@ -52804,7 +53098,7 @@ in sources."eslint-visitor-keys-1.1.0" sources."espree-6.1.2" sources."esprima-4.0.1" - sources."esquery-1.0.1" + sources."esquery-1.1.0" sources."esrecurse-4.2.1" sources."estraverse-4.3.0" sources."esutils-2.0.3" @@ -52812,7 +53106,7 @@ in sources."fast-deep-equal-3.1.1" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" - sources."figures-3.1.0" + sources."figures-3.2.0" sources."file-entry-cache-5.0.1" sources."flat-cache-2.0.1" sources."flatted-2.0.1" @@ -52963,7 +53257,7 @@ in sources."eslint-visitor-keys-1.1.0" sources."espree-6.1.2" sources."esprima-4.0.1" - sources."esquery-1.0.1" + sources."esquery-1.1.0" sources."esrecurse-4.2.1" sources."estraverse-4.3.0" sources."esutils-2.0.3" @@ -52971,7 +53265,7 @@ in sources."fast-deep-equal-3.1.1" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" - sources."figures-3.1.0" + sources."figures-3.2.0" sources."file-entry-cache-5.0.1" sources."flat-cache-2.0.1" sources."flatted-2.0.1" @@ -53220,7 +53514,7 @@ in sources."readable-stream-2.3.7" sources."redent-1.0.0" sources."repeating-2.0.1" - sources."request-2.88.0" + sources."request-2.88.2" sources."request-progress-2.0.1" sources."resolve-1.15.1" sources."restore-cursor-1.0.1" @@ -53240,11 +53534,7 @@ in sources."supports-color-2.0.0" sources."throttleit-1.0.0" sources."tmp-0.0.31" - (sources."tough-cookie-2.4.3" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) + sources."tough-cookie-2.5.0" sources."trim-newlines-1.0.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" @@ -53271,180 +53561,193 @@ in fkill-cli = nodeEnv.buildNodePackage { name = "fkill-cli"; packageName = "fkill-cli"; - version = "5.2.0"; + version = "6.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/fkill-cli/-/fkill-cli-5.2.0.tgz"; - sha512 = "8MT/0AQi9hFOo1j4qQ0URs0FdSoOLGJSNn3CM+1QQj9LKvs2w34yvoSGAJu2EfNvB+W/KJ8wLDyoK7Bs5YdC9w=="; + url = "https://registry.npmjs.org/fkill-cli/-/fkill-cli-6.0.0.tgz"; + sha512 = "YlxeZ1Oid9No7mUMVAuHX1hHhzaydXihUNM2s52y/EkCyVAbQyrSt7+E/Ij+jLO3houXG2k4d2pz4vev0jVqlQ=="; }; dependencies = [ - sources."aggregate-error-1.0.0" - sources."ansi-escapes-3.2.0" - sources."ansi-regex-3.0.0" - sources."ansi-styles-3.2.1" - sources."array-find-index-1.0.2" - sources."arrify-1.0.1" - sources."buffer-alloc-1.2.0" - sources."buffer-alloc-unsafe-1.1.0" - sources."buffer-fill-1.0.0" - sources."buffer-from-1.1.1" - sources."camelcase-4.1.0" - sources."camelcase-keys-4.2.0" - sources."chalk-2.4.2" + sources."@babel/code-frame-7.8.3" + (sources."@babel/highlight-7.8.3" // { + dependencies = [ + sources."ansi-styles-3.2.1" + sources."chalk-2.4.2" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."has-flag-3.0.0" + sources."supports-color-5.5.0" + ]; + }) + sources."@types/color-name-1.1.1" + sources."@types/minimist-1.2.0" + sources."@types/normalize-package-data-2.4.0" + sources."aggregate-error-3.0.1" + sources."ansi-escapes-4.3.0" + sources."ansi-regex-5.0.0" + sources."ansi-styles-4.2.1" + sources."arrify-2.0.1" + sources."astral-regex-2.0.0" + sources."camelcase-5.3.1" + sources."camelcase-keys-6.1.2" + sources."chalk-3.0.0" sources."chardet-0.7.0" - sources."clean-stack-1.3.0" - sources."cli-cursor-2.1.0" - sources."cli-truncate-1.1.0" + sources."clean-stack-2.2.0" + sources."cli-cursor-3.1.0" + sources."cli-truncate-2.1.0" sources."cli-width-2.2.0" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."core-util-is-1.0.2" - sources."cross-spawn-6.0.5" - sources."cross-spawn-async-2.2.5" - sources."csv-parser-1.12.1" - sources."currently-unhandled-0.4.1" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."cross-spawn-7.0.1" sources."decamelize-1.2.0" (sources."decamelize-keys-1.1.0" // { dependencies = [ sources."map-obj-1.0.1" ]; }) + sources."emoji-regex-8.0.0" + sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" sources."esc-exit-2.0.2" sources."escape-string-regexp-1.0.5" - sources."execa-0.10.0" + sources."esutils-2.0.3" + sources."execa-4.0.0" sources."external-editor-3.1.0" - sources."figures-2.0.0" - sources."find-up-2.1.0" - sources."fkill-5.3.0" - sources."from2-2.3.0" - sources."generate-function-1.1.0" - sources."generate-object-property-1.2.0" - sources."get-stream-3.0.0" - sources."graceful-fs-4.2.3" - sources."has-flag-3.0.0" + sources."figures-3.2.0" + sources."find-up-4.1.0" + (sources."fkill-7.0.0" // { + dependencies = [ + sources."ps-list-7.0.0" + ]; + }) + sources."get-stream-5.1.0" + sources."hard-rejection-2.1.0" + sources."has-flag-4.0.0" sources."hosted-git-info-2.8.5" + sources."human-signals-1.1.1" sources."iconv-lite-0.4.24" - sources."indent-string-3.2.0" - sources."inherits-2.0.4" - (sources."inquirer-6.5.2" // { + sources."indent-string-4.0.0" + (sources."inquirer-7.0.4" // { dependencies = [ sources."ansi-regex-4.1.0" + sources."ansi-styles-3.2.1" + sources."chalk-2.4.2" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."has-flag-3.0.0" sources."strip-ansi-5.2.0" + sources."supports-color-5.5.0" + ]; + }) + (sources."inquirer-autocomplete-prompt-1.0.2" // { + dependencies = [ + sources."ansi-escapes-3.2.0" + sources."ansi-styles-3.2.1" + sources."chalk-2.4.2" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."figures-2.0.0" + sources."has-flag-3.0.0" + sources."supports-color-5.5.0" ]; }) - sources."inquirer-autocomplete-prompt-1.0.2" - sources."into-stream-2.0.1" sources."is-arrayish-0.2.1" - sources."is-fullwidth-code-point-2.0.0" + sources."is-fullwidth-code-point-3.0.0" sources."is-plain-obj-1.1.0" sources."is-promise-2.1.0" - sources."is-property-1.0.2" - sources."is-stream-1.1.0" - sources."isarray-1.0.0" + sources."is-stream-2.0.0" sources."isexe-2.0.0" + sources."js-tokens-4.0.0" sources."json-parse-better-errors-1.0.2" - sources."json-stringify-safe-5.0.1" - sources."load-json-file-4.0.0" - sources."locate-path-2.0.0" + sources."lines-and-columns-1.1.6" + sources."locate-path-5.0.0" sources."lodash-4.17.15" - sources."loud-rejection-1.6.0" sources."lru-cache-4.1.5" - sources."map-obj-2.0.0" - sources."meow-5.0.0" - sources."mimic-fn-1.2.0" - sources."minimist-1.2.0" - sources."minimist-options-3.0.2" - sources."mute-stream-0.0.7" - sources."ndjson-1.5.0" - (sources."neat-csv-2.1.0" // { + sources."map-obj-4.1.0" + sources."meow-6.0.1" + sources."merge-stream-2.0.0" + sources."mimic-fn-2.1.0" + sources."min-indent-1.0.0" + (sources."minimist-options-4.0.2" // { dependencies = [ - sources."get-stream-2.3.1" + sources."arrify-1.0.1" ]; }) - sources."nice-try-1.0.5" + sources."mute-stream-0.0.8" sources."normalize-package-data-2.5.0" - sources."npm-run-path-2.0.2" - sources."num-sort-1.0.0" - sources."number-is-nan-1.0.1" - sources."object-assign-4.1.1" - sources."onetime-2.0.1" + sources."npm-run-path-4.0.1" + sources."num-sort-2.0.0" + sources."once-1.4.0" + sources."onetime-5.1.0" sources."os-tmpdir-1.0.2" - sources."p-finally-1.0.0" - sources."p-limit-1.3.0" - sources."p-locate-2.0.0" - sources."p-try-1.0.0" - sources."parse-json-4.0.0" - sources."path-exists-3.0.0" - sources."path-key-2.0.1" + sources."p-finally-2.0.1" + sources."p-limit-2.2.2" + sources."p-locate-4.1.0" + sources."p-try-2.2.0" + sources."parse-json-5.0.0" + sources."path-exists-4.0.0" + sources."path-key-3.1.1" sources."path-parse-1.0.6" - sources."path-type-3.0.0" (sources."pid-from-port-1.1.3" // { dependencies = [ sources."cross-spawn-5.1.0" sources."execa-0.9.0" + sources."get-stream-3.0.0" + sources."is-stream-1.1.0" + sources."npm-run-path-2.0.2" + sources."p-finally-1.0.0" + sources."path-key-2.0.1" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."which-1.3.1" ]; }) - sources."pify-3.0.0" - sources."pinkie-2.0.4" - sources."pinkie-promise-2.0.1" - (sources."process-exists-3.1.0" // { + sources."process-exists-4.0.0" + sources."ps-list-6.3.0" + sources."pseudomap-1.0.2" + sources."pump-3.0.0" + sources."quick-lru-4.0.1" + (sources."read-pkg-5.2.0" // { dependencies = [ - sources."ps-list-4.1.0" + sources."type-fest-0.6.0" ]; }) - sources."process-nextick-args-2.0.1" - sources."ps-list-5.0.1" - sources."pseudomap-1.0.2" - sources."quick-lru-1.1.0" - sources."read-pkg-3.0.0" - sources."read-pkg-up-3.0.0" - sources."readable-stream-2.3.7" - sources."redent-2.0.0" + sources."read-pkg-up-7.0.1" + sources."redent-3.0.0" sources."resolve-1.15.1" - sources."restore-cursor-2.0.0" + sources."restore-cursor-3.1.0" sources."run-async-2.3.0" sources."rxjs-6.5.4" - sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - sources."sec-1.0.0" sources."semver-5.7.1" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" sources."signal-exit-3.0.2" - sources."slice-ansi-1.0.0" + sources."slice-ansi-3.0.0" sources."spdx-correct-3.1.0" sources."spdx-exceptions-2.2.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.5" - sources."split2-2.2.0" - sources."string-width-2.1.1" - sources."string_decoder-1.1.1" - sources."strip-ansi-4.0.0" - sources."strip-bom-3.0.0" + sources."string-width-4.2.0" + sources."strip-ansi-6.0.0" sources."strip-eof-1.0.0" - sources."strip-indent-2.0.0" - sources."supports-color-5.5.0" - (sources."taskkill-2.0.0" // { - dependencies = [ - sources."execa-0.1.1" - ]; - }) - (sources."tasklist-3.1.1" // { + sources."strip-final-newline-2.0.0" + sources."strip-indent-3.0.0" + sources."supports-color-7.1.0" + (sources."taskkill-3.1.0" // { dependencies = [ - sources."pify-2.3.0" + sources."execa-3.4.0" ]; }) sources."through-2.3.8" - sources."through2-2.0.5" sources."tmp-0.0.33" - sources."trim-newlines-2.0.0" + sources."trim-newlines-3.0.0" sources."tslib-1.10.0" - sources."util-deprecate-1.0.2" + sources."type-fest-0.8.1" sources."validate-npm-package-license-3.0.4" - sources."which-1.3.1" - sources."xtend-4.0.2" + sources."which-2.0.2" + sources."wrappy-1.0.2" sources."yallist-2.1.2" - sources."yargs-parser-10.1.0" + sources."yargs-parser-16.1.0" ]; buildInputs = globalBuildInputs; meta = { @@ -54043,7 +54346,7 @@ in (sources."sodium-browserify-tweetnacl-0.2.6" // { dependencies = [ sources."sha.js-2.4.11" - sources."tweetnacl-1.0.2" + sources."tweetnacl-1.0.3" ]; }) sources."sodium-chloride-1.1.2" @@ -54051,7 +54354,7 @@ in sources."split-buffer-1.0.0" sources."ssb-avatar-0.2.0" sources."ssb-caps-1.1.0" - (sources."ssb-client-4.8.0" // { + (sources."ssb-client-4.9.0" // { dependencies = [ sources."ssb-config-3.4.4" ]; @@ -54173,7 +54476,7 @@ in sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."conf-6.2.0" - sources."configstore-5.0.0" + sources."configstore-5.0.1" sources."cross-spawn-7.0.1" sources."crypto-random-string-2.0.0" sources."debounce-fn-3.0.1" @@ -54193,13 +54496,14 @@ in sources."end-of-stream-1.4.4" sources."env-paths-2.2.0" sources."error-ex-1.3.2" + sources."escape-goat-2.1.1" sources."escape-string-regexp-1.0.5" sources."esutils-2.0.3" sources."execa-4.0.0" sources."external-editor-3.1.0" sources."fast-deep-equal-3.1.1" sources."fast-json-stable-stringify-2.1.0" - sources."figures-3.1.0" + sources."figures-3.2.0" sources."find-up-3.0.0" sources."fuse.js-3.4.6" sources."get-stream-5.1.0" @@ -54214,7 +54518,7 @@ in sources."has-flag-4.0.0" sources."has-yarn-2.1.0" sources."hosted-git-info-2.8.5" - sources."http-cache-semantics-4.0.3" + sources."http-cache-semantics-4.0.4" sources."human-signals-1.1.1" sources."iconv-lite-0.4.24" sources."import-lazy-2.1.0" @@ -54278,9 +54582,9 @@ in ]; }) sources."lowercase-keys-1.0.1" - sources."make-dir-3.0.0" + sources."make-dir-3.0.2" sources."map-obj-4.1.0" - sources."meow-6.0.0" + sources."meow-6.0.1" sources."merge-stream-2.0.0" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" @@ -54317,6 +54621,7 @@ in sources."prepend-http-2.0.0" sources."pump-3.0.0" sources."punycode-2.1.1" + sources."pupa-2.0.1" sources."quick-lru-4.0.1" sources."rc-1.2.8" (sources."read-pkg-5.2.0" // { @@ -54373,7 +54678,7 @@ in sources."type-fest-0.8.1" sources."typedarray-to-buffer-3.1.5" sources."unique-string-2.0.0" - sources."update-notifier-4.0.0" + sources."update-notifier-4.1.0" sources."uri-js-4.2.2" sources."url-parse-lax-3.0.0" sources."validate-npm-package-license-3.0.4" @@ -54497,7 +54802,7 @@ in sources."chalk-2.4.2" sources."change-case-3.1.0" sources."chardet-0.7.0" - sources."chownr-1.1.3" + sources."chownr-1.1.4" sources."ci-info-2.0.0" sources."cli-boxes-2.2.0" sources."cli-cursor-3.1.0" @@ -54645,7 +54950,7 @@ in sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.1" sources."fast-json-stable-stringify-2.1.0" - sources."figures-3.1.0" + sources."figures-3.2.0" sources."finalhandler-1.1.2" sources."find-0.2.9" sources."find-up-2.1.0" @@ -54709,7 +55014,7 @@ in sources."header-case-1.0.1" sources."homedir-polyfill-1.0.3" sources."hosted-git-info-2.8.5" - sources."http-cache-semantics-4.0.3" + sources."http-cache-semantics-4.0.4" (sources."http-errors-1.7.2" // { dependencies = [ sources."inherits-2.0.3" @@ -54781,7 +55086,7 @@ in }) sources."isstream-0.1.2" sources."iterall-1.3.0" - sources."js-base64-2.5.1" + sources."js-base64-2.5.2" sources."js-yaml-3.13.1" sources."jsbn-0.1.1" sources."jsesc-2.5.2" @@ -54972,7 +55277,7 @@ in sources."registry-auth-token-4.1.1" sources."registry-url-5.1.0" sources."replaceall-0.1.6" - sources."request-2.88.0" + sources."request-2.88.2" sources."request-promise-4.2.5" sources."request-promise-core-1.1.3" sources."require-directory-2.1.1" @@ -55056,11 +55361,7 @@ in sources."to-fast-properties-2.0.0" sources."to-readable-stream-1.0.0" sources."toidentifier-1.0.0" - (sources."tough-cookie-2.4.3" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) + sources."tough-cookie-2.5.0" sources."traverse-chain-0.1.0" sources."trim-right-1.0.1" sources."tslib-1.10.0" @@ -55478,7 +55779,7 @@ in sources."string_decoder-0.10.31" sources."strip-ansi-3.0.1" sources."supports-color-2.0.0" - sources."systeminformation-4.21.1" + sources."systeminformation-4.22.0" sources."term-canvas-0.0.5" sources."wordwrap-0.0.3" sources."x256-0.0.2" @@ -56541,7 +56842,7 @@ in sources."npm-2.15.12" sources."once-1.4.0" sources."path-is-absolute-1.0.1" - sources."readable-stream-3.5.0" + sources."readable-stream-3.6.0" sources."safe-buffer-5.2.0" sources."sprintf-js-1.0.3" sources."string_decoder-1.3.0" @@ -56692,7 +56993,7 @@ in ]; }) sources."chardet-0.7.0" - sources."chownr-1.1.3" + sources."chownr-1.1.4" sources."cli-cursor-2.1.0" sources."cli-width-2.2.0" sources."co-4.6.0" @@ -56745,7 +57046,7 @@ in sources."extend-3.0.2" sources."external-editor-3.1.0" sources."fast-levenshtein-2.0.6" - sources."figures-3.1.0" + sources."figures-3.2.0" sources."file-uri-to-path-1.0.0" sources."form-data-2.5.1" sources."formidable-1.2.1" @@ -56878,7 +57179,7 @@ in sources."pump-3.0.0" sources."qs-6.9.1" sources."raw-body-2.4.1" - sources."readable-stream-3.5.0" + sources."readable-stream-3.6.0" sources."restore-cursor-2.0.0" sources."rimraf-3.0.2" sources."rsvp-3.6.2" @@ -57249,7 +57550,7 @@ in sources."read-pkg-2.0.0" sources."read-pkg-up-2.0.0" sources."readable-stream-2.3.7" - sources."request-2.88.0" + sources."request-2.88.2" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" sources."resolve-1.15.1" @@ -57305,11 +57606,7 @@ in sources."tiny-emitter-2.1.0" sources."toml-3.0.0" sources."topsort-0.0.2" - (sources."tough-cookie-2.4.3" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) + sources."tough-cookie-2.5.0" sources."ts-process-promises-1.0.2" sources."tslib-1.9.3" sources."ttf2woff-2.0.1" @@ -57591,7 +57888,7 @@ in sources."caseless-0.12.0" sources."chalk-2.4.2" sources."charenc-0.0.2" - sources."chownr-1.1.3" + sources."chownr-1.1.4" sources."chroma-js-2.1.0" sources."clean-css-4.2.3" sources."clean-html-1.5.0" @@ -57828,7 +58125,7 @@ in sources."mime-2.4.4" sources."mime-db-1.43.0" sources."mime-types-2.1.26" - sources."mimic-response-2.0.0" + sources."mimic-response-2.1.0" sources."minimatch-3.0.4" sources."minimist-1.2.0" sources."minipass-3.1.1" @@ -57852,7 +58149,7 @@ in sources."needle-2.4.0" sources."nextgen-events-1.3.0" sources."no-case-2.3.2" - (sources."node-abi-2.14.0" // { + (sources."node-abi-2.15.0" // { dependencies = [ sources."semver-5.7.1" ]; @@ -57917,15 +58214,13 @@ in sources."random-bytes-1.0.0" sources."rc-1.2.8" sources."read-chunk-2.1.0" - sources."readable-stream-3.5.0" + sources."readable-stream-3.6.0" sources."reduce-flatten-1.0.1" sources."redux-3.7.2" sources."relateurl-0.2.7" - (sources."request-2.88.0" // { + (sources."request-2.88.2" // { dependencies = [ sources."form-data-2.3.3" - sources."punycode-1.4.1" - sources."tough-cookie-2.4.3" ]; }) sources."request-promise-core-1.1.3" @@ -57942,7 +58237,7 @@ in sources."set-blocking-2.0.0" sources."setimmediate-1.0.5" sources."setprototypeof-1.1.1" - sources."seventh-0.7.30" + sources."seventh-0.7.34" (sources."sharp-0.23.4" // { dependencies = [ sources."tar-5.0.5" @@ -58016,7 +58311,7 @@ in sources."q-0.9.7" ]; }) - sources."terminal-kit-1.32.3" + sources."terminal-kit-1.33.10" (sources."tkwidgets-0.5.26" // { dependencies = [ sources."is-fullwidth-code-point-2.0.0" @@ -58356,19 +58651,24 @@ in json-server = nodeEnv.buildNodePackage { name = "json-server"; packageName = "json-server"; - version = "0.15.1"; + version = "0.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/json-server/-/json-server-0.15.1.tgz"; - sha512 = "6Vc6tC1uLasnMd6Ksnq+4gSQcRqLuSJ/yLoIG4fr4P8f5dAR1gbCqgaVRlk8jfRune0NXcrfDrz7liwAD2WEeQ=="; + url = "https://registry.npmjs.org/json-server/-/json-server-0.16.0.tgz"; + sha512 = "vdqfkMAiHUCHMkTRgxNJsd0c+lnczxFCxM8bewyalEiunDD8XWXsvgsezAt4iycqWV5aVoR//irtyUX50ZpSdA=="; }; dependencies = [ sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" + sources."@types/color-name-1.1.1" sources."accepts-1.3.7" sources."ajv-6.11.0" - sources."ansi-align-3.0.0" + (sources."ansi-align-3.0.0" // { + dependencies = [ + sources."string-width-3.1.0" + ]; + }) sources."ansi-regex-4.1.0" - sources."ansi-styles-3.2.1" + sources."ansi-styles-4.2.1" sources."array-flatten-1.1.1" sources."asn1-0.2.4" sources."assert-plus-1.0.0" @@ -58378,7 +58678,7 @@ in sources."basic-auth-2.0.1" sources."bcrypt-pbkdf-1.0.2" sources."body-parser-1.19.0" - sources."boxen-3.2.0" + sources."boxen-4.2.0" sources."bytes-3.1.0" (sources."cacheable-request-6.1.0" // { dependencies = [ @@ -58388,13 +58688,18 @@ in }) sources."camelcase-5.3.1" sources."caseless-0.12.0" - sources."chalk-2.4.2" + sources."chalk-3.0.0" sources."ci-info-2.0.0" sources."cli-boxes-2.2.0" - sources."cliui-5.0.0" + (sources."cliui-6.0.0" // { + dependencies = [ + sources."ansi-regex-5.0.0" + sources."strip-ansi-6.0.0" + ]; + }) sources."clone-response-1.0.2" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" sources."combined-stream-1.0.8" sources."compressible-2.0.18" (sources."compression-1.7.4" // { @@ -58402,7 +58707,7 @@ in sources."bytes-3.0.0" ]; }) - sources."configstore-4.0.0" + sources."configstore-5.0.1" sources."connect-pause-0.1.1" sources."content-disposition-0.5.3" sources."content-type-1.0.4" @@ -58410,8 +58715,7 @@ in sources."cookie-signature-1.0.6" sources."core-util-is-1.0.2" sources."cors-2.8.5" - sources."cross-spawn-5.1.0" - sources."crypto-random-string-1.0.0" + sources."crypto-random-string-2.0.0" sources."dashdash-1.14.1" sources."debug-2.6.9" sources."decamelize-1.2.0" @@ -58421,7 +58725,7 @@ in sources."delayed-stream-1.0.0" sources."depd-1.1.2" sources."destroy-1.0.4" - sources."dot-prop-4.2.0" + sources."dot-prop-5.2.0" sources."duplexer3-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" @@ -58429,10 +58733,9 @@ in sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" sources."errorhandler-1.5.1" + sources."escape-goat-2.1.1" sources."escape-html-1.0.3" - sources."escape-string-regexp-1.0.5" sources."etag-1.8.1" - sources."execa-0.7.0" sources."express-4.17.1" (sources."express-urlrewrite-1.2.0" // { dependencies = [ @@ -58444,26 +58747,22 @@ in sources."fast-deep-equal-3.1.1" sources."fast-json-stable-stringify-2.1.0" sources."finalhandler-1.1.2" - sources."find-up-3.0.0" + sources."find-up-4.1.0" sources."forever-agent-0.6.1" sources."form-data-2.3.3" sources."forwarded-0.1.2" sources."fresh-0.5.2" sources."get-caller-file-2.0.5" - sources."get-stream-3.0.0" + sources."get-stream-4.1.0" sources."getpass-0.1.7" - sources."global-dirs-0.1.1" - (sources."got-9.6.0" // { - dependencies = [ - sources."get-stream-4.1.0" - ]; - }) + sources."global-dirs-2.0.1" + sources."got-9.6.0" sources."graceful-fs-4.2.3" sources."har-schema-2.0.0" sources."har-validator-5.1.3" - sources."has-flag-3.0.0" + sources."has-flag-4.0.0" sources."has-yarn-2.1.0" - sources."http-cache-semantics-4.0.3" + sources."http-cache-semantics-4.0.4" sources."http-errors-1.7.2" sources."http-signature-1.2.0" sources."iconv-lite-0.4.24" @@ -58474,16 +58773,14 @@ in sources."ipaddr.js-1.9.0" sources."is-ci-2.0.0" sources."is-fullwidth-code-point-2.0.0" - sources."is-installed-globally-0.1.0" - sources."is-npm-3.0.0" - sources."is-obj-1.0.1" - sources."is-path-inside-1.0.1" + sources."is-installed-globally-0.3.1" + sources."is-npm-4.0.0" + sources."is-obj-2.0.0" + sources."is-path-inside-3.0.2" sources."is-promise-2.1.0" - sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" sources."is-yarn-global-0.3.0" sources."isarray-0.0.1" - sources."isexe-2.0.0" sources."isstream-0.1.2" sources."jju-1.4.0" sources."jsbn-0.1.1" @@ -58495,13 +58792,12 @@ in sources."jsprim-1.4.1" sources."keyv-3.1.0" sources."latest-version-5.1.0" - sources."locate-path-3.0.0" + sources."locate-path-5.0.0" sources."lodash-4.17.15" sources."lodash-id-0.14.0" sources."lowdb-1.0.0" sources."lowercase-keys-1.0.1" - sources."lru-cache-4.1.5" - sources."make-dir-1.3.0" + sources."make-dir-3.0.2" sources."media-typer-0.3.0" sources."merge-descriptors-1.0.1" (sources."method-override-3.0.0" // { @@ -58520,22 +58816,18 @@ in sources."nanoid-2.1.11" sources."negotiator-0.6.2" sources."normalize-url-4.5.0" - sources."npm-run-path-2.0.2" sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" sources."p-cancelable-1.1.0" - sources."p-finally-1.0.0" sources."p-limit-2.2.2" - sources."p-locate-3.0.0" + sources."p-locate-4.1.0" sources."p-try-2.2.0" sources."package-json-6.5.0" sources."parseurl-1.3.3" - sources."path-exists-3.0.0" - sources."path-is-inside-1.0.2" - sources."path-key-2.0.1" + sources."path-exists-4.0.0" sources."path-to-regexp-0.1.7" sources."performance-now-2.1.0" sources."pify-3.0.0" @@ -58543,17 +58835,17 @@ in sources."pluralize-8.0.0" sources."prepend-http-2.0.0" sources."proxy-addr-2.0.5" - sources."pseudomap-1.0.2" sources."psl-1.7.0" sources."pump-3.0.0" sources."punycode-2.1.1" + sources."pupa-2.0.1" sources."qs-6.7.0" sources."range-parser-1.2.1" sources."raw-body-2.4.0" sources."rc-1.2.8" sources."registry-auth-token-4.1.1" sources."registry-url-5.1.0" - (sources."request-2.88.0" // { + (sources."request-2.88.2" // { dependencies = [ sources."qs-6.5.2" ]; @@ -58565,11 +58857,7 @@ in sources."safer-buffer-2.1.2" sources."semver-6.3.0" sources."semver-compare-1.0.0" - (sources."semver-diff-2.1.0" // { - dependencies = [ - sources."semver-5.7.1" - ]; - }) + sources."semver-diff-3.1.1" (sources."send-0.17.1" // { dependencies = [ sources."ms-2.1.1" @@ -58579,59 +58867,57 @@ in sources."server-destroy-1.0.1" sources."set-blocking-2.0.0" sources."setprototypeof-1.1.1" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" sources."signal-exit-3.0.2" sources."sshpk-1.16.1" sources."statuses-1.5.0" sources."steno-0.4.4" - sources."string-width-3.1.0" + (sources."string-width-4.2.0" // { + dependencies = [ + sources."ansi-regex-5.0.0" + sources."emoji-regex-8.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."strip-ansi-6.0.0" + ]; + }) sources."strip-ansi-5.2.0" - sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" - sources."supports-color-5.5.0" - sources."term-size-1.2.0" + sources."supports-color-7.1.0" + sources."term-size-2.2.0" sources."to-readable-stream-1.0.0" sources."toidentifier-1.0.0" - (sources."tough-cookie-2.4.3" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) + sources."tough-cookie-2.5.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."type-fest-0.3.1" + sources."type-fest-0.8.1" sources."type-is-1.6.18" - sources."unique-string-1.0.0" + sources."typedarray-to-buffer-3.1.5" + sources."unique-string-2.0.0" sources."unpipe-1.0.0" - sources."update-notifier-3.0.1" + sources."update-notifier-4.1.0" sources."uri-js-4.2.2" sources."url-parse-lax-3.0.0" sources."utils-merge-1.0.1" sources."uuid-3.4.0" sources."vary-1.1.2" sources."verror-1.10.0" - sources."which-1.3.1" sources."which-module-2.0.0" - (sources."widest-line-2.0.1" // { + sources."widest-line-3.1.0" + (sources."wrap-ansi-6.2.0" // { dependencies = [ - sources."ansi-regex-3.0.0" - sources."string-width-2.1.1" - sources."strip-ansi-4.0.0" + sources."ansi-regex-5.0.0" + sources."strip-ansi-6.0.0" ]; }) - sources."wrap-ansi-5.1.0" sources."wrappy-1.0.2" - sources."write-file-atomic-2.4.3" - sources."xdg-basedir-3.0.0" + sources."write-file-atomic-3.0.1" + sources."xdg-basedir-4.0.0" sources."y18n-4.0.0" - sources."yallist-2.1.2" - sources."yargs-14.2.2" - sources."yargs-parser-15.0.0" + sources."yargs-15.1.0" + sources."yargs-parser-16.1.0" ]; buildInputs = globalBuildInputs; meta = { - description = "Serves JSON files through REST routes."; + description = "Get a full fake REST API with zero coding in less than 30 seconds"; homepage = https://github.com/typicode/json-server; license = "MIT"; }; @@ -59330,7 +59616,7 @@ in sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.7.0" + sources."@types/node-13.7.1" sources."@zkochan/cmd-shim-3.1.0" sources."JSONStream-1.3.5" sources."abbrev-1.1.1" @@ -59398,7 +59684,7 @@ in sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chardet-0.7.0" - sources."chownr-1.1.3" + sources."chownr-1.1.4" sources."ci-info-2.0.0" (sources."class-utils-0.3.6" // { dependencies = [ @@ -59468,7 +59754,7 @@ in sources."concat-stream-2.0.0" sources."meow-4.0.1" sources."minimist-1.2.0" - sources."readable-stream-3.5.0" + sources."readable-stream-3.6.0" ]; }) sources."copy-concurrently-1.0.5" @@ -59943,7 +60229,7 @@ in sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" sources."repeating-2.0.1" - sources."request-2.88.0" + sources."request-2.88.2" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" sources."resolve-1.15.1" @@ -60086,11 +60372,7 @@ in }) sources."to-regex-3.0.2" sources."to-regex-range-2.1.1" - (sources."tough-cookie-2.4.3" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) + sources."tough-cookie-2.5.0" sources."tr46-1.0.1" sources."trim-newlines-2.0.0" sources."trim-off-newlines-1.0.1" @@ -60185,10 +60467,10 @@ in less = nodeEnv.buildNodePackage { name = "less"; packageName = "less"; - version = "3.11.0"; + version = "3.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/less/-/less-3.11.0.tgz"; - sha512 = "dAui5qzfxuWY7BIEt9/gy5EbDhwDb44rqaIUFYeu8wEE8huMZ/PzB+gNFONEG5DUPrOrOGcAjGeYVg6AFiA9KQ=="; + url = "https://registry.npmjs.org/less/-/less-3.11.1.tgz"; + sha512 = "tlWX341RECuTOvoDIvtFqXsKj072hm3+9ymRBe76/mD6O5ZZecnlAOVDlWAleF2+aohFrxNidXhv2773f6kY7g=="; }; dependencies = [ sources."ajv-6.11.0" @@ -60238,16 +60520,13 @@ in sources."psl-1.7.0" sources."punycode-2.1.1" sources."qs-6.5.2" - sources."request-2.88.0" + sources."request-2.88.2" sources."safe-buffer-5.2.0" sources."safer-buffer-2.1.2" sources."source-map-0.6.1" sources."sshpk-1.16.1" - (sources."tough-cookie-2.4.3" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) + sources."tough-cookie-2.5.0" + sources."tslib-1.10.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."uri-js-4.2.2" @@ -60974,7 +61253,7 @@ in sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" - (sources."request-2.88.0" // { + (sources."request-2.88.2" // { dependencies = [ sources."qs-6.5.2" ]; @@ -61084,11 +61363,7 @@ in ]; }) sources."toidentifier-1.0.0" - (sources."tough-cookie-2.4.3" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) + sources."tough-cookie-2.5.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.18" @@ -61229,7 +61504,7 @@ in sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.7.0" + sources."@types/node-13.7.1" sources."@webassemblyjs/ast-1.8.5" sources."@webassemblyjs/floating-point-hex-parser-1.8.5" sources."@webassemblyjs/helper-api-error-1.8.5" @@ -61423,7 +61698,7 @@ in sources."browserify-rsa-4.0.1" sources."browserify-sign-4.0.4" sources."browserify-zlib-0.2.0" - sources."browserslist-4.8.6" + sources."browserslist-4.8.7" sources."buffer-5.4.3" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" @@ -61446,7 +61721,7 @@ in }) sources."call-me-maybe-1.0.1" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001025" + sources."caniuse-lite-1.0.30001027" sources."caw-2.0.1" (sources."chalk-2.4.2" // { dependencies = [ @@ -61473,7 +61748,7 @@ in sources."normalize-path-3.0.0" ]; }) - sources."chownr-1.1.3" + sources."chownr-1.1.4" sources."chrome-trace-event-1.0.2" sources."cipher-base-1.0.4" (sources."class-utils-0.3.6" // { @@ -61603,7 +61878,7 @@ in }) sources."duplexer3-0.1.4" sources."duplexify-3.7.1" - sources."electron-to-chromium-1.3.346" + sources."electron-to-chromium-1.3.353" sources."elliptic-6.5.2" sources."emoji-regex-7.0.3" sources."emojis-list-2.1.0" @@ -61795,7 +62070,7 @@ in ]; }) sources."get-stream-4.1.0" - sources."http-cache-semantics-4.0.3" + sources."http-cache-semantics-4.0.4" sources."normalize-url-4.5.0" sources."p-cancelable-1.1.0" ]; @@ -61980,7 +62255,7 @@ in sources."punycode-1.4.1" ]; }) - (sources."node-releases-1.1.48" // { + (sources."node-releases-1.1.49" // { dependencies = [ sources."semver-6.3.0" ]; @@ -62166,7 +62441,7 @@ in sources."regex-not-1.0.2" sources."regexpu-core-4.6.0" sources."regjsgen-0.5.1" - (sources."regjsparser-0.6.2" // { + (sources."regjsparser-0.6.3" // { dependencies = [ sources."jsesc-0.5.0" ]; @@ -62394,7 +62669,7 @@ in sources."vm-browserify-1.1.2" sources."watchpack-1.6.0" sources."wcwidth-1.0.1" - (sources."webpack-4.41.5" // { + (sources."webpack-4.41.6" // { dependencies = [ sources."arr-diff-4.0.0" sources."array-unique-0.3.2" @@ -62437,7 +62712,7 @@ in sources."ms-2.0.0" ]; }) - (sources."webpack-cli-3.3.10" // { + (sources."webpack-cli-3.3.11" // { dependencies = [ sources."enhanced-resolve-4.1.0" sources."memory-fs-0.4.1" @@ -62498,10 +62773,10 @@ in madoko = nodeEnv.buildNodePackage { name = "madoko"; packageName = "madoko"; - version = "1.1.8"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/madoko/-/madoko-1.1.8.tgz"; - sha512 = "SYChn9LZ7X8hXFHe/y11cebSC4N1+F7LncYCunRX2IW4u5w2y0J2wWw+RicYm6+JZORI61EdzgJFWqQDjgsAEQ=="; + url = "https://registry.npmjs.org/madoko/-/madoko-1.2.0.tgz"; + sha512 = "MTpclhNPFArohFqLNqA+3/6JycVgwiFD8d6i7zuELvs1BDKQv8m4fw2SOSnkFddFnU/FcYLl0P0UkIe0YZ4GZA=="; }; dependencies = [ sources."amdefine-1.0.1" @@ -62580,16 +62855,12 @@ in sources."psl-1.7.0" sources."punycode-2.1.1" sources."qs-6.5.2" - sources."request-2.88.0" + sources."request-2.88.2" sources."safe-buffer-5.2.0" sources."safer-buffer-2.1.2" sources."sshpk-1.16.1" sources."supports-color-5.5.0" - (sources."tough-cookie-2.4.3" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) + sources."tough-cookie-2.5.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."uri-js-4.2.2" @@ -62835,7 +63106,11 @@ in sources."ecc-jsbn-0.1.2" sources."end-of-stream-0.1.5" sources."errno-0.1.7" - sources."es5-ext-0.10.53" + (sources."es5-ext-0.10.53" // { + dependencies = [ + sources."next-tick-1.0.0" + ]; + }) sources."es6-iterator-2.0.3" sources."es6-symbol-3.1.3" sources."es6-weak-map-2.0.3" @@ -63132,7 +63407,7 @@ in sources."multipipe-0.1.2" sources."nanomatch-1.2.13" sources."natives-1.1.6" - sources."next-tick-1.0.0" + sources."next-tick-1.1.0" sources."normalize-path-2.1.1" sources."now-and-later-2.0.1" sources."oauth-sign-0.8.2" @@ -63618,9 +63893,9 @@ in sources."ms-2.1.2" sources."one-time-0.0.4" sources."process-nextick-args-2.0.1" - sources."readable-stream-3.5.0" + sources."readable-stream-3.6.0" sources."safe-buffer-5.2.0" - sources."semver-7.1.2" + sources."semver-7.1.3" sources."simple-swizzle-0.2.2" sources."stack-trace-0.0.10" sources."string_decoder-1.3.0" @@ -63691,7 +63966,7 @@ in sources."bcrypt-pbkdf-1.0.2" sources."brace-expansion-1.1.11" sources."caseless-0.12.0" - sources."chownr-1.1.3" + sources."chownr-1.1.4" sources."code-point-at-1.1.0" sources."combined-stream-1.0.8" sources."concat-map-0.0.1" @@ -63753,7 +64028,7 @@ in sources."punycode-2.1.1" sources."qs-6.5.2" sources."readable-stream-2.3.7" - sources."request-2.88.0" + sources."request-2.88.2" sources."rimraf-2.7.1" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" @@ -63765,11 +64040,7 @@ in sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" sources."tar-4.4.13" - (sources."tough-cookie-2.4.3" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) + sources."tough-cookie-2.5.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."uri-js-4.2.2" @@ -64123,7 +64394,7 @@ in sources."are-we-there-yet-1.1.5" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" - sources."chownr-1.1.3" + sources."chownr-1.1.4" sources."code-point-at-1.1.0" sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" @@ -64292,7 +64563,7 @@ in }) sources."caseless-0.12.0" sources."cheerio-0.22.0" - sources."chownr-1.1.3" + sources."chownr-1.1.4" sources."clone-2.1.2" sources."code-point-at-1.1.0" sources."combined-stream-1.0.8" @@ -64585,7 +64856,7 @@ in sources."range-parser-1.2.1" sources."raw-body-2.4.0" sources."rc-1.2.8" - sources."readable-stream-3.5.0" + sources."readable-stream-3.6.0" sources."regenerator-runtime-0.13.3" sources."reinterval-1.1.0" sources."remove-trailing-separator-1.1.0" @@ -64728,7 +64999,7 @@ in sources."buffer-from-1.1.1" sources."builtins-1.0.3" sources."caseless-0.12.0" - sources."chownr-1.1.3" + sources."chownr-1.1.4" sources."code-point-at-1.1.0" sources."combined-stream-1.0.8" sources."concat-map-0.0.1" @@ -64836,7 +65107,7 @@ in sources."safe-buffer-5.1.2" ]; }) - sources."request-2.88.0" + sources."request-2.88.2" sources."resolve-1.15.1" sources."retry-0.10.1" sources."rimraf-2.6.3" @@ -64862,11 +65133,7 @@ in sources."strip-ansi-3.0.1" sources."tar-4.4.13" sources."temp-0.9.1" - (sources."tough-cookie-2.4.3" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) + sources."tough-cookie-2.5.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."typedarray-0.0.6" @@ -64994,7 +65261,7 @@ in sources."timed-out-4.0.1" sources."to-regex-range-5.0.1" sources."touch-3.1.0" - (sources."undefsafe-2.0.2" // { + (sources."undefsafe-2.0.3" // { dependencies = [ sources."debug-2.6.9" sources."ms-2.0.0" @@ -65083,7 +65350,7 @@ in }) sources."camelcase-5.3.1" sources."chalk-3.0.0" - sources."chownr-1.1.3" + sources."chownr-1.1.4" sources."ci-info-2.0.0" sources."cint-8.2.1" sources."clean-stack-2.2.0" @@ -65148,7 +65415,7 @@ in sources."has-flag-4.0.0" sources."has-yarn-2.1.0" sources."hosted-git-info-3.0.2" - sources."http-cache-semantics-4.0.3" + sources."http-cache-semantics-4.0.4" sources."http-proxy-agent-3.0.0" sources."https-proxy-agent-4.0.0" sources."humanize-ms-1.2.1" @@ -65241,19 +65508,19 @@ in sources."npm-normalize-package-bin-1.0.1" (sources."npm-package-arg-8.0.0" // { dependencies = [ - sources."semver-7.1.2" + sources."semver-7.1.3" ]; }) - sources."npm-packlist-2.0.3" + sources."npm-packlist-2.1.0" (sources."npm-pick-manifest-5.0.0" // { dependencies = [ - sources."semver-7.1.2" + sources."semver-7.1.3" ]; }) - (sources."npm-registry-fetch-6.0.0" // { + (sources."npm-registry-fetch-6.0.2" // { dependencies = [ sources."safe-buffer-5.2.0" - sources."semver-7.1.2" + sources."semver-7.1.3" ]; }) sources."npm-run-path-2.0.2" @@ -65270,7 +65537,7 @@ in sources."package-json-6.5.0" (sources."pacote-10.3.2" // { dependencies = [ - sources."semver-7.1.2" + sources."semver-7.1.3" ]; }) sources."path-exists-4.0.0" @@ -65284,7 +65551,7 @@ in sources."progress-2.0.3" sources."promise-inflight-1.0.1" sources."promise-retry-1.1.1" - sources."prompts-2.3.0" + sources."prompts-2.3.1" sources."pseudomap-1.0.2" sources."pump-3.0.0" (sources."rc-1.2.8" // { @@ -65509,7 +65776,7 @@ in sources."safe-buffer-5.1.2" ]; }) - sources."request-2.88.0" + sources."request-2.88.2" sources."retry-0.6.0" sources."rimraf-2.7.1" sources."safe-buffer-5.2.0" @@ -65537,11 +65804,7 @@ in sources."rimraf-2.1.4" ]; }) - (sources."tough-cookie-2.4.3" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) + sources."tough-cookie-2.5.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."underscore-1.4.4" @@ -65796,7 +66059,7 @@ in sources."pako-1.0.11" ]; }) - sources."browserslist-4.8.6" + sources."browserslist-4.8.7" (sources."buffer-4.9.2" // { dependencies = [ sources."isarray-1.0.0" @@ -65813,7 +66076,7 @@ in sources."callsites-2.0.0" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001025" + sources."caniuse-lite-1.0.30001027" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -65943,13 +66206,13 @@ in sources."domexception-1.0.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."dot-prop-4.2.0" + sources."dot-prop-5.2.0" sources."dotenv-5.0.1" sources."dotenv-expand-5.1.0" sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.346" + sources."electron-to-chromium-1.3.353" sources."elliptic-6.5.2" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" @@ -66052,7 +66315,7 @@ in }) (sources."htmlparser2-3.10.1" // { dependencies = [ - sources."readable-stream-3.5.0" + sources."readable-stream-3.6.0" ]; }) sources."http-errors-1.7.3" @@ -66095,7 +66358,7 @@ in sources."is-glob-4.0.1" sources."is-html-1.1.0" sources."is-number-3.0.0" - sources."is-obj-1.0.1" + sources."is-obj-2.0.0" sources."is-plain-object-2.0.4" sources."is-regex-1.0.5" sources."is-resolvable-1.1.0" @@ -66199,7 +66462,7 @@ in sources."punycode-1.4.1" ]; }) - (sources."node-releases-1.1.48" // { + (sources."node-releases-1.1.49" // { dependencies = [ sources."semver-6.3.0" ]; @@ -66261,7 +66524,7 @@ in sources."postcss-merge-longhand-4.0.11" (sources."postcss-merge-rules-4.0.3" // { dependencies = [ - sources."postcss-selector-parser-3.1.1" + sources."postcss-selector-parser-3.1.2" ]; }) sources."postcss-minify-font-values-4.0.2" @@ -66269,7 +66532,7 @@ in sources."postcss-minify-params-4.0.2" (sources."postcss-minify-selectors-4.0.2" // { dependencies = [ - sources."postcss-selector-parser-3.1.1" + sources."postcss-selector-parser-3.1.2" ]; }) (sources."postcss-modules-extract-imports-1.1.0" // { @@ -66354,7 +66617,7 @@ in }) sources."regexpu-core-4.6.0" sources."regjsgen-0.5.1" - (sources."regjsparser-0.6.2" // { + (sources."regjsparser-0.6.3" // { dependencies = [ sources."jsesc-0.5.0" ]; @@ -66362,12 +66625,7 @@ in sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" - (sources."request-2.88.0" // { - dependencies = [ - sources."punycode-1.4.1" - sources."tough-cookie-2.4.3" - ]; - }) + sources."request-2.88.2" sources."request-promise-core-1.1.3" sources."request-promise-native-1.0.8" sources."require-directory-2.1.1" @@ -66463,7 +66721,7 @@ in sources."strip-ansi-4.0.0" (sources."stylehacks-4.0.3" // { dependencies = [ - sources."postcss-selector-parser-3.1.1" + sources."postcss-selector-parser-3.1.2" ]; }) sources."supports-color-5.5.0" @@ -66493,7 +66751,7 @@ in sources."tweetnacl-0.14.5" sources."type-check-0.3.2" sources."typedarray-0.0.6" - (sources."uncss-0.17.2" // { + (sources."uncss-0.17.3" // { dependencies = [ sources."cssesc-3.0.0" sources."is-absolute-url-3.0.3" @@ -67153,8 +67411,8 @@ in sources."raw-body-2.4.0" sources."re-emitter-1.1.4" sources."read-torrent-1.3.1" - sources."readable-stream-3.5.0" - (sources."request-2.88.0" // { + sources."readable-stream-3.6.0" + (sources."request-2.88.2" // { dependencies = [ sources."qs-6.5.2" ]; @@ -67233,11 +67491,7 @@ in sources."once-1.3.3" ]; }) - (sources."tough-cookie-2.4.3" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) + sources."tough-cookie-2.5.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.18" @@ -67321,7 +67575,7 @@ in sources."fs.realpath-1.0.0" sources."gaze-1.1.3" sources."glob-7.1.6" - sources."globule-1.3.0" + sources."globule-1.3.1" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."isexe-2.0.0" @@ -67355,7 +67609,7 @@ in sources."JSONStream-1.3.5" sources."acorn-7.1.0" sources."acorn-node-1.8.2" - sources."acorn-walk-7.0.0" + sources."acorn-walk-7.1.1" sources."asn1.js-4.10.1" (sources."assert-1.5.0" // { dependencies = [ @@ -67405,7 +67659,7 @@ in sources."concat-map-0.0.1" (sources."concat-stream-2.0.0" // { dependencies = [ - sources."readable-stream-3.5.0" + sources."readable-stream-3.6.0" ]; }) sources."console-browserify-1.2.0" @@ -67438,7 +67692,7 @@ in sources."gaze-1.1.3" sources."get-assigned-identifiers-1.2.0" sources."glob-7.1.6" - sources."globule-1.3.0" + sources."globule-1.3.1" sources."graceful-fs-4.2.3" sources."has-1.0.3" sources."hash-base-3.0.4" @@ -67537,7 +67791,7 @@ in sources."stream-combiner2-1.1.1" (sources."stream-http-3.1.0" // { dependencies = [ - sources."readable-stream-3.5.0" + sources."readable-stream-3.6.0" ]; }) sources."stream-splicer-2.0.1" @@ -67869,7 +68123,7 @@ in (sources."openid-2.0.6" // { dependencies = [ sources."qs-6.5.2" - sources."request-2.88.0" + sources."request-2.88.2" ]; }) sources."pause-0.0.1" @@ -67889,11 +68143,7 @@ in sources."stream-counter-0.2.0" sources."string-1.6.1" sources."string_decoder-0.10.31" - (sources."tough-cookie-2.4.3" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) + sources."tough-cookie-2.5.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."uid2-0.0.3" @@ -67914,10 +68164,10 @@ in semver = nodeEnv.buildNodePackage { name = "semver"; packageName = "semver"; - version = "7.1.2"; + version = "7.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-7.1.2.tgz"; - sha512 = "BJs9T/H8sEVHbeigqzIEo57Iu/3DG6c4QoqTfbQB3BPA4zgzAomh/Fk9E7QtjWQ8mx2dgA9YCfSF4y9k9bHNpQ=="; + url = "https://registry.npmjs.org/semver/-/semver-7.1.3.tgz"; + sha512 = "ekM0zfiA9SCBlsKa2X1hxyxiI4L3B6EbVJkkdgQXnSEEaHlGdvyodMruTiulSRWMMB4NeIuYNMC9rTKTz97GxA=="; }; buildInputs = globalBuildInputs; meta = { @@ -68057,11 +68307,11 @@ in sources."semver-6.3.0" ]; }) - (sources."@serverless/enterprise-plugin-3.3.0" // { + (sources."@serverless/enterprise-plugin-3.4.0" // { dependencies = [ sources."fs-extra-8.1.0" sources."node-fetch-2.6.0" - sources."semver-7.1.2" + sources."semver-6.3.0" sources."uuid-3.4.0" ]; }) @@ -68108,7 +68358,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.614.0" // { + (sources."aws-sdk-2.620.0" // { dependencies = [ sources."buffer-4.9.1" sources."uuid-3.3.2" @@ -68302,7 +68552,7 @@ in sources."external-editor-3.1.0" sources."fast-levenshtein-2.0.6" sources."fd-slicer-1.1.0" - sources."figures-3.1.0" + sources."figures-3.2.0" sources."file-type-8.1.0" sources."filename-reserved-regex-2.0.0" sources."filenamify-2.1.0" @@ -68359,7 +68609,7 @@ in sources."kind-of-4.0.0" ]; }) - sources."http-cache-semantics-4.0.3" + sources."http-cache-semantics-4.0.4" sources."https-proxy-agent-4.0.0" sources."iconv-lite-0.4.24" sources."ieee754-1.1.13" @@ -68623,7 +68873,7 @@ in sources."split-string-3.1.0" (sources."split2-3.1.1" // { dependencies = [ - sources."readable-stream-3.5.0" + sources."readable-stream-3.6.0" ]; }) sources."sprintf-js-1.0.3" @@ -68915,7 +69165,7 @@ in sources."raw-body-2.4.0" sources."read-1.0.7" sources."readable-stream-1.1.14" - (sources."request-2.88.0" // { + (sources."request-2.88.2" // { dependencies = [ sources."qs-6.5.2" ]; @@ -68966,11 +69216,7 @@ in sources."tinycolor-0.0.1" sources."to-array-0.1.3" sources."toidentifier-1.0.0" - (sources."tough-cookie-2.4.3" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) + sources."tough-cookie-2.5.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.18" @@ -69393,10 +69639,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.290.2"; + version = "1.292.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.290.2.tgz"; - sha512 = "siieHkSY/b3Yw1Gf84L07j65m2Bht1PamAbX3cmZ1zAzsUxfXpqZq5W9PlAp5z1d0Tp1vxsQmXw6UGW0K1Tq1Q=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.292.0.tgz"; + sha512 = "ga4ouBqRc897Ts80yzdZG25zqGgbU3ah8VKtLyRjK1ZmApHy+PRi2zBVJcwMspyfhyaCh47vr1siIqHler4rxg=="; }; dependencies = [ sources."@snyk/cli-interface-2.3.0" @@ -69417,7 +69663,7 @@ in sources."@types/debug-4.1.5" sources."@types/events-3.0.0" sources."@types/js-yaml-3.12.2" - sources."@types/node-13.7.0" + sources."@types/node-13.7.1" sources."@types/restify-4.3.6" sources."@types/semver-5.5.0" sources."@types/xml2js-0.4.3" @@ -69437,7 +69683,7 @@ in sources."balanced-match-1.0.0" (sources."bl-3.0.0" // { dependencies = [ - sources."readable-stream-3.5.0" + sources."readable-stream-3.6.0" sources."string_decoder-1.3.0" ]; }) @@ -69687,7 +69933,7 @@ in ]; }) sources."snyk-module-1.9.1" - (sources."snyk-mvn-plugin-2.8.0" // { + (sources."snyk-mvn-plugin-2.9.0" // { dependencies = [ sources."@snyk/cli-interface-2.3.1" sources."debug-4.1.1" @@ -69747,7 +69993,7 @@ in sources."supports-color-5.5.0" (sources."tar-stream-2.1.0" // { dependencies = [ - sources."readable-stream-3.5.0" + sources."readable-stream-3.6.0" sources."string_decoder-1.3.0" ]; }) @@ -70355,7 +70601,7 @@ in sources."level-errors-2.0.1" (sources."level-iterator-stream-4.0.2" // { dependencies = [ - sources."readable-stream-3.5.0" + sources."readable-stream-3.6.0" ]; }) sources."level-js-4.0.2" @@ -70708,7 +70954,7 @@ in (sources."sodium-browserify-tweetnacl-0.2.6" // { dependencies = [ sources."sha.js-2.4.11" - sources."tweetnacl-1.0.2" + sources."tweetnacl-1.0.3" ]; }) sources."sodium-chloride-1.1.2" @@ -70720,7 +70966,7 @@ in sources."split-string-3.1.0" sources."ssb-blobs-1.2.2" sources."ssb-caps-1.1.0" - sources."ssb-client-4.8.0" + sources."ssb-client-4.9.0" sources."ssb-config-3.4.4" sources."ssb-db-19.2.0" sources."ssb-ebt-5.6.7" @@ -70948,7 +71194,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.614.0" // { + (sources."aws-sdk-2.620.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -71221,7 +71467,7 @@ in sources."isstream-0.1.2" sources."jmespath-0.15.0" sources."jpeg-turbo-0.4.0" - sources."js-base64-2.5.1" + sources."js-base64-2.5.2" sources."js-stringify-1.0.2" sources."js-yaml-3.2.7" sources."jsbn-0.1.1" @@ -71427,7 +71673,7 @@ in }) sources."regenerator-runtime-0.11.1" sources."repeat-string-1.6.1" - (sources."request-2.88.0" // { + (sources."request-2.88.2" // { dependencies = [ sources."assert-plus-1.0.0" sources."aws-sign2-0.7.0" @@ -71436,8 +71682,9 @@ in sources."har-validator-5.1.3" sources."http-signature-1.2.0" sources."oauth-sign-0.9.0" + sources."punycode-2.1.1" sources."qs-6.5.2" - sources."tough-cookie-2.4.3" + sources."tough-cookie-2.5.0" sources."tunnel-agent-0.6.0" ]; }) @@ -72372,7 +72619,7 @@ in sources."source-map-0.6.1" ]; }) - sources."undefsafe-2.0.2" + sources."undefsafe-2.0.3" (sources."union-value-1.0.1" // { dependencies = [ sources."is-extendable-0.1.1" @@ -72438,7 +72685,7 @@ in sha256 = "886069ecc5eedf0371b948e8ff66e7f2943c85fe7cfdaa7183e1a3572d55852b"; }; dependencies = [ - sources."@types/node-13.7.0" + sources."@types/node-13.7.1" sources."ajv-6.11.0" sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" @@ -72511,7 +72758,7 @@ in sources."punycode-2.1.1" sources."qs-6.5.2" sources."ramda-0.25.0" - sources."request-2.88.0" + sources."request-2.88.2" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" sources."safe-buffer-5.2.0" @@ -72530,13 +72777,9 @@ in sources."strip-ansi-5.2.0" sources."telegraf-3.36.0" sources."telegram-typings-3.6.1" - (sources."tough-cookie-2.4.3" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) + sources."tough-cookie-2.5.0" sources."tunnel-agent-0.6.0" - sources."tweetnacl-1.0.2" + sources."tweetnacl-1.0.3" sources."uri-js-4.2.2" sources."uuid-3.4.0" sources."verror-1.10.0" @@ -73165,12 +73408,12 @@ in sources."unified-message-control-1.0.4" sources."unique-string-1.0.0" sources."unist-util-is-3.0.0" - sources."unist-util-modify-children-1.1.5" - sources."unist-util-position-3.0.4" + sources."unist-util-modify-children-1.1.6" + sources."unist-util-position-3.1.0" sources."unist-util-remove-position-1.1.4" sources."unist-util-stringify-position-1.1.2" sources."unist-util-visit-1.4.1" - sources."unist-util-visit-children-1.1.3" + sources."unist-util-visit-children-1.1.4" sources."unist-util-visit-parents-2.1.2" sources."untildify-2.1.0" sources."unzip-response-2.0.1" @@ -73365,7 +73608,7 @@ in sources."object-keys-1.1.1" sources."object.assign-4.1.0" sources."object.values-1.1.1" - sources."readable-stream-3.5.0" + sources."readable-stream-3.6.0" sources."safe-buffer-5.2.0" sources."sentence-splitter-3.2.0" sources."string.prototype.trimleft-2.1.1" @@ -73431,10 +73674,10 @@ in textlint-rule-stop-words = nodeEnv.buildNodePackage { name = "textlint-rule-stop-words"; packageName = "textlint-rule-stop-words"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/textlint-rule-stop-words/-/textlint-rule-stop-words-2.0.1.tgz"; - sha512 = "TUnOIMXl850Px9bl3H522UeeStmh92EYwXXnkMZOBIerHwFLG2KaaH+qGN+FaL0EugKj6WY8QKG6jOufGAiJsQ=="; + url = "https://registry.npmjs.org/textlint-rule-stop-words/-/textlint-rule-stop-words-2.0.2.tgz"; + sha512 = "Z96YepMqs2iS3shN8BxegxLQg0g6CQdmvooJ6MA/pmJPZyD+EMuBHqXOkE52GRuz2Z73m3vnh3/BLaryzsMNtw=="; }; dependencies = [ sources."@textlint/ast-node-types-4.2.5" @@ -73461,10 +73704,10 @@ in textlint-rule-terminology = nodeEnv.buildNodePackage { name = "textlint-rule-terminology"; packageName = "textlint-rule-terminology"; - version = "2.1.1"; + version = "2.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/textlint-rule-terminology/-/textlint-rule-terminology-2.1.1.tgz"; - sha512 = "955Q289wCubt67iar/U3jnsPvwHkRhWnOM0gqE3fQDBMJkFsoDnYNummU8CmAPXK7usnbwa2r48q0s4FtATWbw=="; + url = "https://registry.npmjs.org/textlint-rule-terminology/-/textlint-rule-terminology-2.1.3.tgz"; + sha512 = "RpbATk2+M35bAXnDQZGL54ILNPXHy8e8GIl3AJLiywG251L2bQYqvAhLaA7ad9qsrDOXQiGFIkd562KnP5CPkw=="; }; dependencies = [ sources."@textlint/ast-node-types-4.2.5" @@ -73581,7 +73824,7 @@ in sources."@types/color-name-1.1.1" sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" - sources."@types/node-13.7.0" + sources."@types/node-13.7.1" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-1.0.0" @@ -73631,7 +73874,7 @@ in sources."caseless-0.12.0" sources."chalk-3.0.0" sources."cheerio-1.0.0-rc.3" - sources."chownr-1.1.3" + sources."chownr-1.1.4" (sources."clone-response-1.0.2" // { dependencies = [ sources."mimic-response-1.0.1" @@ -73737,7 +73980,7 @@ in sources."has-flag-4.0.0" sources."has-unicode-2.0.1" sources."htmlparser2-3.10.1" - sources."http-cache-semantics-4.0.3" + sources."http-cache-semantics-4.0.4" (sources."http-errors-1.7.2" // { dependencies = [ sources."inherits-2.0.3" @@ -73791,7 +74034,7 @@ in sources."mime-1.6.0" sources."mime-db-1.42.0" sources."mime-types-2.1.25" - sources."mimic-response-2.0.0" + sources."mimic-response-2.1.0" sources."minimalistic-assert-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.0" @@ -73880,11 +74123,11 @@ in sources."rc-1.2.8" sources."read-1.0.7" sources."read-chunk-3.2.0" - sources."readable-stream-3.5.0" + sources."readable-stream-3.6.0" sources."regenerator-runtime-0.13.3" sources."registry-auth-token-4.1.1" sources."registry-url-5.1.0" - (sources."request-2.88.0" // { + (sources."request-2.88.2" // { dependencies = [ sources."qs-6.5.2" ]; @@ -73949,11 +74192,7 @@ in sources."to-array-0.1.4" sources."to-readable-stream-2.1.0" sources."toidentifier-1.0.0" - (sources."tough-cookie-2.4.3" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) + sources."tough-cookie-2.5.0" sources."trim-repeated-1.0.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" @@ -74458,7 +74697,7 @@ in sources."universalify-0.1.2" sources."vscode-jsonrpc-5.0.1" sources."vscode-languageserver-5.3.0-next.10" - sources."vscode-languageserver-protocol-3.15.2" + sources."vscode-languageserver-protocol-3.15.3" sources."vscode-languageserver-types-3.15.1" sources."vscode-textbuffer-1.0.0" sources."vscode-uri-1.0.8" @@ -74708,7 +74947,7 @@ in sources."map-age-cleaner-0.1.3" sources."media-typer-0.3.0" sources."mem-4.3.0" - (sources."memorystore-1.6.1" // { + (sources."memorystore-1.6.2" // { dependencies = [ sources."debug-3.1.0" ]; @@ -74795,7 +75034,7 @@ in ]; }) sources."readable-stream-2.3.7" - (sources."request-2.88.0" // { + (sources."request-2.88.2" // { dependencies = [ sources."qs-6.5.2" ]; @@ -74862,18 +75101,14 @@ in sources."debug-4.1.1" sources."mime-2.4.4" sources."ms-2.1.2" - sources."readable-stream-3.5.0" + sources."readable-stream-3.6.0" sources."semver-6.3.0" ]; }) sources."temp-0.9.1" sources."to-array-0.1.4" sources."toidentifier-1.0.0" - (sources."tough-cookie-2.4.3" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) + sources."tough-cookie-2.5.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.18" @@ -74940,7 +75175,7 @@ in sources."vscode-css-languageservice-3.0.13" sources."vscode-jsonrpc-5.0.1" sources."vscode-languageserver-4.4.2" - sources."vscode-languageserver-protocol-3.15.2" + sources."vscode-languageserver-protocol-3.15.3" sources."vscode-languageserver-protocol-foldingprovider-2.0.1" sources."vscode-languageserver-types-3.15.1" sources."vscode-nls-4.1.1" @@ -74978,7 +75213,7 @@ in }) sources."vscode-jsonrpc-5.0.1" sources."vscode-languageserver-4.4.2" - sources."vscode-languageserver-protocol-3.15.2" + sources."vscode-languageserver-protocol-3.15.3" sources."vscode-languageserver-protocol-foldingprovider-2.0.1" sources."vscode-languageserver-types-3.15.1" sources."vscode-nls-3.2.5" @@ -75204,7 +75439,7 @@ in ]; }) sources."recursive-readdir-2.2.2" - sources."request-2.88.0" + sources."request-2.88.2" sources."restore-cursor-2.0.0" sources."rimraf-2.7.1" sources."run-async-2.3.0" @@ -75249,11 +75484,7 @@ in sources."tmp-0.0.33" sources."to-buffer-1.1.1" sources."toml-2.3.6" - (sources."tough-cookie-2.4.3" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) + sources."tough-cookie-2.5.0" sources."trim-repeated-1.0.0" sources."tslib-1.10.0" sources."tunnel-agent-0.6.0" @@ -75316,7 +75547,7 @@ in sources."@starptech/rehype-webparser-0.10.0" sources."@starptech/webparser-0.10.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-13.7.0" + sources."@types/node-13.7.1" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -75523,7 +75754,7 @@ in sources."ignore-4.0.6" ]; }) - (sources."eslint-plugin-vue-6.1.2" // { + (sources."eslint-plugin-vue-6.2.1" // { dependencies = [ sources."acorn-7.1.0" sources."debug-4.1.1" @@ -75537,7 +75768,7 @@ in sources."eslint-visitor-keys-1.1.0" sources."espree-5.0.1" sources."esprima-4.0.1" - sources."esquery-1.0.1" + sources."esquery-1.1.0" sources."esrecurse-4.2.1" sources."estraverse-4.3.0" sources."esutils-2.0.3" @@ -75663,7 +75894,7 @@ in sources."hosted-git-info-2.8.5" sources."html-void-elements-1.0.5" sources."html-whitespace-sensitive-tag-names-1.0.1" - sources."http-cache-semantics-4.0.3" + sources."http-cache-semantics-4.0.4" sources."iconv-lite-0.4.24" sources."ignore-3.3.10" (sources."import-fresh-3.2.1" // { @@ -75752,7 +75983,7 @@ in sources."lodash.merge-4.6.2" sources."lodash.rest-4.0.5" sources."lodash.unescape-4.0.1" - sources."loglevel-1.6.6" + sources."loglevel-1.6.7" (sources."loglevel-colored-level-prefix-1.0.0" // { dependencies = [ sources."ansi-regex-2.1.1" @@ -76186,7 +76417,7 @@ in sources."unist-util-find-1.0.1" sources."unist-util-inspect-4.1.4" sources."unist-util-is-2.1.3" - sources."unist-util-modify-children-1.1.5" + sources."unist-util-modify-children-1.1.6" sources."unist-util-remove-position-1.1.4" sources."unist-util-stringify-position-2.0.2" sources."unist-util-visit-1.4.1" @@ -76233,7 +76464,7 @@ in sources."vscode-emmet-helper-1.2.17" sources."vscode-jsonrpc-5.0.1" sources."vscode-languageserver-5.3.0-next.10" - sources."vscode-languageserver-protocol-3.15.2" + sources."vscode-languageserver-protocol-3.15.3" sources."vscode-languageserver-types-3.15.1" sources."vscode-nls-4.1.1" sources."vscode-textbuffer-1.0.0" @@ -76287,39 +76518,40 @@ in web-ext = nodeEnv.buildNodePackage { name = "web-ext"; packageName = "web-ext"; - version = "4.0.0"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/web-ext/-/web-ext-4.0.0.tgz"; - sha512 = "778HKIoWpIrZzOq7rPA7Fu7YQ/fnZ6w9XCKUqGJRjo2NgOtgtkLmkd7lCw3gU7KJYe7hurI5XYossJMgjmyNaQ=="; + url = "https://registry.npmjs.org/web-ext/-/web-ext-4.1.0.tgz"; + sha512 = "nhAeZ3BHI4rCT/J+s7JHg0U3G6qUMV8Bi44ohWm8X6GjlQV8tGcD6rkvN4Zk2zzMGaF9sHUOcRjyN79Ih8P/PQ=="; }; dependencies = [ sources."@babel/code-frame-7.8.3" - sources."@babel/highlight-7.8.3" + (sources."@babel/highlight-7.8.3" // { + dependencies = [ + sources."ansi-styles-3.2.1" + sources."chalk-2.4.2" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."has-flag-3.0.0" + sources."supports-color-5.5.0" + ]; + }) sources."@babel/polyfill-7.7.0" sources."@babel/runtime-7.7.7" - sources."@babel/runtime-corejs2-7.8.4" + sources."@babel/runtime-corejs3-7.8.4" sources."@cliqz-oss/firefox-client-0.3.1" sources."@cliqz-oss/node-firefox-connect-1.2.1" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/color-name-1.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.7.0" + sources."@types/node-13.7.1" sources."JSONSelect-0.2.1" sources."acorn-6.4.0" sources."acorn-jsx-5.1.0" sources."adbkit-2.11.1" sources."adbkit-logcat-1.1.0" sources."adbkit-monkey-1.0.1" - (sources."addons-linter-1.19.0" // { - dependencies = [ - sources."ansi-regex-4.1.0" - sources."decamelize-1.2.0" - sources."string-width-3.1.0" - sources."strip-ansi-5.2.0" - sources."yargs-14.0.0" - ]; - }) + sources."addons-linter-1.20.0" sources."adm-zip-0.4.14" sources."ajv-6.10.2" sources."ajv-keywords-1.5.1" @@ -76333,7 +76565,7 @@ in }) sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" - sources."ansi-styles-3.2.1" + sources."ansi-styles-4.2.1" sources."any-promise-1.3.0" sources."anymatch-2.0.0" (sources."archiver-2.1.1" // { @@ -76409,16 +76641,10 @@ in (sources."boxen-4.2.0" // { dependencies = [ sources."ansi-regex-5.0.0" - sources."ansi-styles-4.2.1" - sources."chalk-3.0.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" sources."emoji-regex-8.0.0" - sources."has-flag-4.0.0" sources."is-fullwidth-code-point-3.0.0" sources."string-width-4.2.0" sources."strip-ansi-6.0.0" - sources."supports-color-7.1.0" ]; }) sources."brace-expansion-1.1.11" @@ -76447,7 +76673,7 @@ in sources."callsites-0.2.0" sources."camelcase-5.3.1" sources."caseless-0.12.0" - sources."chalk-2.4.2" + sources."chalk-3.0.0" sources."chardet-0.7.0" sources."cheerio-1.0.0-rc.3" (sources."chokidar-2.1.8" // { @@ -76479,11 +76705,13 @@ in sources."cli-boxes-2.2.0" sources."cli-cursor-2.1.0" sources."cli-width-2.2.0" - (sources."cliui-5.0.0" // { + (sources."cliui-6.0.0" // { dependencies = [ - sources."ansi-regex-4.1.0" - sources."string-width-3.1.0" - sources."strip-ansi-5.2.0" + sources."ansi-regex-5.0.0" + sources."emoji-regex-8.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.0" + sources."strip-ansi-6.0.0" ]; }) sources."clone-1.0.4" @@ -76491,8 +76719,8 @@ in sources."co-4.6.0" sources."code-point-at-1.1.0" sources."collection-visit-1.0.0" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" sources."colors-0.5.1" sources."columnify-1.5.4" sources."combined-stream-1.0.8" @@ -76514,9 +76742,10 @@ in sources."string_decoder-1.1.1" ]; }) - sources."configstore-5.0.0" + sources."configstore-5.0.1" sources."copy-descriptor-0.1.1" sources."core-js-2.6.11" + sources."core-js-pure-3.6.4" sources."core-util-is-1.0.2" sources."crc-3.8.0" (sources."crc32-stream-2.0.0" // { @@ -76551,7 +76780,7 @@ in sources."define-properties-1.1.3" sources."define-property-2.0.2" sources."delayed-stream-1.0.0" - (sources."dispensary-0.48.1" // { + (sources."dispensary-0.49.0" // { dependencies = [ sources."async-3.1.1" ]; @@ -76590,12 +76819,18 @@ in (sources."eslint-5.16.0" // { dependencies = [ sources."ansi-regex-3.0.0" + sources."ansi-styles-3.2.1" + sources."chalk-2.4.2" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" sources."debug-4.1.1" sources."espree-5.0.1" + sources."has-flag-3.0.0" sources."ms-2.1.2" sources."semver-5.7.1" sources."strip-ansi-4.0.0" sources."strip-json-comments-2.0.1" + sources."supports-color-5.5.0" ]; }) (sources."eslint-plugin-no-unsafe-innerhtml-1.0.16" // { @@ -76650,7 +76885,7 @@ in ]; }) sources."esprima-4.0.1" - sources."esquery-1.0.1" + sources."esquery-1.1.0" sources."esrecurse-4.2.1" sources."estraverse-4.3.0" sources."esutils-2.0.3" @@ -76713,7 +76948,7 @@ in sources."is-extendable-0.1.1" ]; }) - sources."find-up-3.0.0" + sources."find-up-4.1.0" (sources."firefox-profile-1.3.0" // { dependencies = [ sources."async-2.5.0" @@ -76769,7 +77004,7 @@ in sources."har-validator-5.1.3" sources."has-1.0.3" sources."has-ansi-2.0.0" - sources."has-flag-3.0.0" + sources."has-flag-4.0.0" sources."has-symbols-1.0.1" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { @@ -76779,7 +77014,7 @@ in }) sources."has-yarn-2.1.0" sources."htmlparser2-3.10.1" - sources."http-cache-semantics-4.0.3" + sources."http-cache-semantics-4.0.4" sources."http-signature-1.2.0" sources."iconv-lite-0.4.24" sources."ieee754-1.1.13" @@ -76797,7 +77032,13 @@ in (sources."inquirer-6.5.2" // { dependencies = [ sources."ansi-regex-4.1.0" + sources."ansi-styles-3.2.1" + sources."chalk-2.4.2" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."has-flag-3.0.0" sources."strip-ansi-5.2.0" + sources."supports-color-5.5.0" ]; }) sources."interpret-1.2.0" @@ -76887,7 +77128,7 @@ in sources."levn-0.3.0" sources."lighthouse-logger-1.2.0" sources."lines-and-columns-1.1.6" - sources."locate-path-3.0.0" + sources."locate-path-5.0.0" sources."lodash-4.17.15" sources."lodash.includes-4.3.0" sources."lodash.isboolean-3.0.3" @@ -76898,12 +77139,16 @@ in sources."lodash.once-4.1.1" sources."lodash.sortby-4.7.0" sources."lowercase-keys-1.0.1" - sources."make-dir-3.0.0" + (sources."make-dir-3.0.2" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) sources."map-age-cleaner-0.1.3" sources."map-cache-0.2.2" sources."map-visit-1.0.0" sources."marky-1.2.1" - sources."mdn-browser-compat-data-1.0.1" + sources."mdn-browser-compat-data-1.0.3" (sources."mem-5.1.1" // { dependencies = [ sources."mimic-fn-2.1.0" @@ -76942,7 +77187,11 @@ in sources."next-tick-1.0.0" sources."nice-try-1.0.5" sources."node-forge-0.7.6" - sources."node-notifier-6.0.0" + (sources."node-notifier-6.0.0" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) sources."normalize-path-2.1.1" sources."normalize-url-4.5.0" sources."npm-run-path-2.0.2" @@ -76982,9 +77231,13 @@ in sources."p-finally-1.0.0" sources."p-is-promise-2.1.0" sources."p-limit-2.2.2" - sources."p-locate-3.0.0" + sources."p-locate-4.1.0" sources."p-try-2.2.0" - sources."package-json-6.5.0" + (sources."package-json-6.5.0" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) sources."pako-1.0.11" (sources."parent-module-1.0.1" // { dependencies = [ @@ -76995,19 +77248,28 @@ in sources."parse5-3.0.3" sources."pascalcase-0.1.1" sources."path-dirname-1.0.2" - sources."path-exists-3.0.0" + sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."path-is-inside-1.0.2" sources."path-key-2.0.1" sources."path-parse-1.0.6" sources."pend-1.2.0" sources."performance-now-2.1.0" - sources."pino-5.14.0" + sources."pino-5.15.0" sources."pino-std-serializers-2.4.2" sources."pluralize-1.2.1" sources."posix-character-classes-0.1.1" - (sources."postcss-7.0.24" // { + (sources."postcss-7.0.26" // { dependencies = [ + sources."ansi-styles-3.2.1" + (sources."chalk-2.4.2" // { + dependencies = [ + sources."supports-color-5.5.0" + ]; + }) + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."has-flag-3.0.0" sources."supports-color-6.1.0" ]; }) @@ -77026,7 +77288,7 @@ in sources."strip-json-comments-2.0.1" ]; }) - sources."readable-stream-3.5.0" + sources."readable-stream-3.6.0" (sources."readdirp-2.2.1" // { dependencies = [ sources."readable-stream-2.3.7" @@ -77047,11 +77309,20 @@ in sources."regexpp-2.0.1" sources."registry-auth-token-4.1.1" sources."registry-url-5.1.0" - sources."relaxed-json-1.0.3" + (sources."relaxed-json-1.0.3" // { + dependencies = [ + sources."ansi-styles-3.2.1" + sources."chalk-2.4.2" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."has-flag-3.0.0" + sources."supports-color-5.5.0" + ]; + }) sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" - sources."request-2.88.0" + sources."request-2.88.2" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" sources."require-uncached-1.0.3" @@ -77070,8 +77341,12 @@ in sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" sources."sax-1.2.4" - sources."semver-6.3.0" - sources."semver-diff-3.1.1" + sources."semver-7.1.1" + (sources."semver-diff-3.1.1" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) sources."set-blocking-2.0.0" (sources."set-value-2.0.1" // { dependencies = [ @@ -77085,13 +77360,22 @@ in sources."shell-quote-1.6.1" sources."shelljs-0.7.8" sources."shellwords-0.1.1" - (sources."sign-addon-2.0.4" // { + (sources."sign-addon-2.0.5" // { dependencies = [ - sources."core-js-3.6.0" + sources."core-js-3.6.4" + sources."punycode-1.4.1" + sources."request-2.88.0" + sources."tough-cookie-2.4.3" ]; }) sources."signal-exit-3.0.2" - sources."slice-ansi-2.1.0" + (sources."slice-ansi-2.1.0" // { + dependencies = [ + sources."ansi-styles-3.2.1" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + ]; + }) (sources."snapdragon-0.8.2" // { dependencies = [ sources."define-property-0.2.5" @@ -77172,7 +77456,7 @@ in sources."strip-bom-stream-4.0.0" sources."strip-eof-1.0.0" sources."strip-json-comments-3.0.1" - sources."supports-color-5.5.0" + sources."supports-color-7.1.0" (sources."table-5.4.6" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -77203,12 +77487,8 @@ in sources."to-regex-3.0.2" sources."to-regex-range-2.1.1" sources."tosource-1.0.0" - (sources."tough-cookie-2.4.3" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) - sources."tr46-1.0.1" + sources."tough-cookie-2.5.0" + sources."tr46-2.0.0" sources."traverse-0.4.6" sources."tslib-1.10.0" sources."tunnel-agent-0.6.0" @@ -77237,16 +77517,7 @@ in ]; }) sources."upath-1.2.0" - (sources."update-notifier-4.0.0" // { - dependencies = [ - sources."ansi-styles-4.2.1" - sources."chalk-3.0.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."supports-color-7.1.0" - ]; - }) + sources."update-notifier-4.0.0" sources."uri-js-4.2.2" sources."urix-0.1.0" sources."url-parse-lax-3.0.0" @@ -77257,8 +77528,8 @@ in sources."verror-1.10.0" sources."watchpack-1.6.0" sources."wcwidth-1.0.1" - sources."webidl-conversions-4.0.2" - sources."whatwg-url-7.1.0" + sources."webidl-conversions-5.0.0" + sources."whatwg-url-8.0.0" sources."when-3.7.7" sources."which-1.3.1" sources."which-module-2.0.0" @@ -77273,11 +77544,13 @@ in }) sources."winreg-0.0.12" sources."word-wrap-1.2.3" - (sources."wrap-ansi-5.1.0" // { + (sources."wrap-ansi-6.2.0" // { dependencies = [ - sources."ansi-regex-4.1.0" - sources."string-width-3.1.0" - sources."strip-ansi-5.2.0" + sources."ansi-regex-5.0.0" + sources."emoji-regex-8.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.0" + sources."strip-ansi-6.0.0" ]; }) sources."wrappy-1.0.2" @@ -77287,30 +77560,20 @@ in sources."xdg-basedir-4.0.0" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" - sources."xregexp-4.2.4" + sources."xregexp-4.3.0" sources."xtend-4.0.2" sources."y18n-4.0.0" - (sources."yargs-15.0.2" // { + (sources."yargs-15.1.0" // { dependencies = [ sources."ansi-regex-5.0.0" - sources."ansi-styles-4.2.1" - sources."cliui-6.0.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" sources."decamelize-1.2.0" sources."emoji-regex-8.0.0" - sources."find-up-4.1.0" sources."is-fullwidth-code-point-3.0.0" - sources."locate-path-5.0.0" - sources."p-locate-4.1.0" - sources."path-exists-4.0.0" sources."string-width-4.2.0" sources."strip-ansi-6.0.0" - sources."wrap-ansi-6.2.0" - sources."yargs-parser-16.1.0" ]; }) - (sources."yargs-parser-13.1.1" // { + (sources."yargs-parser-16.1.0" // { dependencies = [ sources."decamelize-1.2.0" ]; @@ -77342,10 +77605,10 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "4.41.5"; + version = "4.41.6"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-4.41.5.tgz"; - sha512 = "wp0Co4vpyumnp3KlkmpM5LWuzvZYayDwM2n17EHFr4qxBBbRokC7DJawPJC7TfSFZ9HZ6GsdH40EBj4UV0nmpw=="; + url = "https://registry.npmjs.org/webpack/-/webpack-4.41.6.tgz"; + sha512 = "yxXfV0Zv9WMGRD+QexkZzmGIh54bsvEs+9aRWxnN8erLWEOehAKUTeNBoUbA6HPEZPlRo7KDi2ZcNveoZgK9MA=="; }; dependencies = [ sources."@webassemblyjs/ast-1.8.5" @@ -77424,7 +77687,7 @@ in sources."cacache-12.0.3" sources."cache-base-1.0.1" sources."chokidar-2.1.8" - sources."chownr-1.1.3" + sources."chownr-1.1.4" sources."chrome-trace-event-1.0.2" sources."cipher-base-1.0.4" (sources."class-utils-0.3.6" // { @@ -77823,10 +78086,10 @@ in webpack-cli = nodeEnv.buildNodePackage { name = "webpack-cli"; packageName = "webpack-cli"; - version = "3.3.10"; + version = "3.3.11"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.10.tgz"; - sha512 = "u1dgND9+MXaEt74sJR4PR7qkPxXUSQ0RXYq8x1L6Jg1MYVEmGPrH6Ah6C4arD4r0J1P5HKjRqpab36k0eIzPqg=="; + url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.11.tgz"; + sha512 = "dXlfuml7xvAFwYUPsrtQAA9e4DOe58gnzSxhgrO/ZM/gyXTBowrsYeubyN4mqGhYdpXMFNyQ6emjJS9M7OBd4g=="; }; dependencies = [ sources."ansi-regex-4.1.0" @@ -78149,6 +78412,744 @@ in bypassCache = true; reconstructLock = true; }; + webpack-dev-server = nodeEnv.buildNodePackage { + name = "webpack-dev-server"; + packageName = "webpack-dev-server"; + version = "3.10.3"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.10.3.tgz"; + sha512 = "e4nWev8YzEVNdOMcNzNeCN947sWJNd43E5XvsJzbAL08kGc2frm1tQ32hTJslRS+H65LCb/AaUCYU7fjHCpDeQ=="; + }; + dependencies = [ + sources."@types/events-3.0.0" + sources."@types/glob-7.1.1" + sources."@types/minimatch-3.0.3" + sources."@types/node-13.7.1" + sources."accepts-1.3.7" + sources."ajv-6.11.0" + sources."ajv-errors-1.0.1" + sources."ajv-keywords-3.4.1" + sources."ansi-colors-3.2.4" + sources."ansi-html-0.0.7" + sources."ansi-regex-2.1.1" + (sources."anymatch-2.0.0" // { + dependencies = [ + sources."normalize-path-2.1.1" + ]; + }) + sources."arr-diff-4.0.0" + sources."arr-flatten-1.1.0" + sources."arr-union-3.1.0" + sources."array-flatten-2.1.2" + sources."array-union-1.0.2" + sources."array-uniq-1.0.3" + sources."array-unique-0.3.2" + sources."assign-symbols-1.0.0" + sources."async-2.6.3" + sources."async-each-1.0.3" + sources."async-limiter-1.0.1" + sources."atob-2.1.2" + sources."balanced-match-1.0.0" + (sources."base-0.11.2" // { + dependencies = [ + sources."define-property-1.0.0" + ]; + }) + sources."batch-0.6.1" + sources."binary-extensions-1.13.1" + sources."bindings-1.5.0" + (sources."body-parser-1.19.0" // { + dependencies = [ + sources."bytes-3.1.0" + sources."debug-2.6.9" + ]; + }) + sources."bonjour-3.5.0" + sources."brace-expansion-1.1.11" + (sources."braces-2.3.2" // { + dependencies = [ + sources."extend-shallow-2.0.1" + sources."is-extendable-0.1.1" + ]; + }) + sources."buffer-indexof-1.1.1" + sources."bytes-3.0.0" + sources."cache-base-1.0.1" + sources."camelcase-5.3.1" + sources."chokidar-2.1.8" + (sources."class-utils-0.3.6" // { + dependencies = [ + sources."define-property-0.2.5" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) + (sources."cliui-4.1.0" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."strip-ansi-4.0.0" + ]; + }) + sources."code-point-at-1.1.0" + sources."collection-visit-1.0.0" + sources."component-emitter-1.3.0" + sources."compressible-2.0.18" + (sources."compression-1.7.4" // { + dependencies = [ + sources."debug-2.6.9" + sources."safe-buffer-5.1.2" + ]; + }) + sources."concat-map-0.0.1" + sources."connect-history-api-fallback-1.6.0" + (sources."content-disposition-0.5.3" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) + sources."content-type-1.0.4" + sources."cookie-0.4.0" + sources."cookie-signature-1.0.6" + sources."copy-descriptor-0.1.1" + sources."core-util-is-1.0.2" + (sources."cross-spawn-6.0.5" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) + (sources."debug-4.1.1" // { + dependencies = [ + sources."ms-2.1.2" + ]; + }) + sources."decamelize-1.2.0" + sources."decode-uri-component-0.2.0" + sources."deep-equal-1.1.1" + sources."default-gateway-4.2.0" + sources."define-properties-1.1.3" + sources."define-property-2.0.2" + sources."del-4.1.1" + sources."depd-1.1.2" + sources."destroy-1.0.4" + sources."detect-node-2.0.4" + sources."dns-equal-1.0.0" + sources."dns-packet-1.3.1" + sources."dns-txt-2.0.2" + sources."ee-first-1.1.1" + sources."encodeurl-1.0.2" + sources."end-of-stream-1.4.4" + sources."errno-0.1.7" + sources."es-abstract-1.17.4" + sources."es-to-primitive-1.2.1" + sources."escape-html-1.0.3" + sources."etag-1.8.1" + sources."eventemitter3-4.0.0" + sources."eventsource-1.0.7" + sources."execa-1.0.0" + (sources."expand-brackets-2.1.4" // { + dependencies = [ + sources."debug-2.6.9" + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."is-extendable-0.1.1" + sources."kind-of-5.1.0" + ]; + }) + (sources."express-4.17.1" // { + dependencies = [ + sources."array-flatten-1.1.1" + sources."debug-2.6.9" + sources."safe-buffer-5.1.2" + ]; + }) + sources."extend-shallow-3.0.2" + (sources."extglob-2.0.4" // { + dependencies = [ + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + sources."is-extendable-0.1.1" + ]; + }) + sources."fast-deep-equal-3.1.1" + sources."fast-json-stable-stringify-2.1.0" + sources."faye-websocket-0.10.0" + sources."file-uri-to-path-1.0.0" + (sources."fill-range-4.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + sources."is-extendable-0.1.1" + ]; + }) + (sources."finalhandler-1.1.2" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) + sources."find-up-3.0.0" + (sources."follow-redirects-1.10.0" // { + dependencies = [ + sources."debug-3.2.6" + sources."ms-2.1.2" + ]; + }) + sources."for-in-1.0.2" + sources."forwarded-0.1.2" + sources."fragment-cache-0.2.1" + sources."fresh-0.5.2" + sources."fs.realpath-1.0.0" + sources."fsevents-1.2.11" + sources."function-bind-1.1.1" + sources."get-caller-file-1.0.3" + sources."get-stream-4.1.0" + sources."get-value-2.0.6" + sources."glob-7.1.6" + (sources."glob-parent-3.1.0" // { + dependencies = [ + sources."is-glob-3.1.0" + ]; + }) + (sources."globby-6.1.0" // { + dependencies = [ + sources."pify-2.3.0" + ]; + }) + sources."graceful-fs-4.2.3" + sources."handle-thing-2.0.0" + sources."has-1.0.3" + sources."has-flag-3.0.0" + sources."has-symbols-1.0.1" + sources."has-value-1.0.0" + (sources."has-values-1.0.0" // { + dependencies = [ + sources."kind-of-4.0.0" + ]; + }) + sources."hpack.js-2.1.6" + sources."html-entities-1.2.1" + sources."http-deceiver-1.2.7" + (sources."http-errors-1.7.2" // { + dependencies = [ + sources."inherits-2.0.3" + ]; + }) + sources."http-parser-js-0.4.10" + sources."http-proxy-1.18.0" + sources."http-proxy-middleware-0.19.1" + sources."iconv-lite-0.4.24" + sources."import-local-2.0.0" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."internal-ip-4.3.0" + sources."invert-kv-2.0.0" + sources."ip-1.1.5" + sources."ip-regex-2.1.0" + sources."ipaddr.js-1.9.0" + sources."is-absolute-url-3.0.3" + sources."is-accessor-descriptor-1.0.0" + sources."is-arguments-1.0.4" + sources."is-binary-path-1.0.1" + sources."is-buffer-1.1.6" + sources."is-callable-1.1.5" + sources."is-data-descriptor-1.0.0" + sources."is-date-object-1.0.2" + sources."is-descriptor-1.0.2" + sources."is-extendable-1.0.1" + sources."is-extglob-2.1.1" + sources."is-fullwidth-code-point-1.0.0" + sources."is-glob-4.0.1" + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-path-cwd-2.2.0" + sources."is-path-in-cwd-2.1.0" + sources."is-path-inside-2.1.0" + sources."is-plain-object-2.0.4" + sources."is-regex-1.0.5" + sources."is-stream-1.1.0" + sources."is-symbol-1.0.3" + sources."is-windows-1.0.2" + sources."is-wsl-1.1.0" + sources."isarray-1.0.0" + sources."isexe-2.0.0" + sources."isobject-3.0.1" + sources."json-schema-traverse-0.4.1" + sources."json3-3.3.3" + sources."killable-1.0.1" + sources."kind-of-6.0.3" + sources."lcid-2.0.0" + sources."locate-path-3.0.0" + sources."lodash-4.17.15" + sources."loglevel-1.6.7" + sources."map-age-cleaner-0.1.3" + sources."map-cache-0.2.2" + sources."map-visit-1.0.0" + sources."media-typer-0.3.0" + sources."mem-4.3.0" + sources."memory-fs-0.4.1" + sources."merge-descriptors-1.0.1" + sources."methods-1.1.2" + sources."micromatch-3.1.10" + sources."mime-1.6.0" + sources."mime-db-1.43.0" + sources."mime-types-2.1.26" + sources."mimic-fn-2.1.0" + sources."minimalistic-assert-1.0.1" + sources."minimatch-3.0.4" + sources."minimist-0.0.8" + sources."mixin-deep-1.3.2" + sources."mkdirp-0.5.1" + sources."ms-2.0.0" + sources."multicast-dns-6.2.3" + sources."multicast-dns-service-types-1.1.0" + sources."nan-2.14.0" + sources."nanomatch-1.2.13" + sources."negotiator-0.6.2" + sources."nice-try-1.0.5" + sources."node-forge-0.9.0" + sources."normalize-path-3.0.0" + sources."npm-run-path-2.0.2" + sources."number-is-nan-1.0.1" + sources."object-assign-4.1.1" + (sources."object-copy-0.1.0" // { + dependencies = [ + sources."define-property-0.2.5" + sources."is-accessor-descriptor-0.1.6" + sources."is-data-descriptor-0.1.4" + (sources."is-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + sources."kind-of-3.2.2" + ]; + }) + sources."object-inspect-1.7.0" + sources."object-is-1.0.2" + sources."object-keys-1.1.1" + sources."object-visit-1.0.1" + sources."object.assign-4.1.0" + sources."object.pick-1.3.0" + sources."obuf-1.1.2" + sources."on-finished-2.3.0" + sources."on-headers-1.0.2" + sources."once-1.4.0" + sources."opn-5.5.0" + sources."original-1.0.2" + sources."os-locale-3.1.0" + sources."p-defer-1.0.0" + sources."p-finally-1.0.0" + sources."p-is-promise-2.1.0" + sources."p-limit-2.2.2" + sources."p-locate-3.0.0" + sources."p-map-2.1.0" + sources."p-retry-3.0.1" + sources."p-try-2.2.0" + sources."parseurl-1.3.3" + sources."pascalcase-0.1.1" + sources."path-dirname-1.0.2" + sources."path-exists-3.0.0" + sources."path-is-absolute-1.0.1" + sources."path-is-inside-1.0.2" + sources."path-key-2.0.1" + sources."path-to-regexp-0.1.7" + sources."pify-4.0.1" + sources."pinkie-2.0.4" + sources."pinkie-promise-2.0.1" + sources."pkg-dir-3.0.0" + (sources."portfinder-1.0.25" // { + dependencies = [ + sources."debug-3.2.6" + sources."ms-2.1.2" + ]; + }) + sources."posix-character-classes-0.1.1" + sources."process-nextick-args-2.0.1" + sources."proxy-addr-2.0.5" + sources."prr-1.0.1" + sources."pump-3.0.0" + sources."punycode-2.1.1" + sources."qs-6.7.0" + sources."querystring-0.2.0" + sources."querystringify-2.1.1" + sources."range-parser-1.2.1" + (sources."raw-body-2.4.0" // { + dependencies = [ + sources."bytes-3.1.0" + ]; + }) + (sources."readable-stream-2.3.7" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) + sources."readdirp-2.2.1" + sources."regex-not-1.0.2" + sources."regexp.prototype.flags-1.3.0" + sources."remove-trailing-separator-1.1.0" + sources."repeat-element-1.1.3" + sources."repeat-string-1.6.1" + sources."require-directory-2.1.1" + sources."require-main-filename-1.0.1" + sources."requires-port-1.0.0" + sources."resolve-cwd-2.0.0" + sources."resolve-from-3.0.0" + sources."resolve-url-0.2.1" + sources."ret-0.1.15" + sources."retry-0.12.0" + sources."rimraf-2.7.1" + sources."safe-buffer-5.2.0" + sources."safe-regex-1.1.0" + sources."safer-buffer-2.1.2" + sources."schema-utils-1.0.0" + sources."select-hose-2.0.0" + sources."selfsigned-1.10.7" + sources."semver-6.3.0" + (sources."send-0.17.1" // { + dependencies = [ + (sources."debug-2.6.9" // { + dependencies = [ + sources."ms-2.0.0" + ]; + }) + sources."ms-2.1.1" + ]; + }) + (sources."serve-index-1.9.1" // { + dependencies = [ + sources."debug-2.6.9" + sources."http-errors-1.6.3" + sources."inherits-2.0.3" + sources."setprototypeof-1.1.0" + ]; + }) + sources."serve-static-1.14.1" + sources."set-blocking-2.0.0" + (sources."set-value-2.0.1" // { + dependencies = [ + sources."extend-shallow-2.0.1" + sources."is-extendable-0.1.1" + ]; + }) + sources."setprototypeof-1.1.1" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."signal-exit-3.0.2" + (sources."snapdragon-0.8.2" // { + dependencies = [ + sources."debug-2.6.9" + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."is-extendable-0.1.1" + sources."kind-of-5.1.0" + ]; + }) + (sources."snapdragon-node-2.1.1" // { + dependencies = [ + sources."define-property-1.0.0" + ]; + }) + (sources."snapdragon-util-3.0.1" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."sockjs-0.3.19" + (sources."sockjs-client-1.4.0" // { + dependencies = [ + sources."debug-3.2.6" + sources."faye-websocket-0.11.3" + sources."ms-2.1.2" + ]; + }) + sources."source-map-0.5.7" + sources."source-map-resolve-0.5.3" + sources."source-map-url-0.4.0" + sources."spdy-4.0.1" + (sources."spdy-transport-3.0.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) + sources."split-string-3.1.0" + (sources."static-extend-0.1.2" // { + dependencies = [ + sources."define-property-0.2.5" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) + sources."statuses-1.5.0" + (sources."string-width-2.1.1" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."is-fullwidth-code-point-2.0.0" + sources."strip-ansi-4.0.0" + ]; + }) + sources."string.prototype.trimleft-2.1.1" + sources."string.prototype.trimright-2.1.1" + (sources."string_decoder-1.1.1" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) + sources."strip-ansi-3.0.1" + sources."strip-eof-1.0.0" + sources."supports-color-6.1.0" + sources."thunky-1.1.0" + (sources."to-object-path-0.3.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."to-regex-3.0.2" + sources."to-regex-range-2.1.1" + sources."toidentifier-1.0.0" + sources."type-is-1.6.18" + (sources."union-value-1.0.1" // { + dependencies = [ + sources."is-extendable-0.1.1" + ]; + }) + sources."unpipe-1.0.0" + (sources."unset-value-1.0.0" // { + dependencies = [ + (sources."has-value-0.3.1" // { + dependencies = [ + sources."isobject-2.1.0" + ]; + }) + sources."has-values-0.1.4" + ]; + }) + sources."upath-1.2.0" + sources."uri-js-4.2.2" + sources."urix-0.1.0" + (sources."url-0.11.0" // { + dependencies = [ + sources."punycode-1.3.2" + ]; + }) + sources."url-parse-1.4.7" + sources."use-3.1.1" + sources."util-deprecate-1.0.2" + sources."utils-merge-1.0.1" + sources."uuid-3.4.0" + sources."vary-1.1.2" + sources."wbuf-1.7.3" + (sources."webpack-dev-middleware-3.7.2" // { + dependencies = [ + sources."mime-2.4.4" + ]; + }) + sources."webpack-log-2.0.0" + sources."websocket-driver-0.7.3" + sources."websocket-extensions-0.1.3" + sources."which-1.3.1" + sources."which-module-2.0.0" + (sources."wrap-ansi-2.1.0" // { + dependencies = [ + sources."string-width-1.0.2" + ]; + }) + sources."wrappy-1.0.2" + sources."ws-6.2.1" + sources."y18n-4.0.0" + sources."yargs-12.0.5" + sources."yargs-parser-11.1.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Serves a webpack app. Updates the browser on changes."; + homepage = "https://github.com/webpack/webpack-dev-server#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; + copy-webpack-plugin = nodeEnv.buildNodePackage { + name = "copy-webpack-plugin"; + packageName = "copy-webpack-plugin"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-5.1.1.tgz"; + sha512 = "P15M5ZC8dyCjQHWwd4Ia/dm0SgVvZJMYeykVIVYXbGyqO4dWB5oyPHp9i7wjwo5LhtlhKbiBCdS2NvM07Wlybg=="; + }; + dependencies = [ + sources."ajv-6.11.0" + sources."ajv-errors-1.0.1" + sources."ajv-keywords-3.4.1" + sources."ansi-colors-3.2.4" + sources."aproba-1.2.0" + sources."array-union-1.0.2" + sources."array-uniq-1.0.3" + sources."balanced-match-1.0.0" + sources."big.js-5.2.2" + sources."bluebird-3.7.2" + sources."brace-expansion-1.1.11" + sources."buffer-from-1.1.1" + sources."cacache-12.0.3" + sources."chownr-1.1.4" + sources."commondir-1.0.1" + sources."concat-map-0.0.1" + sources."concat-stream-1.6.2" + sources."copy-concurrently-1.0.5" + sources."core-util-is-1.0.2" + sources."cyclist-1.0.1" + sources."dir-glob-2.2.2" + sources."duplexify-3.7.1" + sources."emojis-list-2.1.0" + sources."end-of-stream-1.4.4" + sources."fast-deep-equal-3.1.1" + sources."fast-json-stable-stringify-2.1.0" + sources."figgy-pudding-3.5.1" + sources."find-cache-dir-2.1.0" + sources."find-up-3.0.0" + sources."flush-write-stream-1.1.1" + sources."from2-2.3.0" + sources."fs-write-stream-atomic-1.0.10" + sources."fs.realpath-1.0.0" + sources."glob-7.1.6" + (sources."glob-parent-3.1.0" // { + dependencies = [ + sources."is-glob-3.1.0" + ]; + }) + (sources."globby-7.1.1" // { + dependencies = [ + sources."pify-3.0.0" + ]; + }) + sources."graceful-fs-4.2.3" + sources."iferr-0.1.5" + sources."ignore-3.3.10" + sources."imurmurhash-0.1.4" + sources."infer-owner-1.0.4" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."is-extglob-2.1.1" + sources."is-glob-4.0.1" + sources."isarray-1.0.0" + sources."json-schema-traverse-0.4.1" + (sources."json5-1.0.1" // { + dependencies = [ + sources."minimist-1.2.0" + ]; + }) + sources."loader-utils-1.2.3" + sources."locate-path-3.0.0" + sources."lru-cache-5.1.1" + sources."make-dir-2.1.0" + sources."minimatch-3.0.4" + sources."minimist-0.0.8" + sources."mississippi-3.0.0" + sources."mkdirp-0.5.1" + sources."move-concurrently-1.0.1" + sources."normalize-path-3.0.0" + sources."once-1.4.0" + sources."p-limit-2.2.2" + sources."p-locate-3.0.0" + sources."p-try-2.2.0" + sources."parallel-transform-1.2.0" + sources."path-dirname-1.0.2" + sources."path-exists-3.0.0" + sources."path-is-absolute-1.0.1" + (sources."path-type-3.0.0" // { + dependencies = [ + sources."pify-3.0.0" + ]; + }) + sources."pify-4.0.1" + sources."pkg-dir-3.0.0" + sources."process-nextick-args-2.0.1" + sources."promise-inflight-1.0.1" + sources."pump-3.0.0" + (sources."pumpify-1.5.1" // { + dependencies = [ + sources."pump-2.0.1" + ]; + }) + sources."punycode-2.1.1" + sources."readable-stream-2.3.7" + sources."rimraf-2.7.1" + sources."run-queue-1.0.3" + sources."safe-buffer-5.1.2" + sources."schema-utils-1.0.0" + sources."semver-5.7.1" + sources."serialize-javascript-2.1.2" + sources."slash-1.0.0" + sources."ssri-6.0.1" + sources."stream-each-1.2.3" + sources."stream-shift-1.0.1" + sources."string_decoder-1.1.1" + sources."through2-2.0.5" + sources."typedarray-0.0.6" + sources."unique-filename-1.1.1" + sources."unique-slug-2.0.2" + sources."uri-js-4.2.2" + sources."util-deprecate-1.0.2" + sources."uuid-3.4.0" + sources."webpack-log-2.0.0" + sources."wrappy-1.0.2" + sources."xtend-4.0.2" + sources."y18n-4.0.0" + sources."yallist-3.1.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Copy files && directories with webpack"; + homepage = https://github.com/webpack-contrib/copy-webpack-plugin; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; webtorrent-cli = nodeEnv.buildNodePackage { name = "webtorrent-cli"; packageName = "webtorrent-cli"; @@ -78169,7 +79170,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-10.17.14" + sources."@types/node-10.17.15" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.3.0" sources."balanced-match-1.0.0" @@ -78193,7 +79194,7 @@ in dependencies = [ sources."debug-4.1.1" sources."decompress-response-4.2.1" - sources."mimic-response-2.0.0" + sources."mimic-response-2.1.0" sources."ms-2.1.2" sources."simple-get-3.1.0" ]; @@ -78288,7 +79289,7 @@ in (sources."load-ip-set-2.1.0" // { dependencies = [ sources."decompress-response-4.2.1" - sources."mimic-response-2.0.0" + sources."mimic-response-2.1.0" sources."simple-get-3.1.0" ]; }) @@ -78332,7 +79333,7 @@ in (sources."parse-torrent-7.0.1" // { dependencies = [ sources."decompress-response-4.2.1" - sources."mimic-response-2.0.0" + sources."mimic-response-2.1.0" sources."simple-get-3.1.0" ]; }) @@ -78356,7 +79357,7 @@ in sources."randombytes-2.1.0" sources."range-parser-1.2.1" sources."range-slice-stream-2.0.0" - sources."readable-stream-3.5.0" + sources."readable-stream-3.6.0" sources."record-cache-1.1.0" (sources."render-media-3.4.0" // { dependencies = [ @@ -78428,7 +79429,7 @@ in dependencies = [ sources."debug-4.1.1" sources."decompress-response-4.2.1" - sources."mimic-response-2.0.0" + sources."mimic-response-2.1.0" sources."ms-2.1.2" sources."simple-get-3.1.0" ]; @@ -78564,7 +79565,7 @@ in ]; }) sources."bin-version-check-3.0.0" - sources."boolean-3.0.0" + sources."boolean-3.0.1" (sources."boxen-1.3.0" // { dependencies = [ sources."camelcase-4.1.0" @@ -78736,7 +79737,7 @@ in sources."glob-to-regexp-0.3.0" (sources."global-agent-2.1.8" // { dependencies = [ - sources."semver-7.1.2" + sources."semver-7.1.3" ]; }) sources."global-dirs-0.1.1" @@ -78750,7 +79751,7 @@ in ]; }) sources."graceful-fs-4.2.3" - sources."grouped-queue-0.3.3" + sources."grouped-queue-1.0.0" sources."har-schema-2.0.0" sources."har-validator-5.1.3" (sources."has-ansi-2.0.0" // { @@ -79026,10 +80027,9 @@ in sources."repeat-string-1.6.1" sources."repeating-2.0.1" sources."replace-ext-0.0.1" - (sources."request-2.88.0" // { + (sources."request-2.88.2" // { dependencies = [ - sources."punycode-1.4.1" - sources."tough-cookie-2.4.3" + sources."tough-cookie-2.5.0" ]; }) sources."resolve-1.15.1" @@ -79264,7 +80264,7 @@ in ]; }) sources."yeoman-doctor-4.0.0" - (sources."yeoman-environment-2.7.0" // { + (sources."yeoman-environment-2.8.0" // { dependencies = [ sources."debug-3.2.6" sources."ms-2.1.2" diff --git a/pkgs/development/node-packages/node-packages-v12.nix b/pkgs/development/node-packages/node-packages-v12.nix index 1c6a3821925..198bd0d3324 100644 --- a/pkgs/development/node-packages/node-packages-v12.nix +++ b/pkgs/development/node-packages/node-packages-v12.nix @@ -256,13 +256,13 @@ let sha1 = "1b681c21ff84033c826543090689420d187151dc"; }; }; - "chownr-1.1.3" = { + "chownr-1.1.4" = { name = "chownr"; packageName = "chownr"; - version = "1.1.3"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/chownr/-/chownr-1.1.3.tgz"; - sha512 = "i70fVHhmV3DtTl6nqvZOnIjbY0Pe4kAUjwHj8z0zAdgBtYrJyYwLKCCuRBQ5ppkyL0AkN7HKRnETdmdp1zqNXw=="; + url = "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz"; + sha512 = "jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="; }; }; "class-utils-0.3.6" = { @@ -1741,15 +1741,6 @@ let sha512 = "5NsSEDv8zY70ScRnOTn7bK7eanl2MvFrOrS/R6x+dBt5g1ghnj9Zv90kO8GwT8gxcu2ANyFprnFYB85IogIJOQ=="; }; }; - "punycode-1.4.1" = { - name = "punycode"; - packageName = "punycode"; - version = "1.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz"; - sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"; - }; - }; "punycode-2.1.1" = { name = "punycode"; packageName = "punycode"; @@ -1822,13 +1813,13 @@ let sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637"; }; }; - "request-2.88.0" = { + "request-2.88.2" = { name = "request"; packageName = "request"; - version = "2.88.0"; + version = "2.88.2"; src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.88.0.tgz"; - sha512 = "NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg=="; + url = "https://registry.npmjs.org/request/-/request-2.88.2.tgz"; + sha512 = "MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw=="; }; }; "resolve-1.15.1" = { @@ -2227,13 +2218,13 @@ let sha1 = "7c80c17b9dfebe599e27367e0d4dd5590141db38"; }; }; - "tough-cookie-2.4.3" = { + "tough-cookie-2.5.0" = { name = "tough-cookie"; packageName = "tough-cookie"; - version = "2.4.3"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz"; - sha512 = "Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ=="; + url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz"; + sha512 = "nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g=="; }; }; "tunnel-agent-0.6.0" = { @@ -2760,7 +2751,7 @@ in sources."buffer-from-1.1.1" sources."builtins-1.0.3" sources."caseless-0.12.0" - sources."chownr-1.1.3" + sources."chownr-1.1.4" sources."code-point-at-1.1.0" sources."combined-stream-1.0.8" sources."concat-map-0.0.1" @@ -2868,7 +2859,7 @@ in sources."safe-buffer-5.1.2" ]; }) - sources."request-2.88.0" + sources."request-2.88.2" sources."resolve-1.15.1" sources."retry-0.10.1" sources."rimraf-2.6.3" @@ -2894,11 +2885,7 @@ in sources."strip-ansi-3.0.1" sources."tar-4.4.13" sources."temp-0.9.1" - (sources."tough-cookie-2.4.3" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) + sources."tough-cookie-2.5.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."typedarray-0.0.6" @@ -2947,7 +2934,7 @@ in sources."bcrypt-pbkdf-1.0.2" sources."brace-expansion-1.1.11" sources."caseless-0.12.0" - sources."chownr-1.1.3" + sources."chownr-1.1.4" sources."code-point-at-1.1.0" sources."combined-stream-1.0.8" sources."concat-map-0.0.1" @@ -3009,7 +2996,7 @@ in sources."punycode-2.1.1" sources."qs-6.5.2" sources."readable-stream-2.3.7" - sources."request-2.88.0" + sources."request-2.88.2" sources."rimraf-2.7.1" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" @@ -3021,11 +3008,7 @@ in sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" sources."tar-4.4.13" - (sources."tough-cookie-2.4.3" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) + sources."tough-cookie-2.5.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."uri-js-4.2.2" @@ -3080,7 +3063,7 @@ in sources."are-we-there-yet-1.1.5" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" - sources."chownr-1.1.3" + sources."chownr-1.1.4" sources."code-point-at-1.1.0" sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" diff --git a/pkgs/development/node-packages/node-packages-v13.nix b/pkgs/development/node-packages/node-packages-v13.nix index 0335d6fc377..6e6c0cb4736 100644 --- a/pkgs/development/node-packages/node-packages-v13.nix +++ b/pkgs/development/node-packages/node-packages-v13.nix @@ -157,13 +157,13 @@ let sha1 = "1b681c21ff84033c826543090689420d187151dc"; }; }; - "chownr-1.1.3" = { + "chownr-1.1.4" = { name = "chownr"; packageName = "chownr"; - version = "1.1.3"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/chownr/-/chownr-1.1.3.tgz"; - sha512 = "i70fVHhmV3DtTl6nqvZOnIjbY0Pe4kAUjwHj8z0zAdgBtYrJyYwLKCCuRBQ5ppkyL0AkN7HKRnETdmdp1zqNXw=="; + url = "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz"; + sha512 = "jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="; }; }; "code-point-at-1.1.0" = { @@ -850,15 +850,6 @@ let sha512 = "5NsSEDv8zY70ScRnOTn7bK7eanl2MvFrOrS/R6x+dBt5g1ghnj9Zv90kO8GwT8gxcu2ANyFprnFYB85IogIJOQ=="; }; }; - "punycode-1.4.1" = { - name = "punycode"; - packageName = "punycode"; - version = "1.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz"; - sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"; - }; - }; "punycode-2.1.1" = { name = "punycode"; packageName = "punycode"; @@ -886,13 +877,13 @@ let sha512 = "Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw=="; }; }; - "request-2.88.0" = { + "request-2.88.2" = { name = "request"; packageName = "request"; - version = "2.88.0"; + version = "2.88.2"; src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.88.0.tgz"; - sha512 = "NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg=="; + url = "https://registry.npmjs.org/request/-/request-2.88.2.tgz"; + sha512 = "MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw=="; }; }; "resolve-1.15.1" = { @@ -1120,13 +1111,13 @@ let sha512 = "WMuOgiua1xb5R56lE0eH6ivpVmg/lq2OHm4+LtT/xtEtPQ+sz6N3bBM6WZ5FvO1lO4IKIOb43qnhoc4qxP5OeA=="; }; }; - "tough-cookie-2.4.3" = { + "tough-cookie-2.5.0" = { name = "tough-cookie"; packageName = "tough-cookie"; - version = "2.4.3"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz"; - sha512 = "Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ=="; + url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz"; + sha512 = "nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g=="; }; }; "tunnel-agent-0.6.0" = { @@ -1284,7 +1275,7 @@ in sources."buffer-from-1.1.1" sources."builtins-1.0.3" sources."caseless-0.12.0" - sources."chownr-1.1.3" + sources."chownr-1.1.4" sources."code-point-at-1.1.0" sources."combined-stream-1.0.8" sources."concat-map-0.0.1" @@ -1392,7 +1383,7 @@ in sources."safe-buffer-5.1.2" ]; }) - sources."request-2.88.0" + sources."request-2.88.2" sources."resolve-1.15.1" sources."retry-0.10.1" sources."rimraf-2.6.3" @@ -1418,11 +1409,7 @@ in sources."strip-ansi-3.0.1" sources."tar-4.4.13" sources."temp-0.9.1" - (sources."tough-cookie-2.4.3" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) + sources."tough-cookie-2.5.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."typedarray-0.0.6" diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index 0cecdb0291e..737d1eec3c2 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchPypi , pythonOlder @@ -54,6 +55,7 @@ buildPythonPackage rec { and not handle_keepalive_on_closed_connection \ and not proxy_https_bad_response \ and not partially_applied_handler \ + ${lib.optionalString stdenv.is32bit "and not test_cookiejar"} \ and not middleware" \ --ignore=test_connector.py ''; diff --git a/pkgs/development/python-modules/ansible-runner/default.nix b/pkgs/development/python-modules/ansible-runner/default.nix index 62f95c3cefc..6a71ae9e1d3 100644 --- a/pkgs/development/python-modules/ansible-runner/default.nix +++ b/pkgs/development/python-modules/ansible-runner/default.nix @@ -6,6 +6,7 @@ , python-daemon , pyyaml , six +, stdenv , ansible , pytest , mock @@ -30,8 +31,12 @@ buildPythonPackage rec { six ]; + # test_process_isolation_settings is currently broken on Darwin Catalina + # https://github.com/ansible/ansible-runner/issues/413 checkPhase = '' - HOME=$(mktemp -d) pytest --ignore test/unit/test_runner.py -k "not test_prepare" + HOME=$TMPDIR pytest \ + --ignore test/unit/test_runner.py \ + -k "not prepare ${lib.optionalString stdenv.isDarwin "and not process_isolation_settings"}" ''; meta = with lib; { diff --git a/pkgs/development/python-modules/bayesian-optimization/default.nix b/pkgs/development/python-modules/bayesian-optimization/default.nix new file mode 100644 index 00000000000..1f1d33fe329 --- /dev/null +++ b/pkgs/development/python-modules/bayesian-optimization/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, python +, scikitlearn +, scipy +, pytest +}: + +buildPythonPackage rec { + pname = "bayesian-optimization"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "fmfn"; + repo = "BayesianOptimization"; + rev = "v${version}"; + sha256 = "07sqymg6k5512k7wq4kbp7rsrkb4g90n0ck1f0b9s6glyfpcy4pq"; + }; + + propagatedBuildInputs = [ + scikitlearn + scipy + ]; + + checkInputs = [ pytest ]; + checkPhase = '' + pytest tests + ''; + + meta = with lib; { + description = "A Python implementation of global optimization with gaussian processes"; + homepage = "https://github.com/fmfn/BayesianOptimization"; + license = licenses.mit; + maintainers = [ maintainers.juliendehos ]; + }; +} diff --git a/pkgs/development/python-modules/decorator/default.nix b/pkgs/development/python-modules/decorator/default.nix index f23d5929192..efdd5023a24 100644 --- a/pkgs/development/python-modules/decorator/default.nix +++ b/pkgs/development/python-modules/decorator/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, fetchpatch , fetchPypi }: @@ -12,9 +13,12 @@ buildPythonPackage rec { sha256 = "54c38050039232e1db4ad7375cfce6748d7b41c29e95a081c8a6d2c30364a2ce"; }; - postPatch = '' - substituteInPlace src/tests/test.py --replace "DocumentationTestCase" "NoDocumentation" - ''; + patches = [ + (fetchpatch { + url = https://github.com/micheles/decorator/commit/3265f2755d16c0a3dfc9f1feee39722ddc11ee80.patch; + sha256 = "1q5nmff30vccqq5swf2ivm8cn7x3lhz8c9qpj0zddgs2y7fw8syz"; + }) + ]; meta = with lib; { homepage = https://pypi.python.org/pypi/decorator; diff --git a/pkgs/development/python-modules/dill/default.nix b/pkgs/development/python-modules/dill/default.nix index 88ffbd32e9d..0983805780f 100644 --- a/pkgs/development/python-modules/dill/default.nix +++ b/pkgs/development/python-modules/dill/default.nix @@ -1,7 +1,8 @@ { lib , buildPythonPackage , fetchPypi -, python +, isPy27 +, nose }: buildPythonPackage rec { @@ -13,15 +14,20 @@ buildPythonPackage rec { sha256 = "42d8ef819367516592a825746a18073ced42ca169ab1f5f4044134703e7a049c"; }; - # Messy test suite. Even when running the tests like tox does, it fails - doCheck = false; + # python2 can't import a test fixture + doCheck = !isPy27; + checkInputs = [ nose ]; checkPhase = '' - for test in tests/*.py; do - ${python.interpreter} $test - done + PYTHONPATH=$PWD/tests:$PYTHONPATH + nosetests \ + --ignore-files="test_classdef" \ + --ignore-files="test_objects" \ + --ignore-files="test_selected" \ + --exclude="test_the_rest" \ + --exclude="test_importable" ''; - # Following error without setting checkPhase - # TypeError: don't know how to make test from: {'byref': False, 'recurse': False, 'protocol': 3, 'fmode': 0} + # Tests seem to fail because of import pathing and referencing items/classes in modules. + # Seems to be a Nix/pathing related issue, not the codebase, so disabling failing tests. meta = { description = "Serialize all of python (almost)"; diff --git a/pkgs/development/python-modules/django-extensions/default.nix b/pkgs/development/python-modules/django-extensions/default.nix index d6254253676..08b2460b1bb 100644 --- a/pkgs/development/python-modules/django-extensions/default.nix +++ b/pkgs/development/python-modules/django-extensions/default.nix @@ -1,55 +1,63 @@ -{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch, pythonOlder -, six, typing, pygments -, django, shortuuid, python-dateutil, pytest -, pytest-django, pytestcov, mock, vobject -, werkzeug, glibcLocales, factory_boy +{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, python +, django +, factory_boy +, glibcLocales +, mock +, pygments +, pytest +, pytestcov +, pytest-django +, python-dateutil +, shortuuid +, six +, tox +, typing +, vobject +, werkzeug }: buildPythonPackage rec { pname = "django-extensions"; - version = "2.2.5"; + version = "2.2.8"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "0053yqq4vq3mwy7zkfs5vfm3g8j9sfy3vrc6xby83qlj9wz43ipi"; + sha256 = "1gd3nykwzh3azq1p9cvgkc3l5dwrv7y86sfjxd9llbyj8ky71iaj"; }; - # This patch fixes a single failing test and can be removed when updating this pkg - # to the next version - patches = [ - (fetchpatch { - url = "https://github.com/django-extensions/django-extensions/commit/1d21786da2e6868d98ae34c82079e1e03ad1aa97.patch"; - sha256 = "0d81zpj0f8a7ijrfb12j0b67fgj89k3axaskz1nwqsr4wc6n4bw2"; - }) - ]; - - postPatch = '' - substituteInPlace setup.py --replace "'tox'," "" - - # not yet pytest 5 compatible? - rm tests/management/commands/test_set_fake_emails.py - rm tests/management/commands/test_set_fake_passwords.py - rm tests/management/commands/test_validate_templates.py - - # pip should not be used during tests... - rm tests/management/commands/test_pipchecker.py - ''; + LC_ALL = "en_US.UTF-8"; + __darwinAllowLocalNetworking = true; - propagatedBuildInputs = [ six ] ++ lib.optional (pythonOlder "3.5") typing; + propagatedBuildInputs = [ six ] + ++ lib.optional (pythonOlder "3.5") typing; checkInputs = [ - django shortuuid python-dateutil pytest - pytest-django pytestcov mock vobject - werkzeug glibcLocales factory_boy pygments + django + factory_boy + glibcLocales + mock + pygments # not explicitly declared in setup.py, but some tests require it + pytest + pytestcov + pytest-django + python-dateutil + shortuuid + tox + vobject + werkzeug ]; - LC_ALL = "en_US.UTF-8"; + # tests not compatible with pip>=20 + checkPhase = '' + rm tests/management/commands/test_pipchecker.py + ${python.interpreter} setup.py test + ''; meta = with lib; { description = "A collection of custom extensions for the Django Framework"; - homepage = https://github.com/django-extensions/django-extensions; + homepage = "https://github.com/django-extensions/django-extensions"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/docloud/default.nix b/pkgs/development/python-modules/docloud/default.nix new file mode 100644 index 00000000000..f1ec269f7cb --- /dev/null +++ b/pkgs/development/python-modules/docloud/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchPypi +, requests +}: + +buildPythonPackage rec { + pname = "docloud"; + version = "1.0.375"; + + src = fetchPypi { + inherit pname version; + sha256 = "996d55407498fd01e6c6c480f367048f92255e9ca9db0e9ea19aaef91328a441"; + }; + + propagatedBuildInputs = [ + requests + ]; + + # Pypi's tarball doesn't contain tests. Source not available. + doCheck = false; + pythonImportsCheck = [ "docloud" ]; + + meta = with lib; { + description = "The IBM Decision Optimization on Cloud Python client"; + homepage = "https://onboarding-oaas.docloud.ibmcloud.com/software/analytics/docloud/"; + license = licenses.asl20; + maintainers = with maintainers; [ drewrisinger ]; + }; +} diff --git a/pkgs/development/python-modules/docplex/default.nix b/pkgs/development/python-modules/docplex/default.nix new file mode 100644 index 00000000000..42f1270dc1b --- /dev/null +++ b/pkgs/development/python-modules/docplex/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPy27 +, futures +, docloud +, requests +}: + +buildPythonPackage rec { + pname = "docplex"; + version = "2.12.182"; + + # No source available from official repo + src = fetchPypi { + inherit pname version; + sha256 = "aaf150b06d44f07639aca48be1fca69c7732d57507e6adc4e8451c7a93489116"; + }; + + propagatedBuildInputs = [ + docloud + requests + ] ++ lib.optional isPy27 futures; + + doCheck = false; + pythonImportsCheck = [ "docplex" ]; + + meta = with lib; { + description = "IBM Decision Optimization CPLEX Modeling for Python"; + homepage = "https://onboarding-oaas.docloud.ibmcloud.com/software/analytics/docloud/"; + license = licenses.asl20; + maintainers = with maintainers; [ drewrisinger ]; + }; +} diff --git a/pkgs/development/python-modules/ecos/default.nix b/pkgs/development/python-modules/ecos/default.nix new file mode 100644 index 00000000000..6c07a5d485a --- /dev/null +++ b/pkgs/development/python-modules/ecos/default.nix @@ -0,0 +1,50 @@ +{ lib +, pythonOlder +, buildPythonPackage +, fetchFromGitHub +, pkgs +, numpy +, scipy + # check inputs +, nose +}: + +buildPythonPackage rec { + pname = "ecos"; + version = "2.0.7.post1"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "embotech"; + repo = "ecos-python"; + rev = version; + sha256 = "1wzmamz2r4xr2zxgfwnm5q283185d1q6a7zn30vip18lxpys70z0"; + fetchSubmodules = true; + }; + + prePatch = '' + echo '__version__ = "${version}"' >> ./src/ecos/version.py + ''; + + propagatedBuildInputs = [ + numpy + scipy + ]; + + checkInputs = [ nose ]; + checkPhase = '' + # Run tests + cd ./src + nosetests test_interface.py test_interface_bb.py + ''; + pythonImportsCheck = [ "ecos" ]; + + meta = with lib; { + description = "Python package for ECOS: Embedded Cone Solver"; + downloadPage = "https://github.com/embotech/ecos-python/releases"; + homepage = pkgs.ecos.meta.homepage; + license = licenses.asl20; + maintainers = with maintainers; [ drewrisinger ]; + }; +} diff --git a/pkgs/development/python-modules/ftfy/default.nix b/pkgs/development/python-modules/ftfy/default.nix index d7a9fd2a0b0..1b8b8c17846 100644 --- a/pkgs/development/python-modules/ftfy/default.nix +++ b/pkgs/development/python-modules/ftfy/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "ftfy"; - version = "5.6"; + version = "5.7"; # ftfy v5 only supports python3. Since at the moment the only # packages that use ftfy are spacy and textacy which both support # python 2 and 3, they have pinned ftfy to the v4 branch. @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1k4vr5rfa62yafwpmb4827n50pwb79if0vhg1y4yqbb0bv20jxbd"; + sha256 = "1j143kfpnskksfzs0pnr37kwph6m7c71p8gdldv26x2b7arwiyb7"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/osqp/default.nix b/pkgs/development/python-modules/osqp/default.nix new file mode 100644 index 00000000000..237ad7a7a00 --- /dev/null +++ b/pkgs/development/python-modules/osqp/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, fetchPypi +, cmake +, future +, numpy + # check inputs +, scipy +, pytestCheckHook +, mkl +}: + +buildPythonPackage rec { + pname = "osqp"; + version = "0.6.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "130frig5bznfacqp9jwbshmbqd2xw3ixdspsbkrwsvkdaab7kca7"; + }; + + nativeBuildInputs = [ cmake ]; + dontUseCmakeConfigure = true; + + propagatedBuildInputs = [ + numpy + future + ]; + + checkInputs = [ scipy pytestCheckHook mkl ]; + pythonImportsCheck = [ "osqp" ]; + dontUseSetuptoolsCheck = true; # running setup.py fails if false + preCheck = '' + export LD_LIBRARY_PATH=${lib.strings.makeLibraryPath [ mkl ]}:$LD_LIBRARY_PATH; + ''; + + meta = with lib; { + description = "The Operator Splitting QP Solver"; + longDescription = '' + Numerical optimization package for solving problems in the form + minimize 0.5 x' P x + q' x + subject to l <= A x <= u + + where x in R^n is the optimization variable + ''; + homepage = "https://osqp.org/"; + downloadPage = "https://github.com/oxfordcontrol/osqp"; + license = licenses.asl20; + maintainers = with lib.maintainers; [ drewrisinger ]; + }; +} diff --git a/pkgs/development/python-modules/pylatexenc/default.nix b/pkgs/development/python-modules/pylatexenc/default.nix new file mode 100644 index 00000000000..146aed9a3ec --- /dev/null +++ b/pkgs/development/python-modules/pylatexenc/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytest +}: + +buildPythonPackage rec { + pname = "pylatexenc"; + version = "2.1"; + + src = fetchFromGitHub { + owner = "phfaist"; + repo = pname; + rev = "v${version}"; + sha256 = "0wnl00y5dl56aw9j4y21kqapraaravbycwfxdmjsbgl11nk4llx9"; + }; + + pythonImportsCheck = [ "pylatexenc" ]; + checkInputs = [ pytest ]; + checkPhase = '' + pytest + ''; + + meta = with lib; { + description = "Simple LaTeX parser providing latex-to-unicode and unicode-to-latex conversion"; + homepage = "https://pylatexenc.readthedocs.io"; + downloadPage = "https;//www.github.com/phfaist/pylatexenc"; + license = licenses.mit; + maintainers = with maintainers; [ drewrisinger ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/pyparted/default.nix b/pkgs/development/python-modules/pyparted/default.nix index 3defe979d37..c51c55a5eb2 100644 --- a/pkgs/development/python-modules/pyparted/default.nix +++ b/pkgs/development/python-modules/pyparted/default.nix @@ -1,18 +1,22 @@ { stdenv +, fetchFromGitHub , buildPythonPackage , isPyPy , pkgs , python +, six }: buildPythonPackage rec { pname = "pyparted"; - version = "3.10.7"; + version = "3.11.4"; disabled = isPyPy; - src = pkgs.fetchurl { - url = "https://github.com/rhinstaller/pyparted/archive/v${version}.tar.gz"; - sha256 = "0c9ljrdggwawd8wdzqqqzrna9prrlpj6xs59b0vkxzip0jkf652r"; + src = fetchFromGitHub { + repo = pname; + owner = "dcantrell"; + rev = "v${version}"; + sha256 = "0wd0xhv1y1zw7djzcnimj8irif3mg0shbhgz0jn5yi914is88h6n"; }; postPatch = '' @@ -26,11 +30,16 @@ buildPythonPackage rec { tests/test__ped_ped.py ''; + patches = [ + ./fix-test-pythonpath.patch + ]; + preConfigure = '' PATH="${pkgs.parted}/sbin:$PATH" ''; nativeBuildInputs = [ pkgs.pkgconfig ]; + checkInputs = [ six ]; propagatedBuildInputs = [ pkgs.parted ]; checkPhase = '' @@ -39,10 +48,10 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = "https://fedorahosted.org/pyparted/"; + homepage = "https://github.com/dcantrell/pyparted/"; description = "Python interface for libparted"; license = licenses.gpl2Plus; platforms = platforms.linux; + maintainers = with maintainers; [ lsix ]; }; - } diff --git a/pkgs/development/python-modules/pyparted/fix-test-pythonpath.patch b/pkgs/development/python-modules/pyparted/fix-test-pythonpath.patch new file mode 100644 index 00000000000..740bffbef6d --- /dev/null +++ b/pkgs/development/python-modules/pyparted/fix-test-pythonpath.patch @@ -0,0 +1,26 @@ +diff -ur a/Makefile b/Makefile +--- a/Makefile 1980-01-02 00:00:00.000000000 +0100 ++++ b/Makefile 2020-02-18 20:04:14.068243263 +0100 +@@ -39,19 +39,19 @@ + @$(PYTHON) setup.py build + + test: all +- @env PYTHONPATH=$$(find $$(pwd) -name "*.so" | head -n 1 | xargs dirname):src/parted:src \ ++ @env PYTHONPATH=$$(find $$(pwd) -name "*.so" | head -n 1 | xargs dirname):src/parted:src:$$PYTHONPATH \ + $(PYTHON) -m unittest discover -v + + coverage: all + @echo "*** Running unittests with $(COVERAGE) for $(PYTHON) ***" +- @env PYTHONPATH=$$(find $$(pwd) -name "*.so" | head -n 1 | xargs dirname):src/parted:src \ ++ @env PYTHONPATH=$$(find $$(pwd) -name "*.so" | head -n 1 | xargs dirname):src/parted:src:$$PYTHONPATH \ + $(COVERAGE) run --branch -m unittest discover -v + $(COVERAGE) report --include="build/lib.*/parted/*" --show-missing + $(COVERAGE) report --include="build/lib.*/parted/*" > coverage-report.log + + check: clean + env PYTHON=python3 $(MAKE) ; \ +- env PYTHON=python3 PYTHONPATH=$$(find $$(pwd) -name "*.so" | head -n 1 | xargs dirname):src/parted:src \ ++ env PYTHON=python3 PYTHONPATH=$$(find $$(pwd) -name "*.so" | head -n 1 | xargs dirname):src/parted:src:$$PYTHONPATH \ + tests/pylint/runpylint.py + + dist: diff --git a/pkgs/development/python-modules/ruamel_base/default.nix b/pkgs/development/python-modules/ruamel_base/default.nix index ba6a79fdd63..f7e473f9f56 100644 --- a/pkgs/development/python-modules/ruamel_base/default.nix +++ b/pkgs/development/python-modules/ruamel_base/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Common routines for ruamel packages"; - homepage = https://bitbucket.org/ruamel/base; + homepage = "https://sourceforge.net/projects/ruamel-base/"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/ruamel_ordereddict/default.nix b/pkgs/development/python-modules/ruamel_ordereddict/default.nix index ee329a65166..da4e891b2b3 100644 --- a/pkgs/development/python-modules/ruamel_ordereddict/default.nix +++ b/pkgs/development/python-modules/ruamel_ordereddict/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A version of dict that keeps keys in insertion resp. sorted order"; - homepage = https://bitbucket.org/ruamel/ordereddict; + homepage = "https://sourceforge.net/projects/ruamel-ordereddict/"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/ruamel_yaml/default.nix b/pkgs/development/python-modules/ruamel_yaml/default.nix index 88b2de830b7..bdfde326d76 100644 --- a/pkgs/development/python-modules/ruamel_yaml/default.nix +++ b/pkgs/development/python-modules/ruamel_yaml/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "YAML parser/emitter that supports roundtrip preservation of comments, seq/map flow style, and map key order"; - homepage = https://bitbucket.org/ruamel/yaml; + homepage = "https://sourceforge.net/projects/ruamel-yaml/"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/ruamel_yaml_clib/default.nix b/pkgs/development/python-modules/ruamel_yaml_clib/default.nix index 19c208f2716..46b55c04d30 100644 --- a/pkgs/development/python-modules/ruamel_yaml_clib/default.nix +++ b/pkgs/development/python-modules/ruamel_yaml_clib/default.nix @@ -1,6 +1,6 @@ { stdenv , buildPythonPackage -, fetchFromBitbucket +, fetchhg , ruamel_base , ruamel_ordereddict , isPy3k @@ -10,9 +10,8 @@ buildPythonPackage rec { pname = "ruamel.yaml.clib"; version = "0.2.0"; - src = fetchFromBitbucket { - owner = "ruamel"; - repo = "yaml.clib"; + src = fetchhg { + url = "http://hg.code.sf.net/p/ruamel-yaml-clib/code"; rev = version; sha256 = "0kq6zi96qlm72lzj90fc2rfk6nm5kqhk6qxdl8wl9s3a42b0v6wl"; }; @@ -22,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "YAML parser/emitter that supports roundtrip preservation of comments, seq/map flow style, and map key order"; - homepage = https://bitbucket.org/ruamel/yaml; + homepage = "https://sourceforge.net/projects/ruamel-yaml-clib/"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/seqdiag/default.nix b/pkgs/development/python-modules/seqdiag/default.nix index 1f6307f2cbb..feddc24985a 100644 --- a/pkgs/development/python-modules/seqdiag/default.nix +++ b/pkgs/development/python-modules/seqdiag/default.nix @@ -1,14 +1,15 @@ -{ stdenv, fetchurl, buildPythonPackage, pep8, nose, unittest2, docutils +{ stdenv, fetchurl, buildPythonPackage, isPy27, pep8, nose, unittest2, docutils , blockdiag }: buildPythonPackage rec { pname = "seqdiag"; - version = "0.9.6"; + version = "2.0.0"; + disabled = isPy27; src = fetchurl { url = "mirror://pypi/s/seqdiag/${pname}-${version}.tar.gz"; - sha256 = "78104e7644c1a4d3a5cacb68de6a7f720793f08dd78561ef0e9e80bed63702bf"; + sha256 = "0k7j4f9j3d0325piwvbv90nfh0wzfk2n6s73s6h6nsxmqshcgswk"; }; buildInputs = [ pep8 nose unittest2 docutils ]; diff --git a/pkgs/development/python-modules/sqlitedict/default.nix b/pkgs/development/python-modules/sqlitedict/default.nix new file mode 100644 index 00000000000..5037aa2c368 --- /dev/null +++ b/pkgs/development/python-modules/sqlitedict/default.nix @@ -0,0 +1,26 @@ +{ lib, buildPythonPackage, fetchFromGitHub, pytest }: + +buildPythonPackage rec { + pname = "sqlitedict"; + version = "1.6.0"; + + src = fetchFromGitHub { + owner = "RaRe-Technologies"; + repo = "sqlitedict"; + rev = version; + sha256 = "1yq94lgpny9qcfbsl39npjvrsjfggi3lj2kpzcsxcfdfgxag6m2m"; + }; + + checkInputs = [ pytest ]; + + checkPhase = '' + pytest tests + ''; + + meta = with lib; { + description = "Persistent, thread-safe dict"; + homepage = "https://github.com/RaRe-Technologies/sqlitedict"; + license = licenses.asl20; + maintainers = [ maintainers.arnoldfarkas ]; + }; +} diff --git a/pkgs/development/python-modules/untangle/default.nix b/pkgs/development/python-modules/untangle/default.nix new file mode 100644 index 00000000000..f8f172e78b1 --- /dev/null +++ b/pkgs/development/python-modules/untangle/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchFromGitHub, python }: + +buildPythonPackage rec { + pname = "untangle"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "stchris"; + repo = "untangle"; + # 1.1.1 is not tagged on GitHub + rev = "61b57cd771a40df7d1621e9ec3c68d9acd733d31"; + sha256 = "0ffvlfyyl82xi4akz1lls32lrnlrn44ik41v8x8xh9ghy0n0ick7"; + }; + + checkPhase = '' + ${python.interpreter} -m unittest discover -s tests + ''; + + meta = with lib; { + description = "Convert XML documents into Python objects"; + homepage = "http://github.com/stchris/untangle"; + license = licenses.mit; + maintainers = [ maintainers.arnoldfarkas ]; + }; +} diff --git a/pkgs/development/python-modules/vertica-python/default.nix b/pkgs/development/python-modules/vertica-python/default.nix new file mode 100644 index 00000000000..24af3599869 --- /dev/null +++ b/pkgs/development/python-modules/vertica-python/default.nix @@ -0,0 +1,27 @@ +{ lib, buildPythonPackage, fetchPypi, future, dateutil, six, pytest, mock, parameterized }: + +buildPythonPackage rec { + pname = "vertica-python"; + version = "0.10.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "c35d0e7ac8da2af47a65efc72d5d8351caa93e4829e549f229aa7e375593f896"; + }; + + propagatedBuildInputs = [ future dateutil six ]; + + checkInputs = [ pytest mock parameterized ]; + + # Integration tests require an accessible Vertica db + checkPhase = '' + pytest --ignore vertica_python/tests/integration_tests + ''; + + meta = with lib; { + description = "Native Python client for Vertica database"; + homepage = "https://github.com/vertica/vertica-python"; + license = licenses.asl20; + maintainers = [ maintainers.arnoldfarkas ]; + }; +} diff --git a/pkgs/development/python-modules/vowpalwabbit/default.nix b/pkgs/development/python-modules/vowpalwabbit/default.nix index d23f45b122f..65dbce862a4 100644 --- a/pkgs/development/python-modules/vowpalwabbit/default.nix +++ b/pkgs/development/python-modules/vowpalwabbit/default.nix @@ -1,5 +1,17 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, python, zlib, clang -, ncurses, pytest, docutils, pygments, numpy, scipy, scikitlearn }: +{ stdenv +, lib +, fetchPypi +, buildPythonPackage +, cmake +, python +, zlib +, ncurses +, pytest +, docutils +, pygments +, numpy +, scipy +, scikitlearn }: buildPythonPackage rec { pname = "vowpalwabbit"; @@ -10,21 +22,27 @@ buildPythonPackage rec { sha256 = "bd4c7e49a6ddaa1afedf97b22b822c7322328d686d45151b47a5127fc409c2af"; }; - # Should be fixed in next Python release after 8.5.0: - # https://github.com/JohnLangford/vowpal_wabbit/pull/1533 - patches = [ - ./vowpal-wabbit-find-boost.diff + nativeBuildInputs = [ + cmake ]; - # vw tries to write some explicit things to home - # python installed: The directory '/homeless-shelter/.cache/pip/http' - preInstall = '' - export HOME=$PWD - ''; + buildInputs = [ + docutils + ncurses + pygments + python.pkgs.boost + zlib.dev + ]; + + propagatedBuildInputs = [ + numpy + scikitlearn + scipy + ]; - nativeBuildInputs = [ clang ]; - buildInputs = [ python.pkgs.boost zlib.dev ncurses pytest docutils pygments ]; - propagatedBuildInputs = [ numpy scipy scikitlearn ]; + # Python build script uses CMake, but we don't want CMake to do the + # configuration. + dontUseCmakeConfigure = true; # Python ctypes.find_library uses DYLD_LIBRARY_PATH. preConfigure = lib.optionalString stdenv.isDarwin '' @@ -34,12 +52,12 @@ buildPythonPackage rec { checkPhase = '' # check-manifest requires a git clone, not a tarball # check-manifest --ignore "Makefile,PACKAGE.rst,*.cc,tox.ini,tests*,examples*,src*" - ${python.interpreter} setup.py check -mrs + ${python.interpreter} setup.py check -ms ''; meta = with lib; { description = "Vowpal Wabbit is a fast machine learning library for online learning, and this is the python wrapper for the project."; - homepage = https://github.com/JohnLangford/vowpal_wabbit; + homepage = "https://github.com/JohnLangford/vowpal_wabbit"; license = licenses.bsd3; broken = stdenv.isAarch64; maintainers = with maintainers; [ teh ]; diff --git a/pkgs/development/python-modules/vowpalwabbit/vowpal-wabbit-find-boost.diff b/pkgs/development/python-modules/vowpalwabbit/vowpal-wabbit-find-boost.diff deleted file mode 100644 index 645956594bf..00000000000 --- a/pkgs/development/python-modules/vowpalwabbit/vowpal-wabbit-find-boost.diff +++ /dev/null @@ -1,34 +0,0 @@ ---- vowpalwabbit-8.5.0.orig/setup.py 2018-09-03 20:32:39.000000000 +0200 -+++ vowpalwabbit-8.5.0/setup.py 2018-09-03 20:34:09.000000000 +0200 -@@ -23,18 +23,11 @@ - - def find_boost(): - """Find correct boost-python library information """ -- if system == 'Linux': -+ if system == 'Linux' or system == 'Darwin': - # use version suffix if present -- boost_lib = 'boost_python-py{v[0]}{v[1]}'.format(v=sys.version_info) -- if sys.version_info.major == 3: -- for candidate in ['-py36', '-py35', '-py34', '3']: -- boost_lib = 'boost_python{}'.format(candidate) -- if find_library(boost_lib): -- exit -+ boost_lib = 'boost_python{v[0]}{v[1]}'.format(v=sys.version_info) - if not find_library(boost_lib): - boost_lib = "boost_python" -- elif system == 'Darwin': -- boost_lib = 'boost_python-mt' if sys.version_info[0] == 2 else 'boost_python3-mt' - elif system == 'Cygwin': - boost_lib = 'boost_python-mt' if sys.version_info[0] == 2 else 'boost_python3-mt' - else: ---- vowpalwabbit-8.5.0.orig/src/Makefile 2018-09-03 20:32:40.000000000 +0200 -+++ vowpalwabbit-8.5.0/src/Makefile 2018-09-03 21:42:30.000000000 +0200 -@@ -37,7 +37,7 @@ - NPROCS:=$(shell grep -c ^processor /proc/cpuinfo) - endif - ifeq ($(UNAME), Darwin) -- LIBS = -lboost_program_options-mt -lboost_serialization-mt -l pthread -l z -+ LIBS = -lboost_program_options -lboost_serialization -l pthread -l z - # On Macs, the location isn't always clear - # brew uses /usr/local - # but /opt/local seems to be preferred by some users diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 088bcedf6de..f26e33ca242 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -294,6 +294,12 @@ in libv8 = attrs: { buildInputs = [ which v8 python ]; buildFlags = [ "--with-system-v8=true" ]; + dontBuild = false; + postPatch = '' + substituteInPlace ext/libv8/extconf.rb \ + --replace "location = Libv8::Location::Vendor.new" \ + "location = Libv8::Location::System.new" + ''; }; execjs = attrs: { diff --git a/pkgs/development/tools/analysis/brakeman/default.nix b/pkgs/development/tools/analysis/brakeman/default.nix index edf37efbce9..de351524f39 100644 --- a/pkgs/development/tools/analysis/brakeman/default.nix +++ b/pkgs/development/tools/analysis/brakeman/default.nix @@ -4,12 +4,13 @@ buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "brakeman"; - version = "4.7.2"; - source.sha256 = "1j1svldxvbl27kpyp9yngfwa0fdqal926sjk0cha7h520wvnz79k"; + version = "4.8.0"; + source.sha256 = "0xy28pq4x1i7xns5af9k8fx35sqffz2lg94fgbsi9zhi877b7srg"; meta = with lib; { description = "Static analysis security scanner for Ruby on Rails"; homepage = "https://brakemanscanner.org/"; + changelog = "https://github.com/presidentbeef/brakeman/releases/tag/v${version}"; license = [ licenses.unfreeRedistributable ]; platforms = ruby.meta.platforms; maintainers = [ maintainers.marsam ]; diff --git a/pkgs/development/tools/analysis/hopper/default.nix b/pkgs/development/tools/analysis/hopper/default.nix index c9214ae7e35..f6c5dcaf1ad 100644 --- a/pkgs/development/tools/analysis/hopper/default.nix +++ b/pkgs/development/tools/analysis/hopper/default.nix @@ -1,42 +1,80 @@ -{ stdenv, fetchurl, pkgs, lib }: - +{ stdenv +, fetchurl +, lib +, autoPatchelfHook +, wrapQtAppsHook +, libbsd +, python27 +, gmpxx +, ncurses5 +, gnustep +, libffi +}: stdenv.mkDerivation rec { - pname = "hopper"; - version = "4.5.7"; + pname = "hopper"; + version = "4.5.19"; rev = "v${lib.versions.major version}"; src = fetchurl { url = "https://d2ap6ypl1xbe4k.cloudfront.net/Hopper-${rev}-${version}-Linux.pkg.tar.xz"; - sha256 = "1ce7a0f13126a940398aa8da4a74e250dff0401074f30446a8840ac3dbb902c0"; + sha256 = "1c9wbjwz5xn0skz2a1wpxyx78hhrm8vcbpzagsg4wwnyblap59db"; }; sourceRoot = "."; - ldLibraryPath = with pkgs; stdenv.lib.makeLibraryPath [ -libbsd.out libffi.out gmpxx.out python27Full.out python27Packages.libxml2 qt5.qtbase zlib xlibs.libX11.out xorg_sys_opengl.out xlibs.libXrender.out gcc-unwrapped.lib + nativeBuildInputs = [ + wrapQtAppsHook + autoPatchelfHook ]; - nativeBuildInputs = [ pkgs.qt5.wrapQtAppsHook ]; - - qtWrapperArgs = [ ''--suffix LD_LIBRARY_PATH : ${ldLibraryPath}'' ]; + buildInputs = [ + libbsd + python27 + gmpxx + ncurses5 + gnustep.libobjc + ]; installPhase = '' + runHook preInstall + mkdir -p $out/bin mkdir -p $out/lib mkdir -p $out/share + cp $sourceRoot/opt/hopper-${rev}/bin/Hopper $out/bin/hopper - cp -r $sourceRoot/opt/hopper-${rev}/lib $out - cp -r $sourceRoot/usr/share $out/share - patchelf \ - --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 \ - $out/bin/hopper + cp \ + --archive \ + $sourceRoot/opt/hopper-${rev}/lib/libBlocksRuntime.so* \ + $sourceRoot/opt/hopper-${rev}/lib/libdispatch.so* \ + $sourceRoot/opt/hopper-${rev}/lib/libgnustep-base.so* \ + $sourceRoot/opt/hopper-${rev}/lib/libHopperCore.so* \ + $sourceRoot/opt/hopper-${rev}/lib/libkqueue.so* \ + $sourceRoot/opt/hopper-${rev}/lib/libobjcxx.so* \ + $sourceRoot/opt/hopper-${rev}/lib/libpthread_workqueue.so* \ + $out/lib + + # we already ship libffi.so.7 + ln -s ${lib.getLib libffi}/lib/libffi.so $out/lib/libffi.so.6 + + cp -r $sourceRoot/usr/share $out + + runHook postInstall + ''; + + postFixup = '' + substituteInPlace "$out/share/applications/hopper-${rev}.desktop" \ + --replace "Exec=/opt/hopper-${rev}/bin/Hopper" "Exec=$out/bin/hopper" ''; - meta = { + meta = with stdenv.lib; { homepage = "https://www.hopperapp.com/index.html"; description = "A macOS and Linux Disassembler"; - license = stdenv.lib.licenses.unfree; - maintainers = [ stdenv.lib.maintainers.luis ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.unfree; + maintainers = with maintainers; [ + luis + Enteee + ]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/tools/analysis/panopticon/default.nix b/pkgs/development/tools/analysis/panopticon/default.nix index 87512355b85..85fd8c93529 100644 --- a/pkgs/development/tools/analysis/panopticon/default.nix +++ b/pkgs/development/tools/analysis/panopticon/default.nix @@ -24,10 +24,7 @@ rustPlatform.buildRustPackage rec { git ]; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1fsxd7yzb38h1d52yyz7kj1v0riycjydb1b1bn1zkhgwm5sm2kbs"; + cargoSha256 = "1hdsn011y9invfy7can8c02zwa7birj9y1rxhrj7wyv4gh3659i0"; doCheck = false; postInstall = '' diff --git a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix b/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix index f2f3588ba29..ffdeb01c2bb 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix @@ -8,13 +8,13 @@ buildBazelPackage rec { name = "bazel-remote-${version}"; - version = "2020-01-29"; + version = "1.0.0"; src = fetchFromGitHub { owner = "buchgr"; repo = "bazel-remote"; - rev = "ae9378321552dd14066332f8fa55076040228cb7"; - sha256 = "1jbd319n255cmmncnjfdkdcpx0x62asp3dqwgl6vimx4dqqj8v1p"; + rev = "v${version}"; + sha256 = "1fpdw139d5q1377qnqbgkahmdr4mdaa17d2m10wkyvyvijwm4r2m"; }; nativeBuildInputs = [ go git ]; diff --git a/pkgs/development/tools/build-managers/bmake/default.nix b/pkgs/development/tools/build-managers/bmake/default.nix index d895261c4b5..ed1e6a174ce 100644 --- a/pkgs/development/tools/build-managers/bmake/default.nix +++ b/pkgs/development/tools/build-managers/bmake/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "bmake"; - version = "20181221"; + version = "20200212"; src = fetchurl { url = "http://www.crufty.net/ftp/pub/sjg/${pname}-${version}.tar.gz"; - sha256 = "0zp6yy27z52qb12bgm3hy1dwal2i570615pqqk71zwhcxfs4h2gw"; + sha256 = "134ibplk5rj7s3ig2czbhqs89l45jl6vswg3cy6xzm0anz5smhb2"; }; nativeBuildInputs = [ getopt ]; diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 33d762dbe92..4eb531f59a8 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -19,12 +19,12 @@ stdenv.mkDerivation rec { + lib.optionalString useNcurses "-cursesUI" + lib.optionalString withQt5 "-qt5UI" + lib.optionalString useQt4 "-qt4UI"; - version = "3.16.3"; + version = "3.16.4"; src = fetchurl { url = "${meta.homepage}files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz"; # compare with https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}-SHA-256.txt - sha256 = "0s06wrp0jnw2l4yq94skj53hwnz7lqrmhh96sq7w7njkkggickz5"; + sha256 = "0b5c77lqzfk5l7mnnih5c78i36d3skbkw20jjnph79lx9l8qrk4v"; }; patches = [ diff --git a/pkgs/development/tools/chit/default.nix b/pkgs/development/tools/chit/default.nix index 965f1200235..9859739a1df 100644 --- a/pkgs/development/tools/chit/default.nix +++ b/pkgs/development/tools/chit/default.nix @@ -15,10 +15,7 @@ buildRustPackage rec { sha256 = "0iixczy3cad44j2d7zzj8f3lnmp4jwnb0snmwfgiq3vj9wrn28pz"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "0k6z69a09ps55w2rdgnf92yscw6rlbcpb4q9yf3rsav15pgpqvw8"; + cargoSha256 = "1w25k3bqmmcrhpkw510vbwph0rfmrzi2wby0z2rz1q4k1f9k486m"; nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkgconfig ]; buildInputs = [] diff --git a/pkgs/development/tools/cloudflare-wrangler/default.nix b/pkgs/development/tools/cloudflare-wrangler/default.nix index 372de27ec59..88c52318da4 100644 --- a/pkgs/development/tools/cloudflare-wrangler/default.nix +++ b/pkgs/development/tools/cloudflare-wrangler/default.nix @@ -1,25 +1,29 @@ -{ stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl +{ stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, curl, darwin }: rustPlatform.buildRustPackage rec { pname = "cloudflare-wrangler"; - version = "1.4.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "cloudflare"; repo = "wrangler"; rev = "v" + version; - sha256 = "1agl1cg34iklvniygrkq8dqsampvg17d3nsm0dcr6c3n5rj09gbi"; + sha256 = "0vc7f3jki2fdwlgpwhaxzm58g2898wpwbib7dmibb9kxv4jna8gj"; }; # Delete this on next update; see #79975 for details legacyCargoFetcher = true; - - cargoSha256 = "0c2g6yghwqjy21yfdcri4v9aqizd06ww3zx2snns51gnqqk8r57k"; + cargoSha256 = "1f3gy3agpdg6pck5acxjfrd89hyp9x1byqhfizlizbfmwrqs4il8"; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ]; + buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ + curl + darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.CoreServices + darwin.apple_sdk.frameworks.CoreFoundation + ]; # tries to use "/homeless-shelter" and fails doCheck = false; diff --git a/pkgs/development/tools/continuous-integration/drone/default.nix b/pkgs/development/tools/continuous-integration/drone/default.nix index 8e63daab2d6..05257f65af5 100644 --- a/pkgs/development/tools/continuous-integration/drone/default.nix +++ b/pkgs/development/tools/continuous-integration/drone/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { name = "drone.io-${version}"; - version = "1.6.0"; + version = "1.6.5"; goPackagePath = "github.com/drone/drone"; - modSha256 = "0l33qib9riknrjdpsvd7n6slqp485vx66xl6w7m24b5sc7yfsg7m"; + modSha256 = "1fyb9218s52w8c6c3v6rgivbyzy5hz4q4z8r75ng2yrmjmmiv2gr"; src = fetchFromGitHub { owner = "drone"; repo = "drone"; rev = "v${version}"; - sha256 = "0ij4a6rh17ib360bxrpncf8lp839b6sl17bd0fp3xvwmibk6xgjz"; + sha256 = "05cgd72qyss836fby0adhrm5p8g7639psk2yslhg6pmz0cqfbq9m"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/electron/3.x.nix b/pkgs/development/tools/electron/3.x.nix index a902f279a49..f66d1a57a04 100644 --- a/pkgs/development/tools/electron/3.x.nix +++ b/pkgs/development/tools/electron/3.x.nix @@ -69,7 +69,7 @@ let unzip $src mv Electron.app $out/Applications mkdir -p $out/bin - ln -s $out/Applications/Electron.app/Contents/MacOs/Electron $out/bin/electron + ln -s $out/Applications/Electron.app/Contents/MacOS/Electron $out/bin/electron ''; }; in diff --git a/pkgs/development/tools/electron/generic.nix b/pkgs/development/tools/electron/generic.nix index b2ce076933d..a06989ad254 100644 --- a/pkgs/development/tools/electron/generic.nix +++ b/pkgs/development/tools/electron/generic.nix @@ -70,7 +70,7 @@ let unzip $src mv Electron.app $out/Applications mkdir -p $out/bin - ln -s $out/Applications/Electron.app/Contents/MacOs/Electron $out/bin/electron + ln -s $out/Applications/Electron.app/Contents/MacOS/Electron $out/bin/electron ''; }; in diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix index 8304d95d99f..75bb50f25a4 100644 --- a/pkgs/development/tools/golangci-lint/default.nix +++ b/pkgs/development/tools/golangci-lint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "golangci-lint"; - version = "1.22.2"; + version = "1.23.6"; src = fetchFromGitHub { owner = "golangci"; repo = "golangci-lint"; rev = "v${version}"; - sha256 = "1wwp6ppm5p2cf7jbcgmqm6alzaj34sa079d98afw21yr81qxvvid"; + sha256 = "0y5kjlqbz9xxlxd8kagrsyz9wvjqf7i28i6zb2m8x9c9zg82kvsn"; }; - modSha256 = "02j2cf5778ds0vwz0kkd9c1x5ap732vkq20bfg440spfajscvndm"; + modSha256 = "0sckz298bvkf4p4fdmsmza0zrj2s2pvc86qwg6i76vdh9yzvq5gx"; subPackages = [ "cmd/golangci-lint" ]; meta = with lib; { diff --git a/pkgs/development/tools/heroku/default.nix b/pkgs/development/tools/heroku/default.nix index 58e9c67dd44..1e2359f1003 100644 --- a/pkgs/development/tools/heroku/default.nix +++ b/pkgs/development/tools/heroku/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "heroku"; - version = "7.35.1"; + version = "7.38.1"; src = fetchurl { url = "https://cli-assets.heroku.com/heroku-v${version}/heroku-v${version}.tar.xz"; - sha256 = "1b48jhl7a9nzvgankys32mfnv6i2kx11z874k7fz9px3kx8s7pbb"; + sha256 = "1sa4ph4d5y48yz2n06aivqgl07ljlgwgf5ik431vnrz5smxl6ngr"; }; nativeBuildInputs = [ makeWrapper ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://cli.heroku.com; + homepage = "https://cli.heroku.com"; description = "Everything you need to get started using Heroku"; maintainers = with lib.maintainers; [ aflatter mirdhyn peterhoeg ]; license = lib.licenses.mit; diff --git a/pkgs/development/tools/just/default.nix b/pkgs/development/tools/just/default.nix index 20f85461946..5641a14e1ab 100644 --- a/pkgs/development/tools/just/default.nix +++ b/pkgs/development/tools/just/default.nix @@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0a4bml9nxvyh110a60l4lc11yr2ds5r8d3iplslccrkq1ka96av9"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "0dbgjc21q0zaadsjvq3s6y6f4dmsybxb6g2sg8w2d3phkm9j921z"; + cargoSha256 = "0wp61zjws9r1aapkapvq2vmad5kylkpw03wa82qhhq30knkpvr7b"; checkInputs = [ coreutils bash dash ]; diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix index a590d4a6106..f4bdd0c09af 100644 --- a/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/pkgs/development/tools/misc/circleci-cli/default.nix @@ -2,16 +2,18 @@ buildGoModule rec { pname = "circleci-cli"; - version = "0.1.5879"; + version = "0.1.6072"; src = fetchFromGitHub { owner = "CircleCI-Public"; repo = pname; rev = "v${version}"; - sha256 = "1471g56apaw0c5dpa0jrr7hvzh3kbwfr3yr0m4mz2dlf27d481ac"; + sha256 = "1sbzl6y7974sib14qr2qa6d20cs54h6a3mc1whbxifg87cw02qjn"; }; - modSha256 = "0cvmcsl00jfikpkw3f7k5zw65156z5g5l2b6s5803a2i9d613268"; + modSha256 = "1pxqc2a1hb6bk67sd2c37zwg6n7h0jay3yqsjcs4jc0bqv48gzip"; + + buildFlagsArray = [ "-ldflags=-s -w -X github.com/CircleCI-Public/circleci-cli/version.Version=${version}" ]; preBuild = '' substituteInPlace data/data.go \ diff --git a/pkgs/development/tools/misc/terraform-lsp/default.nix b/pkgs/development/tools/misc/terraform-lsp/default.nix index 94492395a58..9a661f27677 100644 --- a/pkgs/development/tools/misc/terraform-lsp/default.nix +++ b/pkgs/development/tools/misc/terraform-lsp/default.nix @@ -1,17 +1,19 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: -buildGoModule rec { +buildGoPackage rec { pname = "terraform-lsp"; - version = "0.0.9"; + version = "0.0.10"; src = fetchFromGitHub { owner = "juliosueiras"; repo = pname; rev = "v${version}"; - sha256 = "1m133fznf58fkjl5yx0gxa3cjfb0h8f9fv760c9h1d5cg279bghk"; + sha256 = "1j69j1pkd0q6bds1c6pcaars5hl3hk93q2p31mymkzmy640k8zfn"; }; - modSha256 = "1mb3169vdlv4h10k15pg88s48s2b6y7v5frk9j9ahg52grygcqb2"; + goPackagePath = "github.com/juliosueiras/terraform-lsp"; + + buildFlagsArray = [ "-ldflags=-s -w -X main.Version=${version} -X main.GitCommit=${src.rev}" ]; meta = with lib; { description = "Language Server Protocol for Terraform"; diff --git a/pkgs/development/tools/misc/tinyprog/default.nix b/pkgs/development/tools/misc/tinyprog/default.nix index 580414f4d9d..65d2ce37814 100644 --- a/pkgs/development/tools/misc/tinyprog/default.nix +++ b/pkgs/development/tools/misc/tinyprog/default.nix @@ -24,6 +24,7 @@ with python3Packages; buildPythonApplication rec { tqdm six packaging + setuptools pyusb ]; diff --git a/pkgs/development/tools/misc/wishbone-tool/default.nix b/pkgs/development/tools/misc/wishbone-tool/default.nix index 10de4a8157a..8c2e27d6450 100644 --- a/pkgs/development/tools/misc/wishbone-tool/default.nix +++ b/pkgs/development/tools/misc/wishbone-tool/default.nix @@ -1,26 +1,31 @@ { lib, fetchFromGitHub, rustPlatform, libusb }: + let - version = "0.2.8"; + version = "0.6.9"; src = fetchFromGitHub { - owner = "xobs"; + owner = "litex-hub"; repo = "wishbone-utils"; rev = "v${version}"; - sha256 = "0v6s5yl0y6bd2snf12x6c77rwvqkg6ybi1sm4wr7qdgbwq563nxp"; + sha256 = "0gq359ybxnqvcp93cn154bs9kwlai62gnm71yvl2nhzjdlcr3fhp"; }; in rustPlatform.buildRustPackage { pname = "wishbone-tool"; inherit version; + src = "${src}/wishbone-tool"; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - cargoSha256 = "0pj8kf6s1c666p4kc6q1hlvaqm0lm9aqnsx5r034g1y8sxnnyri2"; + # N.B. The cargo vendor consistency checker searches in "source" for lockfile + cargoDepsHook = '' + ln -s wishbone-tool source + ''; + cargoSha256 = "0d5kcwy0cgxqfxf2xysw65ng84q4knhp4fgvh6dwqhf0nsca9gvs"; + buildInputs = [ libusb ]; meta = with lib; { description = "Manipulate a Wishbone device over some sort of bridge"; - homepage = "https://github.com/xobs/wishbone-utils#wishbone-tool"; + homepage = "https://github.com/litex-hub/wishbone-utils"; license = licenses.bsd2; maintainers = with maintainers; [ edef ]; platforms = platforms.linux; diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix b/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix index 68d854f2648..d49e6ce36db 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix @@ -65,7 +65,7 @@ let else { pkg = []; str = null; }; # Fetch the artifacts from the PyPI index. Since we get all - # info we need from the lock file we don't use nixpkgs' fetchPyPi + # info we need from the lock file we don't use nixpkgs' fetchPypi # as it modifies casing while not providing anything we don't already # have. # diff --git a/pkgs/development/tools/rnix-lsp/default.nix b/pkgs/development/tools/rnix-lsp/default.nix index 0cb40242504..e938526ecbf 100644 --- a/pkgs/development/tools/rnix-lsp/default.nix +++ b/pkgs/development/tools/rnix-lsp/default.nix @@ -12,10 +12,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0fy620c34kxl27sd62x9mj0555bcdmnmbsxavmyiwb497z1m9wnn"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1wm5m7b6zr6wg1k59rmqis1zp9i2990p7y0ml852hxv34an7pp5d"; + cargoSha256 = "0xmaa7rds7hlagfxj65pv9vgflcv4nwbwbw4g7cyj88cbb1kbxxj"; meta = with lib; { description = "A work-in-progress language server for Nix, with syntax checking and basic completion"; diff --git a/pkgs/development/tools/rq/default.nix b/pkgs/development/tools/rq/default.nix index 7394d7a645a..5fe73ed33f0 100644 --- a/pkgs/development/tools/rq/default.nix +++ b/pkgs/development/tools/rq/default.nix @@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0km9d751jr6c5qy4af6ks7nv3xfn13iqi03wq59a1c73rnf0zinp"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "0z971fpyj4v5hjp6q4yxgxv069h9idkpkcixb14gxi7kpiswprvz"; + cargoSha256 = "0c5vwy3c5ji602dj64z6jqvcpi2xff03zvjbnwihb3ydqwnb3v67"; buildInputs = [ llvmPackages.clang-unwrapped v8 ]; diff --git a/pkgs/development/tools/rust/cargo-geiger/default.nix b/pkgs/development/tools/rust/cargo-geiger/default.nix index 59e4402627c..b6f3bb7af00 100644 --- a/pkgs/development/tools/rust/cargo-geiger/default.nix +++ b/pkgs/development/tools/rust/cargo-geiger/default.nix @@ -26,6 +26,12 @@ rustPlatform.buildRustPackage rec { # we might be able to run these with something like # `cargo insta review` in the `preCheck` phase. checkPhase = '' + cd cargo-geiger/tests/snapshots + for file in * + do + mv $file r#$file + done + cd - cargo test -- \ --skip test_package::case_2 \ --skip test_package::case_3 \ diff --git a/pkgs/development/tools/rust/maturin/default.nix b/pkgs/development/tools/rust/maturin/default.nix index cb8d13b47d9..8edd69c28be 100644 --- a/pkgs/development/tools/rust/maturin/default.nix +++ b/pkgs/development/tools/rust/maturin/default.nix @@ -14,10 +14,7 @@ in rustPlatform.buildRustPackage rec { sha256 = "1siqd8k6grlbj9n1a75jq8px1pzvzpr2ph689g53rjngf1k44zqk"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "18678qzrzj044aj5nvyjn5hvby0i0x23gx26nhcf1nqcjn3fr32l"; + cargoSha256 = "10x8kr4qxvvmzpr1n41ybsb6rnii2qz5bdhnk0zpfnr2n9215p8s"; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/tools/scaff/default.nix b/pkgs/development/tools/scaff/default.nix index 034376d337c..f81ca70c6a9 100644 --- a/pkgs/development/tools/scaff/default.nix +++ b/pkgs/development/tools/scaff/default.nix @@ -12,10 +12,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1s5v50205l2h33pccyafrjv3a6lpb62inhm8z81hkvx53bqifvd7"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "17rnzwlgrpr6isbajaccxa83msvvskxyqrc4cirgjmc7aqa0ilbh"; + cargoSha256 = "0k6msvly3yhzl1hhs4zv31qzbllwmw16i55dbznlgp1c8icy2pwr"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ openssl ]; diff --git a/pkgs/development/tools/skaffold/default.nix b/pkgs/development/tools/skaffold/default.nix index d485ac19996..325338c376a 100644 --- a/pkgs/development/tools/skaffold/default.nix +++ b/pkgs/development/tools/skaffold/default.nix @@ -2,9 +2,9 @@ buildGoPackage rec { pname = "skaffold"; - version = "1.2.0"; - # rev is the 1.2.0 commit, mainly for skaffold version command output - rev = "80f82f42fe271aea1058f4a37776d52ab5a7c441"; + version = "1.3.1"; + # rev is the 1.3.1 commit, mainly for skaffold version command output + rev = "6ba887a42438d1da578a005cf550e618fee6dfb8"; goPackagePath = "github.com/GoogleContainerTools/skaffold"; subPackages = ["cmd/skaffold"]; @@ -20,7 +20,7 @@ buildGoPackage rec { owner = "GoogleContainerTools"; repo = "skaffold"; rev = "v${version}"; - sha256 = "17gdxifv3n2kcmz1pvs2ni2llq30zw6dwxgy5crs97h7hjdk29fw"; + sha256 = "1ph7qyk5khdinxbhgqhhja8fz8b6q8yz5rj5xh0nwaff4bmlfd99"; }; meta = { diff --git a/pkgs/development/web/nodejs/v12.nix b/pkgs/development/web/nodejs/v12.nix index e8a4634773d..3fa5216ccf8 100644 --- a/pkgs/development/web/nodejs/v12.nix +++ b/pkgs/development/web/nodejs/v12.nix @@ -5,6 +5,6 @@ let in buildNodejs { inherit enableNpm; - version = "12.16.0"; - sha256 = "09grij355z210mkzkzarb6gwz8b02lnaxzdll1249kiz8wvhdjdq"; + version = "12.16.1"; + sha256 = "0ba1dla31z6i31z3723l74nky1v04irwbl3iaqmi0iicl1dq958a"; } diff --git a/pkgs/development/web/nodejs/v13.nix b/pkgs/development/web/nodejs/v13.nix index dcd0f3dd2b7..89ef27c8c5e 100644 --- a/pkgs/development/web/nodejs/v13.nix +++ b/pkgs/development/web/nodejs/v13.nix @@ -5,6 +5,6 @@ let in buildNodejs { inherit enableNpm; - version = "13.8.0"; - sha256 = "1h437yvg43xci35rvp55gvb94rddkf4j9i9iw81bmkwhvb4h8qdv"; + version = "13.9.0"; + sha256 = "0z68hj3z2y8aj4bc14h77mj5l99jb4ljjc10gp0dpg8s4g1x5xzw"; } diff --git a/pkgs/games/qtads/default.nix b/pkgs/games/qtads/default.nix index dda7799aacb..f36581776cb 100644 --- a/pkgs/games/qtads/default.nix +++ b/pkgs/games/qtads/default.nix @@ -1,16 +1,16 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, pkgconfig, qmake +{ lib, mkDerivation, fetchFromGitHub, fetchpatch, pkgconfig, qmake , SDL2, fluidsynth, libsndfile, libvorbis, mpg123, qtbase }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "qtads"; - version = "2.1.99.2019-04-12"; + version = "3.0.0"; src = fetchFromGitHub { owner = "realnc"; repo = pname; - rev = "43289a830a18c66a293c2b1ee75a08e92e8dd5dc"; - sha256 = "0zscf6nmjjc4i7c38iy8znv2s453xc49gn7knyi3g1l6iinjwbx7"; + rev = "v${version}"; + sha256 = "02kk2hs20h9ffhylwms9f8zikmmlrz1nvbrm97gis9iljkyx035c"; }; nativeBuildInputs = [ pkgconfig qmake ]; diff --git a/pkgs/games/quake3/quake3e/default.nix b/pkgs/games/quake3/quake3e/default.nix index 1e179f2f956..7d6ac0afe45 100644 --- a/pkgs/games/quake3/quake3e/default.nix +++ b/pkgs/games/quake3/quake3e/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "Quake3e"; - version = "2019-11-29"; + version = "2020-01-23"; src = fetchFromGitHub { owner = "ec-"; repo = pname; rev = version; - sha256 = "1gpfl72rzwiawhcj3ir38sqdb95y7w7lm7wgj44lbn99z7bvkcn3"; + sha256 = "0crqn32nkqhlagamkp5nr0vl474ad4wx5ms7yr85s6zybpsk5jnz"; }; buildInputs = [ curl libGL libX11 libXxf86dga alsaLib libXrandr libXxf86vm libXext ]; @@ -33,5 +33,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ pmiddend ]; + badPlatforms = [ platforms.aarch64 ]; }; } diff --git a/pkgs/misc/uq/default.nix b/pkgs/misc/uq/default.nix index 3f3ba291dd7..fe3a1e2a5d1 100755 --- a/pkgs/misc/uq/default.nix +++ b/pkgs/misc/uq/default.nix @@ -14,10 +14,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1qqqmdk0v1d3ckasmmw5lbrkvhkv0nws4bzi9cfi1ndhrbvbkbxb"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1s22v2wz5h3l5l447zl54bhdk6avkk2ycrbbpxcx1442lllbss4w"; + cargoSha256 = "1fv13rbghfw7114h7sda04gpqrjrsgnnki0p9kdd6r6sk5cbhn9x"; meta = with lib; { description = "A simple, user-friendly alternative to sort | uniq"; diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index b4464eed825..25d78e3be46 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -347,12 +347,12 @@ let coc-git = buildVimPluginFrom2Nix { pname = "coc-git"; - version = "2020-02-04"; + version = "2020-02-16"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-git"; - rev = "e75395a9064dd88b2434c8824e6de1f173944595"; - sha256 = "1ga01205rdq1zgdpbn3xk4rnd0p4bbfn7wn4jn04wxfyb5rkdnkq"; + rev = "f67abbe05f535086167b3cb4cde6c2c309905959"; + sha256 = "0fl3hgapcwr5sjgmm02lx6vg18qlw5g03ysv926rjb0r0nl3rhh5"; }; }; @@ -898,12 +898,12 @@ let denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2020-02-05"; + version = "2020-02-17"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "21645215f941034f0bfaa081f9146914afd5d563"; - sha256 = "01ywp49ambc3nk0cyv9f7m6gfnf5hkp1dxfiihjxf96whg8p3kwj"; + rev = "eeb067ca291b7f677b6faab590344a4ca84c0e70"; + sha256 = "0irz8g9qpm7d36gig86j3dqk4mdbzl5rnzg07cgizh88jqhzxvin"; }; }; @@ -2060,12 +2060,12 @@ let neoterm = buildVimPluginFrom2Nix { pname = "neoterm"; - version = "2020-02-14"; + version = "2020-02-15"; src = fetchFromGitHub { owner = "kassio"; repo = "neoterm"; - rev = "41b309e5528ce07c9471ea4f2fae41e2a539ae49"; - sha256 = "1knqa3gd9jbj865p8zhy2yks8wfszp7fdnnd29088i82d0sl8g10"; + rev = "dacbae9d844e678c785db7c9d7988df7a405e572"; + sha256 = "03aah6lgygf7rj78kf4rh5hw593l4qi83ivh5amy9yw8lc630pjv"; }; }; @@ -2157,6 +2157,17 @@ let }; }; + notational-fzf-vim = buildVimPluginFrom2Nix { + pname = "notational-fzf-vim"; + version = "2019-12-03"; + src = fetchFromGitHub { + owner = "alok"; + repo = "notational-fzf-vim"; + rev = "16ea3477c8dbf3167f15246a29bd1d1fcc18c914"; + sha256 = "1j1nfb297rqmg2h96hx4bmgxq55z179fh4f1ak79d6v815mr72bi"; + }; + }; + nvim-cm-racer = buildVimPluginFrom2Nix { pname = "nvim-cm-racer"; version = "2017-07-27"; @@ -2203,12 +2214,12 @@ let nvim-lsp = buildVimPluginFrom2Nix { pname = "nvim-lsp"; - version = "2020-02-13"; + version = "2020-02-17"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lsp"; - rev = "63d8e18a1003ad986ce0c95199839adb10283dbd"; - sha256 = "1q1myv0hqlscsnmmxqbl5bxvqkgl896p1b1l93826wbfsnpr6wn6"; + rev = "8c78ca42072d14ca678cd1e138f665a5d42df558"; + sha256 = "10w7rzpfl70bg6w665pfq6mgdz9gsw5i341sd4f0ncr2asrd7l76"; }; }; @@ -2533,12 +2544,12 @@ let riv-vim = buildVimPluginFrom2Nix { pname = "riv-vim"; - version = "2019-09-14"; + version = "2020-02-17"; src = fetchFromGitHub { owner = "Rykka"; repo = "riv.vim"; - rev = "87a1f2c1e487ee0021855fd0c65c3f3244f4fc61"; - sha256 = "13430czv87r16wcyb2f8izfihkhm2q6k1ki5bhzpbakzk7vwxwms"; + rev = "d52844691ca2f139e4b634db65aa49c57a0fc2b3"; + sha256 = "0s4jvqwlnmmh2zw9v9rlwynwx44ypdrzhhyfb20sippxg9g6z0c5"; }; }; @@ -3315,23 +3326,23 @@ let vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2020-02-07"; + version = "2020-02-17"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "099dd92eebe09ab27a483e381f2a708945e34330"; - sha256 = "04rmghvl29hlmlhh4j90m466m0a4sfflk0qrvx87q8ab1salq6iz"; + rev = "7e00ee1107d0ed24ac09af51e576ea7d85e114a3"; + sha256 = "02ax3y8kh503dh7gsi0nwsvlas02vd4issawriydy1wl8ngfgdbh"; }; }; vim-airline-themes = buildVimPluginFrom2Nix { pname = "vim-airline-themes"; - version = "2020-02-07"; + version = "2020-02-17"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline-themes"; - rev = "6270e7d58828999da7239785ad4269899fab99b5"; - sha256 = "1pjgsp4ki1ii5rw75wvzcj3ssz51w5369j8kqaf6awqimyl1ygsd"; + rev = "9772475fcc24bee50c884aba20161465211520c8"; + sha256 = "1nbwwaky9j4w9qjsbgg2a9zl3f2i9zjqqbh1lmz4z9m1mixj6djp"; }; }; @@ -3964,12 +3975,12 @@ let vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2020-02-06"; + version = "2020-02-16"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "460664018a8eaecd89fb2b095fad59c0e16f5f06"; - sha256 = "1xznsxk63gjzhxldzngc0kx10ygkl8ank0xm75qqs92zciwg1xqx"; + rev = "98f67310aa3ae324d725a3b6b68a63e5a48372f4"; + sha256 = "177dk2b2mb13d6hf6hp97p91qsbafd29z8n3zdfwxjgxf9fjgl4c"; }; }; @@ -4515,12 +4526,12 @@ let vim-localvimrc = buildVimPluginFrom2Nix { pname = "vim-localvimrc"; - version = "2019-05-10"; + version = "2020-02-17"; src = fetchFromGitHub { owner = "embear"; repo = "vim-localvimrc"; - rev = "0b36a367f4d46b7f060836fcbfec029cce870ea9"; - sha256 = "119ah0mx7ais335spdy5apk40wbfvhr1mnvjfs429fvym3xdqfk3"; + rev = "1e3238470d833c8622453245694ba107eca46133"; + sha256 = "1agiyycrjkh1ajfpfj4vzl9sd3xpxv68c7jrqkxqq0rfg74rksbc"; }; }; @@ -4966,12 +4977,12 @@ let vim-ps1 = buildVimPluginFrom2Nix { pname = "vim-ps1"; - version = "2019-12-06"; + version = "2020-02-17"; src = fetchFromGitHub { owner = "PProvost"; repo = "vim-ps1"; - rev = "d11593b4a65551cc3391d36b088cc87a59c62da6"; - sha256 = "08d9mp6ig3vkvmynm6qfvb18hc128wwssffkwdd9xnqkr7c3dmlv"; + rev = "72de10080dcb7a906a51ed4eba67611c400df142"; + sha256 = "1ml521kkgiazjizpmn25p4kbmwdl46sc5mq6yzp9cskssbj2c416"; }; }; @@ -5043,12 +5054,12 @@ let vim-rooter = buildVimPluginFrom2Nix { pname = "vim-rooter"; - version = "2019-05-18"; + version = "2020-02-17"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-rooter"; - rev = "eef98131fef264d0f4e4f95c42e0de476c78009c"; - sha256 = "144wwvi295q387w6cy9mv2inzla8ngd735gmf65lf33llp8hga59"; + rev = "8a0a201a17fae3f7656b99f74d67741986faba37"; + sha256 = "1r8kzzljs39ycc6jjh5anpl2gw73c2wb1bs8hjv6xnw1scln6gwq"; }; }; @@ -5219,12 +5230,12 @@ let vim-slime = buildVimPluginFrom2Nix { pname = "vim-slime"; - version = "2019-12-20"; + version = "2020-02-16"; src = fetchFromGitHub { owner = "jpalardy"; repo = "vim-slime"; - rev = "cf896c1f4f37a9feb15d657dfd120aeeb6215ad8"; - sha256 = "19caali0yy1cy4hk9y9z21nzp0kj916551h0p0x7nmzxiiakp9nn"; + rev = "80c04d49b8d3c2a182e5cd745c52153de6ae272c"; + sha256 = "12k1xq8xmwb7v7i8yx55mpg7fzin0ag2rvxvz77kdiwwni4vdrii"; }; }; @@ -5450,12 +5461,12 @@ let vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2020-02-02"; + version = "2020-02-16"; src = fetchFromGitHub { owner = "janko-m"; repo = "vim-test"; - rev = "d0b1e060a7d6dce541f5535f9cc5a24bab1f45aa"; - sha256 = "0z0002nij5n5y9vkx7c1fhngpz60py2xp2lkyy0xd7b1wynh3pgw"; + rev = "330b0911f13bcb48a3e28dedcf71e19de5bd4864"; + sha256 = "0iibm4nzxf7fhn5ka3pmnw324xnnxcf1lkia20w0wbx39axn4br3"; }; }; @@ -5527,12 +5538,12 @@ let vim-themis = buildVimPluginFrom2Nix { pname = "vim-themis"; - version = "2020-02-13"; + version = "2020-02-16"; src = fetchFromGitHub { owner = "thinca"; repo = "vim-themis"; - rev = "002eb3566e2cd6426e1d32713d585389da40abeb"; - sha256 = "066r6132dr37xgl3gz661iyhcx4qb8k548b88smrpar8k8vsgj9n"; + rev = "734262315544ec4c78acdabd1ac9aae18644fcad"; + sha256 = "0sh9kqnkbbbiqsl8qwqslygl72h3wi83iw9iy2aj4zmw7k2g3i8w"; }; }; @@ -5659,12 +5670,12 @@ let vim-visual-multi = buildVimPluginFrom2Nix { pname = "vim-visual-multi"; - version = "2020-02-10"; + version = "2020-02-16"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-visual-multi"; - rev = "9d03a5d366b4198b7b505dfda538e87f76c9ce60"; - sha256 = "0yqqd25l7zzfn31216qpnccb3a3lvv75j6020q02s0wgapiw15y9"; + rev = "0f85922ec3cc0c497ac91ce02e5252643bcf7947"; + sha256 = "1kgqns7a8px13hh0kfdn12zg3f6zv0s3sphxl899mywnp4nx3489"; }; }; @@ -5824,12 +5835,12 @@ let vimoutliner = buildVimPluginFrom2Nix { pname = "vimoutliner"; - version = "2018-07-04"; + version = "2020-02-09"; src = fetchFromGitHub { owner = "vimoutliner"; repo = "vimoutliner"; - rev = "aad0a213069b8a1b5de91cca07d153fc8352c957"; - sha256 = "0pgkgs6xky0skhpp3s9vrw3h48j80im0j39q4vc2b3pd1ydy6rx2"; + rev = "1031b16e6b0069229fe0f33a66489f81174fa4d9"; + sha256 = "1gn21b8yr0bjg0y1nidk13zcl4f6z8wkrxncgkd1hlc14d99jkg0"; }; }; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 0fc5edffe48..fcde3fdc5c6 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -4,6 +4,7 @@ airblade/vim-rooter ajh17/Spacegray.vim aklt/plantuml-syntax albfan/nerdtree-git-plugin +alok/notational-fzf-vim altercation/vim-colors-solarized alvan/vim-closetag alx741/vim-hindent diff --git a/pkgs/os-specific/darwin/apple-sdk/frameworks.nix b/pkgs/os-specific/darwin/apple-sdk/frameworks.nix index 09e0e4e48ec..02e2421f347 100644 --- a/pkgs/os-specific/darwin/apple-sdk/frameworks.nix +++ b/pkgs/os-specific/darwin/apple-sdk/frameworks.nix @@ -75,6 +75,7 @@ with frameworks; with libs; { LocalAuthentication = []; MapKit = []; MediaAccessibility = [ CoreGraphics CoreText QuartzCore ]; + MediaPlayer = []; MediaToolbox = [ AudioToolbox AudioUnit CoreMedia ]; Metal = []; MetalKit = [ ModelIO Metal ]; diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix index fb2b9068921..52b280c3026 100644 --- a/pkgs/os-specific/linux/kernel-headers/default.nix +++ b/pkgs/os-specific/linux/kernel-headers/default.nix @@ -1,7 +1,4 @@ -{ stdenvNoCC, lib, buildPackages -, fetchurl, perl -, elf-header -}: +{ stdenvNoCC, lib, buildPackages, fetchurl, perl, elf-header }: let makeLinuxHeaders = { src, version, patches ? [] }: stdenvNoCC.mkDerivation { @@ -39,29 +36,28 @@ let # Skip clean on darwin, case-sensitivity issues. buildPhase = lib.optionalString (!stdenvNoCC.buildPlatform.isDarwin) '' make mrproper $makeFlags - '' - # For some reason, doing `make install_headers` twice, first without - # INSTALL_HDR_PATH=$out then with, is neccessary to get this to work - # for darwin cross. @Ericson2314 has no idea why. - + '' - make headers_install $makeFlags + '' + '' + make headers $makeFlags ''; checkPhase = '' make headers_check $makeFlags ''; + # The following command requires rsync: + # make headers_install INSTALL_HDR_PATH=$out $makeFlags + # but rsync depends on popt which does not compile on aarch64 without + # updateAutotoolsGnuConfigScriptsHook which is not enabled in stage2, + # so we replicate it with cp. This also reduces bootstrap closure size. installPhase = '' - make headers_install INSTALL_HDR_PATH=$out $makeFlags + mkdir -p $out + cp -r usr/include $out + find $out -type f ! -name '*.h' -delete '' # Some builds (e.g. KVM) want a kernel.release. - + '' mkdir -p $out/include/config - echo "${version}-default" > $out/include/config/kernel.release - '' - # These oddly named file records the `SHELL` passed, which causes bootstrap - # tools run-time dependency. + '' - find "$out" -name '..install.cmd' -print0 | xargs -0 rm + mkdir -p $out/include/config + echo "${version}-default" > $out/include/config/kernel.release ''; meta = with lib; { @@ -73,16 +69,15 @@ let in { inherit makeLinuxHeaders; - linuxHeaders = let version = "4.19.16"; in + linuxHeaders = let version = "5.5"; in makeLinuxHeaders { inherit version; src = fetchurl { - url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1pqvn6dsh0xhdpawz4ag27vkw1abvb6sn3869i4fbrz33ww8i86q"; + url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; + sha256 = "0c131fi6s7vgvka1c0597vnvcmwn1pp968rci5kq64iwj3pd9yx6"; }; patches = [ ./no-relocs.patch # for building x86 kernel headers on non-ELF platforms - ./no-dynamic-cc-version-check.patch # so we can use `stdenvNoCC`, see `makeFlags` above ]; }; } diff --git a/pkgs/os-specific/linux/kernel-headers/no-dynamic-cc-version-check.patch b/pkgs/os-specific/linux/kernel-headers/no-dynamic-cc-version-check.patch deleted file mode 100644 index 9b582cac715..00000000000 --- a/pkgs/os-specific/linux/kernel-headers/no-dynamic-cc-version-check.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/Makefile b/Makefile -index 863f58503bee..b778d5023208 100644 ---- a/Makefile -+++ b/Makefile -@@ -501,11 +501,9 @@ KBUILD_CFLAGS += $(call cc-option,-fno-PIE) - KBUILD_AFLAGS += $(call cc-option,-fno-PIE) - - # check for 'asm goto' --ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-goto.sh $(CC) $(KBUILD_CFLAGS)), y) - CC_HAVE_ASM_GOTO := 1 - KBUILD_CFLAGS += -DCC_HAVE_ASM_GOTO - KBUILD_AFLAGS += -DCC_HAVE_ASM_GOTO --endif - - # The expansion should be delayed until arch/$(SRCARCH)/Makefile is included. - # Some architectures define CROSS_COMPILE in arch/$(SRCARCH)/Makefile. -diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include -index 065324a8046f..d09c67194549 100644 ---- a/scripts/Kbuild.include -+++ b/scripts/Kbuild.include -@@ -216,11 +216,8 @@ cc-disable-warning = $(call try-run-cached,\ - cc-name = $(call shell-cached,$(CC) -v 2>&1 | grep -q "clang version" && echo clang || echo gcc) - - # cc-version --cc-version = $(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-version.sh $(CC)) - - # cc-fullversion --cc-fullversion = $(shell $(CONFIG_SHELL) \ -- $(srctree)/scripts/gcc-version.sh -p $(CC)) - - # cc-ifversion - # Usage: EXTRA_CFLAGS += $(call cc-ifversion, -lt, 0402, -O1) diff --git a/pkgs/os-specific/linux/kernel-headers/no-relocs.patch b/pkgs/os-specific/linux/kernel-headers/no-relocs.patch index 67e8b19e23b..32c88224b86 100644 --- a/pkgs/os-specific/linux/kernel-headers/no-relocs.patch +++ b/pkgs/os-specific/linux/kernel-headers/no-relocs.patch @@ -1,13 +1,7 @@ -diff --git a/arch/x86/Makefile b/arch/x86/Makefile -index fad55160dcb9..a48c8331cbb2 100644 --- a/arch/x86/Makefile +++ b/arch/x86/Makefile -@@ -239,7 +239,7 @@ ifdef CONFIG_RETPOLINE - endif - +@@ -231,3 +231,3 @@ endif archscripts: scripts_basic - $(Q)$(MAKE) $(build)=arch/x86/tools relocs + $(Q)$(MAKE) $(build)=arch/x86/tools - ### - # Syscall table generation diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 6e3abb792bd..81e39ad647c 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.6-rc1"; + version = "5.6-rc2"; extraMeta.branch = "5.6"; # modDirVersion needs to be x.y.z, will always add .0 @@ -11,7 +11,7 @@ buildLinux (args // rec { src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "1ir7mdzxrin7k6a7ldfmpl9bbapkr99l3pd07dv8589vcrd43zlh"; + sha256 = "1b3ds8dv5rc9f4c3czj689dxbl8lyrmnfk6ywa51h9vx3lsd5jrp"; }; # Should the testing kernels ever be built on Hydra? diff --git a/pkgs/servers/gotify/default.nix b/pkgs/servers/gotify/default.nix index 9782b289055..f2014aac9fd 100644 --- a/pkgs/servers/gotify/default.nix +++ b/pkgs/servers/gotify/default.nix @@ -12,13 +12,13 @@ buildGoModule rec { pname = "gotify-server"; # Note that when this is updated, along with the hash, the `ui.nix` file # should include the same changes to the version and the sha256. - version = "2.0.13"; + version = "2.0.14"; src = fetchFromGitHub { owner = "gotify"; repo = "server"; rev = "v${version}"; - sha256 = "11ycs1ci1z8wm4fjgk4454kgszr4s8q9dc96pl77yvlngi4dk46d"; + sha256 = "0hyy9fki2626cgd78l7fkk67lik6g1pkcpf6xr3gl07dxwcclyr8"; }; modSha256 = "1awhbc8qs2bwv6y2vwd92r4ys0l1bzymrb36iamr040x961682wv"; diff --git a/pkgs/servers/gotify/ui.nix b/pkgs/servers/gotify/ui.nix index 2c1bddec68f..403f01c2a85 100644 --- a/pkgs/servers/gotify/ui.nix +++ b/pkgs/servers/gotify/ui.nix @@ -8,13 +8,13 @@ yarn2nix-moretea.mkYarnPackage rec { packageJSON = ./package.json; yarnNix = ./yarndeps.nix; - version = "2.0.13"; + version = "2.0.14"; src_all = fetchFromGitHub { owner = "gotify"; repo = "server"; rev = "v${version}"; - sha256 = "11ycs1ci1z8wm4fjgk4454kgszr4s8q9dc96pl77yvlngi4dk46d"; + sha256 = "0hyy9fki2626cgd78l7fkk67lik6g1pkcpf6xr3gl07dxwcclyr8"; }; src = "${src_all}/ui"; diff --git a/pkgs/servers/gotify/yarndeps.nix b/pkgs/servers/gotify/yarndeps.nix index 0e81e890a9f..3f74ad74ccc 100644 --- a/pkgs/servers/gotify/yarndeps.nix +++ b/pkgs/servers/gotify/yarndeps.nix @@ -1234,11 +1234,11 @@ }; } { - name = "_types_notifyjs___notifyjs_3.0.0.tgz"; + name = "_types_notifyjs___notifyjs_3.0.1.tgz"; path = fetchurl { - name = "_types_notifyjs___notifyjs_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/@types/notifyjs/-/notifyjs-3.0.0.tgz"; - sha1 = "a57126a90be2827d511d00a0615816cd5ca8a740"; + name = "_types_notifyjs___notifyjs_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/@types/notifyjs/-/notifyjs-3.0.1.tgz"; + sha1 = "eba3bec10e44309df4aba31a73bfd26a562bc755"; }; } { diff --git a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix index c0e4cefa40a..0e4804c1a39 100644 --- a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix +++ b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mod_wsgi"; - version = "4.7.0"; + version = "4.7.1"; src = fetchurl { url = "https://github.com/GrahamDumpleton/mod_wsgi/archive/${version}.tar.gz"; - sha256 = "079f4py20jd6n3d7djak5l9j8p6hfq96lf577iir6qpfsk2p0k3n"; + sha256 = "0dbxhrp3x689ccrhvm2lw2icmmj8i4p86z2lq3xn1zlsf43fax16"; }; buildInputs = [ apacheHttpd python ncurses ]; diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index 3aff9f53ce7..12da51f9f23 100644 --- a/pkgs/servers/mail/dovecot/default.nix +++ b/pkgs/servers/mail/dovecot/default.nix @@ -9,7 +9,7 @@ }: stdenv.mkDerivation rec { - name = "dovecot-2.3.9.2"; + name = "dovecot-2.3.9.3"; nativeBuildInputs = [ perl pkgconfig ]; buildInputs = @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dovecot.org/releases/2.3/${name}.tar.gz"; - sha256 = "1yc6hi4hqg4hcc4495sf4m5f1lnargphi6dawj43if21vncgp127"; + sha256 = "0lcnqib63nv32xr3nr4s3x8k77mbgrhc13swjl2xqnzw4fabd7zq"; }; enableParallelBuilding = true; diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix index 3d04d35a3c5..15a651d8a32 100644 --- a/pkgs/servers/mail/rspamd/default.nix +++ b/pkgs/servers/mail/rspamd/default.nix @@ -10,13 +10,13 @@ assert withHyperscan -> stdenv.isx86_64; stdenv.mkDerivation rec { pname = "rspamd"; - version = "2.2"; + version = "2.3"; src = fetchFromGitHub { owner = "rspamd"; repo = "rspamd"; rev = version; - sha256 = "0rqiz4xm20w80q8p4grcgqcrg14yiddsay0aw00f0v82h4apw7k8"; + sha256 = "1v4kbvj9r0hs8jaisq3fr0rg0qndpbhc5h8cbpfpprmkbw4nj6pf"; }; nativeBuildInputs = [ cmake pkgconfig perl ]; diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix index bb72ce1b45f..578f125ee2b 100644 --- a/pkgs/servers/mautrix-whatsapp/default.nix +++ b/pkgs/servers/mautrix-whatsapp/default.nix @@ -2,16 +2,16 @@ buildGoModule { pname = "mautrix-whatsapp-unstable"; - version = "2020-01-12"; + version = "2020-02-09"; src = fetchFromGitHub { owner = "tulir"; repo = "mautrix-whatsapp"; - rev = "39e46833b471b0cf262d4ff57fcd61530b5d2b9e"; - sha256 = "1r1f52advibb97vrhi2gw0d0scnsvfbmfqizsbpjmgm7ci9jjhcl"; + rev = "260555b69ccd20f247405e4d8cab3d49fabda070"; + sha256 = "1ykhwrp8bvhzzw4lg4m1w430ybgzd0zqgrs4jrvfd1m0als2iff7"; }; - modSha256 = "18bcv7x49bqnzwhafh8fvyv9z2d4j6w0iyqql0alq57hy7h7lxik"; + modSha256 = "0ypj79rjwj5bls6aq2cz0d034dnv1sddl43iz51b4fl2bfv0drm9"; meta = with stdenv.lib; { homepage = https://github.com/tulir/mautrix-whatsapp; diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index 380e5bb4be5..2586171a7cf 100644 --- a/pkgs/servers/plex/raw.nix +++ b/pkgs/servers/plex/raw.nix @@ -8,13 +8,13 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.18.4.2171-ac2afe5f8"; + version = "1.18.6.2368-97add474d"; pname = "plexmediaserver"; # Fetch the source src = fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/redhat/plexmediaserver-${version}.x86_64.rpm"; - sha256 = "10x4cf1c826vj9gqr7r6k70rrjifmi36sd7imfi7pdw5swizjzqv"; + sha256 = "0d2nnvw9qpmsra6g044bz192v67igcp1mfayy4sk0j2yqgiqvcgl"; }; outputs = [ "out" "basedb" ]; diff --git a/pkgs/servers/roundcube/default.nix b/pkgs/servers/roundcube/default.nix index 27ff5b409f7..939424ff2bf 100644 --- a/pkgs/servers/roundcube/default.nix +++ b/pkgs/servers/roundcube/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "roundcube"; - version = "1.4.2"; + version = "1.4.3"; src = fetchurl { url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/roundcubemail-${version}-complete.tar.gz"; - sha256 = "0s8gkfnyid1r4xv07vjrbl6558xv6dyn4aapvx8snqdm79n78fn8"; + sha256 = "1gsl9rpdkv388i6zvciladhb15fw94a8xjyh4ai1664nkwl51wi4"; }; patches = [ ./0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch ]; diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 890ac2d3777..b9cd50aa5fe 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -183,41 +183,41 @@ let in self: { postgresql_9_5 = self.callPackage generic { - version = "9.5.20"; + version = "9.5.21"; psqlSchema = "9.5"; - sha256 = "03fygn3nn6l6ar66sldy5akdg1gynny3yxbrpvmmp5ygfnrm2mwj"; + sha256 = "0b3kzc0431bvp55jns42q9h1119gy075mp4aywnkq93pm17nxdby"; this = self.postgresql_9_5; inherit self; }; postgresql_9_6 = self.callPackage generic { - version = "9.6.16"; + version = "9.6.17"; psqlSchema = "9.6"; - sha256 = "1rr2dgv4ams8r2lp13w85c77rkmzpb88fjlc28mvlw6zq2fblv2w"; + sha256 = "1hm0w6n988n9qn2wylhjq02i5ayzb16rzhgkcv09fpsl68ny7qgn"; this = self.postgresql_9_6; inherit self; }; postgresql_10 = self.callPackage generic { - version = "10.11"; + version = "10.12"; psqlSchema = "10.0"; # should be 10, but changing it is invasive - sha256 = "02fcmvbh0mhplj3s2jd24s642ysx7bggnf0h8bs5amh7dgzi8p8d"; + sha256 = "1rsab4zf4rx7pvvhlwhb04kb95aiad9cwazc4ksbvg2gij47z3rq"; this = self.postgresql_10; inherit self; }; postgresql_11 = self.callPackage generic { - version = "11.6"; + version = "11.7"; psqlSchema = "11.1"; # should be 11, but changing it is invasive - sha256 = "0w1iq488kpzfgfnlw4k32lz5by695mpnkq461jrgsr99z5zlz4j9"; + sha256 = "04x343i4v0w4jf1v5ial8rwsizs1qhdjfbanbnibdys6i0xfjjij"; this = self.postgresql_11; inherit self; }; postgresql_12 = self.callPackage generic { - version = "12.1"; + version = "12.2"; psqlSchema = "12"; - sha256 = "1vc3hjcbgkdfczc1ipkk02rahabn7fabpb7qs203jxpnpamz76x0"; + sha256 = "1pmmd59pvfs50gsi728bw9f1jl59xghsjdanfimph0659x6cq7dd"; this = self.postgresql_12; inherit self; }; diff --git a/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix b/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix index 8e30683737d..8bd50c3974c 100644 --- a/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix +++ b/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "cstore_fdw"; - version = "1.6.2"; + version = "1.7.0"; nativeBuildInputs = [ protobufc ]; buildInputs = [ postgresql ]; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "citusdata"; repo = "cstore_fdw"; rev = "refs/tags/v${version}"; - sha256 = "0kdmzpbhhjdg4p6i5963h7qbs88jzgpqc52gz450h7hwb9ckpv74"; + sha256 = "129mpq8rq16jg7idh6c1j6nij64iywrs7wl3cn02bdb3h8f19z1b"; }; installPhase = '' diff --git a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix index 5946b8f5ec3..c872e8bf95d 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pg_auto_failover"; - version = "1.0.5"; + version = "1.0.6"; src = fetchFromGitHub { owner = "citusdata"; repo = pname; rev = "v${version}"; - sha256 = "1idlgqazr2qra5x702f2yjcl99zwm1i5fi84paplfy98i5jjmxm1"; + sha256 = "0fli8wxi5f3vyn9cjjqi0a2z4i9npx4nqndx2lqzzx95khqqknp1"; }; buildInputs = [ postgresql openssl zlib readline ]; diff --git a/pkgs/servers/tang/default.nix b/pkgs/servers/tang/default.nix new file mode 100644 index 00000000000..5aa261bd8a4 --- /dev/null +++ b/pkgs/servers/tang/default.nix @@ -0,0 +1,32 @@ +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, asciidoc +, jansson, jose, http-parser, systemd +}: + +stdenv.mkDerivation rec { + pname = "tang"; + version = "7"; + + src = fetchFromGitHub { + owner = "latchset"; + repo = pname; + rev = "v${version}"; + sha256 = "0y5w1jrq5djh9gpy2r98ja7676nfxss17s1dk7jvgblsijx9qsd7"; + }; + + configureFlags = [ + "--localstatedir=/var" + "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system" + ]; + + nativeBuildInputs = [ autoreconfHook pkgconfig asciidoc ]; + buildInputs = [ jansson jose http-parser systemd ]; + + outputs = [ "out" "man" ]; + + meta = { + description = "Server for binding data to network presence."; + homepage = "https://github.com/latchset/tang"; + maintainers = with lib.maintainers; [ fpletz ]; + license = lib.licenses.gpl3Plus; + }; +} diff --git a/pkgs/servers/web-apps/jirafeau/default.nix b/pkgs/servers/web-apps/jirafeau/default.nix new file mode 100644 index 00000000000..3dc9fb17190 --- /dev/null +++ b/pkgs/servers/web-apps/jirafeau/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitLab, writeText }: + +let + localConfig = writeText "config.local.php" '' + <?php + return require(getenv('JIRAFEAU_CONFIG')); + ?> + ''; +in +stdenv.mkDerivation rec { + pname = "jirafeau"; + version = "4.1.1"; + + src = fetchFromGitLab { + owner = "mojo42"; + repo = "Jirafeau"; + rev = "${version}"; + sha256 = "09gq5zhynygpqj0skq7ifnn9yjjg7qnc6kjvaas7f53av2707z4c"; + }; + + installPhase = '' + mkdir $out + cp -r * $out/ + cp ${localConfig} $out/lib/config.local.php + ''; + + meta = with stdenv.lib; { + description = "Jirafeau is a web site permitting to upload a file in a simple way and give an unique link to it."; + license = licenses.agpl3; + homepage = "https://gitlab.com/mojo42/Jirafeau"; + platforms = platforms.all; + maintainers = with maintainers; [ davidtwco ]; + }; +} diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index 5f59c33af0d..013cebfd7ec 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -90,7 +90,7 @@ let fish = stdenv.mkDerivation rec { pname = "fish"; - version = "3.0.2"; + version = "3.1.0"; etcConfigAppendix = builtins.toFile "etc-config.appendix.fish" etcConfigAppendixText; @@ -98,7 +98,7 @@ let # There are differences between the release tarball and the tarball github packages from the tag # Hence we cannot use fetchFromGithub url = "https://github.com/fish-shell/fish-shell/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "03j3jl9jzlnhq4p86zj8wqsh5sx45j1d1fvfa80ks1cfdg68qwhl"; + sha256 = "0s2356mlx7fp9kgqgw91lm5ds2i9iq9hq071fbqmcp3875l1xnz5"; }; nativeBuildInputs = [ cmake ]; @@ -109,11 +109,10 @@ let ''; patches = [ - # Fixes "Integer 243 in '243 (243)' followed by non-digit" error with systemctl completion. - # https://github.com/fish-shell/fish-shell/issues/5689 (will be included in fish 3.1.0) + # Fixes compilation on old Apple SDKs (fetchpatch { - url = "https://github.com/fish-shell/fish-shell/commit/c6ec4235136e82c709e8d7b455f7c463f9714b48.patch"; - sha256 = "02m6pkhhx6y21csydznsxkbpnwhcpzyz99xgd9ryh7s03v7wbigw"; + url = "https://github.com/fish-shell/fish-shell/commit/10385d422b3e2a823faebfdaf13edd0e7f48a27f.patch"; + sha256 = "0hj13kyjf5wr9j5afd4mfylcr7mz68ilbncbcf307drk1lv1lvrn"; }) ]; @@ -128,7 +127,7 @@ let sed -r "s|command grep|command ${gnugrep}/bin/grep|" \ -i "$out/share/fish/functions/grep.fish" sed -i "s|which |${which}/bin/which |" \ - "$out/share/fish/functions/type.fish" + "$out/share/fish/functions/type.fish" sed -e "s|\|cut|\|${coreutils}/bin/cut|" \ -i "$out/share/fish/functions/fish_prompt.fish" sed -e "s|gettext |${gettext}/bin/gettext |" \ @@ -136,18 +135,18 @@ let -i "$out/share/fish/functions/_.fish" sed -e "s|uname|${coreutils}/bin/uname|" \ -i "$out/share/fish/functions/__fish_pwd.fish" \ - "$out/share/fish/functions/prompt_pwd.fish" + "$out/share/fish/functions/prompt_pwd.fish" sed -e "s|sed |${gnused}/bin/sed |" \ -i "$out/share/fish/functions/alias.fish" \ - "$out/share/fish/functions/prompt_pwd.fish" + "$out/share/fish/functions/prompt_pwd.fish" sed -i "s|nroff |${groff}/bin/nroff |" \ - "$out/share/fish/functions/__fish_print_help.fish" - sed -i "s|/sbin /usr/sbin||" \ - "$out/share/fish/functions/__fish_complete_subcommand_root.fish" - sed -e "s|clear;|${getBin ncurses}/bin/clear;|" \ + "$out/share/fish/functions/__fish_print_help.fish" + sed -e "s|clear;|${getBin ncurses}/bin/clear;|" \ -i "$out/share/fish/functions/fish_default_key_bindings.fish" - sed -e "s|python3|${getBin python3}/bin/python3|" \ + sed -e "s|python3|${getBin python3}/bin/python3|" \ -i $out/share/fish/functions/{__fish_config_interactive.fish,fish_config.fish,fish_update_completions.fish} + sed -i "s|/usr/local/sbin /sbin /usr/sbin||" \ + $out/share/fish/completions/{sudo.fish,doas.fish} '' + optionalString stdenv.isLinux '' sed -e "s| ul| ${utillinux}/bin/ul|" \ diff --git a/pkgs/shells/fish/fish-foreign-env/suppress-harmless-warnings.patch b/pkgs/shells/fish/fish-foreign-env/suppress-harmless-warnings.patch index 5e4569f0a15..6eed3515212 100644 --- a/pkgs/shells/fish/fish-foreign-env/suppress-harmless-warnings.patch +++ b/pkgs/shells/fish/fish-foreign-env/suppress-harmless-warnings.patch @@ -14,7 +14,7 @@ index 34a25e3..3d94135 100644 - set -g -x $key $value + if contains $key $ignore -+ set -g -x $key $value ^/dev/null ++ set -g -x $key $value 2>/dev/null + else + set -g -x $key $value + end diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index e08b23afcdd..811ef762f78 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "nushell"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "0p1aykhkz5rixj6x0rskg77q31xw11mirvjhzp7n4nmbx3rfkagc"; + sha256 = "08zqvk8qkilynfivx1jnr2yqrav64p9cy9i30jjgcqrh2gsrb9dd"; }; - cargoSha256 = "14v25smx23d5d386dyw0gspddj6g9am1qpg4ykc1a8lmr0h4ccrk"; + cargoSha256 = "1gpg0jpd5pmmny9gzzbkph1h2kqmjlapdsw04jzx852yg89lls5v"; nativeBuildInputs = [ pkg-config ] ++ lib.optionals (withStableFeatures && stdenv.isLinux) [ python3 ]; diff --git a/pkgs/shells/xonsh/default.nix b/pkgs/shells/xonsh/default.nix index 0e2490ff434..2bc65164d58 100644 --- a/pkgs/shells/xonsh/default.nix +++ b/pkgs/shells/xonsh/default.nix @@ -1,4 +1,11 @@ -{ stdenv, fetchFromGitHub, python3Packages, glibcLocales, coreutils, git }: +{ stdenv +, fetchFromGitHub +, fetchpatch +, python3Packages +, glibcLocales +, coreutils +, git +}: python3Packages.buildPythonApplication rec { pname = "xonsh"; @@ -12,6 +19,14 @@ python3Packages.buildPythonApplication rec { sha256 = "0nk6rjdkbxli510iwqspvray48kdxvbdmq1k8nxn14kqfpqzlbcv"; }; + patches = [ + (fetchpatch { + name = "fix-ptk-tests.patch"; + url = "https://github.com/xonsh/xonsh/commit/ca7acecc968dcda7dd56c1f5d5b4df349c98d734.patch"; + sha256 = "00nhbf9wzm6r86r9zq8mnhds30w6gdhkgsx5kpl0jppiz4ll96iw"; + }) + ]; + LC_ALL = "en_US.UTF-8"; postPatch = '' sed -ie "s|/bin/ls|${coreutils}/bin/ls|" tests/test_execer.py diff --git a/pkgs/tools/X11/xidlehook/default.nix b/pkgs/tools/X11/xidlehook/default.nix index 49ebe825053..a4bc2295f1b 100644 --- a/pkgs/tools/X11/xidlehook/default.nix +++ b/pkgs/tools/X11/xidlehook/default.nix @@ -16,10 +16,7 @@ rustPlatform.buildRustPackage rec { }; cargoBuildFlags = lib.optionals (!stdenv.isLinux) ["--no-default-features" "--features" "pulse"]; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "0jdkcxvlw7s8pz1ka3d2w97356a2axvlwfgyh2dz7nmfzpjx64x0"; + cargoSha256 = "0wakw3pqgwfwarjfb3h0a2javrhnf509v3j547a7p9k5kbjb5np0"; buildInputs = [ xlibsWrapper xorg.libXScrnSaver libpulseaudio ] ++ lib.optional stdenv.isDarwin Security; nativeBuildInputs = [ pkgconfig patchelf python3 ]; diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix index 07a81a5c525..326d15a9318 100644 --- a/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -42,6 +42,7 @@ in stdenv.mkDerivation rec { patches = [ ./gcloud-path.patch + ./gsutil-disable-updates.patch ]; installPhase = '' @@ -83,6 +84,7 @@ in stdenv.mkDerivation rec { # remove tests and test data find $out -name tests -type d -exec rm -rf '{}' + + rm $out/google-cloud-sdk/platform/gsutil/gslib/commands/test.py # compact all the JSON find $out -name \*.json | while read path; do diff --git a/pkgs/tools/admin/google-cloud-sdk/gsutil-disable-updates.patch b/pkgs/tools/admin/google-cloud-sdk/gsutil-disable-updates.patch new file mode 100644 index 00000000000..de44ea7e791 --- /dev/null +++ b/pkgs/tools/admin/google-cloud-sdk/gsutil-disable-updates.patch @@ -0,0 +1,50 @@ +diff --git a/platform/gsutil/gslib/command_runner.py b/platform/gsutil/gslib/command_runner.py +index 06ca5e5..4a4e225 100644 +--- a/platform/gsutil/gslib/command_runner.py ++++ b/platform/gsutil/gslib/command_runner.py +@@ -61,7 +61,6 @@ from gslib.utils.text_util import InsistAsciiHeaderValue + from gslib.utils.text_util import print_to_fd + from gslib.utils.unit_util import SECONDS_PER_DAY + from gslib.utils.update_util import LookUpGsutilVersion +-from gslib.tests.util import HAS_NON_DEFAULT_GS_HOST + + + def HandleHeaderCoding(headers): +@@ -331,17 +330,6 @@ class CommandRunner(object): + Returns: + Return value(s) from Command that was run. + """ +- command_changed_to_update = False +- if (not skip_update_check and +- self.MaybeCheckForAndOfferSoftwareUpdate(command_name, debug)): +- command_name = 'update' +- command_changed_to_update = True +- args = [_StringToSysArgType('-n')] +- +- # Check for opt-in analytics. +- if system_util.IsRunningInteractively() and collect_analytics: +- metrics.CheckAndMaybePromptForAnalyticsEnabling() +- + if not args: + args = [] + +@@ -414,18 +402,10 @@ class CommandRunner(object): + ShutDownGsutil() + if GetFailureCount() > 0: + return_code = 1 +- if command_changed_to_update: +- # If the command changed to update, the user's original command was +- # not executed. +- return_code = 1 +- print('\n'.join( +- textwrap.wrap( +- 'Update was successful. Exiting with code 1 as the original command ' +- 'issued prior to the update was not executed and should be re-run.' +- ))) + return return_code + + def MaybeCheckForAndOfferSoftwareUpdate(self, command_name, debug): ++ return False + """Checks the last time we checked for an update and offers one if needed. + + Offer is made if the time since the last update check is longer diff --git a/pkgs/tools/admin/procs/default.nix b/pkgs/tools/admin/procs/default.nix index 51ff06817cb..453bbfb426a 100644 --- a/pkgs/tools/admin/procs/default.nix +++ b/pkgs/tools/admin/procs/default.nix @@ -2,27 +2,24 @@ rustPlatform.buildRustPackage rec { pname = "procs"; - version = "0.9.9"; + version = "0.9.11"; src = fetchFromGitHub { owner = "dalance"; repo = pname; rev = "v${version}"; - sha256 = "1dvwn991widribk563jn3461f1913bpga0yyfr5mnf4p4p8s59j6"; + sha256 = "0nz06q1rdrqgprclgr30la2vp4bx0qgibh22vdlqpd4rzi3x0h2r"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "11wv02nn6gp32zzcd6kmsh6ky0dzyk1qqhb5vxvmq2nxhxjlddwv"; + cargoSha256 = "0hmz19ndfcg7bsrjk89ck9x99ibsvghqwmvgcd89vxmjr5h13rsg"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; meta = with stdenv.lib; { description = "A modern replacement for ps written in Rust"; homepage = "https://github.com/dalance/procs"; - license = with licenses; [ mit ]; - maintainers = [ maintainers.dalance ]; + license = licenses.mit; + maintainers = with maintainers; [ dalance filalex77 ]; platforms = with platforms; linux ++ darwin; }; } diff --git a/pkgs/tools/admin/s3bro/default.nix b/pkgs/tools/admin/s3bro/default.nix new file mode 100644 index 00000000000..9f383a8638d --- /dev/null +++ b/pkgs/tools/admin/s3bro/default.nix @@ -0,0 +1,23 @@ +{ stdenv, python3Packages }: + +python3Packages.buildPythonPackage rec { + pname = "s3bro"; + version = "2.8"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "0k25g3vch0q772f29jlghda5mjvps55h5lgwhwwbd5g2nlnrrspq"; + }; + + propagatedBuildInputs = with python3Packages; [ boto3 botocore click termcolor ]; + + # No tests + doCheck = false; + + meta = with stdenv.lib; { + description = "A handy s3 cli tool"; + homepage = https://github.com/rsavordelli/s3bro; + license = licenses.mit; + maintainers = with maintainers; [ psyanticy ]; + }; +} \ No newline at end of file diff --git a/pkgs/tools/audio/abcm2ps/default.nix b/pkgs/tools/audio/abcm2ps/default.nix index 575517829ff..4a824050c9f 100644 --- a/pkgs/tools/audio/abcm2ps/default.nix +++ b/pkgs/tools/audio/abcm2ps/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "abcm2ps"; - version = "8.14.6"; + version = "8.14.7"; src = fetchFromGitHub { owner = "leesavide"; repo = "abcm2ps"; rev = "v${version}"; - sha256 = "1gqjqbd8wj0655vi8gcg2r5jqzafdlnfjzwa9z331ywhrskpm53w"; + sha256 = "0k12wf37vl31w2qpj3dsmv8c4ifrsg3qa30gqsx553jw7n0f3ma2"; }; configureFlags = [ diff --git a/pkgs/tools/graphics/lepton/default.nix b/pkgs/tools/graphics/lepton/default.nix index 0b6c1263942..2a4f8a310ad 100644 --- a/pkgs/tools/graphics/lepton/default.nix +++ b/pkgs/tools/graphics/lepton/default.nix @@ -1,24 +1,24 @@ { stdenv, fetchFromGitHub, cmake, git, glibc }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { version = "1.2.1"; pname = "lepton"; src = fetchFromGitHub { repo = "lepton"; owner = "dropbox"; - rev = "c378cbfa2daaa99e8828be7395013f94cedb1bcc"; + rev = version; sha256 = "1f2vyp0crj4yw27bs53vykf2fqk4w57gv3lh9dp89dh3y7wwh1ba"; }; nativeBuildInputs = [ cmake git ]; - buildInputs = [ glibc.static ]; + buildInputs = stdenv.lib.optionals stdenv.isLinux [ glibc.static ]; meta = with stdenv.lib; { homepage = https://github.com/dropbox/lepton; description = "A tool to losslessly compress JPEGs"; license = licenses.asl20; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; maintainers = with maintainers; [ artemist ]; }; } diff --git a/pkgs/tools/graphics/mscgen/default.nix b/pkgs/tools/graphics/mscgen/default.nix index 832a48baab7..613a906a7b4 100644 --- a/pkgs/tools/graphics/mscgen/default.nix +++ b/pkgs/tools/graphics/mscgen/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { printing. ''; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.peti ]; }; } diff --git a/pkgs/tools/misc/apt-offline/default.nix b/pkgs/tools/misc/apt-offline/default.nix index 921c1af4ad6..7e29c63347d 100644 --- a/pkgs/tools/misc/apt-offline/default.nix +++ b/pkgs/tools/misc/apt-offline/default.nix @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { meta = with stdenv.lib; { description = "Offline APT package manager"; license = licenses.gpl3; - maintainers = [ maintainers.falsifian ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/clipman/default.nix b/pkgs/tools/misc/clipman/default.nix index b8873e2bcac..560dbecd4bf 100644 --- a/pkgs/tools/misc/clipman/default.nix +++ b/pkgs/tools/misc/clipman/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "clipman"; - version = "unstable-2019-12-10"; + version = "1.3.0"; src = fetchFromGitHub { owner = "yory8"; repo = pname; - rev = "c57453be90bb4496f67275db8c0beb2116a6ce14"; - sha256 = "0zvqk3gcpx67dsn7qr0p9bgjp0sljl3yrlsfbqzrbrmj2lwr98ys"; + rev = "v${version}"; + sha256 = "0b27rgyjwvdm9qjq824imda3yjbxxcwwyv8rzzk95ggvyayxw8an"; }; modSha256 = "0aw0ng8pk8qzn1iv79iw0v9zr8xdc8p9xnigr3ij86038f7aqdhv"; diff --git a/pkgs/tools/misc/expect/default.nix b/pkgs/tools/misc/expect/default.nix index 4a6f62f995b..9fcff332de6 100644 --- a/pkgs/tools/misc/expect/default.nix +++ b/pkgs/tools/misc/expect/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; postPatch = '' - sed -i "s,/bin/stty,$(type -p stty),g" configure + sed -i "s,/bin/stty,$(type -p stty),g" configure.in ''; configureFlags = [ diff --git a/pkgs/tools/misc/fontforge/default.nix b/pkgs/tools/misc/fontforge/default.nix index 6239e839598..635d786da53 100644 --- a/pkgs/tools/misc/fontforge/default.nix +++ b/pkgs/tools/misc/fontforge/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, lib -, autoconf, automake, gnum4, libtool, perl, gnulib, uthash, pkgconfig, gettext +, autoconf, automake, gnum4, libtool, perl, uthash, pkgconfig, gettext , python, freetype, zlib, glib, libungif, libpng, libjpeg, libtiff, libxml2, cairo, pango -, readline, woff2, zeromq +, readline, woff2, zeromq, libuninameslist , withSpiro ? false, libspiro , withGTK ? false, gtk2 , withPython ? true @@ -11,15 +11,13 @@ stdenv.mkDerivation rec { pname = "fontforge"; - version = "20190413"; + version = "20190801"; src = fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "05v640mnk4fy4jzmxb6c4n4qm800x7hy4sl5gcdgzmm3md2s0qk7"; + sha256 = "0lh8yx01asbzxm6car5cfi64njh5p4lxc7iv8dldr5rwg357a86r"; }; - patches = [ ./fontforge-20140813-use-system-uthash.patch ]; - # use $SOURCE_DATE_EPOCH instead of non-deterministic timestamps postPatch = '' find . -type f -name '*.c' -exec sed -r -i 's#\btime\(&(.+)\)#if (getenv("SOURCE_DATE_EPOCH")) \1=atol(getenv("SOURCE_DATE_EPOCH")); else &#g' {} \; @@ -34,7 +32,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig autoconf automake gnum4 libtool perl gettext ]; buildInputs = [ - readline uthash woff2 zeromq + readline uthash woff2 zeromq libuninameslist python freetype zlib glib libungif libpng libjpeg libtiff libxml2 ] ++ lib.optionals withSpiro [libspiro] @@ -53,9 +51,7 @@ stdenv.mkDerivation rec { export SOURCE_DATE_EPOCH=$(date -d ${version} +%s) export GIT="$(type -P true)" - cp -r "${gnulib}" ./gnulib - chmod +w -R ./gnulib - ./bootstrap --skip-git --gnulib-srcdir=./gnulib --force + ./bootstrap --skip-git --force ''; doCheck = false; # tries to wget some fonts @@ -74,5 +70,6 @@ stdenv.mkDerivation rec { homepage = http://fontforge.github.io; platforms = stdenv.lib.platforms.all; license = stdenv.lib.licenses.bsd3; + maintainers = [ stdenv.lib.maintainers.erictapen ]; }; } diff --git a/pkgs/tools/misc/fontforge/fontforge-20140813-use-system-uthash.patch b/pkgs/tools/misc/fontforge/fontforge-20140813-use-system-uthash.patch deleted file mode 100644 index fb53c619b2b..00000000000 --- a/pkgs/tools/misc/fontforge/fontforge-20140813-use-system-uthash.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- a/Makefile.am.old 2014-08-12 10:07:32.000000000 +0530 -+++ b/Makefile.am 2014-09-08 16:23:56.046996941 +0530 -@@ -43,7 +43,6 @@ - AM_CPPFLAGS = - AM_LDFLAGS = - --BUILT_SOURCES = uthash/src - EXTRA_DIST = - CLEANFILES = - MOSTLYCLEANFILES = -@@ -113,8 +112,7 @@ - Packaging/FontForge-doc.spec \ - Packaging/FontForge.spec \ - Packaging/FontForge.static.spec \ - README \ -- uthash/src \ - $(NULL) - - #-------------------------------------------------------------------------- -@@ -129,11 +127,6 @@ - - - #-------------------------------------------------------------------------- --uthash/src: -- if [ ! -e uthash/src ]; then \ -- if [ -e uthash ] ; then rm -r uthash ; fi ; \ -- git clone https://github.com/troydhanson/uthash ; \ -- fi ; - - # We import a selection of targets from Frank's standard packaging Makefile. - diff --git a/pkgs/tools/misc/gti/default.nix b/pkgs/tools/misc/gti/default.nix index bca481cade4..cdb6be99253 100644 --- a/pkgs/tools/misc/gti/default.nix +++ b/pkgs/tools/misc/gti/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gti"; - version = "1.6.1"; + version = "1.7.0"; src = fetchFromGitHub { owner = "rwos"; repo = "gti"; rev = "v${version}"; - sha256 = "19q3r4v22z2q1j4njap356f3mcq6kwh6v8nbbq2rw4x3cdxwdv51"; + sha256 = "1jivnjswlhwjfg5v9nwfg3vfssvqbdxxf9znwmfb5dgfblg9wxw9"; }; installPhase = '' diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix index 59055e4114a..b0d69fb98b0 100644 --- a/pkgs/tools/misc/hdf5/default.nix +++ b/pkgs/tools/misc/hdf5/default.nix @@ -70,6 +70,5 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.bsd3; # Lawrence Berkeley National Labs BSD 3-Clause variant homepage = https://www.hdfgroup.org/HDF5/; platforms = stdenv.lib.platforms.unix; - broken = (gfortran != null) && stdenv.isDarwin; }; } diff --git a/pkgs/tools/misc/kepubify/default.nix b/pkgs/tools/misc/kepubify/default.nix new file mode 100644 index 00000000000..faa5e9d85e8 --- /dev/null +++ b/pkgs/tools/misc/kepubify/default.nix @@ -0,0 +1,26 @@ +{ lib, fetchFromGitHub, buildGoModule }: + +buildGoModule rec { + pname = "kepubify"; + version = "3.0.0"; + + src = fetchFromGitHub { + owner = "geek1011"; + repo = pname; + rev = "v${version}"; + sha256 = "168n4xbhjrzwzlhvakmsd0nwqjwgibphkwzq5hcxrk9ywpqpxjad"; + }; + + modSha256 = "18q9ywsjc2v1bsmw7307dpd4v5m7v80hbhijkfrkcyqzj34jrq43"; + + buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + + subPackages = [ "." "covergen" "seriesmeta" ]; + + meta = with lib; { + description = "EPUB to KEPUB converter"; + homepage = "https://pgaskin.net/kepubify"; + license = licenses.mit; + maintainers = with maintainers; [ zowoq ]; + }; +} diff --git a/pkgs/tools/misc/neo-cowsay/default.nix b/pkgs/tools/misc/neo-cowsay/default.nix index 128d582e32e..a4fe58fb107 100644 --- a/pkgs/tools/misc/neo-cowsay/default.nix +++ b/pkgs/tools/misc/neo-cowsay/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "neo-cowsay"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "Code-Hex"; repo = "Neo-cowsay"; rev = "v${version}"; - sha256 = "1in6kadczv05v62qhskqbdx7wppch0gwl0bshr5ihmi39k8l7v3z"; + sha256 = "0c6lygdqi26mczij41sn8ckc3g6qaakkkh3iasf10a4d07amxci1"; }; modSha256 = "063ds35dzv8m4bjk7v1q3f6jwyp7j5jrkrhrl41z1c1mbzzkagkq"; diff --git a/pkgs/tools/misc/osm2pgsql/default.nix b/pkgs/tools/misc/osm2pgsql/default.nix index 8905f9eb36a..6137abd9293 100644 --- a/pkgs/tools/misc/osm2pgsql/default.nix +++ b/pkgs/tools/misc/osm2pgsql/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub, cmake, expat, proj, bzip2, zlib, boost, postgresql, lua}: +{ stdenv, fetchFromGitHub, cmake, expat, proj, bzip2, zlib, boost, postgresql +, withLuaJIT ? false, lua, luajit }: stdenv.mkDerivation rec { pname = "osm2pgsql"; @@ -13,7 +14,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = [ expat proj bzip2 zlib boost postgresql lua ]; + buildInputs = [ expat proj bzip2 zlib boost postgresql ] + ++ stdenv.lib.optional withLuaJIT luajit + ++ stdenv.lib.optional (!withLuaJIT) lua; + + cmakeFlags = stdenv.lib.optional withLuaJIT "-DWITH_LUAJIT:BOOL=ON"; NIX_CFLAGS_COMPILE = "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H"; @@ -21,7 +26,7 @@ stdenv.mkDerivation rec { description = "OpenStreetMap data to PostgreSQL converter"; homepage = "https://github.com/openstreetmap/osm2pgsql"; license = licenses.gpl2; - platforms = platforms.linux; + platforms = with platforms; linux ++ darwin; maintainers = with maintainers; [ jglukasik ]; }; } diff --git a/pkgs/tools/misc/sta/default.nix b/pkgs/tools/misc/sta/default.nix new file mode 100644 index 00000000000..aa27ddf0838 --- /dev/null +++ b/pkgs/tools/misc/sta/default.nix @@ -0,0 +1,30 @@ +{ stdenv, lib, fetchFromGitHub, autoreconfHook }: +stdenv.mkDerivation { + pname = "sta"; + version = "unstable-2016-01-25"; + + src = fetchFromGitHub { + owner = "simonccarter"; + repo = "sta"; + rev = "2aa2a6035dde88b24978b875e4c45e0e296f77ed"; + sha256 = "05804f106nb89yvdd0csvpd5skwvnr9x4qr3maqzaw0qr055mrsk"; + }; + + buildInputs = [ autoreconfHook ]; + + meta = with lib; { + description = "Simple statistics from the command line interface (CLI), fast"; + longDescription = '' + This is a lightweight, fast tool for calculating basic descriptive + statistics from the command line. Inspired by + https://github.com/nferraz/st, this project differs in that it is written + in C++, allowing for faster computation of statistics given larger + non-trivial data sets. + ''; + license = licenses.mit; + homepage = "https://github.com/simonccarter/sta"; + maintainers = with maintainers; [ infinisil ]; + platforms = platforms.all; + badPlatforms = platforms.darwin; + }; +} diff --git a/pkgs/tools/misc/tealdeer/default.nix b/pkgs/tools/misc/tealdeer/default.nix index 1666d22626b..5e4b1bec1e6 100644 --- a/pkgs/tools/misc/tealdeer/default.nix +++ b/pkgs/tools/misc/tealdeer/default.nix @@ -13,10 +13,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1v9wq4k7k4lmdz6xy6kabchjpbx9lds20yh6va87shypdh9iva29"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "0y1y74fgxcv8a3cmyf30p6gg12r79ln7inir8scj88wbmwgkbxsp"; + cargoSha256 = "0rr9mqylcs3nb7wgilp810qia0rv2pnalyhh28q0wnqyz0kqfrzr"; buildInputs = [ openssl cacert curl ] ++ (stdenv.lib.optional stdenv.isDarwin Security); diff --git a/pkgs/tools/misc/you-get/default.nix b/pkgs/tools/misc/you-get/default.nix index 223fb4883ae..466813ee75f 100644 --- a/pkgs/tools/misc/you-get/default.nix +++ b/pkgs/tools/misc/you-get/default.nix @@ -2,7 +2,7 @@ buildPythonApplication rec { pname = "you-get"; - version = "0.4.1388"; + version = "0.4.1403"; # Tests aren't packaged, but they all hit the real network so # probably aren't suitable for a build environment anyway. @@ -10,7 +10,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "1afnyb5srs0prqm73pz5qbfk5j4lb5g70nqg41r4igh753p2yi13"; + sha256 = "195c91xxcv3l3rd0v8ls5ghncf92ndfx0lpcbjr5zb41bl8alkcl"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 59fd4fa70c9..1fc8acdda2c 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { # The websites youtube-dl deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2020.01.24"; + version = "2020.02.16"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "1zrnbjnwv315f9a83lk5c0gl4ianvp6q2kinxvqlv604sabcq78b"; + sha256 = "1ip0p7gifwmkls8ppfvz89j1lh82dg60zmvabj8njnhj170ikkdb"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/tools/networking/dnsmasq/default.nix index f224ab1ac93..2a6b776c14d 100644 --- a/pkgs/tools/networking/dnsmasq/default.nix +++ b/pkgs/tools/networking/dnsmasq/default.nix @@ -27,6 +27,9 @@ stdenv.mkDerivation rec { sha256 = "1hnixij3jp1p6zc3bx2dr92yyf9jp1ahhl9hiiq7bkbhbrw6mbic"; }) ]; + postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isLinux '' + sed '1i#include <linux/sockios.h>' -i src/dhcp.c + ''; preBuild = '' makeFlagsArray=("COPTS=${copts}") diff --git a/pkgs/tools/networking/network-manager/tray.nix b/pkgs/tools/networking/network-manager/tray.nix new file mode 100644 index 00000000000..e8ce8ad342f --- /dev/null +++ b/pkgs/tools/networking/network-manager/tray.nix @@ -0,0 +1,31 @@ +{ lib, mkDerivation, fetchFromGitHub, cmake, qttools, qtbase, networkmanager-qt, modemmanager-qt }: + +mkDerivation rec { + pname = "nm-tray"; + version = "0.4.3"; + + src = fetchFromGitHub { + owner = "palinek"; + repo = pname; + rev = version; + sha256 = "08c86kd613wlvw9571q7a3lb7g6skyyasjw6h1g543rbl4jn2c2v"; + }; + + postPatch = '' + sed -i -e '1i#include <QMetaEnum>' src/nmmodel.cpp + ''; + + nativeBuildInputs = [ cmake qttools ]; + + cmakeFlags = [ "-DWITH_MODEMMANAGER_SUPPORT=ON" ]; + + buildInputs = [ qtbase networkmanager-qt modemmanager-qt ]; + + meta = with lib; { + description = "Simple Network Manager frontend written in Qt"; + homepage = "https://github.com/palinek/nm-tray"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ dtzWill ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/networking/pmacct/default.nix b/pkgs/tools/networking/pmacct/default.nix index 5d0c5cccded..861c44ef70f 100644 --- a/pkgs/tools/networking/pmacct/default.nix +++ b/pkgs/tools/networking/pmacct/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { ''; homepage = "http://www.pmacct.net/"; license = licenses.gpl2; - maintainers = with maintainers; [ "0x4A6F" ]; + maintainers = [ maintainers."0x4A6F" ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/nix/nixdoc/default.nix b/pkgs/tools/nix/nixdoc/default.nix index 4f64750892a..6ea28dbea2b 100644 --- a/pkgs/tools/nix/nixdoc/default.nix +++ b/pkgs/tools/nix/nixdoc/default.nix @@ -13,10 +13,7 @@ rustPlatform.buildRustPackage rec { buildInputs = stdenv.lib.optional stdenv.isDarwin [ darwin.Security ]; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1hy8w73fir4wnqx7zfvfqh7s24w95x9nkw55kmizvrwf0glw9m4n"; + cargoSha256 = "1vamwynkbnffs8ryr2zb1a41cymjvr8zzh1bifyh9hpkx2k11rs3"; meta = with stdenv.lib; { description = "Generate documentation for Nix functions"; diff --git a/pkgs/tools/nix/nixpkgs-fmt/default.nix b/pkgs/tools/nix/nixpkgs-fmt/default.nix index eac8d1293d2..1088884dca6 100644 --- a/pkgs/tools/nix/nixpkgs-fmt/default.nix +++ b/pkgs/tools/nix/nixpkgs-fmt/default.nix @@ -10,10 +10,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1iylldgyvrcarfigpbhicg6j6qyipfiqn7gybza7qajfzyprjqfa"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "04my7dlp76dxs1ydy2sbbca8sp3n62wzdxyc4afcmrg8anb0ghaf"; + cargoSha256 = "1jxvy4w9jxv898wgqyj9bpkhnc7pkj9dxg5x0b39xsnkzl2lr239"; meta = with lib; { description = "Nix code formatter for nixpkgs"; diff --git a/pkgs/tools/package-management/cargo-about/default.nix b/pkgs/tools/package-management/cargo-about/default.nix index bee0ee7d3d8..82da6b7b93c 100644 --- a/pkgs/tools/package-management/cargo-about/default.nix +++ b/pkgs/tools/package-management/cargo-about/default.nix @@ -10,10 +10,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0bsay1vqi5b3z7qjwbkwx3ikmpjzc0kswbajm50xmcwlg8jrn420"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1mqicibpa9sxac8v2kk8vfvxcis2wkdkklia2pbspc0pz3h0c8if"; + cargoSha256 = "1ynalwaqa70ihgras3frp5l3xniz58hwp108wkxn6zj8lwxbxfgx"; meta = with lib; { description = "Cargo plugin to generate list of all licenses for a crate"; diff --git a/pkgs/tools/package-management/cargo-audit/default.nix b/pkgs/tools/package-management/cargo-audit/default.nix index 2d9bb71c569..fba2b82ff32 100644 --- a/pkgs/tools/package-management/cargo-audit/default.nix +++ b/pkgs/tools/package-management/cargo-audit/default.nix @@ -1,19 +1,16 @@ { stdenv, lib, rustPlatform, fetchFromGitHub, openssl, pkg-config, Security, libiconv }: rustPlatform.buildRustPackage rec { pname = "cargo-audit"; - version = "0.10.0"; + version = "0.11.2"; src = fetchFromGitHub { owner = "RustSec"; repo = "cargo-audit"; rev = "v${version}"; - sha256 = "1977ykablfi4mc6j2iil0bxc6diy07vi5hm56xmqj3n37ziavf1m"; + sha256 = "0py4z50ld4vs0g7vh8ga6v5h11nz2yfcpr3xqzpihf4p7sg1mdf4"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "0zbnsq0cif0yppn8ygxhcsrshkbf1c801f8waqqb2d1rjsrhb93y"; + cargoSha256 = "0n4q8767aby6fgq0z7wj966zgqydlwirrzgyahf234dz6arsxw2l"; buildInputs = [ openssl libiconv ] ++ lib.optionals stdenv.isDarwin [ Security ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/package-management/cargo-deps/default.nix b/pkgs/tools/package-management/cargo-deps/default.nix index b5dafc544fb..d0768300d82 100644 --- a/pkgs/tools/package-management/cargo-deps/default.nix +++ b/pkgs/tools/package-management/cargo-deps/default.nix @@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "16181p7ghvy9mqippg1xi2cw7yxvicis8v6n39wly5qw05i57aw2"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1a9svdw1cgk6s7gqpsq3r25wxa2gr2xddqkc1cjk7hf6sk327cpv"; + cargoSha256 = "1zk6pf7agqs1mpld40rn05cwp4wy0vpjnn5ip6m83bxm8b3i87wk"; meta = with lib; { description = "Cargo subcommand for building dependency graphs of Rust projects"; diff --git a/pkgs/tools/package-management/cargo-edit/default.nix b/pkgs/tools/package-management/cargo-edit/default.nix index 77753dc3349..b15400e576e 100644 --- a/pkgs/tools/package-management/cargo-edit/default.nix +++ b/pkgs/tools/package-management/cargo-edit/default.nix @@ -13,10 +13,7 @@ rustPlatform.buildRustPackage rec { sha256 = "16gpljbzk6cibry9ssnl22xbcsx2cr57mrs3x3n6cfmldbp6bhbr"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1cjpbfgbqzlfs5hck2j3d2v719fwandpnc7bdk4243j7j0k1ng9q"; + cargoSha256 = "1zwkar914zyghky09lgk0s374m5d6yccn0m15bqlgxxyymg4b59y"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/tools/package-management/cargo-graph/default.nix b/pkgs/tools/package-management/cargo-graph/default.nix index 1f0b11ad978..4d35e284040 100644 --- a/pkgs/tools/package-management/cargo-graph/default.nix +++ b/pkgs/tools/package-management/cargo-graph/default.nix @@ -12,10 +12,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0myg26cssmbakz53dl61lswsbaqnjqlbc30c2571pq8f7gvz2qv5"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1k4byg77s1iqhry96pl57mbsvd32sbnvf60dlbd62pvan39rispg"; + cargoSha256 = "0fzj88iy57c39yi8pf3agfmsf2dck06f0yqmlnsaxvvp4cknkw1n"; meta = with lib; { description = "A cargo subcommand for creating GraphViz DOT files and dependency graphs"; diff --git a/pkgs/tools/package-management/cargo-outdated/cargo-lock.patch b/pkgs/tools/package-management/cargo-outdated/cargo-lock.patch deleted file mode 100644 index 7e0528eda2a..00000000000 --- a/pkgs/tools/package-management/cargo-outdated/cargo-lock.patch +++ /dev/null @@ -1,1283 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -new file mode 100644 -index 0000000..0f18cc6 ---- /dev/null -+++ b/Cargo.lock -@@ -0,0 +1,1277 @@ -+# This file is automatically @generated by Cargo. -+# It is not intended for manual editing. -+[[package]] -+name = "adler32" -+version = "1.0.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5d2e7343e7fc9de883d1b0341e0b13970f764c14101234857d2ddafa1cb1cac2" -+ -+[[package]] -+name = "aho-corasick" -+version = "0.7.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d" -+dependencies = [ -+ "memchr", -+] -+ -+[[package]] -+name = "ansi_term" -+version = "0.11.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" -+dependencies = [ -+ "winapi", -+] -+ -+[[package]] -+name = "atty" -+version = "0.2.13" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90" -+dependencies = [ -+ "libc", -+ "winapi", -+] -+ -+[[package]] -+name = "autocfg" -+version = "0.1.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" -+ -+[[package]] -+name = "backtrace" -+version = "0.3.40" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "924c76597f0d9ca25d762c25a4d369d51267536465dc5064bdf0eb073ed477ea" -+dependencies = [ -+ "backtrace-sys", -+ "cfg-if", -+ "libc", -+ "rustc-demangle", -+] -+ -+[[package]] -+name = "backtrace-sys" -+version = "0.1.32" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5d6575f128516de27e3ce99689419835fce9643a9b215a14d2b5b685be018491" -+dependencies = [ -+ "cc", -+ "libc", -+] -+ -+[[package]] -+name = "bitflags" -+version = "1.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" -+ -+[[package]] -+name = "bstr" -+version = "0.2.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8d6c2c5b58ab920a4f5aeaaca34b4488074e8cc7596af94e6f8c6ff247c60245" -+dependencies = [ -+ "memchr", -+] -+ -+[[package]] -+name = "bytesize" -+version = "1.0.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "716960a18f978640f25101b5cbf1c6f6b0d3192fab36a2d98ca96f0ecbe41010" -+ -+[[package]] -+name = "c2-chacha" -+version = "0.2.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb" -+dependencies = [ -+ "ppv-lite86", -+] -+ -+[[package]] -+name = "cargo" -+version = "0.40.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "03504435a39de1303decb9c9a7416e875f16d4b94769d4d0dd5e1bfb21229640" -+dependencies = [ -+ "atty", -+ "bytesize", -+ "clap", -+ "core-foundation", -+ "crates-io", -+ "crossbeam-utils", -+ "crypto-hash", -+ "curl", -+ "curl-sys", -+ "env_logger 0.6.2", -+ "failure", -+ "filetime", -+ "flate2", -+ "fs2", -+ "fwdansi", -+ "git2", -+ "git2-curl", -+ "glob", -+ "hex 0.4.0", -+ "home", -+ "humantime", -+ "ignore", -+ "im-rc", -+ "jobserver", -+ "lazy_static", -+ "lazycell", -+ "libc", -+ "libgit2-sys", -+ "log", -+ "memchr", -+ "miow", -+ "num_cpus", -+ "opener", -+ "percent-encoding", -+ "remove_dir_all", -+ "rustc-workspace-hack", -+ "rustfix", -+ "same-file", -+ "semver", -+ "serde", -+ "serde_ignored", -+ "serde_json", -+ "shell-escape", -+ "strip-ansi-escapes", -+ "tar", -+ "tempfile", -+ "termcolor", -+ "toml", -+ "unicode-width", -+ "url", -+ "walkdir", -+ "winapi", -+] -+ -+[[package]] -+name = "cargo-outdated" -+version = "0.9.1" -+dependencies = [ -+ "cargo", -+ "docopt", -+ "env_logger 0.7.1", -+ "failure", -+ "semver", -+ "serde", -+ "serde_derive", -+ "serde_json", -+ "tabwriter", -+ "tempfile", -+ "termcolor", -+ "toml", -+] -+ -+[[package]] -+name = "cc" -+version = "1.0.48" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f52a465a666ca3d838ebbf08b241383421412fe7ebb463527bba275526d89f76" -+dependencies = [ -+ "jobserver", -+ "num_cpus", -+] -+ -+[[package]] -+name = "cfg-if" -+version = "0.1.10" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" -+ -+[[package]] -+name = "clap" -+version = "2.33.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" -+dependencies = [ -+ "ansi_term", -+ "atty", -+ "bitflags", -+ "strsim 0.8.0", -+ "textwrap", -+ "unicode-width", -+ "vec_map", -+] -+ -+[[package]] -+name = "commoncrypto" -+version = "0.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d056a8586ba25a1e4d61cb090900e495952c7886786fc55f909ab2f819b69007" -+dependencies = [ -+ "commoncrypto-sys", -+] -+ -+[[package]] -+name = "commoncrypto-sys" -+version = "0.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1fed34f46747aa73dfaa578069fd8279d2818ade2b55f38f22a9401c7f4083e2" -+dependencies = [ -+ "libc", -+] -+ -+[[package]] -+name = "core-foundation" -+version = "0.6.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "25b9e03f145fd4f2bf705e07b900cd41fc636598fe5dc452fd0db1441c3f496d" -+dependencies = [ -+ "core-foundation-sys", -+ "libc", -+] -+ -+[[package]] -+name = "core-foundation-sys" -+version = "0.6.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b" -+ -+[[package]] -+name = "crates-io" -+version = "0.28.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9dc57b7035c84bcaaa14d89221491b624a32977c230ce6bb77ae191e880c48e1" -+dependencies = [ -+ "curl", -+ "failure", -+ "percent-encoding", -+ "serde", -+ "serde_derive", -+ "serde_json", -+ "url", -+] -+ -+[[package]] -+name = "crc32fast" -+version = "1.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1" -+dependencies = [ -+ "cfg-if", -+] -+ -+[[package]] -+name = "crossbeam-channel" -+version = "0.3.9" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c8ec7fcd21571dc78f96cc96243cab8d8f035247c3efd16c687be154c3fa9efa" -+dependencies = [ -+ "crossbeam-utils", -+] -+ -+[[package]] -+name = "crossbeam-utils" -+version = "0.6.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "04973fa96e96579258a5091af6003abde64af786b860f18622b82e026cca60e6" -+dependencies = [ -+ "cfg-if", -+ "lazy_static", -+] -+ -+[[package]] -+name = "crypto-hash" -+version = "0.3.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8a77162240fd97248d19a564a565eb563a3f592b386e4136fb300909e67dddca" -+dependencies = [ -+ "commoncrypto", -+ "hex 0.3.2", -+ "openssl", -+ "winapi", -+] -+ -+[[package]] -+name = "curl" -+version = "0.4.25" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "06aa71e9208a54def20792d877bc663d6aae0732b9852e612c4a933177c31283" -+dependencies = [ -+ "curl-sys", -+ "libc", -+ "openssl-probe", -+ "openssl-sys", -+ "schannel", -+ "socket2", -+ "winapi", -+] -+ -+[[package]] -+name = "curl-sys" -+version = "0.4.24" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f659f3ffac9582d6177bb86d1d2aa649f4eb9d0d4de9d03ccc08b402832ea340" -+dependencies = [ -+ "cc", -+ "libc", -+ "libnghttp2-sys", -+ "libz-sys", -+ "openssl-sys", -+ "pkg-config", -+ "vcpkg", -+ "winapi", -+] -+ -+[[package]] -+name = "docopt" -+version = "1.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7f525a586d310c87df72ebcd98009e57f1cc030c8c268305287a476beb653969" -+dependencies = [ -+ "lazy_static", -+ "regex", -+ "serde", -+ "strsim 0.9.3", -+] -+ -+[[package]] -+name = "env_logger" -+version = "0.6.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "aafcde04e90a5226a6443b7aabdb016ba2f8307c847d524724bd9b346dd1a2d3" -+dependencies = [ -+ "atty", -+ "humantime", -+ "log", -+ "regex", -+ "termcolor", -+] -+ -+[[package]] -+name = "env_logger" -+version = "0.7.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" -+dependencies = [ -+ "atty", -+ "humantime", -+ "log", -+ "regex", -+ "termcolor", -+] -+ -+[[package]] -+name = "failure" -+version = "0.1.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f8273f13c977665c5db7eb2b99ae520952fe5ac831ae4cd09d80c4c7042b5ed9" -+dependencies = [ -+ "backtrace", -+ "failure_derive", -+] -+ -+[[package]] -+name = "failure_derive" -+version = "0.1.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0bc225b78e0391e4b8683440bf2e63c2deeeb2ce5189eab46e2b68c6d3725d08" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+ "synstructure", -+] -+ -+[[package]] -+name = "filetime" -+version = "0.2.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1ff6d4dab0aa0c8e6346d46052e93b13a16cf847b54ed357087c35011048cc7d" -+dependencies = [ -+ "cfg-if", -+ "libc", -+ "redox_syscall", -+ "winapi", -+] -+ -+[[package]] -+name = "flate2" -+version = "1.0.13" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6bd6d6f4752952feb71363cffc9ebac9411b75b87c6ab6058c40c8900cf43c0f" -+dependencies = [ -+ "cfg-if", -+ "crc32fast", -+ "libc", -+ "libz-sys", -+ "miniz_oxide", -+] -+ -+[[package]] -+name = "fnv" -+version = "1.0.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3" -+ -+[[package]] -+name = "foreign-types" -+version = "0.3.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -+dependencies = [ -+ "foreign-types-shared", -+] -+ -+[[package]] -+name = "foreign-types-shared" -+version = "0.1.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" -+ -+[[package]] -+name = "fs2" -+version = "0.4.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213" -+dependencies = [ -+ "libc", -+ "winapi", -+] -+ -+[[package]] -+name = "fwdansi" -+version = "1.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "08c1f5787fe85505d1f7777268db5103d80a7a374d2316a7ce262e57baf8f208" -+dependencies = [ -+ "memchr", -+ "termcolor", -+] -+ -+[[package]] -+name = "getrandom" -+version = "0.1.13" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e7db7ca94ed4cd01190ceee0d8a8052f08a247aa1b469a7f68c6a3b71afcf407" -+dependencies = [ -+ "cfg-if", -+ "libc", -+ "wasi", -+] -+ -+[[package]] -+name = "git2" -+version = "0.10.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7c1af51ea8a906616af45a4ce78eacf25860f7a13ae7bf8a814693f0f4037a26" -+dependencies = [ -+ "bitflags", -+ "libc", -+ "libgit2-sys", -+ "log", -+ "openssl-probe", -+ "openssl-sys", -+ "url", -+] -+ -+[[package]] -+name = "git2-curl" -+version = "0.11.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cd6527e480187ce19aaf4fa6acfb7657b25628ce31cb8ffabdfca3bf731524c5" -+dependencies = [ -+ "curl", -+ "git2", -+ "log", -+ "url", -+] -+ -+[[package]] -+name = "glob" -+version = "0.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" -+ -+[[package]] -+name = "globset" -+version = "0.4.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "925aa2cac82d8834e2b2a4415b6f6879757fb5c0928fc445ae76461a12eed8f2" -+dependencies = [ -+ "aho-corasick", -+ "bstr", -+ "fnv", -+ "log", -+ "regex", -+] -+ -+[[package]] -+name = "hermit-abi" -+version = "0.1.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "307c3c9f937f38e3534b1d6447ecf090cafcc9744e4a6360e8b037b2cf5af120" -+dependencies = [ -+ "libc", -+] -+ -+[[package]] -+name = "hex" -+version = "0.3.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77" -+ -+[[package]] -+name = "hex" -+version = "0.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "023b39be39e3a2da62a94feb433e91e8bcd37676fbc8bea371daf52b7a769a3e" -+ -+[[package]] -+name = "home" -+version = "0.5.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a3753954f7bd71f0e671afb8b5a992d1724cf43b7f95a563cd4a0bde94659ca8" -+dependencies = [ -+ "scopeguard", -+ "winapi", -+] -+ -+[[package]] -+name = "humantime" -+version = "1.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" -+dependencies = [ -+ "quick-error", -+] -+ -+[[package]] -+name = "idna" -+version = "0.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9" -+dependencies = [ -+ "matches", -+ "unicode-bidi", -+ "unicode-normalization", -+] -+ -+[[package]] -+name = "ignore" -+version = "0.4.10" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0ec16832258409d571aaef8273f3c3cc5b060d784e159d1a0f3b0017308f84a7" -+dependencies = [ -+ "crossbeam-channel", -+ "globset", -+ "lazy_static", -+ "log", -+ "memchr", -+ "regex", -+ "same-file", -+ "thread_local", -+ "walkdir", -+ "winapi-util", -+] -+ -+[[package]] -+name = "im-rc" -+version = "13.0.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0a0197597d095c0d11107975d3175173f810ee572c2501ff4de64f4f3f119806" -+dependencies = [ -+ "rustc_version", -+ "sized-chunks", -+ "typenum", -+] -+ -+[[package]] -+name = "itoa" -+version = "0.4.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f" -+ -+[[package]] -+name = "jobserver" -+version = "0.1.17" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f2b1d42ef453b30b7387e113da1c83ab1605d90c5b4e0eb8e96d016ed3b8c160" -+dependencies = [ -+ "getrandom", -+ "libc", -+ "log", -+] -+ -+[[package]] -+name = "lazy_static" -+version = "1.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -+ -+[[package]] -+name = "lazycell" -+version = "1.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f" -+ -+[[package]] -+name = "libc" -+version = "0.2.66" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558" -+ -+[[package]] -+name = "libgit2-sys" -+version = "0.9.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4870c781f6063efb83150cd22c1ddf6ecf58531419e7570cdcced46970f64a16" -+dependencies = [ -+ "cc", -+ "libc", -+ "libssh2-sys", -+ "libz-sys", -+ "openssl-sys", -+ "pkg-config", -+] -+ -+[[package]] -+name = "libnghttp2-sys" -+version = "0.1.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "02254d44f4435dd79e695f2c2b83cd06a47919adea30216ceaf0c57ca0a72463" -+dependencies = [ -+ "cc", -+ "libc", -+] -+ -+[[package]] -+name = "libssh2-sys" -+version = "0.2.13" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5fcd5a428a31cbbfe059812d74f4b6cd3b9b7426c2bdaec56993c5365da1c328" -+dependencies = [ -+ "cc", -+ "libc", -+ "libz-sys", -+ "openssl-sys", -+ "pkg-config", -+ "vcpkg", -+] -+ -+[[package]] -+name = "libz-sys" -+version = "1.0.25" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2eb5e43362e38e2bca2fd5f5134c4d4564a23a5c28e9b95411652021a8675ebe" -+dependencies = [ -+ "cc", -+ "libc", -+ "pkg-config", -+ "vcpkg", -+] -+ -+[[package]] -+name = "log" -+version = "0.4.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" -+dependencies = [ -+ "cfg-if", -+] -+ -+[[package]] -+name = "matches" -+version = "0.1.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" -+ -+[[package]] -+name = "memchr" -+version = "2.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e" -+ -+[[package]] -+name = "miniz_oxide" -+version = "0.3.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6f3f74f726ae935c3f514300cc6773a0c9492abc5e972d42ba0c0ebb88757625" -+dependencies = [ -+ "adler32", -+] -+ -+[[package]] -+name = "miow" -+version = "0.3.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "396aa0f2003d7df8395cb93e09871561ccc3e785f0acb369170e8cc74ddf9226" -+dependencies = [ -+ "socket2", -+ "winapi", -+] -+ -+[[package]] -+name = "num_cpus" -+version = "1.11.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "76dac5ed2a876980778b8b85f75a71b6cbf0db0b1232ee12f826bccb00d09d72" -+dependencies = [ -+ "hermit-abi", -+ "libc", -+] -+ -+[[package]] -+name = "opener" -+version = "0.4.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "13117407ca9d0caf3a0e74f97b490a7e64c0ae3aa90a8b7085544d0c37b6f3ae" -+dependencies = [ -+ "winapi", -+] -+ -+[[package]] -+name = "openssl" -+version = "0.10.26" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3a3cc5799d98e1088141b8e01ff760112bbd9f19d850c124500566ca6901a585" -+dependencies = [ -+ "bitflags", -+ "cfg-if", -+ "foreign-types", -+ "lazy_static", -+ "libc", -+ "openssl-sys", -+] -+ -+[[package]] -+name = "openssl-probe" -+version = "0.1.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" -+ -+[[package]] -+name = "openssl-sys" -+version = "0.9.53" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "465d16ae7fc0e313318f7de5cecf57b2fbe7511fd213978b457e1c96ff46736f" -+dependencies = [ -+ "autocfg", -+ "cc", -+ "libc", -+ "pkg-config", -+ "vcpkg", -+] -+ -+[[package]] -+name = "percent-encoding" -+version = "2.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" -+ -+[[package]] -+name = "pkg-config" -+version = "0.3.17" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677" -+ -+[[package]] -+name = "ppv-lite86" -+version = "0.2.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b" -+ -+[[package]] -+name = "proc-macro2" -+version = "1.0.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9c9e470a8dc4aeae2dee2f335e8f533e2d4b347e1434e5671afc49b054592f27" -+dependencies = [ -+ "unicode-xid", -+] -+ -+[[package]] -+name = "quick-error" -+version = "1.2.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0" -+ -+[[package]] -+name = "quote" -+version = "1.0.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe" -+dependencies = [ -+ "proc-macro2", -+] -+ -+[[package]] -+name = "rand" -+version = "0.7.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3ae1b169243eaf61759b8475a998f0a385e42042370f3a7dbaf35246eacc8412" -+dependencies = [ -+ "getrandom", -+ "libc", -+ "rand_chacha", -+ "rand_core", -+ "rand_hc", -+] -+ -+[[package]] -+name = "rand_chacha" -+version = "0.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853" -+dependencies = [ -+ "c2-chacha", -+ "rand_core", -+] -+ -+[[package]] -+name = "rand_core" -+version = "0.5.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -+dependencies = [ -+ "getrandom", -+] -+ -+[[package]] -+name = "rand_hc" -+version = "0.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -+dependencies = [ -+ "rand_core", -+] -+ -+[[package]] -+name = "redox_syscall" -+version = "0.1.56" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" -+ -+[[package]] -+name = "regex" -+version = "1.3.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dc220bd33bdce8f093101afe22a037b8eb0e5af33592e6a9caafff0d4cb81cbd" -+dependencies = [ -+ "aho-corasick", -+ "memchr", -+ "regex-syntax", -+ "thread_local", -+] -+ -+[[package]] -+name = "regex-syntax" -+version = "0.6.12" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "11a7e20d1cce64ef2fed88b66d347f88bd9babb82845b2b858f3edbf59a4f716" -+ -+[[package]] -+name = "remove_dir_all" -+version = "0.5.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e" -+dependencies = [ -+ "winapi", -+] -+ -+[[package]] -+name = "rustc-demangle" -+version = "0.1.16" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783" -+ -+[[package]] -+name = "rustc-workspace-hack" -+version = "1.0.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fc71d2faa173b74b232dedc235e3ee1696581bb132fc116fa3626d6151a1a8fb" -+ -+[[package]] -+name = "rustc_version" -+version = "0.2.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -+dependencies = [ -+ "semver", -+] -+ -+[[package]] -+name = "rustfix" -+version = "0.4.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7150ac777a2931a53489f5a41eb0937b84e3092a20cd0e73ad436b65b507f607" -+dependencies = [ -+ "failure", -+ "log", -+ "serde", -+ "serde_json", -+] -+ -+[[package]] -+name = "ryu" -+version = "1.0.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bfa8506c1de11c9c4e4c38863ccbe02a305c8188e85a05a784c9e11e1c3910c8" -+ -+[[package]] -+name = "same-file" -+version = "1.0.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "585e8ddcedc187886a30fa705c47985c3fa88d06624095856b36ca0b82ff4421" -+dependencies = [ -+ "winapi-util", -+] -+ -+[[package]] -+name = "schannel" -+version = "0.1.16" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "87f550b06b6cba9c8b8be3ee73f391990116bf527450d2556e9b9ce263b9a021" -+dependencies = [ -+ "lazy_static", -+ "winapi", -+] -+ -+[[package]] -+name = "scopeguard" -+version = "1.0.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d" -+ -+[[package]] -+name = "semver" -+version = "0.9.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" -+dependencies = [ -+ "semver-parser", -+ "serde", -+] -+ -+[[package]] -+name = "semver-parser" -+version = "0.7.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" -+ -+[[package]] -+name = "serde" -+version = "1.0.103" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1217f97ab8e8904b57dd22eb61cde455fa7446a9c1cf43966066da047c1f3702" -+dependencies = [ -+ "serde_derive", -+] -+ -+[[package]] -+name = "serde_derive" -+version = "1.0.103" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a8c6faef9a2e64b0064f48570289b4bf8823b7581f1d6157c1b52152306651d0" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "serde_ignored" -+version = "0.1.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7248fdcbd17d3f2604fc2a02d0ecc844d9a7bf52bf95fc196d9f0a38f6da6a0e" -+dependencies = [ -+ "serde", -+] -+ -+[[package]] -+name = "serde_json" -+version = "1.0.44" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "48c575e0cc52bdd09b47f330f646cf59afc586e9c4e3ccd6fc1f625b8ea1dad7" -+dependencies = [ -+ "itoa", -+ "ryu", -+ "serde", -+] -+ -+[[package]] -+name = "shell-escape" -+version = "0.1.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "170a13e64f2a51b77a45702ba77287f5c6829375b04a69cf2222acd17d0cfab9" -+ -+[[package]] -+name = "sized-chunks" -+version = "0.3.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f01db57d7ee89c8e053245deb77040a6cc8508311f381c88749c33d4b9b78785" -+dependencies = [ -+ "typenum", -+] -+ -+[[package]] -+name = "smallvec" -+version = "1.0.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4ecf3b85f68e8abaa7555aa5abdb1153079387e60b718283d732f03897fcfc86" -+ -+[[package]] -+name = "socket2" -+version = "0.3.11" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e8b74de517221a2cb01a53349cf54182acdc31a074727d3079068448c0676d85" -+dependencies = [ -+ "cfg-if", -+ "libc", -+ "redox_syscall", -+ "winapi", -+] -+ -+[[package]] -+name = "strip-ansi-escapes" -+version = "0.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9d63676e2abafa709460982ddc02a3bb586b6d15a49b75c212e06edd3933acee" -+dependencies = [ -+ "vte", -+] -+ -+[[package]] -+name = "strsim" -+version = "0.8.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" -+ -+[[package]] -+name = "strsim" -+version = "0.9.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c" -+ -+[[package]] -+name = "syn" -+version = "1.0.11" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dff0acdb207ae2fe6d5976617f887eb1e35a2ba52c13c7234c790960cdad9238" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "unicode-xid", -+] -+ -+[[package]] -+name = "synstructure" -+version = "0.12.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "67656ea1dc1b41b1451851562ea232ec2e5a80242139f7e679ceccfb5d61f545" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+ "unicode-xid", -+] -+ -+[[package]] -+name = "tabwriter" -+version = "1.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9128e3a9149e51494cad59712a286e149fcb74e443d2298d69bd6eaa42cc4ebb" -+dependencies = [ -+ "unicode-width", -+] -+ -+[[package]] -+name = "tar" -+version = "0.4.26" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b3196bfbffbba3e57481b6ea32249fbaf590396a52505a2615adbb79d9d826d3" -+dependencies = [ -+ "filetime", -+ "libc", -+ "redox_syscall", -+] -+ -+[[package]] -+name = "tempfile" -+version = "3.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" -+dependencies = [ -+ "cfg-if", -+ "libc", -+ "rand", -+ "redox_syscall", -+ "remove_dir_all", -+ "winapi", -+] -+ -+[[package]] -+name = "termcolor" -+version = "1.0.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "96d6098003bde162e4277c70665bd87c326f5a0c3f3fbfb285787fa482d54e6e" -+dependencies = [ -+ "wincolor", -+] -+ -+[[package]] -+name = "textwrap" -+version = "0.11.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -+dependencies = [ -+ "unicode-width", -+] -+ -+[[package]] -+name = "thread_local" -+version = "0.3.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b" -+dependencies = [ -+ "lazy_static", -+] -+ -+[[package]] -+name = "toml" -+version = "0.5.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "01d1404644c8b12b16bfcffa4322403a91a451584daaaa7c28d3152e6cbc98cf" -+dependencies = [ -+ "serde", -+] -+ -+[[package]] -+name = "typenum" -+version = "1.11.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6d2783fe2d6b8c1101136184eb41be8b1ad379e4657050b8aaff0c79ee7575f9" -+ -+[[package]] -+name = "unicode-bidi" -+version = "0.3.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" -+dependencies = [ -+ "matches", -+] -+ -+[[package]] -+name = "unicode-normalization" -+version = "0.1.11" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b561e267b2326bb4cebfc0ef9e68355c7abe6c6f522aeac2f5bf95d56c59bdcf" -+dependencies = [ -+ "smallvec", -+] -+ -+[[package]] -+name = "unicode-width" -+version = "0.1.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479" -+ -+[[package]] -+name = "unicode-xid" -+version = "0.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" -+ -+[[package]] -+name = "url" -+version = "2.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "75b414f6c464c879d7f9babf951f23bc3743fb7313c081b2e6ca719067ea9d61" -+dependencies = [ -+ "idna", -+ "matches", -+ "percent-encoding", -+] -+ -+[[package]] -+name = "utf8parse" -+version = "0.1.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8772a4ccbb4e89959023bc5b7cb8623a795caa7092d99f3aa9501b9484d4557d" -+ -+[[package]] -+name = "vcpkg" -+version = "0.2.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3fc439f2794e98976c88a2a2dafce96b930fe8010b0a256b3c2199a773933168" -+ -+[[package]] -+name = "vec_map" -+version = "0.8.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a" -+ -+[[package]] -+name = "vte" -+version = "0.3.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4f42f536e22f7fcbb407639765c8fd78707a33109301f834a594758bedd6e8cf" -+dependencies = [ -+ "utf8parse", -+] -+ -+[[package]] -+name = "walkdir" -+version = "2.2.9" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9658c94fa8b940eab2250bd5a457f9c48b748420d71293b165c8cdbe2f55f71e" -+dependencies = [ -+ "same-file", -+ "winapi", -+ "winapi-util", -+] -+ -+[[package]] -+name = "wasi" -+version = "0.7.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b89c3ce4ce14bdc6fb6beaf9ec7928ca331de5df7e5ea278375642a2f478570d" -+ -+[[package]] -+name = "winapi" -+version = "0.3.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6" -+dependencies = [ -+ "winapi-i686-pc-windows-gnu", -+ "winapi-x86_64-pc-windows-gnu", -+] -+ -+[[package]] -+name = "winapi-i686-pc-windows-gnu" -+version = "0.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" -+ -+[[package]] -+name = "winapi-util" -+version = "0.1.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7168bab6e1daee33b4557efd0e95d5ca70a03706d39fa5f3fe7a236f584b03c9" -+dependencies = [ -+ "winapi", -+] -+ -+[[package]] -+name = "winapi-x86_64-pc-windows-gnu" -+version = "0.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -+ -+[[package]] -+name = "wincolor" -+version = "1.0.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "96f5016b18804d24db43cebf3c77269e7569b8954a8464501c216cc5e070eaa9" -+dependencies = [ -+ "winapi", -+ "winapi-util", -+] diff --git a/pkgs/tools/package-management/cargo-outdated/default.nix b/pkgs/tools/package-management/cargo-outdated/default.nix index 667a1a21a2d..7fc7d93f927 100644 --- a/pkgs/tools/package-management/cargo-outdated/default.nix +++ b/pkgs/tools/package-management/cargo-outdated/default.nix @@ -2,20 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "cargo-outdated"; - version = "0.9.1"; + version = "0.9.5"; src = fetchFromGitHub { owner = "kbknapp"; repo = pname; - rev = "v${version}"; - sha256 = "02gsarwm4gjkr9m4sfbjwp37xmqhch8qpyy027bxqkg8iyipxm69"; + # This is the git commit that produced 0.9.5, according to crates.io, but + # the tag is missing in git. See here for details: + # https://github.com/kbknapp/cargo-outdated/issues/206 + rev = "7685da3265749bb7ae2b436a132f51d19b409bff"; + sha256 = "08prksns7d3g7ha601z8p28p36rg44rjl5ph76vg6nriww96zzca"; }; - cargoPatches = [ ./cargo-lock.patch ]; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1ywmrvkwwwwh99l4j8vc4cyk8qjd0jx8hn68yr2h31ya1bzcqbd1"; + cargoSha256 = "0kxfavyd9slpp2kzxhjp47q1pzw9rlmn7yhxnjsg88sxbjxfzv95"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ openssl ] diff --git a/pkgs/tools/package-management/cargo-outdated/update-cargo-lock.sh b/pkgs/tools/package-management/cargo-outdated/update-cargo-lock.sh deleted file mode 100755 index 21ee27c59b7..00000000000 --- a/pkgs/tools/package-management/cargo-outdated/update-cargo-lock.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh - -# This updates cargo-lock.patch for the cargo-outdated version listed in default.nix. - -set -eu -o verbose - -here=$PWD -version=$(cat default.nix | grep '^ version = "' | cut -d '"' -f 2) -checkout=$(mktemp -d) -git clone -b "v$version" --depth=1 https://github.com/kbknapp/cargo-outdated "$checkout" -cd "$checkout" - -cargo generate-lockfile -git add -f Cargo.lock -git diff HEAD -- Cargo.lock > "$here"/cargo-lock.patch - -cd "$here" -rm -rf "$checkout" diff --git a/pkgs/tools/package-management/cargo-release/default.nix b/pkgs/tools/package-management/cargo-release/default.nix index 1e5d1fe3512..9b7d915a349 100644 --- a/pkgs/tools/package-management/cargo-release/default.nix +++ b/pkgs/tools/package-management/cargo-release/default.nix @@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1w9w43i5br94vg5m4idabh67p4ffsx2lmc2g0ak2k961vl46wr0q"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "075fvvd4c8f3kz6i6ny835h6jpa3c1v3miwfwwrdyy49a85lzjyj"; + cargoSha256 = "1x54c6wk5cbnqcy1qpsff8lwqxs0d4qf0v71r7wl0kjp8mrmmhl4"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ stdenv.lib.optional stdenv.isDarwin Security; diff --git a/pkgs/tools/package-management/cargo-update/cargo-lock.patch b/pkgs/tools/package-management/cargo-update/cargo-lock.patch new file mode 100644 index 00000000000..7872a4bf18b --- /dev/null +++ b/pkgs/tools/package-management/cargo-update/cargo-lock.patch @@ -0,0 +1,739 @@ +diff --git a/Cargo.lock b/Cargo.lock +new file mode 100644 +index 000000000..76f256f46 +--- /dev/null ++++ b/Cargo.lock +@@ -0,0 +1,733 @@ ++# This file is automatically @generated by Cargo. ++# It is not intended for manual editing. ++[[package]] ++name = "aho-corasick" ++version = "0.7.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "ansi_term" ++version = "0.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "array_tool" ++version = "1.0.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "arrayref" ++version = "0.3.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "arrayvec" ++version = "0.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "atty" ++version = "0.2.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "autocfg" ++version = "0.1.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "backtrace" ++version = "0.3.40" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "backtrace-sys" ++version = "0.1.32" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "base64" ++version = "0.10.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "bitflags" ++version = "1.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "blake2b_simd" ++version = "0.5.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "constant_time_eq 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "byteorder" ++version = "1.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "cargo-update" ++version = "2.5.0" ++dependencies = [ ++ "array_tool 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "embed-resource 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "git2 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "json 0.11.15 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazysort 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tabwriter 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "toml 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-normalization 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "url 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "cc" ++version = "1.0.50" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "jobserver 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "cfg-if" ++version = "0.1.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "clap" ++version = "2.33.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "vec_map 0.8.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.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "constant_time_eq" ++version = "0.1.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "crossbeam-utils" ++version = "0.6.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "dirs" ++version = "2.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "dirs-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "dirs-sys" ++version = "0.3.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++ "redox_users 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "embed-resource" ++version = "1.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "vswhom 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winreg 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "failure" ++version = "0.1.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)", ++ "failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "failure_derive" ++version = "0.1.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", ++ "synstructure 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "fuchsia-cprng" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "git2" ++version = "0.10.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libgit2-sys 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.8 (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.53 (registry+https://github.com/rust-lang/crates.io-index)", ++ "url 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "hermit-abi" ++version = "0.1.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "idna" ++version = "0.2.0" ++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.9 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "jobserver" ++version = "0.1.18" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "json" ++version = "0.11.15" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "lazy_static" ++version = "1.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "lazysort" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "libc" ++version = "0.2.66" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "libgit2-sys" ++version = "0.9.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libssh2-sys 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)", ++ "openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "libssh2-sys" ++version = "0.2.13" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)", ++ "openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", ++ "vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "libz-sys" ++version = "1.0.25" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", ++ "vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "log" ++version = "0.4.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.10 (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 = "maybe-uninit" ++version = "2.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "memchr" ++version = "2.2.1" ++source = "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.53" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", ++ "vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "percent-encoding" ++version = "2.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "pkg-config" ++version = "0.3.17" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "proc-macro2" ++version = "1.0.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "quote" ++version = "1.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "proc-macro2 1.0.7 (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.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_core" ++version = "0.4.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "rand_os" ++version = "0.1.3" ++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.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.4.2 (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.8 (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.56" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "redox_users" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rust-argon2 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "regex" ++version = "1.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "regex-syntax" ++version = "0.6.12" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "rust-argon2" ++version = "0.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "blake2b_simd 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rustc-demangle" ++version = "0.1.16" ++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)", ++ "serde 1.0.104 (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 = "serde" ++version = "1.0.104" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "serde_derive" ++version = "1.0.104" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "smallvec" ++version = "0.6.13" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "strsim" ++version = "0.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "syn" ++version = "1.0.13" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "synstructure" ++version = "0.12.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "tabwriter" ++version = "1.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "textwrap" ++version = "0.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "unicode-width 0.1.7 (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.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "toml" ++version = "0.5.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "serde 1.0.104 (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.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "unicode-width" ++version = "0.1.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "unicode-xid" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "url" ++version = "2.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "vcpkg" ++version = "0.2.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "vec_map" ++version = "0.8.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "vswhom" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++ "vswhom-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "vswhom-sys" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "winapi" ++version = "0.3.8" ++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-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 = "winreg" ++version = "0.6.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[metadata] ++"checksum aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d" ++"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" ++"checksum array_tool 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8f8cb5d814eb646a863c4f24978cff2880c4be96ad8cde2c0f0678732902e271" ++"checksum arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0d382e583f07208808f6b1249e60848879ba3543f57c32277bf52d69c2f0f0ee" ++"checksum arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8" ++"checksum atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" ++"checksum autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" ++"checksum backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)" = "924c76597f0d9ca25d762c25a4d369d51267536465dc5064bdf0eb073ed477ea" ++"checksum backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)" = "5d6575f128516de27e3ce99689419835fce9643a9b215a14d2b5b685be018491" ++"checksum base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e" ++"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" ++"checksum blake2b_simd 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)" = "d8fb2d74254a3a0b5cac33ac9f8ed0e44aa50378d9dbb2e5d83bd21ed1dc2c8a" ++"checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5" ++"checksum cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)" = "95e28fa049fda1c330bcf9d723be7663a899c4679724b34c81e9f5a326aab8cd" ++"checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" ++"checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" ++"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" ++"checksum constant_time_eq 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "995a44c877f9212528ccc74b21a232f66ad69001e40ede5bcee2ac9ef2657120" ++"checksum crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "04973fa96e96579258a5091af6003abde64af786b860f18622b82e026cca60e6" ++"checksum dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3" ++"checksum dirs-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "afa0b23de8fd801745c471deffa6e12d248f962c9fd4b4c33787b055599bde7b" ++"checksum embed-resource 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bbaba4684ab0af1cbb3ef0b1f540ddc4b57b31940c920ea594efe09ab86e2a6c" ++"checksum failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "f8273f13c977665c5db7eb2b99ae520952fe5ac831ae4cd09d80c4c7042b5ed9" ++"checksum failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0bc225b78e0391e4b8683440bf2e63c2deeeb2ce5189eab46e2b68c6d3725d08" ++"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" ++"checksum git2 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7c1af51ea8a906616af45a4ce78eacf25860f7a13ae7bf8a814693f0f4037a26" ++"checksum hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "eff2656d88f158ce120947499e971d743c05dbcbed62e5bd2f38f1698bbc3772" ++"checksum idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9" ++"checksum jobserver 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)" = "230ae9adf468173aecd4176c7233bddc84a15871a586c5971ace9a55f881c075" ++"checksum json 0.11.15 (registry+https://github.com/rust-lang/crates.io-index)" = "92c245af8786f6ac35f95ca14feca9119e71339aaab41e878e7cdd655c97e9e5" ++"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" ++"checksum lazysort 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d0e22ff43b231e0e2f87d74984e53ebc73b90ae13397e041214fb07efc64168f" ++"checksum libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)" = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558" ++"checksum libgit2-sys 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4870c781f6063efb83150cd22c1ddf6ecf58531419e7570cdcced46970f64a16" ++"checksum libssh2-sys 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "5fcd5a428a31cbbfe059812d74f4b6cd3b9b7426c2bdaec56993c5365da1c328" ++"checksum libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)" = "2eb5e43362e38e2bca2fd5f5134c4d4564a23a5c28e9b95411652021a8675ebe" ++"checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" ++"checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" ++"checksum maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" ++"checksum memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e" ++"checksum openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" ++"checksum openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)" = "465d16ae7fc0e313318f7de5cecf57b2fbe7511fd213978b457e1c96ff46736f" ++"checksum percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" ++"checksum pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677" ++"checksum proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "0319972dcae462681daf4da1adeeaa066e3ebd29c69be96c6abb1259d2ee2bcc" ++"checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe" ++"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" ++"checksum rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" ++"checksum rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" ++"checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" ++"checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" ++"checksum redox_users 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4ecedbca3bf205f8d8f5c2b44d83cd0690e39ee84b951ed649e9f1841132b66d" ++"checksum regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dc220bd33bdce8f093101afe22a037b8eb0e5af33592e6a9caafff0d4cb81cbd" ++"checksum regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "11a7e20d1cce64ef2fed88b66d347f88bd9babb82845b2b858f3edbf59a4f716" ++"checksum rust-argon2 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4ca4eaef519b494d1f2848fc602d18816fed808a981aedf4f1f00ceb7c9d32cf" ++"checksum rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783" ++"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 serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "414115f25f818d7dfccec8ee535d76949ae78584fc4f79a6f45a904bf8ab4449" ++"checksum serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "128f9e303a5a29922045a830221b8f78ec74a5f544944f3d5984f8ec3895ef64" ++"checksum smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "f7b0758c52e15a8b5e3691eae6cc559f08eee9406e548a4477ba4e67770a82b6" ++"checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" ++"checksum syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1e4ff033220a41d1a57d8125eab57bf5263783dfdcc18688b1dacc6ce9651ef8" ++"checksum synstructure 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "67656ea1dc1b41b1451851562ea232ec2e5a80242139f7e679ceccfb5d61f545" ++"checksum tabwriter 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9128e3a9149e51494cad59712a286e149fcb74e443d2298d69bd6eaa42cc4ebb" ++"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" ++"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b" ++"checksum toml 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "01d1404644c8b12b16bfcffa4322403a91a451584daaaa7c28d3152e6cbc98cf" ++"checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" ++"checksum unicode-normalization 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "09c8070a9942f5e7cfccd93f490fdebd230ee3c3c9f107cb25bad5351ef671cf" ++"checksum unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479" ++"checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" ++"checksum url 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "829d4a8476c35c9bf0bbce5a3b23f4106f79728039b726d292bb93bc106787cb" ++"checksum vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3fc439f2794e98976c88a2a2dafce96b930fe8010b0a256b3c2199a773933168" ++"checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a" ++"checksum vswhom 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "be979b7f07507105799e854203b470ff7c78a1639e330a58f183b5fea574608b" ++"checksum vswhom-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc2f5402d3d0e79a069714f7b48e3ecc60be7775a2c049cb839457457a239532" ++"checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6" ++"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 winreg 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b2986deb581c4fe11b621998a5e53361efe6b48a151178d0cd9eeffa4dc6acc9" diff --git a/pkgs/tools/package-management/cargo-update/cargo-update.nix b/pkgs/tools/package-management/cargo-update/cargo-update.nix deleted file mode 100644 index 9b8cf24605a..00000000000 --- a/pkgs/tools/package-management/cargo-update/cargo-update.nix +++ /dev/null @@ -1,1334 +0,0 @@ -# Generated by carnix 0.6.6: carnix -o cargo-update.nix --src ./. Cargo.lock --standalone -{ lib, stdenv, buildRustCrate, fetchgit }: -let kernel = stdenv.hostPlatform.parsed.kernel.name; - abi = stdenv.hostPlatform.parsed.abi.name; - include = includedFiles: src: builtins.filterSource (path: type: - lib.lists.any (f: - let p = toString (src + ("/" + f)); in - (path == p) || (type == "directory" && lib.strings.hasPrefix path p) - ) includedFiles - ) src; - updateFeatures = f: up: functions: builtins.deepSeq f (lib.lists.foldl' (features: fun: fun features) (lib.attrsets.recursiveUpdate f up) functions); - mapFeatures = features: map (fun: fun { features = features; }); - mkFeatures = feat: lib.lists.foldl (features: featureName: - if feat.${featureName} or false then - [ featureName ] ++ features - else - features - ) [] (builtins.attrNames feat); -in -rec { - cargo_update = f: cargo_update_1_5_2 { features = cargo_update_1_5_2_features { cargo_update_1_5_2 = f; }; }; - advapi32_sys_0_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "advapi32-sys"; - version = "0.2.0"; - authors = [ "Peter Atashian <retep998@gmail.com>" ]; - sha256 = "1l6789hkz2whd9gklwz1m379kcvyizaj8nnzj3rn4a5h79yg59v7"; - libName = "advapi32"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - aho_corasick_0_6_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "aho-corasick"; - version = "0.6.4"; - authors = [ "Andrew Gallant <jamslam@gmail.com>" ]; - sha256 = "189v919mp6rzzgjp1khpn4zlq8ls81gh43x1lmc8kbkagdlpq888"; - libName = "aho_corasick"; - crateBin = [ { name = "aho-corasick-dot"; } ]; - inherit dependencies buildDependencies features; - }; - ansi_term_0_11_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "ansi_term"; - version = "0.11.0"; - authors = [ "ogham@bsago.me" "Ryan Scheel (Havvy) <ryan.havvy@gmail.com>" "Josh Triplett <josh@joshtriplett.org>" ]; - sha256 = "08fk0p2xvkqpmz3zlrwnf6l8sj2vngw464rvzspzp31sbgxbwm4v"; - inherit dependencies buildDependencies features; - }; - array_tool_1_0_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "array_tool"; - version = "1.0.3"; - authors = [ "Daniel P. Clark <6ftdan@gmail.com>" ]; - sha256 = "0igg0zvhcvjc15vgg6vjxjfifn2w4scjq9c8i1b2abv1sy2cgc86"; - inherit dependencies buildDependencies features; - }; - atty_0_2_10_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "atty"; - version = "0.2.10"; - authors = [ "softprops <d.tangren@gmail.com>" ]; - sha256 = "1h26lssj8rwaz0xhwwm5a645r49yly211amfmd243m3m0jl49i2c"; - inherit dependencies buildDependencies features; - }; - bitflags_0_9_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "bitflags"; - version = "0.9.1"; - authors = [ "The Rust Project Developers" ]; - sha256 = "18h073l5jd88rx4qdr95fjddr9rk79pb1aqnshzdnw16cfmb9rws"; - inherit dependencies buildDependencies features; - }; - bitflags_1_0_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "bitflags"; - version = "1.0.3"; - authors = [ "The Rust Project Developers" ]; - sha256 = "162p4w4h1ad76awq6b5yivmls3d50m9cl27d8g588lsps6g8s5rw"; - inherit dependencies buildDependencies features; - }; - cargo_update_1_5_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "cargo-update"; - version = "1.5.2"; - authors = [ "nabijaczleweli <nabijaczleweli@gmail.com>" "Yann Simon <yann.simon.fr@gmail.com>" "ven <vendethiel@hotmail.fr>" "Cat Plus Plus <piotrlegnica@piotrl.pl>" "Liigo <liigo@qq.com>" "azyobuzin <azyobuzin@users.sourceforge.jp>" "Tatsuyuki Ishi <ishitatsuyuki@gmail.com>" "Tom Prince <tom.prince@twistedmatrix.com>" "Mateusz MikuÅ‚a <mati865@gmail.com>" "sinkuu <sinkuupump@gmail.com>" "Alex Burka <aburka@seas.upenn.edu>" "Matthias Krüger <matthias.krueger@famsik.de>" "Daniel Holbert <dholbert@cs.stanford.edu>" ]; - src = ./.; - crateBin = [ { name = "cargo-install-update"; path = "src/main.rs"; } { name = "cargo-install-update-config"; path = "src/main-config.rs"; } ]; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - cc_1_0_15_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "cc"; - version = "1.0.15"; - authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; - sha256 = "1zmcv4zf888byhay2qakqlc9b8snhy5ccfs35zb6flywmlj8f2c0"; - inherit dependencies buildDependencies features; - }; - clap_2_31_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "clap"; - version = "2.31.2"; - authors = [ "Kevin K. <kbknapp@gmail.com>" ]; - sha256 = "0r24ziw85a8y1sf2l21y4mvv5qan3rjafcshpyfsjfadqfxsij72"; - inherit dependencies buildDependencies features; - }; - cmake_0_1_31_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "cmake"; - version = "0.1.31"; - authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; - sha256 = "18j5fci486s7v5yjvv2ik3nsp4lk0fn0b8js5k6c4dviml476vz2"; - inherit dependencies buildDependencies features; - }; - curl_sys_0_4_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "curl-sys"; - version = "0.4.5"; - authors = [ "Carl Lerche <me@carllerche.com>" "Alex Crichton <alex@alexcrichton.com>" ]; - sha256 = "149nswzwzr1lx0ki8awbppm7kf8nb268pc3zhzmvbs5fliq075qw"; - libPath = "lib.rs"; - libName = "curl_sys"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - embed_resource_1_1_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "embed-resource"; - version = "1.1.4"; - authors = [ "nabijaczleweli <nabijaczleweli@gmail.com>" "Cat Plus Plus <piotrlegnica@piotrl.pl>" "Liigo <liigo@qq.com>" "azyobuzin <azyobuzin@users.sourceforge.jp>" "Peter Atashian <retep998@gmail.com>" ]; - sha256 = "1n07qys5904mkcididfgh1m6g8nfgl93pdpygaqn4dkhm5cxssfd"; - inherit dependencies buildDependencies features; - }; - fuchsia_zircon_0_3_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "fuchsia-zircon"; - version = "0.3.3"; - authors = [ "Raph Levien <raph@google.com>" ]; - sha256 = "0jrf4shb1699r4la8z358vri8318w4mdi6qzfqy30p2ymjlca4gk"; - inherit dependencies buildDependencies features; - }; - fuchsia_zircon_sys_0_3_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "fuchsia-zircon-sys"; - version = "0.3.3"; - authors = [ "Raph Levien <raph@google.com>" ]; - sha256 = "08jp1zxrm9jbrr6l26bjal4dbm8bxfy57ickdgibsqxr1n9j3hf5"; - inherit dependencies buildDependencies features; - }; - git2_0_6_11_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "git2"; - version = "0.6.11"; - authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; - sha256 = "0jznfnk2n7nk250cj52k3mxjqgan7gwyrh3h7dkhqqs2zfx4ylvd"; - inherit dependencies buildDependencies features; - }; - idna_0_1_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "idna"; - version = "0.1.4"; - authors = [ "The rust-url developers" ]; - sha256 = "15j44qgjx1skwg9i7f4cm36ni4n99b1ayx23yxx7axxcw8vjf336"; - inherit dependencies buildDependencies features; - }; - json_0_11_13_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "json"; - version = "0.11.13"; - authors = [ "Maciej Hirsz <maciej.hirsz@gmail.com>" ]; - sha256 = "03227jaj6rjlfigsk4rmc0b83b1djlh42grfjaxk0d2xvgdb893i"; - inherit dependencies buildDependencies features; - }; - kernel32_sys_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "kernel32-sys"; - version = "0.2.2"; - authors = [ "Peter Atashian <retep998@gmail.com>" ]; - sha256 = "1lrw1hbinyvr6cp28g60z97w32w8vsk6pahk64pmrv2fmby8srfj"; - libName = "kernel32"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - lazy_static_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "lazy_static"; - version = "1.0.0"; - authors = [ "Marvin Löbel <loebel.marvin@gmail.com>" ]; - sha256 = "0wfvqyr2nvx2mbsrscg5y7gfa9skhb8p72ayanl8vl49pw24v4fh"; - inherit dependencies buildDependencies features; - }; - lazysort_0_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "lazysort"; - version = "0.2.0"; - authors = [ "Ben Ashford" ]; - sha256 = "0dv9bryg10hj8cycmdxpcc9y14i958yjr2hm4c3i9168q0y7njdz"; - inherit dependencies buildDependencies features; - }; - libc_0_2_40_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "libc"; - version = "0.2.40"; - authors = [ "The Rust Project Developers" ]; - sha256 = "1xfc39237ldzgr8x8wcflgdr8zssi3wif7g2zxc02d94gzkjsw83"; - inherit dependencies buildDependencies features; - }; - libgit2_sys_0_6_19_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "libgit2-sys"; - version = "0.6.19"; - authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; - sha256 = "13044s468adsx3sq4qvr4vnbr6nr5hq23lls8wn0a415jdl3qbcg"; - libPath = "lib.rs"; - libName = "libgit2_sys"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - libssh2_sys_0_2_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "libssh2-sys"; - version = "0.2.7"; - authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; - sha256 = "1mr683x23l7f0mmc10vd5fnarfqpd7wqxs3rxyhq2igrh3fn0m2v"; - libPath = "lib.rs"; - libName = "libssh2_sys"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - libz_sys_1_0_18_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "libz-sys"; - version = "1.0.18"; - authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; - sha256 = "0lr0rvmmfbfa4g7mhi0l93i8jq86pfcssdv4d40kzfy45ajdcgim"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - matches_0_1_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "matches"; - version = "0.1.6"; - authors = [ "Simon Sapin <simon.sapin@exyr.org>" ]; - sha256 = "1zlrqlbvzxdil8z8ial2ihvxjwvlvg3g8dr0lcdpsjclkclasjan"; - libPath = "lib.rs"; - inherit dependencies buildDependencies features; - }; - memchr_2_0_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "memchr"; - version = "2.0.1"; - authors = [ "Andrew Gallant <jamslam@gmail.com>" "bluss" ]; - sha256 = "0ls2y47rjwapjdax6bp974gdp06ggm1v8d1h69wyydmh1nhgm5gr"; - inherit dependencies buildDependencies features; - }; - openssl_probe_0_1_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "openssl-probe"; - version = "0.1.2"; - authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; - sha256 = "1a89fznx26vvaxyrxdvgf6iwai5xvs6xjvpjin68fgvrslv6n15a"; - inherit dependencies buildDependencies features; - }; - openssl_sys_0_9_30_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "openssl-sys"; - version = "0.9.30"; - authors = [ "Alex Crichton <alex@alexcrichton.com>" "Steven Fackler <sfackler@gmail.com>" ]; - sha256 = "1p5y3md4crbmg0lcfkdl8pp3kf9k82vghjy28x7ix5mji3j2p87a"; - inherit dependencies buildDependencies features; - }; - percent_encoding_1_0_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "percent-encoding"; - version = "1.0.1"; - authors = [ "The rust-url developers" ]; - sha256 = "04ahrp7aw4ip7fmadb0bknybmkfav0kk0gw4ps3ydq5w6hr0ib5i"; - libPath = "lib.rs"; - inherit dependencies buildDependencies features; - }; - pkg_config_0_3_11_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "pkg-config"; - version = "0.3.11"; - authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; - sha256 = "177kbs465skvzmb2d9bh7aa5lqm0npfig12awcbd34c6k6nlyr5h"; - inherit dependencies buildDependencies features; - }; - proc_macro2_0_3_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "proc-macro2"; - version = "0.3.8"; - authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; - sha256 = "0ixnavxcd6sk1861hjgnfxly7qgq4ch1iplsx0nclvjjkwg39qdc"; - inherit dependencies buildDependencies features; - }; - quote_0_5_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "quote"; - version = "0.5.2"; - authors = [ "David Tolnay <dtolnay@gmail.com>" ]; - sha256 = "062cnp12j09x0z0nj4j5pfh26h35zlrks07asxgqhfhcym1ba595"; - inherit dependencies buildDependencies features; - }; - rand_0_3_22_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "rand"; - version = "0.3.22"; - authors = [ "The Rust Project Developers" ]; - sha256 = "0wrj12acx7l4hr7ag3nz8b50yhp8ancyq988bzmnnsxln67rsys0"; - inherit dependencies buildDependencies features; - }; - rand_0_4_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "rand"; - version = "0.4.2"; - authors = [ "The Rust Project Developers" ]; - sha256 = "0h8pkg23wb67i8904sm76iyr1jlmhklb85vbpz9c9191a24xzkfm"; - inherit dependencies buildDependencies features; - }; - redox_syscall_0_1_37_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "redox_syscall"; - version = "0.1.37"; - authors = [ "Jeremy Soller <jackpot51@gmail.com>" ]; - sha256 = "0qa0jl9cr3qp80an8vshp2mcn8rzvwiavs1398hq1vsjw7pc3h2v"; - libName = "syscall"; - inherit dependencies buildDependencies features; - }; - redox_termios_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "redox_termios"; - version = "0.1.1"; - authors = [ "Jeremy Soller <jackpot51@gmail.com>" ]; - sha256 = "04s6yyzjca552hdaqlvqhp3vw0zqbc304md5czyd3axh56iry8wh"; - libPath = "src/lib.rs"; - inherit dependencies buildDependencies features; - }; - regex_0_2_11_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "regex"; - version = "0.2.11"; - authors = [ "The Rust Project Developers" ]; - sha256 = "0r50cymxdqp0fv1dxd22mjr6y32q450nwacd279p9s7lh0cafijj"; - inherit dependencies buildDependencies features; - }; - regex_syntax_0_5_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "regex-syntax"; - version = "0.5.6"; - authors = [ "The Rust Project Developers" ]; - sha256 = "10vf3r34bgjnbrnqd5aszn35bjvm8insw498l1vjy8zx5yms3427"; - inherit dependencies buildDependencies features; - }; - semver_0_9_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "semver"; - version = "0.9.0"; - authors = [ "Steve Klabnik <steve@steveklabnik.com>" "The Rust Project Developers" ]; - sha256 = "0azak2lb2wc36s3x15az886kck7rpnksrw14lalm157rg9sc9z63"; - inherit dependencies buildDependencies features; - }; - semver_parser_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "semver-parser"; - version = "0.7.0"; - authors = [ "Steve Klabnik <steve@steveklabnik.com>" ]; - sha256 = "1da66c8413yakx0y15k8c055yna5lyb6fr0fw9318kdwkrk5k12h"; - inherit dependencies buildDependencies features; - }; - serde_1_0_55_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "serde"; - version = "1.0.55"; - authors = [ "Erick Tryzelaar <erick.tryzelaar@gmail.com>" "David Tolnay <dtolnay@gmail.com>" ]; - sha256 = "1vpslfs3j8xbl3srmzppa34h0908q0sj4hyrmlrpklhldii5vbqh"; - inherit dependencies buildDependencies features; - }; - serde_derive_1_0_55_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "serde_derive"; - version = "1.0.55"; - authors = [ "Erick Tryzelaar <erick.tryzelaar@gmail.com>" "David Tolnay <dtolnay@gmail.com>" ]; - sha256 = "1ggcidzgi51l3lsdf8gg46ivn61py8rnrf6garpcxwmdbfcc8lgk"; - procMacro = true; - inherit dependencies buildDependencies features; - }; - strsim_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "strsim"; - version = "0.7.0"; - authors = [ "Danny Guo <dannyguo91@gmail.com>" ]; - sha256 = "0fy0k5f2705z73mb3x9459bpcvrx4ky8jpr4zikcbiwan4bnm0iv"; - inherit dependencies buildDependencies features; - }; - syn_0_13_10_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "syn"; - version = "0.13.10"; - authors = [ "David Tolnay <dtolnay@gmail.com>" ]; - sha256 = "0dbvdxlpvx7f8iw5cbv88vbyszp72df8y8zhl36gj73g1xwdqfhx"; - inherit dependencies buildDependencies features; - }; - tabwriter_1_0_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "tabwriter"; - version = "1.0.4"; - authors = [ "Andrew Gallant <jamslam@gmail.com>" ]; - sha256 = "02yk7db101lqn24wnm15yy8xb095kv9bnkdvyj7vqhx40vixyibd"; - inherit dependencies buildDependencies features; - }; - termion_1_5_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "termion"; - version = "1.5.1"; - authors = [ "ticki <Ticki@users.noreply.github.com>" "gycos <alexandre.bury@gmail.com>" "IGI-111 <igi-111@protonmail.com>" ]; - sha256 = "02gq4vd8iws1f3gjrgrgpajsk2bk43nds5acbbb4s8dvrdvr8nf1"; - inherit dependencies buildDependencies features; - }; - textwrap_0_9_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "textwrap"; - version = "0.9.0"; - authors = [ "Martin Geisler <martin@geisler.net>" ]; - sha256 = "18jg79ndjlwndz01mlbh82kkr2arqm658yn5kwp65l5n1hz8w4yb"; - inherit dependencies buildDependencies features; - }; - thread_local_0_3_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "thread_local"; - version = "0.3.5"; - authors = [ "Amanieu d'Antras <amanieu@gmail.com>" ]; - sha256 = "0mkp0sp91aqsk7brgygai4igv751r1754rsxn37mig3ag5rx8np6"; - inherit dependencies buildDependencies features; - }; - toml_0_4_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "toml"; - version = "0.4.6"; - authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; - sha256 = "0rfl7lyb5f67spk69s604nw87f97g7fvv36hj9v88qlr2bwyrn8v"; - inherit dependencies buildDependencies features; - }; - ucd_util_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "ucd-util"; - version = "0.1.1"; - authors = [ "Andrew Gallant <jamslam@gmail.com>" ]; - sha256 = "02a8h3siipx52b832xc8m8rwasj6nx9jpiwfldw8hp6k205hgkn0"; - inherit dependencies buildDependencies features; - }; - unicode_bidi_0_3_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "unicode-bidi"; - version = "0.3.4"; - authors = [ "The Servo Project Developers" ]; - sha256 = "0lcd6jasrf8p9p0q20qyf10c6xhvw40m2c4rr105hbk6zy26nj1q"; - libName = "unicode_bidi"; - inherit dependencies buildDependencies features; - }; - unicode_normalization_0_1_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "unicode-normalization"; - version = "0.1.7"; - authors = [ "kwantam <kwantam@gmail.com>" ]; - sha256 = "1da2hv800pd0wilmn4idwpgv5p510hjxizjcfv6xzb40xcsjd8gs"; - inherit dependencies buildDependencies features; - }; - unicode_width_0_1_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "unicode-width"; - version = "0.1.4"; - authors = [ "kwantam <kwantam@gmail.com>" ]; - sha256 = "1rp7a04icn9y5c0lm74nrd4py0rdl0af8bhdwq7g478n1xifpifl"; - inherit dependencies buildDependencies features; - }; - unicode_xid_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "unicode-xid"; - version = "0.1.0"; - authors = [ "erick.tryzelaar <erick.tryzelaar@gmail.com>" "kwantam <kwantam@gmail.com>" ]; - sha256 = "05wdmwlfzxhq3nhsxn6wx4q8dhxzzfb9szsz6wiw092m1rjj01zj"; - inherit dependencies buildDependencies features; - }; - unreachable_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "unreachable"; - version = "1.0.0"; - authors = [ "Jonathan Reem <jonathan.reem@gmail.com>" ]; - sha256 = "1am8czbk5wwr25gbp2zr007744fxjshhdqjz9liz7wl4pnv3whcf"; - inherit dependencies buildDependencies features; - }; - url_1_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "url"; - version = "1.7.0"; - authors = [ "The rust-url developers" ]; - sha256 = "0333ynhkp47hna88aamz1zpk4lxyzx4ab9n7yhc75g14w27cv8jj"; - inherit dependencies buildDependencies features; - }; - utf8_ranges_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "utf8-ranges"; - version = "1.0.0"; - authors = [ "Andrew Gallant <jamslam@gmail.com>" ]; - sha256 = "0rzmqprwjv9yp1n0qqgahgm24872x6c0xddfym5pfndy7a36vkn0"; - inherit dependencies buildDependencies features; - }; - vcpkg_0_2_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "vcpkg"; - version = "0.2.3"; - authors = [ "Jim McGrath <jimmc2@gmail.com>" ]; - sha256 = "0achi8sfy0wm4q04gj7nwpq9xfx8ynk6vv4r12a3ijg26hispq0c"; - inherit dependencies buildDependencies features; - }; - vec_map_0_8_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "vec_map"; - version = "0.8.1"; - authors = [ "Alex Crichton <alex@alexcrichton.com>" "Jorge Aparicio <japaricious@gmail.com>" "Alexis Beingessner <a.beingessner@gmail.com>" "Brian Anderson <>" "tbu- <>" "Manish Goregaokar <>" "Aaron Turon <aturon@mozilla.com>" "Adolfo OchagavÃa <>" "Niko Matsakis <>" "Steven Fackler <>" "Chase Southwood <csouth3@illinois.edu>" "Eduard Burtescu <>" "Florian Wilkens <>" "Félix Raimundo <>" "Tibor Benke <>" "Markus Siemens <markus@m-siemens.de>" "Josh Branchaud <jbranchaud@gmail.com>" "Huon Wilson <dbau.pp@gmail.com>" "Corey Farwell <coref@rwell.org>" "Aaron Liblong <>" "Nick Cameron <nrc@ncameron.org>" "Patrick Walton <pcwalton@mimiga.net>" "Felix S Klock II <>" "Andrew Paseltiner <apaseltiner@gmail.com>" "Sean McArthur <sean.monstar@gmail.com>" "Vadim Petrochenkov <>" ]; - sha256 = "1jj2nrg8h3l53d43rwkpkikq5a5x15ms4rf1rw92hp5lrqhi8mpi"; - inherit dependencies buildDependencies features; - }; - void_1_0_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "void"; - version = "1.0.2"; - authors = [ "Jonathan Reem <jonathan.reem@gmail.com>" ]; - sha256 = "0h1dm0dx8dhf56a83k68mijyxigqhizpskwxfdrs1drwv2cdclv3"; - inherit dependencies buildDependencies features; - }; - winapi_0_2_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "winapi"; - version = "0.2.8"; - authors = [ "Peter Atashian <retep998@gmail.com>" ]; - sha256 = "0a45b58ywf12vb7gvj6h3j264nydynmzyqz8d8rqxsj6icqv82as"; - inherit dependencies buildDependencies features; - }; - winapi_0_3_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "winapi"; - version = "0.3.4"; - authors = [ "Peter Atashian <retep998@gmail.com>" ]; - sha256 = "1qbrf5dcnd8j36cawby5d9r5vx07r0l4ryf672pfncnp8895k9lx"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - winapi_build_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "winapi-build"; - version = "0.1.1"; - authors = [ "Peter Atashian <retep998@gmail.com>" ]; - sha256 = "1lxlpi87rkhxcwp2ykf1ldw3p108hwm24nywf3jfrvmff4rjhqga"; - libName = "build"; - inherit dependencies buildDependencies features; - }; - winapi_i686_pc_windows_gnu_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "winapi-i686-pc-windows-gnu"; - version = "0.4.0"; - authors = [ "Peter Atashian <retep998@gmail.com>" ]; - sha256 = "05ihkij18r4gamjpxj4gra24514can762imjzlmak5wlzidplzrp"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - winapi_x86_64_pc_windows_gnu_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "winapi-x86_64-pc-windows-gnu"; - version = "0.4.0"; - authors = [ "Peter Atashian <retep998@gmail.com>" ]; - sha256 = "0n1ylmlsb8yg1v583i4xy0qmqg42275flvbc51hdqjjfjcl9vlbj"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - winreg_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "winreg"; - version = "0.4.0"; - authors = [ "Igor Shaula <gentoo90@gmail.com>" ]; - sha256 = "1zhk2a6qwyfpvwjd929qs0y6zzxl7g90pnz59qhazfg72m36iwda"; - inherit dependencies buildDependencies features; - }; - advapi32_sys_0_2_0 = { features?(advapi32_sys_0_2_0_features {}) }: advapi32_sys_0_2_0_ { - dependencies = mapFeatures features ([ winapi_0_2_8 ]); - buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]); - }; - advapi32_sys_0_2_0_features = f: updateFeatures f ({ - advapi32_sys_0_2_0.default = (f.advapi32_sys_0_2_0.default or true); - winapi_0_2_8.default = true; - winapi_build_0_1_1.default = true; - }) [ winapi_0_2_8_features winapi_build_0_1_1_features ]; - aho_corasick_0_6_4 = { features?(aho_corasick_0_6_4_features {}) }: aho_corasick_0_6_4_ { - dependencies = mapFeatures features ([ memchr_2_0_1 ]); - }; - aho_corasick_0_6_4_features = f: updateFeatures f ({ - aho_corasick_0_6_4.default = (f.aho_corasick_0_6_4.default or true); - memchr_2_0_1.default = true; - }) [ memchr_2_0_1_features ]; - ansi_term_0_11_0 = { features?(ansi_term_0_11_0_features {}) }: ansi_term_0_11_0_ { - dependencies = (if kernel == "windows" then mapFeatures features ([ winapi_0_3_4 ]) else []); - }; - ansi_term_0_11_0_features = f: updateFeatures f ({ - ansi_term_0_11_0.default = (f.ansi_term_0_11_0.default or true); - winapi_0_3_4.consoleapi = true; - winapi_0_3_4.default = true; - winapi_0_3_4.errhandlingapi = true; - winapi_0_3_4.processenv = true; - }) [ winapi_0_3_4_features ]; - array_tool_1_0_3 = { features?(array_tool_1_0_3_features {}) }: array_tool_1_0_3_ {}; - array_tool_1_0_3_features = f: updateFeatures f ({ - array_tool_1_0_3.default = (f.array_tool_1_0_3.default or true); - }) []; - atty_0_2_10 = { features?(atty_0_2_10_features {}) }: atty_0_2_10_ { - dependencies = (if kernel == "redox" then mapFeatures features ([ termion_1_5_1 ]) else []) - ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_40 ]) else []) - ++ (if kernel == "windows" then mapFeatures features ([ winapi_0_3_4 ]) else []); - }; - atty_0_2_10_features = f: updateFeatures f ({ - atty_0_2_10.default = (f.atty_0_2_10.default or true); - libc_0_2_40.default = (f.libc_0_2_40.default or false); - termion_1_5_1.default = true; - winapi_0_3_4.consoleapi = true; - winapi_0_3_4.default = true; - winapi_0_3_4.minwinbase = true; - winapi_0_3_4.minwindef = true; - winapi_0_3_4.processenv = true; - winapi_0_3_4.winbase = true; - }) [ termion_1_5_1_features libc_0_2_40_features winapi_0_3_4_features ]; - bitflags_0_9_1 = { features?(bitflags_0_9_1_features {}) }: bitflags_0_9_1_ { - features = mkFeatures (features.bitflags_0_9_1 or {}); - }; - bitflags_0_9_1_features = f: updateFeatures f (rec { - bitflags_0_9_1.default = (f.bitflags_0_9_1.default or true); - bitflags_0_9_1.example_generated = - (f.bitflags_0_9_1.example_generated or false) || - (f.bitflags_0_9_1.default or false) || - (bitflags_0_9_1.default or false); - }) []; - bitflags_1_0_3 = { features?(bitflags_1_0_3_features {}) }: bitflags_1_0_3_ { - features = mkFeatures (features.bitflags_1_0_3 or {}); - }; - bitflags_1_0_3_features = f: updateFeatures f ({ - bitflags_1_0_3.default = (f.bitflags_1_0_3.default or true); - }) []; - cargo_update_1_5_2 = { features?(cargo_update_1_5_2_features {}) }: cargo_update_1_5_2_ { - dependencies = mapFeatures features ([ array_tool_1_0_3 clap_2_31_2 git2_0_6_11 json_0_11_13 lazy_static_1_0_0 lazysort_0_2_0 regex_0_2_11 semver_0_9_0 serde_1_0_55 serde_derive_1_0_55 tabwriter_1_0_4 toml_0_4_6 url_1_7_0 ]); - buildDependencies = mapFeatures features ([ embed_resource_1_1_4 ]); - }; - cargo_update_1_5_2_features = f: updateFeatures f ({ - array_tool_1_0_3.default = true; - cargo_update_1_5_2.default = (f.cargo_update_1_5_2.default or true); - clap_2_31_2.default = true; - embed_resource_1_1_4.default = true; - git2_0_6_11.default = true; - json_0_11_13.default = true; - lazy_static_1_0_0.default = true; - lazysort_0_2_0.default = true; - regex_0_2_11.default = true; - semver_0_9_0.default = true; - semver_0_9_0.serde = true; - serde_1_0_55.default = true; - serde_derive_1_0_55.default = true; - tabwriter_1_0_4.default = true; - toml_0_4_6.default = true; - url_1_7_0.default = true; - }) [ array_tool_1_0_3_features clap_2_31_2_features git2_0_6_11_features json_0_11_13_features lazy_static_1_0_0_features lazysort_0_2_0_features regex_0_2_11_features semver_0_9_0_features serde_1_0_55_features serde_derive_1_0_55_features tabwriter_1_0_4_features toml_0_4_6_features url_1_7_0_features embed_resource_1_1_4_features ]; - cc_1_0_15 = { features?(cc_1_0_15_features {}) }: cc_1_0_15_ { - dependencies = mapFeatures features ([]); - features = mkFeatures (features.cc_1_0_15 or {}); - }; - cc_1_0_15_features = f: updateFeatures f (rec { - cc_1_0_15.default = (f.cc_1_0_15.default or true); - cc_1_0_15.rayon = - (f.cc_1_0_15.rayon or false) || - (f.cc_1_0_15.parallel or false) || - (cc_1_0_15.parallel or false); - }) []; - clap_2_31_2 = { features?(clap_2_31_2_features {}) }: clap_2_31_2_ { - dependencies = mapFeatures features ([ bitflags_1_0_3 textwrap_0_9_0 unicode_width_0_1_4 ] - ++ (if features.clap_2_31_2.atty or false then [ atty_0_2_10 ] else []) - ++ (if features.clap_2_31_2.strsim or false then [ strsim_0_7_0 ] else []) - ++ (if features.clap_2_31_2.vec_map or false then [ vec_map_0_8_1 ] else [])) - ++ (if !(kernel == "windows") then mapFeatures features ([ ] - ++ (if features.clap_2_31_2.ansi_term or false then [ ansi_term_0_11_0 ] else [])) else []); - features = mkFeatures (features.clap_2_31_2 or {}); - }; - clap_2_31_2_features = f: updateFeatures f (rec { - ansi_term_0_11_0.default = true; - atty_0_2_10.default = true; - bitflags_1_0_3.default = true; - clap_2_31_2.ansi_term = - (f.clap_2_31_2.ansi_term or false) || - (f.clap_2_31_2.color or false) || - (clap_2_31_2.color or false); - clap_2_31_2.atty = - (f.clap_2_31_2.atty or false) || - (f.clap_2_31_2.color or false) || - (clap_2_31_2.color or false); - clap_2_31_2.clippy = - (f.clap_2_31_2.clippy or false) || - (f.clap_2_31_2.lints or false) || - (clap_2_31_2.lints or false); - clap_2_31_2.color = - (f.clap_2_31_2.color or false) || - (f.clap_2_31_2.default or false) || - (clap_2_31_2.default or false); - clap_2_31_2.default = (f.clap_2_31_2.default or true); - clap_2_31_2.strsim = - (f.clap_2_31_2.strsim or false) || - (f.clap_2_31_2.suggestions or false) || - (clap_2_31_2.suggestions or false); - clap_2_31_2.suggestions = - (f.clap_2_31_2.suggestions or false) || - (f.clap_2_31_2.default or false) || - (clap_2_31_2.default or false); - clap_2_31_2.term_size = - (f.clap_2_31_2.term_size or false) || - (f.clap_2_31_2.wrap_help or false) || - (clap_2_31_2.wrap_help or false); - clap_2_31_2.vec_map = - (f.clap_2_31_2.vec_map or false) || - (f.clap_2_31_2.default or false) || - (clap_2_31_2.default or false); - clap_2_31_2.yaml = - (f.clap_2_31_2.yaml or false) || - (f.clap_2_31_2.doc or false) || - (clap_2_31_2.doc or false); - clap_2_31_2.yaml-rust = - (f.clap_2_31_2.yaml-rust or false) || - (f.clap_2_31_2.yaml or false) || - (clap_2_31_2.yaml or false); - strsim_0_7_0.default = true; - textwrap_0_9_0.default = true; - textwrap_0_9_0.term_size = - (f.textwrap_0_9_0.term_size or false) || - (clap_2_31_2.wrap_help or false) || - (f.clap_2_31_2.wrap_help or false); - unicode_width_0_1_4.default = true; - vec_map_0_8_1.default = true; - }) [ atty_0_2_10_features bitflags_1_0_3_features strsim_0_7_0_features textwrap_0_9_0_features unicode_width_0_1_4_features vec_map_0_8_1_features ansi_term_0_11_0_features ]; - cmake_0_1_31 = { features?(cmake_0_1_31_features {}) }: cmake_0_1_31_ { - dependencies = mapFeatures features ([ cc_1_0_15 ]); - }; - cmake_0_1_31_features = f: updateFeatures f ({ - cc_1_0_15.default = true; - cmake_0_1_31.default = (f.cmake_0_1_31.default or true); - }) [ cc_1_0_15_features ]; - curl_sys_0_4_5 = { features?(curl_sys_0_4_5_features {}) }: curl_sys_0_4_5_ { - dependencies = mapFeatures features ([ libc_0_2_40 libz_sys_1_0_18 ]) - ++ (if (kernel == "linux" || kernel == "darwin") && !(kernel == "darwin") then mapFeatures features ([ openssl_sys_0_9_30 ]) else []) - ++ (if abi == "msvc" then mapFeatures features ([]) else []) - ++ (if kernel == "windows" then mapFeatures features ([ winapi_0_3_4 ]) else []); - buildDependencies = mapFeatures features ([ cc_1_0_15 pkg_config_0_3_11 ]); - }; - curl_sys_0_4_5_features = f: updateFeatures f ({ - cc_1_0_15.default = true; - curl_sys_0_4_5.default = (f.curl_sys_0_4_5.default or true); - libc_0_2_40.default = true; - libz_sys_1_0_18.default = true; - openssl_sys_0_9_30.default = true; - pkg_config_0_3_11.default = true; - winapi_0_3_4.default = true; - winapi_0_3_4.winsock2 = true; - winapi_0_3_4.ws2def = true; - }) [ libc_0_2_40_features libz_sys_1_0_18_features cc_1_0_15_features pkg_config_0_3_11_features openssl_sys_0_9_30_features winapi_0_3_4_features ]; - embed_resource_1_1_4 = { features?(embed_resource_1_1_4_features {}) }: embed_resource_1_1_4_ { - dependencies = (if kernel == "windows" && abi == "msvc" then mapFeatures features ([ winreg_0_4_0 ]) else []); - }; - embed_resource_1_1_4_features = f: updateFeatures f ({ - embed_resource_1_1_4.default = (f.embed_resource_1_1_4.default or true); - winreg_0_4_0.default = (f.winreg_0_4_0.default or false); - }) [ winreg_0_4_0_features ]; - fuchsia_zircon_0_3_3 = { features?(fuchsia_zircon_0_3_3_features {}) }: fuchsia_zircon_0_3_3_ { - dependencies = mapFeatures features ([ bitflags_1_0_3 fuchsia_zircon_sys_0_3_3 ]); - }; - fuchsia_zircon_0_3_3_features = f: updateFeatures f ({ - bitflags_1_0_3.default = true; - fuchsia_zircon_0_3_3.default = (f.fuchsia_zircon_0_3_3.default or true); - fuchsia_zircon_sys_0_3_3.default = true; - }) [ bitflags_1_0_3_features fuchsia_zircon_sys_0_3_3_features ]; - fuchsia_zircon_sys_0_3_3 = { features?(fuchsia_zircon_sys_0_3_3_features {}) }: fuchsia_zircon_sys_0_3_3_ {}; - fuchsia_zircon_sys_0_3_3_features = f: updateFeatures f ({ - fuchsia_zircon_sys_0_3_3.default = (f.fuchsia_zircon_sys_0_3_3.default or true); - }) []; - git2_0_6_11 = { features?(git2_0_6_11_features {}) }: git2_0_6_11_ { - dependencies = mapFeatures features ([ bitflags_0_9_1 libc_0_2_40 libgit2_sys_0_6_19 url_1_7_0 ]) - ++ (if (kernel == "linux" || kernel == "darwin") && !(kernel == "darwin") then mapFeatures features ([ ] - ++ (if features.git2_0_6_11.openssl-probe or false then [ openssl_probe_0_1_2 ] else []) - ++ (if features.git2_0_6_11.openssl-sys or false then [ openssl_sys_0_9_30 ] else [])) else []); - features = mkFeatures (features.git2_0_6_11 or {}); - }; - git2_0_6_11_features = f: updateFeatures f (rec { - bitflags_0_9_1.default = true; - git2_0_6_11.curl = - (f.git2_0_6_11.curl or false) || - (f.git2_0_6_11.default or false) || - (git2_0_6_11.default or false); - git2_0_6_11.default = (f.git2_0_6_11.default or true); - git2_0_6_11.https = - (f.git2_0_6_11.https or false) || - (f.git2_0_6_11.default or false) || - (git2_0_6_11.default or false); - git2_0_6_11.openssl-probe = - (f.git2_0_6_11.openssl-probe or false) || - (f.git2_0_6_11.https or false) || - (git2_0_6_11.https or false); - git2_0_6_11.openssl-sys = - (f.git2_0_6_11.openssl-sys or false) || - (f.git2_0_6_11.https or false) || - (git2_0_6_11.https or false); - git2_0_6_11.ssh = - (f.git2_0_6_11.ssh or false) || - (f.git2_0_6_11.default or false) || - (git2_0_6_11.default or false); - libc_0_2_40.default = true; - libgit2_sys_0_6_19.curl = - (f.libgit2_sys_0_6_19.curl or false) || - (git2_0_6_11.curl or false) || - (f.git2_0_6_11.curl or false); - libgit2_sys_0_6_19.default = true; - libgit2_sys_0_6_19.https = - (f.libgit2_sys_0_6_19.https or false) || - (git2_0_6_11.https or false) || - (f.git2_0_6_11.https or false); - libgit2_sys_0_6_19.ssh = - (f.libgit2_sys_0_6_19.ssh or false) || - (git2_0_6_11.ssh or false) || - (f.git2_0_6_11.ssh or false); - openssl_probe_0_1_2.default = true; - openssl_sys_0_9_30.default = true; - url_1_7_0.default = true; - }) [ bitflags_0_9_1_features libc_0_2_40_features libgit2_sys_0_6_19_features url_1_7_0_features openssl_probe_0_1_2_features openssl_sys_0_9_30_features ]; - idna_0_1_4 = { features?(idna_0_1_4_features {}) }: idna_0_1_4_ { - dependencies = mapFeatures features ([ matches_0_1_6 unicode_bidi_0_3_4 unicode_normalization_0_1_7 ]); - }; - idna_0_1_4_features = f: updateFeatures f ({ - idna_0_1_4.default = (f.idna_0_1_4.default or true); - matches_0_1_6.default = true; - unicode_bidi_0_3_4.default = true; - unicode_normalization_0_1_7.default = true; - }) [ matches_0_1_6_features unicode_bidi_0_3_4_features unicode_normalization_0_1_7_features ]; - json_0_11_13 = { features?(json_0_11_13_features {}) }: json_0_11_13_ {}; - json_0_11_13_features = f: updateFeatures f ({ - json_0_11_13.default = (f.json_0_11_13.default or true); - }) []; - kernel32_sys_0_2_2 = { features?(kernel32_sys_0_2_2_features {}) }: kernel32_sys_0_2_2_ { - dependencies = mapFeatures features ([ winapi_0_2_8 ]); - buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]); - }; - kernel32_sys_0_2_2_features = f: updateFeatures f ({ - kernel32_sys_0_2_2.default = (f.kernel32_sys_0_2_2.default or true); - winapi_0_2_8.default = true; - winapi_build_0_1_1.default = true; - }) [ winapi_0_2_8_features winapi_build_0_1_1_features ]; - lazy_static_1_0_0 = { features?(lazy_static_1_0_0_features {}) }: lazy_static_1_0_0_ { - dependencies = mapFeatures features ([]); - features = mkFeatures (features.lazy_static_1_0_0 or {}); - }; - lazy_static_1_0_0_features = f: updateFeatures f (rec { - lazy_static_1_0_0.compiletest_rs = - (f.lazy_static_1_0_0.compiletest_rs or false) || - (f.lazy_static_1_0_0.compiletest or false) || - (lazy_static_1_0_0.compiletest or false); - lazy_static_1_0_0.default = (f.lazy_static_1_0_0.default or true); - lazy_static_1_0_0.nightly = - (f.lazy_static_1_0_0.nightly or false) || - (f.lazy_static_1_0_0.spin_no_std or false) || - (lazy_static_1_0_0.spin_no_std or false); - lazy_static_1_0_0.spin = - (f.lazy_static_1_0_0.spin or false) || - (f.lazy_static_1_0_0.spin_no_std or false) || - (lazy_static_1_0_0.spin_no_std or false); - }) []; - lazysort_0_2_0 = { features?(lazysort_0_2_0_features {}) }: lazysort_0_2_0_ { - dependencies = mapFeatures features ([ rand_0_3_22 ]); - features = mkFeatures (features.lazysort_0_2_0 or {}); - }; - lazysort_0_2_0_features = f: updateFeatures f ({ - lazysort_0_2_0.default = (f.lazysort_0_2_0.default or true); - rand_0_3_22.default = true; - }) [ rand_0_3_22_features ]; - libc_0_2_40 = { features?(libc_0_2_40_features {}) }: libc_0_2_40_ { - features = mkFeatures (features.libc_0_2_40 or {}); - }; - libc_0_2_40_features = f: updateFeatures f (rec { - libc_0_2_40.default = (f.libc_0_2_40.default or true); - libc_0_2_40.use_std = - (f.libc_0_2_40.use_std or false) || - (f.libc_0_2_40.default or false) || - (libc_0_2_40.default or false); - }) []; - libgit2_sys_0_6_19 = { features?(libgit2_sys_0_6_19_features {}) }: libgit2_sys_0_6_19_ { - dependencies = mapFeatures features ([ libc_0_2_40 libz_sys_1_0_18 ] - ++ (if features.libgit2_sys_0_6_19.curl-sys or false then [ curl_sys_0_4_5 ] else []) - ++ (if features.libgit2_sys_0_6_19.libssh2-sys or false then [ libssh2_sys_0_2_7 ] else [])) - ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ ] - ++ (if features.libgit2_sys_0_6_19.openssl-sys or false then [ openssl_sys_0_9_30 ] else [])) else []); - buildDependencies = mapFeatures features ([ cc_1_0_15 cmake_0_1_31 pkg_config_0_3_11 ]); - features = mkFeatures (features.libgit2_sys_0_6_19 or {}); - }; - libgit2_sys_0_6_19_features = f: updateFeatures f (rec { - cc_1_0_15.default = true; - cmake_0_1_31.default = true; - curl_sys_0_4_5.default = true; - libc_0_2_40.default = true; - libgit2_sys_0_6_19.curl-sys = - (f.libgit2_sys_0_6_19.curl-sys or false) || - (f.libgit2_sys_0_6_19.curl or false) || - (libgit2_sys_0_6_19.curl or false); - libgit2_sys_0_6_19.default = (f.libgit2_sys_0_6_19.default or true); - libgit2_sys_0_6_19.libssh2-sys = - (f.libgit2_sys_0_6_19.libssh2-sys or false) || - (f.libgit2_sys_0_6_19.ssh or false) || - (libgit2_sys_0_6_19.ssh or false); - libgit2_sys_0_6_19.openssl-sys = - (f.libgit2_sys_0_6_19.openssl-sys or false) || - (f.libgit2_sys_0_6_19.https or false) || - (libgit2_sys_0_6_19.https or false); - libssh2_sys_0_2_7.default = true; - libz_sys_1_0_18.default = true; - openssl_sys_0_9_30.default = true; - pkg_config_0_3_11.default = true; - }) [ curl_sys_0_4_5_features libc_0_2_40_features libssh2_sys_0_2_7_features libz_sys_1_0_18_features cc_1_0_15_features cmake_0_1_31_features pkg_config_0_3_11_features openssl_sys_0_9_30_features ]; - libssh2_sys_0_2_7 = { features?(libssh2_sys_0_2_7_features {}) }: libssh2_sys_0_2_7_ { - dependencies = mapFeatures features ([ libc_0_2_40 libz_sys_1_0_18 ]) - ++ (if abi == "msvc" then mapFeatures features ([]) else []) - ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ openssl_sys_0_9_30 ]) else []); - buildDependencies = mapFeatures features ([ cmake_0_1_31 pkg_config_0_3_11 ]); - }; - libssh2_sys_0_2_7_features = f: updateFeatures f ({ - cmake_0_1_31.default = true; - libc_0_2_40.default = true; - libssh2_sys_0_2_7.default = (f.libssh2_sys_0_2_7.default or true); - libz_sys_1_0_18.default = true; - openssl_sys_0_9_30.default = true; - pkg_config_0_3_11.default = true; - }) [ libc_0_2_40_features libz_sys_1_0_18_features cmake_0_1_31_features pkg_config_0_3_11_features openssl_sys_0_9_30_features ]; - libz_sys_1_0_18 = { features?(libz_sys_1_0_18_features {}) }: libz_sys_1_0_18_ { - dependencies = mapFeatures features ([ libc_0_2_40 ]) - ++ (if abi == "msvc" then mapFeatures features ([]) else []); - buildDependencies = mapFeatures features ([ cc_1_0_15 pkg_config_0_3_11 ]); - }; - libz_sys_1_0_18_features = f: updateFeatures f ({ - cc_1_0_15.default = true; - libc_0_2_40.default = true; - libz_sys_1_0_18.default = (f.libz_sys_1_0_18.default or true); - pkg_config_0_3_11.default = true; - }) [ libc_0_2_40_features cc_1_0_15_features pkg_config_0_3_11_features ]; - matches_0_1_6 = { features?(matches_0_1_6_features {}) }: matches_0_1_6_ {}; - matches_0_1_6_features = f: updateFeatures f ({ - matches_0_1_6.default = (f.matches_0_1_6.default or true); - }) []; - memchr_2_0_1 = { features?(memchr_2_0_1_features {}) }: memchr_2_0_1_ { - dependencies = mapFeatures features ([ ] - ++ (if features.memchr_2_0_1.libc or false then [ libc_0_2_40 ] else [])); - features = mkFeatures (features.memchr_2_0_1 or {}); - }; - memchr_2_0_1_features = f: updateFeatures f (rec { - libc_0_2_40.default = (f.libc_0_2_40.default or false); - libc_0_2_40.use_std = - (f.libc_0_2_40.use_std or false) || - (memchr_2_0_1.use_std or false) || - (f.memchr_2_0_1.use_std or false); - memchr_2_0_1.default = (f.memchr_2_0_1.default or true); - memchr_2_0_1.libc = - (f.memchr_2_0_1.libc or false) || - (f.memchr_2_0_1.default or false) || - (memchr_2_0_1.default or false) || - (f.memchr_2_0_1.use_std or false) || - (memchr_2_0_1.use_std or false); - memchr_2_0_1.use_std = - (f.memchr_2_0_1.use_std or false) || - (f.memchr_2_0_1.default or false) || - (memchr_2_0_1.default or false); - }) [ libc_0_2_40_features ]; - openssl_probe_0_1_2 = { features?(openssl_probe_0_1_2_features {}) }: openssl_probe_0_1_2_ {}; - openssl_probe_0_1_2_features = f: updateFeatures f ({ - openssl_probe_0_1_2.default = (f.openssl_probe_0_1_2.default or true); - }) []; - openssl_sys_0_9_30 = { features?(openssl_sys_0_9_30_features {}) }: openssl_sys_0_9_30_ { - dependencies = mapFeatures features ([ libc_0_2_40 ]) - ++ (if abi == "msvc" then mapFeatures features ([]) else []); - buildDependencies = mapFeatures features ([ cc_1_0_15 pkg_config_0_3_11 ]); - }; - openssl_sys_0_9_30_features = f: updateFeatures f ({ - cc_1_0_15.default = true; - libc_0_2_40.default = true; - openssl_sys_0_9_30.default = (f.openssl_sys_0_9_30.default or true); - pkg_config_0_3_11.default = true; - }) [ libc_0_2_40_features cc_1_0_15_features pkg_config_0_3_11_features ]; - percent_encoding_1_0_1 = { features?(percent_encoding_1_0_1_features {}) }: percent_encoding_1_0_1_ {}; - percent_encoding_1_0_1_features = f: updateFeatures f ({ - percent_encoding_1_0_1.default = (f.percent_encoding_1_0_1.default or true); - }) []; - pkg_config_0_3_11 = { features?(pkg_config_0_3_11_features {}) }: pkg_config_0_3_11_ {}; - pkg_config_0_3_11_features = f: updateFeatures f ({ - pkg_config_0_3_11.default = (f.pkg_config_0_3_11.default or true); - }) []; - proc_macro2_0_3_8 = { features?(proc_macro2_0_3_8_features {}) }: proc_macro2_0_3_8_ { - dependencies = mapFeatures features ([ unicode_xid_0_1_0 ]); - features = mkFeatures (features.proc_macro2_0_3_8 or {}); - }; - proc_macro2_0_3_8_features = f: updateFeatures f (rec { - proc_macro2_0_3_8.default = (f.proc_macro2_0_3_8.default or true); - proc_macro2_0_3_8.proc-macro = - (f.proc_macro2_0_3_8.proc-macro or false) || - (f.proc_macro2_0_3_8.default or false) || - (proc_macro2_0_3_8.default or false) || - (f.proc_macro2_0_3_8.nightly or false) || - (proc_macro2_0_3_8.nightly or false); - unicode_xid_0_1_0.default = true; - }) [ unicode_xid_0_1_0_features ]; - quote_0_5_2 = { features?(quote_0_5_2_features {}) }: quote_0_5_2_ { - dependencies = mapFeatures features ([ proc_macro2_0_3_8 ]); - features = mkFeatures (features.quote_0_5_2 or {}); - }; - quote_0_5_2_features = f: updateFeatures f (rec { - proc_macro2_0_3_8.default = (f.proc_macro2_0_3_8.default or false); - proc_macro2_0_3_8.proc-macro = - (f.proc_macro2_0_3_8.proc-macro or false) || - (quote_0_5_2.proc-macro or false) || - (f.quote_0_5_2.proc-macro or false); - quote_0_5_2.default = (f.quote_0_5_2.default or true); - quote_0_5_2.proc-macro = - (f.quote_0_5_2.proc-macro or false) || - (f.quote_0_5_2.default or false) || - (quote_0_5_2.default or false); - }) [ proc_macro2_0_3_8_features ]; - rand_0_3_22 = { features?(rand_0_3_22_features {}) }: rand_0_3_22_ { - dependencies = mapFeatures features ([ libc_0_2_40 rand_0_4_2 ]) - ++ (if kernel == "fuchsia" then mapFeatures features ([ fuchsia_zircon_0_3_3 ]) else []); - features = mkFeatures (features.rand_0_3_22 or {}); - }; - rand_0_3_22_features = f: updateFeatures f (rec { - fuchsia_zircon_0_3_3.default = true; - libc_0_2_40.default = true; - rand_0_3_22.default = (f.rand_0_3_22.default or true); - rand_0_3_22.i128_support = - (f.rand_0_3_22.i128_support or false) || - (f.rand_0_3_22.nightly or false) || - (rand_0_3_22.nightly or false); - rand_0_4_2.default = true; - }) [ libc_0_2_40_features rand_0_4_2_features fuchsia_zircon_0_3_3_features ]; - rand_0_4_2 = { features?(rand_0_4_2_features {}) }: rand_0_4_2_ { - dependencies = (if kernel == "fuchsia" then mapFeatures features ([ fuchsia_zircon_0_3_3 ]) else []) - ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ ] - ++ (if features.rand_0_4_2.libc or false then [ libc_0_2_40 ] else [])) else []) - ++ (if kernel == "windows" then mapFeatures features ([ winapi_0_3_4 ]) else []); - features = mkFeatures (features.rand_0_4_2 or {}); - }; - rand_0_4_2_features = f: updateFeatures f (rec { - fuchsia_zircon_0_3_3.default = true; - libc_0_2_40.default = true; - rand_0_4_2.default = (f.rand_0_4_2.default or true); - rand_0_4_2.i128_support = - (f.rand_0_4_2.i128_support or false) || - (f.rand_0_4_2.nightly or false) || - (rand_0_4_2.nightly or false); - rand_0_4_2.libc = - (f.rand_0_4_2.libc or false) || - (f.rand_0_4_2.std or false) || - (rand_0_4_2.std or false); - rand_0_4_2.std = - (f.rand_0_4_2.std or false) || - (f.rand_0_4_2.default or false) || - (rand_0_4_2.default or false); - winapi_0_3_4.default = true; - winapi_0_3_4.minwindef = true; - winapi_0_3_4.ntsecapi = true; - winapi_0_3_4.profileapi = true; - winapi_0_3_4.winnt = true; - }) [ fuchsia_zircon_0_3_3_features libc_0_2_40_features winapi_0_3_4_features ]; - redox_syscall_0_1_37 = { features?(redox_syscall_0_1_37_features {}) }: redox_syscall_0_1_37_ {}; - redox_syscall_0_1_37_features = f: updateFeatures f ({ - redox_syscall_0_1_37.default = (f.redox_syscall_0_1_37.default or true); - }) []; - redox_termios_0_1_1 = { features?(redox_termios_0_1_1_features {}) }: redox_termios_0_1_1_ { - dependencies = mapFeatures features ([ redox_syscall_0_1_37 ]); - }; - redox_termios_0_1_1_features = f: updateFeatures f ({ - redox_syscall_0_1_37.default = true; - redox_termios_0_1_1.default = (f.redox_termios_0_1_1.default or true); - }) [ redox_syscall_0_1_37_features ]; - regex_0_2_11 = { features?(regex_0_2_11_features {}) }: regex_0_2_11_ { - dependencies = mapFeatures features ([ aho_corasick_0_6_4 memchr_2_0_1 regex_syntax_0_5_6 thread_local_0_3_5 utf8_ranges_1_0_0 ]); - features = mkFeatures (features.regex_0_2_11 or {}); - }; - regex_0_2_11_features = f: updateFeatures f (rec { - aho_corasick_0_6_4.default = true; - memchr_2_0_1.default = true; - regex_0_2_11.default = (f.regex_0_2_11.default or true); - regex_0_2_11.pattern = - (f.regex_0_2_11.pattern or false) || - (f.regex_0_2_11.unstable or false) || - (regex_0_2_11.unstable or false); - regex_syntax_0_5_6.default = true; - thread_local_0_3_5.default = true; - utf8_ranges_1_0_0.default = true; - }) [ aho_corasick_0_6_4_features memchr_2_0_1_features regex_syntax_0_5_6_features thread_local_0_3_5_features utf8_ranges_1_0_0_features ]; - regex_syntax_0_5_6 = { features?(regex_syntax_0_5_6_features {}) }: regex_syntax_0_5_6_ { - dependencies = mapFeatures features ([ ucd_util_0_1_1 ]); - }; - regex_syntax_0_5_6_features = f: updateFeatures f ({ - regex_syntax_0_5_6.default = (f.regex_syntax_0_5_6.default or true); - ucd_util_0_1_1.default = true; - }) [ ucd_util_0_1_1_features ]; - semver_0_9_0 = { features?(semver_0_9_0_features {}) }: semver_0_9_0_ { - dependencies = mapFeatures features ([ semver_parser_0_7_0 ] - ++ (if features.semver_0_9_0.serde or false then [ serde_1_0_55 ] else [])); - features = mkFeatures (features.semver_0_9_0 or {}); - }; - semver_0_9_0_features = f: updateFeatures f (rec { - semver_0_9_0.default = (f.semver_0_9_0.default or true); - semver_0_9_0.serde = - (f.semver_0_9_0.serde or false) || - (f.semver_0_9_0.ci or false) || - (semver_0_9_0.ci or false); - semver_parser_0_7_0.default = true; - serde_1_0_55.default = true; - }) [ semver_parser_0_7_0_features serde_1_0_55_features ]; - semver_parser_0_7_0 = { features?(semver_parser_0_7_0_features {}) }: semver_parser_0_7_0_ {}; - semver_parser_0_7_0_features = f: updateFeatures f ({ - semver_parser_0_7_0.default = (f.semver_parser_0_7_0.default or true); - }) []; - serde_1_0_55 = { features?(serde_1_0_55_features {}) }: serde_1_0_55_ { - dependencies = mapFeatures features ([]); - features = mkFeatures (features.serde_1_0_55 or {}); - }; - serde_1_0_55_features = f: updateFeatures f (rec { - serde_1_0_55.default = (f.serde_1_0_55.default or true); - serde_1_0_55.serde_derive = - (f.serde_1_0_55.serde_derive or false) || - (f.serde_1_0_55.derive or false) || - (serde_1_0_55.derive or false); - serde_1_0_55.std = - (f.serde_1_0_55.std or false) || - (f.serde_1_0_55.default or false) || - (serde_1_0_55.default or false); - serde_1_0_55.unstable = - (f.serde_1_0_55.unstable or false) || - (f.serde_1_0_55.alloc or false) || - (serde_1_0_55.alloc or false); - }) []; - serde_derive_1_0_55 = { features?(serde_derive_1_0_55_features {}) }: serde_derive_1_0_55_ { - dependencies = mapFeatures features ([ proc_macro2_0_3_8 quote_0_5_2 syn_0_13_10 ]); - features = mkFeatures (features.serde_derive_1_0_55 or {}); - }; - serde_derive_1_0_55_features = f: updateFeatures f ({ - proc_macro2_0_3_8.default = true; - quote_0_5_2.default = true; - serde_derive_1_0_55.default = (f.serde_derive_1_0_55.default or true); - syn_0_13_10.default = true; - syn_0_13_10.visit = true; - }) [ proc_macro2_0_3_8_features quote_0_5_2_features syn_0_13_10_features ]; - strsim_0_7_0 = { features?(strsim_0_7_0_features {}) }: strsim_0_7_0_ {}; - strsim_0_7_0_features = f: updateFeatures f ({ - strsim_0_7_0.default = (f.strsim_0_7_0.default or true); - }) []; - syn_0_13_10 = { features?(syn_0_13_10_features {}) }: syn_0_13_10_ { - dependencies = mapFeatures features ([ proc_macro2_0_3_8 unicode_xid_0_1_0 ] - ++ (if features.syn_0_13_10.quote or false then [ quote_0_5_2 ] else [])); - features = mkFeatures (features.syn_0_13_10 or {}); - }; - syn_0_13_10_features = f: updateFeatures f (rec { - proc_macro2_0_3_8.default = (f.proc_macro2_0_3_8.default or false); - proc_macro2_0_3_8.proc-macro = - (f.proc_macro2_0_3_8.proc-macro or false) || - (syn_0_13_10.proc-macro or false) || - (f.syn_0_13_10.proc-macro or false); - quote_0_5_2.default = (f.quote_0_5_2.default or false); - quote_0_5_2.proc-macro = - (f.quote_0_5_2.proc-macro or false) || - (syn_0_13_10.proc-macro or false) || - (f.syn_0_13_10.proc-macro or false); - syn_0_13_10.clone-impls = - (f.syn_0_13_10.clone-impls or false) || - (f.syn_0_13_10.default or false) || - (syn_0_13_10.default or false); - syn_0_13_10.default = (f.syn_0_13_10.default or true); - syn_0_13_10.derive = - (f.syn_0_13_10.derive or false) || - (f.syn_0_13_10.default or false) || - (syn_0_13_10.default or false); - syn_0_13_10.parsing = - (f.syn_0_13_10.parsing or false) || - (f.syn_0_13_10.default or false) || - (syn_0_13_10.default or false); - syn_0_13_10.printing = - (f.syn_0_13_10.printing or false) || - (f.syn_0_13_10.default or false) || - (syn_0_13_10.default or false); - syn_0_13_10.proc-macro = - (f.syn_0_13_10.proc-macro or false) || - (f.syn_0_13_10.default or false) || - (syn_0_13_10.default or false); - syn_0_13_10.quote = - (f.syn_0_13_10.quote or false) || - (f.syn_0_13_10.printing or false) || - (syn_0_13_10.printing or false); - unicode_xid_0_1_0.default = true; - }) [ proc_macro2_0_3_8_features quote_0_5_2_features unicode_xid_0_1_0_features ]; - tabwriter_1_0_4 = { features?(tabwriter_1_0_4_features {}) }: tabwriter_1_0_4_ { - dependencies = mapFeatures features ([ unicode_width_0_1_4 ]); - features = mkFeatures (features.tabwriter_1_0_4 or {}); - }; - tabwriter_1_0_4_features = f: updateFeatures f (rec { - tabwriter_1_0_4.default = (f.tabwriter_1_0_4.default or true); - tabwriter_1_0_4.lazy_static = - (f.tabwriter_1_0_4.lazy_static or false) || - (f.tabwriter_1_0_4.ansi_formatting or false) || - (tabwriter_1_0_4.ansi_formatting or false); - tabwriter_1_0_4.regex = - (f.tabwriter_1_0_4.regex or false) || - (f.tabwriter_1_0_4.ansi_formatting or false) || - (tabwriter_1_0_4.ansi_formatting or false); - unicode_width_0_1_4.default = true; - }) [ unicode_width_0_1_4_features ]; - termion_1_5_1 = { features?(termion_1_5_1_features {}) }: termion_1_5_1_ { - dependencies = (if !(kernel == "redox") then mapFeatures features ([ libc_0_2_40 ]) else []) - ++ (if kernel == "redox" then mapFeatures features ([ redox_syscall_0_1_37 redox_termios_0_1_1 ]) else []); - }; - termion_1_5_1_features = f: updateFeatures f ({ - libc_0_2_40.default = true; - redox_syscall_0_1_37.default = true; - redox_termios_0_1_1.default = true; - termion_1_5_1.default = (f.termion_1_5_1.default or true); - }) [ libc_0_2_40_features redox_syscall_0_1_37_features redox_termios_0_1_1_features ]; - textwrap_0_9_0 = { features?(textwrap_0_9_0_features {}) }: textwrap_0_9_0_ { - dependencies = mapFeatures features ([ unicode_width_0_1_4 ]); - }; - textwrap_0_9_0_features = f: updateFeatures f ({ - textwrap_0_9_0.default = (f.textwrap_0_9_0.default or true); - unicode_width_0_1_4.default = true; - }) [ unicode_width_0_1_4_features ]; - thread_local_0_3_5 = { features?(thread_local_0_3_5_features {}) }: thread_local_0_3_5_ { - dependencies = mapFeatures features ([ lazy_static_1_0_0 unreachable_1_0_0 ]); - }; - thread_local_0_3_5_features = f: updateFeatures f ({ - lazy_static_1_0_0.default = true; - thread_local_0_3_5.default = (f.thread_local_0_3_5.default or true); - unreachable_1_0_0.default = true; - }) [ lazy_static_1_0_0_features unreachable_1_0_0_features ]; - toml_0_4_6 = { features?(toml_0_4_6_features {}) }: toml_0_4_6_ { - dependencies = mapFeatures features ([ serde_1_0_55 ]); - }; - toml_0_4_6_features = f: updateFeatures f ({ - serde_1_0_55.default = true; - toml_0_4_6.default = (f.toml_0_4_6.default or true); - }) [ serde_1_0_55_features ]; - ucd_util_0_1_1 = { features?(ucd_util_0_1_1_features {}) }: ucd_util_0_1_1_ {}; - ucd_util_0_1_1_features = f: updateFeatures f ({ - ucd_util_0_1_1.default = (f.ucd_util_0_1_1.default or true); - }) []; - unicode_bidi_0_3_4 = { features?(unicode_bidi_0_3_4_features {}) }: unicode_bidi_0_3_4_ { - dependencies = mapFeatures features ([ matches_0_1_6 ]); - features = mkFeatures (features.unicode_bidi_0_3_4 or {}); - }; - unicode_bidi_0_3_4_features = f: updateFeatures f (rec { - matches_0_1_6.default = true; - unicode_bidi_0_3_4.default = (f.unicode_bidi_0_3_4.default or true); - unicode_bidi_0_3_4.flame = - (f.unicode_bidi_0_3_4.flame or false) || - (f.unicode_bidi_0_3_4.flame_it or false) || - (unicode_bidi_0_3_4.flame_it or false); - unicode_bidi_0_3_4.flamer = - (f.unicode_bidi_0_3_4.flamer or false) || - (f.unicode_bidi_0_3_4.flame_it or false) || - (unicode_bidi_0_3_4.flame_it or false); - unicode_bidi_0_3_4.serde = - (f.unicode_bidi_0_3_4.serde or false) || - (f.unicode_bidi_0_3_4.with_serde or false) || - (unicode_bidi_0_3_4.with_serde or false); - }) [ matches_0_1_6_features ]; - unicode_normalization_0_1_7 = { features?(unicode_normalization_0_1_7_features {}) }: unicode_normalization_0_1_7_ {}; - unicode_normalization_0_1_7_features = f: updateFeatures f ({ - unicode_normalization_0_1_7.default = (f.unicode_normalization_0_1_7.default or true); - }) []; - unicode_width_0_1_4 = { features?(unicode_width_0_1_4_features {}) }: unicode_width_0_1_4_ { - features = mkFeatures (features.unicode_width_0_1_4 or {}); - }; - unicode_width_0_1_4_features = f: updateFeatures f ({ - unicode_width_0_1_4.default = (f.unicode_width_0_1_4.default or true); - }) []; - unicode_xid_0_1_0 = { features?(unicode_xid_0_1_0_features {}) }: unicode_xid_0_1_0_ { - features = mkFeatures (features.unicode_xid_0_1_0 or {}); - }; - unicode_xid_0_1_0_features = f: updateFeatures f ({ - unicode_xid_0_1_0.default = (f.unicode_xid_0_1_0.default or true); - }) []; - unreachable_1_0_0 = { features?(unreachable_1_0_0_features {}) }: unreachable_1_0_0_ { - dependencies = mapFeatures features ([ void_1_0_2 ]); - }; - unreachable_1_0_0_features = f: updateFeatures f ({ - unreachable_1_0_0.default = (f.unreachable_1_0_0.default or true); - void_1_0_2.default = (f.void_1_0_2.default or false); - }) [ void_1_0_2_features ]; - url_1_7_0 = { features?(url_1_7_0_features {}) }: url_1_7_0_ { - dependencies = mapFeatures features ([ idna_0_1_4 matches_0_1_6 percent_encoding_1_0_1 ]); - features = mkFeatures (features.url_1_7_0 or {}); - }; - url_1_7_0_features = f: updateFeatures f (rec { - idna_0_1_4.default = true; - matches_0_1_6.default = true; - percent_encoding_1_0_1.default = true; - url_1_7_0.default = (f.url_1_7_0.default or true); - url_1_7_0.encoding = - (f.url_1_7_0.encoding or false) || - (f.url_1_7_0.query_encoding or false) || - (url_1_7_0.query_encoding or false); - url_1_7_0.heapsize = - (f.url_1_7_0.heapsize or false) || - (f.url_1_7_0.heap_size or false) || - (url_1_7_0.heap_size or false); - }) [ idna_0_1_4_features matches_0_1_6_features percent_encoding_1_0_1_features ]; - utf8_ranges_1_0_0 = { features?(utf8_ranges_1_0_0_features {}) }: utf8_ranges_1_0_0_ {}; - utf8_ranges_1_0_0_features = f: updateFeatures f ({ - utf8_ranges_1_0_0.default = (f.utf8_ranges_1_0_0.default or true); - }) []; - vcpkg_0_2_3 = { features?(vcpkg_0_2_3_features {}) }: vcpkg_0_2_3_ {}; - vcpkg_0_2_3_features = f: updateFeatures f ({ - vcpkg_0_2_3.default = (f.vcpkg_0_2_3.default or true); - }) []; - vec_map_0_8_1 = { features?(vec_map_0_8_1_features {}) }: vec_map_0_8_1_ { - dependencies = mapFeatures features ([]); - features = mkFeatures (features.vec_map_0_8_1 or {}); - }; - vec_map_0_8_1_features = f: updateFeatures f (rec { - vec_map_0_8_1.default = (f.vec_map_0_8_1.default or true); - vec_map_0_8_1.serde = - (f.vec_map_0_8_1.serde or false) || - (f.vec_map_0_8_1.eders or false) || - (vec_map_0_8_1.eders or false); - }) []; - void_1_0_2 = { features?(void_1_0_2_features {}) }: void_1_0_2_ { - features = mkFeatures (features.void_1_0_2 or {}); - }; - void_1_0_2_features = f: updateFeatures f (rec { - void_1_0_2.default = (f.void_1_0_2.default or true); - void_1_0_2.std = - (f.void_1_0_2.std or false) || - (f.void_1_0_2.default or false) || - (void_1_0_2.default or false); - }) []; - winapi_0_2_8 = { features?(winapi_0_2_8_features {}) }: winapi_0_2_8_ {}; - winapi_0_2_8_features = f: updateFeatures f ({ - winapi_0_2_8.default = (f.winapi_0_2_8.default or true); - }) []; - winapi_0_3_4 = { features?(winapi_0_3_4_features {}) }: winapi_0_3_4_ { - dependencies = (if kernel == "i686-pc-windows-gnu" then mapFeatures features ([ winapi_i686_pc_windows_gnu_0_4_0 ]) else []) - ++ (if kernel == "x86_64-pc-windows-gnu" then mapFeatures features ([ winapi_x86_64_pc_windows_gnu_0_4_0 ]) else []); - features = mkFeatures (features.winapi_0_3_4 or {}); - }; - winapi_0_3_4_features = f: updateFeatures f ({ - winapi_0_3_4.default = (f.winapi_0_3_4.default or true); - winapi_i686_pc_windows_gnu_0_4_0.default = true; - winapi_x86_64_pc_windows_gnu_0_4_0.default = true; - }) [ winapi_i686_pc_windows_gnu_0_4_0_features winapi_x86_64_pc_windows_gnu_0_4_0_features ]; - winapi_build_0_1_1 = { features?(winapi_build_0_1_1_features {}) }: winapi_build_0_1_1_ {}; - winapi_build_0_1_1_features = f: updateFeatures f ({ - winapi_build_0_1_1.default = (f.winapi_build_0_1_1.default or true); - }) []; - winapi_i686_pc_windows_gnu_0_4_0 = { features?(winapi_i686_pc_windows_gnu_0_4_0_features {}) }: winapi_i686_pc_windows_gnu_0_4_0_ {}; - winapi_i686_pc_windows_gnu_0_4_0_features = f: updateFeatures f ({ - winapi_i686_pc_windows_gnu_0_4_0.default = (f.winapi_i686_pc_windows_gnu_0_4_0.default or true); - }) []; - winapi_x86_64_pc_windows_gnu_0_4_0 = { features?(winapi_x86_64_pc_windows_gnu_0_4_0_features {}) }: winapi_x86_64_pc_windows_gnu_0_4_0_ {}; - winapi_x86_64_pc_windows_gnu_0_4_0_features = f: updateFeatures f ({ - winapi_x86_64_pc_windows_gnu_0_4_0.default = (f.winapi_x86_64_pc_windows_gnu_0_4_0.default or true); - }) []; - winreg_0_4_0 = { features?(winreg_0_4_0_features {}) }: winreg_0_4_0_ { - dependencies = mapFeatures features ([ advapi32_sys_0_2_0 kernel32_sys_0_2_2 winapi_0_2_8 ]); - features = mkFeatures (features.winreg_0_4_0 or {}); - }; - winreg_0_4_0_features = f: updateFeatures f (rec { - advapi32_sys_0_2_0.default = true; - kernel32_sys_0_2_2.default = true; - winapi_0_2_8.default = true; - winreg_0_4_0.default = (f.winreg_0_4_0.default or true); - winreg_0_4_0.ktmw32-sys = - (f.winreg_0_4_0.ktmw32-sys or false) || - (f.winreg_0_4_0.transactions or false) || - (winreg_0_4_0.transactions or false); - winreg_0_4_0.rustc-serialize = - (f.winreg_0_4_0.rustc-serialize or false) || - (f.winreg_0_4_0.serialization-rustc or false) || - (winreg_0_4_0.serialization-rustc or false); - winreg_0_4_0.serialization-rustc = - (f.winreg_0_4_0.serialization-rustc or false) || - (f.winreg_0_4_0.default or false) || - (winreg_0_4_0.default or false); - winreg_0_4_0.transactions = - (f.winreg_0_4_0.transactions or false) || - (f.winreg_0_4_0.default or false) || - (winreg_0_4_0.default or false) || - (f.winreg_0_4_0.serialization-rustc or false) || - (winreg_0_4_0.serialization-rustc or false); - }) [ advapi32_sys_0_2_0_features kernel32_sys_0_2_2_features winapi_0_2_8_features ]; -} diff --git a/pkgs/tools/package-management/cargo-update/default.nix b/pkgs/tools/package-management/cargo-update/default.nix index 50dc748e07e..241213b9409 100644 --- a/pkgs/tools/package-management/cargo-update/default.nix +++ b/pkgs/tools/package-management/cargo-update/default.nix @@ -1,29 +1,37 @@ -{ stdenv, callPackage, defaultCrateOverrides, fetchFromGitHub, cmake, curl, libssh2, libgit2, openssl, zlib }: +{ stdenv +, rustPlatform +, fetchFromGitHub +, cmake +, curl +, libgit2 +, libssh2 +, openssl +, pkg-config +, zlib }: -((callPackage ./cargo-update.nix {}).cargo_update {}).override { - crateOverrides = defaultCrateOverrides // { - cargo-update = attrs: rec { - name = "cargo-update-${version}"; - version = "1.5.2"; +rustPlatform.buildRustPackage rec { + pname = "cargo-update"; + version = "2.5.0"; - src = fetchFromGitHub { - owner = "nabijaczleweli"; - repo = "cargo-update"; - rev = "v${version}"; - sha256 = "1bvrdgcw2akzd78wgvsisvghi8pvdk3szyg9s46qxv4km9sf88s7"; - }; + src = fetchFromGitHub { + owner = "nabijaczleweli"; + repo = pname; + rev = "v${version}"; + sha256 = "143aczay7i3zbhbvv4cjf6hns5w8j52rfdaq8ff0r8v3qghd2972"; + }; + + cargoPatches = [ ./cargo-lock.patch ]; + cargoSha256 = "0mxc752hmd7r29camq4f4qzwx0w008rqlq07j2r26z4ygvlrkc3a"; - nativeBuildInputs = [ cmake ]; - buildInputs = [ libssh2 libgit2 openssl zlib ] - ++ stdenv.lib.optional stdenv.isDarwin curl; + nativeBuildInputs = [ cmake ]; + buildInputs = [ libgit2 libssh2 openssl pkg-config zlib ] + ++ stdenv.lib.optional stdenv.isDarwin curl; - meta = with stdenv.lib; { - description = "A cargo subcommand for checking and applying updates to installed executables"; - homepage = https://github.com/nabijaczleweli/cargo-update; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ gerschtli ]; - platforms = platforms.all; - }; - }; + meta = with stdenv.lib; { + description = "A cargo subcommand for checking and applying updates to installed executables"; + homepage = "https://github.com/nabijaczleweli/cargo-update"; + license = licenses.mit; + maintainers = with maintainers; [ gerschtli filalex77 ]; + platforms = platforms.all; }; } diff --git a/pkgs/tools/package-management/emplace/default.nix b/pkgs/tools/package-management/emplace/default.nix index 6b39ed9d1c4..321897369db 100644 --- a/pkgs/tools/package-management/emplace/default.nix +++ b/pkgs/tools/package-management/emplace/default.nix @@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1y77cla6bgy8pjb21cawx7cb69hhri4r7gyjkhnjyiixkh945mwj"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "119llsc8m7qda2cjnd45ndml148z8074f76xygkz6fp3m1c2z3pw"; + cargoSha256 = "1vkcr239axxqya0iin74jxkmx6z9nwb67pjjdh89v4qwjvwhiqg3"; meta = with lib; { description = "Mirror installed software on multiple machines"; diff --git a/pkgs/tools/package-management/nix-index/default.nix b/pkgs/tools/package-management/nix-index/default.nix index f41dd715fcf..da7469ea646 100644 --- a/pkgs/tools/package-management/nix-index/default.nix +++ b/pkgs/tools/package-management/nix-index/default.nix @@ -12,10 +12,9 @@ rustPlatform.buildRustPackage rec { rev = "v${version}"; sha256 = "05fqfwz34n4ijw7ydw2n6bh4bv64rhks85cn720sy5r7bmhfmfa8"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - cargoSha256 = "06idjb5h5fahqklyxnss2zffrvvfbcw0hjh1mcrf1872s4x78ags"; + cargoSha256 = "0apdr9z18p6m4lfjv8k9zv2mqc7vssd2d536zfv1pns0pdqsfw50"; + nativeBuildInputs = [ pkgconfig makeWrapper ]; buildInputs = [ openssl curl ] ++ stdenv.lib.optional stdenv.isDarwin Security; diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index a51a4cab4f0..06e987f6f2b 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -173,10 +173,10 @@ in rec { }; nixStable = callPackage common (rec { - name = "nix-2.3.2"; + name = "nix-2.3.3"; src = fetchurl { url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz"; - sha256 = "9fea4b52db0b296dcf05d36f7ecad9f48396af3a682bb21e31f8d04c469beef8"; + sha256 = "332fffb8dfc33eab854c136ef162a88cec15b701def71fa63714d160831ba224"; }; inherit storeDir stateDir confDir boehmgc; diff --git a/pkgs/tools/package-management/nixpkgs-review/default.nix b/pkgs/tools/package-management/nixpkgs-review/default.nix index 928c946de2b..9f54d82d3cd 100644 --- a/pkgs/tools/package-management/nixpkgs-review/default.nix +++ b/pkgs/tools/package-management/nixpkgs-review/default.nix @@ -8,13 +8,13 @@ python3.pkgs.buildPythonApplication rec { pname = "nixpkgs-review"; - version = "2.1.1"; + version = "2.2.0"; src = fetchFromGitHub { owner = "Mic92"; repo = "nixpkgs-review"; rev = version; - sha256 = "0rx0ld2ihsvlr1yiap5cq7h227jr79zf3xhkninh2m00x384s6bd"; + sha256 = "0qsvrcxl97nih1yprydzlqc6n1ppg726664d6harx5kjzp5776mr"; }; makeWrapperArgs = [ diff --git a/pkgs/tools/package-management/protontricks/default.nix b/pkgs/tools/package-management/protontricks/default.nix index 2b7fbd28c7e..c2bdf327124 100644 --- a/pkgs/tools/package-management/protontricks/default.nix +++ b/pkgs/tools/package-management/protontricks/default.nix @@ -6,13 +6,13 @@ buildPythonApplication rec { pname = "protontricks"; - version = "1.4"; + version = "1.4.1"; src = fetchFromGitHub { owner = "Matoking"; repo = pname; rev = version; - sha256 = "1aarx6g8ykw1jvygfngmz8apdvfj26rcq10bwl228612kwigh7s2"; + sha256 = "083ncg6yjd7s3dx91zd52w166x709mnxknwwr78ggka8d8vlyi0b"; }; # Fix interpreter in mock run.sh for tests diff --git a/pkgs/tools/security/bitwarden_rs/vault.nix b/pkgs/tools/security/bitwarden_rs/vault.nix index 9cbf067d40b..6c6ef6ccaa9 100644 --- a/pkgs/tools/security/bitwarden_rs/vault.nix +++ b/pkgs/tools/security/bitwarden_rs/vault.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bitwarden_rs-vault"; - version = "2.12.0b"; + version = "2.12.0c"; src = fetchurl { url = "https://github.com/dani-garcia/bw_web_builds/releases/download/v${version}/bw_web_v${version}.tar.gz"; - sha256 = "01jwyhcam9kh8lpxfgzzw7r3nn9sn6jbgmd78a7h8r50z5hy04g5"; + sha256 = "040bqbx6hpwq4qvv4s7d77gwp5n2ay9rr7kdb135582d80wjq5sp"; }; buildCommand = '' @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Integrates the web vault into bitwarden_rs"; - homepage = https://github.com/dani-garcia/bw_web_builds; + homepage = "https://github.com/dani-garcia/bw_web_builds"; platforms = platforms.all; license = licenses.gpl3; maintainers = with maintainers; [ msteen ]; diff --git a/pkgs/tools/security/clevis/default.nix b/pkgs/tools/security/clevis/default.nix new file mode 100644 index 00000000000..4acec7c8a5b --- /dev/null +++ b/pkgs/tools/security/clevis/default.nix @@ -0,0 +1,27 @@ +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkgconfig, asciidoc +, jansson, jose, cryptsetup, curl, libpwquality, luksmeta +}: + +stdenv.mkDerivation rec { + pname = "clevis"; + version = "12"; + + src = fetchFromGitHub { + owner = "latchset"; + repo = pname; + rev = "v${version}"; + sha256 = "1dbyl3c21h841w9lrrq6gd5y6dhamr0z5ixd87jz86cn02lznp5m"; + }; + + nativeBuildInputs = [ meson ninja pkgconfig asciidoc ]; + buildInputs = [ jansson jose cryptsetup curl libpwquality luksmeta ]; + + outputs = [ "out" "man" ]; + + meta = { + description = "Automated Encryption Framework"; + homepage = "https://github.com/latchset/clevis"; + maintainers = with lib.maintainers; [ fpletz ]; + license = lib.licenses.gpl3Plus; + }; +} diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index 2aae6fc49d9..3924e6919d3 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/5.0.45" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/5.0.74" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index 931ea65f54a..2eaf8aa6c71 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,16 +1,15 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: 2b9e74c7a8a4423ea195e75abca1f56c354e5541 - ref: refs/tags/5.0.45 + revision: 22104a154544b3ee57d3ce98a490c4b42a4a8776 + ref: refs/tags/5.0.74 specs: - metasploit-framework (5.0.45) + metasploit-framework (5.0.74) actionpack (~> 4.2.6) activerecord (~> 4.2.6) activesupport (~> 4.2.6) aws-sdk-ec2 aws-sdk-iam aws-sdk-s3 - backports bcrypt (= 3.1.12) bcrypt_pbkdf bit-struct @@ -18,16 +17,19 @@ GIT dnsruby ed25519 em-http-request + eventmachine faker + faraday (<= 0.17.0) + faye-websocket filesize jsobfu json metasm - metasploit-concern - metasploit-credential - metasploit-model - metasploit-payloads (= 1.3.70) - metasploit_data_models (= 3.0.10) + metasploit-concern (~> 2.0.0) + metasploit-credential (~> 3.0.0) + metasploit-model (~> 2.0.4) + metasploit-payloads (= 1.3.84) + metasploit_data_models (~> 3.0.10) metasploit_payloads-mettle (= 0.5.16) mqtt msgpack @@ -61,7 +63,7 @@ GIT rex-random_identifier rex-registry rex-rop_builder - rex-socket (= 0.1.17) + rex-socket rex-sslscan rex-struct2 rex-text @@ -114,39 +116,38 @@ GEM public_suffix (>= 2.0.2, < 5.0) afm (0.2.2) arel (6.0.4) - arel-helpers (2.10.0) + arel-helpers (2.11.0) activerecord (>= 3.1.0, < 7) aws-eventstream (1.0.3) - aws-partitions (1.208.0) - aws-sdk-core (3.66.0) + aws-partitions (1.274.0) + aws-sdk-core (3.90.1) aws-eventstream (~> 1.0, >= 1.0.2) - aws-partitions (~> 1.0) + aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-ec2 (1.106.0) - aws-sdk-core (~> 3, >= 3.61.1) + aws-sdk-ec2 (1.144.0) + aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-iam (1.29.0) - aws-sdk-core (~> 3, >= 3.61.1) + aws-sdk-iam (1.33.0) + aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-kms (1.24.0) - aws-sdk-core (~> 3, >= 3.61.1) + aws-sdk-kms (1.29.0) + aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.48.0) - aws-sdk-core (~> 3, >= 3.61.1) + aws-sdk-s3 (1.60.2) + aws-sdk-core (~> 3, >= 3.83.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) aws-sigv4 (1.1.0) aws-eventstream (~> 1.0, >= 1.0.2) - backports (3.15.0) bcrypt (3.1.12) bcrypt_pbkdf (1.0.1) bindata (2.4.4) bit-struct (0.16) - builder (3.2.3) + builder (3.2.4) concurrent-ruby (1.0.5) cookiejar (0.3.3) - crass (1.0.4) + crass (1.0.6) daemons (1.3.1) dnsruby (1.61.3) addressable (~> 2.5) @@ -163,8 +164,11 @@ GEM eventmachine (1.2.7) faker (2.2.1) i18n (>= 0.8) - faraday (0.15.4) + faraday (0.17.0) multipart-post (>= 1.2, < 3) + faye-websocket (0.10.9) + eventmachine (>= 0.12.0) + websocket-driver (>= 0.5.1) filesize (0.2.0) hashery (2.1.2) http_parser.rb (0.6.0) @@ -173,8 +177,8 @@ GEM jmespath (1.4.0) jsobfu (0.4.2) rkelly-remix - json (2.2.0) - loofah (2.2.3) + json (2.3.0) + loofah (2.4.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) metasm (1.0.4) @@ -182,7 +186,7 @@ GEM activemodel (~> 4.2.6) activesupport (~> 4.2.6) railties (~> 4.2.6) - metasploit-credential (3.0.3) + metasploit-credential (3.0.4) metasploit-concern metasploit-model metasploit_data_models (>= 3.0.0) @@ -196,7 +200,7 @@ GEM activemodel (~> 4.2.6) activesupport (~> 4.2.6) railties (~> 4.2.6) - metasploit-payloads (1.3.70) + metasploit-payloads (1.3.84) metasploit_data_models (3.0.10) activerecord (~> 4.2.6) activesupport (~> 4.2.6) @@ -209,17 +213,18 @@ GEM recog (~> 2.0) metasploit_payloads-mettle (0.5.16) mini_portile2 (2.4.0) - minitest (5.11.3) + minitest (5.14.0) mqtt (0.5.0) - msgpack (1.3.1) + msgpack (1.3.3) multipart-post (2.1.1) nessus_rest (0.1.6) net-ssh (5.2.0) network_interface (0.0.2) nexpose (7.2.1) - nokogiri (1.10.4) + nokogiri (1.10.8) mini_portile2 (~> 2.4.0) - octokit (4.14.0) + octokit (4.16.0) + faraday (>= 0.9) sawyer (~> 0.8.0, >= 0.5.3) openssl-ccm (1.2.2) openvas-omp (0.0.4) @@ -227,7 +232,7 @@ GEM pcaprub patch_finder (1.0.2) pcaprub (0.13.0) - pdf-reader (2.2.1) + pdf-reader (2.4.0) Ascii85 (~> 1.0.0) afm (~> 0.2.1) hashery (~> 2.0) @@ -239,8 +244,8 @@ GEM activerecord (~> 4.0) arel (>= 4.0.1) pg_array_parser (~> 0.0.9) - public_suffix (4.0.1) - rack (1.6.11) + public_suffix (4.0.3) + rack (1.6.13) rack-protection (1.5.5) rack rack-test (0.6.3) @@ -251,16 +256,16 @@ GEM activesupport (>= 4.2.0, < 5.0) nokogiri (~> 1.6) rails-deprecated_sanitizer (>= 1.0.1) - rails-html-sanitizer (1.2.0) - loofah (~> 2.2, >= 2.2.2) + rails-html-sanitizer (1.3.0) + loofah (~> 2.3) railties (4.2.11.1) actionpack (= 4.2.11.1) activesupport (= 4.2.11.1) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (12.3.3) + rake (13.0.1) rb-readline (0.5.5) - recog (2.3.2) + recog (2.3.6) nokogiri redcarpet (3.5.0) rex-arch (0.1.13) @@ -276,7 +281,7 @@ GEM metasm rex-arch rex-text - rex-exploitation (0.1.21) + rex-exploitation (0.1.22) jsobfu metasm rex-arch @@ -289,7 +294,7 @@ GEM rex-arch rex-ole (0.1.6) rex-text - rex-powershell (0.1.82) + rex-powershell (0.1.86) rex-random_identifier rex-text rex-random_identifier (0.1.4) @@ -299,14 +304,14 @@ GEM metasm rex-core rex-text - rex-socket (0.1.17) + rex-socket (0.1.21) rex-core rex-sslscan (0.1.5) rex-core rex-socket rex-text rex-struct2 (0.1.2) - rex-text (0.2.23) + rex-text (0.2.24) rex-zip (0.1.3) rex-text rkelly-remix (0.0.7) @@ -317,7 +322,7 @@ GEM rubyntlm windows_error rubyntlm (0.6.2) - rubyzip (1.2.3) + rubyzip (2.2.0) sawyer (0.8.2) addressable (>= 2.3.5) faraday (> 0.8, < 2.0) @@ -325,22 +330,25 @@ GEM rack (~> 1.5) rack-protection (~> 1.4) tilt (>= 1.3, < 3) - sqlite3 (1.4.1) + sqlite3 (1.4.2) sshkey (2.0.0) thin (1.7.2) daemons (~> 1.0, >= 1.0.9) eventmachine (~> 1.0, >= 1.0.4) rack (>= 1, < 3) - thor (0.20.3) + thor (1.0.1) thread_safe (0.3.6) - tilt (2.0.9) - ttfunk (1.5.1) - tzinfo (1.2.5) + tilt (2.0.10) + ttfunk (1.6.2.1) + tzinfo (1.2.6) thread_safe (~> 0.1) - tzinfo-data (1.2019.2) + tzinfo-data (1.2019.3) tzinfo (>= 1.0.0) warden (1.2.7) rack (>= 1.0) + websocket-driver (0.7.1) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.4) windows_error (0.1.2) xdr (2.0.0) activemodel (>= 4.2.7) @@ -354,4 +362,4 @@ DEPENDENCIES metasploit-framework! BUNDLED WITH - 1.17.2 + 1.17.3 diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index 8486f10bab0..31d45c30db7 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -17,13 +17,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "5.0.45"; + version = "5.0.74"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "16jl3fkfbwl4wwbj2zrq9yr8y8brkhj9641hplc8idv8gaqkgmm5"; + sha256 = "1ml4d6xfaxyv1mamc2qldd39db92qkic8660f8clabi9f1k0ghpp"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index 28cc83b240f..a35aa958a1d 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -1,6 +1,5 @@ { actionpack = { - dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; groups = ["default"]; platforms = []; source = { @@ -11,7 +10,6 @@ version = "4.2.11.1"; }; actionview = { - dependencies = ["activesupport" "builder" "erubis" "rails-dom-testing" "rails-html-sanitizer"]; groups = ["default"]; platforms = []; source = { @@ -22,7 +20,6 @@ version = "4.2.11.1"; }; activemodel = { - dependencies = ["activesupport" "builder"]; groups = ["default"]; platforms = []; source = { @@ -33,7 +30,6 @@ version = "4.2.11.1"; }; activerecord = { - dependencies = ["activemodel" "activesupport" "arel"]; groups = ["default"]; platforms = []; source = { @@ -44,7 +40,6 @@ version = "4.2.11.1"; }; activesupport = { - dependencies = ["i18n" "minitest" "thread_safe" "tzinfo"]; groups = ["default"]; platforms = []; source = { @@ -55,7 +50,6 @@ version = "4.2.11.1"; }; addressable = { - dependencies = ["public_suffix"]; groups = ["default"]; platforms = []; source = { @@ -86,15 +80,14 @@ version = "6.0.4"; }; arel-helpers = { - dependencies = ["activerecord"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lb52rd20ix7khh70vrwd85qivir9sis62s055k3zr5h9iy3lyqi"; + sha256 = "16irs6rai9pasv36yy31glijs3p2pvgry5g1lh03vnzg8xpb1msp"; type = "gem"; }; - version = "2.10.0"; + version = "2.11.0"; }; Ascii85 = { groups = ["default"]; @@ -121,68 +114,62 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vkjw8cxssfwplrcl593gp4jxxiajihb8gqmpgzyac8i3xigpacb"; + sha256 = "1k2dpn0xznksh5y9bq9gbvbych06pzyswsdak7bz8nlkbsgf38x3"; type = "gem"; }; - version = "1.208.0"; + version = "1.274.0"; }; aws-sdk-core = { - dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18h35j7wp7n6zc5r6dpixjcyjshqmpkhwph9qgpv2g0db37zlxyk"; + sha256 = "1q7f9jkpmpppj31kh3wnzybkphq4piy8ays3vld0zsibfjs9iw7i"; type = "gem"; }; - version = "3.66.0"; + version = "3.90.1"; }; aws-sdk-ec2 = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1sb04blmc0lgdgq909cj8cm63zl2idgc5mcysj6cg4rvm8699ahp"; + sha256 = "1wnql5rzwkn97w4l3pq6k97grqdci1qs7h132pnd6lc3bx62v4h5"; type = "gem"; }; - version = "1.106.0"; + version = "1.144.0"; }; aws-sdk-iam = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ypv1cmmrc496myllqd8dqz422qm1i0bhskkvqb9b2lbagmzr3l9"; + sha256 = "0s78ssjcp974v7r1znrgk78bqz23jhws4gy1nm659z5390zsn1fz"; type = "gem"; }; - version = "1.29.0"; + version = "1.33.0"; }; aws-sdk-kms = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14blvvfz67rhffi4ahby50jiip5f0hm85mcxlx6y93g0cfrnxh3m"; + sha256 = "191qnrpg9qhwj24pisha28fwqx30sqkj75ibgpqcf4q389l3a2gw"; type = "gem"; }; - version = "1.24.0"; + version = "1.29.0"; }; aws-sdk-s3 = { - dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14iv2wqvvbiz0gdms21i9n6rh8390r1yg4zcf8pzzfplbqfwqw4w"; + sha256 = "1pblkq7rw465w08hs2xy6v7w10x9n004hk43yqzswqxirki68ldz"; type = "gem"; }; - version = "1.48.0"; + version = "1.60.2"; }; aws-sigv4 = { - dependencies = ["aws-eventstream"]; groups = ["default"]; platforms = []; source = { @@ -192,16 +179,6 @@ }; version = "1.1.0"; }; - backports = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0cczfi1yp7a68bg7ipzi4lvrmi4xsi36n9a19krr4yb3nfwd8fn2"; - type = "gem"; - }; - version = "3.15.0"; - }; bcrypt = { groups = ["default"]; platforms = []; @@ -247,10 +224,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qibi5s67lpdv1wgcj66wcymcr04q6j4mzws6a479n0mlrmh5wr1"; + sha256 = "045wzckxpwcqzrjr353cxnyaxgf0qg22jh00dcx7z38cys5g1jlr"; type = "gem"; }; - version = "3.2.3"; + version = "3.2.4"; }; concurrent-ruby = { groups = ["default"]; @@ -277,10 +254,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bpxzy6gjw9ggjynlxschbfsgmx8lv3zw1azkjvnb8b9i895dqfi"; + sha256 = "0pfl5c0pyqaparxaqxi6s4gfl21bdldwiawrc0aknyvflli60lfw"; type = "gem"; }; - version = "1.0.4"; + version = "1.0.6"; }; daemons = { groups = ["default"]; @@ -293,7 +270,6 @@ version = "1.3.1"; }; dnsruby = { - dependencies = ["addressable"]; groups = ["default"]; platforms = []; source = { @@ -314,7 +290,6 @@ version = "1.2.4"; }; em-http-request = { - dependencies = ["addressable" "cookiejar" "em-socksify" "eventmachine" "http_parser.rb"]; groups = ["default"]; platforms = []; source = { @@ -325,7 +300,6 @@ version = "1.1.5"; }; em-socksify = { - dependencies = ["eventmachine"]; groups = ["default"]; platforms = []; source = { @@ -356,7 +330,6 @@ version = "1.2.7"; }; faker = { - dependencies = ["i18n"]; groups = ["default"]; platforms = []; source = { @@ -367,15 +340,24 @@ version = "2.2.1"; }; faraday = { - dependencies = ["multipart-post"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s72m05jvzc1pd6cw1i289chas399q0a14xrwg4rvkdwy7bgzrh0"; + sha256 = "0jk2bar4x6miq2cr73lv0lsbmw4cymiljvp29xb85jifsb3ba6az"; type = "gem"; }; - version = "0.15.4"; + version = "0.17.0"; + }; + faye-websocket = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1kbp3rjwm74zdj0wy2n1cyyvd7ak4k8i8zva6ib4vqfcv8d2j11a"; + type = "gem"; + }; + version = "0.10.9"; }; filesize = { groups = ["default"]; @@ -408,7 +390,6 @@ version = "0.6.0"; }; i18n = { - dependencies = ["concurrent-ruby"]; groups = ["default"]; platforms = []; source = { @@ -429,7 +410,6 @@ version = "1.4.0"; }; jsobfu = { - dependencies = ["rkelly-remix"]; groups = ["default"]; platforms = []; source = { @@ -444,21 +424,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sx97bm9by389rbzv8r1f43h06xcz8vwi3h5jv074gvparql7lcx"; + sha256 = "0nrmw2r4nfxlfgprfgki3hjifgrcrs3l5zvm3ca3gb4743yr25mn"; type = "gem"; }; - version = "2.2.0"; + version = "2.3.0"; }; loofah = { - dependencies = ["crass" "nokogiri"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ccsid33xjajd0im2xv941aywi58z7ihwkvaf1w2bv89vn5bhsjg"; + sha256 = "1g7ps9m3s14cajhxrfgbzahv9i3gy47s4hqrv3mpybpj5cyr0srn"; type = "gem"; }; - version = "2.2.3"; + version = "2.4.0"; }; metasm = { groups = ["default"]; @@ -471,7 +450,6 @@ version = "1.0.4"; }; metasploit-concern = { - dependencies = ["activemodel" "activesupport" "railties"]; groups = ["default"]; platforms = []; source = { @@ -482,31 +460,28 @@ version = "2.0.5"; }; metasploit-credential = { - dependencies = ["metasploit-concern" "metasploit-model" "metasploit_data_models" "net-ssh" "pg" "railties" "rex-socket" "rubyntlm" "rubyzip"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0m6j149x502p00y2jzra65281dhhw3m8a41pwfn1sk9wv7aiclvl"; + sha256 = "1jh1mzvjpsmqamhwjqs6x2bx550mxkqjvl0f1gl1g87w5qvg3w69"; type = "gem"; }; - version = "3.0.3"; + version = "3.0.4"; }; metasploit-framework = { - dependencies = ["actionpack" "activerecord" "activesupport" "aws-sdk-ec2" "aws-sdk-iam" "aws-sdk-s3" "backports" "bcrypt" "bcrypt_pbkdf" "bit-struct" "concurrent-ruby" "dnsruby" "ed25519" "em-http-request" "faker" "filesize" "jsobfu" "json" "metasm" "metasploit-concern" "metasploit-credential" "metasploit-model" "metasploit-payloads" "metasploit_data_models" "metasploit_payloads-mettle" "mqtt" "msgpack" "nessus_rest" "net-ssh" "network_interface" "nexpose" "nokogiri" "octokit" "openssl-ccm" "openvas-omp" "packetfu" "patch_finder" "pcaprub" "pdf-reader" "pg" "railties" "rb-readline" "recog" "redcarpet" "rex-arch" "rex-bin_tools" "rex-core" "rex-encoder" "rex-exploitation" "rex-java" "rex-mime" "rex-nop" "rex-ole" "rex-powershell" "rex-random_identifier" "rex-registry" "rex-rop_builder" "rex-socket" "rex-sslscan" "rex-struct2" "rex-text" "rex-zip" "ruby-macho" "ruby_smb" "rubyntlm" "rubyzip" "sinatra" "sqlite3" "sshkey" "thin" "tzinfo" "tzinfo-data" "warden" "windows_error" "xdr" "xmlrpc"]; groups = ["default"]; platforms = []; source = { fetchSubmodules = false; - rev = "2b9e74c7a8a4423ea195e75abca1f56c354e5541"; - sha256 = "16jl3fkfbwl4wwbj2zrq9yr8y8brkhj9641hplc8idv8gaqkgmm5"; + rev = "22104a154544b3ee57d3ce98a490c4b42a4a8776"; + sha256 = "1ml4d6xfaxyv1mamc2qldd39db92qkic8660f8clabi9f1k0ghpp"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "5.0.45"; + version = "5.0.74"; }; metasploit-model = { - dependencies = ["activemodel" "activesupport" "railties"]; groups = ["default"]; platforms = []; source = { @@ -521,13 +496,12 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01s3xmgw4fp2ic0wql8lswa86q3lgr3z687idx3xkfii3dskjpp3"; + sha256 = "1wz72w5a34r6jcgbl97ha3zhl8d28r974clcp99qj5sg71k280c0"; type = "gem"; }; - version = "1.3.70"; + version = "1.3.84"; }; metasploit_data_models = { - dependencies = ["activerecord" "activesupport" "arel-helpers" "metasploit-concern" "metasploit-model" "pg" "postgres_ext" "railties" "recog"]; groups = ["default"]; platforms = []; source = { @@ -562,10 +536,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0icglrhghgwdlnzzp4jf76b0mbc71s80njn5afyfjn4wqji8mqbq"; + sha256 = "0g73x65hmjph8dg1h3rkzfg7ys3ffxm35hj35grw75fixmq53qyz"; type = "gem"; }; - version = "5.11.3"; + version = "5.14.0"; }; mqtt = { groups = ["default"]; @@ -582,10 +556,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qr2mkm2i3m76zarvy7qgjl9596hmvjrg7x6w42vx8cfsbf5p0y1"; + sha256 = "1lva6bkvb4mfa0m3bqn4lm4s4gi81c40jvdcsrxr6vng49q9daih"; type = "gem"; }; - version = "1.3.1"; + version = "1.3.3"; }; multipart-post = { groups = ["default"]; @@ -638,26 +612,24 @@ version = "7.2.1"; }; nokogiri = { - dependencies = ["mini_portile2"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nmdrqqz1gs0fwkgzxjl4wr554gr8dc1fkrqjc2jpsvwgm41rygv"; + sha256 = "1yi8j8hwrlc3rg5v3w52gxndmwifyk7m732q9yfbal0qajqbh1h8"; type = "gem"; }; - version = "1.10.4"; + version = "1.10.8"; }; octokit = { - dependencies = ["sawyer"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1w7agbfg39jzqk81yad9xhscg31869277ysr2iwdvpjafl5lj4ha"; + sha256 = "06kx258qa5k24q5pv8i4daaw3g57gif6p5k5h3gndj3q2jk6vhkn"; type = "gem"; }; - version = "4.14.0"; + version = "4.16.0"; }; openssl-ccm = { groups = ["default"]; @@ -680,7 +652,6 @@ version = "0.0.4"; }; packetfu = { - dependencies = ["pcaprub"]; groups = ["default"]; platforms = []; source = { @@ -711,15 +682,14 @@ version = "0.13.0"; }; pdf-reader = { - dependencies = ["Ascii85" "afm" "hashery" "ruby-rc4" "ttfunk"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14lqdbiwn2qwgbvnnzxg7haqiy026d8x37hp45c3m9jb9rym92ps"; + sha256 = "1g3gr2m46275hjv6fv4jwq3qlvdbnhf1jxir9vzgxhv45ncnhffy"; type = "gem"; }; - version = "2.2.1"; + version = "2.4.0"; }; pg = { groups = ["default"]; @@ -742,7 +712,6 @@ version = "0.0.9"; }; postgres_ext = { - dependencies = ["activerecord" "arel" "pg_array_parser"]; groups = ["default"]; platforms = []; source = { @@ -757,23 +726,22 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xnfv2j2bqgdpg2yq9i2rxby0w2sc9h5iyjkpaas2xknwrgmhdb0"; + sha256 = "1c6kq6s13idl2036b5lch8r7390f8w82cal8hcp4ml76fm2vdac7"; type = "gem"; }; - version = "4.0.1"; + version = "4.0.3"; }; rack = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1g9926ln2lw12lfxm4ylq1h6nl0rafl10za3xvjzc87qvnqic87f"; + sha256 = "0wr1f3g9rc9i8svfxa9cijajl1661d817s56b2w7rd572zwn0zi0"; type = "gem"; }; - version = "1.6.11"; + version = "1.6.13"; }; rack-protection = { - dependencies = ["rack"]; groups = ["default"]; platforms = []; source = { @@ -784,7 +752,6 @@ version = "1.5.5"; }; rack-test = { - dependencies = ["rack"]; groups = ["default"]; platforms = []; source = { @@ -795,7 +762,6 @@ version = "0.6.3"; }; rails-deprecated_sanitizer = { - dependencies = ["activesupport"]; groups = ["default"]; platforms = []; source = { @@ -806,7 +772,6 @@ version = "1.0.3"; }; rails-dom-testing = { - dependencies = ["activesupport" "nokogiri" "rails-deprecated_sanitizer"]; groups = ["default"]; platforms = []; source = { @@ -817,18 +782,16 @@ version = "1.0.9"; }; rails-html-sanitizer = { - dependencies = ["loofah"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ilwxzm3a7bql5c9q2n9g9nb1hax7vd8d65a5yp3d967ld97nvrq"; + sha256 = "1icpqmxbppl4ynzmn6dx7wdil5hhq6fz707m9ya6d86c7ys8sd4f"; type = "gem"; }; - version = "1.2.0"; + version = "1.3.0"; }; railties = { - dependencies = ["actionpack" "activesupport" "rake" "thor"]; groups = ["default"]; platforms = []; source = { @@ -843,10 +806,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1cvaqarr1m84mhc006g3l1vw7sa5qpkcw0138lsxlf769zdllsgp"; + sha256 = "0w6qza25bq1s825faaglkx1k6d59aiyjjk3yw3ip5sb463mhhai9"; type = "gem"; }; - version = "12.3.3"; + version = "13.0.1"; }; rb-readline = { groups = ["default"]; @@ -859,15 +822,14 @@ version = "0.5.5"; }; recog = { - dependencies = ["nokogiri"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kbv0j82zf90sc9hhwna2bkb5zv0nxagk22gxyfy82kjmcz71c6k"; + sha256 = "0kw753vq5m5m8pzn1avafzz757gdzzsv7ck94y6d8n4jzqa50isv"; type = "gem"; }; - version = "2.3.2"; + version = "2.3.6"; }; redcarpet = { groups = ["default"]; @@ -880,7 +842,6 @@ version = "3.5.0"; }; rex-arch = { - dependencies = ["rex-text"]; groups = ["default"]; platforms = []; source = { @@ -891,7 +852,6 @@ version = "0.1.13"; }; rex-bin_tools = { - dependencies = ["metasm" "rex-arch" "rex-core" "rex-struct2" "rex-text"]; groups = ["default"]; platforms = []; source = { @@ -912,7 +872,6 @@ version = "0.1.13"; }; rex-encoder = { - dependencies = ["metasm" "rex-arch" "rex-text"]; groups = ["default"]; platforms = []; source = { @@ -923,15 +882,14 @@ version = "0.1.4"; }; rex-exploitation = { - dependencies = ["jsobfu" "metasm" "rex-arch" "rex-encoder" "rex-text"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0b2jg7mccwc34j9mfpndh7b387723qas38qsd906bs4s8b6hf05c"; + sha256 = "16anprj4pc4pi2yb1y6b7c8nrqgpk49g40wy1384snmii24jiwyx"; type = "gem"; }; - version = "0.1.21"; + version = "0.1.22"; }; rex-java = { groups = ["default"]; @@ -944,7 +902,6 @@ version = "0.1.5"; }; rex-mime = { - dependencies = ["rex-text"]; groups = ["default"]; platforms = []; source = { @@ -955,7 +912,6 @@ version = "0.1.5"; }; rex-nop = { - dependencies = ["rex-arch"]; groups = ["default"]; platforms = []; source = { @@ -966,7 +922,6 @@ version = "0.1.1"; }; rex-ole = { - dependencies = ["rex-text"]; groups = ["default"]; platforms = []; source = { @@ -977,18 +932,16 @@ version = "0.1.6"; }; rex-powershell = { - dependencies = ["rex-random_identifier" "rex-text"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fcyiz8cgcv6pcn5w969ac4wwhr1cz6jk6kf6p8gyw5rjrlwfz0j"; + sha256 = "150nmpgrvpd6hyx9cghah8dxpcfb1h7inpcwmz7ijpir60zxxfdj"; type = "gem"; }; - version = "0.1.82"; + version = "0.1.86"; }; rex-random_identifier = { - dependencies = ["rex-text"]; groups = ["default"]; platforms = []; source = { @@ -1009,7 +962,6 @@ version = "0.1.3"; }; rex-rop_builder = { - dependencies = ["metasm" "rex-core" "rex-text"]; groups = ["default"]; platforms = []; source = { @@ -1020,18 +972,16 @@ version = "0.1.3"; }; rex-socket = { - dependencies = ["rex-core"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "136szyv31fcdzmcgs44vg009k3ssyawkqppkhm3xyv2ivpp1mlgv"; + sha256 = "0jkmff92ga9qd9gg13cd6s99qcdmr5n354l9br70j784mpyl9apb"; type = "gem"; }; - version = "0.1.17"; + version = "0.1.21"; }; rex-sslscan = { - dependencies = ["rex-core" "rex-socket" "rex-text"]; groups = ["default"]; platforms = []; source = { @@ -1056,13 +1006,12 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cmfwzd3r6xzhaw5l2grgiivql1yynh620drg8h39q8hiixya6xz"; + sha256 = "0wjrp4n7j2ifdgqc6z8z4jbz9gr7g5m5h35b7vx4k9cbaq9b5zxw"; type = "gem"; }; - version = "0.2.23"; + version = "0.2.24"; }; rex-zip = { - dependencies = ["rex-text"]; groups = ["default"]; platforms = []; source = { @@ -1103,7 +1052,6 @@ version = "0.1.5"; }; ruby_smb = { - dependencies = ["bindata" "rubyntlm" "windows_error"]; groups = ["default"]; platforms = []; source = { @@ -1128,13 +1076,12 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1w9gw28ly3zyqydnm8phxchf4ymyjl2r7zf7c12z8kla10cpmhlc"; + sha256 = "13b15icwx0c8zzjfzf7bmqq9ynilw0dy8ydgjb199nqzp93p6wqv"; type = "gem"; }; - version = "1.2.3"; + version = "2.2.0"; }; sawyer = { - dependencies = ["addressable" "faraday"]; groups = ["default"]; platforms = []; source = { @@ -1145,7 +1092,6 @@ version = "0.8.2"; }; sinatra = { - dependencies = ["rack" "rack-protection" "tilt"]; groups = ["default"]; platforms = []; source = { @@ -1160,10 +1106,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1v903nbcws3ifm6jnxrdfcpgl1qg2x3lbif16mhlbyfn0npzb494"; + sha256 = "0lja01cp9xd5m6vmx99zwn4r7s97r1w5cb76gqd8xhbm1wxyzf78"; type = "gem"; }; - version = "1.4.1"; + version = "1.4.2"; }; sshkey = { groups = ["default"]; @@ -1176,7 +1122,6 @@ version = "2.0.0"; }; thin = { - dependencies = ["daemons" "eventmachine" "rack"]; groups = ["default"]; platforms = []; source = { @@ -1191,10 +1136,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yhrnp9x8qcy5vc7g438amd5j9sw83ih7c30dr6g6slgw9zj3g29"; + sha256 = "1xbhkmyhlxwzshaqa7swy2bx6vd64mm0wrr8g3jywvxy7hg0cwkm"; type = "gem"; }; - version = "0.20.3"; + version = "1.0.1"; }; thread_safe = { groups = ["default"]; @@ -1211,45 +1156,42 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ca4k0clwf0rkvy7726x4nxpjxkpv67w043i39saxgldxd97zmwz"; + sha256 = "0rn8z8hda4h41a64l0zhkiwz2vxw9b1nb70gl37h1dg2k874yrlv"; type = "gem"; }; - version = "2.0.9"; + version = "2.0.10"; }; ttfunk = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mgrnqla5n51v4ivn844albsajkck7k6lviphfqa8470r46c58cd"; + sha256 = "0w0bjn6k38xv46mr02p3038gwk5jj5hl398bv5kr625msxkdhqzn"; type = "gem"; }; - version = "1.5.1"; + version = "1.6.2.1"; }; tzinfo = { - dependencies = ["thread_safe"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fjx9j327xpkkdlxwmkl3a8wqj7i4l4jwlrv3z13mg95z9wl253z"; + sha256 = "04f18jdv6z3zn3va50rqq35nj3izjpb72fnf21ixm7vanq6nc4fp"; type = "gem"; }; - version = "1.2.5"; + version = "1.2.6"; }; tzinfo-data = { - dependencies = ["tzinfo"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1m507in0d7vlfgasxpkz3y1a44zp532k9qlqcaz90ay939sz9h5q"; + sha256 = "17fbf05qhcxp8anmp7k5wnafw3ypy607h5ybnqg92dqgh4b1c3yi"; type = "gem"; }; - version = "1.2019.2"; + version = "1.2019.3"; }; warden = { - dependencies = ["rack"]; groups = ["default"]; platforms = []; source = { @@ -1259,6 +1201,26 @@ }; version = "1.2.7"; }; + websocket-driver = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1bxamwqldmy98hxs5pqby3andws14hl36ch78g0s81gaz9b91nj2"; + type = "gem"; + }; + version = "0.7.1"; + }; + websocket-extensions = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00i624ng1nvkz1yckj3f8yxxp6hi7xaqf40qh9q3hj2n1l9i8g6m"; + type = "gem"; + }; + version = "0.1.4"; + }; windows_error = { groups = ["default"]; platforms = []; @@ -1270,7 +1232,6 @@ version = "0.1.2"; }; xdr = { - dependencies = ["activemodel" "activesupport"]; groups = ["default"]; platforms = []; source = { diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index 698693be95e..78d5b4441d5 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -28,6 +28,8 @@ stdenv.mkDerivation rec { buildInputs = [ libevent openssl zlib lzma zstd scrypt ] ++ stdenv.lib.optionals stdenv.isLinux [ libseccomp systemd libcap ]; + patches = [ ./disable-monotonic-timer-tests.patch ]; + NIX_CFLAGS_LINK = stdenv.lib.optionalString stdenv.cc.isGNU "-lgcc_s"; postPatch = '' @@ -39,7 +41,6 @@ stdenv.mkDerivation rec { ''; enableParallelBuilding = true; - enableParallelChecking = false; # 4 tests fail randomly doCheck = true; diff --git a/pkgs/tools/security/tor/disable-monotonic-timer-tests.patch b/pkgs/tools/security/tor/disable-monotonic-timer-tests.patch new file mode 100644 index 00000000000..a95a373bbb6 --- /dev/null +++ b/pkgs/tools/security/tor/disable-monotonic-timer-tests.patch @@ -0,0 +1,26 @@ +diff --git a/src/test/test_util.c b/src/test/test_util.c +index 0d86a5ab5..e93c6ba89 100644 +--- a/src/test/test_util.c ++++ b/src/test/test_util.c +@@ -5829,13 +5829,9 @@ test_util_monotonic_time(void *arg) + /* We need to be a little careful here since we don't know the system load. + */ + tt_i64_op(monotime_diff_msec(&mt1, &mt2), OP_GE, 175); +- tt_i64_op(monotime_diff_msec(&mt1, &mt2), OP_LT, 1000); + tt_i64_op(monotime_coarse_diff_msec(&mtc1, &mtc2), OP_GE, 125); +- tt_i64_op(monotime_coarse_diff_msec(&mtc1, &mtc2), OP_LT, 1000); + tt_u64_op(nsec2-nsec1, OP_GE, 175000000); +- tt_u64_op(nsec2-nsec1, OP_LT, 1000000000); + tt_u64_op(nsecc2-nsecc1, OP_GE, 125000000); +- tt_u64_op(nsecc2-nsecc1, OP_LT, 1000000000); + + tt_u64_op(msec1, OP_GE, nsec1 / 1000000); + tt_u64_op(usec1, OP_GE, nsec1 / 1000); +@@ -5849,7 +5845,6 @@ test_util_monotonic_time(void *arg) + uint64_t coarse_stamp_diff = + monotime_coarse_stamp_units_to_approx_msec(stamp2-stamp1); + tt_u64_op(coarse_stamp_diff, OP_GE, 120); +- tt_u64_op(coarse_stamp_diff, OP_LE, 1200); + + { + uint64_t units = monotime_msec_to_approx_coarse_stamp_units(5000); diff --git a/pkgs/tools/system/efibootmgr/default.nix b/pkgs/tools/system/efibootmgr/default.nix index 272809e486c..a2487324849 100644 --- a/pkgs/tools/system/efibootmgr/default.nix +++ b/pkgs/tools/system/efibootmgr/default.nix @@ -22,6 +22,8 @@ stdenv.mkDerivation rec { sha256 = "1sbijvlpv4khkix3vix9mbhzffj8lp8zpnbxm9gnzjz8yssz9p5h"; }) ]; + # We have no LTO here since commit 22284b07. + postPatch = if stdenv.isi686 then "sed '/^CFLAGS/s/-flto//' -i Make.defaults" else null; makeFlags = [ "EFIDIR=nixos" ]; diff --git a/pkgs/tools/system/efivar/default.nix b/pkgs/tools/system/efivar/default.nix index f02923de349..71389af7423 100644 --- a/pkgs/tools/system/efivar/default.nix +++ b/pkgs/tools/system/efivar/default.nix @@ -29,6 +29,8 @@ stdenv.mkDerivation rec { sha256 = "0lc38npydp069nlcga25wzzm204ww9l6mpjfn6wmhdfhn0pgjwky"; }) ]; + # We have no LTO here since commit 22284b07. + postPatch = if stdenv.isi686 then "sed '/^OPTIMIZE /s/-flto//' -i Make.defaults" else null; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ popt ]; diff --git a/pkgs/tools/system/mq-cli/default.nix b/pkgs/tools/system/mq-cli/default.nix index f685259429d..afde8b8f9d2 100644 --- a/pkgs/tools/system/mq-cli/default.nix +++ b/pkgs/tools/system/mq-cli/default.nix @@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "02z85waj5jc312biv2qhbgplsggxgjmfmyv9v8b1ky0iq1mpxjw7"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "03ab6jbcgmbgg9hn7ihk8814sjwdmrr9p4xlll6nfdad4a7gq3yn"; + cargoSha256 = "19ccylnmmlm2d8kc178cffpjwrjlia6b4v3nzvxcs81a396ymr7b"; meta = with lib; { description = "CLI tool to manage POSIX message queues"; diff --git a/pkgs/tools/system/ytop/default.nix b/pkgs/tools/system/ytop/default.nix index 8732bf88ad7..7bd97507bea 100644 --- a/pkgs/tools/system/ytop/default.nix +++ b/pkgs/tools/system/ytop/default.nix @@ -4,22 +4,18 @@ assert stdenv.isDarwin -> IOKit != null; rustPlatform.buildRustPackage rec { pname = "ytop"; - version = "0.4.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "cjbassi"; repo = pname; rev = version; - sha256 = "1158nlg5b93jyljwvf9f2m8m3ph8sksk5dh9sfnvbiifbk4gizv7"; + sha256 = "1wpxn8i5112pzs8b03shl627r2yz70lvzjhd6f5crwhsnir06h5x"; }; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ IOKit ]; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "11pcchwahcwdvmfwfs6j2zg23grlw538wfs90mvqy2mpccj7d3ys"; - verifyCargoDeps = true; + cargoSha256 = "0wmlmkq4y2923i5kjhprw2hd2v5qls49ncs6h8g9rdlmwd7qdl86"; meta = with stdenv.lib; { description = "A TUI system monitor written in Rust"; diff --git a/pkgs/tools/text/amber/default.nix b/pkgs/tools/text/amber/default.nix index 95ffc592bfe..70bfaafbcec 100644 --- a/pkgs/tools/text/amber/default.nix +++ b/pkgs/tools/text/amber/default.nix @@ -13,10 +13,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0k70rk19hwdlhhqm91x12xcb8r09kzpijs0xwhplrwdh86qfxymx"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "0hh3sgcdcp0llgf3i3dysrr3vry3fv3fzzf44ad1953d5mnyhvap"; + cargoSha256 = "0g8n3r6bdsfl1417wnss3ggnv5ywz8mx53hjglshmln40552znh3"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; diff --git a/pkgs/tools/text/coloursum/default.nix b/pkgs/tools/text/coloursum/default.nix index 27e349c9d93..f38ada46c11 100644 --- a/pkgs/tools/text/coloursum/default.nix +++ b/pkgs/tools/text/coloursum/default.nix @@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1piz0l7qdcvjzfykm6rzqc8s1daxp3cj3923v9cmm41bc2v0p5q0"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "091flc5ymx0y43ld6bdmig5cy479b90bkmwv3yaysi5kpr28skvh"; + cargoSha256 = "1w0q5w0bf1682jvzcml8cgmr9mrgi4if0p63wzchyjav330dp6pk"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; diff --git a/pkgs/tools/text/mdbook/default.nix b/pkgs/tools/text/mdbook/default.nix index 6f9f8577501..2aad1755cff 100644 --- a/pkgs/tools/text/mdbook/default.nix +++ b/pkgs/tools/text/mdbook/default.nix @@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0gcrv54iswphzxxkmak1c7pmmpakiri6jk50j4bxrsplwjr76f7n"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "00grlxjz61vxinr18f28ga6610yjxcq48lr75wmyc5wq317j12fn"; + cargoSha256 = "12i9w9dgji36yvvdks0vkjjkh32nbnhz76sgrl2827pj49h9vnn0"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; diff --git a/pkgs/tools/text/mdcat/default.nix b/pkgs/tools/text/mdcat/default.nix index 7a97a110381..9bb3d7469ef 100644 --- a/pkgs/tools/text/mdcat/default.nix +++ b/pkgs/tools/text/mdcat/default.nix @@ -2,22 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "mdcat"; - version = "0.15.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "lunaryorn"; repo = pname; rev = "mdcat-${version}"; - sha256 = "1x9c3cj3y8wvwr74kbz6nrdh61rinr98gcp3hnjpi6c3vg3xx4wh"; + sha256 = "0qvlnjw0h2hnap1crnprdrynqvg7pywq32qin5fdkk4fv496wjhs"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ openssl ] ++ stdenv.lib.optional stdenv.isDarwin Security; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1kc434pa72n9xll2r4ddmd9xdwv3ls36cwsmdry392j41zmics51"; + cargoSha256 = "12s0dakv37vvvd43xzkydr7w3cpp7sizk8s1kalg4b0xz6ydghcp"; checkInputs = [ ansi2html ]; checkPhase = '' diff --git a/pkgs/tools/text/ruplacer/default.nix b/pkgs/tools/text/ruplacer/default.nix index d868f9e2529..535a00b7b4d 100644 --- a/pkgs/tools/text/ruplacer/default.nix +++ b/pkgs/tools/text/ruplacer/default.nix @@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0yj753d9wsnp4s5a71ph241jym5rfz3161a1v3qxfc4w23v86j1q"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1lzw4x40j25khf68x5srj8i05c11ls5y7km206vxn19vsy9ah4k9"; + cargoSha256 = "0wrv4k63pc1v0apmxmmci9qaykcv9ig3nfxy6id5caqrckp73cr4"; buildInputs = (stdenv.lib.optional stdenv.isDarwin Security); diff --git a/pkgs/tools/text/sd/default.nix b/pkgs/tools/text/sd/default.nix index 889dde46dea..1b6e4d945d4 100644 --- a/pkgs/tools/text/sd/default.nix +++ b/pkgs/tools/text/sd/default.nix @@ -12,10 +12,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1vxljmd1vh245yhv095i3l44pk915zr2pix4v9r8pz2fynp2nnmj"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1shqphbpn3ib28hnyib7mh1i5q56nshj864jm209s8qggbp96wp1"; + cargoSha256 = "0n4c0snmjfyk3z2mbzpqgb6ggyv4nqszdda035g3rzpbavzx9xb5"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix index 308f893e73b..6035c2950a9 100644 --- a/pkgs/tools/text/vale/default.nix +++ b/pkgs/tools/text/vale/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "vale"; - version = "1.7.1"; + version = "2.0.0"; subPackages = [ "." ]; @@ -10,13 +10,15 @@ buildGoPackage rec { owner = "errata-ai"; repo = "vale"; rev = "v${version}"; - sha256 = "1qi3brjppiymk6as0xic2n3bhq8g8qw1z8d9a24w60x9gp52yq5m"; + sha256 = "068973ayd883kzkxl60lpammf3icjz090nw07kfccvhcf24x07bh"; }; goPackagePath = "github.com/errata-ai/vale"; + buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + meta = with stdenv.lib; { - homepage = https://errata-ai.github.io/vale/; + homepage = "https://errata-ai.gitbook.io/vale/"; description = "A syntax-aware linter for prose built with speed and extensibility in mind"; license = licenses.mit; maintainers = [ maintainers.marsam ]; diff --git a/pkgs/tools/text/xsv/default.nix b/pkgs/tools/text/xsv/default.nix index b81b7b10982..72a586d2b22 100644 --- a/pkgs/tools/text/xsv/default.nix +++ b/pkgs/tools/text/xsv/default.nix @@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "17v1nw36mrarrd5yv4xd3mpc1d7lvhd5786mqkzyyraf78pjg045"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1xlbszr9ccv924ww45lnc0qqb7nxj2cnc41480xbpvsdqsdrgbhs"; + cargoSha256 = "1q59nvklh5r2mrsz656z6js3j2l6rqyhfz6l0yq28df5kyahk91b"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; diff --git a/pkgs/tools/typesetting/pdftk/default.nix b/pkgs/tools/typesetting/pdftk/default.nix index 72f25ef099b..b30d6269c34 100644 --- a/pkgs/tools/typesetting/pdftk/default.nix +++ b/pkgs/tools/typesetting/pdftk/default.nix @@ -1,42 +1,95 @@ -{ fetchurl, stdenv, gcj, unzip }: +{ stdenv, fetchFromGitLab, gradle_5, jre, perl, writeText, runtimeShell }: -stdenv.mkDerivation { - name = "pdftk-2.02"; +let + pname = "pdftk"; + version = "3.0.8"; - src = fetchurl { - url = "https://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/pdftk-2.02-src.zip"; - sha256 = "1hdq6zm2dx2f9h7bjrp6a1hfa1ywgkwydp14i2sszjiszljnm3qi"; + src = fetchFromGitLab { + owner = "pdftk-java"; + repo = "pdftk"; + rev = "v${version}"; + sha256 = "1bj4a9g5mbxd859mmawzs0mpm0jw7ap4n1imcwkwz142r9x1g6rk"; }; - nativeBuildInputs = [ gcj unzip ]; + deps = stdenv.mkDerivation { + pname = "${pname}-deps"; + inherit src version; - hardeningDisable = [ "fortify" "format" ]; + nativeBuildInputs = [ gradle_5 perl ]; - preBuild = '' - cd pdftk - sed -e 's@/usr/bin/@@g' -i Makefile.* - NIX_ENFORCE_PURITY= \ - make \ - LIBGCJ="${gcj.cc}/share/java/libgcj-${gcj.cc.version}.jar" \ - GCJ=gcj GCJH=gcjh GJAR=gjar \ - -iC ../java all + buildPhase = '' + export GRADLE_USER_HOME=$(mktemp -d) + gradle -Dfile.encoding=utf-8 shadowJar; + ''; + + # Mavenize dependency paths + # e.g. org.codehaus.groovy/groovy/2.4.0/{hash}/groovy-2.4.0.jar -> org/codehaus/groovy/groovy/2.4.0/groovy-2.4.0.jar + installPhase = '' + find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \ + | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ + | sh + ''; + + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "12b7lw1zpj69pv4bpbrm6pi0ip02ay3dfj3vcy2jyikfbwdb3qcz"; + }; + + # Point to our local deps repo + gradleInit = writeText "init.gradle" '' + logger.lifecycle 'Replacing Maven repositories with ${deps}...' + gradle.projectsLoaded { + rootProject.allprojects { + buildscript { + repositories { + clear() + maven { url '${deps}' } + } + } + repositories { + clear() + maven { url '${deps}' } + } + } + } + + settingsEvaluated { settings -> + settings.pluginManagement { + repositories { + maven { url '${deps}' } + } + } + } ''; - # Makefile.Debian has almost fitting defaults - makeFlags = [ "-f" "Makefile.Debian" "VERSUFF=" ]; +in stdenv.mkDerivation rec { + inherit pname version src; - installPhase = '' - mkdir -p $out/bin $out/share/man/man1 - cp pdftk $out/bin - cp ../pdftk.1 $out/share/man/man1 + nativeBuildInputs = [ gradle_5 ]; + + buildPhase = '' + export GRADLE_USER_HOME=$(mktemp -d) + gradle --offline --no-daemon --info --init-script ${gradleInit} shadowJar ''; + installPhase = '' + mkdir -p $out/{bin,share/pdftk,share/man/man1} + cp build/libs/pdftk.jar $out/share/pdftk + + cat << EOF > $out/bin/pdftk + #!${runtimeShell} + exec ${jre}/bin/java -jar "$out/share/pdftk/pdftk.jar" "\$@" + EOF + chmod a+x "$out/bin/pdftk" + + cp ${src}/pdftk.1 $out/share/man/man1 + ''; meta = { - description = "Simple tool for doing everyday things with PDF documents"; - homepage = https://www.pdflabs.com/tools/pdftk-server/; + description = "Command-line tool for working with PDFs"; + homepage = "https://gitlab.com/pdftk-java/pdftk"; license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [raskin]; - platforms = with stdenv.lib.platforms; linux; + maintainers = with stdenv.lib.maintainers; [ raskin averelld ]; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/typesetting/pdftk/legacy.nix b/pkgs/tools/typesetting/pdftk/legacy.nix new file mode 100644 index 00000000000..72f25ef099b --- /dev/null +++ b/pkgs/tools/typesetting/pdftk/legacy.nix @@ -0,0 +1,42 @@ +{ fetchurl, stdenv, gcj, unzip }: + +stdenv.mkDerivation { + name = "pdftk-2.02"; + + src = fetchurl { + url = "https://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/pdftk-2.02-src.zip"; + sha256 = "1hdq6zm2dx2f9h7bjrp6a1hfa1ywgkwydp14i2sszjiszljnm3qi"; + }; + + nativeBuildInputs = [ gcj unzip ]; + + hardeningDisable = [ "fortify" "format" ]; + + preBuild = '' + cd pdftk + sed -e 's@/usr/bin/@@g' -i Makefile.* + NIX_ENFORCE_PURITY= \ + make \ + LIBGCJ="${gcj.cc}/share/java/libgcj-${gcj.cc.version}.jar" \ + GCJ=gcj GCJH=gcjh GJAR=gjar \ + -iC ../java all + ''; + + # Makefile.Debian has almost fitting defaults + makeFlags = [ "-f" "Makefile.Debian" "VERSUFF=" ]; + + installPhase = '' + mkdir -p $out/bin $out/share/man/man1 + cp pdftk $out/bin + cp ../pdftk.1 $out/share/man/man1 + ''; + + + meta = { + description = "Simple tool for doing everyday things with PDF documents"; + homepage = https://www.pdflabs.com/tools/pdftk-server/; + license = stdenv.lib.licenses.gpl2; + maintainers = with stdenv.lib.maintainers; [raskin]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/tools/typesetting/satysfi/default.nix b/pkgs/tools/typesetting/satysfi/default.nix index 6a2ebb089d2..f2d447f66f6 100644 --- a/pkgs/tools/typesetting/satysfi/default.nix +++ b/pkgs/tools/typesetting/satysfi/default.nix @@ -15,27 +15,35 @@ let src = fetchFromGitHub { owner = "gfngfn"; repo = "camlpdf"; - rev = "v2.2.1+satysfi"; - sha256 = "1s8v2i8nq52kz038bvc2n0spz68fpdq6kgxrabcs6zvml6n1frzy"; + rev = "v2.2.2+satysfi"; + sha256 = "1dkyibjd8qb9fzljlzdsfdhb798vc9m8xqkd7295fm6bcfpr5r5k"; }; }); otfm = ocamlPackages.otfm.overrideAttrs (o: { src = fetchFromGitHub { owner = "gfngfn"; repo = "otfm"; - rev = "v0.3.2+satysfi"; - sha256 = "1h795pdi5qi2nwymsfvb53x56h9pqi9iiqbzw10mi6fazgd2dzhd"; + rev = "v0.3.7+satysfi"; + sha256 = "0y8s0ij1vp1s4h5y1hn3ns76fzki2ba5ysqdib33akdav9krbj8p"; + }; + }); + yojson = ocamlPackages.yojson.overrideAttrs (o: { + src = fetchFromGitHub { + owner = "gfngfn"; + repo = "yojson"; + rev = "v1.4.1+satysfi"; + sha256 = "06lajzycwmvc6s26cf40s9xn001cjxrpxijgfha3s4f4rpybb1mp"; }; }); in stdenv.mkDerivation rec { pname = "satysfi"; - version = "0.0.3"; + version = "0.0.4"; src = fetchFromGitHub { owner = "gfngfn"; repo = "SATySFi"; rev = "v${version}"; - sha256 = "0qk284jhxnfb69s24j397a6155dhl4dcgamicin7sq04d0wj6c7f"; + sha256 = "0ilvgixglklqwavf8p9mcbrjq6cjfm9pk4kqx163c0irh0lh0adv"; fetchSubmodules = true; }; @@ -49,7 +57,7 @@ in buildInputs = [ camlpdf otfm ] ++ (with ocamlPackages; [ ocaml findlib menhir - batteries camlimages core_kernel ppx_deriving uutf yojson + batteries camlimages core_kernel ppx_deriving uutf yojson omd cppo re ]); installPhase = '' @@ -58,13 +66,15 @@ in cp -r ${lm}/* lib-satysfi/dist/fonts/ cp -r ${lm-math}/otf/latinmodern-math.otf lib-satysfi/dist/fonts/ make install PREFIX=$out LIBDIR=$out/share/satysfi + mkdir -p $out/share/satysfi/ + cp -r lib-satysfi/dist/ $out/share/satysfi/ ''; meta = with stdenv.lib; { homepage = https://github.com/gfngfn/SATySFi; description = "A statically-typed, functional typesetting system"; license = licenses.lgpl3; - maintainers = [ maintainers.mt-caret ]; + maintainers = [ maintainers.mt-caret maintainers.marsam ]; platforms = platforms.all; }; } diff --git a/pkgs/tools/typesetting/tectonic/default.nix b/pkgs/tools/typesetting/tectonic/default.nix index b6d8cb67c11..7e4c7dafefe 100644 --- a/pkgs/tools/typesetting/tectonic/default.nix +++ b/pkgs/tools/typesetting/tectonic/default.nix @@ -12,10 +12,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0dycv135bkpf71iwlwh8rwwvn287d605nl7v8mjxlrsayiivdmn9"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "0bkgh73kqcdv3j9hr3m13wrdhls3zrk7aii9shzbzl6rnp2ry1az"; + cargoSha256 = "1axrf7d01gmhvrap13rydfvwcsg0lk1zw7z1i7zzm898bc7c02qn"; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fda84f4ac4f..b70c6856301 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1431,6 +1431,10 @@ in clasp = callPackage ../tools/misc/clasp { }; + clevis = callPackage ../tools/security/clevis { + asciidoc = asciidoc-full; + }; + cli53 = callPackage ../tools/admin/cli53 { }; cli-visualizer = callPackage ../applications/misc/cli-visualizer { }; @@ -1558,6 +1562,8 @@ in datasette = with python3Packages; toPythonApplication datasette; + howard-hinnant-date = callPackage ../development/libraries/howard-hinnant-date { }; + datefudge = callPackage ../tools/system/datefudge { }; dateutils = callPackage ../tools/misc/dateutils { }; @@ -1876,7 +1882,7 @@ in hostsblock = callPackage ../tools/misc/hostsblock { }; - hopper = callPackage ../development/tools/analysis/hopper {}; + hopper = qt5.callPackage ../development/tools/analysis/hopper {}; hr = callPackage ../applications/misc/hr { }; @@ -2115,7 +2121,7 @@ in riot-desktop = callPackage ../applications/networking/instant-messengers/riot/riot-desktop.nix { }; riot-web = callPackage ../applications/networking/instant-messengers/riot/riot-web.nix { - conf = config.riot-web.conf or null; + conf = config.riot-web.conf or {}; }; ripasso-cursive = callPackage ../tools/security/ripasso/cursive.nix { @@ -2405,11 +2411,7 @@ in ciopfs = callPackage ../tools/filesystems/ciopfs { }; - circleci-cli = callPackage ../development/tools/misc/circleci-cli { - # Version 0.1.5879 fails to build with go 1.13 due to: - # build github.com/CircleCI-Public/circleci-cli: cannot load github.com/gobuffalo/packr/v2: github.com/gobuffalo/packr@v1.21.0: reading file:///nix/store/hh9hrfdg3gbqz37sa3hx44mkzkxpkkyw-circleci-cli-0.1.5879-go-modules/github.com/gobuffalo/packr/@v/v1.21.0.zip: Not Found - buildGoModule = buildGo112Module; - }; + circleci-cli = callPackage ../development/tools/misc/circleci-cli { }; circus = callPackage ../tools/networking/circus { }; @@ -4312,6 +4314,8 @@ in jira-cli = callPackage ../development/tools/jira_cli { }; + jirafeau = callPackage ../servers/web-apps/jirafeau { }; + jitterentropy = callPackage ../development/libraries/jitterentropy { }; jl = haskellPackages.callPackage ../development/tools/jl { }; @@ -5005,6 +5009,8 @@ in boost = boost155; }; + mbutil = python3Packages.callPackage ../applications/misc/mbutil { }; + mc = callPackage ../tools/misc/mc { }; mcabber = callPackage ../applications/networking/instant-messengers/mcabber { }; @@ -5154,6 +5160,8 @@ in multitime = callPackage ../tools/misc/multitime { }; + sta = callPackage ../tools/misc/sta {}; + multitran = recurseIntoAttrs (let callPackage = newScope pkgs.multitran; in { multitrandata = callPackage ../tools/text/multitran/data { }; @@ -5287,6 +5295,8 @@ in networkmanager_dmenu = callPackage ../tools/networking/network-manager/dmenu { }; + nm-tray = libsForQt5.callPackage ../tools/networking/network-manager/tray.nix { }; + newsboat = callPackage ../applications/networking/feedreaders/newsboat { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -5461,6 +5471,8 @@ in ofono-phonesim = libsForQt5.callPackage ../development/tools/ofono-phonesim/default.nix { }; + ogdf = callPackage ../development/libraries/ogdf { }; + oh-my-zsh = callPackage ../shells/zsh/oh-my-zsh { }; ola = callPackage ../applications/misc/ola { }; @@ -6262,6 +6274,8 @@ in s3backer = callPackage ../tools/filesystems/s3backer { }; + s3bro = callPackage ../tools/admin/s3bro { }; + s3fs = callPackage ../tools/filesystems/s3fs { }; s3cmd = callPackage ../tools/networking/s3cmd { }; @@ -7352,9 +7366,13 @@ in xxkb = callPackage ../applications/misc/xxkb { }; - ugarit = callPackage ../tools/backup/ugarit { }; + ugarit = callPackage ../tools/backup/ugarit { + inherit (chickenPackages_4) eggDerivation fetchegg; + }; - ugarit-manifest-maker = callPackage ../tools/backup/ugarit-manifest-maker { }; + ugarit-manifest-maker = callPackage ../tools/backup/ugarit-manifest-maker { + inherit (chickenPackages_4) eggDerivation fetchegg; + }; unar = callPackage ../tools/archivers/unar { stdenv = clangStdenv; }; @@ -7923,8 +7941,6 @@ in stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; inherit (llvmPackages_6) clang llvm; }) - crystal_0_25 - crystal_0_26 crystal_0_27 crystal_0_29 crystal_0_30 @@ -8530,6 +8546,12 @@ in inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices; }; + julia_13 = callPackage ../development/compilers/julia/1.3.nix { + gmp = gmp6; + openblas = openblasCompat; + inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices; + }; + julia_1 = julia_10; julia = julia_1; @@ -9506,8 +9528,6 @@ in proglodyte-wasm = callPackage ../development/interpreters/proglodyte-wasm { }; - wasm-gc = callPackage ../development/interpreters/wasm-gc { }; - ### DEVELOPMENT / MISC @@ -10666,11 +10686,7 @@ in terracognita = callPackage ../development/tools/misc/terracognita { }; - terraform-lsp = callPackage ../development/tools/misc/terraform-lsp { - # Version 0.0.5 fails to build with go 1.13 due to dependency: - # build github.com/juliosueiras/terraform-lsp: cannot load github.com/googleapis/gax-go/v2: github.com/googleapis/gax-go@v2.0.0+incompatible: reading file:///nix/store/ihiyd3mqa5gvfm2k2716hpl16knak798-terraform-lsp-0.0.5-go-modules/github.com/googleapis/gax-go/@v/v2.0.0+incompatible.zip: Not Found - buildGoModule = buildGo112Module; - }; + terraform-lsp = callPackage ../development/tools/misc/terraform-lsp { }; texinfo413 = callPackage ../development/tools/misc/texinfo/4.13a.nix { }; texinfo4 = texinfo413; @@ -10695,6 +10711,8 @@ in todoist = callPackage ../applications/misc/todoist { }; + todoist-electron = callPackage ../applications/misc/todoist-electron { }; + todolist = callPackage ../applications/misc/todolist { }; travis = callPackage ../development/tools/misc/travis { }; @@ -11488,7 +11506,7 @@ in }; gdal = callPackage ../development/libraries/gdal { - pythonPackages = python3Packages; + pythonPackages = python3Packages; }; gdal_1_11 = callPackage ../development/libraries/gdal/gdal-1_11.nix { }; @@ -12060,6 +12078,8 @@ in jemalloc450 = callPackage ../development/libraries/jemalloc/jemalloc450.nix { }; + jose = callPackage ../development/libraries/jose { }; + jshon = callPackage ../development/tools/parsing/jshon { }; json2hcl = callPackage ../development/tools/json2hcl { }; @@ -12440,6 +12460,8 @@ in libfilezilla = callPackage ../development/libraries/libfilezilla { }; + libfishsound = callPackage ../development/libraries/libfishsound { }; + libfm = callPackage ../development/libraries/libfm { }; libfm-extra = libfm.override { extraOnly = true; @@ -13087,6 +13109,8 @@ in libunibreak = callPackage ../development/libraries/libunibreak { }; + libuninameslist = callPackage ../development/libraries/libuninameslist { }; + libunique = callPackage ../development/libraries/libunique { }; libunique3 = callPackage ../development/libraries/libunique/3.x.nix { }; @@ -13279,6 +13303,10 @@ in luabind_luajit = luabind.override { lua = luajit; }; + luksmeta = callPackage ../development/libraries/luksmeta { + asciidoc = asciidoc-full; + }; + lzo = callPackage ../development/libraries/lzo { }; opencl-clang = callPackage ../development/libraries/opencl-clang { }; @@ -15386,7 +15414,7 @@ in miniHttpd = callPackage ../servers/http/mini-httpd {}; mlflow-server = callPackage ../servers/mlflow-server { }; - + mlmmj = callPackage ../servers/mail/mlmmj { }; moodle = callPackage ../servers/web-apps/moodle { }; @@ -15652,6 +15680,10 @@ in libmemcached = null; # Detection is broken upstream }; + tang = callPackage ../servers/tang { + asciidoc = asciidoc-full; + }; + timescaledb-parallel-copy = callPackage ../development/tools/database/timescaledb-parallel-copy { }; timescaledb-tune = callPackage ../development/tools/database/timescaledb-tune { }; @@ -15757,11 +15789,7 @@ in redstore = callPackage ../servers/http/redstore { }; - restic = callPackage ../tools/backup/restic { - # Version 0.9.5 fails to build with go 1.13 due to dependency: - # go: bazil.org/fuse@v0.0.0-20180421153158-65cc252bf669: Get https://proxy.golang.org/bazil.org/fuse/@v/v0.0.0-20180421153158-65cc252bf669.mod: dial tcp: lookup proxy.golang.org on [::1]:53: read udp [::1]:56450->[::1]:53: read: connection refused - buildGoPackage = buildGo112Package; - }; + restic = callPackage ../tools/backup/restic { }; restic-rest-server = callPackage ../tools/backup/restic/rest-server.nix { }; @@ -17922,7 +17950,8 @@ in inter-ui = callPackage ../data/fonts/inter-ui { }; inter = callPackage ../data/fonts/inter { }; - siji = callPackage ../data/fonts/siji { }; + siji = callPackage ../data/fonts/siji + { inherit (buildPackages.xorg) mkfontscale fonttosfnt; }; sound-theme-freedesktop = callPackage ../data/misc/sound-theme-freedesktop { }; @@ -17953,7 +17982,7 @@ in inherit (callPackages ../data/fonts/tai-languages { }) tai-ahom; - tamsyn = callPackage ../data/fonts/tamsyn { }; + tamsyn = callPackage ../data/fonts/tamsyn { inherit (buildPackages.xorg) mkfontscale; }; tango-icon-theme = callPackage ../data/icons/tango-icon-theme { gtk = res.gtk2; @@ -17973,7 +18002,8 @@ in tenderness = callPackage ../data/fonts/tenderness { }; - terminus_font = callPackage ../data/fonts/terminus-font { }; + terminus_font = callPackage ../data/fonts/terminus-font + { inherit (buildPackages.xorg) fonttosfnt mkfontscale; }; terminus_font_ttf = callPackage ../data/fonts/terminus-font-ttf { }; @@ -18001,13 +18031,16 @@ in ubuntu_font_family = callPackage ../data/fonts/ubuntu-font-family { }; - ucs-fonts = callPackage ../data/fonts/ucs-fonts { }; + ucs-fonts = callPackage ../data/fonts/ucs-fonts + { inherit (buildPackages.xorg) fonttosfnt mkfontscale; }; + ultimate-oldschool-pc-font-pack = callPackage ../data/fonts/ultimate-oldschool-pc-font-pack { }; undefined-medium = callPackage ../data/fonts/undefined-medium { }; - uni-vga = callPackage ../data/fonts/uni-vga { }; + uni-vga = callPackage ../data/fonts/uni-vga + { inherit (buildPackages.xorg) fonttosfnt mkfontscale; }; unicode-character-database = callPackage ../data/misc/unicode-character-database { }; @@ -18015,7 +18048,8 @@ in unihan-database = callPackage ../data/misc/unihan-database { }; - unifont = callPackage ../data/fonts/unifont { }; + unifont = callPackage ../data/fonts/unifont + { inherit (buildPackages.xorg) fonttosfnt mkfontscale; }; unifont_upper = callPackage ../data/fonts/unifont_upper { }; @@ -19901,6 +19935,8 @@ in kega-fusion = pkgsi686Linux.callPackage ../misc/emulators/kega-fusion { }; + kepubify = callPackage ../tools/misc/kepubify { }; + kermit = callPackage ../tools/misc/kermit { }; kexi = libsForQt5.callPackage ../applications/office/kexi { }; @@ -20123,6 +20159,8 @@ in inherit (darwin) libobjc; }; + jftui = callPackage ../applications/video/jftui { }; + lilyterm = callPackage ../applications/misc/lilyterm { inherit (gnome2) vte; gtk = gtk2; @@ -20422,6 +20460,7 @@ in mpv = callPackage ../applications/video/mpv { inherit lua; + inherit (darwin.apple_sdk.frameworks) CoreFoundation Cocoa CoreAudio MediaPlayer; }; mpv-with-scripts = callPackage ../applications/video/mpv/wrapper.nix { }; @@ -20645,6 +20684,8 @@ in mypaint = callPackage ../applications/graphics/mypaint { }; + mypaint-brushes1 = callPackage ../development/libraries/mypaint-brushes/1.0.nix { }; + mypaint-brushes = callPackage ../development/libraries/mypaint-brushes { }; mythtv = libsForQt5.callPackage ../applications/video/mythtv { @@ -20860,6 +20901,7 @@ in pdfcpu = callPackage ../applications/graphics/pdfcpu { }; pdftk = callPackage ../tools/typesetting/pdftk { }; + pdftk-legacy = lowPrio (callPackage ../tools/typesetting/pdftk/legacy.nix { }); pdfgrep = callPackage ../tools/typesetting/pdfgrep { }; pdfpc = callPackage ../applications/misc/pdfpc { @@ -25477,7 +25519,8 @@ in tetex = callPackage ../tools/typesetting/tex/tetex { libpng = libpng12; }; - tewi-font = callPackage ../data/fonts/tewi {}; + tewi-font = callPackage ../data/fonts/tewi + { inherit (buildPackages.xorg) fonttosfnt mkfontscale; }; texFunctions = callPackage ../tools/typesetting/tex/nix pkgs; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 562e96246bf..9401a76ca3e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3279,6 +3279,13 @@ let url = mirror://cpan/authors/id/A/AN/ANDK/CPAN-2.27.tar.gz; sha256 = "b4b1471a2881e2d616f59e723879b4110ae485b79d5962f115119c28cf69e07f"; }; + patches = [ + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/andk/cpanpm/pull/133.diff"; + name = "patch-YAML-modules-default-for-LoadBlessed-was-changed-to-false"; + sha256 = "0i8648cwshzzd0b34gyfn68s1vs85d8336ggk2kl99awah1ydsfr"; + }) + ]; propagatedBuildInputs = [ ArchiveZip CPANChecksums CPANPerlReleases Expect FileHomeDir LWP LogLog4perl ModuleBuild TermReadKey YAML YAMLLibYAML YAMLSyck ]; meta = { description = "Query, download and build perl modules from CPAN sites"; @@ -3437,6 +3444,12 @@ let url = mirror://cpan/authors/id/A/AJ/AJGB/Crypt-Curve25519-0.06.tar.gz; sha256 = "1ir0gfxm8i7r9zyfs2zvil5jgwirl7j6cb9cm1p2kjpfnhyp0j4z"; }; + patches = [ + (fetchpatch { + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-perl/Crypt-Curve25519/files/Crypt-Curve25519-0.60.0-fmul-fixedvar.patch?id=cec727ad614986ca1e6b9468eea7f1a5a9183382"; + sha256 = "0l005jzxp6q6vyl3p43ji47if0v9inscnjl0vxaqzf6c17akgbhf"; + }) + ]; meta = { description = "Generate shared secret using elliptic-curve Diffie-Hellman function"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -11113,10 +11126,10 @@ let MathGMP = buildPerlPackage { pname = "Math-GMP"; - version = "2.19"; + version = "2.20"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/Math-GMP-2.19.tar.gz; - sha256 = "1c07521m4d38hy2yx21hkwz22n2672bvrc4i21ldc68h85qy1q8i"; + url = mirror://cpan/authors/id/S/SH/SHLOMIF/Math-GMP-2.20.tar.gz; + sha256 = "0psmpj3j8cw02b5bzb7qnkd4rcpxm82891rwpdi2hx2jxy0mznhn"; }; buildInputs = [ pkgs.gmp AlienGMP ]; NIX_CFLAGS_COMPILE = "-I${pkgs.gmp.dev}/include"; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index e439ebe7188..eb0ddf2dc29 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -287,6 +287,20 @@ let meta.broken = isPhp74; # Build error }; + pdo_oci = buildPecl rec { + inherit (php) src version; + + pname = "pdo_oci"; + sourceRoot = "php-${version}/ext/pdo_oci"; + + buildInputs = [ pkgs.oracle-instantclient ]; + configureFlags = [ "--with-pdo-oci=instantclient,${pkgs.oracle-instantclient.lib}/lib" ]; + + postPatch = '' + sed -i -e 's|OCISDKMANINC=`.*$|OCISDKMANINC="${pkgs.oracle-instantclient.dev}/include"|' config.m4 + ''; + }; + pdo_sqlsrv = buildPecl { version = "5.8.0"; pname = "pdo_sqlsrv"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 927bfa285ba..2b9a8bb8c25 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -484,6 +484,8 @@ in { bashlex = callPackage ../development/python-modules/bashlex { }; + bayesian-optimization = callPackage ../development/python-modules/bayesian-optimization { }; + bayespy = callPackage ../development/python-modules/bayespy { }; beanstalkc = callPackage ../development/python-modules/beanstalkc { }; @@ -2544,6 +2546,10 @@ in { docker_pycreds = callPackage ../development/python-modules/docker-pycreds {}; + docloud = callPackage ../development/python-modules/docloud { }; + + docplex = callPackage ../development/python-modules/docplex { }; + docopt = callPackage ../development/python-modules/docopt { }; doctest-ignore-unicode = callPackage ../development/python-modules/doctest-ignore-unicode { }; @@ -2981,6 +2987,8 @@ in { oscrypto = callPackage ../development/python-modules/oscrypto { }; + osqp = callPackage ../development/python-modules/osqp { }; + oyaml = callPackage ../development/python-modules/oyaml { }; pamela = callPackage ../development/python-modules/pamela { }; @@ -3078,6 +3086,8 @@ in { pylama = callPackage ../development/python-modules/pylama { }; + pylatexenc = callPackage ../development/python-modules/pylatexenc { }; + pymbolic = callPackage ../development/python-modules/pymbolic { }; pymediainfo = callPackage ../development/python-modules/pymediainfo { }; @@ -3427,6 +3437,8 @@ in { ecdsa = callPackage ../development/python-modules/ecdsa { }; + ecos = callPackage ../development/python-modules/ecos { }; + effect = callPackage ../development/python-modules/effect {}; enum = callPackage ../development/python-modules/enum { }; @@ -5718,6 +5730,8 @@ in { vega_datasets = callPackage ../development/python-modules/vega_datasets { }; + vertica-python = callPackage ../development/python-modules/vertica-python { }; + virtkey = callPackage ../development/python-modules/virtkey { inherit (pkgs) pkgconfig; }; @@ -5874,6 +5888,8 @@ in { sqlite3dbm = callPackage ../development/python-modules/sqlite3dbm { }; + sqlitedict = callPackage ../development/python-modules/sqlitedict { }; + sqlobject = callPackage ../development/python-modules/sqlobject { }; sqlmap = callPackage ../development/python-modules/sqlmap { }; @@ -6107,6 +6123,8 @@ in { unittest-xml-reporting = callPackage ../development/python-modules/unittest-xml-reporting { }; + untangle = callPackage ../development/python-modules/untangle { }; + traceback2 = callPackage ../development/python-modules/traceback2 { }; trackpy = callPackage ../development/python-modules/trackpy { }; |