From 3ec2fa6bfd4e9d280accf1170f595ea89be8b74b Mon Sep 17 00:00:00 2001 From: Default email Date: Fri, 6 Aug 2021 16:57:35 -0500 Subject: [PATCH] Project import generated by Copybara. GitOrigin-RevId: 0dde103318090f77ac95ef7fc26fe0cdd00fa0b3 --- .../nixpkgs/.github/PULL_REQUEST_TEMPLATE.md | 4 +- .../doc/languages-frameworks/go.section.md | 26 +- .../nixpkgs/nixos/modules/security/pam.nix | 12 +- .../services/networking/ntp/chrony.nix | 2 +- third_party/nixpkgs/nixos/tests/traefik.nix | 2 + .../emacs/elisp-packages/elpa-generated.nix | 101 +- .../emacs/elisp-packages/elpa-packages.nix | 15 +- .../emacs/elisp-packages/fetchelpa.nix | 21 + .../emacs/elisp-packages/nongnu-packages.nix | 7 +- .../applications/editors/jetbrains/common.nix | 2 +- .../editors/jetbrains/default.nix | 51 +- .../applications/editors/jetbrains/update.pl | 12 +- .../applications/editors/vscode/vscode.nix | 1 - .../graphics/megapixels/default.nix | 6 +- .../applications/logging/humioctl/default.nix | 6 +- .../pkgs/applications/misc/hugo/default.nix | 8 +- .../pkgs/applications/misc/josm/default.nix | 8 +- .../pkgs/applications/misc/kratos/default.nix | 2 +- .../pkgs/applications/misc/lutris/fhsenv.nix | 8 +- .../misc/rofi-file-browser/default.nix | 4 +- .../pkgs/applications/misc/usql/default.nix | 3 +- .../networking/browsers/brave/default.nix | 4 +- .../networking/cluster/cni/plugins.nix | 4 +- .../networking/cluster/fluxctl/default.nix | 6 +- .../networking/cluster/linkerd/default.nix | 4 +- .../cluster/nomad-driver-podman/default.nix | 2 +- .../networking/cluster/nomad/generic.nix | 14 +- .../element/element-desktop.nix | 15 +- .../telegram/tdesktop/default.nix | 10 +- .../pkgs/applications/office/zim/default.nix | 16 +- .../gitlab/gitaly/default.nix | 2 +- .../version-management/pijul/default.nix | 6 +- .../bochs/bochs-2.6.11-glibc-2.26.patch | 13 - .../bochs_fix_narrowing_conv_warning.patch | 29 - .../virtualization/bochs/default.nix | 26 +- .../virtualization/bochs/fix-build-smp.patch | 21 - .../virtualization/umoci/default.nix | 2 +- .../pkgs/data/fonts/comfortaa/default.nix | 21 +- .../pkgs/data/fonts/fira-mono/default.nix | 9 +- .../pkgs/data/fonts/unifont/default.nix | 10 +- .../pkgs/data/fonts/unifont_upper/default.nix | 8 +- .../desktops/gnome/core/caribou/default.nix | 14 +- .../nixpkgs/pkgs/desktops/plasma-5/fetch.sh | 2 +- .../nixpkgs/pkgs/desktops/plasma-5/srcs.nix | 424 ++--- .../pkgs/development/compilers/go/1.15.nix | 4 +- .../pkgs/development/compilers/go/1.16.nix | 4 +- .../go-modules/generic/default.nix | 32 +- .../go-packages/generic/default.nix | 5 +- .../libraries/armadillo/default.nix | 4 +- .../development/libraries/libgrss/default.nix | 7 +- .../libraries/libraspberrypi/default.nix | 6 +- .../development/libraries/ndi/default.nix | 4 +- .../node-packages/node-packages.json | 1 + .../node-packages/node-packages.nix | 1432 ++++++++++------- .../python-modules/GitPython/default.nix | 17 +- .../python-modules/adax/default.nix | 37 + .../python-modules/mdformat/default.nix | 4 +- .../development/python-modules/notmuch/2.nix | 2 +- .../python-modules/open-garage/default.nix | 37 + .../python-modules/pyprosegur/default.nix | 39 + .../tools/analysis/tfsec/default.nix | 4 +- .../tools/build-managers/sbt/default.nix | 4 +- .../pkgs/development/tools/butane/default.nix | 4 +- .../pkgs/development/tools/doctl/default.nix | 13 +- .../development/tools/esbuild/default.nix | 4 +- .../pkgs/development/tools/jbang/default.nix | 4 +- .../misc/editorconfig-checker/default.nix | 2 +- .../pkgs/development/tools/packer/default.nix | 2 +- .../pkgs/development/tools/tychus/default.nix | 2 +- .../pkgs/games/terraria-server/default.nix | 10 +- .../pkgs/misc/vim-plugins/generated.nix | 168 +- .../pkgs/misc/vim-plugins/overrides.nix | 2 +- .../pkgs/misc/vim-plugins/vim-plugin-names | 1 + .../os-specific/linux/extrace/default.nix | 4 +- .../firmware/raspberrypi-wireless/default.nix | 8 +- .../linux/firmware/raspberrypi/armstubs.nix | 12 +- .../linux/firmware/raspberrypi/default.nix | 4 +- .../pkgs/os-specific/linux/ipset/default.nix | 4 +- .../os-specific/linux/kernel/linux-rpi.nix | 13 +- .../nixpkgs/pkgs/servers/consul/default.nix | 11 +- .../nixpkgs/pkgs/servers/corosync/default.nix | 4 +- .../pkgs/servers/headscale/default.nix | 4 +- .../home-assistant/component-packages.nix | 2 +- .../pkgs/servers/interlock/default.nix | 2 +- .../pkgs/servers/mail/dovecot/default.nix | 4 +- .../dovecot/plugins/pigeonhole/default.nix | 4 +- .../servers/monitoring/telegraf/default.nix | 3 +- .../nixpkgs/pkgs/servers/traefik/default.nix | 6 +- .../pkgs/servers/xmpp/prosody/default.nix | 8 +- .../inputmethods/remote-touchpad/default.nix | 2 +- .../pkgs/tools/misc/chezmoi/default.nix | 6 +- .../nixpkgs/pkgs/tools/misc/dua/default.nix | 6 +- .../nixpkgs/pkgs/tools/misc/fzf/default.nix | 4 +- .../pkgs/tools/misc/kepubify/default.nix | 2 +- .../0001-Forcefully-disable-docs-build.patch | 38 + .../nixpkgs/pkgs/tools/misc/lnav/default.nix | 19 +- .../nixpkgs/pkgs/tools/misc/mimeo/default.nix | 4 +- .../pkgs/tools/misc/mmv-go/default.nix | 2 +- .../misc/opentelemetry-collector/default.nix | 5 +- .../nixpkgs/pkgs/tools/misc/pferd/default.nix | 4 +- .../pkgs/tools/misc/zoxide/default.nix | 6 +- .../pkgs/tools/networking/ngrok-1/default.nix | 2 +- .../pkgs/tools/networking/unbound/python.nix | 50 +- .../pkgs/tools/networking/xh/default.nix | 6 +- .../pkgs/tools/security/exploitdb/default.nix | 4 +- .../pkgs/tools/security/keybase/default.nix | 2 +- .../pkgs/tools/security/keybase/kbfs.nix | 2 +- .../pkgs/tools/security/vault/default.nix | 2 +- .../pkgs/tools/text/ispell/default.nix | 2 +- .../nixpkgs/pkgs/tools/text/vgrep/default.nix | 2 +- .../virtualization/cri-tools/default.nix | 4 +- .../nixpkgs/pkgs/top-level/all-packages.nix | 6 +- .../nixpkgs/pkgs/top-level/emacs-packages.nix | 5 +- .../pkgs/top-level/python-packages.nix | 6 + 114 files changed, 1773 insertions(+), 1329 deletions(-) create mode 100644 third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/fetchelpa.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/virtualization/bochs/bochs-2.6.11-glibc-2.26.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/virtualization/bochs/bochs_fix_narrowing_conv_warning.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/virtualization/bochs/fix-build-smp.patch create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/adax/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/open-garage/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pyprosegur/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/misc/lnav/0001-Forcefully-disable-docs-build.patch diff --git a/third_party/nixpkgs/.github/PULL_REQUEST_TEMPLATE.md b/third_party/nixpkgs/.github/PULL_REQUEST_TEMPLATE.md index 27d959410b..23d8a1b56a 100644 --- a/third_party/nixpkgs/.github/PULL_REQUEST_TEMPLATE.md +++ b/third_party/nixpkgs/.github/PULL_REQUEST_TEMPLATE.md @@ -21,9 +21,9 @@ Reviewing guidelines: https://nixos.org/manual/nixpkgs/unstable/#chap-reviewing- - [ ] macOS - [ ] other Linux distributions - [ ] Tested via one or more NixOS test(s) if existing and applicable for the change (look inside [nixos/tests](https://github.com/NixOS/nixpkgs/blob/master/nixos/tests)) -- [ ] Tested compilation of all pkgs that depend on this change using `nix-shell -p nixpkgs-review --run "nixpkgs-review wip"` +- [ ] Tested compilation of all packages that depend on this change using `nix-shell -p nixpkgs-review --run "nixpkgs-review wip"` - [ ] Tested execution of all binary files (usually in `./result/bin/`) -- [21.11 Release Notes (or backporting 21.05 Relase notes)](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#generating-2111-release-notes) +- [21.11 Release Notes (or backporting 21.05 Release notes)](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#generating-2111-release-notes) - [ ] (Package updates) Added a release notes entry if the change is major or breaking - [ ] (Module updates) Added a release notes entry if the change is significant - [ ] (Module addition) Added a release notes entry if adding a new NixOS module diff --git a/third_party/nixpkgs/doc/languages-frameworks/go.section.md b/third_party/nixpkgs/doc/languages-frameworks/go.section.md index b20a8d0c35..45d85f1f99 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/go.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/go.section.md @@ -13,6 +13,7 @@ In the following is an example expression using `buildGoModule`, the following a - `vendorSha256`: is the hash of the output of the intermediate fetcher derivation. `vendorSha256` can also take `null` as an input. When `null` is used as a value, rather than fetching the dependencies and vendoring them, we use the vendoring included within the source repo. If you'd like to not have to update this field on dependency changes, run `go mod vendor` in your source repo and set `vendorSha256 = null;` - `runVend`: runs the vend command to generate the vendor directory. This is useful if your code depends on c code and go mod tidy does not include the needed sources to build. +- `proxyVendor`: Fetches (go mod download) and proxies the vendor directory. This is useful if any dependency has case-insensitive conflicts which will produce platform dependant `vendorSha256` checksums. ```nix pet = buildGoModule rec { @@ -112,16 +113,6 @@ done Both `buildGoModule` and `buildGoPackage` can be tweaked to behave slightly differently, if the following attributes are used: -### `buildFlagsArray` and `buildFlags`: {#ex-goBuildFlags-noarray} - -These attributes set build flags supported by `go build`. We recommend using `buildFlagsArray`. - -```nix - buildFlagsArray = [ - "-tags=release" - ]; -``` - ### `ldflags` {#var-go-ldflags} Arguments to pass to the Go linker tool via the `-ldflags` argument of `go build`. The most common use case for this argument is to make the resulting executable aware of its own version. For example: @@ -134,6 +125,21 @@ Arguments to pass to the Go linker tool via the `-ldflags` argument of `go build ]; ``` +### `tags` {#var-go-tags} + +Arguments to pass to the Go via the `-tags` argument of `go build`. For example: + +```nix + tags = [ + "production" + "sqlite" + ]; +``` + +```nix + tags = [ "production" ] ++ lib.optionals withSqlite [ "sqlite" ]; +``` + ### `deleteVendor` {#var-go-deleteVendor} Removes the pre-existing vendor directory. This should only be used if the dependencies included in the vendor folder are broken or incomplete. diff --git a/third_party/nixpkgs/nixos/modules/security/pam.nix b/third_party/nixpkgs/nixos/modules/security/pam.nix index 5699025601..9a6c7d1782 100644 --- a/third_party/nixpkgs/nixos/modules/security/pam.nix +++ b/third_party/nixpkgs/nixos/modules/security/pam.nix @@ -406,7 +406,7 @@ let ${let oath = config.security.pam.oath; in optionalString cfg.oathAuth "auth requisite ${pkgs.oathToolkit}/lib/security/pam_oath.so window=${toString oath.window} usersfile=${toString oath.usersFile} digits=${toString oath.digits}"} ${let yubi = config.security.pam.yubico; in optionalString cfg.yubicoAuth - "auth ${yubi.control} ${pkgs.yubico-pam}/lib/security/pam_yubico.so mode=${toString yubi.mode} ${optionalString (yubi.mode == "client") "id=${toString yubi.id}"} ${optionalString yubi.debug "debug"}"} + "auth ${yubi.control} ${pkgs.yubico-pam}/lib/security/pam_yubico.so mode=${toString yubi.mode} ${optionalString (yubi.challengeResponsePath != null) "chalresp_path=${yubi.challengeResponsePath}"} ${optionalString (yubi.mode == "client") "id=${toString yubi.id}"} ${optionalString yubi.debug "debug"}"} ${optionalString cfg.fprintAuth "auth sufficient ${pkgs.fprintd}/lib/security/pam_fprintd.so"} '' + @@ -822,6 +822,16 @@ in Challenge-Response configurations. See the man-page ykpamcfg(1) for further details on how to configure offline Challenge-Response validation. + More information can be found here. + ''; + }; + challengeResponsePath = mkOption { + default = null; + type = types.path; + description = '' + If not null, set the path used by yubico pam module where the challenge expected response is stored. + More information can be found here. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/ntp/chrony.nix b/third_party/nixpkgs/nixos/modules/services/networking/ntp/chrony.nix index 96c6444c23..a4b17bbbff 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/ntp/chrony.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/ntp/chrony.nix @@ -148,7 +148,7 @@ in wantedBy = [ "multi-user.target" ]; wants = [ "time-sync.target" ]; before = [ "time-sync.target" ]; - after = [ "network.target" ]; + after = [ "network.target" "nss-lookup.target" ]; conflicts = [ "ntpd.service" "systemd-timesyncd.service" ]; path = [ chronyPkg ]; diff --git a/third_party/nixpkgs/nixos/tests/traefik.nix b/third_party/nixpkgs/nixos/tests/traefik.nix index f27f6e1e6d..1d6c0a479e 100644 --- a/third_party/nixpkgs/nixos/tests/traefik.nix +++ b/third_party/nixpkgs/nixos/tests/traefik.nix @@ -74,6 +74,8 @@ import ./make-test-python.nix ({ pkgs, ... }: { client.wait_for_unit("multi-user.target") + client.wait_until_succeeds("curl -sSf -H Host:nginx.traefik.test http://traefik/") + with subtest("Check that a container can be reached via Traefik"): assert "Hello from NGINX" in client.succeed( "curl -sSf -H Host:nginx.traefik.test http://traefik/" diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix index 1326964035..ce30adce60 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix @@ -39,10 +39,10 @@ elpaBuild { pname = "ada-mode"; ename = "ada-mode"; - version = "7.1.5"; + version = "7.1.7"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ada-mode-7.1.5.tar"; - sha256 = "037v25mqpg1n52hz89b49vf9zw68fmc0m7l6c1f8vnbw3dibyk8d"; + url = "https://elpa.gnu.org/packages/ada-mode-7.1.7.tar"; + sha256 = "0bzykgzc3kx1dgngishsf9w4czq3ig6wvrv3832zlxb7q3rmw8j2"; }; packageRequires = [ emacs uniquify-files wisi ]; meta = { @@ -1007,16 +1007,16 @@ license = lib.licenses.free; }; }) {}; - ebdb = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib, seq }: + ebdb = callPackage ({ elpaBuild, emacs, fetchurl, lib, seq }: elpaBuild { pname = "ebdb"; ename = "ebdb"; - version = "0.7"; + version = "0.7.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ebdb-0.7.tar"; - sha256 = "0q4ywgh87d6hjac3031s21w91gld2hh7s8nbva94dnzwn6y9d0v1"; + url = "https://elpa.gnu.org/packages/ebdb-0.7.1.tar"; + sha256 = "1z5lh1mib60mvs5kbdsrw2h4whz4n5ad4qkpphs2xjvaz92jgq6s"; }; - packageRequires = [ cl-lib emacs seq ]; + packageRequires = [ emacs seq ]; meta = { homepage = "https://elpa.gnu.org/packages/ebdb.html"; license = lib.licenses.free; @@ -1420,6 +1420,21 @@ license = lib.licenses.free; }; }) {}; + ftable = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "ftable"; + ename = "ftable"; + version = "1.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/ftable-1.0.tar"; + sha256 = "1qi0fxw94hb7p2s8n2dzbziialbjbjxgpwx2m4mvrmicrq375r5p"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/ftable.html"; + license = lib.licenses.free; + }; + }) {}; gcmh = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "gcmh"; @@ -1964,16 +1979,16 @@ license = lib.licenses.free; }; }) {}; - kiwix = callPackage ({ elpaBuild, emacs, fetchurl, lib, request }: + kiwix = callPackage ({ elpaBuild, elquery, emacs, fetchurl, lib, request }: elpaBuild { pname = "kiwix"; ename = "kiwix"; - version = "1.0.3"; + version = "1.1.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/kiwix-1.0.3.tar"; - sha256 = "061b816xp8ykqd56z0nvc69aql9y4mba42p6x6vc0j6gr9n3c1j6"; + url = "https://elpa.gnu.org/packages/kiwix-1.1.0.tar"; + sha256 = "1clp0q34bs395d0hrqdyvm9ds665hgf5qrdiqa14k31h4lbv2wsn"; }; - packageRequires = [ emacs request ]; + packageRequires = [ elquery emacs request ]; meta = { homepage = "https://elpa.gnu.org/packages/kiwix.html"; license = lib.licenses.free; @@ -2780,10 +2795,10 @@ elpaBuild { pname = "phps-mode"; ename = "phps-mode"; - version = "0.4.3"; + version = "0.4.6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/phps-mode-0.4.3.tar"; - sha256 = "0yvwfaj7l4z3zgycvnf1j0r5jx4lryaapljbw2sqvwqpbgyiw0y0"; + url = "https://elpa.gnu.org/packages/phps-mode-0.4.6.tar"; + sha256 = "0mfwyz9rwnrs0xcd1jmq1ngdhbwygm6hbfhyr14djywxx0b4hpm5"; }; packageRequires = [ emacs ]; meta = { @@ -2885,10 +2900,10 @@ elpaBuild { pname = "pyim"; ename = "pyim"; - version = "3.9.3"; + version = "3.9.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/pyim-3.9.3.tar"; - sha256 = "0rjaimvbh0fadbqiq4ggyxr0y4pfzld76wb64v7l5874qczn8dfr"; + url = "https://elpa.gnu.org/packages/pyim-3.9.4.tar"; + sha256 = "0ggnl2jidcklyhqd5av5kk1f855gsq29wq2nhvp1yjzn35hz6xij"; }; packageRequires = [ async emacs xr ]; meta = { @@ -3362,21 +3377,6 @@ license = lib.licenses.free; }; }) {}; - shell-command-plus = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "shell-command-plus"; - ename = "shell-command+"; - version = "2.2.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/shell-command+-2.2.0.tar"; - sha256 = "1ms2xk7xfgd3ngwm90hnmlxwpvyb167bislc2wr3ilfrirbbw476"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/shell-command+.html"; - license = lib.licenses.free; - }; - }) {}; shelisp = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "shelisp"; @@ -3392,6 +3392,21 @@ license = lib.licenses.free; }; }) {}; + shell-command-plus = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "shell-command-plus"; + ename = "shell-command+"; + version = "2.2.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/shell-command+-2.2.0.tar"; + sha256 = "1ms2xk7xfgd3ngwm90hnmlxwpvyb167bislc2wr3ilfrirbbw476"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/shell-command+.html"; + license = lib.licenses.free; + }; + }) {}; shen-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "shen-mode"; @@ -3501,10 +3516,10 @@ elpaBuild { pname = "so-long"; ename = "so-long"; - version = "1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/so-long-1.0.el"; - sha256 = "00z9gnxz32rakd0k7lqaj050fwmqzq5vr9d6rb7ji3fn01rjp7kj"; + url = "https://elpa.gnu.org/packages/so-long-1.1.1.tar"; + sha256 = "0qgdnkb702mkm886v0zv0hnm5y7zlifgx9ji6xmdsxycpsfkjz1f"; }; packageRequires = [ emacs ]; meta = { @@ -3775,10 +3790,10 @@ elpaBuild { pname = "tramp"; ename = "tramp"; - version = "2.5.1"; + version = "2.5.1.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/tramp-2.5.1.tar"; - sha256 = "1r7wifhzy2ipdlc4fqnx6549fnx45ggz57wh0cp7s6y25761si7q"; + url = "https://elpa.gnu.org/packages/tramp-2.5.1.1.tar"; + sha256 = "0v3rvvhjcnyvg6l4vyxz6513mxzvv9n0skkmr62ry8yi5x9wnqp1"; }; packageRequires = [ emacs ]; meta = { @@ -4224,10 +4239,10 @@ elpaBuild { pname = "wisi"; ename = "wisi"; - version = "3.1.4"; + version = "3.1.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/wisi-3.1.4.tar"; - sha256 = "1j35ln5x3dgypq3hn6xcdpg6vp6yjj6avcjakc2r6wx19vxixciw"; + url = "https://elpa.gnu.org/packages/wisi-3.1.5.tar"; + sha256 = "07jc8x6xdhpjv9hlghmvk7ga4gwww33nj5pizlx5scvpp0qvikpy"; }; packageRequires = [ emacs seq ]; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix index 2fcfa9b84d..adf7d75ed5 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix @@ -41,7 +41,10 @@ self: let }: let imported = import generated { - inherit (self) callPackage; + callPackage = pkgs: args: self.callPackage pkgs (args // { + # Use custom elpa url fetcher with fallback/uncompress + fetchurl = buildPackages.callPackage ./fetchelpa.nix { }; + }); }; super = removeAttrs imported [ "dash" ]; @@ -66,7 +69,12 @@ self: let phases = "unpackPhase " + old.phases; # not a list, interestingly… srcs = [ super.ada-mode.src - self.wisi.src + # ada-mode needs a specific version of wisi, check NEWS or ada-mode's + # package-requires to find the version to use. + (pkgs.fetchurl { + url = "https://elpa.gnu.org/packages/wisi-3.1.3.tar.lz"; + sha256 = "18dwcc0crds7aw466vslqicidlzamf8avn59gqi2g7y2x9k5q0as"; + }) ]; sourceRoot = "ada-mode-${self.ada-mode.version}"; @@ -74,6 +82,7 @@ self: let nativeBuildInputs = [ buildPackages.gnat buildPackages.gprbuild + buildPackages.lzip ]; buildInputs = [ @@ -81,7 +90,7 @@ self: let ]; preInstall = '' - ./build.sh + ./build.sh -j$NIX_BUILD_CORES ''; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/fetchelpa.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/fetchelpa.nix new file mode 100644 index 0000000000..f4524f3b7a --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/fetchelpa.nix @@ -0,0 +1,21 @@ +# Elpa only serves the latest version of a given package uncompressed. +# Once that release is no longer the latest & greatest it gets archived and compressed +# meaning that both the URL and the hash changes. +# +# To work around this issue we fall back to the URL with the .lz suffix and if that's the +# one we downloaded we uncompress the file to ensure the hash matches regardless of compression. + +{ fetchurl, lzip }: + +{ url, ... }@args: fetchurl ((removeAttrs args [ "url" ]) // { + urls = [ + url + (url + ".lz") + ]; + postFetch = '' + if [[ $url == *.lz ]]; then + ${lzip}/bin/lzip -c -d $out > uncompressed + mv uncompressed $out + fi + ''; +}) diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nongnu-packages.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nongnu-packages.nix index c3459448c2..66ca61499d 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nongnu-packages.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nongnu-packages.nix @@ -10,7 +10,7 @@ To update the list of packages from nongnu (ELPA), */ -{ lib }: +{ lib, buildPackages }: self: let @@ -19,7 +19,10 @@ self: let }: let imported = import generated { - inherit (self) callPackage; + callPackage = pkgs: args: self.callPackage pkgs (args // { + # Use custom elpa url fetcher with fallback/uncompress + fetchurl = buildPackages.callPackage ./fetchelpa.nix { }; + }); }; super = imported; diff --git a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/common.nix b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/common.nix index 2e244364dc..985c36ee05 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/common.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/common.nix @@ -52,7 +52,7 @@ with stdenv; lib.makeOverridable mkDerivation rec { } interpreter=$(echo ${stdenv.glibc.out}/lib/ld-linux*.so.2) - if [ "${stdenv.hostPlatform.system}" == "x86_64-linux" ]; then + if [[ "${stdenv.hostPlatform.system}" == "x86_64-linux" && -e bin/fsnotifier64 ]]; then target_size=$(get_file_size bin/fsnotifier64) patchelf --set-interpreter "$interpreter" bin/fsnotifier64 munge_size_hack bin/fsnotifier64 $target_size diff --git a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix index 4370e9af3e..bd8751dcf9 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix @@ -242,12 +242,12 @@ in clion = buildClion rec { name = "clion-${version}"; - version = "2021.1.2"; /* updated by script */ + version = "2021.2"; /* updated by script */ description = "C/C++ IDE. New. Intelligent. Cross-platform"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"; - sha256 = "1zx9qwjx7hwjq25y474yj7sxvp9bqnq9l53afs6d4h6131lhjkcz"; /* updated by script */ + sha256 = "0im14b52b6hgns964m946q68mvyaq8haldm92s9cn5azh8yg1arc"; /* updated by script */ }; wmClass = "jetbrains-clion"; update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml @@ -255,12 +255,12 @@ in datagrip = buildDataGrip rec { name = "datagrip-${version}"; - version = "2021.1.3"; /* updated by script */ + version = "2021.2"; /* updated by script */ description = "Your Swiss Army Knife for Databases and SQL"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/datagrip/${name}.tar.gz"; - sha256 = "0lhi3vwhwb359va4sa17y071i03l4mfwqpsp7haqxjf900dcld7d"; /* updated by script */ + sha256 = "17fzrn20mkldf74965c7abw3znyxskssdz1k4lciz6q7kn5cvdbf"; /* updated by script */ }; wmClass = "jetbrains-datagrip"; update-channel = "DataGrip RELEASE"; @@ -268,12 +268,12 @@ in goland = buildGoland rec { name = "goland-${version}"; - version = "2021.1.3"; /* updated by script */ + version = "2021.2"; /* updated by script */ description = "Up and Coming Go IDE"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/go/${name}.tar.gz"; - sha256 = "0xy9k90v3kcm9sj48l809qn0vws4ygsxxyqwsg6y9a3r1raqgqxd"; /* updated by script */ + sha256 = "15pxr9w4gs342g9in7a41x0cpb7z68y28hwsamk9ic7yz2qshps8"; /* updated by script */ }; wmClass = "jetbrains-goland"; update-channel = "GoLand RELEASE"; @@ -281,12 +281,12 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2021.1.3"; /* updated by script */ + version = "2021.2"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "1phpfa9i3k7g92ankmibp53c1469ifnb12g6s8gklln7v7xxakmi"; /* updated by script */ + sha256 = "1zki6myy3wbr1sgp1gli263y32g75gna2r9m7baa06zvc6c7j9vw"; /* updated by script */ }; wmClass = "jetbrains-idea-ce"; update-channel = "IntelliJ IDEA RELEASE"; @@ -294,12 +294,12 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2021.1.3"; /* updated by script */ + version = "2021.2"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz"; - sha256 = "13c7a96zbw05w1gy4ds4wzac853hdlnbflww2xaz60jnr1k24gnp"; /* updated by script */ + sha256 = "0gbx1ngf8i2a0dvysw5g0ikakq4a7gghb4rjk7c99jwzwq9hckjm"; /* updated by script */ }; wmClass = "jetbrains-idea"; update-channel = "IntelliJ IDEA RELEASE"; @@ -307,12 +307,13 @@ in mps = buildMps rec { name = "mps-${version}"; - version = "2021.1"; /* updated by script */ + version = "2021.1.1"; /* updated by script */ + versionMajorMinor = "2021.1"; /* updated by script */ description = "Create your own domain-specific language"; license = lib.licenses.asl20; src = fetchurl { - url = "https://download.jetbrains.com/mps/${version}/MPS-${version}.tar.gz"; - sha256 = "0fdh8lzsi2zryi0xs961vrf3l8kqk5imlj56dhifywi7xkhs3vwn"; /* updated by script */ + url = "https://download.jetbrains.com/mps/${versionMajorMinor}/MPS-${version}.tar.gz"; + sha256 = "1gp9f4b57pr8c20qxcwax4l0d3w13x4lihxpb9z4agdqjafnc9l6"; /* updated by script */ }; wmClass = "jetbrains-mps"; update-channel = "MPS RELEASE"; @@ -320,12 +321,12 @@ in phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "2021.1.4"; /* updated by script */ + version = "2021.2"; /* updated by script */ description = "Professional IDE for Web and PHP developers"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; - sha256 = "0p9a8l2bpjm25x4af1hlqhmw5xsirsfajznd6y723yqmjy8hs46l"; /* updated by script */ + sha256 = "11lm7mja3mc2v329i830j8w1zymlz11sj86qvcg7s4pgc4xwnzd6"; /* updated by script */ }; wmClass = "jetbrains-phpstorm"; update-channel = "PhpStorm RELEASE"; @@ -333,12 +334,12 @@ in pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "2021.1.3"; /* updated by script */ + version = "2021.2"; /* updated by script */ description = "PyCharm Community Edition"; license = lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0c03grsrjydb6jcnbq1qi4158c14vni3znr7vysnbvldi8al6w8m"; /* updated by script */ + sha256 = "075lb50g853791hj8ahhi88zbp07cvfs3zrdahvvif2nd121r1mx"; /* updated by script */ }; wmClass = "jetbrains-pycharm-ce"; update-channel = "PyCharm RELEASE"; @@ -346,12 +347,12 @@ in pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "2021.1.3"; /* updated by script */ + version = "2021.2"; /* updated by script */ description = "PyCharm Professional Edition"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "01nwc9nprlyrwyij98px915w66g6vxbznsmmmg56rv3rvjvjp7yl"; /* updated by script */ + sha256 = "1l83a8wfqz4xddscpzf7v29rhq9ibx32ximcqrj1cw0i9v7qnv9g"; /* updated by script */ }; wmClass = "jetbrains-pycharm"; update-channel = "PyCharm RELEASE"; @@ -359,12 +360,12 @@ in rider = buildRider rec { name = "rider-${version}"; - version = "2021.1.3"; /* updated by script */ + version = "2021.1.5"; /* updated by script */ description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/rider/JetBrains.Rider-${version}.tar.gz"; - sha256 = "0k2vpndpachq6g767v2dwfa3xc8mssv0i7wwpm05dgqirpn4n0dw"; /* updated by script */ + sha256 = "17mxqh6p9jby5qrjqaq5km0j8k1bp8061ch2j059ka3n4ycxy7ph"; /* updated by script */ }; wmClass = "jetbrains-rider"; update-channel = "Rider RELEASE"; @@ -372,12 +373,12 @@ in ruby-mine = buildRubyMine rec { name = "ruby-mine-${version}"; - version = "2021.1.2"; /* updated by script */ + version = "2021.2"; /* updated by script */ description = "The Most Intelligent Ruby and Rails IDE"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; - sha256 = "0r80y8y38rdxgc9sim0q2p7bmgxlp4pdxydr0w9gjikwnjxnvz51"; /* updated by script */ + sha256 = "169jsd34l83n1pnrhzz548yn7ch1dzxpy8xck7vlymjgrxdqciwi"; /* updated by script */ }; wmClass = "jetbrains-rubymine"; update-channel = "RubyMine RELEASE"; @@ -385,12 +386,12 @@ in webstorm = buildWebStorm rec { name = "webstorm-${version}"; - version = "2021.1.2"; /* updated by script */ + version = "2021.2"; /* updated by script */ description = "Professional IDE for Web and JavaScript development"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"; - sha256 = "0q4hn6npm0c30v23d30dnphd6wajif0im1b9vjwa121lqi997l34"; /* updated by script */ + sha256 = "1whikk1izzvhq1d7kaf2kn4j4qpxn7aq70hlbxr1kb7zs4mzy9x3"; /* updated by script */ }; wmClass = "jetbrains-webstorm"; update-channel = "WebStorm RELEASE"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/update.pl b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/update.pl index 7656581a8b..201c51094d 100755 --- a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/update.pl +++ b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/update.pl @@ -60,17 +60,20 @@ sub update_nix_block { } elsif ($only_free && $block =~ /licenses\.unfree/) { print("$channel is unfree, skipping\n"); } else { - print("updating $channel: $version -> $latest_versions{$channel}\n"); + my $version_string = $latest_versions{$channel}; + my $versionMajorMinor = $version_string =~ s/^([0-9]+[.][0-9]+).*/$1/r; + + print("updating $channel: $version -> $version_string\n"); my ($url) = $block =~ /url\s*=\s*"([^"]+)"/; # try to interpret some nix my ($name) = $block =~ /name\s*=\s*"([^"]+)"/; - $name =~ s/\$\{version\}/$latest_versions{$channel}/; + $name =~ s/\$\{version\}/$version_string/; # Some url pattern contain variables more than once $url =~ s/\$\{name\}/$name/g; - $url =~ s/\$\{version\}/$latest_versions{$channel}/g; + $url =~ s/\$\{version\}/$version_string/g; + $url =~ s/\$\{versionMajorMinor\}/$versionMajorMinor/g; die "$url still has some interpolation" if $url =~ /\$/; my ($sha256) = get("$url.sha256") =~ /^([0-9a-f]{64})/; - my $version_string = $latest_versions{$channel}; unless ( $sha256 ) { my $full_version = $latest_versions{"full1_" . $channel}; $url =~ s/$version_string/$full_version/; @@ -83,6 +86,7 @@ sub update_nix_block { print "Jetbrains published SHA256: $sha256\n"; print "Conversion into base32 yields: $sha256Base32\n"; $block =~ s#version\s*=\s*"([^"]+)".+$#version = "$version_string"; /* updated by script */#m; + $block =~ s#versionMajorMinor\s*=\s*"([^"]+)".+$#versionMajorMinor = "$versionMajorMinor"; /* updated by script */#m; $block =~ s#sha256\s*=\s*"([^"]+)".+$#sha256 = "$sha256Base32"; /* updated by script */#m; } } else { diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix index 23af04462b..908739b6aa 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix @@ -27,7 +27,6 @@ in version = "1.58.2"; pname = "vscode"; - sourceExecutableName = "code"; executableName = "code" + lib.optionalString isInsiders "-insiders"; longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders"; shortName = "Code" + lib.optionalString isInsiders " - Insiders"; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/megapixels/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/megapixels/default.nix index 1e9540ef95..9b1377e520 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/megapixels/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/megapixels/default.nix @@ -26,13 +26,13 @@ let in stdenv.mkDerivation rec { pname = "megapixels"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromSourcehut { owner = "~martijnbraam"; repo = "megapixels"; rev = version; - sha256 = "0y56c6vchlzidfmp3a3bdc228vbhy7zaxvmhkyxchfb752yzr0n3"; + sha256 = "0jnfzwvq58p4ksyifma10i158r2fb7fv72ymibgcxbnx596xpjb2"; }; nativeBuildInputs = [ meson ninja pkg-config wrapGAppsHook ]; @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "GTK3 camera application using raw v4l2 and media-requests"; + description = "GTK4 camera application that knows how to deal with the media request api"; homepage = "https://sr.ht/~martijnbraam/Megapixels"; changelog = "https://git.sr.ht/~martijnbraam/megapixels/refs/${version}"; license = licenses.gpl3Only; diff --git a/third_party/nixpkgs/pkgs/applications/logging/humioctl/default.nix b/third_party/nixpkgs/pkgs/applications/logging/humioctl/default.nix index f73c38591f..5ec33d88cd 100644 --- a/third_party/nixpkgs/pkgs/applications/logging/humioctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/logging/humioctl/default.nix @@ -1,9 +1,9 @@ { buildGoModule, fetchFromGitHub, installShellFiles, lib }: let - humioCtlVersion = "0.28.5"; - sha256 = "sha256-h6zQG9jjHpAxaJUaFoVmRyR1A/bk57CKBIkOGPcdJP0="; - vendorSha256 = "sha256-867x33Aq27D2m14NqqsdByC39pjjyJZbfX3jmwVU2yo="; + humioCtlVersion = "0.28.6"; + sha256 = "sha256-15RRoTr+N+DsILYF1KndAwsW329w+UxHfB1VaWnkEFI="; + vendorSha256 = "sha256-fgRQ2n5tzj5s4rT65VIqh61wDwu+x/fWhpaKwyr8XWA="; in buildGoModule { name = "humioctl-${humioCtlVersion}"; pname = "humioctl"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/hugo/default.nix b/third_party/nixpkgs/pkgs/applications/misc/hugo/default.nix index 42d3985244..7aa844098e 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/hugo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/hugo/default.nix @@ -2,22 +2,22 @@ buildGoModule rec { pname = "hugo"; - version = "0.86.1"; + version = "0.87.0"; src = fetchFromGitHub { owner = "gohugoio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2tCR4iabTLD9SynXjUM7+zNsFCCAa/n88brPnZ1DQ0Q="; + sha256 = "sha256-2I1PDxbqtaOOlVbr7zhuawaFrFWM/PYt5QJm3N74Noc="; }; - vendorSha256 = "sha256-ZIGw349m6k8qqrzUN/oYV/HrgBvfOo/ovjo1SUDRmyk="; + vendorSha256 = "sha256-0pkQ+VcmK2XLaQ2XJHh5/QftSdud6Eo1nlBK+L92xKU="; doCheck = false; runVend = true; - buildFlags = [ "-tags" "extended" ]; + tags = [ "extended" ]; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/josm/default.nix b/third_party/nixpkgs/pkgs/applications/misc/josm/default.nix index 76af55c508..71d70774b1 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/josm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/josm/default.nix @@ -3,20 +3,20 @@ }: let pname = "josm"; - version = "18004"; + version = "18118"; srcs = { jar = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "sha256-Cd+/sE6A0MddHeAxy3gx7ev+9UR3ZNcR0tCTmdX2FtY="; + sha256 = "01wcbf1mh1gqxnqkc3j6h64h9sz0yd5wiwpyx4ic4d5fwkh65qym"; }; macosx = fetchurl { url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java16.zip"; - sha256 = "sha256-QSVh8043K/f7gPEjosGo/DNj1d75LUFwf6EMeHk68fM="; + sha256 = "0i1vglqg49fd3w2bny01l92wj4hvr3y35rrmd1mdff0lc1zhi397"; }; pkg = fetchsvn { url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested"; rev = version; - sha256 = "sha256-Ic6RtQPqpQIci1IbKgTcFmLfMdPxSVybrEAk+ttM0j8="; + sha256 = "0gyj9kdzl920mjdmqjgiscqxyqhnvh22l6sjicf059ga0fsr3ki1"; }; }; in diff --git a/third_party/nixpkgs/pkgs/applications/misc/kratos/default.nix b/third_party/nixpkgs/pkgs/applications/misc/kratos/default.nix index 8912a0e71e..c07dbd4567 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/kratos/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/kratos/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { subPackages = [ "." ]; - buildFlags = [ "-tags sqlite" ]; + tags = [ "sqlite" ]; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/misc/lutris/fhsenv.nix b/third_party/nixpkgs/pkgs/applications/misc/lutris/fhsenv.nix index 19cb7f6c55..38513937d0 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/lutris/fhsenv.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/lutris/fhsenv.nix @@ -1,4 +1,6 @@ { lib, buildFHSUserEnv, lutris-unwrapped +, extraPkgs ? pkgs: [ ] +, extraLibraries ? pkgs: [ ] , steamSupport ? true }: @@ -87,7 +89,8 @@ in buildFHSUserEnv { soundfont-fluid bzip2 game-music-emu ] ++ qt5Deps pkgs ++ gnomeDeps pkgs - ++ lib.optional steamSupport pkgs.steam; + ++ lib.optional steamSupport pkgs.steam + ++ extraPkgs pkgs; multiPkgs = pkgs: with pkgs; [ # Common @@ -110,7 +113,8 @@ in buildFHSUserEnv { # Winetricks fribidi - ] ++ xorgDeps pkgs; + ] ++ xorgDeps pkgs + ++ extraLibraries pkgs; extraInstallCommands = '' mkdir -p $out/share diff --git a/third_party/nixpkgs/pkgs/applications/misc/rofi-file-browser/default.nix b/third_party/nixpkgs/pkgs/applications/misc/rofi-file-browser/default.nix index 0f9067a7e3..3de8a94b62 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/rofi-file-browser/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/rofi-file-browser/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rofi-file-browser-extended"; - version = "1.1.1"; + version = "1.2.0"; src = fetchFromGitHub { owner = "marvinkreis"; repo = pname; rev = version; - sha256 = "10wk5sif3bmvsgyk2gdy0qhpv1b37zgzf89n3h0yh7pg195fi2gn"; + sha256 = "1grcal8ga4gpaj3p1dvx4zmqai93jjz2izpj91lxwj0dbz1gmbdm"; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/usql/default.nix b/third_party/nixpkgs/pkgs/applications/misc/usql/default.nix index 7a83ec05c1..8ab143ac54 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/usql/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/usql/default.nix @@ -21,8 +21,7 @@ buildGoModule rec { buildInputs = [ unixODBC icu ]; # These tags and flags are copied from build-release.sh - buildFlags = [ "-tags" ]; - buildFlagsArray = [ + tags = [ "most" "sqlite_app_armor" "sqlite_fts5" diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix index 7b85a5a510..019075592e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix @@ -90,11 +90,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.27.109"; + version = "1.27.111"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "RJCGaezucb3LJC1KLG/7vPIF3diVgSTsnylXEN1BaRU="; + sha256 = "nQkna1r8wSjTPEWp9RxOz45FVmz97NHzTlb4Hh5lXcs="; }; dontConfigure = true; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/cni/plugins.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/cni/plugins.nix index 8fc667e339..3c0b97f0ba 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/cni/plugins.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/cni/plugins.nix @@ -15,8 +15,8 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = [ - "-ldflags=-X github.com/containernetworking/plugins/pkg/utils/buildversion.BuildVersion=v${version}" + ldflags = [ + "-X github.com/containernetworking/plugins/pkg/utils/buildversion.BuildVersion=v${version}" ]; subPackages = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxctl/default.nix index d8a6306a1f..003f6722d1 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fluxctl"; - version = "1.23.1"; + version = "1.23.2"; src = fetchFromGitHub { owner = "weaveworks"; repo = "flux"; rev = version; - sha256 = "sha256-PcDipeW+ebGm6w/htjyx1/PXaanh2gp3EyHkcLY9peo="; + sha256 = "sha256-Ypy462QYmRiQrnOYjBA4BrtPKMT7sNpWb4St3KMVqbI="; }; - vendorSha256 = "sha256-CxGa95x742vS+8WxK/I2ZbEn2mJPwpXa5zm3xBNbX4U="; + vendorSha256 = "sha256-GUeLbngahbjEXetCfFbwWhn7jtyqKu7I2dyfjKalUM0="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/default.nix index 47c6cc5bcd..1e47ccc66f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/default.nix @@ -22,8 +22,8 @@ let generic = { channel, version, sha256, vendorSha256 }: env GOFLAGS="" go generate ./viz/static ''; - buildFlagsArray = [ - "-tags=prod" + tags = [ + "prod" ]; ldflags = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad-driver-podman/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad-driver-podman/default.nix index cfa8d6fc67..8d470af513 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad-driver-podman/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad-driver-podman/default.nix @@ -21,7 +21,7 @@ buildGoModule rec { meta = with lib; { homepage = "https://www.github.com/hashicorp/nomad-driver-podman"; description = "Podman task driver for Nomad"; - platforms = platforms.unix; + platforms = platforms.linux; license = licenses.mpl20; maintainers = with maintainers; [ cpcloud ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/generic.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/generic.nix index f4ddc038d2..99a2585272 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/generic.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/generic.nix @@ -6,6 +6,7 @@ , nvidiaGpuSupport , patchelf , nvidia_x11 +, nixosTests }: buildGoPackage rec { @@ -29,16 +30,7 @@ buildGoPackage rec { # ui: # Nomad release commits include the compiled version of the UI, but the file # is only included if we build with the ui tag. - preBuild = - let - tags = [ "ui" ] ++ lib.optional (!nvidiaGpuSupport) "nonvidia"; - tagsString = lib.concatStringsSep " " tags; - in - '' - export buildFlagsArray=( - -tags="${tagsString}" - ) - ''; + tags = [ "ui" ] ++ lib.optional (!nvidiaGpuSupport) "nonvidia"; # The dependency on NVML isn't explicit. We have to make it so otherwise the # binary will not know where to look for the relevant symbols. @@ -48,6 +40,8 @@ buildGoPackage rec { done ''; + passthru.tests.nomad = nixosTests.nomad; + meta = with lib; { homepage = "https://www.nomadproject.io/"; description = "A Distributed, Highly Available, Datacenter-Aware Scheduler"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix index ef4663f300..fd7074f005 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix @@ -1,6 +1,11 @@ -{ lib, stdenv, fetchFromGitHub -, makeWrapper, makeDesktopItem, mkYarnPackage -, electron, element-web +{ lib +, stdenv +, fetchFromGitHub +, makeWrapper +, makeDesktopItem +, mkYarnPackage +, electron +, element-web , callPackage , Security , AppKit @@ -22,7 +27,8 @@ let sha256 = "sha256-4d2IOngiRcKd4k0jnilAR3Sojkfru3dlqtoBYi3zeLY="; }; electron_exec = if stdenv.isDarwin then "${electron}/Applications/Electron.app/Contents/MacOS/Electron" else "${electron}/bin/electron"; -in mkYarnPackage rec { +in +mkYarnPackage rec { name = "element-desktop-${version}"; inherit version src; @@ -57,6 +63,7 @@ in mkYarnPackage rec { rm "$out/share/element/electron/node_modules" cp -r './node_modules' "$out/share/element/electron" cp $out/share/element/electron/lib/i18n/strings/en_EN.json $out/share/element/electron/lib/i18n/strings/en-us.json + ln -s $out/share/element/electron/lib/i18n/strings/en{-us,}.json # icons for icon in $out/share/element/electron/build/icons/*.png; do diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 972fb1eab2..8478b59008 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, fetchFromGitHub, callPackage , pkg-config, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook , extra-cmake-modules -, qtbase, qtimageformats, gtk3, libsForQt5, lz4, xxHash +, qtbase, qtimageformats, gtk3, kwayland, libdbusmenu, lz4, xxHash , ffmpeg, openalSoft, minizip, libopus, alsa-lib, libpulseaudio, range-v3 , tl-expected, hunspell, glibmm, webkitgtk, jemalloc , rnnoise @@ -12,8 +12,6 @@ , xdg-utils, libsysprof-capture, libpsl, brotli }: -with lib; - # Main reference: # - This package was originally based on the Arch package but all patches are now upstreamed: # https://git.archlinux.org/svntogit/community.git/tree/trunk/PKGBUILD?h=packages/telegram-desktop @@ -59,7 +57,7 @@ in mkDerivation rec { ]; buildInputs = [ - qtbase qtimageformats gtk3 libsForQt5.kwayland libsForQt5.libdbusmenu lz4 xxHash + qtbase qtimageformats gtk3 kwayland libdbusmenu lz4 xxHash ffmpeg openalSoft minizip libopus alsa-lib libpulseaudio range-v3 tl-expected hunspell glibmm webkitgtk jemalloc rnnoise @@ -85,7 +83,7 @@ in mkDerivation rec { wrapProgram $out/bin/telegram-desktop \ "''${gappsWrapperArgs[@]}" \ "''${qtWrapperArgs[@]}" \ - --prefix PATH : ${xdg-utils}/bin \ + --prefix PATH : ${lib.makeBinPath [ xdg-utils]} \ --set XDG_RUNTIME_DIR "XDG-RUNTIME-DIR" sed -i $out/bin/telegram-desktop \ -e "s,'XDG-RUNTIME-DIR',\"\''${XDG_RUNTIME_DIR:-/run/user/\$(id --user)}\"," @@ -96,7 +94,7 @@ in mkDerivation rec { updateScript = ./update.py; }; - meta = { + meta = with lib; { description = "Telegram Desktop messaging app"; longDescription = '' Desktop client for the Telegram messenger, based on the Telegram API and diff --git a/third_party/nixpkgs/pkgs/applications/office/zim/default.nix b/third_party/nixpkgs/pkgs/applications/office/zim/default.nix index 4cf3c3d78c..c0bca4c904 100644 --- a/third_party/nixpkgs/pkgs/applications/office/zim/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/zim/default.nix @@ -1,25 +1,22 @@ { lib, stdenv, fetchurl, python3Packages, gtk3, gobject-introspection, wrapGAppsHook, gnome }: -# # TODO: Declare configuration options for the following optional dependencies: # - File stores: hg, git, bzr # - Included plugins depenencies: dot, ditaa, dia, any other? # - pyxdg: Need to make it work first (see setupPyInstallFlags). -# python3Packages.buildPythonApplication rec { - name = "zim-${version}"; - version = "0.73.1"; + pname = "zim"; + version = "0.73.5"; src = fetchurl { - url = "https://zim-wiki.org/downloads/${name}.tar.gz"; - sha256 = "13vhwsgv6mscgixypc0ixkgj0y7cpcm7z7wn1vmdrwp7kn8m3xgx"; + url = "https://zim-wiki.org/downloads/zim-${version}.tar.gz"; + sha256 = "sha256-o28V2Sw5lMDVWwf4MlOz2LgmvrNxSGXturwU8cyR1jo="; }; buildInputs = [ gtk3 gobject-introspection wrapGAppsHook gnome.adwaita-icon-theme ]; propagatedBuildInputs = with python3Packages; [ pyxdg pygobject3 ]; - preFixup = '' export makeWrapperArgs="--prefix XDG_DATA_DIRS : $out/share --argv0 $out/bin/.zim-wrapped" ''; @@ -28,13 +25,12 @@ python3Packages.buildPythonApplication rec { doCheck = false; checkPhase = '' - python test.py + ${python3Packages.python.interpreter} test.py ''; - meta = with lib; { description = "A desktop wiki"; - homepage = "http://zim-wiki.org"; + homepage = "https://zim-wiki.org/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ pSub ]; broken = stdenv.isDarwin; # https://github.com/NixOS/nixpkgs/pull/52658#issuecomment-449565790 diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix index 36223aa194..13ed3db3a4 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -37,7 +37,7 @@ in buildGoModule rec { inherit rubyEnv; }; - buildFlags = [ "-tags=static,system_libgit2" ]; + tags = [ "static,system_libgit2" ]; nativeBuildInputs = [ pkg-config ]; buildInputs = [ rubyEnv.wrappedRuby libgit2 openssl zlib pcre http-parser ]; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/pijul/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/pijul/default.nix index 4c4cedd5a1..e5a12dd900 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/pijul/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/pijul/default.nix @@ -13,14 +13,14 @@ rustPlatform.buildRustPackage rec { pname = "pijul"; - version = "1.0.0-alpha.52"; + version = "1.0.0-alpha.53"; src = fetchCrate { inherit version pname; - sha256 = "0m759zfh40kxswsv40z1l332lc8lfqppyv8188y4i6biqmgbx8f1"; + sha256 = "1y5wnqscyfhd806qs6gfmssm7hvfdi7mxc9p1125jnmzca4wcsm2"; }; - cargoSha256 = "0f31hw2zjvhkhsb0ykvw4c3d0qy8zirgsaz7yr89hy01rs23bh8z"; + cargoSha256 = "0m9zjagq59rxf5pysklal030f4n0dqgmjsgwcnljajxc2r26665h"; cargoBuildFlags = lib.optional gitImportSupport "--features=git"; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/bochs/bochs-2.6.11-glibc-2.26.patch b/third_party/nixpkgs/pkgs/applications/virtualization/bochs/bochs-2.6.11-glibc-2.26.patch deleted file mode 100644 index e662913574..0000000000 --- a/third_party/nixpkgs/pkgs/applications/virtualization/bochs/bochs-2.6.11-glibc-2.26.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Naur bochs-2.6.10.orig/iodev/network/slirp/slirp.h bochs-2.6.10.mod/iodev/network/slirp/slirp.h ---- bochs-2.6.10.orig/iodev/network/slirp/slirp.h 2019-11-02 16:30:39.843938000 -0300 -+++ bochs-2.6.10.mod/iodev/network/slirp/slirp.h 2019-12-29 12:55:49.541630697 -0300 -@@ -44,8 +44,8 @@ - #endif - - #include --#if defined(__OpenBSD__) || defined(__linux__) - #include -+#if defined(__OpenBSD__) || defined(__linux__) - #include - #endif - #ifdef HAVE_SYS_BITYPES_H diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/bochs/bochs_fix_narrowing_conv_warning.patch b/third_party/nixpkgs/pkgs/applications/virtualization/bochs/bochs_fix_narrowing_conv_warning.patch deleted file mode 100644 index 167dd65d05..0000000000 --- a/third_party/nixpkgs/pkgs/applications/virtualization/bochs/bochs_fix_narrowing_conv_warning.patch +++ /dev/null @@ -1,29 +0,0 @@ ------------------------------------------------------------------------- -r13882 | vruppert | 2020-06-09 09:30:01 +0200 (Tue, 09 Jun 2020) | 2 lines - -Compilation fix for MSYS2 gcc 10.1.0 (narrowing conversion). - - -Index: iodev/display/voodoo_data.h -=================================================================== ---- a/iodev/display/voodoo_data.h (revision 13881) -+++ b/iodev/display/voodoo_data.h (revision 13882) -@@ -1837,11 +1837,11 @@ - - /* fifo content defines */ - #define FIFO_TYPES (7 << 29) --#define FIFO_WR_REG (1 << 29) --#define FIFO_WR_TEX (2 << 29) --#define FIFO_WR_FBI_32 (3 << 29) --#define FIFO_WR_FBI_16L (4 << 29) --#define FIFO_WR_FBI_16H (5 << 29) -+#define FIFO_WR_REG (1U << 29) -+#define FIFO_WR_TEX (2U << 29) -+#define FIFO_WR_FBI_32 (3U << 29) -+#define FIFO_WR_FBI_16L (4U << 29) -+#define FIFO_WR_FBI_16H (5U << 29) - - BX_CPP_INLINE void fifo_reset(fifo_state *f) - { - ------------------------------------------------------------------------- diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/bochs/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/bochs/default.nix index 002848380c..a54411eca9 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/bochs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/bochs/default.nix @@ -20,22 +20,13 @@ stdenv.mkDerivation rec { pname = "bochs"; - version = "2.6.11"; + version = "2.7"; src = fetchurl { - url = "mirror://sourceforge/project/bochs/bochs/${version}/${pname}-${version}.tar.gz"; - sha256 = "0ql8q6y1k356li1g9gbvl21448mlxphxxi6kjb2b3pxvzd0pp2b3"; + url = "mirror://sourceforge/project/bochs/bochs/${version}/bochs-${version}.tar.gz"; + hash = "sha256-oBCrG/3HKsWgjS4kEs1HHA/r1mrx2TSbwNeWh53lsXo="; }; - patches = [ - # A flip between two lines of code, in order to compile with GLIBC 2.26 - ./bochs-2.6.11-glibc-2.26.patch - # Fix compilation for MSYS2 GCC 10; remove it when the next version arrives - ./bochs_fix_narrowing_conv_warning.patch - # SMP-enabled configs; remove it when the next version arrives - ./fix-build-smp.patch - ]; - nativeBuildInputs = [ docbook_xml_dtd_45 docbook_xsl @@ -62,7 +53,6 @@ stdenv.mkDerivation rec { "--with-rfb=no" "--with-vncsrv=no" - "--with-svga=no" # it doesn't compile on NixOS # These will always be "yes" on NixOS "--enable-ltdl-install=yes" @@ -92,7 +82,6 @@ stdenv.mkDerivation rec { "--enable-cpu-level=6" # from 3 to 6 "--enable-debugger" #conflicts with gdb-stub option "--enable-debugger-gui" - "--enable-disasm" "--enable-e1000" "--enable-es1370" "--enable-evex" @@ -105,7 +94,7 @@ stdenv.mkDerivation rec { "--enable-largefile" "--enable-ne2000" "--enable-pci" - "--enable-plugins=no" # Plugins are a bit buggy in Bochs + "--enable-plugins=yes" "--enable-pnic" "--enable-repeat-speedups" "--enable-sb16" @@ -126,11 +115,6 @@ stdenv.mkDerivation rec { ++ lib.optionals (ncurses != null) [ "--with-term" ] ++ lib.optionals (gtk2 != null && wxGTK != null) [ "--with-wx" ]; - NIX_CFLAGS_COMPILE="-I${gtk2.dev}/include/gtk-2.0/ -I${libtool}/include/"; - NIX_LDFLAGS="-L${libtool.lib}/lib"; - - hardeningDisable = [ "format" ]; - enableParallelBuilding = true; meta = with lib; { @@ -146,5 +130,5 @@ stdenv.mkDerivation rec { platforms = platforms.unix; }; } -# TODO: plugins # TODO: a better way to organize the options +# TODO: docbook (install docbook-tools from RedHat mirrors can help) diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/bochs/fix-build-smp.patch b/third_party/nixpkgs/pkgs/applications/virtualization/bochs/fix-build-smp.patch deleted file mode 100644 index faa2acfa51..0000000000 --- a/third_party/nixpkgs/pkgs/applications/virtualization/bochs/fix-build-smp.patch +++ /dev/null @@ -1,21 +0,0 @@ -Description: A fix for SMP-enable configurations -Inspired in: https://sourceforge.net/p/bochs/code/13778/ - -============ -diff -Naur bochs-2.6.11-old/bx_debug/dbg_main.cc bochs-2.6.11-new/bx_debug/dbg_main.cc ---- bochs-2.6.11-old/bx_debug/dbg_main.cc 2019-12-20 04:57:59.818924000 -0300 -+++ bochs-2.6.11-new/bx_debug/dbg_main.cc 2020-03-30 23:20:29.402195707 -0300 -@@ -1494,11 +1494,11 @@ - { - char cpu_param_name[16]; - -- Bit32u index = BX_ITLB_INDEX_OF(laddr); -+ Bit32u index = BX_CPU(dbg_cpu)->ITLB.get_index_of(laddr); - sprintf(cpu_param_name, "ITLB.entry%d", index); - bx_dbg_show_param_command(cpu_param_name, 0); - -- index = BX_DTLB_INDEX_OF(laddr, 0); -+ index = BX_CPU(dbg_cpu)->DTLB.get_index_of(laddr); - sprintf(cpu_param_name, "DTLB.entry%d", index); - bx_dbg_show_param_command(cpu_param_name, 0); - } diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/umoci/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/umoci/default.nix index 82e6ca9086..22db5503c0 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/umoci/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/umoci/default.nix @@ -21,7 +21,7 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + ldflags = [ "-s" "-w" "-X main.version=${version}" ]; nativeBuildInputs = [ go-md2man installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/data/fonts/comfortaa/default.nix b/third_party/nixpkgs/pkgs/data/fonts/comfortaa/default.nix index 525c2920db..39c228d235 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/comfortaa/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/comfortaa/default.nix @@ -1,17 +1,22 @@ -{ lib, fetchzip }: +{ lib, fetchFromGitHub }: let - version = "3.001"; -in fetchzip rec { + version = "3.101"; +in fetchFromGitHub rec { name = "comfortaa-${version}"; - url = "https://orig00.deviantart.net/40a3/f/2017/093/d/4/comfortaa___font_by_aajohan-d1qr019.zip"; + owner = "googlefonts"; + repo = "comfortaa"; + rev = version; + postFetch = '' - mkdir -p $out/share/fonts $out/share/doc - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - unzip -j $downloadedFile \*/FONTLOG.txt \*/donate.html -d $out/share/doc/${name} + tar -xf $downloadedFile --strip=1 + mkdir -p $out/share/fonts/truetype $out/share/doc/comfortaa + cp fonts/TTF/*.ttf $out/share/fonts/truetype + cp FONTLOG.txt README.md $out/share/doc/comfortaa ''; - sha256 = "0z7xr0cnn6ghwivrm5b5awq9bzhnay3y99qq6dkdgfkfdsaz0n9h"; + + sha256 = "06jhdrfzl01ma085bp354g002ypmkbp6a51jn1lsj77zfj2mfmfc"; meta = with lib; { homepage = "http://aajohan.deviantart.com/art/Comfortaa-font-105395949"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/fira-mono/default.nix b/third_party/nixpkgs/pkgs/data/fonts/fira-mono/default.nix index 2aef2fc4b0..2cf1e7addb 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/fira-mono/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/fira-mono/default.nix @@ -1,13 +1,14 @@ { lib, fetchzip }: -fetchzip { - name = "fira-mono-3.206"; +let version = "4.202"; +in fetchzip { + name = "fira-mono-${version}"; - url = "https://github.com/mozilla/Fira/archive/4.106.zip"; + url = "https://github.com/mozilla/Fira/archive/${version}.zip"; postFetch = '' mkdir -p $out/share/fonts - unzip -j $downloadedFile Fira-4.106/otf/FiraMono\*.otf -d $out/share/fonts/opentype + unzip -j $downloadedFile Fira-${version}/otf/FiraMono\*.otf -d $out/share/fonts/opentype ''; sha256 = "1ci3fxhdwabvfj4nl16pwcgqnh7s2slp8vblribk8zkpx8cbp1dj"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/unifont/default.nix b/third_party/nixpkgs/pkgs/data/fonts/unifont/default.nix index 7fb7387179..f7cb84f285 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/unifont/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/unifont/default.nix @@ -4,16 +4,16 @@ stdenv.mkDerivation rec { pname = "unifont"; - version = "13.0.05"; + version = "13.0.06"; ttf = fetchurl { url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.ttf"; - sha256 = "0ff7zbyqi45q0171rl9ckj6lpfhcj8a9850d8j89m7wbwky32isf"; + sha256 = "0hp72lcj8q8cw490lxl5y1ygw9mcicryjwqr1mmkdz8zh4jh8g6p"; }; pcf = fetchurl { url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.pcf.gz"; - sha256 = "16n666p6rs6l4r8grh67gy4ls33qfnbb5xk7cksywzjwdh42js0r"; + sha256 = "0y030km1x8mai8zrk661dqsb0yq8rpx6akl7p2sw5ijkcdsfm85f"; }; nativeBuildInputs = [ libfaketime fonttosfnt mkfontscale ]; @@ -43,10 +43,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Unicode font for Base Multilingual Plane"; - homepage = "http://unifoundry.com/unifont.html"; + homepage = "https://unifoundry.com/unifont/"; # Basically GPL2+ with font exception. - license = "http://unifoundry.com/LICENSE.txt"; + license = "https://unifoundry.com/LICENSE.txt"; maintainers = [ maintainers.rycee maintainers.vrthra ]; platforms = platforms.all; }; diff --git a/third_party/nixpkgs/pkgs/data/fonts/unifont_upper/default.nix b/third_party/nixpkgs/pkgs/data/fonts/unifont_upper/default.nix index 04480aaeec..40799fafab 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/unifont_upper/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/unifont_upper/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "13.0.05"; + version = "13.0.06"; in fetchzip rec { name = "unifont_upper-${version}"; @@ -9,14 +9,14 @@ in fetchzip rec { postFetch = "install -Dm644 $downloadedFile $out/share/fonts/truetype/unifont_upper.ttf"; - sha256 = "1cpi44fzsiq3yqg38763awgri1ma46421c3v8167bsxzsx7vzlkp"; + sha256 = "0bqw30h5b787dw8bn1dj8shz22mlxr1zmcfp68fpyll5vg02540n"; meta = with lib; { description = "Unicode font for glyphs above the Unicode Basic Multilingual Plane"; - homepage = "http://unifoundry.com/unifont.html"; + homepage = "https://unifoundry.com/unifont/"; # Basically GPL2+ with font exception. - license = "http://unifoundry.com/LICENSE.txt"; + license = "https://unifoundry.com/LICENSE.txt"; maintainers = [ maintainers.mathnerd314 maintainers.vrthra ]; platforms = platforms.all; }; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/caribou/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/caribou/default.nix index 5985ff8226..50fb1c3de5 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/caribou/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/caribou/default.nix @@ -1,6 +1,6 @@ { fetchurl, lib, stdenv, pkg-config, gnome, glib, gtk3, clutter, dbus, python3, libxml2 , libxklavier, libXtst, gtk2, intltool, libxslt, at-spi2-core, autoreconfHook -, wrapGAppsHook, libgee }: +, wrapGAppsHook, libgee, vala_0_40 }: let pname = "caribou"; @@ -21,9 +21,19 @@ in stdenv.mkDerivation rec { url = "https://bugzilla.gnome.org/attachment.cgi?id=364774"; sha256 = "15k1455grf6knlrxqbjnk7sals1730b0whj30451scp46wyvykvd"; }) + (fetchurl { + name = "fix-build-modern-vala.patch"; + url = "https://gitlab.gnome.org/GNOME/caribou/-/commit/76fbd11575f918fc898cb0f5defe07f67c11ec38.patch"; + sha256 = "0qy27zk7889hg51nx40afgppcx9iaihxbg3aqz9w35d6fmhr2k2y"; + }) + (fetchurl { + name = "CVE-2021-3567.patch"; + url = "https://gitlab.gnome.org/GNOME/caribou/-/commit/d41c8e44b12222a290eaca16703406b113a630c6.patch"; + sha256 = "1vd2j3823k2p3msv7fq2437p3jvxzbd7hyh07i80g9754ylh92y8"; + }) ]; - nativeBuildInputs = [ pkg-config intltool libxslt libxml2 autoreconfHook wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config intltool libxslt libxml2 autoreconfHook wrapGAppsHook vala_0_40 ]; buildInputs = [ glib gtk3 clutter at-spi2-core dbus pythonEnv python3.pkgs.pygobject3 diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/fetch.sh b/third_party/nixpkgs/pkgs/desktops/plasma-5/fetch.sh index d03f3e86fd..db200b4cd1 100644 --- a/third_party/nixpkgs/pkgs/desktops/plasma-5/fetch.sh +++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/plasma/5.22.3/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/plasma/5.22.4/ -A '*.tar.xz' ) diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/srcs.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/srcs.nix index 675cb51e09..0cd26b6a6c 100644 --- a/third_party/nixpkgs/pkgs/desktops/plasma-5/srcs.nix +++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/srcs.nix @@ -4,427 +4,427 @@ { bluedevil = { - version = "5.22.3"; + version = "5.22.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.3/bluedevil-5.22.3.tar.xz"; - sha256 = "1qgq4c3c1jmhssq9yllx69df58a884w39ng9z2ddl3kvph6c1f4m"; - name = "bluedevil-5.22.3.tar.xz"; + url = "${mirror}/stable/plasma/5.22.4/bluedevil-5.22.4.tar.xz"; + sha256 = "10bqk46ygnf72aqxxaxlx4khv1gwj46la1czsjmlszvkcqxrpwa0"; + name = "bluedevil-5.22.4.tar.xz"; }; }; breeze = { - version = "5.22.3"; + version = "5.22.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.3/breeze-5.22.3.tar.xz"; - sha256 = "1r10y41l6l2xhmwvy2q03icp6b4163pav98bdrwysrx7pvlj131b"; - name = "breeze-5.22.3.tar.xz"; + url = "${mirror}/stable/plasma/5.22.4/breeze-5.22.4.tar.xz"; + sha256 = "1b4zrwpaayd6mlwsnwg416ryba32zpg8w2dlh56qbmg6jxzjnybx"; + name = "breeze-5.22.4.tar.xz"; }; }; breeze-grub = { - version = "5.22.3"; + version = "5.22.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.3/breeze-grub-5.22.3.tar.xz"; - sha256 = "06i0k2s7arfwjzcr972c1zs2kpkxvl57ih9nz5idd0lshamc36gy"; - name = "breeze-grub-5.22.3.tar.xz"; + url = "${mirror}/stable/plasma/5.22.4/breeze-grub-5.22.4.tar.xz"; + sha256 = "19zlhq3k80id676sxlf8nhk0a11rkrwmbd256aggdwhz1fivxc1c"; + name = "breeze-grub-5.22.4.tar.xz"; }; }; breeze-gtk = { - version = "5.22.3"; + version = "5.22.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.3/breeze-gtk-5.22.3.tar.xz"; - sha256 = "1gvx1ip8jkc7pj6bciy3514bkmlazliz60sxdab8b6m00lb0rwng"; - name = "breeze-gtk-5.22.3.tar.xz"; + url = "${mirror}/stable/plasma/5.22.4/breeze-gtk-5.22.4.tar.xz"; + sha256 = "1p47vsr2xj00p1r2jhyns2wzchjlhymzzyv2xqy9xd4l8pkv8scb"; + name = "breeze-gtk-5.22.4.tar.xz"; }; }; breeze-plymouth = { - version = "5.22.3"; + version = "5.22.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.3/breeze-plymouth-5.22.3.tar.xz"; - sha256 = "03px2jk50plalpnzj6xsbkpqxmj5vkxl7r6y60g7dxf6d4hv15dr"; - name = "breeze-plymouth-5.22.3.tar.xz"; + url = "${mirror}/stable/plasma/5.22.4/breeze-plymouth-5.22.4.tar.xz"; + sha256 = "0b9sjn8lfhgyc2sz1r9rnknkas79526qmwi5j3wbxb0va2rcap9z"; + name = "breeze-plymouth-5.22.4.tar.xz"; }; }; discover = { - version = "5.22.3"; + version = "5.22.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.3/discover-5.22.3.tar.xz"; - sha256 = "1893wwq4m40z6k64n97vqgxkhwcgbhw4q5m5cs0dpczx1803sa8y"; - name = "discover-5.22.3.tar.xz"; + url = "${mirror}/stable/plasma/5.22.4/discover-5.22.4.tar.xz"; + sha256 = "0ij7b1fyv9rgiw6ywgxzj35c9bd3937w3njzqmkzi2l9zlnrzwvg"; + name = "discover-5.22.4.tar.xz"; }; }; drkonqi = { - version = "5.22.3"; + version = "5.22.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.3/drkonqi-5.22.3.tar.xz"; - sha256 = "09jf0rdpb1k2fbbqg3p5ypk7jhp2nls19x1zc8rphnsr1hwxxsb3"; - name = "drkonqi-5.22.3.tar.xz"; + url = "${mirror}/stable/plasma/5.22.4/drkonqi-5.22.4.tar.xz"; + sha256 = "1dy5v50icnlwa4pl5z30q5abv2sbznlrpgiy28hh1mf64hx6hl3w"; + name = "drkonqi-5.22.4.tar.xz"; }; }; kactivitymanagerd = { - version = "5.22.3"; + version = "5.22.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.3/kactivitymanagerd-5.22.3.tar.xz"; - sha256 = "1i2hs9204vi41d3jb6hr050g9v0jm5in07nqyxy1wxw2bmpncisx"; - name = "kactivitymanagerd-5.22.3.tar.xz"; + url = "${mirror}/stable/plasma/5.22.4/kactivitymanagerd-5.22.4.tar.xz"; + sha256 = "1km0mlqyrvflq45gwffrbwvkrqirb44qn1rp37iif4d82pmx11yv"; + name = "kactivitymanagerd-5.22.4.tar.xz"; }; }; kde-cli-tools = { - version = "5.22.3"; + version = "5.22.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.3/kde-cli-tools-5.22.3.tar.xz"; - sha256 = "1w5c65fd0p2xz185prkrr6ys0cy3wasfkbfv1q4qiniwxjipa3q4"; - name = "kde-cli-tools-5.22.3.tar.xz"; + url = "${mirror}/stable/plasma/5.22.4/kde-cli-tools-5.22.4.tar.xz"; + sha256 = "1kh8pba9q61qjjpc945nvx42mm63vrj5bny4iv60jgcfxxwy7qj4"; + name = "kde-cli-tools-5.22.4.tar.xz"; }; }; kdecoration = { - version = "5.22.3"; + version = "5.22.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.3/kdecoration-5.22.3.tar.xz"; - sha256 = "1bgygqi37yc34nhlf5w32zgz0qvrga9kh7ickxc2gydslvjwaq5p"; - name = "kdecoration-5.22.3.tar.xz"; + url = "${mirror}/stable/plasma/5.22.4/kdecoration-5.22.4.tar.xz"; + sha256 = "0cc0lskm359lbg93bxny84cf1qnk0h53f64bxy3dvbyn5gmvzsch"; + name = "kdecoration-5.22.4.tar.xz"; }; }; kde-gtk-config = { - version = "5.22.3"; + version = "5.22.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.3/kde-gtk-config-5.22.3.tar.xz"; - sha256 = "1mq10qbp3jm4mdbkday1afwa0nj9zx8clvaw51qxprcphg4csjy8"; - name = "kde-gtk-config-5.22.3.tar.xz"; + url = "${mirror}/stable/plasma/5.22.4/kde-gtk-config-5.22.4.tar.xz"; + sha256 = "0d56brzpk5yi7cdyvpqg3jlk5n3l2dvk98npw34fd4i3gw357px8"; + name = "kde-gtk-config-5.22.4.tar.xz"; }; }; kdeplasma-addons = { - version = "5.22.3"; + version = "5.22.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.3/kdeplasma-addons-5.22.3.tar.xz"; - sha256 = "1hd3lv9sjlhab91lsxbg6rkgjcp50zy7n3sj51hdcbsdi8fjr9nh"; - name = "kdeplasma-addons-5.22.3.tar.xz"; + url = "${mirror}/stable/plasma/5.22.4/kdeplasma-addons-5.22.4.tar.xz"; + sha256 = "1flf4mq0zcjh7fnv155hklliidfvflh20d1s84rj8q2ka7phcwk0"; + name = "kdeplasma-addons-5.22.4.tar.xz"; }; }; kgamma5 = { - version = "5.22.3"; + version = "5.22.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.3/kgamma5-5.22.3.tar.xz"; - sha256 = "1v7jak4bpj5vhzqzq07v9v6b24xqp52k00dx43w2dhsh0vaas9sc"; - name = "kgamma5-5.22.3.tar.xz"; + url = "${mirror}/stable/plasma/5.22.4/kgamma5-5.22.4.tar.xz"; + sha256 = "0fgx9i031iqrp7w7v7px1vha079cjcdv9w5ah4k1m53g8abriddl"; + name = "kgamma5-5.22.4.tar.xz"; }; }; khotkeys = { - version = "5.22.3"; + version = "5.22.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.3/khotkeys-5.22.3.tar.xz"; - sha256 = "0070nk02nwsbnikvf7qjw0wdxkpfv6nvyv1sw68whnm0xjgxnkl5"; - name = "khotkeys-5.22.3.tar.xz"; + url = "${mirror}/stable/plasma/5.22.4/khotkeys-5.22.4.tar.xz"; + sha256 = "1lm1xrbrpym7nhvnzljdgr5nsas8z3i0hgda53j5k6svzk5r3qg8"; + name = "khotkeys-5.22.4.tar.xz"; }; }; kinfocenter = { - version = "5.22.3"; + version = "5.22.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.3/kinfocenter-5.22.3.tar.xz"; - sha256 = "1qkbhic99ddd55z3wvnhx1ykiy2ydanw32gs7gww8i0adwh0jc3b"; - name = "kinfocenter-5.22.3.tar.xz"; + url = "${mirror}/stable/plasma/5.22.4/kinfocenter-5.22.4.tar.xz"; + sha256 = "14vfz5j3fxhfb1fip00fgg9k6dc9ffjf0ss8ij1cx7bga14nmzvw"; + name = "kinfocenter-5.22.4.tar.xz"; }; }; kmenuedit = { - version = "5.22.3"; + version = "5.22.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.3/kmenuedit-5.22.3.tar.xz"; - sha256 = "1ldvx0mvzx3ym7aqz9hk044nn33b97n5bh757v8kwi8fy6yk10xx"; - name = "kmenuedit-5.22.3.tar.xz"; + url = "${mirror}/stable/plasma/5.22.4/kmenuedit-5.22.4.tar.xz"; + sha256 = "186j8ky5z3l0mmxx327xzahhsyf7wlds1rsmzzmlxficpg43n90b"; + name = "kmenuedit-5.22.4.tar.xz"; }; }; kscreen = { - version = "5.22.3"; + version = "5.22.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.3/kscreen-5.22.3.tar.xz"; - sha256 = "09ai5l3rnhsq3fy1faqg8q3hrikmsjq7gvh1rsw542v9ii37bgjn"; - name = "kscreen-5.22.3.tar.xz"; + url = "${mirror}/stable/plasma/5.22.4/kscreen-5.22.4.tar.xz"; + sha256 = "0hkn7ap55x4rzm6x3qdinjar9qhnb742zgzmvswy1kn3a8mxby17"; + name = "kscreen-5.22.4.tar.xz"; }; }; kscreenlocker = { - version = "5.22.3"; + version = "5.22.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.3/kscreenlocker-5.22.3.tar.xz"; - sha256 = "119jbpvni7id6d1kidi8n4nsxscisyc8ifd5a4q7y73sspdr46fp"; - name = "kscreenlocker-5.22.3.tar.xz"; + url = "${mirror}/stable/plasma/5.22.4/kscreenlocker-5.22.4.tar.xz"; + sha256 = "0i7c6a378h7366h7nl5051mwrx7cadzfaryfnhpskhlgy3l7119j"; + name = "kscreenlocker-5.22.4.tar.xz"; }; }; ksshaskpass = { - version = "5.22.3"; + version = "5.22.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.3/ksshaskpass-5.22.3.tar.xz"; - sha256 = "1vgnz3j83yypymwqzi9r314zwgvaqp82akyfwzzfw60csb6vqdfr"; - name = "ksshaskpass-5.22.3.tar.xz"; + url = "${mirror}/stable/plasma/5.22.4/ksshaskpass-5.22.4.tar.xz"; + sha256 = "01f2rz1xqb1jy83427f7rmsb3a7ivkgf2qmm04kwjv29zplg796f"; + name = "ksshaskpass-5.22.4.tar.xz"; }; }; ksystemstats = { - version = "5.22.3"; + version = "5.22.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.3/ksystemstats-5.22.3.tar.xz"; - sha256 = "0p19lcn8rmpxnnwa6crn9id6pwxixmh68yx6j3cy7z2l3ngfrnka"; - name = "ksystemstats-5.22.3.tar.xz"; + url = "${mirror}/stable/plasma/5.22.4/ksystemstats-5.22.4.tar.xz"; + sha256 = "1daz3890v7qbkcsb9m535mfnijdq3rbasxwqs0ixhn2m400yivvg"; + name = "ksystemstats-5.22.4.tar.xz"; }; }; kwallet-pam = { - version = "5.22.3"; + version = "5.22.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.3/kwallet-pam-5.22.3.tar.xz"; - sha256 = "0x2dw5rgqr0hysdbd4d7nqx4wkxh511xhwfikrgbc3m13vs7l8dg"; - name = "kwallet-pam-5.22.3.tar.xz"; + url = "${mirror}/stable/plasma/5.22.4/kwallet-pam-5.22.4.tar.xz"; + sha256 = "1ljrrgjvkvs3fsiijgaxj82hzp1fhsiy39r4amwp21v411c80jwq"; + name = "kwallet-pam-5.22.4.tar.xz"; }; }; kwayland-integration = { - version = "5.22.3"; + version = "5.22.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.3/kwayland-integration-5.22.3.tar.xz"; - sha256 = "096a8b4pjc1l57jq08x7x181biichrjp5i3s9kyp2kkd09lk0niz"; - name = "kwayland-integration-5.22.3.tar.xz"; + url = "${mirror}/stable/plasma/5.22.4/kwayland-integration-5.22.4.tar.xz"; + sha256 = "17nl033vl8i9a92bjbgwwwrkf03lg4726lwdbj3y8xajdp8ql1nb"; + name = "kwayland-integration-5.22.4.tar.xz"; }; }; kwayland-server = { - version = "5.22.3"; + version = "5.22.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.3/kwayland-server-5.22.3.tar.xz"; - sha256 = "0c5xcnj29d5j9zqj4qnqgs5732aqi6xqpxqwid20v551lf24kc6n"; - name = "kwayland-server-5.22.3.tar.xz"; + url = "${mirror}/stable/plasma/5.22.4/kwayland-server-5.22.4.tar.xz"; + sha256 = "0z3ni5ar2bwpc75ssb3qmkbff85a489sxr7vzqhxa40n48bp85ns"; + name = "kwayland-server-5.22.4.tar.xz"; }; }; kwin = { - version = "5.22.3"; + version = "5.22.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.3/kwin-5.22.3.tar.xz"; - sha256 = "03kd07p1hm6s8vkfjr1rlbjj9bpc48k5ynfb364dkypbfin5p6dw"; - name = "kwin-5.22.3.tar.xz"; + url = "${mirror}/stable/plasma/5.22.4/kwin-5.22.4.tar.xz"; + sha256 = "1x5338aib7kn1lgpb06b8s06bfj2ybfgyr6k0q91zlc53x61qamh"; + name = "kwin-5.22.4.tar.xz"; }; }; kwrited = { - version = "5.22.3"; + version = "5.22.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.3/kwrited-5.22.3.tar.xz"; - sha256 = "063hmj24i3hvaw6wzjqs56ln6p9jjfz08f9r04wgzgg01zzyznjn"; - name = "kwrited-5.22.3.tar.xz"; + url = "${mirror}/stable/plasma/5.22.4/kwrited-5.22.4.tar.xz"; + sha256 = "1rbkbqf5v8wqd2aldpg396ki8a9fsw82jmzmdhsirq33r5yznn4i"; + name = "kwrited-5.22.4.tar.xz"; }; }; layer-shell-qt = { - version = "5.22.3"; + version = "5.22.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.3/layer-shell-qt-5.22.3.tar.xz"; - sha256 = "0jnfhq86419f9y0vs6l7z3n2f63xy7mwz1s0992zx44ambvwfpnq"; - name = "layer-shell-qt-5.22.3.tar.xz"; + url = "${mirror}/stable/plasma/5.22.4/layer-shell-qt-5.22.4.tar.xz"; + sha256 = "11iqk4bla0y0w2frmvzxi4a3jxj3cj2m8y473z3nfb0z8i5yca0m"; + name = "layer-shell-qt-5.22.4.tar.xz"; }; }; libkscreen = { - version = "5.22.3"; + version = "5.22.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.3/libkscreen-5.22.3.tar.xz"; - sha256 = "1whhxzbl8sh63490c222y2dn6qcx9rp8wxsmx8mpx9i7p0x3rl01"; - name = "libkscreen-5.22.3.tar.xz"; + url = "${mirror}/stable/plasma/5.22.4/libkscreen-5.22.4.tar.xz"; + sha256 = "0z2mzha22f2yl7l0ijy4pqpab6n1ivib3grnd583znff02wvj4d2"; + name = "libkscreen-5.22.4.tar.xz"; }; }; libksysguard = { - version = "5.22.3"; + version = "5.22.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.3/libksysguard-5.22.3.tar.xz"; - sha256 = "0sjrm3g4wxscv0p9vkw0p6vr1hdysmngc1l57a26cg1z920zidjh"; - name = "libksysguard-5.22.3.tar.xz"; + url = "${mirror}/stable/plasma/5.22.4/libksysguard-5.22.4.tar.xz"; + sha256 = "14h66gs7z6gf7wrpdhpd1461431q2plv7kvfsh02fj52l1dzpcc0"; + name = "libksysguard-5.22.4.tar.xz"; }; }; milou = { - version = "5.22.3"; + version = "5.22.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.3/milou-5.22.3.tar.xz"; - sha256 = "0qcy7snn3r16x0vyz57xv60fnjl565pfq9rd265n3w6543ivc09r"; - name = "milou-5.22.3.tar.xz"; + url = "${mirror}/stable/plasma/5.22.4/milou-5.22.4.tar.xz"; + sha256 = "11fa9bj3yzriaydfk8q9kc626yv0s0sal5ws13pcd6ksbhslz83s"; + name = "milou-5.22.4.tar.xz"; }; }; oxygen = { - version = "5.22.3"; + version = "5.22.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.3/oxygen-5.22.3.tar.xz"; - sha256 = "1fp425ifzk5fxapkwdc4q8xfyajs2skqg83sf1gqh9qsyniw47m5"; - name = "oxygen-5.22.3.tar.xz"; + url = "${mirror}/stable/plasma/5.22.4/oxygen-5.22.4.tar.xz"; + sha256 = "1p5hklryi02xw0byy5zcaxx5zw81vd6vq3s1h8dyhj07vspimpzw"; + name = "oxygen-5.22.4.tar.xz"; }; }; plasma-browser-integration = { - version = "5.22.3"; + version = "5.22.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.3/plasma-browser-integration-5.22.3.tar.xz"; - sha256 = "16mpzycxpag946l6fivr5gv5ns5wlmxq7q8mwmhmffa0byg87wxs"; - name = "plasma-browser-integration-5.22.3.tar.xz"; + url = "${mirror}/stable/plasma/5.22.4/plasma-browser-integration-5.22.4.tar.xz"; + sha256 = "023qbp77ga0jblhhx3437v9jjxx5va7q58abmnpv2nls1xwyq8hb"; + name = "plasma-browser-integration-5.22.4.tar.xz"; }; }; plasma-desktop = { - version = "5.22.3"; + version = "5.22.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.3/plasma-desktop-5.22.3.tar.xz"; - sha256 = "046n6wxbdmjxhv1xvvdkb2vy76cpb7nkj7x5zpkmjy2ifa2q6nxx"; - name = "plasma-desktop-5.22.3.tar.xz"; + url = "${mirror}/stable/plasma/5.22.4/plasma-desktop-5.22.4.tar.xz"; + sha256 = "0c225lckhsmhig7xsnv5yfajys3w67g6xj4w1hvz1x3hqs79z3kj"; + name = "plasma-desktop-5.22.4.tar.xz"; }; }; plasma-disks = { - version = "5.22.3"; + version = "5.22.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.3/plasma-disks-5.22.3.tar.xz"; - sha256 = "1a36mgd32743jmnib2gc9x5yg8ipv7zpjwjq087b39k7sr16c40l"; - name = "plasma-disks-5.22.3.tar.xz"; + url = "${mirror}/stable/plasma/5.22.4/plasma-disks-5.22.4.tar.xz"; + sha256 = "02brm36akqfhjz9fzyzfinjnb954glrrlwpyhiq1sx073v2ibyap"; + name = "plasma-disks-5.22.4.tar.xz"; }; }; plasma-firewall = { - version = "5.22.3"; + version = "5.22.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.3/plasma-firewall-5.22.3.tar.xz"; - sha256 = "09300mbq6g193k3bk51g0a21idw5lfvibciiw6dqpn4dxynb8i0d"; - name = "plasma-firewall-5.22.3.tar.xz"; + url = "${mirror}/stable/plasma/5.22.4/plasma-firewall-5.22.4.tar.xz"; + sha256 = "1c1mzpd45hd4sb6qsylqgq2x4fay1nskkgmcc1vswmnapcm9gp91"; + name = "plasma-firewall-5.22.4.tar.xz"; }; }; plasma-integration = { - version = "5.22.3"; + version = "5.22.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.3/plasma-integration-5.22.3.tar.xz"; - sha256 = "02xsw10zn3p17zb6nqgbjlsmy6ayxyyr6krnmqdg5xz03p6m9whq"; - name = "plasma-integration-5.22.3.tar.xz"; + url = "${mirror}/stable/plasma/5.22.4/plasma-integration-5.22.4.tar.xz"; + sha256 = "0rslli0jsyyhm6prac3xgilwf58gjxqhsijgvr25sipg6200r2z0"; + name = "plasma-integration-5.22.4.tar.xz"; }; }; plasma-nano = { - version = "5.22.3"; + version = "5.22.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.3/plasma-nano-5.22.3.tar.xz"; - sha256 = "100ljwavpm02dvf0msp2al2hrjb2ki1zpm57bwkfaqj40knir6p6"; - name = "plasma-nano-5.22.3.tar.xz"; + url = "${mirror}/stable/plasma/5.22.4/plasma-nano-5.22.4.tar.xz"; + sha256 = "1ag57nphgkj3f17s42d81npk0z2n27623szbiz1hpgp7f6994l90"; + name = "plasma-nano-5.22.4.tar.xz"; }; }; plasma-nm = { - version = "5.22.3"; + version = "5.22.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.3/plasma-nm-5.22.3.tar.xz"; - sha256 = "1imq4j5a62idqjp0bqwbz2rqc9ln1dwxxarxkq68jiw7bvyy0rix"; - name = "plasma-nm-5.22.3.tar.xz"; + url = "${mirror}/stable/plasma/5.22.4/plasma-nm-5.22.4.tar.xz"; + sha256 = "1cvfawsqzk3yzjwnz6gc6l7p3pz9brbh0n6km23i1bis08rks168"; + name = "plasma-nm-5.22.4.tar.xz"; }; }; plasma-pa = { - version = "5.22.3"; + version = "5.22.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.3/plasma-pa-5.22.3.tar.xz"; - sha256 = "184a89qfn58ylakqjh524p3n4knvch85klz534jzxdxzb8kjmn0a"; - name = "plasma-pa-5.22.3.tar.xz"; + url = "${mirror}/stable/plasma/5.22.4/plasma-pa-5.22.4.tar.xz"; + sha256 = "1p000y08p89wvv73glv9ic0gdbdhc9fpzvphx72y420g5hhmnnwa"; + name = "plasma-pa-5.22.4.tar.xz"; }; }; plasma-phone-components = { - version = "5.22.3"; + version = "5.22.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.3/plasma-phone-components-5.22.3.tar.xz"; - sha256 = "1plp49acy83a1ls7i9aafckb62grwhsqv1i7l3hrzdd1ci7gsmxl"; - name = "plasma-phone-components-5.22.3.tar.xz"; + url = "${mirror}/stable/plasma/5.22.4/plasma-phone-components-5.22.4.tar.xz"; + sha256 = "0mkr7amxvr325y7f98y1368iv4gs6j2x6bkpi20rp8c2vifkvg5b"; + name = "plasma-phone-components-5.22.4.tar.xz"; }; }; plasma-sdk = { - version = "5.22.3"; + version = "5.22.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.3/plasma-sdk-5.22.3.tar.xz"; - sha256 = "0hn7im5wb2jka2q1g5gyp9hr8n000raxpk1rfcr09i8yrc6xhsnj"; - name = "plasma-sdk-5.22.3.tar.xz"; + url = "${mirror}/stable/plasma/5.22.4/plasma-sdk-5.22.4.tar.xz"; + sha256 = "0nrh3zbff25wr59hbsvrygjix56as8rd95smr5075qwdyamcqnhf"; + name = "plasma-sdk-5.22.4.tar.xz"; }; }; plasma-systemmonitor = { - version = "5.22.3"; + version = "5.22.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.3/plasma-systemmonitor-5.22.3.tar.xz"; - sha256 = "1lz4j5cv405jfbx4bl522wica0xylc33hgsf8v5915d3i074z669"; - name = "plasma-systemmonitor-5.22.3.tar.xz"; + url = "${mirror}/stable/plasma/5.22.4/plasma-systemmonitor-5.22.4.tar.xz"; + sha256 = "1gl6kjk6b8xwcfrk6xf41jf1lh3zxr5b6qvdv7z6i8wb3pll63cb"; + name = "plasma-systemmonitor-5.22.4.tar.xz"; }; }; plasma-tests = { - version = "5.22.3"; + version = "5.22.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.3/plasma-tests-5.22.3.tar.xz"; - sha256 = "0qvgmk4idxr4ajj33frrsa2xpdgr53am4cvzs70g6fk3wfjm0b9z"; - name = "plasma-tests-5.22.3.tar.xz"; + url = "${mirror}/stable/plasma/5.22.4/plasma-tests-5.22.4.tar.xz"; + sha256 = "1wf33c0izm9yyjcysiimcpiwmsa64b4ypklga2rbg7kkk7q0nq82"; + name = "plasma-tests-5.22.4.tar.xz"; }; }; plasma-thunderbolt = { - version = "5.22.3"; + version = "5.22.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.3/plasma-thunderbolt-5.22.3.tar.xz"; - sha256 = "1f5vnf4zacgzvg9rbga90mcgjzfhrqq1qbbf16syi0xkbg031prz"; - name = "plasma-thunderbolt-5.22.3.tar.xz"; + url = "${mirror}/stable/plasma/5.22.4/plasma-thunderbolt-5.22.4.tar.xz"; + sha256 = "1c5ihvam5hfk7xiy3m707jjhpv2rxgl7d2f6m0d764zynm6zax79"; + name = "plasma-thunderbolt-5.22.4.tar.xz"; }; }; plasma-vault = { - version = "5.22.3"; + version = "5.22.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.3/plasma-vault-5.22.3.tar.xz"; - sha256 = "13vdbmbsz6bfjdsbhwv29rm515h7bk11lqc6hk2178yh9p4xn6nk"; - name = "plasma-vault-5.22.3.tar.xz"; + url = "${mirror}/stable/plasma/5.22.4/plasma-vault-5.22.4.tar.xz"; + sha256 = "1p6bl8as8rx36nzwx2rymqmx4rg7dg0bfrxr0flx9jqp1adclf39"; + name = "plasma-vault-5.22.4.tar.xz"; }; }; plasma-workspace = { - version = "5.22.3"; + version = "5.22.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.3/plasma-workspace-5.22.3.tar.xz"; - sha256 = "1mm4lpx094v62h05qlg0rbgk10g8aisnnr82ynyal4m1awahlp6r"; - name = "plasma-workspace-5.22.3.tar.xz"; + url = "${mirror}/stable/plasma/5.22.4/plasma-workspace-5.22.4.tar.xz"; + sha256 = "1fi0c66f2cgqcbshbaxzch75r28l5w4l3flggccil5c73lavf5mg"; + name = "plasma-workspace-5.22.4.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.22.3"; + version = "5.22.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.3/plasma-workspace-wallpapers-5.22.3.tar.xz"; - sha256 = "0xay6zfrvz535n5cl3w40x63b5mvqmzmmha4csbwhingqrxyxqp3"; - name = "plasma-workspace-wallpapers-5.22.3.tar.xz"; + url = "${mirror}/stable/plasma/5.22.4/plasma-workspace-wallpapers-5.22.4.tar.xz"; + sha256 = "0abz3qic8m7dcbd0m1ci8qspfds3fdsqhgv8m6ks2jkcm7z4vnnr"; + name = "plasma-workspace-wallpapers-5.22.4.tar.xz"; }; }; plymouth-kcm = { - version = "5.22.3"; + version = "5.22.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.3/plymouth-kcm-5.22.3.tar.xz"; - sha256 = "0xwn827xi0fwvwsrb69q6k8xgbgdjjhb50v4d9icy1n7dfjlbw19"; - name = "plymouth-kcm-5.22.3.tar.xz"; + url = "${mirror}/stable/plasma/5.22.4/plymouth-kcm-5.22.4.tar.xz"; + sha256 = "0vh39lidm0dqah14y7nkzqpanlkxpmylf7wc40giavady3d2i1y1"; + name = "plymouth-kcm-5.22.4.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.22.3"; + version = "1-5.22.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.3/polkit-kde-agent-1-5.22.3.tar.xz"; - sha256 = "16jdrqgibm9iv1j7vl9n8k7q4sqjqmvzcndq67wyva2lvy2xhjcw"; - name = "polkit-kde-agent-1-5.22.3.tar.xz"; + url = "${mirror}/stable/plasma/5.22.4/polkit-kde-agent-1-5.22.4.tar.xz"; + sha256 = "0pxrrn4qs96a5p9cp890vdq2g79ah72p655643ciqdb14936p0z2"; + name = "polkit-kde-agent-1-5.22.4.tar.xz"; }; }; powerdevil = { - version = "5.22.3"; + version = "5.22.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.3/powerdevil-5.22.3.tar.xz"; - sha256 = "1i7zx8ykp73g8mav1k8jiizfz4f3lzjvsjf0ky74hklc610hgvb4"; - name = "powerdevil-5.22.3.tar.xz"; + url = "${mirror}/stable/plasma/5.22.4/powerdevil-5.22.4.tar.xz"; + sha256 = "17427sv6yh16hmgl94lyb4d7gds0r4hvx8vbbqhzysih2x81xl6m"; + name = "powerdevil-5.22.4.tar.xz"; }; }; qqc2-breeze-style = { - version = "5.22.3"; + version = "5.22.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.3/qqc2-breeze-style-5.22.3.tar.xz"; - sha256 = "1pfpmqs4469sfk753915jjg78a61jjswzq2ckg1mrvpvjm6c3m3n"; - name = "qqc2-breeze-style-5.22.3.tar.xz"; + url = "${mirror}/stable/plasma/5.22.4/qqc2-breeze-style-5.22.4.tar.xz"; + sha256 = "15h9rjc4ry3kw18aw18r8y8av4cn2wckab8gyyi7zx7s54n6zpvc"; + name = "qqc2-breeze-style-5.22.4.tar.xz"; }; }; sddm-kcm = { - version = "5.22.3"; + version = "5.22.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.3/sddm-kcm-5.22.3.tar.xz"; - sha256 = "1cp421qk5plp0l3h0z3v6kkfm2qc3j1xk1q7xgfw7s6scrxkj1gp"; - name = "sddm-kcm-5.22.3.tar.xz"; + url = "${mirror}/stable/plasma/5.22.4/sddm-kcm-5.22.4.tar.xz"; + sha256 = "08j0qd288a5msagpyaqwrw0w6wymxsgqq3rlk8kv3n6qvrsm7174"; + name = "sddm-kcm-5.22.4.tar.xz"; }; }; systemsettings = { - version = "5.22.3"; + version = "5.22.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.3/systemsettings-5.22.3.tar.xz"; - sha256 = "0hg999vk4nw8hpyl0wmy1h0bcgd9jc7xd1y073bd28bjjpywn5vq"; - name = "systemsettings-5.22.3.tar.xz"; + url = "${mirror}/stable/plasma/5.22.4/systemsettings-5.22.4.tar.xz"; + sha256 = "1ap2h1sa6hdakhf6lzy4bhaq5pxc8g7p32iz04894hd7dbb2iv8h"; + name = "systemsettings-5.22.4.tar.xz"; }; }; xdg-desktop-portal-kde = { - version = "5.22.3"; + version = "5.22.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.3/xdg-desktop-portal-kde-5.22.3.tar.xz"; - sha256 = "1ggcnwvpp32912jgi2ly1541456kwk18q7a7z7l913vhfyrmsa5q"; - name = "xdg-desktop-portal-kde-5.22.3.tar.xz"; + url = "${mirror}/stable/plasma/5.22.4/xdg-desktop-portal-kde-5.22.4.tar.xz"; + sha256 = "1xmlw66bw60cl530hjjab8g4krv6di4wpimjaz0a9mv3dnq9xz7m"; + name = "xdg-desktop-portal-kde-5.22.4.tar.xz"; }; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/go/1.15.nix b/third_party/nixpkgs/pkgs/development/compilers/go/1.15.nix index 74ab1342da..f9bba06d63 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/go/1.15.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/go/1.15.nix @@ -51,11 +51,11 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.15.14"; + version = "1.15.15"; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "sha256-YKSlxI1j0KE+yohJAJtiRin/QpyLxdGmqMPE2p805wo="; + sha256 = "sha256-BmKuOBMzAoDV8al6LuI7vb46Wnz6YAGySphzoZoNx+w="; }; # perl is used for testing go vet diff --git a/third_party/nixpkgs/pkgs/development/compilers/go/1.16.nix b/third_party/nixpkgs/pkgs/development/compilers/go/1.16.nix index 49a2f9656f..a97aa4fe80 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/go/1.16.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/go/1.16.nix @@ -51,11 +51,11 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.16.6"; + version = "1.16.7"; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "sha256-o6XUvEAbUdsGXk+TtSM0ek00OuDAsIplw0I7BaE4A30="; + sha256 = "sha256-Gp8olNPYeHKfcEUHLzC+zr4kNSTPL85OCnskix4GVKw="; }; # perl is used for testing go vet diff --git a/third_party/nixpkgs/pkgs/development/go-modules/generic/default.nix b/third_party/nixpkgs/pkgs/development/go-modules/generic/default.nix index 968664f81c..5ab5818a6c 100644 --- a/third_party/nixpkgs/pkgs/development/go-modules/generic/default.nix +++ b/third_party/nixpkgs/pkgs/development/go-modules/generic/default.nix @@ -10,6 +10,9 @@ # Go linker flags, passed to go via -ldflags , ldflags ? [] +# Go tags, passed to go via -tag +, tags ? [] + # A function to override the go-modules derivation , overrideModAttrs ? (_oldAttrs : {}) @@ -26,6 +29,10 @@ # Whether to run the vend tool to regenerate the vendor directory. # This is useful if any dependency contain C files. , runVend ? false +# Whether to fetch (go mod download) and proxy the vendor directory. +# This is useful if any dependency has case-insensitive conflicts +# which will produce platform dependant `vendorSha256` checksums. +, proxyVendor ? false # We want parallel builds by default , enableParallelBuilding ? true @@ -43,6 +50,8 @@ with builtins; +assert (runVend == true && proxyVendor == true) -> throw "can't use `runVend` and `proxyVendor` together"; + assert goPackagePath != "" -> throw "`goPackagePath` is not needed with `buildGoModule`"; let @@ -94,6 +103,9 @@ let ${if runVend then '' echo "running 'vend' to rewrite vendor folder" ${vend}/bin/vend + '' else if proxyVendor then '' + mkdir -p "''${GOPATH}/pkg/mod/cache/download" + go mod download '' else '' go mod vendor ''} @@ -106,8 +118,12 @@ let installPhase = args.modInstallPhase or '' runHook preInstall - # remove cached lookup results and tiles + ${if proxyVendor then '' + rm -rf "''${GOPATH}/pkg/mod/cache/download/sumdb" + cp -r --reflink=auto "''${GOPATH}/pkg/mod/cache/download" $out + '' else '' cp -r --reflink=auto vendor $out + ''} runHook postInstall ''; @@ -127,7 +143,7 @@ let inherit (go) GOOS GOARCH; GO111MODULE = "on"; - GOFLAGS = [ "-mod=vendor" ] ++ lib.optionals (!allowGoReference) [ "-trimpath" ]; + GOFLAGS = lib.optionals (!proxyVendor) [ "-mod=vendor" ] ++ lib.optionals (!allowGoReference) [ "-trimpath" ]; configurePhase = args.configurePhase or '' runHook preConfigure @@ -135,11 +151,15 @@ let export GOCACHE=$TMPDIR/go-cache export GOPATH="$TMPDIR/go" export GOSUMDB=off - export GOPROXY=off cd "$modRoot" '' + lib.optionalString (go-modules != "") '' - rm -rf vendor - cp -r --reflink=auto ${go-modules} vendor + ${if proxyVendor then '' + export GOPROXY=file://${go-modules} + '' else '' + export GOPROXY=off + rm -rf vendor + cp -r --reflink=auto ${go-modules} vendor + ''} '' + '' runHook postConfigure @@ -156,7 +176,7 @@ let echo "$d" | grep -q "\(/_\|examples\|Godeps\|testdata\)" && return 0 [ -n "$excludedPackages" ] && echo "$d" | grep -q "$excludedPackages" && return 0 local OUT - if ! OUT="$(go $cmd $buildFlags "''${buildFlagsArray[@]}" ''${ldflags:+-ldflags="$ldflags"} -v -p $NIX_BUILD_CORES $d 2>&1)"; then + if ! OUT="$(go $cmd $buildFlags "''${buildFlagsArray[@]}" ''${tags:+-tags=${lib.concatStringsSep "," tags}} ''${ldflags:+-ldflags="$ldflags"} -v -p $NIX_BUILD_CORES $d 2>&1)"; then if ! echo "$OUT" | grep -qE '(no( buildable| non-test)?|build constraints exclude all) Go (source )?files'; then echo "$OUT" >&2 return 1 diff --git a/third_party/nixpkgs/pkgs/development/go-packages/generic/default.nix b/third_party/nixpkgs/pkgs/development/go-packages/generic/default.nix index 0fb51b68ec..6700dec082 100644 --- a/third_party/nixpkgs/pkgs/development/go-packages/generic/default.nix +++ b/third_party/nixpkgs/pkgs/development/go-packages/generic/default.nix @@ -10,6 +10,9 @@ # Go linker flags, passed to go via -ldflags , ldflags ? [] +# Go tags, passed to go via -tag +, tags ? [] + # We want parallel builds by default , enableParallelBuilding ? true @@ -151,7 +154,7 @@ let echo "$d" | grep -q "\(/_\|examples\|Godeps\)" && return 0 [ -n "$excludedPackages" ] && echo "$d" | grep -q "$excludedPackages" && return 0 local OUT - if ! OUT="$(go $cmd $buildFlags "''${buildFlagsArray[@]}" ''${ldflags:+-ldflags="$ldflags"} -v -p $NIX_BUILD_CORES $d 2>&1)"; then + if ! OUT="$(go $cmd $buildFlags "''${buildFlagsArray[@]}" ''${tags:+-tags=${lib.concatStringsSep "," tags}} ''${ldflags:+-ldflags="$ldflags"} -v -p $NIX_BUILD_CORES $d 2>&1)"; then if ! echo "$OUT" | grep -qE '(no( buildable| non-test)?|build constraints exclude all) Go (source )?files'; then echo "$OUT" >&2 return 1 diff --git a/third_party/nixpkgs/pkgs/development/libraries/armadillo/default.nix b/third_party/nixpkgs/pkgs/development/libraries/armadillo/default.nix index b0f0682b52..6e9f67a9a3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/armadillo/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/armadillo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "armadillo"; - version = "10.6.1"; + version = "10.6.2"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - sha256 = "sha256-HQbDI31lx7xGHqEvT9/YtaabapZbSQCucJYM6SCIF58="; + sha256 = "sha256-KoA9b4921AfbnBXtw4lJZSOMjliflMyQeoNz7pRXKKg="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgrss/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgrss/default.nix index 5e1c2b1785..ab8346990f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libgrss/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libgrss/default.nix @@ -1,11 +1,8 @@ { lib, stdenv, fetchurl, fetchpatch, pkg-config, vala, gobject-introspection, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, libxml2, libsoup, gnome }: -let - version = "0.7.0"; +stdenv.mkDerivation rec { pname = "libgrss"; -in -stdenv.mkDerivation { - name = "${pname}-${version}"; + version = "0.7.0"; outputs = [ "out" "dev" "devdoc" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libraspberrypi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libraspberrypi/default.nix index 8a8f41981a..a0b959d178 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libraspberrypi/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libraspberrypi/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "libraspberrypi"; - version = "unstable-2021-03-17"; + version = "unstable-2021-06-23"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "userland"; - rev = "3fd8527eefd8790b4e8393458efc5f94eb21a615"; - sha256 = "099qxh4bjzwd431ffpdhzx0gzlrkdyf66wplgkwg2rrfrc9zlv5a"; + rev = "97bc8180ad682b004ea224d1db7b8e108eda4397"; + sha256 = "0cnjc7w8ynayj90vlpl13xzm9izd8m5b4cvrq52si9vc6wlm4in5"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/ndi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ndi/default.nix index 81465b61ac..90032f774b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ndi/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ndi/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "ndi"; - fullVersion = "4.6.0"; + fullVersion = "4.6.2"; version = builtins.head (builtins.splitVersion fullVersion); src = requireFile rec { name = "InstallNDISDK_v${version}_Linux.tar.gz"; - sha256 = "19jrj2v7x1amdpc9pdq3042vm2l3szwqbzb83lirgbc24s2q043m"; + sha256 = "181ypfj1bl0kljzrfr6037i14ykg2y4plkzdhym6m3z7kcrnm1fl"; message = '' In order to use NDI SDK version ${fullVersion}, you need to comply with NewTek's license and download the appropriate Linux tarball from: diff --git a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json index e70ad2a91f..0ba7fd8a62 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json +++ b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json @@ -266,6 +266,7 @@ , "unified-language-server" , "vega-cli" , "vega-lite" +, "vercel" , "vim-language-server" , "vls" , "vscode-css-languageserver-bin" diff --git a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix index 0d01b75583..55eaf452ab 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix +++ b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix @@ -49,13 +49,13 @@ let sha512 = "o/xdK8b4P0t/xpCARgWXAeaiWeh9jeua6bP1jrcbfN39+Z4zC4x2jg4NysHNhz6spRG8dJFH3kJIUoIbs0Ckww=="; }; }; - "@angular-devkit/architect-0.1201.4" = { + "@angular-devkit/architect-0.1202.0" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.1201.4"; + version = "0.1202.0"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1201.4.tgz"; - sha512 = "hGO5NrZxV8Z7sILwokt7H+1sMf+5tJS9PJszvYlIBSzG0LBkOwwLQDb4MD42ATXFru57SXNqMZDVKoi1kTgxAw=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1202.0.tgz"; + sha512 = "99O8iLO9LEVTPYN6kj6XINHxjw13ofTS48hm3D0i44QMEyq3SRH1ctH6HcUAtbgPF3VjOUFr5vRYpQN1OdOCXw=="; }; }; "@angular-devkit/core-12.0.5" = { @@ -76,6 +76,15 @@ let sha512 = "KOzGD8JbP/7EeUwPiU5x+fo3ZEQ5R4IVW5WoH92PaO3mdpqXC7UL2MWLct8PUe9il9nqJMvrBMldSSvP9PCT2w=="; }; }; + "@angular-devkit/core-12.2.0" = { + name = "_at_angular-devkit_slash_core"; + packageName = "@angular-devkit/core"; + version = "12.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-12.2.0.tgz"; + sha512 = "9H2NfE4eazpMPwbAx4ZbtTNijo6419DZsmQzlzwQWzTInO3+CAjQuyW53W5Nt/IoauNVOgOEsC8/YbYjNmN0Aw=="; + }; + }; "@angular-devkit/schematics-12.0.5" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; @@ -94,6 +103,15 @@ let sha512 = "yD3y3pK/K5piOgvALFoCCiPp4H8emNa3yZL+vlpEpewVLpF1MM55LeTxc0PI5s0uqtOGVnvcbA5wYgMm3YsUEA=="; }; }; + "@angular-devkit/schematics-12.2.0" = { + name = "_at_angular-devkit_slash_schematics"; + packageName = "@angular-devkit/schematics"; + version = "12.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-12.2.0.tgz"; + sha512 = "C+eutMKtOLROk/2zs1NkXeLZJpFtvZm7ctWmcns0Yh83Di2sCgGiSqdqNZFyDplxkt5W5lF2cdBSGyP8ZH+/ug=="; + }; + }; "@angular-devkit/schematics-cli-12.1.4" = { name = "_at_angular-devkit_slash_schematics-cli"; packageName = "@angular-devkit/schematics-cli"; @@ -220,13 +238,13 @@ let sha512 = "GBD2Le9w2+lVFoc4vswGI/TjkNIZSVp7+9xPf+X3uidBfWnAeUWmquteSyt0+VCrhNMWj/FTABISQrD3Z/YA+w=="; }; }; - "@apollo/client-3.4.4" = { + "@apollo/client-3.4.5" = { name = "_at_apollo_slash_client"; packageName = "@apollo/client"; - version = "3.4.4"; + version = "3.4.5"; src = fetchurl { - url = "https://registry.npmjs.org/@apollo/client/-/client-3.4.4.tgz"; - sha512 = "XuFudJUA/YDBeEbxxkUK80FEhpABaphvOuKu8VPwgvu9681Rrqju9e6tGpsoCBIBtcBjFMrFkEafAai7H+dVNw=="; + url = "https://registry.npmjs.org/@apollo/client/-/client-3.4.5.tgz"; + sha512 = "arvzqyh+SmcJ9jGmdP1QhboTCq6YoowidqbDTigJ8LqA4jywOvgy3GMSPKUtyyxter12rQ+42cXjGI9+ZMVuyA=="; }; }; "@apollo/protobufjs-1.2.2" = { @@ -346,15 +364,6 @@ let sha512 = "9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw=="; }; }; - "@babel/compat-data-7.14.9" = { - name = "_at_babel_slash_compat-data"; - packageName = "@babel/compat-data"; - version = "7.14.9"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.14.9.tgz"; - sha512 = "p3QjZmMGHDGdpcwEYYWu7i7oJShJvtgMjJeb0W95PPhSm++3lm8YXYOh45Y6iCN9PkZLTZ7CIX5nFrp7pw7TXw=="; - }; - }; "@babel/compat-data-7.15.0" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; @@ -373,15 +382,6 @@ let sha512 = "O34LQooYVDXPl7QWCdW9p4NR+QlzOr7xShPPJz8GsuCU3/8ua/wqTr7gmnxXv+WBESiGU/G5s16i6tUvHkNb+w=="; }; }; - "@babel/core-7.14.8" = { - name = "_at_babel_slash_core"; - packageName = "@babel/core"; - version = "7.14.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.14.8.tgz"; - sha512 = "/AtaeEhT6ErpDhInbXmjHcUQXH0L0TEgscfcxk1qbOvLuKCa5aZT0SOOtDKFY96/CLROwbLSKyFor6idgNaU4Q=="; - }; - }; "@babel/core-7.15.0" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; @@ -400,15 +400,6 @@ let sha512 = "kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w=="; }; }; - "@babel/generator-7.14.9" = { - name = "_at_babel_slash_generator"; - packageName = "@babel/generator"; - version = "7.14.9"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.14.9.tgz"; - sha512 = "4yoHbhDYzFa0GLfCzLp5GxH7vPPMAHdZjyE7M/OajM9037zhx0rf+iNsJwp4PT0MSFpwjG7BsHEbPkBQpZ6cYA=="; - }; - }; "@babel/generator-7.15.0" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; @@ -436,15 +427,6 @@ let sha512 = "YTA/Twn0vBXDVGJuAX6PwW7x5zQei1luDDo2Pl6q1qZ7hVNl0RZrhHCQG/ArGpR29Vl7ETiB8eJyrvpuRp300w=="; }; }; - "@babel/helper-compilation-targets-7.14.5" = { - name = "_at_babel_slash_helper-compilation-targets"; - packageName = "@babel/helper-compilation-targets"; - version = "7.14.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.14.5.tgz"; - sha512 = "v+QtZqXEiOnpO6EYvlImB6zCD2Lel06RzOPzmkz/D/XgQiUu3C/Jb1LOqSt/AIA34TYi/Q+KlT8vTQrgdxkbLw=="; - }; - }; "@babel/helper-compilation-targets-7.15.0" = { name = "_at_babel_slash_helper-compilation-targets"; packageName = "@babel/helper-compilation-targets"; @@ -454,15 +436,6 @@ let sha512 = "h+/9t0ncd4jfZ8wsdAsoIxSa61qhBYlycXiHWqJaQBCXAhDCMbPRSMTGnZIkkmt1u4ag+UQmuqcILwqKzZ4N2A=="; }; }; - "@babel/helper-create-class-features-plugin-7.14.8" = { - name = "_at_babel_slash_helper-create-class-features-plugin"; - packageName = "@babel/helper-create-class-features-plugin"; - version = "7.14.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.8.tgz"; - sha512 = "bpYvH8zJBWzeqi1o+co8qOrw+EXzQ/0c74gVmY205AWXy9nifHrOg77y+1zwxX5lXE7Icq4sPlSQ4O2kWBrteQ=="; - }; - }; "@babel/helper-create-class-features-plugin-7.15.0" = { name = "_at_babel_slash_helper-create-class-features-plugin"; packageName = "@babel/helper-create-class-features-plugin"; @@ -526,15 +499,6 @@ let sha512 = "R1PXiz31Uc0Vxy4OEOm07x0oSjKAdPPCh3tPivn/Eo8cvz6gveAeuyUUPB21Hoiif0uoPQSSdhIPS3352nvdyQ=="; }; }; - "@babel/helper-member-expression-to-functions-7.14.7" = { - name = "_at_babel_slash_helper-member-expression-to-functions"; - packageName = "@babel/helper-member-expression-to-functions"; - version = "7.14.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.14.7.tgz"; - sha512 = "TMUt4xKxJn6ccjcOW7c4hlwyJArizskAhoSTOCkA0uZ+KghIaci0Qg9R043kUMWI9mtQfgny+NQ5QATnZ+paaA=="; - }; - }; "@babel/helper-member-expression-to-functions-7.15.0" = { name = "_at_babel_slash_helper-member-expression-to-functions"; packageName = "@babel/helper-member-expression-to-functions"; @@ -553,15 +517,6 @@ let sha512 = "SwrNHu5QWS84XlHwGYPDtCxcA0hrSlL2yhWYLgeOc0w7ccOl2qv4s/nARI0aYZW+bSwAL5CukeXA47B/1NKcnQ=="; }; }; - "@babel/helper-module-transforms-7.14.8" = { - name = "_at_babel_slash_helper-module-transforms"; - packageName = "@babel/helper-module-transforms"; - version = "7.14.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.14.8.tgz"; - sha512 = "RyE+NFOjXn5A9YU1dkpeBaduagTlZ0+fccnIcAGbv1KGUlReBj7utF7oEth8IdIBQPcux0DDgW5MFBH2xu9KcA=="; - }; - }; "@babel/helper-module-transforms-7.15.0" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; @@ -607,15 +562,6 @@ let sha512 = "rLQKdQU+HYlxBwQIj8dk4/0ENOUEhA/Z0l4hN8BexpvmSMN9oA9EagjnhnDpNsRdWCfjwa4mn/HyBXO9yhQP6A=="; }; }; - "@babel/helper-replace-supers-7.14.5" = { - name = "_at_babel_slash_helper-replace-supers"; - packageName = "@babel/helper-replace-supers"; - version = "7.14.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.14.5.tgz"; - sha512 = "3i1Qe9/8x/hCHINujn+iuHy+mMRLoc77b2nI9TB0zjH1hvn9qGlXjWlggdwUcju36PkPCy/lpM7LLUdcTyH4Ow=="; - }; - }; "@babel/helper-replace-supers-7.15.0" = { name = "_at_babel_slash_helper-replace-supers"; packageName = "@babel/helper-replace-supers"; @@ -706,15 +652,6 @@ let sha512 = "OhsyMrqygfk5v8HmWwOzlYjJrtLaFhF34MrfG/Z73DgYCI6ojNUTUp2TYbtnjo8PegeJp12eamsNettCQjKjVw=="; }; }; - "@babel/parser-7.14.9" = { - name = "_at_babel_slash_parser"; - packageName = "@babel/parser"; - version = "7.14.9"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.14.9.tgz"; - sha512 = "RdUTOseXJ8POjjOeEBEvNMIZU/nm4yu2rufRkcibzkkg7DmQvXU8v3M4Xk9G7uuI86CDGkKcuDWgioqZm+mScQ=="; - }; - }; "@babel/parser-7.15.0" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; @@ -1228,15 +1165,6 @@ let sha512 = "3lpOU8Vxmp3roC4vzFpSdEpGUWSMsHFreTWOMMLzel2gNGfHE5UWIh/LN6ghHs2xurUp4jRFYMUIZhuFbody1g=="; }; }; - "@babel/plugin-transform-modules-commonjs-7.14.5" = { - name = "_at_babel_slash_plugin-transform-modules-commonjs"; - packageName = "@babel/plugin-transform-modules-commonjs"; - version = "7.14.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.14.5.tgz"; - sha512 = "en8GfBtgnydoao2PS+87mKyw62k02k7kJ9ltbKe0fXTHrQmG6QZZflYuGI1VVG7sVpx4E1n7KBpNlPb8m78J+A=="; - }; - }; "@babel/plugin-transform-modules-commonjs-7.15.0" = { name = "_at_babel_slash_plugin-transform-modules-commonjs"; packageName = "@babel/plugin-transform-modules-commonjs"; @@ -1318,13 +1246,13 @@ let sha512 = "r1uilDthkgXW8Z1vJz2dKYLV1tuw2xsbrp3MrZmD99Wh9vsfKoob+JTgri5VUb/JqyKRXotlOtwgu4stIYCmnw=="; }; }; - "@babel/plugin-transform-react-display-name-7.14.5" = { + "@babel/plugin-transform-react-display-name-7.15.1" = { name = "_at_babel_slash_plugin-transform-react-display-name"; packageName = "@babel/plugin-transform-react-display-name"; - version = "7.14.5"; + version = "7.15.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.14.5.tgz"; - sha512 = "07aqY1ChoPgIxsuDviptRpVkWCSbXWmzQqcgy65C6YSFOfPFvb/DX3bBRHh7pCd/PMEEYHYWUTSVkCbkVainYQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.15.1.tgz"; + sha512 = "yQZ/i/pUCJAHI/LbtZr413S3VT26qNrEm0M5RRxQJA947/YNYwbZbBaXGDrq6CG5QsZycI1VIP6d7pQaBfP+8Q=="; }; }; "@babel/plugin-transform-react-jsx-7.14.9" = { @@ -1390,13 +1318,13 @@ let sha512 = "cv4F2rv1nD4qdexOGsRQXJrOcyb5CrgjUH9PKrrtyhSDBNWGxd0UIitjyJiWagS+EbUGjG++22mGH1Pub8D6Vg=="; }; }; - "@babel/plugin-transform-runtime-7.14.5" = { + "@babel/plugin-transform-runtime-7.15.0" = { name = "_at_babel_slash_plugin-transform-runtime"; packageName = "@babel/plugin-transform-runtime"; - version = "7.14.5"; + version = "7.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.14.5.tgz"; - sha512 = "fPMBhh1AV8ZyneiCIA+wYYUH1arzlXR1UMcApjvchDhfKxhy2r2lReJv8uHEyihi4IFIGlr1Pdx7S5fkESDQsg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.15.0.tgz"; + sha512 = "sfHYkLGjhzWTq6xsuQ01oEsUYjkHRux9fW1iUA68dC7Qd8BS1Unq4aZ8itmQp95zUzIcyR2EbNMTzAicFj+guw=="; }; }; "@babel/plugin-transform-shorthand-properties-7.14.5" = { @@ -1444,15 +1372,6 @@ let sha512 = "lXzLD30ffCWseTbMQzrvDWqljvZlHkXU+CnseMhkMNqU1sASnCsz3tSzAaH3vCUXb9PHeUb90ZT1BdFTm1xxJw=="; }; }; - "@babel/plugin-transform-typescript-7.14.6" = { - name = "_at_babel_slash_plugin-transform-typescript"; - packageName = "@babel/plugin-transform-typescript"; - version = "7.14.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.14.6.tgz"; - sha512 = "XlTdBq7Awr4FYIzqhmYY80WN0V0azF74DMPyFqVHBvf81ZUgc4X7ZOpx6O8eLDK6iM5cCQzeyJw0ynTaefixRA=="; - }; - }; "@babel/plugin-transform-typescript-7.15.0" = { name = "_at_babel_slash_plugin-transform-typescript"; packageName = "@babel/plugin-transform-typescript"; @@ -1480,15 +1399,6 @@ let sha512 = "UygduJpC5kHeCiRw/xDVzC+wj8VaYSoKl5JNVmbP7MadpNinAm3SvZCxZ42H37KZBKztz46YC73i9yV34d0Tzw=="; }; }; - "@babel/preset-env-7.14.9" = { - name = "_at_babel_slash_preset-env"; - packageName = "@babel/preset-env"; - version = "7.14.9"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.14.9.tgz"; - sha512 = "BV5JvCwBDebkyh67bPKBYVCC6gGw0MCzU6HfKe5Pm3upFpPVqiC/hB33zkOe0tVdAzaMywah0LSXQeD9v/BYdQ=="; - }; - }; "@babel/preset-env-7.15.0" = { name = "_at_babel_slash_preset-env"; packageName = "@babel/preset-env"; @@ -1543,15 +1453,6 @@ let sha512 = "dStnEQgejNYIHFNACdDCigK4BF7wgW6Zahv9Dc2un7rGjbeVtZhBfR3sy0I7ZJOhBexkFxVdMZ5hqmll7BFShw=="; }; }; - "@babel/preset-typescript-7.14.5" = { - name = "_at_babel_slash_preset-typescript"; - packageName = "@babel/preset-typescript"; - version = "7.14.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.14.5.tgz"; - sha512 = "u4zO6CdbRKbS9TypMqrlGH7sd2TAJppZwn3c/ZRLeO/wGsbddxgbPDUZVNrie3JWYLQ9vpineKlsrWFvO6Pwkw=="; - }; - }; "@babel/preset-typescript-7.15.0" = { name = "_at_babel_slash_preset-typescript"; packageName = "@babel/preset-typescript"; @@ -1606,13 +1507,13 @@ let sha512 = "64RiH2ON4/y8qYtoa8rUiyam/tUVyGqRyNYhe+vCRGmjnV4bUlZvY+mwd0RrmLoCpJpdq3RsrNqKb7SJdw/4kw=="; }; }; - "@babel/standalone-7.14.9" = { + "@babel/standalone-7.15.1" = { name = "_at_babel_slash_standalone"; packageName = "@babel/standalone"; - version = "7.14.9"; + version = "7.15.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/standalone/-/standalone-7.14.9.tgz"; - sha512 = "EEAwahkk3VW8WOlEAd3xtKN4tVDcgbSiDCc50qD4IgjyMowI2mvLnIZbRpZU5G/yZBGZsEPg7FssT/+yLFBlQQ=="; + url = "https://registry.npmjs.org/@babel/standalone/-/standalone-7.15.1.tgz"; + sha512 = "OJvIUtmXWEnTFvm+/TSMFkJK9vmbOF1wNmu/vbU18/Hlj9E6JdrkWxTkwbrsM1UjLtyb4w+pwZ/A1C4XZXorXg=="; }; }; "@babel/template-7.14.5" = { @@ -1624,15 +1525,6 @@ let sha512 = "6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g=="; }; }; - "@babel/traverse-7.14.9" = { - name = "_at_babel_slash_traverse"; - packageName = "@babel/traverse"; - version = "7.14.9"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.14.9.tgz"; - sha512 = "bldh6dtB49L8q9bUyB7bC20UKgU+EFDwKJylwl234Kv+ySZeMD31Xeht6URyueQ6LrRRpF2tmkfcZooZR9/e8g=="; - }; - }; "@babel/traverse-7.15.0" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; @@ -1651,15 +1543,6 @@ let sha512 = "K4nY2xFN4QMvQwkQ+zmBDp6ANMbVNw6BbxWmYA4qNjhR9W+Lj/8ky5MEY2Me5r+B2c6/v6F53oMndG+f9s3IiA=="; }; }; - "@babel/types-7.14.9" = { - name = "_at_babel_slash_types"; - packageName = "@babel/types"; - version = "7.14.9"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.14.9.tgz"; - sha512 = "u0bLTnv3DFHeaQLYzb7oRJ1JHr1sv/SYDM7JSqHFFLwXG1wTZRughxFI5NCP8qBEo1rVVsn7Yg2Lvw49nne/Ow=="; - }; - }; "@babel/types-7.15.0" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; @@ -2470,13 +2353,13 @@ let sha512 = "nPng19/ncq34ZwbHMa26US3Fu+7Q3GBo7DDcGnj5+csvw+XaGkJ+OeKDx0PyulkI5WM+hkR358VwxDJ87jlH1A=="; }; }; - "@fluentui/react-8.23.8" = { + "@fluentui/react-8.27.0" = { name = "_at_fluentui_slash_react"; packageName = "@fluentui/react"; - version = "8.23.8"; + version = "8.27.0"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react/-/react-8.23.8.tgz"; - sha512 = "piomaUcVxDZvA0yueTW/BGMISYdJ9/LJ1FNMgvSnST8/LwWTCRGbswN3tg/IUVULRlENy9th9rBp1TeMZ/DigQ=="; + url = "https://registry.npmjs.org/@fluentui/react/-/react-8.27.0.tgz"; + sha512 = "5LSh5XVU3qy6nY949jxS3BwF7UZA6jGjcH9JOTosgtxuHZUIXkzfZlT7fyt5xp+27B1B5ro9K9u2pDjItDHVHg=="; }; }; "@fluentui/react-focus-7.17.6" = { @@ -2704,13 +2587,22 @@ let sha512 = "G5YrOew39fZf16VIrc49q3c8dBqQDD0ax5LYPiNja00xsXDi0T9zsEWVt06ApjtSdSF6HDddlu5S12QjeN8Tow=="; }; }; - "@graphql-tools/mock-8.1.7" = { + "@graphql-tools/merge-7.0.0" = { + name = "_at_graphql-tools_slash_merge"; + packageName = "@graphql-tools/merge"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-7.0.0.tgz"; + sha512 = "u7TTwKQ7cybAkn6snYPRg3um/C2u690wlD8TgHITAmGQDAExN/yipSSBgu4rXWopsPLsY0G30mJ8tOWToZVE1w=="; + }; + }; + "@graphql-tools/mock-8.1.8" = { name = "_at_graphql-tools_slash_mock"; packageName = "@graphql-tools/mock"; - version = "8.1.7"; + version = "8.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/mock/-/mock-8.1.7.tgz"; - sha512 = "6fMxYQGSJrR4XrhncFdmOicXjUhbrVnil4dy15ky9amcwOiAdSIyn+OZHWi99hJjfdyQSamALjUKRFZjRmOXrA=="; + url = "https://registry.npmjs.org/@graphql-tools/mock/-/mock-8.1.8.tgz"; + sha512 = "ZLt4THOdDrwzMP5bKYaWJwJFYmacQojNWHt5Oo0c50N0jWe+PD/AbPbrn8Jb7mdVMhnxDgdMGwhsEFBhHSKJVA=="; }; }; "@graphql-tools/schema-7.1.5" = { @@ -2722,13 +2614,13 @@ let sha512 = "uyn3HSNSckf4mvQSq0Q07CPaVZMNFCYEVxroApOaw802m9DcZPgf9XVPy/gda5GWj9AhbijfRYVTZQgHnJ4CXA=="; }; }; - "@graphql-tools/schema-8.0.2" = { + "@graphql-tools/schema-8.0.3" = { name = "_at_graphql-tools_slash_schema"; packageName = "@graphql-tools/schema"; - version = "8.0.2"; + version = "8.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-8.0.2.tgz"; - sha512 = "LRO9R4Yi7uBVthdxoBgBTZxRCainfKeTlaBUy8MD/W+u8uUKUmdknrnqeWD4tvNwQjDFcEssm1cKwhvge7OqMA=="; + url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-8.0.3.tgz"; + sha512 = "ufJH7r/RcetVPd3kKCZ16/JTRkOX8aB1yGbYnUjqWEIdYEZc3Fpg7AVlcliu2JlvwR+WSNlgWn2QK76QCsFFdA=="; }; }; "@graphql-tools/url-loader-6.10.1" = { @@ -5134,22 +5026,22 @@ let sha512 = "USSjRAAQYsZFlv43FUPdD+jEGML5/8oLF0rUzPQTtK4q9kvaXr49F5ZplyLz5lox78cLZ0TxN2bIDQ1xhOkulQ=="; }; }; - "@percy/config-1.0.0-beta.62" = { + "@percy/config-1.0.0-beta.63" = { name = "_at_percy_slash_config"; packageName = "@percy/config"; - version = "1.0.0-beta.62"; + version = "1.0.0-beta.63"; src = fetchurl { - url = "https://registry.npmjs.org/@percy/config/-/config-1.0.0-beta.62.tgz"; - sha512 = "MhtjzNvjGvCv4n9pjXtIf0yKcuEOK592biaEtGAchfNJRC+kFpxQBF6wihR6AWN27uKa+8EXOuq62gqhpOJvIw=="; + url = "https://registry.npmjs.org/@percy/config/-/config-1.0.0-beta.63.tgz"; + sha512 = "mc2DQwk0uMHV+C7vJOcLm5hrxVqAKLgJvgsN+49Y/fbl6fUTNwY2s1usTi3kfCThdGpnIkqRooVxisnOIxLEUg=="; }; }; - "@percy/logger-1.0.0-beta.62" = { + "@percy/logger-1.0.0-beta.63" = { name = "_at_percy_slash_logger"; packageName = "@percy/logger"; - version = "1.0.0-beta.62"; + version = "1.0.0-beta.63"; src = fetchurl { - url = "https://registry.npmjs.org/@percy/logger/-/logger-1.0.0-beta.62.tgz"; - sha512 = "ILdCq9S6Prok5hfoCxqthA7we/rAg7SttNZRTaFogewdPnpJ99KBAzVx9wQWGEbpIGjlQt2PHb+ymQ1yIXz56A=="; + url = "https://registry.npmjs.org/@percy/logger/-/logger-1.0.0-beta.63.tgz"; + sha512 = "iumIt1JjrZQiD9fPShbqaUtyqgRBA1crJzwhh6MPZz4s0XJLxcEzhawKzqhtOoiB8Wr5AxVygswLOkTfPcVuFg=="; }; }; "@percy/migrate-0.10.0" = { @@ -5476,13 +5368,13 @@ let sha512 = "c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ=="; }; }; - "@schematics/angular-12.1.4" = { + "@schematics/angular-12.2.0" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "12.1.4"; + version = "12.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-12.1.4.tgz"; - sha512 = "xGqgGI6GWk4EFdKis8FmSESxoLgjnLQbaRE1t1KZCkSKJzqkOj0R9wiDrtZfcrbPxIkLL+3fAk2ThwwPznT6yw=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-12.2.0.tgz"; + sha512 = "2NolT/PNKgjINIHvz6o4sYFj4D4ai7Usf+HspQCi9W30qtLV4Z6hRXoEhmDxrGSlF67vJdwUwDM3sP+6Tg8XEw=="; }; }; "@segment/loosely-validate-event-2.0.0" = { @@ -8005,6 +7897,51 @@ let sha1 = "c585c0bdb94210198945c6597e4fe23d6e63e084"; }; }; + "@vercel/build-utils-2.11.1" = { + name = "_at_vercel_slash_build-utils"; + packageName = "@vercel/build-utils"; + version = "2.11.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@vercel/build-utils/-/build-utils-2.11.1.tgz"; + sha512 = "4eVUV7az4c/Avb9tdkoeJf8EYXW4mSY42ZQh15WRUkEXZq80FAgmywrklKOt3B/J+DW6fn8R4exuI1yXnu2iJg=="; + }; + }; + "@vercel/go-1.2.2" = { + name = "_at_vercel_slash_go"; + packageName = "@vercel/go"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@vercel/go/-/go-1.2.2.tgz"; + sha512 = "Oo1lXjXmDrSqdF3LKCWXJGU9DInq5aMe6weQSoWnKRvSZ6v4at2x19ltHYvgUO95y4tbdzqPLRKFNUSQEJVdjQ=="; + }; + }; + "@vercel/node-1.11.1" = { + name = "_at_vercel_slash_node"; + packageName = "@vercel/node"; + version = "1.11.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@vercel/node/-/node-1.11.1.tgz"; + sha512 = "2OheDtjxr1OkYyvMh7laDkOA4K6KfLL60IBg1D+PksNri2YEFaPK1lzdq7xuByuDRUs+tm9U57sPVAlyzGjlvw=="; + }; + }; + "@vercel/python-2.0.4" = { + name = "_at_vercel_slash_python"; + packageName = "@vercel/python"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@vercel/python/-/python-2.0.4.tgz"; + sha512 = "pGHtsbF2gVHnZGw62HIUZhfGzO+jXGprFsmgJwHdDWkUjiVGGKpbMKiDZlZPJQF7FC4xTF4rb0JKzrcckrpYXg=="; + }; + }; + "@vercel/ruby-1.2.6" = { + name = "_at_vercel_slash_ruby"; + packageName = "@vercel/ruby"; + version = "1.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@vercel/ruby/-/ruby-1.2.6.tgz"; + sha512 = "ZLDMxMvOL0xd7FBHXQJ9EJxPohw+qzpgwulaNhXGgPuFUfnS9mboUEyj0sU9A9F7lMJFPJ6gs8UfVxBY2eNnGA=="; + }; + }; "@vue/cli-shared-utils-4.5.13" = { name = "_at_vue_slash_cli-shared-utils"; packageName = "@vue/cli-shared-utils"; @@ -10291,6 +10228,15 @@ let sha512 = "XxNTUzKnz1ctK3ZIcI2XUPlD96wbHP2nGqkPKpvk/HNRlPveYrXIVSTk9m3LcqOgDPg3B1nMvdV/K8wZd7PG4w=="; }; }; + "arg-4.1.3" = { + name = "arg"; + packageName = "arg"; + version = "4.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz"; + sha512 = "58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA=="; + }; + }; "argparse-0.1.15" = { name = "argparse"; packageName = "argparse"; @@ -12937,13 +12883,13 @@ let sha512 = "wrDhHe7LUkqaytxgbsFXoemzHRv6e8FrVNWWsQCgUfmuVYW6ke44hoGc9VdpjgfIsJ/ejmCFA8wDtDqACNAvyw=="; }; }; - "bittorrent-dht-10.0.1" = { + "bittorrent-dht-10.0.2" = { name = "bittorrent-dht"; packageName = "bittorrent-dht"; - version = "10.0.1"; + version = "10.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-10.0.1.tgz"; - sha512 = "aR0vAgm+SgLiwTCEtNgeuqtT2deg+E/xHCTb7iryikvLbqbR58oFHbNYX4CM6EzyNGSKfcdBKp1gWI5Gcn2Aaw=="; + url = "https://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-10.0.2.tgz"; + sha512 = "V7+V6ZCfxHtn/wvaRuUvxucJhocb8StgKurQJUdHboVjNGWjALVG+VAYuZqz5iN+/j4vmd4GwqjR1ixYCMkyVA=="; }; }; "bittorrent-dht-6.4.2" = { @@ -12982,13 +12928,13 @@ let sha512 = "Xzk1FJFHmsc9H8IKFtDUkfAZIT1HW8r6UqajfZBBxWmpA1v7FsPO8xPFtnFzCqcXlPN3yi8dDmlqZCemyB7P8w=="; }; }; - "bittorrent-protocol-3.4.2" = { + "bittorrent-protocol-3.4.3" = { name = "bittorrent-protocol"; packageName = "bittorrent-protocol"; - version = "3.4.2"; + version = "3.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/bittorrent-protocol/-/bittorrent-protocol-3.4.2.tgz"; - sha512 = "a7ueJzmCImWIXfKrJ+dT6mgqi5+LFByAXoMXhV/cYt/y8kplaC8N9ZWfpiTidJY4H2o1GTsyMy73o62a/rZ0Ow=="; + url = "https://registry.npmjs.org/bittorrent-protocol/-/bittorrent-protocol-3.4.3.tgz"; + sha512 = "FNQMWrVptQlOxT5+s4M8QO6yWv67WwquUwpg+0dMcPj2UjwGt+XP3U/jVPg16PxxOBz0N371L+Qe7H2LdALC9Q=="; }; }; "bittorrent-tracker-7.7.0" = { @@ -14854,13 +14800,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001248" = { + "caniuse-lite-1.0.30001249" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001248"; + version = "1.0.30001249"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001248.tgz"; - sha512 = "NwlQbJkxUFJ8nMErnGtT0QTM2TJ33xgz4KXJSMIrjXIbDVdaYueGyjOrLKRtJC+rTiWfi6j5cnZN1NBiSBJGNw=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001249.tgz"; + sha512 = "vcX4U8lwVXPdqzPWi6cAJ3FnQaqXbBqy/GZseKNQzRj37J7qZdGcBtxq/QLFNLLlfsoXLUdHw8Iwenri86Tagw=="; }; }; "canvas-2.8.0" = { @@ -15790,13 +15736,13 @@ let sha512 = "VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA=="; }; }; - "clean-css-5.1.4" = { + "clean-css-5.1.5" = { name = "clean-css"; packageName = "clean-css"; - version = "5.1.4"; + version = "5.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/clean-css/-/clean-css-5.1.4.tgz"; - sha512 = "e6JAuR0T2ahg7fOSv98Nxqh7mHWOac5TaCSgrr61h/6mkPLwlxX38hzob4h6IKj/UHlrrLXvAEjWqXlvi8r8lQ=="; + url = "https://registry.npmjs.org/clean-css/-/clean-css-5.1.5.tgz"; + sha512 = "9dr/cU/LjMpU57PXlSvDkVRh0rPxJBXiBtD0+SgYt8ahTCsXtfKjCkNYgIoTC6mBg8CFr5EKhW3DKCaGMUbUfQ=="; }; }; "clean-deep-3.4.0" = { @@ -17563,13 +17509,13 @@ let sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75"; }; }; - "constructs-3.3.113" = { + "constructs-3.3.114" = { name = "constructs"; packageName = "constructs"; - version = "3.3.113"; + version = "3.3.114"; src = fetchurl { - url = "https://registry.npmjs.org/constructs/-/constructs-3.3.113.tgz"; - sha512 = "dy8Nhvihh+rmCr9+Z6omfaaknVwFUIUOkC5zKLc/CyNoVXNc8yvQC6395fQ/t25u42cFGTXedxBkTUx1dwf4uQ=="; + url = "https://registry.npmjs.org/constructs/-/constructs-3.3.114.tgz"; + sha512 = "J1R3RypQsCBvZ4zUpogIunj8ShpU4GC73mmHFPmOp7HgxHKYEOpukYAe5VL84pnsoQxv1tnM3EJcScPh/EEQQw=="; }; }; "consume-http-header-1.0.0" = { @@ -18383,13 +18329,13 @@ let sha512 = "dNldIoSuNSvlTJ7slIKC/ZFGKexBMBrrcc+TTe1NdmROnaASuLPvqpwj9v4XS4uXZ8+YPu0sNmShX2rXI5LNsw=="; }; }; - "create-torrent-4.7.1" = { + "create-torrent-4.7.2" = { name = "create-torrent"; packageName = "create-torrent"; - version = "4.7.1"; + version = "4.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/create-torrent/-/create-torrent-4.7.1.tgz"; - sha512 = "OMT0cYHa35p55jqRPP5Cilow/iD9tk+1lRlgmGWNcAhP3e37DwgGnEPkgTU40UTSPfZpaLiWY3wGc929Q2WaRw=="; + url = "https://registry.npmjs.org/create-torrent/-/create-torrent-4.7.2.tgz"; + sha512 = "8T5zMK0WhOfm2QubE/ZFVxaoCmhZk6I01ze53MIIe1HI0dxsvYohkNtFXEHL5oXi1vkbJOD/yLVJuUc4cCziog=="; }; }; "cron-1.8.2" = { @@ -22280,13 +22226,13 @@ let sha512 = "1sQ1DRtQGpglFhc3urD4olMJzt/wxlbnAAsf+WY2xHf5c50ZovivZvCXSpVgTOP9f4TzOMvelWyspyfhxQKHzQ=="; }; }; - "electron-to-chromium-1.3.795" = { + "electron-to-chromium-1.3.796" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.795"; + version = "1.3.796"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.795.tgz"; - sha512 = "4TPxrLf9Fzsi4rVgTlDm+ubxoXm3/TN67/LGHx/a4UkVubKILa6L26O6eTnHewixG/knzU9L3lLmfL39eElwlQ=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.796.tgz"; + sha512 = "agwJFgM0FUC1UPPbQ4aII3HamaaJ09fqWGAWYHmzxDWqdmTleCHyyA0kt3fJlTd5M440IaeuBfzXzXzCotnZcQ=="; }; }; "electrum-client-git://github.com/janoside/electrum-client" = { @@ -24334,13 +24280,13 @@ let sha512 = "64YwTWpxgVGnwoLi4zvKaQ5RWIV0dkxVE4GGkBF7D89RI0/I6gTRUDL25Il4AK3cUqyLtxnX2X5BZ2YRvRx5uQ=="; }; }; - "express-openapi-7.5.0" = { + "express-openapi-8.0.0" = { name = "express-openapi"; packageName = "express-openapi"; - version = "7.5.0"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/express-openapi/-/express-openapi-7.5.0.tgz"; - sha512 = "94JMAXcBkBHYazc8y85akJQvq/7PFdBHOWc5B421liyQXdDzvq49ct4tbTHRnpOZ3aPlsufLGVQdhJIuGUNiTQ=="; + url = "https://registry.npmjs.org/express-openapi/-/express-openapi-8.0.0.tgz"; + sha512 = "MUntG3qQKdU5eRG51WLglaUfIXrVagQHNmStwl44lzu6XKiMj4TBDm/cIbubO49HAMCqNkX5BaiKCOK6pvP5Wg=="; }; }; "express-session-1.17.2" = { @@ -26593,6 +26539,15 @@ let sha512 = "kSAfx/P8oLSi5+tblecTETcJJ/Q+qL+xzGx4hns/+gHXMkTOZEzG73/2dBDW1FFy5+ZW080XoMaBAN2kCN55aQ=="; }; }; + "fs-routes-8.0.0" = { + name = "fs-routes"; + packageName = "fs-routes"; + version = "8.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-routes/-/fs-routes-8.0.0.tgz"; + sha512 = "EezW71GPu+VK2ZOnX0Aljaref63+mvhkkz55DqUp5xryV/mJraA2t/XFmBxNMwgRq6tFUOYuQOlr+RQh4nq5kQ=="; + }; + }; "fs-write-stream-atomic-1.0.10" = { name = "fs-write-stream-atomic"; packageName = "fs-write-stream-atomic"; @@ -27944,13 +27899,13 @@ let sha512 = "Q+ZjUEvLQj/lrVHF/IQwRo6p3s8Nc44Zk/DALsN+ac3T4HY/g/3rrufkgtl+nZ1TW7DNAw5cTChdVp4apUXVgQ=="; }; }; - "google-auth-library-7.4.1" = { + "google-auth-library-7.5.0" = { name = "google-auth-library"; packageName = "google-auth-library"; - version = "7.4.1"; + version = "7.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/google-auth-library/-/google-auth-library-7.4.1.tgz"; - sha512 = "TNLFbGKZZKIzOLHKaSXCo1pSZQ1ZOaAZZPkVKQa4MM7vrRNfHGzRTwE2WDxWAow/35kJP1710ZTMY4Qf3jH3Gw=="; + url = "https://registry.npmjs.org/google-auth-library/-/google-auth-library-7.5.0.tgz"; + sha512 = "iRMwc060kiA6ncZbAoQN90nlwT8jiHVmippofpMgo4YFEyRBaPouyM7+ZB742wKetByyy+TahshVRTx0tEyXGQ=="; }; }; "google-closure-compiler-js-20170910.0.1" = { @@ -33705,13 +33660,13 @@ let sha512 = "NrhHIJ0BNKxpjyvqtqhunIcHhJiA5dhlRSPPuO+EGsCQB+yc94aRj+hZZXYvWj+X1o61kdLVudJLn54sn7ESoQ=="; }; }; - "jsii-srcmak-0.1.315" = { + "jsii-srcmak-0.1.316" = { name = "jsii-srcmak"; packageName = "jsii-srcmak"; - version = "0.1.315"; + version = "0.1.316"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.315.tgz"; - sha512 = "omRLKVIrhg4yfUPRNJqFM2DDeyHm+ikZ8I3A5zS0PNJHf7LXCpRxVPwoGTLzFDYcd/EnCQPFHPLsH5Jt8p/Egg=="; + url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.316.tgz"; + sha512 = "hJhok9bx0izVqXbfQ/A5Y8n6buUovbl5I3mozAFS8SM2z/RJCVf1ZaBui8yRUhWVADaZ0DsXB5ps40acdWNU3A=="; }; }; "json-bigint-0.2.3" = { @@ -34020,13 +33975,13 @@ let sha512 = "0/4Lv6IenJV0qj2oBdgPIAmFiKKnh8qh7bmLFJ+/ZZHLjSeiL3fKKGX3UryvKPbxFbhV+JcYo9KUC19GJ/Z/4A=="; }; }; - "json2jsii-0.1.285" = { + "json2jsii-0.1.286" = { name = "json2jsii"; packageName = "json2jsii"; - version = "0.1.285"; + version = "0.1.286"; src = fetchurl { - url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.1.285.tgz"; - sha512 = "VzZUg/mZqPPdIPdOwJ58P8CupA4QgHvBAUSFdk4rKW2PVj3jITCQVr8M9STZ/xHuEGtSk5r1wOxBmqMnx5nC5w=="; + url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.1.286.tgz"; + sha512 = "AD0Ip07hdVs6VrrNUxi6vy7zLuAXmS231/DqfQFCF2zwSkaqMO1cK/OhfDiKafkspZoadwTR/cyQXBXlCsOPpQ=="; }; }; "json3-3.2.6" = { @@ -37810,6 +37765,15 @@ let sha512 = "g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw=="; }; }; + "make-error-1.3.6" = { + name = "make-error"; + packageName = "make-error"; + version = "1.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz"; + sha512 = "s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw=="; + }; + }; "make-fetch-happen-8.0.14" = { name = "make-fetch-happen"; packageName = "make-fetch-happen"; @@ -43474,6 +43438,15 @@ let sha512 = "wRqgsLfZB3LXx8l3RfKo8icdDPDucnrRD2EkygTMiUv5W1/OdZJmo1ChgD6FjQUZH/7U67IxEjnXPEWfnu+dRw=="; }; }; + "openapi-default-setter-8.0.0" = { + name = "openapi-default-setter"; + packageName = "openapi-default-setter"; + version = "8.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/openapi-default-setter/-/openapi-default-setter-8.0.0.tgz"; + sha512 = "Ro0hg8w+lTPe18r5noVUjHgYMXZ3mPe5evW6fA0hdahqLns444wR/Cuvcykb/FHteqaq0WooQrsoKObO4lIHWA=="; + }; + }; "openapi-framework-0.26.0" = { name = "openapi-framework"; packageName = "openapi-framework"; @@ -43492,6 +43465,15 @@ let sha512 = "t+sGVNMs2apX6d/rf5oq/3S6tCyBTgCjgFY0EDEIKKWepO4v3wM+kjy/Ve9iU92Ui5GeWbGR6ceFKY6VP/OKfQ=="; }; }; + "openapi-framework-8.0.0" = { + name = "openapi-framework"; + packageName = "openapi-framework"; + version = "8.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/openapi-framework/-/openapi-framework-8.0.0.tgz"; + sha512 = "T9rP8onTa5xU+7+FCiiBO/p0DLjbHlcfhu+8yUEWFlmlCyihqjbsH0YiH7cCQYNOLgKZUCQZOaxJDiYBlVIaQQ=="; + }; + }; "openapi-jsonschema-parameters-1.2.0" = { name = "openapi-jsonschema-parameters"; packageName = "openapi-jsonschema-parameters"; @@ -43510,6 +43492,15 @@ let sha512 = "hnhuSbyB0gwA2KrDmMve0A+XC3rqhiQwlvOpZ+kGDz9nWqgLgFJA582LpA4V1W+nI3WruS0nEkAvfG8EHKD+qQ=="; }; }; + "openapi-jsonschema-parameters-8.0.0" = { + name = "openapi-jsonschema-parameters"; + packageName = "openapi-jsonschema-parameters"; + version = "8.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/openapi-jsonschema-parameters/-/openapi-jsonschema-parameters-8.0.0.tgz"; + sha512 = "yBBShgxPyo1M33q6RHNAvhTH6AydMDyDl7e89YUA/VkAf1wrU2HO/7Nok65R0vGbZFF43yml4i8sIak3GGnqVA=="; + }; + }; "openapi-request-coercer-2.4.0" = { name = "openapi-request-coercer"; packageName = "openapi-request-coercer"; @@ -43528,6 +43519,15 @@ let sha512 = "wvrh3xSEpmgKaHiAnVhPxL6Yp9IXW+NEI192z6X5RiU6xe+jszn6A3v8vJcceyNsvDBA4tkm4I3mFndDlhc6Zw=="; }; }; + "openapi-request-coercer-8.0.0" = { + name = "openapi-request-coercer"; + packageName = "openapi-request-coercer"; + version = "8.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/openapi-request-coercer/-/openapi-request-coercer-8.0.0.tgz"; + sha512 = "CTWZJT6rAPiLO7kvBpN9CJ7TXbCTlZzE7Z/Id/gegK/5FlxYIoB+ybx4tYC4IwJEjfm/lxY7Xv2CRp6RLJfKPw=="; + }; + }; "openapi-request-validator-4.2.0" = { name = "openapi-request-validator"; packageName = "openapi-request-validator"; @@ -43546,6 +43546,15 @@ let sha512 = "0rnslY82Btw5nM6rUEuXkvupav4ujvP+e9WziZvcMrE+VZ6IxRGDP8F7w0XmtPBwMS2nJGgt/J7BnRXAFTx5tw=="; }; }; + "openapi-request-validator-8.0.0" = { + name = "openapi-request-validator"; + packageName = "openapi-request-validator"; + version = "8.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/openapi-request-validator/-/openapi-request-validator-8.0.0.tgz"; + sha512 = "7gqNp4MvYu+pbdbq8Pw0qMsKqlhWQeYdKCHiu1OeOgBG8YkjlNGGeTuX028TsBEB/jGw7PgMCggaHuMl/W3bmQ=="; + }; + }; "openapi-response-validator-4.0.0" = { name = "openapi-response-validator"; packageName = "openapi-response-validator"; @@ -43564,6 +43573,15 @@ let sha512 = "Su8jA45PhegUgJnEAT15DYt2spPJgvjyTtXqg+Lw5AtGePfcQskV6ACEzsL0XPoAXIFf09Vx6sBor9pek+tl+Q=="; }; }; + "openapi-response-validator-8.0.0" = { + name = "openapi-response-validator"; + packageName = "openapi-response-validator"; + version = "8.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/openapi-response-validator/-/openapi-response-validator-8.0.0.tgz"; + sha512 = "h41hcEIgT7ldowLafcWlaE2m3+ss9IgRRrBfEzTtdBab2SyefYeXBV5keicL/muC1msmhT2p2rftjQnvfQN2jA=="; + }; + }; "openapi-sampler-1.1.0" = { name = "openapi-sampler"; packageName = "openapi-sampler"; @@ -43591,6 +43609,15 @@ let sha512 = "XT8NM5e/zBBa/cydTS1IeYkCPzJp9oixvt9Y1lEx+2gsCTOooNxw9x/KEivtWMSokne7X1aR+VtsYHQtNNOSyA=="; }; }; + "openapi-schema-validator-8.0.0" = { + name = "openapi-schema-validator"; + packageName = "openapi-schema-validator"; + version = "8.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/openapi-schema-validator/-/openapi-schema-validator-8.0.0.tgz"; + sha512 = "cxacCVE/pIhlfzDPjhMREEVgWsFFUxU/+bKU258LKDmgXcdbbajtWtRT63VarXPnQ0sS4Bhl3V4ZKWxdJMiOXA=="; + }; + }; "openapi-security-handler-2.0.4" = { name = "openapi-security-handler"; packageName = "openapi-security-handler"; @@ -43609,6 +43636,15 @@ let sha512 = "6wC2MXUv/FOy6uK6kkvPx1Pmh4WI3rpj7fsA1jwKCIPMwVcaJQA7/4Cfw3VWMNF0mVz7Nlxt9/aiziXHSOfiLg=="; }; }; + "openapi-security-handler-8.0.0" = { + name = "openapi-security-handler"; + packageName = "openapi-security-handler"; + version = "8.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/openapi-security-handler/-/openapi-security-handler-8.0.0.tgz"; + sha512 = "XWD15AQSZA3OQFS1gqupC9KoxOuUacyG8PUEna91sihPvZdO5lVcAfqHkJ1tqOKcn5k8Y8EsSoCwlr0d5njCaw=="; + }; + }; "openapi-to-graphql-2.2.5" = { name = "openapi-to-graphql"; packageName = "openapi-to-graphql"; @@ -43654,6 +43690,15 @@ let sha512 = "olbaNxz12R27+mTyJ/ZAFEfUruauHH27AkeQHDHRq5AF0LdNkK1SSV7EourXQDK+4aX7dv2HtyirAGK06WMAsA=="; }; }; + "openapi-types-8.0.0" = { + name = "openapi-types"; + packageName = "openapi-types"; + version = "8.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/openapi-types/-/openapi-types-8.0.0.tgz"; + sha512 = "dcHYyCDOAy4QQTrur5Sn1L3lPVspB7rd04Rw/Q7AsMvfV797IiWgmKziFCbq8VhnBoREU/SPPSBDxtK9Biwa1g=="; + }; + }; "openapi3-ts-2.0.1" = { name = "openapi3-ts"; packageName = "openapi3-ts"; @@ -44626,15 +44671,6 @@ let sha512 = "LUL4NK7sz01jdSUdCu3z1LyphCiFdQaFouaEDsAWmJpzS0lbeNfvZoX4bi1Tm1ilzheK5VAoD96QskDCZQr+jA=="; }; }; - "pacote-11.3.4" = { - name = "pacote"; - packageName = "pacote"; - version = "11.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/pacote/-/pacote-11.3.4.tgz"; - sha512 = "RfahPCunM9GI7ryJV/zY0bWQiokZyLqaSNHXtbNSoLb7bwTvBbJBEyCJ01KWs4j1Gj7GmX8crYXQ1sNX6P2VKA=="; - }; - }; "pacote-11.3.5" = { name = "pacote"; packageName = "pacote"; @@ -45004,13 +45040,13 @@ let sha512 = "yy7UTSmliOT/7Yl+P4hwwW2W7PbCTAMcD0lasaVG+k4/2laj42YWzLm468bLFGDoFPIb29g3BuwBcA3gLopKww=="; }; }; - "parse-torrent-9.1.3" = { + "parse-torrent-9.1.4" = { name = "parse-torrent"; packageName = "parse-torrent"; - version = "9.1.3"; + version = "9.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/parse-torrent/-/parse-torrent-9.1.3.tgz"; - sha512 = "/Yr951CvJM8S6TjMaqrsmMxeQEAjDeCX+MZ3hGXXc7DG2wqzp/rzOsHtDzIVqN6NsFRCqy6wYLF/W7Sgvq7bXw=="; + url = "https://registry.npmjs.org/parse-torrent/-/parse-torrent-9.1.4.tgz"; + sha512 = "NSlG8ewolqfcEWevUUsrpvxzVWYGaKWwPHMcXTAV2qYYo6pPugVOacQXt8uDlEYh23Ituz+A9pAZK5YaXTV8Pg=="; }; }; "parse-torrent-file-2.1.4" = { @@ -46084,13 +46120,13 @@ let sha1 = "084b5093ddc92506e259f874b8d9b1afb8c79593"; }; }; - "plist-3.0.2" = { + "plist-3.0.3" = { name = "plist"; packageName = "plist"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/plist/-/plist-3.0.2.tgz"; - sha512 = "MSrkwZBdQ6YapHy87/8hDU8MnIcyxBKjeF+McXnr5A9MtffPewTs7G3hlpodT5TacyfIyFTaJEhh3GGcmasTgQ=="; + url = "https://registry.npmjs.org/plist/-/plist-3.0.3.tgz"; + sha512 = "ghdOKN99hh1oEmAlwBmPYo4L+tSQ7O3jRpkhWqOrMz86CWotpVzMevvQ+czo7oPDpOZyA6K06Ci7QVHpoh9gaA=="; }; }; "plist-with-patches-0.5.1" = { @@ -52394,13 +52430,13 @@ let sha512 = "/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A=="; }; }; - "rollup-2.55.1" = { + "rollup-2.56.0" = { name = "rollup"; packageName = "rollup"; - version = "2.55.1"; + version = "2.56.0"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.55.1.tgz"; - sha512 = "1P9w5fpb6b4qroePh8vHKGIvPNxwoCQhjJpIqfZGHLKpZ0xcU2/XBmFxFbc9697/6bmHpmFTLk5R1dAQhFSo0g=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.56.0.tgz"; + sha512 = "weEafgbjbHCnrtJPNyCrhYnjP62AkF04P0BcV/1mofy1+gytWln4VVB1OK462cq2EAyWzRDpTMheSP/o+quoiA=="; }; }; "rollup-plugin-babel-4.4.0" = { @@ -56012,13 +56048,13 @@ let sha512 = "zZ/Q1M+9ZWlrchgh4QauD/MEUFa6eC6H6FYq6T8Of/y82JqsQBLwN6YlzbO09evE7Rx6x0oliXDCnQSjwGwQRA=="; }; }; - "sscaff-1.2.36" = { + "sscaff-1.2.37" = { name = "sscaff"; packageName = "sscaff"; - version = "1.2.36"; + version = "1.2.37"; src = fetchurl { - url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.36.tgz"; - sha512 = "OP8XE492gbcsTFXH/PQy2DNxnqWGWVRC1P8uqjmWInZdfX3lYA+q9jSS7e7lkqkNYsJYMcnCrjnmLCk5jLI6NA=="; + url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.37.tgz"; + sha512 = "TPvwDnZgM8cPkNtkESjJQ9dCajib2T1YBC763//zVlKsLrJJN3xAwoAQXfey7BdYCCB7DyXKHgtyhKLq0TZl+A=="; }; }; "ssh-config-1.1.6" = { @@ -56885,15 +56921,6 @@ let sha512 = "jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw=="; }; }; - "string2compact-1.3.0" = { - name = "string2compact"; - packageName = "string2compact"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/string2compact/-/string2compact-1.3.0.tgz"; - sha512 = "004ulKKANDuQilQsNxy2lisrpMG0qUJxBU+2YCEF7KziRyNR0Nredm2qk0f1V82nva59H3y9GWeHXE63HzGRFw=="; - }; - }; "string2compact-1.3.2" = { name = "string2compact"; packageName = "string2compact"; @@ -57713,13 +57740,13 @@ let sha512 = "mDAmaltQl6e5zU2VEtoWEf7eLTfuOTGr9zt+BpA3AGHo8MIhKiNSPE9OLTCTOMgj0vj/uL9QBbaNmpG4G1CgIA=="; }; }; - "svelte2tsx-0.4.4" = { + "svelte2tsx-0.4.5" = { name = "svelte2tsx"; packageName = "svelte2tsx"; - version = "0.4.4"; + version = "0.4.5"; src = fetchurl { - url = "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.4.4.tgz"; - sha512 = "BvARagYreupBS9rMSCa7aTH1m6qoU6OXtjouDrZggunW9hpyn9UpU0f1uw8loiCYbdE1LCNAK74Y6B2sIjevug=="; + url = "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.4.5.tgz"; + sha512 = "5SbnH3rGA5eymeSidlPZ3qxL0P6SfJv0pWaoTVuJDxpHbI00dUZpuDTNn/WZ8yMXfU7vjY/QxKC/iYiDTbJEjg=="; }; }; "sver-compat-1.5.0" = { @@ -57866,13 +57893,13 @@ let sha512 = "xk5CMbwoQVI53rTq9o/iMojAqXP5NT4/+TMeTP4uXWDIH18pB9AXgO5Olqt0RXuf3jH032DA4DS4qzem6XdXAw=="; }; }; - "swagger-ui-dist-3.51.1" = { + "swagger-ui-dist-3.51.2" = { name = "swagger-ui-dist"; packageName = "swagger-ui-dist"; - version = "3.51.1"; + version = "3.51.2"; src = fetchurl { - url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.51.1.tgz"; - sha512 = "df2mEeVgnJp/FcXY3DRh3CsTfvHVTaO6g3FJP/kfwhxfOD1+YTXqBZrOIIsYTPtcRIFBkCAto0NFCxAV4XFRbw=="; + url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.51.2.tgz"; + sha512 = "7aDfpvGrya61WQN4Eb6x5TELvYb5+7SRJQNYySkKUDGiRIwj1A8B2PNsXs4xMD0/5t8uNi4zW58KSofutcBdhw=="; }; }; "swagger2openapi-7.0.8" = { @@ -59532,13 +59559,13 @@ let sha1 = "2d17d82cf669ada7f9dfe75db4b31f7034b71e29"; }; }; - "torrent-discovery-9.4.2" = { + "torrent-discovery-9.4.4" = { name = "torrent-discovery"; packageName = "torrent-discovery"; - version = "9.4.2"; + version = "9.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/torrent-discovery/-/torrent-discovery-9.4.2.tgz"; - sha512 = "zM7GKeWJ/jLkC8nb2DXoSD6tcImj7DywoL9ziIDp0Pjqp+zYN7b6rNgPHY+1eJZeiN4bVJZv00hD5ruly2QgwA=="; + url = "https://registry.npmjs.org/torrent-discovery/-/torrent-discovery-9.4.4.tgz"; + sha512 = "psD/QcqSevMouHFbPKz4V9X5u2HuR/SaxeIp2T/JAduHKmDoq/pgxMQiAe/4DlhDgSCIAYWEB2xKP0dUTInBpQ=="; }; }; "torrent-piece-1.1.2" = { @@ -59946,6 +59973,15 @@ let sha512 = "XvB+OdKSJ708Dmf9ore4Uf/q62AYDTzFcAdxc8KNML1mmAWywRFVt/dn1KYJH8Agt5UJNujfM3znU5PxgAzA2w=="; }; }; + "ts-node-8.9.1" = { + name = "ts-node"; + packageName = "ts-node"; + version = "8.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ts-node/-/ts-node-8.9.1.tgz"; + sha512 = "yrq6ODsxEFTLz0R3BX2myf0WBCSQh9A+py8PBo1dCzWIOcvisbyH6akNKqDHMgXePF2kir5mm5JXJTH3OUJYOQ=="; + }; + }; "ts-pnp-1.2.0" = { name = "ts-pnp"; packageName = "ts-pnp"; @@ -60540,6 +60576,15 @@ let sha512 = "w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q=="; }; }; + "typescript-3.9.3" = { + name = "typescript"; + packageName = "typescript"; + version = "3.9.3"; + src = fetchurl { + url = "https://registry.npmjs.org/typescript/-/typescript-3.9.3.tgz"; + sha512 = "D/wqnB2xzNFIcoBG9FG8cXRDjiqSTbG2wd8DMZeQyJlP1vfTkIxH4GKveWaEBYySKIg+USu+E+EDIR47SqnaMQ=="; + }; + }; "typescript-4.0.3" = { name = "typescript"; packageName = "typescript"; @@ -61755,6 +61800,15 @@ let sha512 = "grrmrB6Zb8DUiyDIaeRTBCkgISYUgETNe7NglEbVsrLWXeESnlCSP50WfRSj/GmzMPl6Uchj24S/p80nP/ZQrQ=="; }; }; + "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=="; + }; + }; "update-notifier-4.1.3" = { name = "update-notifier"; packageName = "update-notifier"; @@ -62080,13 +62134,13 @@ let sha512 = "3XZZuJSeoIUyMYSuDbTbVtP4KAVGHPfU8nmHFkr8LJc+THCaUXwnu/2AV+LCSLarET/hL9IlbNfYTGrt6fOVuQ=="; }; }; - "ut_pex-3.0.1" = { + "ut_pex-3.0.2" = { name = "ut_pex"; packageName = "ut_pex"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/ut_pex/-/ut_pex-3.0.1.tgz"; - sha512 = "t1MHIDHSISgOJcmq8UM6Qv9/hRQYVaUvzqSNnXa5ATDbS9hXfhBpyBo2HcSyJtwPSHsmMtNui8G6yKirwJ8vow=="; + url = "https://registry.npmjs.org/ut_pex/-/ut_pex-3.0.2.tgz"; + sha512 = "3xM88t+AVU5GR0sIY3tmRMLUS+YKiwStc7U7+ZFQ+UHQpX7BjVJOomhmtm0Bs+8R2n812Dt2ymXm01EqDrOOpQ=="; }; }; "utf-8-validate-1.2.2" = { @@ -64420,13 +64474,13 @@ let sha512 = "OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg=="; }; }; - "webtorrent-1.3.4" = { + "webtorrent-1.3.7" = { name = "webtorrent"; packageName = "webtorrent"; - version = "1.3.4"; + version = "1.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/webtorrent/-/webtorrent-1.3.4.tgz"; - sha512 = "C7WsNxOJ2YG5tTd533fUDxUUklnPOUxHvBhljrue0e1GRCrCHKAtlWm6kgaO9qHRJnnx1m66vVDGoiKaDYPmLw=="; + url = "https://registry.npmjs.org/webtorrent/-/webtorrent-1.3.7.tgz"; + sha512 = "0dabc5WmYyuAchbsyugcVPvFeuyrig32cacPK+rvK71WUN80Q5nJOHj4YP+ZnIJMjjJ0LOOvdTdNo5ZPDGqjtQ=="; }; }; "well-known-symbols-2.0.0" = { @@ -66605,29 +66659,29 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "12.1.4"; + version = "12.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-12.1.4.tgz"; - sha512 = "LpyhyqWe3bFcuH3MrXeYoIPI1htjwG1b5ehETfq4qsMvNmuFON6QI+F7EWEpX7lItVQc2bES+ogasTZsZue/uw=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-12.2.0.tgz"; + sha512 = "gxw4e3Wb1YgNE+f9sX90xea5vXatqvlYq3mOWFUWVKYcayAgnt9z97a1ULEkSytS1aVjyL44zzkU/QFufPpadQ=="; }; dependencies = [ - sources."@angular-devkit/architect-0.1201.4" - sources."@angular-devkit/core-12.1.4" - sources."@angular-devkit/schematics-12.1.4" + sources."@angular-devkit/architect-0.1202.0" + sources."@angular-devkit/core-12.2.0" + sources."@angular-devkit/schematics-12.2.0" sources."@npmcli/git-2.1.0" sources."@npmcli/installed-package-contents-1.0.7" sources."@npmcli/move-file-1.1.2" sources."@npmcli/node-gyp-1.0.2" sources."@npmcli/promise-spawn-1.3.2" sources."@npmcli/run-script-1.8.5" - sources."@schematics/angular-12.1.4" + sources."@schematics/angular-12.2.0" sources."@tootallnate/once-1.1.2" sources."@yarnpkg/lockfile-1.1.0" sources."abbrev-1.1.1" sources."agent-base-6.0.2" sources."agentkeepalive-4.1.4" sources."aggregate-error-3.1.0" - sources."ajv-8.6.0" + sources."ajv-8.6.2" sources."ajv-formats-2.1.0" sources."ansi-colors-4.1.1" sources."ansi-escapes-4.3.2" @@ -66671,7 +66725,7 @@ in sources."console-control-strings-1.1.0" sources."core-util-is-1.0.2" sources."dashdash-1.14.1" - sources."debug-4.3.1" + sources."debug-4.3.2" sources."defaults-1.0.3" sources."define-lazy-prop-2.0.0" sources."delayed-stream-1.0.0" @@ -66734,7 +66788,12 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-2.0.0" - sources."inquirer-8.1.1" + (sources."inquirer-8.1.2" // { + dependencies = [ + sources."rxjs-7.3.0" + sources."tslib-2.1.0" + ]; + }) sources."ip-1.1.5" sources."is-core-module-2.5.0" sources."is-docker-2.2.1" @@ -66795,7 +66854,7 @@ in sources."ora-5.4.1" sources."os-tmpdir-1.0.2" sources."p-map-4.0.0" - sources."pacote-11.3.4" + sources."pacote-11.3.5" sources."path-is-absolute-1.0.1" sources."path-parse-1.0.7" sources."performance-now-2.1.0" @@ -67963,7 +68022,7 @@ in sources."buffer-5.7.1" sources."buffer-from-1.1.2" sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001248" + sources."caniuse-lite-1.0.30001249" sources."chalk-3.0.0" sources."chardet-0.7.0" sources."chokidar-3.5.2" @@ -67990,7 +68049,7 @@ in sources."cross-spawn-7.0.3" sources."deepmerge-4.2.2" sources."defaults-1.0.3" - sources."electron-to-chromium-1.3.795" + sources."electron-to-chromium-1.3.796" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" (sources."enhanced-resolve-5.8.2" // { @@ -68237,26 +68296,26 @@ in sources."@apollographql/graphql-playground-html-1.6.27" sources."@apollographql/graphql-upload-8-fork-8.1.3" sources."@babel/code-frame-7.14.5" - sources."@babel/compat-data-7.14.9" - sources."@babel/core-7.14.8" - sources."@babel/generator-7.14.9" + sources."@babel/compat-data-7.15.0" + sources."@babel/core-7.15.0" + sources."@babel/generator-7.15.0" sources."@babel/helper-annotate-as-pure-7.14.5" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.14.5" - sources."@babel/helper-compilation-targets-7.14.5" - sources."@babel/helper-create-class-features-plugin-7.14.8" + sources."@babel/helper-compilation-targets-7.15.0" + sources."@babel/helper-create-class-features-plugin-7.15.0" sources."@babel/helper-create-regexp-features-plugin-7.14.5" sources."@babel/helper-define-polyfill-provider-0.2.3" sources."@babel/helper-explode-assignable-expression-7.14.5" sources."@babel/helper-function-name-7.14.5" sources."@babel/helper-get-function-arity-7.14.5" sources."@babel/helper-hoist-variables-7.14.5" - sources."@babel/helper-member-expression-to-functions-7.14.7" + sources."@babel/helper-member-expression-to-functions-7.15.0" sources."@babel/helper-module-imports-7.14.5" - sources."@babel/helper-module-transforms-7.14.8" + sources."@babel/helper-module-transforms-7.15.0" sources."@babel/helper-optimise-call-expression-7.14.5" sources."@babel/helper-plugin-utils-7.14.5" sources."@babel/helper-remap-async-to-generator-7.14.5" - sources."@babel/helper-replace-supers-7.14.5" + sources."@babel/helper-replace-supers-7.15.0" sources."@babel/helper-simple-access-7.14.8" sources."@babel/helper-skip-transparent-expression-wrappers-7.14.5" sources."@babel/helper-split-export-declaration-7.14.5" @@ -68265,7 +68324,7 @@ in sources."@babel/helper-wrap-function-7.14.5" sources."@babel/helpers-7.14.8" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.14.9" + sources."@babel/parser-7.15.0" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5" sources."@babel/plugin-proposal-async-generator-functions-7.14.9" sources."@babel/plugin-proposal-class-properties-7.14.5" @@ -68314,7 +68373,7 @@ in sources."@babel/plugin-transform-literals-7.14.5" sources."@babel/plugin-transform-member-expression-literals-7.14.5" sources."@babel/plugin-transform-modules-amd-7.14.5" - sources."@babel/plugin-transform-modules-commonjs-7.14.5" + sources."@babel/plugin-transform-modules-commonjs-7.15.0" sources."@babel/plugin-transform-modules-systemjs-7.14.5" sources."@babel/plugin-transform-modules-umd-7.14.5" sources."@babel/plugin-transform-named-capturing-groups-regex-7.14.9" @@ -68329,13 +68388,13 @@ in sources."@babel/plugin-transform-sticky-regex-7.14.5" sources."@babel/plugin-transform-template-literals-7.14.5" sources."@babel/plugin-transform-typeof-symbol-7.14.5" - sources."@babel/plugin-transform-typescript-7.14.6" + sources."@babel/plugin-transform-typescript-7.15.0" sources."@babel/plugin-transform-unicode-escapes-7.14.5" sources."@babel/plugin-transform-unicode-regex-7.14.5" - sources."@babel/preset-env-7.14.9" + sources."@babel/preset-env-7.15.0" sources."@babel/preset-flow-7.14.5" sources."@babel/preset-modules-0.1.4" - sources."@babel/preset-typescript-7.14.5" + sources."@babel/preset-typescript-7.15.0" (sources."@babel/register-7.14.5" // { dependencies = [ sources."make-dir-2.1.0" @@ -68345,8 +68404,8 @@ in }) sources."@babel/runtime-7.14.8" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.9" - sources."@babel/types-7.14.9" + sources."@babel/traverse-7.15.0" + sources."@babel/types-7.15.0" sources."@hapi/address-2.1.4" sources."@hapi/bourne-1.3.2" sources."@hapi/hoek-8.5.1" @@ -68542,7 +68601,7 @@ in sources."call-bind-1.0.2" sources."call-me-maybe-1.0.1" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001248" + sources."caniuse-lite-1.0.30001249" sources."caseless-0.12.0" sources."caw-2.0.1" sources."chalk-2.4.2" @@ -68670,7 +68729,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.795" + sources."electron-to-chromium-1.3.796" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -69565,12 +69624,12 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/generator-7.14.9" + sources."@babel/generator-7.15.0" sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.14.9" + sources."@babel/parser-7.15.0" sources."@babel/template-7.14.5" - sources."@babel/types-7.14.9" + sources."@babel/types-7.15.0" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" sources."@webassemblyjs/helper-api-error-1.11.1" @@ -69645,36 +69704,36 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/compat-data-7.14.9" - (sources."@babel/core-7.14.8" // { + sources."@babel/compat-data-7.15.0" + (sources."@babel/core-7.15.0" // { dependencies = [ sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.14.9" // { + (sources."@babel/generator-7.15.0" // { dependencies = [ sources."source-map-0.5.7" ]; }) - sources."@babel/helper-compilation-targets-7.14.5" + sources."@babel/helper-compilation-targets-7.15.0" sources."@babel/helper-function-name-7.14.5" sources."@babel/helper-get-function-arity-7.14.5" sources."@babel/helper-hoist-variables-7.14.5" - sources."@babel/helper-member-expression-to-functions-7.14.7" + sources."@babel/helper-member-expression-to-functions-7.15.0" sources."@babel/helper-module-imports-7.14.5" - sources."@babel/helper-module-transforms-7.14.8" + sources."@babel/helper-module-transforms-7.15.0" sources."@babel/helper-optimise-call-expression-7.14.5" - sources."@babel/helper-replace-supers-7.14.5" + sources."@babel/helper-replace-supers-7.15.0" sources."@babel/helper-simple-access-7.14.8" sources."@babel/helper-split-export-declaration-7.14.5" sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/helper-validator-option-7.14.5" sources."@babel/helpers-7.14.8" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.14.9" + sources."@babel/parser-7.15.0" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.9" - sources."@babel/types-7.14.9" + sources."@babel/traverse-7.15.0" + sources."@babel/types-7.15.0" sources."JSV-4.0.2" sources."ansi-styles-3.2.1" sources."array-unique-0.3.2" @@ -69682,7 +69741,7 @@ in sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."browserslist-4.16.7" - sources."caniuse-lite-1.0.30001248" + sources."caniuse-lite-1.0.30001249" sources."chalk-2.4.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" @@ -69693,7 +69752,7 @@ in sources."convert-source-map-1.8.0" sources."debug-4.3.2" sources."ejs-3.1.6" - sources."electron-to-chromium-1.3.795" + sources."electron-to-chromium-1.3.796" sources."ensure-posix-path-1.1.1" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" @@ -69822,9 +69881,9 @@ in }; dependencies = [ sources."browserslist-4.16.7" - sources."caniuse-lite-1.0.30001248" + sources."caniuse-lite-1.0.30001249" sources."colorette-1.2.2" - sources."electron-to-chromium-1.3.795" + sources."electron-to-chromium-1.3.796" sources."escalade-3.1.1" sources."fraction.js-4.1.1" sources."node-releases-1.1.73" @@ -71506,8 +71565,8 @@ in sources."@babel/code-frame-7.14.5" sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.14.9" - sources."@babel/types-7.14.9" + sources."@babel/parser-7.15.0" + sources."@babel/types-7.15.0" sources."@kwsites/file-exists-1.1.1" sources."@kwsites/promise-deferred-1.1.1" sources."@types/minimist-1.2.2" @@ -72208,7 +72267,7 @@ in sources."supports-color-0.2.0" ]; }) - sources."plist-3.0.2" + sources."plist-3.0.3" sources."process-nextick-args-2.0.1" sources."promiscuous-0.6.0" sources."protobufjs-6.11.2" @@ -72297,11 +72356,7 @@ in sources."srt2vtt-1.3.1" sources."sshpk-1.16.1" sources."stream-transcoder-0.0.5" - (sources."string2compact-1.3.0" // { - dependencies = [ - sources."ipaddr.js-1.9.1" - ]; - }) + sources."string2compact-1.3.2" sources."string_decoder-0.10.31" sources."strip-ansi-2.0.1" sources."strip-bom-2.0.0" @@ -72355,7 +72410,7 @@ in ]; }) sources."xmlbuilder-9.0.7" - sources."xmldom-0.5.0" + sources."xmldom-0.6.0" sources."xspfr-0.3.1" sources."xtend-4.0.2" ]; @@ -72400,7 +72455,7 @@ in sources."color-name-1.1.4" sources."colors-1.4.0" sources."commonmark-0.29.3" - sources."constructs-3.3.113" + sources."constructs-3.3.114" sources."date-format-3.0.0" sources."debug-4.3.2" sources."decamelize-5.0.0" @@ -72474,13 +72529,13 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.315" // { + (sources."jsii-srcmak-0.1.316" // { dependencies = [ sources."fs-extra-9.1.0" ]; }) sources."json-schema-0.3.0" - sources."json2jsii-0.1.285" + sources."json2jsii-0.1.286" sources."jsonfile-6.1.0" sources."jsonschema-1.4.0" sources."locate-path-5.0.0" @@ -72516,7 +72571,7 @@ in sources."snake-case-3.0.4" sources."sort-json-2.0.0" sources."spdx-license-list-6.4.0" - sources."sscaff-1.2.36" + sources."sscaff-1.2.37" (sources."streamroller-2.2.4" // { dependencies = [ sources."date-format-2.1.0" @@ -72571,7 +72626,7 @@ in sha512 = "53HldFlYJdptaQ9yZyx8xuN0pxmBwI7yaVImmPwGmauoOYWsO89YrAjyPIiAaR+GWI8avbQeg3jz5Z1Q+MoIGA=="; }; dependencies = [ - sources."@apollo/client-3.4.4" + sources."@apollo/client-3.4.5" (sources."@apollo/protobufjs-1.2.2" // { dependencies = [ sources."@types/node-10.17.60" @@ -72585,16 +72640,16 @@ in ]; }) sources."@babel/code-frame-7.14.5" - sources."@babel/generator-7.14.9" + sources."@babel/generator-7.15.0" sources."@babel/helper-validator-identifier-7.14.9" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.14.9" + sources."@babel/parser-7.15.0" sources."@babel/template-7.14.5" - sources."@babel/types-7.14.9" + sources."@babel/types-7.15.0" sources."@cdktf/hcl2cdk-0.5.0" sources."@cdktf/hcl2json-0.5.0" (sources."@graphql-tools/graphql-file-loader-6.2.7" // { @@ -72617,13 +72672,15 @@ in sources."@graphql-tools/utils-8.0.2" ]; }) - (sources."@graphql-tools/mock-8.1.7" // { + (sources."@graphql-tools/mock-8.1.8" // { dependencies = [ + sources."@graphql-tools/merge-7.0.0" sources."@graphql-tools/utils-8.0.2" ]; }) - (sources."@graphql-tools/schema-8.0.2" // { + (sources."@graphql-tools/schema-8.0.3" // { dependencies = [ + sources."@graphql-tools/merge-7.0.0" sources."@graphql-tools/utils-8.0.2" ]; }) @@ -72777,7 +72834,7 @@ in ]; }) sources."concat-map-0.0.1" - sources."constructs-3.3.113" + sources."constructs-3.3.114" (sources."content-disposition-0.5.3" // { dependencies = [ sources."safe-buffer-5.1.2" @@ -72976,7 +73033,7 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.315" // { + (sources."jsii-srcmak-0.1.316" // { dependencies = [ sources."fs-extra-9.1.0" ]; @@ -73134,7 +73191,7 @@ in sources."sort-json-2.0.0" sources."source-map-0.5.7" sources."spdx-license-list-6.4.0" - sources."sscaff-1.2.36" + sources."sscaff-1.2.37" (sources."stack-utils-2.0.3" // { dependencies = [ sources."escape-string-regexp-2.0.0" @@ -73245,15 +73302,15 @@ in clean-css-cli = nodeEnv.buildNodePackage { name = "clean-css-cli"; packageName = "clean-css-cli"; - version = "5.3.2"; + version = "5.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/clean-css-cli/-/clean-css-cli-5.3.2.tgz"; - sha512 = "NZY3lWHeeb9idk/0f37yDLeb3Y8UUiuuRCYKVVioqFJU83f3uuJUz7qIIYBgAWARv56D0MLOkwqQcq5fTtK6vQ=="; + url = "https://registry.npmjs.org/clean-css-cli/-/clean-css-cli-5.3.3.tgz"; + sha512 = "Reo/w25/3J2uRL4EFHvo92Tv97uhefyHranTpxXNqQ7iIRB8oxRNVlXC+Xcq8RWO2LjSyOofrb7AU6I6oXpPpA=="; }; dependencies = [ sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" - sources."clean-css-5.1.4" + sources."clean-css-5.1.5" sources."commander-7.2.0" sources."concat-map-0.0.1" sources."fs.realpath-1.0.0" @@ -73269,7 +73326,7 @@ in buildInputs = globalBuildInputs; meta = { description = "A command-line interface to clean-css CSS optimization library"; - homepage = "https://github.com/jakubpawlowicz/clean-css-cli#readme"; + homepage = "https://github.com/clean-css/clean-css-cli#readme"; license = "MIT"; }; production = true; @@ -74067,7 +74124,7 @@ in sources."callsites-3.1.0" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" - sources."caniuse-lite-1.0.30001248" + sources."caniuse-lite-1.0.30001249" sources."capture-stack-trace-1.0.1" sources."ccount-1.1.0" (sources."chalk-4.1.2" // { @@ -74165,7 +74222,7 @@ in sources."domutils-1.7.0" sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.795" + sources."electron-to-chromium-1.3.796" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."enquirer-2.3.6" @@ -75121,18 +75178,18 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/compat-data-7.14.9" - sources."@babel/core-7.14.8" - sources."@babel/generator-7.14.9" - sources."@babel/helper-compilation-targets-7.14.5" + sources."@babel/compat-data-7.15.0" + sources."@babel/core-7.15.0" + sources."@babel/generator-7.15.0" + sources."@babel/helper-compilation-targets-7.15.0" sources."@babel/helper-function-name-7.14.5" sources."@babel/helper-get-function-arity-7.14.5" sources."@babel/helper-hoist-variables-7.14.5" - sources."@babel/helper-member-expression-to-functions-7.14.7" + sources."@babel/helper-member-expression-to-functions-7.15.0" sources."@babel/helper-module-imports-7.14.5" - sources."@babel/helper-module-transforms-7.14.8" + sources."@babel/helper-module-transforms-7.15.0" sources."@babel/helper-optimise-call-expression-7.14.5" - sources."@babel/helper-replace-supers-7.14.5" + sources."@babel/helper-replace-supers-7.15.0" sources."@babel/helper-simple-access-7.14.8" sources."@babel/helper-split-export-declaration-7.14.5" sources."@babel/helper-validator-identifier-7.14.9" @@ -75143,10 +75200,10 @@ in sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.14.9" + sources."@babel/parser-7.15.0" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.9" - sources."@babel/types-7.14.9" + sources."@babel/traverse-7.15.0" + sources."@babel/types-7.15.0" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -75176,7 +75233,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001248" + sources."caniuse-lite-1.0.30001249" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -75214,7 +75271,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.795" + sources."electron-to-chromium-1.3.796" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -76499,7 +76556,7 @@ in sources."picomatch-2.3.0" sources."pify-4.0.1" sources."pkg-up-2.0.0" - sources."plist-3.0.2" + sources."plist-3.0.3" sources."prepend-http-2.0.0" sources."process-nextick-args-2.0.1" sources."promise-inflight-1.0.1" @@ -76651,7 +76708,7 @@ in sources."write-file-atomic-3.0.3" sources."xdg-basedir-4.0.0" sources."xmlbuilder-9.0.7" - sources."xmldom-0.5.0" + sources."xmldom-0.6.0" sources."yallist-4.0.0" ]; buildInputs = globalBuildInputs; @@ -78793,7 +78850,7 @@ in sources."path-exists-4.0.0" ]; }) - sources."plist-3.0.2" + sources."plist-3.0.3" sources."prepend-http-2.0.0" sources."pretty-bytes-1.0.4" sources."pretty-ms-7.0.1" @@ -78917,7 +78974,7 @@ in }) sources."wrappy-1.0.2" sources."xmlbuilder-9.0.7" - sources."xmldom-0.5.0" + sources."xmldom-0.6.0" sources."xtend-2.1.2" sources."y18n-5.0.8" sources."yallist-3.1.1" @@ -78979,15 +79036,15 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/compat-data-7.14.9" - (sources."@babel/core-7.14.8" // { + sources."@babel/compat-data-7.15.0" + (sources."@babel/core-7.15.0" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/generator-7.14.9" + sources."@babel/generator-7.15.0" sources."@babel/helper-annotate-as-pure-7.14.5" - (sources."@babel/helper-compilation-targets-7.14.5" // { + (sources."@babel/helper-compilation-targets-7.15.0" // { dependencies = [ sources."semver-6.3.0" ]; @@ -78995,19 +79052,19 @@ in sources."@babel/helper-function-name-7.14.5" sources."@babel/helper-get-function-arity-7.14.5" sources."@babel/helper-hoist-variables-7.14.5" - sources."@babel/helper-member-expression-to-functions-7.14.7" + sources."@babel/helper-member-expression-to-functions-7.15.0" sources."@babel/helper-module-imports-7.14.5" - sources."@babel/helper-module-transforms-7.14.8" + sources."@babel/helper-module-transforms-7.15.0" sources."@babel/helper-optimise-call-expression-7.14.5" sources."@babel/helper-plugin-utils-7.14.5" - sources."@babel/helper-replace-supers-7.14.5" + sources."@babel/helper-replace-supers-7.15.0" sources."@babel/helper-simple-access-7.14.8" sources."@babel/helper-split-export-declaration-7.14.5" sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/helper-validator-option-7.14.5" sources."@babel/helpers-7.14.8" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.14.9" + sources."@babel/parser-7.15.0" sources."@babel/plugin-proposal-object-rest-spread-7.14.7" sources."@babel/plugin-syntax-jsx-7.14.5" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" @@ -79015,8 +79072,8 @@ in sources."@babel/plugin-transform-parameters-7.14.5" sources."@babel/plugin-transform-react-jsx-7.14.9" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.9" - sources."@babel/types-7.14.9" + sources."@babel/traverse-7.15.0" + sources."@babel/types-7.15.0" sources."@sindresorhus/is-4.0.1" sources."@szmarczak/http-timer-4.0.6" sources."@types/cacheable-request-6.0.2" @@ -79058,7 +79115,7 @@ in sources."quick-lru-4.0.1" ]; }) - sources."caniuse-lite-1.0.30001248" + sources."caniuse-lite-1.0.30001249" sources."chalk-2.4.2" sources."ci-info-2.0.0" sources."cli-boxes-2.2.1" @@ -79095,7 +79152,7 @@ in }) sources."defer-to-connect-2.0.1" sources."dot-prop-5.3.0" - sources."electron-to-chromium-1.3.795" + sources."electron-to-chromium-1.3.796" sources."emoji-regex-8.0.0" sources."emojilib-2.4.0" sources."end-of-stream-1.4.4" @@ -81383,24 +81440,24 @@ in }; dependencies = [ sources."@babel/code-frame-7.10.4" - sources."@babel/compat-data-7.14.9" - (sources."@babel/core-7.14.8" // { + sources."@babel/compat-data-7.15.0" + (sources."@babel/core-7.15.0" // { dependencies = [ sources."@babel/code-frame-7.14.5" sources."json5-2.2.0" sources."semver-6.3.0" ]; }) - sources."@babel/generator-7.14.9" + sources."@babel/generator-7.15.0" sources."@babel/helper-annotate-as-pure-7.14.5" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.14.5" - (sources."@babel/helper-compilation-targets-7.14.5" // { + (sources."@babel/helper-compilation-targets-7.15.0" // { dependencies = [ sources."browserslist-4.16.7" sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.14.8" + sources."@babel/helper-create-class-features-plugin-7.15.0" sources."@babel/helper-create-regexp-features-plugin-7.14.5" (sources."@babel/helper-define-polyfill-provider-0.2.3" // { dependencies = [ @@ -81411,13 +81468,13 @@ in sources."@babel/helper-function-name-7.14.5" sources."@babel/helper-get-function-arity-7.14.5" sources."@babel/helper-hoist-variables-7.14.5" - sources."@babel/helper-member-expression-to-functions-7.14.7" + sources."@babel/helper-member-expression-to-functions-7.15.0" sources."@babel/helper-module-imports-7.14.5" - sources."@babel/helper-module-transforms-7.14.8" + sources."@babel/helper-module-transforms-7.15.0" sources."@babel/helper-optimise-call-expression-7.14.5" sources."@babel/helper-plugin-utils-7.14.5" sources."@babel/helper-remap-async-to-generator-7.14.5" - sources."@babel/helper-replace-supers-7.14.5" + sources."@babel/helper-replace-supers-7.15.0" sources."@babel/helper-simple-access-7.14.8" sources."@babel/helper-skip-transparent-expression-wrappers-7.14.5" sources."@babel/helper-split-export-declaration-7.14.5" @@ -81430,7 +81487,7 @@ in sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.14.9" + sources."@babel/parser-7.15.0" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5" sources."@babel/plugin-proposal-async-generator-functions-7.14.9" sources."@babel/plugin-proposal-class-properties-7.14.5" @@ -81482,7 +81539,7 @@ in sources."@babel/plugin-transform-literals-7.14.5" sources."@babel/plugin-transform-member-expression-literals-7.14.5" sources."@babel/plugin-transform-modules-amd-7.14.5" - sources."@babel/plugin-transform-modules-commonjs-7.14.5" + sources."@babel/plugin-transform-modules-commonjs-7.15.0" sources."@babel/plugin-transform-modules-systemjs-7.14.5" sources."@babel/plugin-transform-modules-umd-7.14.5" sources."@babel/plugin-transform-named-capturing-groups-regex-7.14.9" @@ -81491,13 +81548,13 @@ in sources."@babel/plugin-transform-object-super-7.14.5" sources."@babel/plugin-transform-parameters-7.14.5" sources."@babel/plugin-transform-property-literals-7.14.5" - sources."@babel/plugin-transform-react-display-name-7.14.5" + sources."@babel/plugin-transform-react-display-name-7.15.1" sources."@babel/plugin-transform-react-jsx-7.14.9" sources."@babel/plugin-transform-react-jsx-self-7.14.9" sources."@babel/plugin-transform-react-jsx-source-7.14.5" sources."@babel/plugin-transform-regenerator-7.14.5" sources."@babel/plugin-transform-reserved-words-7.14.5" - (sources."@babel/plugin-transform-runtime-7.14.5" // { + (sources."@babel/plugin-transform-runtime-7.15.0" // { dependencies = [ sources."semver-6.3.0" ]; @@ -81507,10 +81564,10 @@ in sources."@babel/plugin-transform-sticky-regex-7.14.5" sources."@babel/plugin-transform-template-literals-7.14.5" sources."@babel/plugin-transform-typeof-symbol-7.14.5" - sources."@babel/plugin-transform-typescript-7.14.6" + sources."@babel/plugin-transform-typescript-7.15.0" sources."@babel/plugin-transform-unicode-escapes-7.14.5" sources."@babel/plugin-transform-unicode-regex-7.14.5" - (sources."@babel/preset-env-7.14.9" // { + (sources."@babel/preset-env-7.15.0" // { dependencies = [ sources."semver-6.3.0" ]; @@ -81526,12 +81583,12 @@ in sources."@babel/code-frame-7.14.5" ]; }) - (sources."@babel/traverse-7.14.9" // { + (sources."@babel/traverse-7.15.0" // { dependencies = [ sources."@babel/code-frame-7.14.5" ]; }) - sources."@babel/types-7.14.9" + sources."@babel/types-7.15.0" sources."@expo/apple-utils-0.0.0-alpha.20" sources."@expo/bunyan-4.0.0" sources."@expo/config-5.0.6" @@ -81585,6 +81642,7 @@ in (sources."@expo/plist-0.0.13" // { dependencies = [ sources."xmlbuilder-14.0.0" + sources."xmldom-0.5.0" ]; }) sources."@expo/prebuild-config-2.0.6" @@ -81909,7 +81967,7 @@ in }) sources."camelcase-6.2.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001248" + sources."caniuse-lite-1.0.30001249" sources."caseless-0.12.0" (sources."chalk-4.1.2" // { dependencies = [ @@ -82177,7 +82235,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.795" + sources."electron-to-chromium-1.3.796" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -82960,7 +83018,7 @@ in sources."path-exists-3.0.0" ]; }) - sources."plist-3.0.2" + sources."plist-3.0.3" sources."pngjs-3.4.0" sources."pnp-webpack-plugin-1.7.0" (sources."portfinder-1.0.28" // { @@ -83237,7 +83295,7 @@ in ]; }) sources."ripemd160-2.0.2" - sources."rollup-2.55.1" + sources."rollup-2.56.0" (sources."rollup-plugin-terser-7.0.2" // { dependencies = [ sources."commander-2.20.3" @@ -83823,7 +83881,7 @@ in ]; }) sources."xmlbuilder-9.0.7" - sources."xmldom-0.5.0" + sources."xmldom-0.6.0" sources."xtend-4.0.2" sources."y18n-4.0.3" sources."yallist-4.0.0" @@ -83868,27 +83926,27 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/compat-data-7.14.9" - sources."@babel/core-7.14.8" - sources."@babel/generator-7.14.9" + sources."@babel/compat-data-7.15.0" + sources."@babel/core-7.15.0" + sources."@babel/generator-7.15.0" sources."@babel/helper-annotate-as-pure-7.14.5" - sources."@babel/helper-compilation-targets-7.14.5" + sources."@babel/helper-compilation-targets-7.15.0" sources."@babel/helper-function-name-7.14.5" sources."@babel/helper-get-function-arity-7.14.5" sources."@babel/helper-hoist-variables-7.14.5" - sources."@babel/helper-member-expression-to-functions-7.14.7" + sources."@babel/helper-member-expression-to-functions-7.15.0" sources."@babel/helper-module-imports-7.14.5" - sources."@babel/helper-module-transforms-7.14.8" + sources."@babel/helper-module-transforms-7.15.0" sources."@babel/helper-optimise-call-expression-7.14.5" sources."@babel/helper-plugin-utils-7.14.5" - sources."@babel/helper-replace-supers-7.14.5" + sources."@babel/helper-replace-supers-7.15.0" sources."@babel/helper-simple-access-7.14.8" sources."@babel/helper-split-export-declaration-7.14.5" sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/helper-validator-option-7.14.5" sources."@babel/helpers-7.14.8" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.14.9" + sources."@babel/parser-7.15.0" sources."@babel/plugin-proposal-object-rest-spread-7.14.7" sources."@babel/plugin-syntax-jsx-7.14.5" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" @@ -83896,8 +83954,8 @@ in sources."@babel/plugin-transform-parameters-7.14.5" sources."@babel/plugin-transform-react-jsx-7.14.9" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.9" - sources."@babel/types-7.14.9" + sources."@babel/traverse-7.15.0" + sources."@babel/types-7.15.0" sources."@types/minimist-1.2.2" sources."@types/node-16.4.12" sources."@types/normalize-package-data-2.4.1" @@ -83926,7 +83984,7 @@ in sources."callsites-2.0.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001248" + sources."caniuse-lite-1.0.30001249" sources."chalk-2.4.2" sources."chownr-1.1.4" sources."ci-info-2.0.0" @@ -83951,7 +84009,7 @@ in }) sources."delay-5.0.0" sources."devtools-protocol-0.0.869402" - sources."electron-to-chromium-1.3.795" + sources."electron-to-chromium-1.3.796" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" @@ -84143,17 +84201,17 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/generator-7.14.9" + sources."@babel/generator-7.15.0" sources."@babel/helper-function-name-7.14.5" sources."@babel/helper-get-function-arity-7.14.5" sources."@babel/helper-hoist-variables-7.14.5" sources."@babel/helper-split-export-declaration-7.14.5" sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.14.9" + sources."@babel/parser-7.15.0" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.9" - sources."@babel/types-7.14.9" + sources."@babel/traverse-7.15.0" + sources."@babel/types-7.15.0" (sources."@heroku-cli/color-1.1.14" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -84773,7 +84831,7 @@ in sources."@google-cloud/promisify-2.0.3" (sources."@google-cloud/pubsub-2.16.1" // { dependencies = [ - sources."google-auth-library-7.4.1" + sources."google-auth-library-7.5.0" ]; }) sources."@grpc/grpc-js-1.3.6" @@ -85156,7 +85214,7 @@ in sources."google-auth-library-6.1.6" (sources."google-gax-2.21.1" // { dependencies = [ - sources."google-auth-library-7.4.1" + sources."google-auth-library-7.5.0" ]; }) sources."google-p12-pem-3.1.1" @@ -86607,20 +86665,20 @@ in ]; }) sources."@babel/code-frame-7.14.5" - sources."@babel/compat-data-7.14.9" - (sources."@babel/core-7.14.8" // { + sources."@babel/compat-data-7.15.0" + (sources."@babel/core-7.15.0" // { dependencies = [ sources."semver-6.3.0" sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.14.9" // { + (sources."@babel/generator-7.15.0" // { dependencies = [ sources."source-map-0.5.7" ]; }) sources."@babel/helper-annotate-as-pure-7.14.5" - (sources."@babel/helper-compilation-targets-7.14.5" // { + (sources."@babel/helper-compilation-targets-7.15.0" // { dependencies = [ sources."semver-6.3.0" ]; @@ -86628,12 +86686,12 @@ in sources."@babel/helper-function-name-7.14.5" sources."@babel/helper-get-function-arity-7.14.5" sources."@babel/helper-hoist-variables-7.14.5" - sources."@babel/helper-member-expression-to-functions-7.14.7" + sources."@babel/helper-member-expression-to-functions-7.15.0" sources."@babel/helper-module-imports-7.14.5" - sources."@babel/helper-module-transforms-7.14.8" + sources."@babel/helper-module-transforms-7.15.0" sources."@babel/helper-optimise-call-expression-7.14.5" sources."@babel/helper-plugin-utils-7.14.5" - sources."@babel/helper-replace-supers-7.14.5" + sources."@babel/helper-replace-supers-7.15.0" sources."@babel/helper-simple-access-7.14.8" sources."@babel/helper-skip-transparent-expression-wrappers-7.14.5" sources."@babel/helper-split-export-declaration-7.14.5" @@ -86645,7 +86703,7 @@ in sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.14.9" + sources."@babel/parser-7.15.0" sources."@babel/plugin-proposal-object-rest-spread-7.10.4" sources."@babel/plugin-proposal-optional-chaining-7.14.5" sources."@babel/plugin-syntax-jsx-7.14.5" @@ -86654,10 +86712,10 @@ in sources."@babel/plugin-transform-parameters-7.14.5" sources."@babel/plugin-transform-react-jsx-7.14.9" sources."@babel/runtime-7.14.8" - sources."@babel/standalone-7.14.9" + sources."@babel/standalone-7.15.1" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.9" - sources."@babel/types-7.14.9" + sources."@babel/traverse-7.15.0" + sources."@babel/types-7.15.0" sources."@graphql-tools/schema-7.1.5" sources."@graphql-tools/utils-7.10.0" sources."@hapi/address-2.1.4" @@ -86760,7 +86818,7 @@ in sources."call-bind-1.0.2" sources."camel-case-4.1.2" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001248" + sources."caniuse-lite-1.0.30001249" sources."ccount-1.1.0" (sources."chalk-4.1.2" // { dependencies = [ @@ -86856,7 +86914,7 @@ in sources."dotenv-8.6.0" sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.795" + sources."electron-to-chromium-1.3.796" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -87615,10 +87673,10 @@ in gitmoji-cli = nodeEnv.buildNodePackage { name = "gitmoji-cli"; packageName = "gitmoji-cli"; - version = "4.4.1"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/gitmoji-cli/-/gitmoji-cli-4.4.1.tgz"; - sha512 = "+T6OUPejA5b1c+fuZ0yjdVVBhj0Js6rAieAtgi3ZLtJ0QpNzVI2rvNOiSaDyip3GpiLMTuNmH83G5mcOzrU+8w=="; + url = "https://registry.npmjs.org/gitmoji-cli/-/gitmoji-cli-4.5.0.tgz"; + sha512 = "8Zyt0/LQeTBg1biDUJjJ0BuWZQ4cXmNQHH+9wzJrdsfMkXl3vQ9fLJPVM22DHaHhmzpyMfgb6M3RSB3l+kO0mQ=="; }; dependencies = [ sources."@babel/code-frame-7.14.5" @@ -88049,8 +88107,9 @@ in sources."tslib-2.3.0" ]; }) - (sources."@graphql-tools/schema-8.0.2" // { + (sources."@graphql-tools/schema-8.0.3" // { dependencies = [ + sources."@graphql-tools/merge-7.0.0" sources."@graphql-tools/utils-8.0.2" sources."tslib-2.3.0" ]; @@ -88373,7 +88432,7 @@ in sources."oas-linter-3.2.2" (sources."oas-resolver-2.5.6" // { dependencies = [ - sources."yargs-17.0.1" + sources."yargs-17.1.0" ]; }) sources."oas-schema-walker-1.1.5" @@ -88486,7 +88545,7 @@ in sources."supports-color-7.2.0" (sources."swagger2openapi-7.0.8" // { dependencies = [ - sources."yargs-17.0.1" + sources."yargs-17.1.0" ]; }) sources."symbol-observable-1.2.0" @@ -90947,7 +91006,7 @@ in sources."color-name-1.1.4" sources."has-flag-4.0.0" sources."supports-color-7.2.0" - sources."yargs-17.0.1" + sources."yargs-17.1.0" ]; }) sources."wawoff2-2.0.0" @@ -91105,29 +91164,29 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/compat-data-7.14.9" - (sources."@babel/core-7.14.8" // { + sources."@babel/compat-data-7.15.0" + (sources."@babel/core-7.15.0" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/generator-7.14.9" + sources."@babel/generator-7.15.0" sources."@babel/helper-annotate-as-pure-7.14.5" - (sources."@babel/helper-compilation-targets-7.14.5" // { + (sources."@babel/helper-compilation-targets-7.15.0" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.14.8" + sources."@babel/helper-create-class-features-plugin-7.15.0" sources."@babel/helper-function-name-7.14.5" sources."@babel/helper-get-function-arity-7.14.5" sources."@babel/helper-hoist-variables-7.14.5" - sources."@babel/helper-member-expression-to-functions-7.14.7" + sources."@babel/helper-member-expression-to-functions-7.15.0" sources."@babel/helper-module-imports-7.14.5" - sources."@babel/helper-module-transforms-7.14.8" + sources."@babel/helper-module-transforms-7.15.0" sources."@babel/helper-optimise-call-expression-7.14.5" sources."@babel/helper-plugin-utils-7.14.5" - sources."@babel/helper-replace-supers-7.14.5" + sources."@babel/helper-replace-supers-7.15.0" sources."@babel/helper-simple-access-7.14.8" sources."@babel/helper-skip-transparent-expression-wrappers-7.14.5" sources."@babel/helper-split-export-declaration-7.14.5" @@ -91143,7 +91202,7 @@ in sources."escape-string-regexp-1.0.5" ]; }) - sources."@babel/parser-7.14.9" + sources."@babel/parser-7.15.0" sources."@babel/plugin-proposal-class-properties-7.14.5" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.14.5" sources."@babel/plugin-proposal-optional-chaining-7.14.5" @@ -91152,14 +91211,14 @@ in sources."@babel/plugin-syntax-optional-chaining-7.8.3" sources."@babel/plugin-syntax-typescript-7.14.5" sources."@babel/plugin-transform-flow-strip-types-7.14.5" - sources."@babel/plugin-transform-modules-commonjs-7.14.5" - sources."@babel/plugin-transform-typescript-7.14.6" + sources."@babel/plugin-transform-modules-commonjs-7.15.0" + sources."@babel/plugin-transform-typescript-7.15.0" sources."@babel/preset-flow-7.14.5" - sources."@babel/preset-typescript-7.14.5" + sources."@babel/preset-typescript-7.15.0" sources."@babel/register-7.14.5" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.9" - sources."@babel/types-7.14.9" + sources."@babel/traverse-7.15.0" + sources."@babel/types-7.15.0" sources."@braintree/sanitize-url-3.1.0" sources."@cronvel/get-pixels-3.4.0" sources."@joplin/fork-htmlparser2-4.1.28" @@ -91228,8 +91287,8 @@ in }) ]; }) - sources."@percy/config-1.0.0-beta.62" - sources."@percy/logger-1.0.0-beta.62" + sources."@percy/config-1.0.0-beta.63" + sources."@percy/logger-1.0.0-beta.63" sources."@percy/migrate-0.10.0" sources."@types/parse-json-4.0.0" sources."abab-2.0.5" @@ -91323,7 +91382,7 @@ in sources."callsites-3.1.0" sources."camel-case-3.0.0" sources."camelcase-4.1.0" - sources."caniuse-lite-1.0.30001248" + sources."caniuse-lite-1.0.30001249" sources."caseless-0.12.0" (sources."chalk-4.1.2" // { dependencies = [ @@ -91481,7 +91540,7 @@ in ]; }) sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.795" + sources."electron-to-chromium-1.3.796" sources."emoji-regex-8.0.0" (sources."emphasize-1.5.0" // { dependencies = [ @@ -92391,7 +92450,7 @@ in sha512 = "sxKt7h0vzCd+3Y81Ey2qinupL6DpRSZJclS04ugHDNmRUXGzqicMJ6iwayhSA0S0DwwX30c5ozyUthr1QKF6uw=="; }; dependencies = [ - sources."@babel/parser-7.14.9" + sources."@babel/parser-7.15.0" sources."argparse-1.0.10" sources."bluebird-3.7.2" sources."catharsis-0.9.0" @@ -96393,26 +96452,26 @@ in src = ../interpreters/clojurescript/lumo; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/compat-data-7.14.9" - sources."@babel/core-7.14.8" - sources."@babel/generator-7.14.9" + sources."@babel/compat-data-7.15.0" + sources."@babel/core-7.15.0" + sources."@babel/generator-7.15.0" sources."@babel/helper-annotate-as-pure-7.14.5" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.14.5" - sources."@babel/helper-compilation-targets-7.14.5" - sources."@babel/helper-create-class-features-plugin-7.14.8" + sources."@babel/helper-compilation-targets-7.15.0" + sources."@babel/helper-create-class-features-plugin-7.15.0" sources."@babel/helper-create-regexp-features-plugin-7.14.5" sources."@babel/helper-define-polyfill-provider-0.2.3" sources."@babel/helper-explode-assignable-expression-7.14.5" sources."@babel/helper-function-name-7.14.5" sources."@babel/helper-get-function-arity-7.14.5" sources."@babel/helper-hoist-variables-7.14.5" - sources."@babel/helper-member-expression-to-functions-7.14.7" + sources."@babel/helper-member-expression-to-functions-7.15.0" sources."@babel/helper-module-imports-7.14.5" - sources."@babel/helper-module-transforms-7.14.8" + sources."@babel/helper-module-transforms-7.15.0" sources."@babel/helper-optimise-call-expression-7.14.5" sources."@babel/helper-plugin-utils-7.14.5" sources."@babel/helper-remap-async-to-generator-7.14.5" - sources."@babel/helper-replace-supers-7.14.5" + sources."@babel/helper-replace-supers-7.15.0" sources."@babel/helper-simple-access-7.14.8" sources."@babel/helper-skip-transparent-expression-wrappers-7.14.5" sources."@babel/helper-split-export-declaration-7.14.5" @@ -96425,7 +96484,7 @@ in sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.14.9" + sources."@babel/parser-7.15.0" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5" sources."@babel/plugin-external-helpers-7.8.3" sources."@babel/plugin-proposal-async-generator-functions-7.14.9" @@ -96474,7 +96533,7 @@ in sources."@babel/plugin-transform-literals-7.14.5" sources."@babel/plugin-transform-member-expression-literals-7.14.5" sources."@babel/plugin-transform-modules-amd-7.14.5" - sources."@babel/plugin-transform-modules-commonjs-7.14.5" + sources."@babel/plugin-transform-modules-commonjs-7.15.0" sources."@babel/plugin-transform-modules-systemjs-7.14.5" sources."@babel/plugin-transform-modules-umd-7.14.5" sources."@babel/plugin-transform-named-capturing-groups-regex-7.14.9" @@ -96484,7 +96543,7 @@ in sources."@babel/plugin-transform-property-literals-7.14.5" sources."@babel/plugin-transform-regenerator-7.14.5" sources."@babel/plugin-transform-reserved-words-7.14.5" - sources."@babel/plugin-transform-runtime-7.14.5" + sources."@babel/plugin-transform-runtime-7.15.0" sources."@babel/plugin-transform-shorthand-properties-7.14.5" sources."@babel/plugin-transform-spread-7.14.6" sources."@babel/plugin-transform-sticky-regex-7.14.5" @@ -96492,13 +96551,13 @@ in sources."@babel/plugin-transform-typeof-symbol-7.14.5" sources."@babel/plugin-transform-unicode-escapes-7.14.5" sources."@babel/plugin-transform-unicode-regex-7.14.5" - sources."@babel/preset-env-7.14.9" + sources."@babel/preset-env-7.15.0" sources."@babel/preset-modules-0.1.4" sources."@babel/preset-stage-2-7.8.3" sources."@babel/runtime-7.14.8" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.9" - sources."@babel/types-7.14.9" + sources."@babel/traverse-7.15.0" + sources."@babel/types-7.15.0" sources."@cnakazawa/watch-1.0.4" sources."@comandeer/babel-plugin-banner-5.0.0" sources."@istanbuljs/load-nyc-config-1.1.0" @@ -96692,7 +96751,7 @@ in sources."cached-path-relative-1.0.2" sources."call-bind-1.0.2" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001248" + sources."caniuse-lite-1.0.30001249" sources."capture-exit-2.0.0" sources."caseless-0.12.0" (sources."chalk-3.0.0" // { @@ -96816,7 +96875,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.795" + sources."electron-to-chromium-1.3.796" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -98064,29 +98123,29 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/compat-data-7.14.9" - (sources."@babel/core-7.14.8" // { + sources."@babel/compat-data-7.15.0" + (sources."@babel/core-7.15.0" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/generator-7.14.9" + sources."@babel/generator-7.15.0" sources."@babel/helper-annotate-as-pure-7.14.5" - (sources."@babel/helper-compilation-targets-7.14.5" // { + (sources."@babel/helper-compilation-targets-7.15.0" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.14.8" + sources."@babel/helper-create-class-features-plugin-7.15.0" sources."@babel/helper-function-name-7.14.5" sources."@babel/helper-get-function-arity-7.14.5" sources."@babel/helper-hoist-variables-7.14.5" - sources."@babel/helper-member-expression-to-functions-7.14.7" + sources."@babel/helper-member-expression-to-functions-7.15.0" sources."@babel/helper-module-imports-7.14.5" - sources."@babel/helper-module-transforms-7.14.8" + sources."@babel/helper-module-transforms-7.15.0" sources."@babel/helper-optimise-call-expression-7.14.5" sources."@babel/helper-plugin-utils-7.14.5" - sources."@babel/helper-replace-supers-7.14.5" + sources."@babel/helper-replace-supers-7.15.0" sources."@babel/helper-simple-access-7.14.8" sources."@babel/helper-skip-transparent-expression-wrappers-7.14.5" sources."@babel/helper-split-export-declaration-7.14.5" @@ -98104,7 +98163,7 @@ in sources."supports-color-5.5.0" ]; }) - sources."@babel/parser-7.14.9" + sources."@babel/parser-7.15.0" sources."@babel/plugin-proposal-class-properties-7.14.5" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.14.5" sources."@babel/plugin-proposal-optional-chaining-7.14.5" @@ -98113,14 +98172,14 @@ in sources."@babel/plugin-syntax-optional-chaining-7.8.3" sources."@babel/plugin-syntax-typescript-7.14.5" sources."@babel/plugin-transform-flow-strip-types-7.14.5" - sources."@babel/plugin-transform-modules-commonjs-7.14.5" - sources."@babel/plugin-transform-typescript-7.14.6" + sources."@babel/plugin-transform-modules-commonjs-7.15.0" + sources."@babel/plugin-transform-typescript-7.15.0" sources."@babel/preset-flow-7.14.5" - sources."@babel/preset-typescript-7.14.5" + sources."@babel/preset-typescript-7.15.0" sources."@babel/register-7.14.5" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.9" - sources."@babel/types-7.14.9" + sources."@babel/traverse-7.15.0" + sources."@babel/types-7.15.0" sources."@braintree/sanitize-url-3.1.0" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" @@ -98159,8 +98218,8 @@ in }) ]; }) - sources."@percy/config-1.0.0-beta.62" - sources."@percy/logger-1.0.0-beta.62" + sources."@percy/config-1.0.0-beta.63" + sources."@percy/logger-1.0.0-beta.63" sources."@percy/migrate-0.10.0" sources."@types/node-16.4.12" sources."@types/parse-json-4.0.0" @@ -98201,7 +98260,7 @@ in sources."cache-base-1.0.1" sources."call-bind-1.0.2" sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001248" + sources."caniuse-lite-1.0.30001249" sources."chalk-4.1.2" sources."chardet-0.7.0" sources."chownr-1.1.4" @@ -98291,7 +98350,7 @@ in sources."devtools-protocol-0.0.901419" sources."dir-glob-3.0.1" sources."dompurify-2.3.0" - sources."electron-to-chromium-1.3.795" + sources."electron-to-chromium-1.3.796" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" @@ -98681,10 +98740,10 @@ in mirakurun = nodeEnv.buildNodePackage { name = "mirakurun"; packageName = "mirakurun"; - version = "3.7.0"; + version = "3.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/mirakurun/-/mirakurun-3.7.0.tgz"; - sha512 = "seHSVEn7JJbOEuYD8T8UmqZcYT1iLCFp2mMA/+UyhcpRICLzClF9uQX3beAuHCZUymO3FBwdEjN4Ky5qd2kbHw=="; + url = "https://registry.npmjs.org/mirakurun/-/mirakurun-3.7.1.tgz"; + sha512 = "1Igntd9BqPrUMMB2nhVSy2k6D/BzGx1yLC5GMHyyC7z2w+i27oDYuk7ZMfwBHMZS409F5desIOcDE6w3BFb1XA=="; }; dependencies = [ sources."@fluentui/date-time-utilities-8.2.2" @@ -98693,7 +98752,7 @@ in sources."@fluentui/foundation-legacy-8.1.8" sources."@fluentui/keyboard-key-0.3.4" sources."@fluentui/merge-styles-8.1.4" - sources."@fluentui/react-8.23.8" + sources."@fluentui/react-8.27.0" sources."@fluentui/react-focus-8.1.10" sources."@fluentui/react-hooks-8.2.6" sources."@fluentui/react-window-provider-2.1.4" @@ -98771,7 +98830,11 @@ in sources."eventemitter3-4.0.7" sources."express-4.17.1" sources."express-normalize-query-params-middleware-0.5.1" - sources."express-openapi-7.5.0" + (sources."express-openapi-8.0.0" // { + dependencies = [ + sources."openapi-types-8.0.0" + ]; + }) sources."external-editor-2.2.0" sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" @@ -98779,7 +98842,7 @@ in sources."finalhandler-1.1.2" sources."forwarded-0.2.0" sources."fresh-0.5.2" - sources."fs-routes-7.0.1" + sources."fs-routes-8.0.0" sources."fs.realpath-1.0.0" sources."get-stream-4.1.0" sources."glob-7.1.7" @@ -98829,7 +98892,6 @@ in ]; }) sources."ms-2.0.0" - sources."munin-plugin-0.0.9" sources."mute-stream-0.0.7" sources."negotiator-0.6.2" sources."node-fetch-1.6.3" @@ -98839,18 +98901,47 @@ in sources."on-headers-1.0.2" sources."once-1.4.0" sources."onetime-2.0.1" - sources."openapi-default-setter-7.2.3" - (sources."openapi-framework-7.5.0" // { + (sources."openapi-default-setter-8.0.0" // { dependencies = [ - sources."js-yaml-3.14.1" + sources."openapi-types-8.0.0" + ]; + }) + (sources."openapi-framework-8.0.0" // { + dependencies = [ + sources."js-yaml-3.14.1" + sources."openapi-types-8.0.0" + ]; + }) + (sources."openapi-jsonschema-parameters-8.0.0" // { + dependencies = [ + sources."openapi-types-8.0.0" + ]; + }) + (sources."openapi-request-coercer-8.0.0" // { + dependencies = [ + sources."openapi-types-8.0.0" + ]; + }) + (sources."openapi-request-validator-8.0.0" // { + dependencies = [ + sources."openapi-types-8.0.0" + ]; + }) + (sources."openapi-response-validator-8.0.0" // { + dependencies = [ + sources."openapi-types-8.0.0" + ]; + }) + (sources."openapi-schema-validator-8.0.0" // { + dependencies = [ + sources."openapi-types-8.0.0" + ]; + }) + (sources."openapi-security-handler-8.0.0" // { + dependencies = [ + sources."openapi-types-8.0.0" ]; }) - sources."openapi-jsonschema-parameters-7.2.3" - sources."openapi-request-coercer-7.5.0" - sources."openapi-request-validator-7.4.0" - sources."openapi-response-validator-7.4.0" - sources."openapi-schema-validator-7.2.3" - sources."openapi-security-handler-7.2.3" sources."openapi-types-7.2.3" (sources."opencollective-1.0.3" // { dependencies = [ @@ -98927,7 +99018,7 @@ in sources."strip-json-comments-2.0.1" sources."supports-color-2.0.0" sources."swagger-schema-official-2.0.0-bab6bed" - sources."swagger-ui-dist-3.51.1" + sources."swagger-ui-dist-3.51.2" sources."tail-2.2.3" sources."through-2.3.8" sources."tmp-0.0.33" @@ -99289,28 +99380,28 @@ in netlify-cli = nodeEnv.buildNodePackage { name = "netlify-cli"; packageName = "netlify-cli"; - version = "6.0.3"; + version = "6.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-6.0.3.tgz"; - sha512 = "cm07sqQpSYmHjk1j//geep75fc3NRX0KO7Jr0S8H43OZyFrdY4G8VfAfukMBwVXie/aEfFw1CcgA8yiFMq+7pw=="; + url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-6.0.5.tgz"; + sha512 = "u6nQQSwJwKM3llCxjseF71yl3ecEN2apAZVvOkx+rha0wuqBz5SNi70TVbgbLaBMxjhJnfRsbgXEizRBub9fHQ=="; }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/compat-data-7.14.9" - (sources."@babel/core-7.14.8" // { + sources."@babel/compat-data-7.15.0" + (sources."@babel/core-7.15.0" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/generator-7.14.9" + sources."@babel/generator-7.15.0" sources."@babel/helper-annotate-as-pure-7.14.5" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.14.5" - (sources."@babel/helper-compilation-targets-7.14.5" // { + (sources."@babel/helper-compilation-targets-7.15.0" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.14.8" + sources."@babel/helper-create-class-features-plugin-7.15.0" sources."@babel/helper-create-regexp-features-plugin-7.14.5" (sources."@babel/helper-define-polyfill-provider-0.2.3" // { dependencies = [ @@ -99321,13 +99412,13 @@ in sources."@babel/helper-function-name-7.14.5" sources."@babel/helper-get-function-arity-7.14.5" sources."@babel/helper-hoist-variables-7.14.5" - sources."@babel/helper-member-expression-to-functions-7.14.7" + sources."@babel/helper-member-expression-to-functions-7.15.0" sources."@babel/helper-module-imports-7.14.5" - sources."@babel/helper-module-transforms-7.14.8" + sources."@babel/helper-module-transforms-7.15.0" sources."@babel/helper-optimise-call-expression-7.14.5" sources."@babel/helper-plugin-utils-7.14.5" sources."@babel/helper-remap-async-to-generator-7.14.5" - sources."@babel/helper-replace-supers-7.14.5" + sources."@babel/helper-replace-supers-7.15.0" sources."@babel/helper-simple-access-7.14.8" sources."@babel/helper-skip-transparent-expression-wrappers-7.14.5" sources."@babel/helper-split-export-declaration-7.14.5" @@ -99344,7 +99435,7 @@ in sources."supports-color-5.5.0" ]; }) - sources."@babel/parser-7.14.9" + sources."@babel/parser-7.15.0" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5" sources."@babel/plugin-proposal-async-generator-functions-7.14.9" sources."@babel/plugin-proposal-class-properties-7.14.5" @@ -99390,7 +99481,7 @@ in sources."@babel/plugin-transform-literals-7.14.5" sources."@babel/plugin-transform-member-expression-literals-7.14.5" sources."@babel/plugin-transform-modules-amd-7.14.5" - sources."@babel/plugin-transform-modules-commonjs-7.14.5" + sources."@babel/plugin-transform-modules-commonjs-7.15.0" sources."@babel/plugin-transform-modules-systemjs-7.14.5" sources."@babel/plugin-transform-modules-umd-7.14.5" sources."@babel/plugin-transform-named-capturing-groups-regex-7.14.9" @@ -99407,7 +99498,7 @@ in sources."@babel/plugin-transform-typeof-symbol-7.14.5" sources."@babel/plugin-transform-unicode-escapes-7.14.5" sources."@babel/plugin-transform-unicode-regex-7.14.5" - (sources."@babel/preset-env-7.14.9" // { + (sources."@babel/preset-env-7.15.0" // { dependencies = [ sources."semver-6.3.0" ]; @@ -99415,8 +99506,8 @@ in sources."@babel/preset-modules-0.1.4" sources."@babel/runtime-7.14.8" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.9" - sources."@babel/types-7.14.9" + sources."@babel/traverse-7.15.0" + sources."@babel/types-7.15.0" sources."@bugsnag/browser-7.11.0" sources."@bugsnag/core-7.11.0" sources."@bugsnag/cuid-3.0.0" @@ -99841,7 +99932,7 @@ in sources."call-me-maybe-1.0.1" sources."callsite-1.0.0" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001248" + sources."caniuse-lite-1.0.30001249" sources."cardinal-2.1.1" (sources."chalk-4.1.2" // { dependencies = [ @@ -100107,7 +100198,7 @@ in }) sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.795" + sources."electron-to-chromium-1.3.796" sources."elegant-spinner-1.0.1" sources."elf-cam-0.1.1" sources."emoji-regex-8.0.0" @@ -100925,7 +101016,7 @@ in sources."reusify-1.0.4" sources."rfdc-1.3.0" sources."rimraf-3.0.2" - sources."rollup-2.55.1" + sources."rollup-2.56.0" (sources."rollup-plugin-inject-3.0.2" // { dependencies = [ sources."estree-walker-0.6.1" @@ -103717,27 +103808,27 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/compat-data-7.14.9" - (sources."@babel/core-7.14.8" // { + sources."@babel/compat-data-7.15.0" + (sources."@babel/core-7.15.0" // { dependencies = [ sources."json5-2.2.0" sources."semver-6.3.0" sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.14.9" // { + (sources."@babel/generator-7.15.0" // { dependencies = [ sources."source-map-0.5.7" ]; }) sources."@babel/helper-annotate-as-pure-7.14.5" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.14.5" - (sources."@babel/helper-compilation-targets-7.14.5" // { + (sources."@babel/helper-compilation-targets-7.15.0" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.14.8" + sources."@babel/helper-create-class-features-plugin-7.15.0" sources."@babel/helper-create-regexp-features-plugin-7.14.5" (sources."@babel/helper-define-polyfill-provider-0.2.3" // { dependencies = [ @@ -103748,13 +103839,13 @@ in sources."@babel/helper-function-name-7.14.5" sources."@babel/helper-get-function-arity-7.14.5" sources."@babel/helper-hoist-variables-7.14.5" - sources."@babel/helper-member-expression-to-functions-7.14.7" + sources."@babel/helper-member-expression-to-functions-7.15.0" sources."@babel/helper-module-imports-7.14.5" - sources."@babel/helper-module-transforms-7.14.8" + sources."@babel/helper-module-transforms-7.15.0" sources."@babel/helper-optimise-call-expression-7.14.5" sources."@babel/helper-plugin-utils-7.14.5" sources."@babel/helper-remap-async-to-generator-7.14.5" - sources."@babel/helper-replace-supers-7.14.5" + sources."@babel/helper-replace-supers-7.15.0" sources."@babel/helper-simple-access-7.14.8" sources."@babel/helper-skip-transparent-expression-wrappers-7.14.5" sources."@babel/helper-split-export-declaration-7.14.5" @@ -103763,7 +103854,7 @@ in sources."@babel/helper-wrap-function-7.14.5" sources."@babel/helpers-7.14.8" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.14.9" + sources."@babel/parser-7.15.0" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5" sources."@babel/plugin-proposal-async-generator-functions-7.14.9" sources."@babel/plugin-proposal-class-properties-7.14.5" @@ -103812,7 +103903,7 @@ in sources."@babel/plugin-transform-literals-7.14.5" sources."@babel/plugin-transform-member-expression-literals-7.14.5" sources."@babel/plugin-transform-modules-amd-7.14.5" - sources."@babel/plugin-transform-modules-commonjs-7.14.5" + sources."@babel/plugin-transform-modules-commonjs-7.15.0" sources."@babel/plugin-transform-modules-systemjs-7.14.5" sources."@babel/plugin-transform-modules-umd-7.14.5" sources."@babel/plugin-transform-named-capturing-groups-regex-7.14.9" @@ -103830,7 +103921,7 @@ in sources."@babel/plugin-transform-typeof-symbol-7.14.5" sources."@babel/plugin-transform-unicode-escapes-7.14.5" sources."@babel/plugin-transform-unicode-regex-7.14.5" - (sources."@babel/preset-env-7.14.9" // { + (sources."@babel/preset-env-7.15.0" // { dependencies = [ sources."semver-6.3.0" ]; @@ -103838,8 +103929,8 @@ in sources."@babel/preset-modules-0.1.4" sources."@babel/runtime-7.14.8" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.9" - sources."@babel/types-7.14.9" + sources."@babel/traverse-7.15.0" + sources."@babel/types-7.15.0" sources."@iarna/toml-2.2.5" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" @@ -103961,7 +104052,7 @@ in sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001248" + sources."caniuse-lite-1.0.30001249" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -104099,7 +104190,7 @@ in sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.795" + sources."electron-to-chromium-1.3.796" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -105340,11 +105431,7 @@ in sources."speedometer-0.1.4" sources."stream-buffers-2.2.0" sources."string-width-1.0.2" - (sources."string2compact-1.3.0" // { - dependencies = [ - sources."ipaddr.js-1.9.1" - ]; - }) + sources."string2compact-1.3.2" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" sources."strip-bom-2.0.0" @@ -105712,7 +105799,11 @@ in sources."speedometer-0.1.4" sources."sshpk-1.16.1" sources."statuses-1.5.0" - sources."string2compact-1.3.0" + (sources."string2compact-1.3.2" // { + dependencies = [ + sources."ipaddr.js-2.0.1" + ]; + }) sources."string_decoder-1.1.1" sources."tar-stream-2.2.0" sources."thirty-two-0.0.2" @@ -107208,21 +107299,21 @@ in dependencies = [ sources."@babel/cli-7.14.8" sources."@babel/code-frame-7.14.5" - sources."@babel/compat-data-7.14.9" - (sources."@babel/core-7.14.8" // { + sources."@babel/compat-data-7.15.0" + (sources."@babel/core-7.15.0" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/generator-7.14.9" + sources."@babel/generator-7.15.0" sources."@babel/helper-annotate-as-pure-7.14.5" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.14.5" - (sources."@babel/helper-compilation-targets-7.14.5" // { + (sources."@babel/helper-compilation-targets-7.15.0" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.14.8" + sources."@babel/helper-create-class-features-plugin-7.15.0" sources."@babel/helper-create-regexp-features-plugin-7.14.5" (sources."@babel/helper-define-polyfill-provider-0.2.3" // { dependencies = [ @@ -107233,13 +107324,13 @@ in sources."@babel/helper-function-name-7.14.5" sources."@babel/helper-get-function-arity-7.14.5" sources."@babel/helper-hoist-variables-7.14.5" - sources."@babel/helper-member-expression-to-functions-7.14.7" + sources."@babel/helper-member-expression-to-functions-7.15.0" sources."@babel/helper-module-imports-7.14.5" - sources."@babel/helper-module-transforms-7.14.8" + sources."@babel/helper-module-transforms-7.15.0" sources."@babel/helper-optimise-call-expression-7.14.5" sources."@babel/helper-plugin-utils-7.14.5" sources."@babel/helper-remap-async-to-generator-7.14.5" - sources."@babel/helper-replace-supers-7.14.5" + sources."@babel/helper-replace-supers-7.15.0" sources."@babel/helper-simple-access-7.14.8" sources."@babel/helper-skip-transparent-expression-wrappers-7.14.5" sources."@babel/helper-split-export-declaration-7.14.5" @@ -107248,7 +107339,7 @@ in sources."@babel/helper-wrap-function-7.14.5" sources."@babel/helpers-7.14.8" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.14.9" + sources."@babel/parser-7.15.0" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5" sources."@babel/plugin-proposal-async-generator-functions-7.14.9" sources."@babel/plugin-proposal-class-properties-7.14.5" @@ -107297,7 +107388,7 @@ in sources."@babel/plugin-transform-literals-7.14.5" sources."@babel/plugin-transform-member-expression-literals-7.14.5" sources."@babel/plugin-transform-modules-amd-7.14.5" - sources."@babel/plugin-transform-modules-commonjs-7.14.5" + sources."@babel/plugin-transform-modules-commonjs-7.15.0" sources."@babel/plugin-transform-modules-systemjs-7.14.5" sources."@babel/plugin-transform-modules-umd-7.14.5" sources."@babel/plugin-transform-named-capturing-groups-regex-7.14.9" @@ -107305,13 +107396,13 @@ in sources."@babel/plugin-transform-object-super-7.14.5" sources."@babel/plugin-transform-parameters-7.14.5" sources."@babel/plugin-transform-property-literals-7.14.5" - sources."@babel/plugin-transform-react-display-name-7.14.5" + sources."@babel/plugin-transform-react-display-name-7.15.1" sources."@babel/plugin-transform-react-jsx-7.14.9" sources."@babel/plugin-transform-react-jsx-development-7.14.5" sources."@babel/plugin-transform-react-pure-annotations-7.14.5" sources."@babel/plugin-transform-regenerator-7.14.5" sources."@babel/plugin-transform-reserved-words-7.14.5" - (sources."@babel/plugin-transform-runtime-7.14.5" // { + (sources."@babel/plugin-transform-runtime-7.15.0" // { dependencies = [ sources."semver-6.3.0" ]; @@ -107323,7 +107414,7 @@ in sources."@babel/plugin-transform-typeof-symbol-7.14.5" sources."@babel/plugin-transform-unicode-escapes-7.14.5" sources."@babel/plugin-transform-unicode-regex-7.14.5" - (sources."@babel/preset-env-7.14.9" // { + (sources."@babel/preset-env-7.15.0" // { dependencies = [ sources."semver-6.3.0" ]; @@ -107334,8 +107425,8 @@ in sources."@babel/register-7.14.5" sources."@babel/runtime-7.14.8" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.9" - sources."@babel/types-7.14.9" + sources."@babel/traverse-7.15.0" + sources."@babel/types-7.15.0" sources."@reach/router-1.3.4" sources."@sindresorhus/is-0.7.0" sources."@types/glob-7.1.4" @@ -107529,7 +107620,7 @@ in sources."camel-case-3.0.0" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001248" + sources."caniuse-lite-1.0.30001249" sources."case-sensitive-paths-webpack-plugin-2.4.0" sources."caw-2.0.1" (sources."chalk-2.4.2" // { @@ -107758,7 +107849,7 @@ in sources."duplexify-3.7.1" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.795" + sources."electron-to-chromium-1.3.796" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -109100,7 +109191,7 @@ in sources."xml-name-validator-3.0.0" sources."xmlchars-2.2.0" sources."y18n-5.0.8" - sources."yargs-17.0.1" + sources."yargs-17.1.0" sources."yargs-parser-20.2.9" ]; buildInputs = globalBuildInputs; @@ -109123,7 +109214,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - (sources."@babel/generator-7.14.9" // { + (sources."@babel/generator-7.15.0" // { dependencies = [ sources."source-map-0.5.7" ]; @@ -109136,11 +109227,11 @@ in sources."@babel/helper-split-export-declaration-7.14.5" sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.14.9" + sources."@babel/parser-7.15.0" sources."@babel/runtime-7.14.8" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.9" - sources."@babel/types-7.14.9" + sources."@babel/traverse-7.15.0" + sources."@babel/types-7.15.0" sources."@emotion/is-prop-valid-0.8.8" sources."@emotion/memoize-0.7.4" sources."@emotion/stylis-0.8.5" @@ -109425,7 +109516,7 @@ in sources."y18n-5.0.8" sources."yaml-1.10.2" sources."yaml-ast-parser-0.0.43" - sources."yargs-17.0.1" + sources."yargs-17.1.0" sources."yargs-parser-20.2.9" ]; buildInputs = globalBuildInputs; @@ -109630,10 +109721,10 @@ in rollup = nodeEnv.buildNodePackage { name = "rollup"; packageName = "rollup"; - version = "2.55.1"; + version = "2.56.0"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.55.1.tgz"; - sha512 = "1P9w5fpb6b4qroePh8vHKGIvPNxwoCQhjJpIqfZGHLKpZ0xcU2/XBmFxFbc9697/6bmHpmFTLk5R1dAQhFSo0g=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.56.0.tgz"; + sha512 = "weEafgbjbHCnrtJPNyCrhYnjP62AkF04P0BcV/1mofy1+gytWln4VVB1OK462cq2EAyWzRDpTMheSP/o+quoiA=="; }; dependencies = [ sources."fsevents-2.3.2" @@ -109959,7 +110050,7 @@ in sources."resolve-from-4.0.0" sources."reusify-1.0.4" sources."rimraf-3.0.2" - sources."rollup-2.55.1" + sources."rollup-2.56.0" sources."run-parallel-1.2.0" sources."safe-buffer-5.2.1" sources."semver-7.3.5" @@ -111848,10 +111939,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.675.0"; + version = "1.676.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.675.0.tgz"; - sha512 = "J5ZvEiaAIRdyFrIjS1OnfQs5vKLG0SNPJmeg/GuTA9z8L/gqtTXUsnCrnmpQ8Y2y7L3LRyjh9VXx7G0QC9rlWA=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.676.0.tgz"; + sha512 = "3B+YZ5mf/fXcb6PmbXBhZHQPY9BuK5g+KeI+HsLlNeLIEqc+PPxyL0XKv8W1VKFsaY8J1d3JQ68fjXeJie2OoA=="; }; dependencies = [ sources."@arcanis/slice-ansi-1.0.2" @@ -114589,17 +114680,17 @@ in dependencies = [ sources."@babel/code-frame-7.14.5" sources."@babel/compat-data-7.15.0" - sources."@babel/core-7.14.8" - sources."@babel/generator-7.14.9" + sources."@babel/core-7.15.0" + sources."@babel/generator-7.15.0" sources."@babel/helper-compilation-targets-7.15.0" sources."@babel/helper-function-name-7.14.5" sources."@babel/helper-get-function-arity-7.14.5" sources."@babel/helper-hoist-variables-7.14.5" - sources."@babel/helper-member-expression-to-functions-7.14.7" + sources."@babel/helper-member-expression-to-functions-7.15.0" sources."@babel/helper-module-imports-7.14.5" - sources."@babel/helper-module-transforms-7.14.8" + sources."@babel/helper-module-transforms-7.15.0" sources."@babel/helper-optimise-call-expression-7.14.5" - sources."@babel/helper-replace-supers-7.14.5" + sources."@babel/helper-replace-supers-7.15.0" sources."@babel/helper-simple-access-7.14.8" sources."@babel/helper-split-export-declaration-7.14.5" sources."@babel/helper-validator-identifier-7.14.9" @@ -114612,7 +114703,7 @@ in }) sources."@babel/parser-7.15.0" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.9" + sources."@babel/traverse-7.15.0" sources."@babel/types-7.15.0" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" @@ -114643,7 +114734,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001248" + sources."caniuse-lite-1.0.30001249" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -114681,7 +114772,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.795" + sources."electron-to-chromium-1.3.796" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -114914,10 +115005,10 @@ in svelte-language-server = nodeEnv.buildNodePackage { name = "svelte-language-server"; packageName = "svelte-language-server"; - version = "0.14.5"; + version = "0.14.6"; src = fetchurl { - url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-0.14.5.tgz"; - sha512 = "oHbbJx5x25ztVm+EIyXwWB2rCb+fgfNV7izSb/hjlI6jHXpmcHcu6pIXGxx9JI3PWj18nLyzvKfTE/Nr6p8mpw=="; + url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-0.14.6.tgz"; + sha512 = "TetCKVY6kf1iJs7heFbyFa9p1iwzZKYa4qkNEBJVt4V0ck0XdTQO5WFVepriUOJDf8m/YpCoZldFUtVwYmuaJA=="; }; dependencies = [ sources."@emmetio/abbreviation-2.2.2" @@ -114966,7 +115057,7 @@ in sources."strip-indent-3.0.0" sources."svelte-3.38.3" sources."svelte-preprocess-4.7.4" - sources."svelte2tsx-0.4.4" + sources."svelte2tsx-0.4.5" sources."to-regex-range-5.0.1" sources."tslib-2.3.0" sources."typescript-4.3.5" @@ -118449,7 +118540,7 @@ in sha512 = "N+ENrder8z9zJQF9UM7K3/1LcfVW60omqeyaQsu6GN1BGdCgPm8gdHssn7WRD7vx+ABKc82IE1+pJyHOPkwe+w=="; }; dependencies = [ - sources."@types/node-16.4.10" + sources."@types/node-16.4.12" sources."@types/unist-2.0.6" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -118816,6 +118907,135 @@ in bypassCache = true; reconstructLock = true; }; + vercel = nodeEnv.buildNodePackage { + name = "vercel"; + packageName = "vercel"; + version = "23.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vercel/-/vercel-23.0.1.tgz"; + sha512 = "gY9D74WG9OL7TB/z1g4fypxq3eSiWtFMFx1gIbNf0DXIHGxWG+eczhGxa3IiZ14HhrebTfiPnM8O26AL81MVrQ=="; + }; + dependencies = [ + sources."@sindresorhus/is-0.14.0" + sources."@szmarczak/http-timer-1.1.2" + sources."@types/node-16.4.12" + sources."@vercel/build-utils-2.11.1" + sources."@vercel/go-1.2.2" + sources."@vercel/node-1.11.1" + sources."@vercel/python-2.0.4" + sources."@vercel/ruby-1.2.6" + (sources."ansi-align-3.0.0" // { + dependencies = [ + sources."string-width-3.1.0" + ]; + }) + sources."ansi-regex-4.1.0" + sources."ansi-styles-4.3.0" + sources."arg-4.1.3" + sources."boxen-4.2.0" + sources."buffer-from-1.1.2" + (sources."cacheable-request-6.1.0" // { + dependencies = [ + sources."get-stream-5.2.0" + sources."lowercase-keys-2.0.0" + ]; + }) + sources."camelcase-5.3.1" + sources."chalk-3.0.0" + sources."ci-info-2.0.0" + sources."cli-boxes-2.2.1" + sources."clone-response-1.0.2" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."configstore-5.0.1" + sources."crypto-random-string-2.0.0" + sources."decompress-response-3.3.0" + sources."deep-extend-0.6.0" + sources."defer-to-connect-1.1.3" + sources."diff-4.0.2" + sources."dot-prop-5.3.0" + sources."duplexer3-0.1.4" + sources."emoji-regex-7.0.3" + sources."end-of-stream-1.4.4" + sources."escape-goat-2.1.1" + sources."get-stream-4.1.0" + sources."global-dirs-2.1.0" + sources."got-9.6.0" + sources."graceful-fs-4.2.6" + sources."has-flag-4.0.0" + sources."has-yarn-2.1.0" + sources."http-cache-semantics-4.1.0" + sources."import-lazy-2.1.0" + sources."imurmurhash-0.1.4" + sources."ini-1.3.7" + sources."is-ci-2.0.0" + sources."is-fullwidth-code-point-2.0.0" + sources."is-installed-globally-0.3.2" + sources."is-npm-4.0.0" + sources."is-obj-2.0.0" + sources."is-path-inside-3.0.3" + sources."is-typedarray-1.0.0" + sources."is-yarn-global-0.3.0" + sources."json-buffer-3.0.0" + sources."keyv-3.1.0" + sources."latest-version-5.1.0" + sources."lowercase-keys-1.0.1" + sources."make-dir-3.1.0" + sources."make-error-1.3.6" + sources."mimic-response-1.0.1" + sources."minimist-1.2.5" + sources."normalize-url-4.5.1" + sources."once-1.4.0" + sources."p-cancelable-1.1.0" + sources."package-json-6.5.0" + sources."prepend-http-2.0.0" + sources."pump-3.0.0" + sources."pupa-2.1.1" + sources."rc-1.2.8" + sources."registry-auth-token-4.2.1" + sources."registry-url-5.1.0" + sources."responselike-1.0.2" + sources."semver-6.3.0" + sources."semver-diff-3.1.1" + sources."signal-exit-3.0.3" + sources."source-map-0.6.1" + sources."source-map-support-0.5.19" + (sources."string-width-4.2.2" // { + 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-json-comments-2.0.1" + sources."supports-color-7.2.0" + sources."term-size-2.2.1" + sources."to-readable-stream-1.0.0" + sources."ts-node-8.9.1" + sources."type-fest-0.8.1" + sources."typedarray-to-buffer-3.1.5" + sources."typescript-3.9.3" + sources."unique-string-2.0.0" + sources."update-notifier-4.1.0" + sources."url-parse-lax-3.0.0" + sources."widest-line-3.1.0" + sources."wrappy-1.0.2" + sources."write-file-atomic-3.0.3" + sources."xdg-basedir-4.0.0" + sources."yn-3.1.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "The command-line interface for Vercel"; + homepage = "https://vercel.com"; + license = "Apache-2.0"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; vim-language-server = nodeEnv.buildNodePackage { name = "vim-language-server"; packageName = "vim-language-server"; @@ -119245,7 +119465,7 @@ in sources."buffer-from-1.1.2" sources."call-bind-1.0.2" sources."camelcase-6.2.0" - sources."caniuse-lite-1.0.30001248" + sources."caniuse-lite-1.0.30001249" (sources."chalk-4.1.2" // { dependencies = [ sources."supports-color-7.2.0" @@ -119285,7 +119505,7 @@ in sources."domelementtype-2.2.0" sources."domhandler-4.2.0" sources."domutils-2.7.0" - sources."electron-to-chromium-1.3.795" + sources."electron-to-chromium-1.3.796" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" sources."enhanced-resolve-5.8.2" @@ -120803,7 +121023,7 @@ in sources."is-fullwidth-code-point-3.0.0" sources."string-width-4.2.2" sources."strip-ansi-6.0.0" - sources."yargs-17.0.1" + sources."yargs-17.1.0" ]; }) sources."brace-expansion-1.1.11" @@ -121610,11 +121830,11 @@ in sources."ajv-keywords-3.5.2" sources."browserslist-4.16.7" sources."buffer-from-1.1.2" - sources."caniuse-lite-1.0.30001248" + sources."caniuse-lite-1.0.30001249" sources."chrome-trace-event-1.0.3" sources."colorette-1.2.2" sources."commander-2.20.3" - sources."electron-to-chromium-1.3.795" + sources."electron-to-chromium-1.3.796" sources."enhanced-resolve-5.8.2" sources."es-module-lexer-0.7.1" sources."escalade-3.1.1" @@ -122416,7 +122636,7 @@ in sources."bep53-range-1.1.1" sources."binary-search-1.3.6" sources."bitfield-4.0.0" - (sources."bittorrent-dht-10.0.1" // { + (sources."bittorrent-dht-10.0.2" // { dependencies = [ sources."debug-4.3.2" sources."ms-2.1.2" @@ -122429,7 +122649,7 @@ in ]; }) sources."bittorrent-peerid-1.3.4" - (sources."bittorrent-protocol-3.4.2" // { + (sources."bittorrent-protocol-3.4.3" // { dependencies = [ sources."debug-4.3.2" sources."ms-2.1.2" @@ -122490,7 +122710,7 @@ in }) sources."core-util-is-1.0.2" sources."cpus-1.0.3" - sources."create-torrent-4.7.1" + sources."create-torrent-4.7.2" sources."debug-2.6.9" sources."decompress-response-3.3.0" sources."define-lazy-prop-2.0.0" @@ -122592,7 +122812,7 @@ in sources."once-1.4.0" sources."open-8.2.1" sources."package-json-versionify-1.0.4" - (sources."parse-torrent-9.1.3" // { + (sources."parse-torrent-9.1.4" // { dependencies = [ sources."decompress-response-6.0.0" sources."mimic-response-3.1.0" @@ -122668,7 +122888,7 @@ in sources."thunky-0.1.0" sources."timeout-refresh-1.0.3" sources."to-arraybuffer-1.0.1" - (sources."torrent-discovery-9.4.2" // { + (sources."torrent-discovery-9.4.4" // { dependencies = [ sources."debug-4.3.2" sources."ms-2.1.2" @@ -122689,13 +122909,13 @@ in sources."ms-2.1.2" ]; }) - sources."ut_pex-3.0.1" + sources."ut_pex-3.0.2" sources."utf-8-validate-5.0.5" sources."util-deprecate-1.0.2" sources."utp-native-2.5.3" sources."videostream-3.2.2" sources."vlc-command-1.2.0" - (sources."webtorrent-1.3.4" // { + (sources."webtorrent-1.3.7" // { dependencies = [ sources."debug-4.3.2" sources."decompress-response-6.0.0" @@ -122712,7 +122932,7 @@ in sources."xmlbuilder-11.0.1" sources."xmldom-0.1.31" sources."y18n-5.0.8" - sources."yargs-17.0.1" + sources."yargs-17.1.0" sources."yargs-parser-20.2.9" ]; buildInputs = globalBuildInputs; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/GitPython/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/GitPython/default.nix index bd3084ae91..40191722ab 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/GitPython/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/GitPython/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage -, fetchPypi -, isPy27 +, fetchFromGitHub , substituteAll , git , gitdb @@ -11,13 +10,15 @@ }: buildPythonPackage rec { - pname = "GitPython"; - version = "3.1.19"; - disabled = isPy27; + pname = "gitpython"; + version = "3.1.20"; + disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - sha256 = "0lqf5plm02aw9zl73kffk7aa4mp4girm3f2yfk27nmmmjsdh7x0q"; + src = fetchFromGitHub { + owner = "gitpython-developers"; + repo = "GitPython"; + rev = version; + sha256 = "1ygrxn8br2ff87j02ibijxzxa0ax9lgjdviwddslqxiarfggik9h"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/adax/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/adax/default.nix new file mode 100644 index 0000000000..849d0d9cf8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/adax/default.nix @@ -0,0 +1,37 @@ +{ lib +, aiohttp +, async-timeout +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +}: + +buildPythonPackage rec { + pname = "adax"; + version = "0.1.0"; + disabled = pythonOlder "3.5"; + + src = fetchFromGitHub { + owner = "Danielhiversen"; + repo = "pyadax"; + rev = version; + sha256 = "06qk8xbv8lsaabdpi6pclnbkp3vmb4k18spahldazqj8235ii237"; + }; + + propagatedBuildInputs = [ + aiohttp + async-timeout + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "adax" ]; + + meta = with lib; { + description = "Python module to communicate with Adax"; + homepage = "https://github.com/Danielhiversen/pyAdax"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mdformat/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mdformat/default.nix index 780cafa599..d66d6fa1fa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mdformat/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mdformat/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "mdformat"; - version = "0.7.7"; + version = "0.7.8"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "executablebooks"; repo = pname; rev = version; - sha256 = "sha256-1qwluHxZnSuyNJENzeJzkuhIQN5njTOch2Wz45J0qRI="; + sha256 = "0zvgz2c517ig31hcrf05gv4h68zpqk56asnmwx072ld8gk2ff8ag"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/notmuch/2.nix b/third_party/nixpkgs/pkgs/development/python-modules/notmuch/2.nix index bde039836f..bd195b52d4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/notmuch/2.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/notmuch/2.nix @@ -10,7 +10,7 @@ buildPythonPackage { pname = "notmuch2"; inherit (notmuch) version src; - sourceRoot = "${notmuch.src.name}/bindings/python-cffi"; + sourceRoot = "notmuch-${notmuch.version}/bindings/python-cffi"; buildInputs = [ python notmuch cffi ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/open-garage/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/open-garage/default.nix new file mode 100644 index 0000000000..cbf9ee3087 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/open-garage/default.nix @@ -0,0 +1,37 @@ +{ lib +, aiohttp +, async-timeout +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +}: + +buildPythonPackage rec { + pname = "open-garage"; + version = "0.1.5"; + disabled = pythonOlder "3.5"; + + src = fetchFromGitHub { + owner = "Danielhiversen"; + repo = "pyOpenGarage"; + rev = version; + sha256 = "1iqcqkbb1ik5lmsvwgy6i780x6y3wlm1gx257anxyvp1b21gm24p"; + }; + + propagatedBuildInputs = [ + aiohttp + async-timeout + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "opengarage" ]; + + meta = with lib; { + description = "Python module to communicate with opengarage.io"; + homepage = "https://github.com/Danielhiversen/pyOpenGarage"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyprosegur/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyprosegur/default.nix new file mode 100644 index 0000000000..d2d5102465 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyprosegur/default.nix @@ -0,0 +1,39 @@ +{ lib +, aiohttp +, backoff +, buildPythonPackage +, click +, fetchFromGitHub +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pyprosegur"; + version = "0.0.5"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "dgomes"; + repo = pname; + rev = version; + sha256 = "0bpzxm8s548fw6j36brp7bcx9481x2hrypcw3yyg4ihsjhka5qln"; + }; + + propagatedBuildInputs = [ + aiohttp + backoff + click + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "pyprosegur" ]; + + meta = with lib; { + description = "Python module to communicate with Prosegur Residential Alarms"; + homepage = "https://github.com/dgomes/pyprosegur"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix index 57fe412565..1e9f262e3b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix @@ -5,13 +5,13 @@ buildGoPackage rec { pname = "tfsec"; - version = "0.55.1"; + version = "0.56.0"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "0s18hfy1gnnvhppvapj8n066pb0fc7w3sm0zm0mzjd58h11x0bbr"; + sha256 = "0kv9g11jgbrbb50qhlfznw9i473gw8vadrrlkvki6y3cfcavghkv"; }; goPackagePath = "github.com/aquasecurity/tfsec"; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix index 677b31063a..ec479c1389 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "sbt"; - version = "1.5.4"; + version = "1.5.5"; src = fetchurl { url = "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz"; - sha256 = "035jl4czx9ixl12z874bksq5wxdnajxr06cl1yvfj2v92yx3l5wf"; + sha256 = "1jdknan2gckkfl79pzshgb4009xn2y3nlp0ws1xd47n9yl6dbz60"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/butane/default.nix b/third_party/nixpkgs/pkgs/development/tools/butane/default.nix index f5eafd4a90..ccb011360e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/butane/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/butane/default.nix @@ -4,13 +4,13 @@ with lib; buildGoModule rec { pname = "butane"; - version = "0.13.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "coreos"; repo = "butane"; rev = "v${version}"; - sha256 = "0z1cq43dnj73k0idjhc310h00a1mryk2297w3yy6k1sa95swlz9m"; + sha256 = "sha256-wrz9+McHW2NNMsB3uOZIceykYBlSgl2WErAT8bMlkXo="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/development/tools/doctl/default.nix b/third_party/nixpkgs/pkgs/development/tools/doctl/default.nix index aa7c7c8ca0..74cb56c201 100644 --- a/third_party/nixpkgs/pkgs/development/tools/doctl/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/doctl/default.nix @@ -10,13 +10,12 @@ buildGoModule rec { subPackages = [ "cmd/doctl" ]; - buildFlagsArray = let t = "github.com/digitalocean/doctl"; in '' - -ldflags= - -X ${t}.Major=${lib.versions.major version} - -X ${t}.Minor=${lib.versions.minor version} - -X ${t}.Patch=${lib.versions.patch version} - -X ${t}.Label=release - ''; + ldflags = let t = "github.com/digitalocean/doctl"; in [ + "-X ${t}.Major=${lib.versions.major version}" + "-X ${t}.Minor=${lib.versions.minor version}" + "-X ${t}.Patch=${lib.versions.patch version}" + "-X ${t}.Label=release" + ]; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/esbuild/default.nix b/third_party/nixpkgs/pkgs/development/tools/esbuild/default.nix index 59e79a6ee1..85d311d7ae 100644 --- a/third_party/nixpkgs/pkgs/development/tools/esbuild/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/esbuild/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "esbuild"; - version = "0.12.17"; + version = "0.12.18"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - sha256 = "sha256-wZOBjNOgGmwIQNCrhzwGPmI/fW/yZiDqq8l4oSDTvZs="; + sha256 = "sha256-sq5gdsrcakghd71+nXrtI980mlA6+GZW36tJkJkaJ2U="; }; vendorSha256 = "sha256-2ABWPqhK2Cf4ipQH7XvRrd+ZscJhYPc3SV2cGT0apdg="; diff --git a/third_party/nixpkgs/pkgs/development/tools/jbang/default.nix b/third_party/nixpkgs/pkgs/development/tools/jbang/default.nix index f179ef13ba..c09344d8d5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/jbang/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/jbang/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, fetchzip, jdk, makeWrapper, coreutils, curl }: stdenv.mkDerivation rec { - version = "0.77.0"; + version = "0.78.0"; pname = "jbang"; src = fetchzip { url = "https://github.com/jbangdev/jbang/releases/download/v${version}/${pname}-${version}.tar"; - sha256 = "sha256-EOseHe0CrSzOI/NgPk0Q24nzeOSV6X8GVFNPstou/Ng="; + sha256 = "sha256-03CuKNQtKdhD6fFYfsmeNR18oRGL5vWG7Lb+srNw8XU="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/editorconfig-checker/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/editorconfig-checker/default.nix index b4359bb186..37f455e91b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/editorconfig-checker/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/editorconfig-checker/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; - buildFlagsArray = [ "-ldflags=-X main.version=${version}" ]; + ldflags = [ "-X main.version=${version}" ]; postInstall = '' installManPage docs/editorconfig-checker.1 diff --git a/third_party/nixpkgs/pkgs/development/tools/packer/default.nix b/third_party/nixpkgs/pkgs/development/tools/packer/default.nix index c48cf727d2..7b86f8da10 100644 --- a/third_party/nixpkgs/pkgs/development/tools/packer/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/packer/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { subPackages = [ "." ]; - buildFlagsArray = [ "-ldflags=-s -w" ]; + ldflags = [ "-s" "-w" ]; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/tychus/default.nix b/third_party/nixpkgs/pkgs/development/tools/tychus/default.nix index 8b330b36ea..3838dfdc48 100644 --- a/third_party/nixpkgs/pkgs/development/tools/tychus/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/tychus/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation ]; - buildFlags = [ "--tags" "release" ]; + tags = [ "release" ]; meta = { description = "Command line utility to live-reload your application"; diff --git a/third_party/nixpkgs/pkgs/games/terraria-server/default.nix b/third_party/nixpkgs/pkgs/games/terraria-server/default.nix index b5a8c7e486..e325319e39 100644 --- a/third_party/nixpkgs/pkgs/games/terraria-server/default.nix +++ b/third_party/nixpkgs/pkgs/games/terraria-server/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { urlVersion = lib.replaceChars [ "." ] [ "" ] version; src = fetchurl { - url = "https://terraria.org/system/dedicated_servers/archives/000/000/046/original/terraria-server-${urlVersion}.zip"; + url = "https://terraria.org/api/download/pc-dedicated-server/terraria-server-${urlVersion}.zip"; sha256 = "0qm4pbm1d9gax47fk4zhw9rcxvajxs36w7dghirli89i994r7g8j"; }; @@ -14,17 +14,21 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoPatchelfHook unzip ]; installPhase = '' + runHook preInstall + mkdir -p $out/bin cp -r Linux $out/ chmod +x "$out/Linux/TerrariaServer.bin.x86_64" ln -s "$out/Linux/TerrariaServer.bin.x86_64" $out/bin/TerrariaServer + + runHook postInstall ''; meta = with lib; { homepage = "https://terraria.org"; - description = - "Dedicated server for Terraria, a 2D action-adventure sandbox"; + description = "Dedicated server for Terraria, a 2D action-adventure sandbox"; platforms = [ "x86_64-linux" ]; license = licenses.unfree; + maintainers = with maintainers; [ ncfavier ]; }; } diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix b/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix index 0a1cd947e6..d55d2ed060 100644 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix @@ -77,12 +77,12 @@ final: prev: ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2021-08-04"; + version = "2021-08-06"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "9eb39348e928e6a89938784e67ba4168c5a295c0"; - sha256 = "18j5zpkkir9yxcvmyggglh76fzny1i9z6pkj2bdszvz8rxw8z88y"; + rev = "10f984673c51d2affbf8dc69d79a6280d7b69060"; + sha256 = "1gj2hg9qpkxnqks395a4rvgy40a7qg4q260xa8a8zymdf476h57f"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -281,12 +281,12 @@ final: prev: barbar-nvim = buildVimPluginFrom2Nix { pname = "barbar-nvim"; - version = "2021-08-03"; + version = "2021-08-06"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "f677f1d93be06c41eaabc87d845cdd5bd46a259f"; - sha256 = "1crd8gyzqgycbcb9aipn31kphz3j1y1rlzqivfvgk2zqf550dqis"; + rev = "fbe62f62bbe16c871073868fe29d7ffdd3d1251e"; + sha256 = "14hzbpgkalia7j42zr0gnddbh2rnxv149xvlzl39wkzjk7gxjz0y"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; @@ -425,12 +425,12 @@ final: prev: chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2021-08-05"; + version = "2021-08-06"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "681950778d7b4e18cb28d5cc7ba54bc480aad232"; - sha256 = "11g7a86sprfdch68xwabkfr5gv9jpmji587cw1h5cabbzxslrvcg"; + rev = "7db60eee751787035a3f152040fdf6b48104453e"; + sha256 = "08hqx031gd8sd7lvzx4n429311p3nihhp1k1knsq3yn8yfrj915m"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -1667,12 +1667,12 @@ final: prev: friendly-snippets = buildVimPluginFrom2Nix { pname = "friendly-snippets"; - version = "2021-08-04"; + version = "2021-08-05"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "97942a726bf7e4851d8d1812e910e8f9d489f909"; - sha256 = "1mqgy6jps6g69x1jj3x60hcr3szpfnwvvyjyafqbd3wpc313pnwq"; + rev = "bf2ebdfba23a10a7b9dea62b23dfaa7a1bc0852d"; + sha256 = "100iif4is145fgr3hzqk4k9d3jhdl3lh6nbl4n7xrahkh9fxw6s8"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -1871,12 +1871,12 @@ final: prev: gitsigns-nvim = buildVimPluginFrom2Nix { pname = "gitsigns-nvim"; - version = "2021-08-03"; + version = "2021-08-05"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "f8786ea3bfe69fccadec6ef7fa64d4188f788729"; - sha256 = "028l9x94yi5ffjp44vsjyyalxnax0691aiiy22c143pcd5wv5w3q"; + rev = "8d284060170bcc96987b3c431a7c8fa3aef9e1cc"; + sha256 = "1x2pwb8d8azfmpfpyhx9anfh6ji2viwi98zfgqp12q7bq9rvf9h3"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -2231,12 +2231,12 @@ final: prev: indent-blankline-nvim = buildVimPluginFrom2Nix { pname = "indent-blankline-nvim"; - version = "2021-08-04"; + version = "2021-08-05"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "indent-blankline.nvim"; - rev = "f452ba25ecae318c591b4e6983aa5bd9ac6fd8e6"; - sha256 = "13aqr4gigpjjz0g25y8q48hb0sfa6xxgp0lr8hk1ykv8w0nwlgra"; + rev = "134a1ace3274e14cf3f2c9b845f6a62c58d2f2de"; + sha256 = "1n3cbfvm4jdiwhv2hc6379xqjpjpdfzvz9zs2zpb1pj9qjdznqcc"; }; meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/"; }; @@ -2592,12 +2592,12 @@ final: prev: lightline-bufferline = buildVimPluginFrom2Nix { pname = "lightline-bufferline"; - version = "2021-06-09"; + version = "2021-08-05"; src = fetchFromGitHub { owner = "mengelbrecht"; repo = "lightline-bufferline"; - rev = "ce6b2e1e09654af34a80af774879eac4708cc11e"; - sha256 = "0cv5845d1gg9mv5pcp8c9afydvgihgfyk7ibjr3fgkqacwcfzjmy"; + rev = "2d2e57009a613c3c6cb7a2112d822ef91024cc38"; + sha256 = "066x2hkav2k83rjdnv3hmmm7fx4rrp4ab8704sc7p57q965kpwgc"; }; meta.homepage = "https://github.com/mengelbrecht/lightline-bufferline/"; }; @@ -2712,12 +2712,12 @@ final: prev: lsp_signature-nvim = buildVimPluginFrom2Nix { pname = "lsp_signature-nvim"; - version = "2021-08-04"; + version = "2021-08-05"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "444f5e0a27ca58040c33715be8c3b6051db17230"; - sha256 = "0rijkdsnxdkyrrpib0qlszjkkx33cm3nb9spcmjrcqi6674kyq88"; + rev = "04126aa17cbe863a4fe8ca43653cd9ef70f29c18"; + sha256 = "0w2jxbbmgdlh9hakzjy2i229qlcj7krh1xb7b1ds7y27prb1h144"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; @@ -3144,12 +3144,12 @@ final: prev: neco-vim = buildVimPluginFrom2Nix { pname = "neco-vim"; - version = "2021-08-03"; + version = "2021-08-05"; src = fetchFromGitHub { owner = "Shougo"; repo = "neco-vim"; - rev = "fb97a98717450fca16e5d2f8db667f7df227ba3c"; - sha256 = "1d0l7d2mlm0dq6m13mr8958qc257bhhgl0y4xilpdkfgx35vir34"; + rev = "ec50b3cbb4537625c2aaba7601232a53ccd779aa"; + sha256 = "0k5l9phs211xw6c3q9q52x6m6gfhk4b2fxhyr3m19mghbzmichha"; }; meta.homepage = "https://github.com/Shougo/neco-vim/"; }; @@ -3180,12 +3180,12 @@ final: prev: neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2021-07-23"; + version = "2021-08-05"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "b676afbf57bd3fb256a7a45605cac06407eff5a1"; - sha256 = "1ln4sqj00xw2dnn3gwshxdzaq5gaknbs59cksrr7i7mj902lqr8v"; + rev = "1ff0099c62dad62f1126dba15b61b35d54aa607f"; + sha256 = "18xczksv70v18xh6f40d5bad2f890vm8gyg5xqh7sh2vh9jdg0jz"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; }; @@ -3708,12 +3708,12 @@ final: prev: nvim-highlite = buildVimPluginFrom2Nix { pname = "nvim-highlite"; - version = "2021-08-04"; + version = "2021-08-05"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "9465c24cb8f4293569f6a4e937a3a38a4416a072"; - sha256 = "0l484w17bb0kdk1k7dhxj5322a8xsh374ma6yci92jh7sv3dp60f"; + rev = "929cb313e90589576348c3a2e9a18bac8a56999c"; + sha256 = "0j48zy517px40w119xad97zja0p7fspapnd1n70w3lq9ank0l7a1"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; @@ -3768,12 +3768,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2021-08-01"; + version = "2021-08-05"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "4bcc485e2e6ccb4ed7bdd9f1e12c9c4ad6fe1f0e"; - sha256 = "18csqavwmdz7yn6j1wp9ypmpdkw6147xvn4gmd50wkphfh74bc67"; + rev = "662159eeb112c076d90b2c3fe799f16a8165e4a6"; + sha256 = "0jazw69444zcvvzj7j8k2zjqwyymgcsvz42pxq10ll58apmjrzri"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -3804,12 +3804,12 @@ final: prev: nvim-notify = buildVimPluginFrom2Nix { pname = "nvim-notify"; - version = "2021-08-04"; + version = "2021-08-05"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-notify"; - rev = "bc18fb4552f051639eade5318f1d538ffe0302f5"; - sha256 = "1l5fi8c59zqyjgkikbrxas4klfa11j17bl72qxg3kj8isnfalspj"; + rev = "14029645caaecaa4392a6f89bf087a4aec5672cd"; + sha256 = "0pviz0dh519yaddrb3lrsa8pg1q4dp4h2a2chzh2nnwhr7973qjr"; }; meta.homepage = "https://github.com/rcarriga/nvim-notify/"; }; @@ -3982,6 +3982,18 @@ final: prev: meta.homepage = "https://github.com/roxma/nvim-yarp/"; }; + nvim_context_vt = buildVimPluginFrom2Nix { + pname = "nvim_context_vt"; + version = "2021-08-03"; + src = fetchFromGitHub { + owner = "haringsrob"; + repo = "nvim_context_vt"; + rev = "7e93fc59c2af9e36d64a230ec77c1ef1ebe47c57"; + sha256 = "0mgafpcx5mz9hw7pv3a4v74kdikcrf9mv10mqnp5pg71m0f6sjmn"; + }; + meta.homepage = "https://github.com/haringsrob/nvim_context_vt/"; + }; + nvimdev-nvim = buildVimPluginFrom2Nix { pname = "nvimdev-nvim"; version = "2019-10-09"; @@ -4092,12 +4104,12 @@ final: prev: packer-nvim = buildVimPluginFrom2Nix { pname = "packer-nvim"; - version = "2021-08-01"; + version = "2021-08-05"; src = fetchFromGitHub { owner = "wbthomason"; repo = "packer.nvim"; - rev = "2794f0767920c884736b746d1c0824cc55874f4b"; - sha256 = "19cwjm98nq0f9z0kxc8l4350pkaw3m2dv5wb7nlwcz0m9w3dri0w"; + rev = "a6901b9d15dc17be94a2caf6b2fb8d1323278a74"; + sha256 = "0lyq8pi0c9665gjhg3wzx8889xq649fjld1cbv5bm2znmq000c8j"; }; meta.homepage = "https://github.com/wbthomason/packer.nvim/"; }; @@ -4887,12 +4899,12 @@ final: prev: sql-nvim = buildVimPluginFrom2Nix { pname = "sql-nvim"; - version = "2021-07-19"; + version = "2021-08-05"; src = fetchFromGitHub { owner = "tami5"; repo = "sql.nvim"; - rev = "9983108bc9941af842d3b847b60564d180fc8e4b"; - sha256 = "1f1f1v107w61b86pdrs9qvchyg286nif31c5cp3yx6rq22fynbgd"; + rev = "527a306000c02f81075045d461349efcfa26c022"; + sha256 = "1v99ibx1ypijpm1icy0lsyfvf41rz0zhv18rvhrinyphr0jl546j"; }; meta.homepage = "https://github.com/tami5/sql.nvim/"; }; @@ -4983,12 +4995,12 @@ final: prev: swift-vim = buildVimPluginFrom2Nix { pname = "swift-vim"; - version = "2021-05-30"; + version = "2021-08-05"; src = fetchFromGitHub { owner = "keith"; repo = "swift.vim"; - rev = "7ef452b47f14a2bfed26324793777cf12d2a8d78"; - sha256 = "0s12iv8vmqp8yr8fg7a6yf73kgq84i9zy18fhgb0jcc6cwwwz3iq"; + rev = "e83ca052e88805b8b20bc2558e7995461665e306"; + sha256 = "1in7dz0h9a4phw57a3fk7h2lmn3hrcn17vaqjimpp7hwlc160467"; }; meta.homepage = "https://github.com/keith/swift.vim/"; }; @@ -5152,12 +5164,12 @@ final: prev: telescope-frecency-nvim = buildVimPluginFrom2Nix { pname = "telescope-frecency-nvim"; - version = "2021-08-04"; + version = "2021-08-05"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-frecency.nvim"; - rev = "31e8158d54ce945dc416b1f53df827aa3c096c55"; - sha256 = "1q2bf21gymjjx603159x59sg1ahwgsqais6q5laz4cpcwmxmwq7f"; + rev = "459041fb42d81c65444b147d25b1e28b0c8ac8f9"; + sha256 = "0n4bv22azqgvqk00dcnxzafpx1mkdfm6ds3w6pyn0mflkfninfb7"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/"; }; @@ -5321,12 +5333,12 @@ final: prev: todo-comments-nvim = buildVimPluginFrom2Nix { pname = "todo-comments-nvim"; - version = "2021-07-11"; + version = "2021-08-05"; src = fetchFromGitHub { owner = "folke"; repo = "todo-comments.nvim"; - rev = "4a27e05519827ba1594d5ce3fde874040f005bfe"; - sha256 = "0g6dxyd7vh89rg4xfdl20djfdcv1scq44mvxd3imzb7yhrhdpa95"; + rev = "808a2e524b3720804716a99fd900986b9d727d4d"; + sha256 = "1j1ls4d6c3shbm9pd0b6lwmccxsvlr8j12c3fhn9q6dizkir08qx"; }; meta.homepage = "https://github.com/folke/todo-comments.nvim/"; }; @@ -5346,12 +5358,12 @@ final: prev: tokyonight-nvim = buildVimPluginFrom2Nix { pname = "tokyonight-nvim"; - version = "2021-07-21"; + version = "2021-08-05"; src = fetchFromGitHub { owner = "folke"; repo = "tokyonight.nvim"; - rev = "0ee0bcf14d8c7c70081a0e9967c211121c4300c7"; - sha256 = "0rkw544dzgyp76ag3zrh8d3n0mri5c0cjpy8mvbfpgyj87w18m8d"; + rev = "a5b3cbe750ed6a05a018ac81782bb01de512a6c9"; + sha256 = "1zggbj1xkqigc9rk6mm6jdwk67kcq1avrrq3hxy7jkfc11ynbl91"; }; meta.homepage = "https://github.com/folke/tokyonight.nvim/"; }; @@ -5394,12 +5406,12 @@ final: prev: trouble-nvim = buildVimPluginFrom2Nix { pname = "trouble-nvim"; - version = "2021-07-22"; + version = "2021-08-05"; src = fetchFromGitHub { owner = "folke"; repo = "trouble.nvim"; - rev = "169b2ec3a4d0cac01f22cc8f7332f1d0a11f1fa4"; - sha256 = "08r1ivzw6v5bfyhd7cy6kysryd123f68aa3kpamzy168ixvihbii"; + rev = "51dd9175eb506b026189c70f81823dfa77defe86"; + sha256 = "0cd3xiiwsqivy8vx408wdz622i7kcvxw6whmkm1dcw6lnsp4bcg1"; }; meta.homepage = "https://github.com/folke/trouble.nvim/"; }; @@ -5430,12 +5442,12 @@ final: prev: twilight-nvim = buildVimPluginFrom2Nix { pname = "twilight-nvim"; - version = "2021-07-17"; + version = "2021-08-05"; src = fetchFromGitHub { owner = "folke"; repo = "twilight.nvim"; - rev = "f722fa24411d0423a3d2daf6f1b5f8b11df9db2b"; - sha256 = "0k2vbhs960h346w37ky2mpv1syzjxi19zl9zmnvlsy6annqd892x"; + rev = "0ac66e85f2d8d7c6eb7d263ffc39fa19b56d882f"; + sha256 = "0a0bbj9lwpxwql8m56qxr1qjvfb3qb1cj6knfhdvgaskilv5mlg1"; }; meta.homepage = "https://github.com/folke/twilight.nvim/"; }; @@ -6102,12 +6114,12 @@ final: prev: vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2021-07-27"; + version = "2021-08-06"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "5fa131dc95a7b3e03fa1307802b3a43419571921"; - sha256 = "10viqhmyvw8lik53gbslfxfsv36f1vl8qi0vzn7zi6waqdrr3n79"; + rev = "cf229cd88ecf9ee9e157d6737770b289de24d3bd"; + sha256 = "06cn9z7p39qvp34533azj2xc3jyj6bi8kb4aasq52awizdg3flvz"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -6882,12 +6894,12 @@ final: prev: vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2021-08-03"; + version = "2021-08-05"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "7a087725eebedf4c23b621d9a25ca6fac9a0a985"; - sha256 = "0gvgi6sp6imjf865jfj5di8zvivm8hsfpg2qjjx0q4kss821yznm"; + rev = "e9f913ff8a6f76062e0aa95b60d740ec690f6f4f"; + sha256 = "0i2j15yqndzfisf7x1cdszs7s32gh57wravgar3pmk13ffcx4n0s"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -7748,12 +7760,12 @@ final: prev: vim-maktaba = buildVimPluginFrom2Nix { pname = "vim-maktaba"; - version = "2021-08-03"; + version = "2021-08-05"; src = fetchFromGitHub { owner = "google"; repo = "vim-maktaba"; - rev = "92b8483abb3b128b2a64782c60c2a236b2484a99"; - sha256 = "1prx8hhjdh4bs1c25jxjis151d1kg3vxdy5f9scwgas9a79ii3lw"; + rev = "339ab52b488b2d9ced5dde5ebd734b95bc6500f3"; + sha256 = "1191bdrlc2sxwfick7y82cvl2hsxai32sdspxpwskbigyzsd6xks"; }; meta.homepage = "https://github.com/google/vim-maktaba/"; }; @@ -9923,12 +9935,12 @@ final: prev: which-key-nvim = buildVimPluginFrom2Nix { pname = "which-key-nvim"; - version = "2021-07-06"; + version = "2021-08-05"; src = fetchFromGitHub { owner = "folke"; repo = "which-key.nvim"; - rev = "dc9c3be7acae2a486c117f5a9f6ada62b2243336"; - sha256 = "105fnr3qa64izllb9s4r6lsg5mfddiap784j7zz7gh3znpy43n3m"; + rev = "b582c9d78f0d105041ed29ec3a8ee11d98ddfd50"; + sha256 = "00k4x121v5zmd70xn24ipiqnpvzlvbv5p089mxsd0wpkng3q31ks"; }; meta.homepage = "https://github.com/folke/which-key.nvim/"; }; @@ -10056,12 +10068,12 @@ final: prev: YouCompleteMe = buildVimPluginFrom2Nix { pname = "YouCompleteMe"; - version = "2021-07-28"; + version = "2021-08-05"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "8c6081c79b2250467c45f475332e3a3a33028467"; - sha256 = "1m0yjngysk0hngrp7awc7m5ahg39yb6hg17zd2fj0ywcf18fw7kf"; + rev = "518275b599ab6dd7844c24022f6aec505fb4b07c"; + sha256 = "0wkd83xlzfbk3h19gn3jhp6lpkb1wnxrhcdnczhdwhy81lizfq4w"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix b/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix index af0c6d4c80..669ca2cb9e 100644 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix @@ -651,7 +651,7 @@ self: super: { libiconv ]; - cargoSha256 = "sha256-E16fwBb9ZDRrcs+rZVKG0UESDqrVIcybr+kbFIxrS1o="; + cargoSha256 = "sha256-wYxUo9zfflU7RTsTb7W9wc/WBsXhz3OLjC8CwUkRRiE="; }; in '' diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names b/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names index d74ebb3601..5f75e705cb 100644 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names @@ -194,6 +194,7 @@ guns/vim-clojure-highlight guns/vim-clojure-static guns/vim-sexp guns/xterm-color-table.vim +haringsrob/nvim_context_vt hashivim/vim-packer hashivim/vim-terraform hashivim/vim-vagrant diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/extrace/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/extrace/default.nix index 8a02d9c67b..1eac5997bf 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/extrace/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/extrace/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "extrace"; - version = "0.7"; + version = "0.8"; src = fetchFromGitHub { owner = "leahneukirchen"; repo = "extrace"; rev = "v${version}"; - sha256 = "0acspj3djspfvgr3ng5b61qws6v2md6b0lc5qkby10mqnfpkvq85"; + sha256 = "sha256-Kg5yzVg9sqlOCzAq/HeFUPZ89Enfkt/r7EunCfOqdA0="; }; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix index e6a03ef7df..ba8df75151 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { pname = "raspberrypi-wireless-firmware"; - version = "2021-01-28"; + version = "2021-06-28"; srcs = [ (fetchFromGitHub { @@ -16,8 +16,8 @@ stdenv.mkDerivation { name = "firmware-nonfree"; owner = "RPi-Distro"; repo = "firmware-nonfree"; - rev = "83938f78ca2d5a0ffe0c223bb96d72ccc7b71ca5"; - sha256 = "1l4zz86y2hjyvdwjy75abyjwh3wqknd71y3vh1iw5nd0hws8ranp"; + rev = "00de3194a96397c913786945ac0af1fd6fbec45b"; + sha256 = "1xnr364dkiq6gmr21lcrj23hwc0g9y5qad8dm2maij647bgzp07r"; }) ]; @@ -28,6 +28,7 @@ stdenv.mkDerivation { dontFixup = true; installPhase = '' + runHook preInstall mkdir -p "$out/lib/firmware/brcm" # Wifi firmware @@ -37,6 +38,7 @@ stdenv.mkDerivation { # Bluetooth firmware cp bluez-firmware/broadcom/*.hcd "$out/lib/firmware/brcm" + runHook postInstall ''; outputHashMode = "recursive"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix index 52fa426657..9934f51487 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config }: +{ lib, stdenv, fetchFromGitHub }: let inherit (lib) optionals; in stdenv.mkDerivation { pname = "raspberrypi-armstubs"; - version = "2020-10-08"; + version = "2021-07-05"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "tools"; - rev = "fc0e73c13865450e95edd046200e42a6e52d8256"; - sha256 = "1g6ikpjcrm5x0rk5aiwjdd8grf997qkvgamcrdxy6k9ln746h25s"; + rev = "2e59fc67d465510179155973d2b959e50a440e47"; + sha256 = "1ysdl4qldy6ldf8cm1igxjisi14xl3s2pi6cnqzpxb38sgihb1vy"; }; NIX_CFLAGS_COMPILE = [ @@ -37,13 +37,15 @@ stdenv.mkDerivation { ; installPhase = '' + runHook preInstall mkdir -vp $out/ cp -v *.bin $out/ + runHook postInstall ''; meta = with lib; { description = "Firmware related ARM stubs for the Raspberry Pi"; - homepage = https://github.com/raspberrypi/tools; + homepage = "https://github.com/raspberrypi/tools"; license = licenses.bsd3; platforms = [ "armv6l-linux" "armv7l-linux" "aarch64-linux" ]; maintainers = with maintainers; [ samueldr ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi/default.nix index 6a826f6396..29c1859121 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi/default.nix @@ -3,13 +3,13 @@ stdenvNoCC.mkDerivation rec { # NOTE: this should be updated with linux_rpi pname = "raspberrypi-firmware"; - version = "1.20210303"; + version = "1.20210805"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "firmware"; rev = version; - sha256 = "0pgiw93hq4gfph5dnwbi8w59g0f7yhmagwzam971k529mh5yl86m"; + sha256 = "1nndhjv4il42yw3pq8ni3r4nlp1m0r229fadrf4f9v51mgcg11i1"; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ipset/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/ipset/default.nix index 7b4322657e..a116aef792 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/ipset/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/ipset/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ipset"; - version = "7.14"; + version = "7.15"; src = fetchurl { url = "https://ipset.netfilter.org/${pname}-${version}.tar.bz2"; - sha256 = "sha256-JwMcNtNVkHAxzOQeZVU+mbsBPXYvzVU5L2PX6Edg+QA="; + sha256 = "sha256-ClVFqq22QBQsH4iNNmp43fhyR5mWf6IGhqcAU71iF1E="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rpi.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rpi.nix index 8ccf46b402..17d24c187d 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rpi.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rpi.nix @@ -2,8 +2,8 @@ let # NOTE: raspberrypifw & raspberryPiWirelessFirmware should be updated with this - modDirVersion = "5.10.17"; - tag = "1.20210303"; + modDirVersion = "5.10.52"; + tag = "1.20210805"; in lib.overrideDerivation (buildLinux (args // { version = "${modDirVersion}-${tag}"; @@ -12,8 +12,8 @@ lib.overrideDerivation (buildLinux (args // { src = fetchFromGitHub { owner = "raspberrypi"; repo = "linux"; - rev = "raspberrypi-kernel_${tag}-1"; - sha256 = "0ffsllayl18ka4mgp4rdy9h0da5gy1n6g0kfvinvzdzabb5wzvrx"; + rev = tag; + sha256 = "1j71xblflslfi4c3zx2srw6fahnhp3bjx4yjfqrp39kzaa41ij0b"; }; defconfig = { @@ -33,6 +33,11 @@ lib.overrideDerivation (buildLinux (args // { # | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ # ../drivers/gpu/drm/ast/ast_mode.c:851:18: note: (near initialization for 'ast_crtc_helper_funcs.atomic_flush') DRM_AST n + # ../drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c: In function 'amdgpu_dm_atomic_commit_tail': + # ../drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:7757:4: error: implicit declaration of function 'is_hdr_metadata_different' [-Werror=implicit-function-declaration] + # 7757 | is_hdr_metadata_different(old_con_state, new_con_state); + # | ^~~~~~~~~~~~~~~~~~~~~~~~~ + DRM_AMDGPU n ''; extraMeta = if (rpiVersion < 3) then { diff --git a/third_party/nixpkgs/pkgs/servers/consul/default.nix b/third_party/nixpkgs/pkgs/servers/consul/default.nix index da0e7364e9..0b94528164 100644 --- a/third_party/nixpkgs/pkgs/servers/consul/default.nix +++ b/third_party/nixpkgs/pkgs/servers/consul/default.nix @@ -32,12 +32,11 @@ buildGoModule rec { deleteVendor = true; - preBuild = '' - buildFlagsArray+=("-ldflags" - "-X github.com/hashicorp/consul/version.GitDescribe=v${version} - -X github.com/hashicorp/consul/version.Version=${version} - -X github.com/hashicorp/consul/version.VersionPrerelease=") - ''; + ldflags = [ + "-X github.com/hashicorp/consul/version.GitDescribe=v${version}" + "-X github.com/hashicorp/consul/version.Version=${version}" + "-X github.com/hashicorp/consul/version.VersionPrerelease=" + ]; meta = with lib; { description = "Tool for service discovery, monitoring and configuration"; diff --git a/third_party/nixpkgs/pkgs/servers/corosync/default.nix b/third_party/nixpkgs/pkgs/servers/corosync/default.nix index b4926e75b5..9df679bf6b 100644 --- a/third_party/nixpkgs/pkgs/servers/corosync/default.nix +++ b/third_party/nixpkgs/pkgs/servers/corosync/default.nix @@ -10,11 +10,11 @@ with lib; stdenv.mkDerivation rec { pname = "corosync"; - version = "3.1.4"; + version = "3.1.5"; src = fetchurl { url = "http://build.clusterlabs.org/corosync/releases/${pname}-${version}.tar.gz"; - sha256 = "sha256-sxoYlAi5RJCQcg0bSqO23t9nTkuuzOeLWPa/dLZZzuo="; + sha256 = "sha256-O7o+PtgasrCAcRsu4kEC+7530GCwXUvi2jEAgghPC7w="; }; nativeBuildInputs = [ makeWrapper pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/servers/headscale/default.nix b/third_party/nixpkgs/pkgs/servers/headscale/default.nix index c79d70e261..b97c1f977f 100644 --- a/third_party/nixpkgs/pkgs/servers/headscale/default.nix +++ b/third_party/nixpkgs/pkgs/servers/headscale/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "headscale"; - version = "0.3.6"; + version = "0.4.0"; src = fetchFromGitHub { owner = "juanfont"; repo = "headscale"; rev = "v${version}"; - sha256 = "sha256-cjaA62YRfZSbXwbW1pz51hc/opCLsN26GxWnBcVTvyE="; + sha256 = "sha256-0fa6V85NwURwsW1Mk1eMPtOWNqTe7x9BSuoCUrSJ/s8="; }; vendorSha256 = "sha256-3cGvp9hnajNJtvDn4K6fkCzLYrEFXQk9ZhQ4n+WnQEo="; diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix index cb74e1cecb..f39df1838d 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix @@ -607,7 +607,7 @@ "openerz" = ps: with ps; [ openerz-api ]; "openevse" = ps: with ps; [ ]; # missing inputs: openevsewifi "openexchangerates" = ps: with ps; [ ]; - "opengarage" = ps: with ps; [ ]; # missing inputs: open-garage + "opengarage" = ps: with ps; [ open-garage ]; "openhardwaremonitor" = ps: with ps; [ ]; "openhome" = ps: with ps; [ openhomedevice ]; "opensensemap" = ps: with ps; [ opensensemap-api ]; diff --git a/third_party/nixpkgs/pkgs/servers/interlock/default.nix b/third_party/nixpkgs/pkgs/servers/interlock/default.nix index 9823a36d75..e151c9ec45 100644 --- a/third_party/nixpkgs/pkgs/servers/interlock/default.nix +++ b/third_party/nixpkgs/pkgs/servers/interlock/default.nix @@ -21,7 +21,7 @@ buildGoPackage rec { goDeps = ./deps.nix; nativeBuildInputs = [ sudo ]; - buildFlags = [ "-tags textsecure" ]; + tags = [ "textsecure" ]; postPatch = '' grep -lr '/s\?bin/' | xargs sed -i \ -e 's|/bin/mount|${mount}/bin/mount|' \ diff --git a/third_party/nixpkgs/pkgs/servers/mail/dovecot/default.nix b/third_party/nixpkgs/pkgs/servers/mail/dovecot/default.nix index 0bd0a8707c..6f5d065e48 100644 --- a/third_party/nixpkgs/pkgs/servers/mail/dovecot/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mail/dovecot/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { pname = "dovecot"; - version = "2.3.15"; + version = "2.3.16"; nativeBuildInputs = [ perl pkg-config ]; buildInputs = @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dovecot.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.gz"; - sha256 = "141manrh54cy8xizr7f8fsa3vdzc2ccfgdz87l9rjylm8mfxvfr1"; + sha256 = "04ngqv5mml5z0i4p7fkchp4xw2awy7x7mq2mim9frnav0m9iv9q3"; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix b/third_party/nixpkgs/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix index 33c66a46bb..a13a7c1041 100644 --- a/third_party/nixpkgs/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix @@ -3,11 +3,11 @@ let dovecotMajorMinor = lib.versions.majorMinor dovecot.version; in stdenv.mkDerivation rec { pname = "dovecot-pigeonhole"; - version = "0.5.15"; + version = "0.5.16"; src = fetchurl { url = "https://pigeonhole.dovecot.org/releases/${dovecotMajorMinor}/dovecot-${dovecotMajorMinor}-pigeonhole-${version}.tar.gz"; - sha256 = "1l2h0p8ddsl3ja2lnwk0mfqplqh8n0iw8k27awd3ak7prr88yjg1"; + sha256 = "0f79qsiqnhaxn7mrrfcrnsjyv6357kzb7wa0chhfd69vwa06g8sw"; }; buildInputs = [ dovecot openssl ]; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix index 578bb10652..ef7b144a5b 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix @@ -15,7 +15,8 @@ buildGoModule rec { sha256 = "sha256-8shyNKwSg3pUxfQsIHBNnIaks/86vHuHN/SroDE3QFU="; }; - vendorSha256 = "sha256-jP6P2NShzlFCptCQ04XY4cIrONNArwthiEONEo32Btw="; + vendorSha256 = "sha256-GMNyeWa2dz+q4RYS+DDkpj9sx1PlPvSuWYcHSM2umRE="; + proxyVendor = true; preBuild = '' buildFlagsArray+=("-ldflags=-w -s -X main.version=${version}") diff --git a/third_party/nixpkgs/pkgs/servers/traefik/default.nix b/third_party/nixpkgs/pkgs/servers/traefik/default.nix index ca8d7d7412..c3f9aa13cc 100644 --- a/third_party/nixpkgs/pkgs/servers/traefik/default.nix +++ b/third_party/nixpkgs/pkgs/servers/traefik/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "traefik"; - version = "2.4.8"; + version = "2.4.13"; src = fetchzip { url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz"; - sha256 = "sha256-hCBhJazI0Y1qQjULF+CBfUfz6PvkgLXafvXKR6iKHmU="; + sha256 = "sha256-kGCzw8B7fCh6oh0ziB1eBedWEeGOBJVBvUf++TK/Lo0="; stripRoot = false; }; - vendorSha256 = "sha256-MW/JG4TbUvbo4dQnQbKIbLlLgkQvOqsfagpXILJ/BYQ="; + vendorSha256 = "sha256-jn4Ud+MrX7no+s69LAAbDOoFg1yIQ2lmoy8r37JIVz8="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/xmpp/prosody/default.nix b/third_party/nixpkgs/pkgs/servers/xmpp/prosody/default.nix index 190f396009..43e77d918e 100644 --- a/third_party/nixpkgs/pkgs/servers/xmpp/prosody/default.nix +++ b/third_party/nixpkgs/pkgs/servers/xmpp/prosody/default.nix @@ -15,7 +15,7 @@ with lib; stdenv.mkDerivation rec { - version = "0.11.9"; # also update communityModules + version = "0.11.10"; # also update communityModules pname = "prosody"; # The following community modules are necessary for the nixos module # prosody module to comply with XEP-0423 and provide a working @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ]; src = fetchurl { url = "https://prosody.im/downloads/source/${pname}-${version}.tar.gz"; - sha256 = "02gzvsaq0l5lx608sfh7hfz14s6yfsr4sr4kzcsqd1cxljp35h6c"; + sha256 = "1q84s9cq7cgzd295qxa2iy0r3vd3v3chbck62bdx3pd6skk19my6"; }; # A note to all those merging automated updates: Please also update this @@ -37,8 +37,8 @@ stdenv.mkDerivation rec { # version. communityModules = fetchhg { url = "https://hg.prosody.im/prosody-modules"; - rev = "c149edb37349"; - sha256 = "1njw17k0nhf15hc20l28v0xzcc7jha85lqy3j97nspv9zdxmshk1"; + rev = "64fafbeba14d"; + sha256 = "02gj1b8sdmdvymsdmjpq47zrl7sg578jcdxbbq18s44f3njmc9q1"; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/remote-touchpad/default.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/remote-touchpad/default.nix index a4dc6a1c46..90a438adb7 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/remote-touchpad/default.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/remote-touchpad/default.nix @@ -19,7 +19,7 @@ buildGoModule rec { }; buildInputs = [ libX11 libXi libXt libXtst ]; - buildFlags = [ "-tags" "portal,x11" ]; + tags = [ "portal,x11" ]; vendorSha256 = "1pgj0m67g759mcs4s34h4pq3mc7gni643z5cp6ffq4rrn8mdi060"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/chezmoi/default.nix b/third_party/nixpkgs/pkgs/tools/misc/chezmoi/default.nix index c1889b0e8c..6d03e49ab8 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/chezmoi/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/chezmoi/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "chezmoi"; - version = "2.1.3"; + version = "2.1.4"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - sha256 = "sha256-F4ad2P4NF7MSp6Lttk9hjAixiMTG/vtMe7YItmXdc4w="; + sha256 = "sha256-+KSLmr6tia22XFHYFmn3leRdT6TTKdrQa9PrGGJNPaw="; }; - vendorSha256 = "sha256-S/aP+oBH+bChoTLqqcB0aDzR7xtg9/qBqxxcLCwAbqY="; + vendorSha256 = "sha256-9vLOJOWsa6XADvWBLZKlyenqfDSvHuh5Ron4FE2tY7Y="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/misc/dua/default.nix b/third_party/nixpkgs/pkgs/tools/misc/dua/default.nix index 1d11f3c8de..56880b6448 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/dua/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/dua/default.nix @@ -2,7 +2,7 @@ rustPlatform.buildRustPackage rec { pname = "dua"; - version = "2.14.3"; + version = "2.14.4"; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Foundation ]; @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { owner = "Byron"; repo = "dua-cli"; rev = "v${version}"; - sha256 = "sha256-Tste5DdUwCu1CNRzIcBEvyckrvhEg9C8M3y89luIMbE="; + sha256 = "sha256-0L5IiB/J4RO/KGSk/zZKLPpAneNGPDvhmPsNiZxImac="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "sha256-iHRPgQtanW2LcFLPPHmr2n1NeAPi0mDmHNeIv524lrM="; + cargoSha256 = "sha256-Mb59ZkIQVAZ01e3njdIR+0pM+PKQgEDaUP4saMGYn/8="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/misc/fzf/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fzf/default.nix index 3ef5a64325..d38a0ad713 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/fzf/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/fzf/default.nix @@ -19,8 +19,8 @@ buildGoModule rec { buildInputs = [ ncurses ]; - buildFlagsArray = [ - "-ldflags=-s -w -X main.version=${version} -X main.revision=${src.rev}" + ldflags = [ + "-s" "-w" "-X main.version=${version} -X main.revision=${src.rev}" ]; # The vim plugin expects a relative path to the binary; patch it to abspath. diff --git a/third_party/nixpkgs/pkgs/tools/misc/kepubify/default.nix b/third_party/nixpkgs/pkgs/tools/misc/kepubify/default.nix index b1ece43154..19bf832fad 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/kepubify/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/kepubify/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { vendorSha256 = "sha256-bLQH7ZY2hE8fBTcW7DNoUQxe4N3m9Mv3JjjKO4cG7DY="; # remove when built with >= go 1.17 - buildFlags = [ "-tags" "zip117" ]; + tags = [ "zip117" ]; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/lnav/0001-Forcefully-disable-docs-build.patch b/third_party/nixpkgs/pkgs/tools/misc/lnav/0001-Forcefully-disable-docs-build.patch new file mode 100644 index 0000000000..afbec1d7e4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/lnav/0001-Forcefully-disable-docs-build.patch @@ -0,0 +1,38 @@ +From 20c3fe76340981c43eeed16a5509480a0f5cb56d Mon Sep 17 00:00:00 2001 +From: Maximilian Bosch +Date: Fri, 6 Aug 2021 10:55:01 +0200 +Subject: [PATCH] Forcefully disable docs build + +This currently affects the following statement in `src/Makefile.am` +only: + + if !DISABLE_DOCUMENTATION + all-local: lnav + if test -w $(srcdir)/internals; then \ + env DUMP_INTERNALS_DIR=$(srcdir)/internals DUMP_CRASH=1 ./lnav Makefile; \ + mv $(srcdir)/internals/*.schema.json $(top_srcdir)/docs/schemas; \ + fi + endif + +We cannot do this (even on non-cross builds) since `lnav` requires e.g. +`/etc/nsswitch.conf` and other impurities here. +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index ce311fd8..e3c9ebe0 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -287,7 +287,7 @@ AS_IF([test $? -eq 0], + + AM_CONDITIONAL(USE_INCLUDED_YAJL, test $HAVE_LOCAL_YAJL -eq 0) + AM_CONDITIONAL(HAVE_LIBCURL, test x"$LIBCURL" != x"") +-AM_CONDITIONAL([DISABLE_DOCUMENTATION], [ test x"$cross_compiling" != x"no" ]) ++AM_CONDITIONAL([DISABLE_DOCUMENTATION], [ true ]) + + AC_CONFIG_HEADERS([src/config.h]) + AC_CONFIG_FILES([Makefile]) +-- +2.31.1 + diff --git a/third_party/nixpkgs/pkgs/tools/misc/lnav/default.nix b/third_party/nixpkgs/pkgs/tools/misc/lnav/default.nix index 373687fafd..3cbfb2ad36 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/lnav/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/lnav/default.nix @@ -3,18 +3,25 @@ stdenv.mkDerivation rec { pname = "lnav"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "tstack"; repo = "lnav"; rev = "v${version}"; - sha256 = "1frdrr3yjlk2fns3ny0qbr30rpswhwlvv3kyhdl3l6a0q5cqaqsg"; + sha256 = "sha256-hAFyMypGC065aRgX2L4LdyFGpZ/LnX5SjA2iQv5Iuas="; }; + patches = [ ./0001-Forcefully-disable-docs-build.patch ]; + postPatch = '' + substituteInPlace Makefile.am \ + --replace "SUBDIRS = src test" "SUBDIRS = src" + ''; + + enableParallelBuilding = true; + + nativeBuildInputs = [ autoconf automake ]; buildInputs = [ - autoconf - automake zlib bzip2 ncurses @@ -24,10 +31,6 @@ stdenv.mkDerivation rec { curl ]; - postPatch = '' - sed -ie '/DUMP_INTERNALS/d' src/Makefile.am - ''; - preConfigure = '' ./autogen.sh ''; diff --git a/third_party/nixpkgs/pkgs/tools/misc/mimeo/default.nix b/third_party/nixpkgs/pkgs/tools/misc/mimeo/default.nix index ea79b8d2f0..d8e09e72f7 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/mimeo/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/mimeo/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "mimeo"; - version = "2019.7"; + version = "2021.2"; src = fetchurl { url = "https://xyne.archlinux.ca/projects/mimeo/src/${pname}-${version}.tar.xz"; - sha256 = "0nzn7qvmpbb17d6q16llnhz1qdmyg718q59ic4gw2rq23cd6q47r"; + sha256 = "113ip024ggajjdx0l406g6lwypdrddxz6k3640y6lzqjivcgybjf"; }; buildInputs = [ file desktop-file-utils ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/mmv-go/default.nix b/third_party/nixpkgs/pkgs/tools/misc/mmv-go/default.nix index 8787e4a838..640b0d611e 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/mmv-go/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/mmv-go/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = "0xnrai15ww9lfk02bc9p5ssycwnqkyjj5ch1srh7yvnbw3fakx68"; - buildFlagsArray = [ "-ldflags=-s -w -X main.revision=${src.rev}" ]; + ldflags = [ "-s" "-w" "-X main.revision=${src.rev}" ]; meta = with lib; { homepage = "https://github.com/itchyny/mmv"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/opentelemetry-collector/default.nix b/third_party/nixpkgs/pkgs/tools/misc/opentelemetry-collector/default.nix index 7c730c8c4a..1d6cce6334 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/opentelemetry-collector/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/opentelemetry-collector/default.nix @@ -15,9 +15,8 @@ buildGoModule rec { sha256 = "03713b4bkhcz61maz0r5mkd36kv3rq8rji3qcpi9zf5bkkjs1yzb"; }; - vendorSha256 = if stdenv.isDarwin - then "0anw3l6pq8yys2g2607ndhklb9m1i9krgjrw4wb99igavjzp3wpj" - else "04h463d2d7g6wqp5mzkqlszwzdbq0pix6j7n2s9s80lwg7nh8k3h"; + vendorSha256 = "sha256-sNI2OoDsSNtcQP8rNO4OCboFqSC7v6g4xEPNRKjv3sQ="; + proxyVendor = true; subPackages = [ "cmd/otelcontribcol" ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/pferd/default.nix b/third_party/nixpkgs/pkgs/tools/misc/pferd/default.nix index c964a33455..5c88ea2349 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/pferd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/pferd/default.nix @@ -5,14 +5,14 @@ python3Packages.buildPythonApplication rec { pname = "pferd"; - version = "3.1.0"; + version = "3.2.0"; format = "pyproject"; src = fetchFromGitHub { owner = "Garmelon"; repo = "PFERD"; rev = "v${version}"; - sha256 = "08kcl1c8z8qx65dfz5ghmbfqyjgkng4g9ymcnhydiz8j27smkj5d"; + sha256 = "0r75a128r8ghrccc1flmpxblfrab5kg6fypzrlfmv2aqhkqg1brb"; }; propagatedBuildInputs = with python3Packages; [ diff --git a/third_party/nixpkgs/pkgs/tools/misc/zoxide/default.nix b/third_party/nixpkgs/pkgs/tools/misc/zoxide/default.nix index a28cf27ab1..7a66c7f92c 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/zoxide/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/zoxide/default.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage rec { pname = "zoxide"; - version = "0.7.2"; + version = "0.7.3"; src = fetchFromGitHub { owner = "ajeetdsouza"; repo = "zoxide"; rev = "v${version}"; - sha256 = "sha256-M83J28aG4NACBZtCJzYNU7aYNTJILAboaDv5aAo35OM="; + sha256 = "sha256-vw/3pWqb1Qtat+17tzhBvpS+Z2DRe69HGmgzhMQPUw8="; }; nativeBuildInputs = [ installShellFiles ]; @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { --replace '"fzf"' '"${fzf}/bin/fzf"' ''; - cargoSha256 = "sha256-aF0vdudOFBcDrHpgsS7+HNE70GTNPdBOmbvQhLwmsM0="; + cargoSha256 = "sha256-xybP9A2QfhuSSjsBVsJgSfDC/1/OahtF5xfsXAlmpjs="; postInstall = '' installManPage man/* diff --git a/third_party/nixpkgs/pkgs/tools/networking/ngrok-1/default.nix b/third_party/nixpkgs/pkgs/tools/networking/ngrok-1/default.nix index 82f6ed4760..d33b749399 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/ngrok-1/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/ngrok-1/default.nix @@ -27,7 +27,7 @@ buildGoPackage rec { export sourceRoot=$sourceRoot/src/ngrok ''; - buildFlags = [ "-tags release" ]; + tags = [ "release" ]; meta = { homepage = "https://ngrok.com/"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/unbound/python.nix b/third_party/nixpkgs/pkgs/tools/networking/unbound/python.nix index fcfd93be4d..311a7812b9 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/unbound/python.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/unbound/python.nix @@ -2,21 +2,25 @@ let inherit (pythonPackages) python; -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { pname = "pyunbound"; - version = "1.9.3"; + version = "1.13.1"; src = fetchurl { - url = "http://unbound.net/downloads/unbound-${version}.tar.gz"; - sha256 = "1ykdy62sgzv33ggkmzwx2h0ifm7hyyxyfkb4zckv7gz4f28xsm8v"; + url = "https://nlnetlabs.nl/downloads/unbound/unbound-${version}.tar.gz"; + sha256 = "sha256-hQTZe4/FvYlzRcldEW4O4N34yP+ZWQqytL0TJ4yfULg="; }; - buildInputs = [ openssl expat libevent swig python ]; + nativeBuildInputs = [ swig ]; - patchPhase = ''substituteInPlace Makefile.in \ - --replace "\$(DESTDIR)\$(PYTHON_SITE_PKG)" "$out/${python.sitePackages}" \ - --replace "\$(LIBTOOL) --mode=install cp _unbound.la" "cp _unbound.la" - ''; + buildInputs = [ openssl expat libevent python ]; + + postPatch = '' + substituteInPlace Makefile.in \ + --replace "\$(DESTDIR)\$(PYTHON_SITE_PKG)" "$out/${python.sitePackages}" \ + --replace "\$(LIBTOOL) --mode=install cp _unbound.la" "cp _unbound.la" + ''; preConfigure = "export PYTHON_VERSION=${python.pythonVersion}"; @@ -30,18 +34,22 @@ in stdenv.mkDerivation rec { "--enable-pie" "--enable-relro-now" "--with-pyunbound" - "DESTDIR=$out PREFIX=" + "DESTDIR=$out" + "PREFIX=" ]; preInstall = '' mkdir -p $out/${python.sitePackages} $out/etc/${pname} cp .libs/_unbound.so .libs/libunbound.so* $out/${python.sitePackages} substituteInPlace _unbound.la \ - --replace "-L.libs $PWD/libunbound.la" "-L$out/${python.sitePackages}" \ - --replace "libdir=\'$PWD/${python.sitePackages}\'" "libdir=\'$out/${python.sitePackages}\'" - ''; + --replace "-L.libs $PWD/libunbound.la" "-L$out/${python.sitePackages}" + ''; - installFlags = [ "configfile=\${out}/etc/unbound/unbound.conf pyunbound-install lib" ]; + installFlags = [ + "configfile=\${out}/etc/unbound/unbound.conf" + "pyunbound-install" + "lib" + ]; # All we want is the Unbound Python module postInstall = '' @@ -50,16 +58,18 @@ in stdenv.mkDerivation rec { $out/bin/unbound-anchor -l | head -1 > $out/etc/${pname}/root.anchor $out/bin/unbound-anchor -l | tail --lines=+2 - > $out/etc/${pname}/root.key # We don't need anything else - rm -fR $out/bin $out/share $out/include $out/etc/unbound - patchelf --replace-needed libunbound.so.2 $out/${python.sitePackages}/libunbound.so.2 $out/${python.sitePackages}/_unbound.so - ''; + rm -r $out/bin $out/share $out/include $out/etc/unbound + '' + # patchelf is only available on Linux and no patching is needed on darwin + + lib.optionalString stdenv.isLinux '' + patchelf --replace-needed libunbound.so.8 $out/${python.sitePackages}/libunbound.so.8 $out/${python.sitePackages}/_unbound.so + ''; meta = with lib; { description = "Python library for Unbound, the validating, recursive, and caching DNS resolver"; license = licenses.bsd3; - homepage = "http://www.unbound.net"; + homepage = "https://www.unbound.net"; maintainers = with maintainers; [ leenaars ]; - platforms = lib.platforms.unix; - broken = true; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/tools/networking/xh/default.nix b/third_party/nixpkgs/pkgs/tools/networking/xh/default.nix index 0a62fee4bd..90f99120cd 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/xh/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/xh/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "xh"; - version = "0.10.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "ducaale"; repo = "xh"; rev = "v${version}"; - sha256 = "0b9cgjgzf1vxd9j6cz44g68xbaii8gb3973pvjf0p6barnqzvqvq"; + sha256 = "sha256-icJBQdFWdiHCYrZ7U90g6CdXdAkv3Y/WJu0IfZAdGv0="; }; - cargoSha256 = "0lwxmqp0ww9wf9p3nd42q89j0g7ichpkcm0mb1p5hhagwqgb0z15"; + cargoSha256 = "sha256-htv5OQnat4Qi6A6lmVonuz+8/DWz8fOGYPbnCnlizBo="; nativeBuildInputs = [ installShellFiles pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/exploitdb/default.nix b/third_party/nixpkgs/pkgs/tools/security/exploitdb/default.nix index 57e5af58fa..47c017ee98 100644 --- a/third_party/nixpkgs/pkgs/tools/security/exploitdb/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/exploitdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2021-08-05"; + version = "2021-08-06"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "sha256-on70ulr8B883Ty7ctmB9d8bLhK+83Qo2UqwIIrA7fkE="; + sha256 = "sha256-aKF/6SuSAk319QqGmyUu91//ofvPtHxX2Uv8FxhzqCM="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/tools/security/keybase/default.nix b/third_party/nixpkgs/pkgs/tools/security/keybase/default.nix index ec240a7c71..8b65d3b8b0 100644 --- a/third_party/nixpkgs/pkgs/tools/security/keybase/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/keybase/default.nix @@ -29,7 +29,7 @@ buildGoPackage rec { ]; buildInputs = lib.optionals stdenv.isDarwin [ AVFoundation AudioToolbox ImageIO CoreMedia Foundation CoreGraphics MediaToolbox ]; - buildFlags = [ "-tags production" ]; + tags = [ "production" ]; meta = with lib; { homepage = "https://www.keybase.io/"; diff --git a/third_party/nixpkgs/pkgs/tools/security/keybase/kbfs.nix b/third_party/nixpkgs/pkgs/tools/security/keybase/kbfs.nix index 67abb57394..dc49f9d9e7 100644 --- a/third_party/nixpkgs/pkgs/tools/security/keybase/kbfs.nix +++ b/third_party/nixpkgs/pkgs/tools/security/keybase/kbfs.nix @@ -10,7 +10,7 @@ buildGoPackage { dontRenameImports = true; - buildFlags = [ "-tags production" ]; + tags = [ "production" ]; meta = with lib; { homepage = "https://keybase.io/docs/kbfs"; diff --git a/third_party/nixpkgs/pkgs/tools/security/vault/default.nix b/third_party/nixpkgs/pkgs/tools/security/vault/default.nix index e5b8b370ff..346141ca89 100644 --- a/third_party/nixpkgs/pkgs/tools/security/vault/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/vault/default.nix @@ -21,7 +21,7 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles makeWrapper ]; - buildFlagsArray = [ "-tags=vault" ]; + tags = [ "vault" ]; ldflags = [ "-s" "-w" diff --git a/third_party/nixpkgs/pkgs/tools/text/ispell/default.nix b/third_party/nixpkgs/pkgs/tools/text/ispell/default.nix index b3dac1c48f..6c92983585 100644 --- a/third_party/nixpkgs/pkgs/tools/text/ispell/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/ispell/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "3.4.00"; src = fetchurl { - url = "http://fmg-www.cs.ucla.edu/geoff/tars/${pname}-${version}.tar.gz"; + url = "https://www.cs.hmc.edu/~geoff/tars/${pname}-${version}.tar.gz"; sha256 = "1hmfnz55qzfpz7lz0r3m4kkv31smir92ks9s5l1iiwimhr2jxi2x"; }; diff --git a/third_party/nixpkgs/pkgs/tools/text/vgrep/default.nix b/third_party/nixpkgs/pkgs/tools/text/vgrep/default.nix index edd0416b0e..1eea8b7f67 100644 --- a/third_party/nixpkgs/pkgs/tools/text/vgrep/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/vgrep/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = null; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + ldflags = [ "-s" "-w" "-X main.version=${version}" ]; nativeBuildInputs = [ go-md2man installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/cri-tools/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/cri-tools/default.nix index 637ff51317..16a7ecffa0 100644 --- a/third_party/nixpkgs/pkgs/tools/virtualization/cri-tools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/virtualization/cri-tools/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "cri-tools"; - version = "1.21.0"; + version = "1.22.0"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-chU7qNapmM4Gm8lYcdUreg1ZP93UM0LpIEk+w5cutlg="; + sha256 = "sha256-+36lGLpNnTQnwwmXoVNPt3RMcnE46AdXOpghvhP0Bq0="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/top-level/all-packages.nix b/third_party/nixpkgs/pkgs/top-level/all-packages.nix index ad08cb107d..204f3c8b6e 100644 --- a/third_party/nixpkgs/pkgs/top-level/all-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/all-packages.nix @@ -2043,7 +2043,9 @@ in boca = callPackage ../development/libraries/boca { }; - bochs = callPackage ../applications/virtualization/bochs { }; + bochs = callPackage ../applications/virtualization/bochs { + wxGTK = wxGTK30; + }; bubblewrap = callPackage ../tools/admin/bubblewrap { }; @@ -27543,7 +27545,7 @@ in taskopen = callPackage ../applications/misc/taskopen { }; - tdesktop = qt5.callPackage ../applications/networking/instant-messengers/telegram/tdesktop { + tdesktop = libsForQt5.callPackage ../applications/networking/instant-messengers/telegram/tdesktop { inherit (xorg) libpthreadstubs libXdmcp; }; diff --git a/third_party/nixpkgs/pkgs/top-level/emacs-packages.nix b/third_party/nixpkgs/pkgs/top-level/emacs-packages.nix index 9b4d700a35..30b834cc11 100644 --- a/third_party/nixpkgs/pkgs/top-level/emacs-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/emacs-packages.nix @@ -35,7 +35,8 @@ let inherit lib; }; - mkNongnuPackages = { lib }: import ../applications/editors/emacs/elisp-packages/nongnu-packages.nix { + mkNongnuPackages = { pkgs, lib }: import ../applications/editors/emacs/elisp-packages/nongnu-packages.nix { + inherit (pkgs) buildPackages; inherit lib; }; @@ -62,7 +63,7 @@ in makeScope pkgs'.newScope (self: makeOverridable ({ pkgs ? pkgs' , lib ? pkgs.lib , elpaPackages ? mkElpaPackages { inherit pkgs lib; } self - , nongnuPackages ? mkNongnuPackages { inherit lib; } self + , nongnuPackages ? mkNongnuPackages { inherit pkgs lib; } self , melpaStablePackages ? melpaGeneric { inherit pkgs lib; } "stable" self , melpaPackages ? melpaGeneric { inherit pkgs lib; } "unstable" self , orgPackages ? mkOrgPackages { inherit lib; } self diff --git a/third_party/nixpkgs/pkgs/top-level/python-packages.nix b/third_party/nixpkgs/pkgs/top-level/python-packages.nix index b4e475075a..9fc50a6d2f 100644 --- a/third_party/nixpkgs/pkgs/top-level/python-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/python-packages.nix @@ -189,6 +189,8 @@ in { adal = callPackage ../development/python-modules/adal { }; + adax = callPackage ../development/python-modules/adax { }; + adb-enhanced = callPackage ../development/python-modules/adb-enhanced { }; adb-homeassistant = callPackage ../development/python-modules/adb-homeassistant { }; @@ -4994,6 +4996,8 @@ in { onnx = callPackage ../development/python-modules/onnx { }; + open-garage = callPackage ../development/python-modules/open-garage { }; + openant = callPackage ../development/python-modules/openant { }; openapi-schema-validator = callPackage ../development/python-modules/openapi-schema-validator { }; @@ -6461,6 +6465,8 @@ in { pyproj = callPackage ../development/python-modules/pyproj { }; + pyprosegur = callPackage ../development/python-modules/pyprosegur { }; + pyptlib = callPackage ../development/python-modules/pyptlib { }; pypubsub = callPackage ../development/python-modules/pypubsub { };