diff --git a/third_party/nixpkgs/doc/contributing/coding-conventions.chapter.md b/third_party/nixpkgs/doc/contributing/coding-conventions.chapter.md index 7199fc63c8..85c8626bd9 100644 --- a/third_party/nixpkgs/doc/contributing/coding-conventions.chapter.md +++ b/third_party/nixpkgs/doc/contributing/coding-conventions.chapter.md @@ -545,7 +545,26 @@ The following types of tests exists: Here in the nixpkgs manual we describe mostly _package tests_; for _module tests_ head over to the corresponding [section in the NixOS manual](https://nixos.org/manual/nixos/stable/#sec-nixos-tests). -### Writing package tests {#ssec-package-tests-writing} +### Writing inline package tests {#ssec-inline-package-tests-writing} + +For very simple tests, they can be written inline: + +```nix +{ …, yq-go }: + +buildGoModule rec { + … + + passthru.tests = { + simple = runCommand "${pname}-test" {} '' + echo "test: 1" | ${yq-go}/bin/yq eval -j > $out + [ "$(cat $out | tr -d $'\n ')" = '{"test":1}' ] + ''; + }; +} +``` + +### Writing larger package tests {#ssec-package-tests-writing} This is an example using the `phoronix-test-suite` package with the current best practices. diff --git a/third_party/nixpkgs/doc/languages-frameworks/coq.section.md b/third_party/nixpkgs/doc/languages-frameworks/coq.section.md index 0674c5a470..39b60d83ac 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/coq.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/coq.section.md @@ -33,6 +33,7 @@ The recommended way of defining a derivation for a Coq library, is to use the `c * `mlPlugin` (optional, defaults to `false`). Some extensions (plugins) might require OCaml and sometimes other OCaml packages. Standard dependencies can be added by setting the current option to `true`. For a finer grain control, the `coq.ocamlPackages` attribute can be used in `extraBuildInputs` to depend on the same package set Coq was built against. * `useDune2ifVersion` (optional, default to `(x: false)` uses Dune2 to build the package if the provided predicate evaluates to true on the version, e.g. `useDune2if = versions.isGe "1.1"` will use dune if the version of the package is greater or equal to `"1.1"`, * `useDune2` (optional, defaults to `false`) uses Dune2 to build the package if set to true, the presence of this attribute overrides the behavior of the previous one. +* `opam-name` (optional, defaults to `coq-` followed by the value of `pname`), name of the Dune package to build. * `enableParallelBuilding` (optional, defaults to `true`), since it is activated by default, we provide a way to disable it. * `extraInstallFlags` (optional), allows to extend `installFlags` which initializes the variable `COQMF_COQLIB` so as to install in the proper subdirectory. Indeed Coq libraries should be installed in `$(out)/lib/coq/${coq.coq-version}/user-contrib/`. Such directories are automatically added to the `$COQPATH` environment variable by the hook defined in the Coq derivation. * `setCOQBIN` (optional, defaults to `true`), by default, the environment variable `$COQBIN` is set to the current Coq's binary, but one can disable this behavior by setting it to `false`, diff --git a/third_party/nixpkgs/doc/stdenv/meta.chapter.md b/third_party/nixpkgs/doc/stdenv/meta.chapter.md index f226a72548..e4970f7e96 100644 --- a/third_party/nixpkgs/doc/stdenv/meta.chapter.md +++ b/third_party/nixpkgs/doc/stdenv/meta.chapter.md @@ -134,7 +134,28 @@ Attribute Set `lib.platforms` defines [various common lists](https://github.com/ This attribute is special in that it is not actually under the `meta` attribute set but rather under the `passthru` attribute set. This is due to how `meta` attributes work, and the fact that they are supposed to contain only metadata, not derivations. ::: -An attribute set with as values tests. A test is a derivation, which builds successfully when the test passes, and fails to build otherwise. A derivation that is a test needs to have `meta.timeout` defined. +An attribute set with tests as values. A test is a derivation that builds when the test passes and fails to build otherwise. + +You can run these tests with: + +```ShellSession +$ cd path/to/nixpkgs +$ nix-build -A your-package.tests +``` + +#### Package tests + +Tests that are part of the source package are often executed in the `installCheckPhase`. + +Prefer `passthru.tests` for tests that are introduced in nixpkgs because: + +* `passthru.tests` tests the 'real' package, independently from the environment in which it was built +* we can run `passthru.tests` independently +* `installCheckPhase` adds overhead to each build + +For more on how to write and run package tests, see . + +#### NixOS tests The NixOS tests are available as `nixosTests` in parameters of derivations. For instance, the OpenSMTPD derivation includes lines similar to: @@ -148,6 +169,8 @@ The NixOS tests are available as `nixosTests` in parameters of derivations. For } ``` +NixOS tests run in a VM, so they are slower than regular package tests. For more information see [NixOS module tests](https://nixos.org/manual/nixos/stable/#sec-nixos-tests). + ### `timeout` {#var-meta-timeout} A timeout (in seconds) for building the derivation. If the derivation takes longer than this time to build, it can fail due to breaking the timeout. However, all computers do not have the same computing power, hence some builders may decide to apply a multiplicative factor to this value. When filling this value in, try to keep it approximately consistent with other values already present in `nixpkgs`. diff --git a/third_party/nixpkgs/doc/stdenv/stdenv.chapter.md b/third_party/nixpkgs/doc/stdenv/stdenv.chapter.md index e3e7b4c850..9befcaa51a 100644 --- a/third_party/nixpkgs/doc/stdenv/stdenv.chapter.md +++ b/third_party/nixpkgs/doc/stdenv/stdenv.chapter.md @@ -714,6 +714,8 @@ to `~/.gdbinit`. GDB will then be able to find debug information installed via ` The installCheck phase checks whether the package was installed correctly by running its test suite against the installed directories. The default `installCheck` calls `make installcheck`. +It is often better to add tests that are not part of the source distribution to `passthru.tests` (see ). This avoids adding overhead to every build and enables us to run them independently. + #### Variables controlling the installCheck phase {#variables-controlling-the-installcheck-phase} ##### `doInstallCheck` {#var-stdenv-doInstallCheck} diff --git a/third_party/nixpkgs/lib/default.nix b/third_party/nixpkgs/lib/default.nix index 8e29ef5c42..56859d85ff 100644 --- a/third_party/nixpkgs/lib/default.nix +++ b/third_party/nixpkgs/lib/default.nix @@ -115,7 +115,7 @@ let mergeModules' mergeOptionDecls evalOptionValue mergeDefinitions pushDownProperties dischargeProperties filterOverrides sortProperties fixupOptionType mkIf mkAssert mkMerge mkOverride - mkOptionDefault mkDefault mkForce mkVMOverride + mkOptionDefault mkDefault mkImageMediaOverride mkForce mkVMOverride mkFixStrictness mkOrder mkBefore mkAfter mkAliasDefinitions mkAliasAndWrapDefinitions fixMergeModules mkRemovedOptionModule mkRenamedOptionModule mkMergedOptionModule mkChangedOptionModule diff --git a/third_party/nixpkgs/lib/flake.nix b/third_party/nixpkgs/lib/flake.nix index f05bd40960..0b5e54d547 100644 --- a/third_party/nixpkgs/lib/flake.nix +++ b/third_party/nixpkgs/lib/flake.nix @@ -1,5 +1,5 @@ { description = "Library of low-level helper functions for nix expressions."; - outputs = { self }: { lib = import ./lib; }; + outputs = { self }: { lib = import ./.; }; } diff --git a/third_party/nixpkgs/lib/generators.nix b/third_party/nixpkgs/lib/generators.nix index c8144db50a..bcb0f371a9 100644 --- a/third_party/nixpkgs/lib/generators.nix +++ b/third_party/nixpkgs/lib/generators.nix @@ -248,7 +248,7 @@ rec { then v.__pretty v.val else if v == {} then "{ }" else if v ? type && v.type == "derivation" then - "" + "" else "{" + introSpace + libStr.concatStringsSep introSpace (libAttr.mapAttrsToList (name: value: diff --git a/third_party/nixpkgs/lib/modules.nix b/third_party/nixpkgs/lib/modules.nix index ab2bc4f7f8..b124ea000a 100644 --- a/third_party/nixpkgs/lib/modules.nix +++ b/third_party/nixpkgs/lib/modules.nix @@ -710,6 +710,7 @@ rec { mkOptionDefault = mkOverride 1500; # priority of option defaults mkDefault = mkOverride 1000; # used in config sections of non-user modules to set a default + mkImageMediaOverride = mkOverride 60; # image media profiles can be derived by inclusion into host config, hence needing to override host config, but do allow user to mkForce mkForce = mkOverride 50; mkVMOverride = mkOverride 10; # used by ‘nixos-rebuild build-vm’ diff --git a/third_party/nixpkgs/lib/tests/maintainers.nix b/third_party/nixpkgs/lib/tests/maintainers.nix index d3ed398c80..2408a20af4 100644 --- a/third_party/nixpkgs/lib/tests/maintainers.nix +++ b/third_party/nixpkgs/lib/tests/maintainers.nix @@ -61,9 +61,9 @@ let missingGithubIds = lib.concatLists (lib.mapAttrsToList checkMaintainer lib.maintainers); - success = pkgs.runCommandNoCC "checked-maintainers-success" {} ">$out"; + success = pkgs.runCommand "checked-maintainers-success" {} ">$out"; - failure = pkgs.runCommandNoCC "checked-maintainers-failure" { + failure = pkgs.runCommand "checked-maintainers-failure" { nativeBuildInputs = [ pkgs.curl pkgs.jq ]; outputHash = "sha256:${lib.fakeSha256}"; outputHAlgo = "sha256"; diff --git a/third_party/nixpkgs/lib/tests/release.nix b/third_party/nixpkgs/lib/tests/release.nix index c3b05251f7..77e0e1af75 100644 --- a/third_party/nixpkgs/lib/tests/release.nix +++ b/third_party/nixpkgs/lib/tests/release.nix @@ -3,7 +3,7 @@ pkgs ? import ../.. {} // { lib = throw "pkgs.lib accessed, but the lib tests should use nixpkgs' lib path directly!"; } }: -pkgs.runCommandNoCC "nixpkgs-lib-tests" { +pkgs.runCommand "nixpkgs-lib-tests" { buildInputs = [ pkgs.nix (import ./check-eval.nix) diff --git a/third_party/nixpkgs/maintainers/maintainer-list.nix b/third_party/nixpkgs/maintainers/maintainer-list.nix index fdc0cd3c45..9bf862302d 100644 --- a/third_party/nixpkgs/maintainers/maintainer-list.nix +++ b/third_party/nixpkgs/maintainers/maintainer-list.nix @@ -4755,6 +4755,12 @@ githubId = 40566146; name = "Jonas Braun"; }; + j-hui = { + email = "j-hui@cs.columbia.edu"; + github = "j-hui"; + githubId = 11800204; + name = "John Hui"; + }; j-keck = { email = "jhyphenkeck@gmail.com"; github = "j-keck"; @@ -8768,6 +8774,12 @@ githubId = 5636; name = "Steve Purcell"; }; + putchar = { + email = "slim.cadoux@gmail.com"; + github = "putchar"; + githubId = 8208767; + name = "Slim Cadoux"; + }; puzzlewolf = { email = "nixos@nora.pink"; github = "puzzlewolf"; @@ -10006,6 +10018,12 @@ fingerprint = "6F8A 18AE 4101 103F 3C54 24B9 6AA2 3A11 93B7 064B"; }]; }; + smancill = { + email = "smancill@smancill.dev"; + github = "smancill"; + githubId = 238528; + name = "Sebastián Mancilla"; + }; smaret = { email = "sebastien.maret@icloud.com"; github = "smaret"; @@ -11277,7 +11295,7 @@ }; vel = { email = "llathasa@outlook.com"; - github = "llathasa-veleth"; + github = "q60"; githubId = 61933599; name = "vel"; }; diff --git a/third_party/nixpkgs/maintainers/scripts/pluginupdate.py b/third_party/nixpkgs/maintainers/scripts/pluginupdate.py index 79f5b93be8..c468b33bb4 100644 --- a/third_party/nixpkgs/maintainers/scripts/pluginupdate.py +++ b/third_party/nixpkgs/maintainers/scripts/pluginupdate.py @@ -86,7 +86,7 @@ class PluginDesc: owner: str repo: str branch: str - alias: str + alias: Optional[str] class Repo: @@ -317,12 +317,10 @@ def get_current_plugins(editor: Editor) -> List[Plugin]: def prefetch_plugin( - user: str, - repo_name: str, - branch: str, - alias: Optional[str], + p: PluginDesc, cache: "Optional[Cache]" = None, ) -> Tuple[Plugin, Dict[str, str]]: + user, repo_name, branch, alias = p.owner, p.repo, p.branch, p.alias log.info(f"Fetching last commit for plugin {user}/{repo_name}@{branch}") repo = Repo(user, repo_name, branch, alias) commit, date = repo.latest_commit() @@ -347,7 +345,7 @@ def prefetch_plugin( def fetch_plugin_from_pluginline(plugin_line: str) -> Plugin: - plugin, _ = prefetch_plugin(*parse_plugin_line(plugin_line)) + plugin, _ = prefetch_plugin(parse_plugin_line(plugin_line)) return plugin @@ -466,11 +464,11 @@ class Cache: def prefetch( - args: PluginDesc, cache: Cache + pluginDesc: PluginDesc, cache: Cache ) -> Tuple[str, str, Union[Exception, Plugin], dict]: - owner, repo = args.owner, args.repo + owner, repo = pluginDesc.owner, pluginDesc.repo try: - plugin, redirect = prefetch_plugin(owner, repo, args.branch, args.alias, cache) + plugin, redirect = prefetch_plugin(pluginDesc, cache) cache[plugin.commit] = plugin return (owner, repo, plugin, redirect) except Exception as e: @@ -576,8 +574,9 @@ def update_plugins(editor: Editor, args): if autocommit: commit( nixpkgs_repo, - "{editor.get_drv_name name}: init at {version}".format( - editor=editor.name, name=plugin.normalized_name, version=plugin.version + "{drv_name}: init at {version}".format( + drv_name=editor.get_drv_name(plugin.normalized_name), + version=plugin.version ), [args.outfile, args.input_file], ) diff --git a/third_party/nixpkgs/maintainers/scripts/update-luarocks-packages b/third_party/nixpkgs/maintainers/scripts/update-luarocks-packages index 5123f86e93..6de9779984 100755 --- a/third_party/nixpkgs/maintainers/scripts/update-luarocks-packages +++ b/third_party/nixpkgs/maintainers/scripts/update-luarocks-packages @@ -110,7 +110,6 @@ class LuaEditor(Editor): return "luaPackages" def get_update(self, input_file: str, outfile: str, proc: int): - cache: Cache = Cache(self.cache_file) _prefetch = generate_pkg_nix def update() -> dict: diff --git a/third_party/nixpkgs/maintainers/team-list.nix b/third_party/nixpkgs/maintainers/team-list.nix index 385f16ce1e..a86af02d23 100644 --- a/third_party/nixpkgs/maintainers/team-list.nix +++ b/third_party/nixpkgs/maintainers/team-list.nix @@ -132,6 +132,17 @@ with lib.maintainers; { scope = "Maintain the Home Assistant ecosystem"; }; + iog = { + members = [ + cleverca22 + disassembler + jonringer + maveru + nrdxp + ]; + scope = "Input-Output Global employees, which maintain critical software"; + }; + jitsi = { members = [ petabyteboy diff --git a/third_party/nixpkgs/nixos/doc/manual/development/building-nixos.chapter.md b/third_party/nixpkgs/nixos/doc/manual/development/building-nixos.chapter.md index 699a75f411..3310dee98f 100644 --- a/third_party/nixpkgs/nixos/doc/manual/development/building-nixos.chapter.md +++ b/third_party/nixpkgs/nixos/doc/manual/development/building-nixos.chapter.md @@ -1,7 +1,22 @@ -# Building Your Own NixOS CD {#sec-building-cd} -Building a NixOS CD is as easy as configuring your own computer. The idea is to use another module which will replace your `configuration.nix` to configure the system that would be installed on the CD. +# Building a NixOS (Live) ISO {#sec-building-image} -Default CD/DVD configurations are available inside `nixos/modules/installer/cd-dvd` +Default live installer configurations are available inside `nixos/modules/installer/cd-dvd`. +For building other system images, [nixos-generators] is a good place to start looking at. + +You have two options: + +- Use any of those default configurations as is +- Combine them with (any of) your host config(s) + +System images, such as the live installer ones, know how to enforce configuration settings +on wich they immediately depend in order to work correctly. + +However, if you are confident, you can opt to override those +enforced values with `mkForce`. + +[nixos-generators]: https://github.com/nix-community/nixos-generators + +## Practical Instructions {#sec-building-image-instructions} ```ShellSession $ git clone https://github.com/NixOS/nixpkgs.git @@ -9,10 +24,23 @@ $ cd nixpkgs/nixos $ nix-build -A config.system.build.isoImage -I nixos-config=modules/installer/cd-dvd/installation-cd-minimal.nix default.nix ``` -Before burning your CD/DVD, you can check the content of the image by mounting anywhere like suggested by the following command: +To check the content of an ISO image, mount it like so: ```ShellSession -# mount -o loop -t iso9660 ./result/iso/cd.iso /mnt/iso +# mount -o loop -t iso9660 ./result/iso/cd.iso /mnt/iso ``` -If you want to customize your NixOS CD in more detail, or generate other kinds of images, you might want to check out [nixos-generators](https://github.com/nix-community/nixos-generators). This can also be a good starting point when you want to use Nix to build a 'minimal' image that doesn't include a NixOS installation. +## Technical Notes {#sec-building-image-tech-notes} + +The config value enforcement is implemented via `mkImageMediaOverride = mkOverride 60;` +and therefore primes over simple value assignments, but also yields to `mkForce`. + +This property allows image designers to implement in semantically correct ways those +configuration values upon which the correct functioning of the image depends. + +For example, the iso base image overrides those file systems which it needs at a minimum +for correct functioning, while the installer base image overrides the entire file system +layout because there can't be any other guarantees on a live medium than those given +by the live medium itself. The latter is especially true befor formatting the target +block device(s). On the other hand, the netboot iso only overrides its minimum dependencies +since netboot images are always made-to-target. diff --git a/third_party/nixpkgs/nixos/doc/manual/from_md/development/building-nixos.chapter.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/development/building-nixos.chapter.xml index ceb744447d..ad9349da06 100644 --- a/third_party/nixpkgs/nixos/doc/manual/from_md/development/building-nixos.chapter.xml +++ b/third_party/nixpkgs/nixos/doc/manual/from_md/development/building-nixos.chapter.xml @@ -1,33 +1,72 @@ - - Building Your Own NixOS CD + + Building a NixOS (Live) ISO - Building a NixOS CD is as easy as configuring your own computer. The - idea is to use another module which will replace your - configuration.nix to configure the system that - would be installed on the CD. + Default live installer configurations are available inside + nixos/modules/installer/cd-dvd. For building + other system images, + nixos-generators + is a good place to start looking at. - Default CD/DVD configurations are available inside - nixos/modules/installer/cd-dvd + You have two options: - + + + + Use any of those default configurations as is + + + + + Combine them with (any of) your host config(s) + + + + + System images, such as the live installer ones, know how to enforce + configuration settings on wich they immediately depend in order to + work correctly. + + + However, if you are confident, you can opt to override those + enforced values with mkForce. + +
+ Practical Instructions + $ git clone https://github.com/NixOS/nixpkgs.git $ cd nixpkgs/nixos $ nix-build -A config.system.build.isoImage -I nixos-config=modules/installer/cd-dvd/installation-cd-minimal.nix default.nix - - Before burning your CD/DVD, you can check the content of the image - by mounting anywhere like suggested by the following command: - - -# mount -o loop -t iso9660 ./result/iso/cd.iso /mnt/iso</screen> + + To check the content of an ISO image, mount it like so: + + +# mount -o loop -t iso9660 ./result/iso/cd.iso /mnt/iso - - If you want to customize your NixOS CD in more detail, or generate - other kinds of images, you might want to check out - nixos-generators. - This can also be a good starting point when you want to use Nix to - build a minimal image that doesn’t include a NixOS - installation. - +
+
+ Technical Notes + + The config value enforcement is implemented via + mkImageMediaOverride = mkOverride 60; and + therefore primes over simple value assignments, but also yields to + mkForce. + + + This property allows image designers to implement in semantically + correct ways those configuration values upon which the correct + functioning of the image depends. + + + For example, the iso base image overrides those file systems which + it needs at a minimum for correct functioning, while the installer + base image overrides the entire file system layout because there + can’t be any other guarantees on a live medium than those given by + the live medium itself. The latter is especially true befor + formatting the target block device(s). On the other hand, the + netboot iso only overrides its minimum dependencies since netboot + images are always made-to-target. + +
diff --git a/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2105.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2105.section.xml index f4155d6f8c..fb11b19229 100644 --- a/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2105.section.xml +++ b/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2105.section.xml @@ -84,7 +84,7 @@ - The linux_latest kernel was updated to the 5.12 series. It + The linux_latest kernel was updated to the 5.13 series. It currently is not officially supported for use with the zfs filesystem. If you use zfs, you should use a different kernel version (either the LTS kernel, or track a specific one). diff --git a/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index 68d09a7781..86031791b1 100644 --- a/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -172,10 +172,104 @@ + + + + navidrome, + a personal music streaming server with subsonic-compatible + api. Available as + navidrome. + + +
Backward Incompatibilities + + + The paperless module and package have been + removed. All users should migrate to the successor + paperless-ng instead. The Paperless project + has + been archived and advises all users to use + paperless-ng instead. + + + Users can use the services.paperless-ng + module as a replacement while noting the following + incompatibilities: + + + + + services.paperless.ocrLanguages has no + replacement. Users should migrate to + services.paperless-ng.extraConfig + instead: + + + + +{ + services.paperless-ng.extraConfig = { + # Provide languages as ISO 639-2 codes + # separated by a plus (+) sign. + # https://en.wikipedia.org/wiki/List_of_ISO_639-2_codes + PAPERLESS_OCR_LANGUAGE = "deu+eng+jpn"; # German & English & Japanse + }; +} + + + + + If you previously specified + PAPERLESS_CONSUME_MAIL_* settings in + services.paperless.extraConfig you + should remove those options now. You now + must define those settings in the + admin interface of paperless-ng. + + + + + Option services.paperless.manage no + longer exists. Use the script at + ${services.paperless-ng.dataDir}/paperless-ng-manage + instead. Note that this script only exists after the + paperless-ng service has been started + at least once. + + + + + After switching to the new system configuration you should + run the Django management command to reindex your + documents and optionally create a user, if you don’t have + one already. + + + To do so, enter the data directory (the value of + services.paperless-ng.dataDir, + /var/lib/paperless by default), switch + to the paperless user and execute the management command + like below: + + +$ cd /var/lib/paperless +$ su paperless -s /bin/sh +$ ./paperless-ng-manage document_index reindex +# if not already done create a user account, paperless-ng requires a login +$ ./paperless-ng-manage createsuperuser +Username (leave blank to use 'paperless'): my-user-name +Email address: me@example.com +Password: ********** +Password (again): ********** +Superuser created successfully. + + + + The staticjinja package has been upgraded @@ -703,6 +797,36 @@ web UI this port needs to be opened in the firewall. + + + The varnish package was upgraded from 6.3.x + to 6.5.x. varnish60 for the last LTS + release is also still available. + + + + + The kubernetes package was upgraded to + 1.22. The kubernetes.apiserver.kubeletHttps + option was removed and HTTPS is always used. + + + + + The attribute linuxPackages_latest_hardened + was dropped because the hardened patches lag behind the + upstream kernel which made version bumps harder. If you want + to use a hardened kernel, please pin it explicitly with a + versioned attribute such as + linuxPackages_5_10_hardened. + + + + + The nomad package now defaults to a 1.1.x + release instead of 1.0.x + +
diff --git a/third_party/nixpkgs/nixos/doc/manual/installation/installing.xml b/third_party/nixpkgs/nixos/doc/manual/installation/installing.xml index d019bb3180..ff2425e725 100644 --- a/third_party/nixpkgs/nixos/doc/manual/installation/installing.xml +++ b/third_party/nixpkgs/nixos/doc/manual/installation/installing.xml @@ -64,14 +64,51 @@ - To manually configure the network on the graphical installer, first disable - network-manager with systemctl stop NetworkManager. + On the graphical installer, you can configure the network, wifi included, + through NetworkManager. Using the nmtui program, you + can do so even in a non-graphical session. If you prefer to configure the + network manually, disable NetworkManager with + systemctl stop NetworkManager. - To manually configure the wifi on the minimal installer, run - wpa_supplicant -B -i interface -c <(wpa_passphrase 'SSID' - 'key'). + On the minimal installer, NetworkManager is not available, so configuration + must be perfomed manually. To configure the wifi, first start wpa_supplicant + with sudo systemctl start wpa_supplicant, then run + wpa_cli. For most home networks, you need to type + in the following commands: + +> add_network +0 +> set_network 0 ssid "myhomenetwork" +OK +> set_network 0 psk "mypassword" +OK +> set_network 0 key_mgmt WPA-PSK +OK +> enable_network 0 +OK + + For enterprise networks, for example eduroam, instead do: + +> add_network +0 +> set_network 0 ssid "eduroam" +OK +> set_network 0 identity "myname@example.com" +OK +> set_network 0 password "mypassword" +OK +> set_network 0 key_mgmt WPA-EAP +OK +> enable_network 0 +OK + + When successfully connected, you should see a line such as this one + +<3>CTRL-EVENT-CONNECTED - Connection to 32:85:ab:ef:24:5c completed [id=0 id_str=] + + you can now leave wpa_cli by typing quit. diff --git a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2105.section.md b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2105.section.md index 49b97c203f..359f2e5b2e 100644 --- a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2105.section.md +++ b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2105.section.md @@ -30,7 +30,7 @@ In addition to numerous new and upgraded packages, this release has the followin - Python optimizations were disabled again. Builds with optimizations enabled are not reproducible. Optimizations can now be enabled with an option. -- The linux_latest kernel was updated to the 5.12 series. It currently is not officially supported for use with the zfs filesystem. If you use zfs, you should use a different kernel version (either the LTS kernel, or track a specific one). +- The linux_latest kernel was updated to the 5.13 series. It currently is not officially supported for use with the zfs filesystem. If you use zfs, you should use a different kernel version (either the LTS kernel, or track a specific one). ## New Services {#sec-release-21.05-new-services} diff --git a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2111.section.md b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2111.section.md index d7c38056ef..231fc05f88 100644 --- a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2111.section.md @@ -53,8 +53,58 @@ pt-services.clipcat.enable). - [isso](https://posativ.org/isso/), a commenting server similar to Disqus. Available as [isso](#opt-services.isso.enable) +* [navidrome](https://www.navidrome.org/), a personal music streaming server with +subsonic-compatible api. Available as [navidrome](#opt-services.navidrome.enable). + ## Backward Incompatibilities {#sec-release-21.11-incompatibilities} +- The `paperless` module and package have been removed. All users should migrate to the + successor `paperless-ng` instead. The Paperless project [has been + archived](https://github.com/the-paperless-project/paperless/commit/9b0063c9731f7c5f65b1852cb8caff97f5e40ba4) + and advises all users to use `paperless-ng` instead. + + Users can use the `services.paperless-ng` module as a replacement while noting the following incompatibilities: + - `services.paperless.ocrLanguages` has no replacement. Users should migrate to [`services.paperless-ng.extraConfig`](options.html#opt-services.paperless-ng.extraConfig) instead: + ```nix + { + services.paperless-ng.extraConfig = { + # Provide languages as ISO 639-2 codes + # separated by a plus (+) sign. + # https://en.wikipedia.org/wiki/List_of_ISO_639-2_codes + PAPERLESS_OCR_LANGUAGE = "deu+eng+jpn"; # German & English & Japanse + }; + } + ``` + + - If you previously specified `PAPERLESS_CONSUME_MAIL_*` settings in + `services.paperless.extraConfig` you should remove those options now. You + now *must* define those settings in the admin interface of paperless-ng. + + - Option `services.paperless.manage` no longer exists. + Use the script at `${services.paperless-ng.dataDir}/paperless-ng-manage` instead. + Note that this script only exists after the `paperless-ng` service has been + started at least once. + + - After switching to the new system configuration you should run the Django + management command to reindex your documents and optionally create a user, + if you don't have one already. + + To do so, enter the data directory (the value of + `services.paperless-ng.dataDir`, `/var/lib/paperless` by default), switch + to the paperless user and execute the management command like below: + ``` + $ cd /var/lib/paperless + $ su paperless -s /bin/sh + $ ./paperless-ng-manage document_index reindex + # if not already done create a user account, paperless-ng requires a login + $ ./paperless-ng-manage createsuperuser + Username (leave blank to use 'paperless'): my-user-name + Email address: me@example.com + Password: ********** + Password (again): ********** + Superuser created successfully. + ``` + - The `staticjinja` package has been upgraded from 1.0.4 to 3.0.1 - The `erigon` ethereum node has moved to a new database format in `2021-05-04`, and requires a full resync @@ -179,6 +229,17 @@ pt-services.clipcat.enable). configures the address and port the web UI is listening, it defaults to `:9001`. To be able to access the web UI this port needs to be opened in the firewall. +- The `varnish` package was upgraded from 6.3.x to 6.5.x. `varnish60` for the last LTS release is also still available. + +- The `kubernetes` package was upgraded to 1.22. The `kubernetes.apiserver.kubeletHttps` option was removed and HTTPS is always used. + +- The attribute `linuxPackages_latest_hardened` was dropped because the hardened patches + lag behind the upstream kernel which made version bumps harder. If you want to use + a hardened kernel, please pin it explicitly with a versioned attribute such as + `linuxPackages_5_10_hardened`. + +- The `nomad` package now defaults to a 1.1.x release instead of 1.0.x + ## Other Notable Changes {#sec-release-21.11-notable-changes} - The setting [`services.openssh.logLevel`](options.html#opt-services.openssh.logLevel) `"VERBOSE"` `"INFO"`. This brings NixOS in line with upstream and other Linux distributions, and reduces log spam on servers due to bruteforcing botnets. diff --git a/third_party/nixpkgs/nixos/lib/test-driver/test-driver.py b/third_party/nixpkgs/nixos/lib/test-driver/test-driver.py index 1720e553d7..0372148cb3 100755 --- a/third_party/nixpkgs/nixos/lib/test-driver/test-driver.py +++ b/third_party/nixpkgs/nixos/lib/test-driver/test-driver.py @@ -1029,10 +1029,11 @@ if __name__ == "__main__": args = arg_parser.parse_args() global test_script + testscript = pathlib.Path(args.testscript).read_text() def test_script() -> None: with log.nested("running the VM test script"): - exec(pathlib.Path(args.testscript).read_text(), globals()) + exec(testscript, globals()) log = Logger() @@ -1061,7 +1062,8 @@ if __name__ == "__main__": process.terminate() log.close() + interactive = args.interactive or (not bool(testscript)) tic = time.time() - run_tests(args.interactive) + run_tests(interactive) toc = time.time() print("test script finished in {:.2f}s".format(toc - tic)) diff --git a/third_party/nixpkgs/nixos/lib/testing-python.nix b/third_party/nixpkgs/nixos/lib/testing-python.nix index 6369d6ef05..e95ebe16ec 100644 --- a/third_party/nixpkgs/nixos/lib/testing-python.nix +++ b/third_party/nixpkgs/nixos/lib/testing-python.nix @@ -186,6 +186,14 @@ rec { --set startScripts "''${vmStartScripts[*]}" \ --set testScript "$out/test-script" \ --set vlans '${toString vlans}' + + ${lib.optionalString (testScript == "") '' + ln -s ${testDriver}/bin/nixos-test-driver $out/bin/nixos-run-vms + wrapProgram $out/bin/nixos-run-vms \ + --set startScripts "''${vmStartScripts[*]}" \ + --set testScript "${pkgs.writeText "start-all" "start_all(); join_all();"}" \ + --set vlans '${toString vlans}' + ''} ''); # Make a full-blown test diff --git a/third_party/nixpkgs/nixos/lib/utils.nix b/third_party/nixpkgs/nixos/lib/utils.nix index f1332ab559..7fe812424f 100644 --- a/third_party/nixpkgs/nixos/lib/utils.nix +++ b/third_party/nixpkgs/nixos/lib/utils.nix @@ -3,7 +3,7 @@ pkgs: with pkgs.lib; rec { # Copy configuration files to avoid having the entire sources in the system closure - copyFile = filePath: pkgs.runCommandNoCC (builtins.unsafeDiscardStringContext (builtins.baseNameOf filePath)) {} '' + copyFile = filePath: pkgs.runCommand (builtins.unsafeDiscardStringContext (builtins.baseNameOf filePath)) {} '' cp ${filePath} $out ''; diff --git a/third_party/nixpkgs/nixos/modules/config/ldap.nix b/third_party/nixpkgs/nixos/modules/config/ldap.nix index 35813c168f..85cad8b93d 100644 --- a/third_party/nixpkgs/nixos/modules/config/ldap.nix +++ b/third_party/nixpkgs/nixos/modules/config/ldap.nix @@ -42,7 +42,7 @@ let # nslcd normally reads configuration from /etc/nslcd.conf. # this file might contain secrets. We append those at runtime, # so redirect its location to something more temporary. - nslcdWrapped = runCommandNoCC "nslcd-wrapped" { nativeBuildInputs = [ makeWrapper ]; } '' + nslcdWrapped = runCommand "nslcd-wrapped" { nativeBuildInputs = [ makeWrapper ]; } '' mkdir -p $out/bin makeWrapper ${nss_pam_ldapd}/sbin/nslcd $out/bin/nslcd \ --set LD_PRELOAD "${pkgs.libredirect}/lib/libredirect.so" \ diff --git a/third_party/nixpkgs/nixos/modules/config/networking.nix b/third_party/nixpkgs/nixos/modules/config/networking.nix index dba8977e48..8c4eec510e 100644 --- a/third_party/nixpkgs/nixos/modules/config/networking.nix +++ b/third_party/nixpkgs/nixos/modules/config/networking.nix @@ -190,7 +190,7 @@ in protocols.source = pkgs.iana-etc + "/etc/protocols"; # /etc/hosts: Hostname-to-IP mappings. - hosts.source = pkgs.runCommandNoCC "hosts" {} '' + hosts.source = pkgs.runCommand "hosts" {} '' cat ${escapeShellArgs cfg.hostFiles} > $out ''; diff --git a/third_party/nixpkgs/nixos/modules/hardware/video/hidpi.nix b/third_party/nixpkgs/nixos/modules/hardware/video/hidpi.nix index ac72b65250..c480cc481d 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/video/hidpi.nix +++ b/third_party/nixpkgs/nixos/modules/hardware/video/hidpi.nix @@ -12,5 +12,6 @@ with lib; boot.loader.systemd-boot.consoleMode = mkDefault "1"; # TODO Find reasonable defaults X11 & wayland + services.xserver.dpi = lib.mkDefault 192; }; } diff --git a/third_party/nixpkgs/nixos/modules/installer/cd-dvd/installation-cd-base.nix b/third_party/nixpkgs/nixos/modules/installer/cd-dvd/installation-cd-base.nix index aecb65b8c5..618057618d 100644 --- a/third_party/nixpkgs/nixos/modules/installer/cd-dvd/installation-cd-base.nix +++ b/third_party/nixpkgs/nixos/modules/installer/cd-dvd/installation-cd-base.nix @@ -30,6 +30,11 @@ with lib; # Add Memtest86+ to the CD. boot.loader.grub.memtest86.enable = true; + # An installation media cannot tolerate a host config defined file + # system layout on a fresh machine, before it has been formatted. + swapDevices = mkImageMediaOverride [ ]; + fileSystems = mkImageMediaOverride config.lib.isoFileSystems; + boot.postBootCommands = '' for o in $( for supported values. + ''; + }; + + }; + }; + + config = mkIf cfg.enable { + systemd.services.navidrome = { + description = "Navidrome Media Server"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + ExecStart = '' + ${pkgs.navidrome}/bin/navidrome --configfile ${settingsFormat.generate "navidrome.json" cfg.settings} + ''; + DynamicUser = true; + StateDirectory = "navidrome"; + WorkingDirectory = "/var/lib/navidrome"; + RuntimeDirectory = "navidrome"; + RootDirectory = "/run/navidrome"; + ReadWritePaths = ""; + BindReadOnlyPaths = [ + builtins.storeDir + ] ++ lib.optional (cfg.settings ? MusicFolder) cfg.settings.MusicFolder; + CapabilityBoundingSet = ""; + RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" ]; + RestrictNamespaces = true; + PrivateDevices = true; + PrivateUsers = true; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ "@system-service" "~@privileged" "~@resources" ]; + RestrictRealtime = true; + LockPersonality = true; + MemoryDenyWriteExecute = true; + UMask = "0066"; + ProtectHostname = true; + }; + }; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/backup/borgbackup.nix b/third_party/nixpkgs/nixos/modules/services/backup/borgbackup.nix index 18fb29fd72..ccbc772639 100644 --- a/third_party/nixpkgs/nixos/modules/services/backup/borgbackup.nix +++ b/third_party/nixpkgs/nixos/modules/services/backup/borgbackup.nix @@ -102,7 +102,7 @@ let mkWrapperDrv = { original, name, set ? {} }: - pkgs.runCommandNoCC "${name}-wrapper" { + pkgs.runCommand "${name}-wrapper" { buildInputs = [ pkgs.makeWrapper ]; } (with lib; '' makeWrapper "${original}" "$out/bin/${name}" \ diff --git a/third_party/nixpkgs/nixos/modules/services/backup/syncoid.nix b/third_party/nixpkgs/nixos/modules/services/backup/syncoid.nix index 73b01d4b53..3ad8d279a3 100644 --- a/third_party/nixpkgs/nixos/modules/services/backup/syncoid.nix +++ b/third_party/nixpkgs/nixos/modules/services/backup/syncoid.nix @@ -79,6 +79,33 @@ in ''; }; + localSourceAllow = mkOption { + type = types.listOf types.str; + # Permissions snapshot and destroy are in case --no-sync-snap is not used + default = [ "bookmark" "hold" "send" "snapshot" "destroy" ]; + description = '' + Permissions granted for the user + for local source datasets. See + + for available permissions. + ''; + }; + + localTargetAllow = mkOption { + type = types.listOf types.str; + default = [ "change-key" "compression" "create" "mount" "mountpoint" "receive" "rollback" ]; + example = [ "create" "mount" "receive" "rollback" ]; + description = '' + Permissions granted for the user + for local target datasets. See + + for available permissions. + Make sure to include the change-key permission if you send raw encrypted datasets, + the compression permission if you send raw compressed datasets, and so on. + For remote target datasets you'll have to set your remote user permissions by yourself. + ''; + }; + commonArgs = mkOption { type = types.listOf types.str; default = [ ]; @@ -133,6 +160,30 @@ in ''; }; + localSourceAllow = mkOption { + type = types.listOf types.str; + description = '' + Permissions granted for the user + for local source datasets. See + + for available permissions. + Defaults to option. + ''; + }; + + localTargetAllow = mkOption { + type = types.listOf types.str; + description = '' + Permissions granted for the user + for local target datasets. See + + for available permissions. + Make sure to include the change-key permission if you send raw encrypted datasets, + the compression permission if you send raw compressed datasets, and so on. + For remote target datasets you'll have to set your remote user permissions by yourself. + ''; + }; + sendOptions = mkOption { type = types.separatedString " "; default = ""; @@ -179,6 +230,8 @@ in config = { source = mkDefault name; sshKey = mkDefault cfg.sshKey; + localSourceAllow = mkDefault cfg.localSourceAllow; + localTargetAllow = mkDefault cfg.localTargetAllow; }; })); default = { }; @@ -221,13 +274,11 @@ in path = [ "/run/booted-system/sw/bin/" ]; serviceConfig = { ExecStartPre = - # Permissions snapshot and destroy are in case --no-sync-snap is not used - (map (buildAllowCommand "allow" [ "bookmark" "hold" "send" "snapshot" "destroy" ]) (localDatasetName c.source)) ++ - (map (buildAllowCommand "allow" [ "create" "mount" "receive" "rollback" ]) (localDatasetName c.target)); + (map (buildAllowCommand "allow" c.localSourceAllow) (localDatasetName c.source)) ++ + (map (buildAllowCommand "allow" c.localTargetAllow) (localDatasetName c.target)); ExecStopPost = - # Permissions snapshot and destroy are in case --no-sync-snap is not used - (map (buildAllowCommand "unallow" [ "bookmark" "hold" "send" "snapshot" "destroy" ]) (localDatasetName c.source)) ++ - (map (buildAllowCommand "unallow" [ "create" "mount" "receive" "rollback" ]) (localDatasetName c.target)); + (map (buildAllowCommand "unallow" c.localSourceAllow) (localDatasetName c.source)) ++ + (map (buildAllowCommand "unallow" c.localTargetAllow) (localDatasetName c.target)); ExecStart = lib.escapeShellArgs ([ "${pkgs.sanoid}/bin/syncoid" ] ++ optionals c.useCommonArgs cfg.commonArgs ++ optional c.recursive "-r" diff --git a/third_party/nixpkgs/nixos/modules/services/blockchain/ethereum/geth.nix b/third_party/nixpkgs/nixos/modules/services/blockchain/ethereum/geth.nix index be3f40f6bd..6c2df95886 100644 --- a/third_party/nixpkgs/nixos/modules/services/blockchain/ethereum/geth.nix +++ b/third_party/nixpkgs/nixos/modules/services/blockchain/ethereum/geth.nix @@ -83,8 +83,8 @@ let }; syncmode = mkOption { - type = types.enum [ "fast" "full" "light" ]; - default = "fast"; + type = types.enum [ "snap" "fast" "full" "light" ]; + default = "snap"; description = "Blockchain sync mode."; }; diff --git a/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/apiserver.nix b/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/apiserver.nix index f1531caa75..f842f784b3 100644 --- a/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/apiserver.nix +++ b/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/apiserver.nix @@ -190,12 +190,6 @@ in type = nullOr path; }; - kubeletHttps = mkOption { - description = "Whether to use https for connections to kubelet."; - default = true; - type = bool; - }; - preferredAddressTypes = mkOption { description = "List of the preferred NodeAddressTypes to use for kubelet connections."; type = nullOr str; @@ -365,7 +359,6 @@ in "--feature-gates=${concatMapStringsSep "," (feature: "${feature}=true") cfg.featureGates}"} \ ${optionalString (cfg.basicAuthFile != null) "--basic-auth-file=${cfg.basicAuthFile}"} \ - --kubelet-https=${boolToString cfg.kubeletHttps} \ ${optionalString (cfg.kubeletClientCaFile != null) "--kubelet-certificate-authority=${cfg.kubeletClientCaFile}"} \ ${optionalString (cfg.kubeletClientCertFile != null) diff --git a/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/flannel.nix b/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/flannel.nix index 3f55719027..fecea7a15f 100644 --- a/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/flannel.nix +++ b/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/flannel.nix @@ -58,7 +58,7 @@ in services.kubernetes.addonManager.bootstrapAddons = mkIf ((storageBackend == "kubernetes") && (elem "RBAC" top.apiserver.authorizationMode)) { flannel-cr = { - apiVersion = "rbac.authorization.k8s.io/v1beta1"; + apiVersion = "rbac.authorization.k8s.io/v1"; kind = "ClusterRole"; metadata = { name = "flannel"; }; rules = [{ @@ -79,7 +79,7 @@ in }; flannel-crb = { - apiVersion = "rbac.authorization.k8s.io/v1beta1"; + apiVersion = "rbac.authorization.k8s.io/v1"; kind = "ClusterRoleBinding"; metadata = { name = "flannel"; }; roleRef = { diff --git a/third_party/nixpkgs/nixos/modules/services/misc/matrix-appservice-irc.nix b/third_party/nixpkgs/nixos/modules/services/misc/matrix-appservice-irc.nix index a0a5973d30..02627e51c9 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/matrix-appservice-irc.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/matrix-appservice-irc.nix @@ -10,7 +10,7 @@ let jsonType = (pkgs.formats.json {}).type; - configFile = pkgs.runCommandNoCC "matrix-appservice-irc.yml" { + configFile = pkgs.runCommand "matrix-appservice-irc.yml" { # Because this program will be run at build time, we need `nativeBuildInputs` nativeBuildInputs = [ (pkgs.python3.withPackages (ps: [ ps.pyyaml ps.jsonschema ])) ]; preferLocalBuild = true; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/paperless-ng.nix b/third_party/nixpkgs/nixos/modules/services/misc/paperless-ng.nix new file mode 100644 index 0000000000..9eaf8fa885 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/misc/paperless-ng.nix @@ -0,0 +1,304 @@ +{ config, pkgs, lib, ... }: + +with lib; +let + cfg = config.services.paperless-ng; + + defaultUser = "paperless"; + + env = { + PAPERLESS_DATA_DIR = cfg.dataDir; + PAPERLESS_MEDIA_ROOT = cfg.mediaDir; + PAPERLESS_CONSUMPTION_DIR = cfg.consumptionDir; + GUNICORN_CMD_ARGS = "--bind=${cfg.address}:${toString cfg.port}"; + } // lib.mapAttrs (_: toString) cfg.extraConfig; + + manage = let + setupEnv = lib.concatStringsSep "\n" (mapAttrsToList (name: val: "export ${name}=\"${val}\"") env); + in pkgs.writeShellScript "manage" '' + ${setupEnv} + exec ${cfg.package}/bin/paperless-ng "$@" + ''; + + # Secure the services + defaultServiceConfig = { + TemporaryFileSystem = "/:ro"; + BindReadOnlyPaths = [ + "/nix/store" + "-/etc/resolv.conf" + "-/etc/nsswitch.conf" + "-/etc/hosts" + "-/etc/localtime" + ]; + BindPaths = [ + cfg.consumptionDir + cfg.dataDir + cfg.mediaDir + ]; + CapabilityBoundingSet = ""; + # ProtectClock adds DeviceAllow=char-rtc r + DeviceAllow = ""; + LockPersonality = true; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; + PrivateDevices = true; + PrivateMounts = true; + # Needs to connect to redis + # PrivateNetwork = true; + PrivateTmp = true; + PrivateUsers = true; + ProcSubset = "pid"; + ProtectClock = true; + # Breaks if the home dir of the user is in /home + # Also does not add much value in combination with the TemporaryFileSystem. + # ProtectHome = true; + ProtectHostname = true; + # Would re-mount paths ignored by temporary root + #ProtectSystem = "strict"; + ProtectControlGroups = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ "@system-service" "~@privileged @resources @setuid @keyring" ]; + # Does not work well with the temporary root + #UMask = "0066"; + }; +in +{ + meta.maintainers = with maintainers; [ earvstedt Flakebi ]; + + imports = [ + (mkRemovedOptionModule [ "services" "paperless"] '' + The paperless module has been removed as the upstream project died. + Users should migrate to the paperless-ng module (services.paperless-ng). + More information can be found in the NixOS 21.11 release notes. + '') + ]; + + options.services.paperless-ng = { + enable = mkOption { + type = lib.types.bool; + default = false; + description = '' + Enable Paperless-ng. + + When started, the Paperless database is automatically created if it doesn't + exist and updated if the Paperless package has changed. + Both tasks are achieved by running a Django migration. + + A script to manage the Paperless instance (by wrapping Django's manage.py) is linked to + ''${dataDir}/paperless-ng-manage. + ''; + }; + + dataDir = mkOption { + type = types.str; + default = "/var/lib/paperless"; + description = "Directory to store the Paperless data."; + }; + + mediaDir = mkOption { + type = types.str; + default = "${cfg.dataDir}/media"; + defaultText = "\${dataDir}/consume"; + description = "Directory to store the Paperless documents."; + }; + + consumptionDir = mkOption { + type = types.str; + default = "${cfg.dataDir}/consume"; + defaultText = "\${dataDir}/consume"; + description = "Directory from which new documents are imported."; + }; + + consumptionDirIsPublic = mkOption { + type = types.bool; + default = false; + description = "Whether all users can write to the consumption dir."; + }; + + passwordFile = mkOption { + type = types.nullOr types.path; + default = null; + example = "/run/keys/paperless-ng-password"; + description = '' + A file containing the superuser password. + + A superuser is required to access the web interface. + If unset, you can create a superuser manually by running + ''${dataDir}/paperless-ng-manage createsuperuser. + + The default superuser name is admin. To change it, set + option . + WARNING: When changing the superuser name after the initial setup, the old superuser + will continue to exist. + + To disable login for the web interface, set the following: + extraConfig.PAPERLESS_AUTO_LOGIN_USERNAME = "admin";. + WARNING: Only use this on a trusted system without internet access to Paperless. + ''; + }; + + address = mkOption { + type = types.str; + default = "localhost"; + description = "Web interface address."; + }; + + port = mkOption { + type = types.port; + default = 28981; + description = "Web interface port."; + }; + + extraConfig = mkOption { + type = types.attrs; + default = {}; + description = '' + Extra paperless-ng config options. + + See the documentation + for available options. + ''; + example = literalExample '' + { + PAPERLESS_OCR_LANGUAGE = "deu+eng"; + } + ''; + }; + + user = mkOption { + type = types.str; + default = defaultUser; + description = "User under which Paperless runs."; + }; + + package = mkOption { + type = types.package; + default = pkgs.paperless-ng; + defaultText = "pkgs.paperless-ng"; + description = "The Paperless package to use."; + }; + }; + + config = mkIf cfg.enable { + # Enable redis if no special url is set + services.redis.enable = mkIf (!hasAttr "PAPERLESS_REDIS" env) true; + + systemd.tmpfiles.rules = [ + "d '${cfg.dataDir}' - ${cfg.user} ${config.users.users.${cfg.user}.group} - -" + "d '${cfg.mediaDir}' - ${cfg.user} ${config.users.users.${cfg.user}.group} - -" + (if cfg.consumptionDirIsPublic then + "d '${cfg.consumptionDir}' 777 - - - -" + else + "d '${cfg.consumptionDir}' - ${cfg.user} ${config.users.users.${cfg.user}.group} - -" + ) + ]; + + systemd.services.paperless-ng-server = { + description = "Paperless document server"; + serviceConfig = defaultServiceConfig // { + User = cfg.user; + ExecStart = "${cfg.package}/bin/paperless-ng qcluster"; + Restart = "on-failure"; + }; + environment = env; + wantedBy = [ "multi-user.target" ]; + wants = [ "paperless-ng-consumer.service" "paperless-ng-web.service" ]; + + preStart = '' + ln -sf ${manage} ${cfg.dataDir}/paperless-ng-manage + + # Auto-migrate on first run or if the package has changed + versionFile="${cfg.dataDir}/src-version" + if [[ $(cat "$versionFile" 2>/dev/null) != ${cfg.package} ]]; then + ${cfg.package}/bin/paperless-ng migrate + echo ${cfg.package} > "$versionFile" + fi + '' + + optionalString (cfg.passwordFile != null) '' + export PAPERLESS_ADMIN_USER="''${PAPERLESS_ADMIN_USER:-admin}" + export PAPERLESS_ADMIN_PASSWORD=$(cat "${cfg.dataDir}/superuser-password") + superuserState="$PAPERLESS_ADMIN_USER:$PAPERLESS_ADMIN_PASSWORD" + superuserStateFile="${cfg.dataDir}/superuser-state" + + if [[ $(cat "$superuserStateFile" 2>/dev/null) != $superuserState ]]; then + ${cfg.package}/bin/paperless-ng manage_superuser + echo "$superuserState" > "$superuserStateFile" + fi + ''; + }; + + # Password copying can't be implemented as a privileged preStart script + # in 'paperless-ng-server' because 'defaultServiceConfig' limits the filesystem + # paths accessible by the service. + systemd.services.paperless-ng-copy-password = mkIf (cfg.passwordFile != null) { + requiredBy = [ "paperless-ng-server.service" ]; + before = [ "paperless-ng-server.service" ]; + serviceConfig = { + ExecStart = '' + ${pkgs.coreutils}/bin/install --mode 600 --owner '${cfg.user}' --compare \ + '${cfg.passwordFile}' '${cfg.dataDir}/superuser-password' + ''; + Type = "oneshot"; + }; + }; + + systemd.services.paperless-ng-consumer = { + description = "Paperless document consumer"; + serviceConfig = defaultServiceConfig // { + User = cfg.user; + ExecStart = "${cfg.package}/bin/paperless-ng document_consumer"; + Restart = "on-failure"; + }; + environment = env; + # Bind to `paperless-ng-server` so that the consumer never runs + # during migrations + bindsTo = [ "paperless-ng-server.service" ]; + after = [ "paperless-ng-server.service" ]; + }; + + systemd.services.paperless-ng-web = { + description = "Paperless web server"; + serviceConfig = defaultServiceConfig // { + User = cfg.user; + ExecStart = '' + ${pkgs.python3Packages.gunicorn}/bin/gunicorn \ + -c ${cfg.package}/lib/paperless-ng/gunicorn.conf.py paperless.asgi:application + ''; + Restart = "on-failure"; + + AmbientCapabilities = "CAP_NET_BIND_SERVICE"; + CapabilityBoundingSet = "CAP_NET_BIND_SERVICE"; + # gunicorn needs setuid + SystemCallFilter = defaultServiceConfig.SystemCallFilter ++ [ "@setuid" ]; + }; + environment = env // { + PATH = mkForce cfg.package.path; + PYTHONPATH = "${cfg.package.pythonPath}:${cfg.package}/lib/paperless-ng/src"; + }; + # Bind to `paperless-ng-server` so that the web server never runs + # during migrations + bindsTo = [ "paperless-ng-server.service" ]; + after = [ "paperless-ng-server.service" ]; + }; + + users = optionalAttrs (cfg.user == defaultUser) { + users.${defaultUser} = { + group = defaultUser; + uid = config.ids.uids.paperless; + home = cfg.dataDir; + }; + + groups.${defaultUser} = { + gid = config.ids.gids.paperless; + }; + }; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/misc/paperless.nix b/third_party/nixpkgs/nixos/modules/services/misc/paperless.nix deleted file mode 100644 index 43730b80eb..0000000000 --- a/third_party/nixpkgs/nixos/modules/services/misc/paperless.nix +++ /dev/null @@ -1,183 +0,0 @@ -{ config, pkgs, lib, ... }: - -with lib; -let - cfg = config.services.paperless; - - defaultUser = "paperless"; - - manage = cfg.package.withConfig { - config = { - PAPERLESS_CONSUMPTION_DIR = cfg.consumptionDir; - PAPERLESS_INLINE_DOC = "true"; - PAPERLESS_DISABLE_LOGIN = "true"; - } // cfg.extraConfig; - inherit (cfg) dataDir ocrLanguages; - paperlessPkg = cfg.package; - }; -in -{ - options.services.paperless = { - enable = mkOption { - type = lib.types.bool; - default = false; - description = '' - Enable Paperless. - - When started, the Paperless database is automatically created if it doesn't - exist and updated if the Paperless package has changed. - Both tasks are achieved by running a Django migration. - ''; - }; - - dataDir = mkOption { - type = types.str; - default = "/var/lib/paperless"; - description = "Directory to store the Paperless data."; - }; - - consumptionDir = mkOption { - type = types.str; - default = "${cfg.dataDir}/consume"; - defaultText = "\${dataDir}/consume"; - description = "Directory from which new documents are imported."; - }; - - consumptionDirIsPublic = mkOption { - type = types.bool; - default = false; - description = "Whether all users can write to the consumption dir."; - }; - - ocrLanguages = mkOption { - type = with types; nullOr (listOf str); - default = null; - description = '' - Languages available for OCR via Tesseract, specified as - ISO 639-2/T language codes. - If unset, defaults to all available languages. - ''; - example = [ "eng" "spa" "jpn" ]; - }; - - address = mkOption { - type = types.str; - default = "localhost"; - description = "Server listening address."; - }; - - port = mkOption { - type = types.port; - default = 28981; - description = "Server port to listen on."; - }; - - extraConfig = mkOption { - type = types.attrs; - default = {}; - description = '' - Extra paperless config options. - - The config values are evaluated as double-quoted Bash string literals. - - See paperless-src/paperless.conf.example for available options. - - To enable user authentication, set PAPERLESS_DISABLE_LOGIN = "false" - and run the shell command $dataDir/paperless-manage createsuperuser. - - To define secret options without storing them in /nix/store, use the following pattern: - PAPERLESS_PASSPHRASE = "$(< /etc/my_passphrase_file)" - ''; - example = literalExample '' - { - PAPERLESS_OCR_LANGUAGE = "deu"; - } - ''; - }; - - user = mkOption { - type = types.str; - default = defaultUser; - description = "User under which Paperless runs."; - }; - - package = mkOption { - type = types.package; - default = pkgs.paperless; - defaultText = "pkgs.paperless"; - description = "The Paperless package to use."; - }; - - manage = mkOption { - type = types.package; - readOnly = true; - default = manage; - description = '' - A script to manage the Paperless instance. - It wraps Django's manage.py and is also available at - $dataDir/manage-paperless - ''; - }; - }; - - config = mkIf cfg.enable { - - systemd.tmpfiles.rules = [ - "d '${cfg.dataDir}' - ${cfg.user} ${config.users.users.${cfg.user}.group} - -" - ] ++ (optional cfg.consumptionDirIsPublic - "d '${cfg.consumptionDir}' 777 - - - -" - # If the consumption dir is not created here, it's automatically created by - # 'manage' with the default permissions. - ); - - systemd.services.paperless-consumer = { - description = "Paperless document consumer"; - serviceConfig = { - User = cfg.user; - ExecStart = "${manage} document_consumer"; - Restart = "always"; - }; - after = [ "systemd-tmpfiles-setup.service" ]; - wantedBy = [ "multi-user.target" ]; - preStart = '' - if [[ $(readlink ${cfg.dataDir}/paperless-manage) != ${manage} ]]; then - ln -sf ${manage} ${cfg.dataDir}/paperless-manage - fi - - ${manage.setupEnv} - # Auto-migrate on first run or if the package has changed - versionFile="$PAPERLESS_DBDIR/src-version" - if [[ $(cat "$versionFile" 2>/dev/null) != ${cfg.package} ]]; then - python $paperlessSrc/manage.py migrate - echo ${cfg.package} > "$versionFile" - fi - ''; - }; - - systemd.services.paperless-server = { - description = "Paperless document server"; - serviceConfig = { - User = cfg.user; - ExecStart = "${manage} runserver --noreload ${cfg.address}:${toString cfg.port}"; - Restart = "always"; - }; - # Bind to `paperless-consumer` so that the server never runs - # during migrations - bindsTo = [ "paperless-consumer.service" ]; - after = [ "paperless-consumer.service" ]; - wantedBy = [ "multi-user.target" ]; - }; - - users = optionalAttrs (cfg.user == defaultUser) { - users.${defaultUser} = { - group = defaultUser; - uid = config.ids.uids.paperless; - home = cfg.dataDir; - }; - - groups.${defaultUser} = { - gid = config.ids.gids.paperless; - }; - }; - }; -} diff --git a/third_party/nixpkgs/nixos/modules/services/misc/sourcehut/builds.nix b/third_party/nixpkgs/nixos/modules/services/misc/sourcehut/builds.nix index a17a1010db..e446f08284 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/sourcehut/builds.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/sourcehut/builds.nix @@ -84,7 +84,7 @@ in (rev: archs: lib.attrsets.mapAttrsToList (arch: image: - pkgs.runCommandNoCC "buildsrht-images" { } '' + pkgs.runCommand "buildsrht-images" { } '' mkdir -p $out/${distro}/${rev}/${arch} ln -s ${image}/*.qcow2 $out/${distro}/${rev}/${arch}/root.img.qcow2 '') @@ -97,7 +97,7 @@ in "${pkgs.sourcehut.buildsrht}/lib/images" ]; }; - image_dir = pkgs.runCommandNoCC "builds.sr.ht-worker-images" { } '' + image_dir = pkgs.runCommand "builds.sr.ht-worker-images" { } '' mkdir -p $out/images cp -Lr ${image_dir_pre}/* $out/images ''; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/default.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/default.nix index 3be247ffb2..1161d18ab1 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/default.nix @@ -10,7 +10,7 @@ let # a wrapper that verifies that the configuration is valid promtoolCheck = what: name: file: if cfg.checkConfig then - pkgs.runCommandNoCCLocal + pkgs.runCommandLocal "${name}-${replaceStrings [" "] [""] what}-checked" { buildInputs = [ cfg.package ]; } '' ln -s ${file} $out @@ -19,7 +19,7 @@ let # Pretty-print JSON to a file writePrettyJSON = name: x: - pkgs.runCommandNoCCLocal name {} '' + pkgs.runCommandLocal name {} '' echo '${builtins.toJSON x}' | ${pkgs.jq}/bin/jq . > $out ''; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/thanos.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/thanos.nix index 474ea4b250..96addf392b 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/thanos.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/thanos.nix @@ -63,7 +63,7 @@ let }; }; - toYAML = name: attrs: pkgs.runCommandNoCC name { + toYAML = name: attrs: pkgs.runCommand name { preferLocalBuild = true; json = builtins.toFile "${name}.json" (builtins.toJSON attrs); nativeBuildInputs = [ pkgs.remarshal ]; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/cjdns.nix b/third_party/nixpkgs/nixos/modules/services/networking/cjdns.nix index f1a504b3e3..ca95d00c2f 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/cjdns.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/cjdns.nix @@ -39,7 +39,7 @@ let }; # Additional /etc/hosts entries for peers with an associated hostname - cjdnsExtraHosts = pkgs.runCommandNoCC "cjdns-hosts" {} '' + cjdnsExtraHosts = pkgs.runCommand "cjdns-hosts" {} '' exec >$out ${concatStringsSep "\n" (mapAttrsToList (k: v: optionalString (v.hostname != "") diff --git a/third_party/nixpkgs/nixos/modules/services/networking/connman.nix b/third_party/nixpkgs/nixos/modules/services/networking/connman.nix index 11f66b05df..608672c644 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/connman.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/connman.nix @@ -150,6 +150,7 @@ in { useDHCP = false; wireless = { enable = mkIf (!enableIwd) true; + dbusControlled = true; iwd = mkIf enableIwd { enable = true; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/ssh/sshd.nix b/third_party/nixpkgs/nixos/modules/services/networking/ssh/sshd.nix index 28d7c82f85..225aee5160 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/ssh/sshd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/ssh/sshd.nix @@ -549,11 +549,7 @@ in LogLevel ${cfg.logLevel} - ${if cfg.useDns then '' - UseDNS yes - '' else '' - UseDNS no - ''} + UseDNS ${if cfg.useDns then "yes" else "no"} ''; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/wpa_supplicant.nix b/third_party/nixpkgs/nixos/modules/services/networking/wpa_supplicant.nix index 6238a351b9..155c6fdd0a 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/wpa_supplicant.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/wpa_supplicant.nix @@ -8,28 +8,108 @@ let else pkgs.wpa_supplicant; cfg = config.networking.wireless; - configFile = if cfg.networks != {} || cfg.extraConfig != "" || cfg.userControlled.enable then pkgs.writeText "wpa_supplicant.conf" '' - ${optionalString cfg.userControlled.enable '' - ctrl_interface=DIR=/run/wpa_supplicant GROUP=${cfg.userControlled.group} - update_config=1''} - ${cfg.extraConfig} - ${concatStringsSep "\n" (mapAttrsToList (ssid: config: with config; let - key = if psk != null - then ''"${psk}"'' - else pskRaw; - baseAuth = if key != null - then "psk=${key}" - else "key_mgmt=NONE"; - in '' - network={ - ssid="${ssid}" - ${optionalString (priority != null) ''priority=${toString priority}''} - ${optionalString hidden "scan_ssid=1"} - ${if (auth != null) then auth else baseAuth} - ${extraConfig} - } - '') cfg.networks)} - '' else "/etc/wpa_supplicant.conf"; + + # Content of wpa_supplicant.conf + generatedConfig = concatStringsSep "\n" ( + (mapAttrsToList mkNetwork cfg.networks) + ++ optional cfg.userControlled.enable (concatStringsSep "\n" + [ "ctrl_interface=/run/wpa_supplicant" + "ctrl_interface_group=${cfg.userControlled.group}" + "update_config=1" + ]) + ++ optional cfg.scanOnLowSignal ''bgscan="simple:30:-70:3600"'' + ++ optional (cfg.extraConfig != "") cfg.extraConfig); + + configFile = + if cfg.networks != {} || cfg.extraConfig != "" || cfg.userControlled.enable + then pkgs.writeText "wpa_supplicant.conf" generatedConfig + else "/etc/wpa_supplicant.conf"; + + # Creates a network block for wpa_supplicant.conf + mkNetwork = ssid: opts: + let + quote = x: ''"${x}"''; + indent = x: " " + x; + + pskString = if opts.psk != null + then quote opts.psk + else opts.pskRaw; + + options = [ + "ssid=${quote ssid}" + (if pskString != null || opts.auth != null + then "key_mgmt=${concatStringsSep " " opts.authProtocols}" + else "key_mgmt=NONE") + ] ++ optional opts.hidden "scan_ssid=1" + ++ optional (pskString != null) "psk=${pskString}" + ++ optionals (opts.auth != null) (filter (x: x != "") (splitString "\n" opts.auth)) + ++ optional (opts.priority != null) "priority=${toString opts.priority}" + ++ optional (opts.extraConfig != "") opts.extraConfig; + in '' + network={ + ${concatMapStringsSep "\n" indent options} + } + ''; + + # Creates a systemd unit for wpa_supplicant bound to a given (or any) interface + mkUnit = iface: + let + deviceUnit = optional (iface != null) "sys-subsystem-net-devices-${utils.escapeSystemdPath iface}.device"; + configStr = if cfg.allowAuxiliaryImperativeNetworks + then "-c /etc/wpa_supplicant.conf -I ${configFile}" + else "-c ${configFile}"; + in { + description = "WPA Supplicant instance" + optionalString (iface != null) " for interface ${iface}"; + + after = deviceUnit; + before = [ "network.target" ]; + wants = [ "network.target" ]; + requires = deviceUnit; + wantedBy = [ "multi-user.target" ]; + stopIfChanged = false; + + path = [ package ]; + + script = + '' + if [ -f /etc/wpa_supplicant.conf -a "/etc/wpa_supplicant.conf" != "${configFile}" ]; then + echo >&2 "<3>/etc/wpa_supplicant.conf present but ignored. Generated ${configFile} is used instead." + fi + + iface_args="-s ${optionalString cfg.dbusControlled "-u"} -D${cfg.driver} ${configStr}" + + ${if iface == null then '' + # detect interfaces automatically + + # check if there are no wireless interfaces + if ! find -H /sys/class/net/* -name wireless | grep -q .; then + # if so, wait until one appears + echo "Waiting for wireless interfaces" + grep -q '^ACTION=add' < <(stdbuf -oL -- udevadm monitor -s net/wlan -pu) + # Note: the above line has been carefully written: + # 1. The process substitution avoids udevadm hanging (after grep has quit) + # until it tries to write to the pipe again. Not even pipefail works here. + # 2. stdbuf is needed because udevadm output is buffered by default and grep + # may hang until more udev events enter the pipe. + fi + + # add any interface found to the daemon arguments + for name in $(find -H /sys/class/net/* -name wireless | cut -d/ -f 5); do + echo "Adding interface $name" + args+="''${args:+ -N} -i$name $iface_args" + done + '' else '' + # add known interface to the daemon arguments + args="-i${iface} $iface_args" + ''} + + # finally start daemon + exec wpa_supplicant $args + ''; + }; + + systemctl = "/run/current-system/systemd/bin/systemctl"; + in { options = { networking.wireless = { @@ -42,6 +122,10 @@ in { description = '' The interfaces wpa_supplicant will use. If empty, it will automatically use all wireless interfaces. + + + A separate wpa_supplicant instance will be started for each interface. + ''; }; @@ -61,6 +145,16 @@ in { ''; }; + scanOnLowSignal = mkOption { + type = types.bool; + default = true; + description = '' + Whether to periodically scan for (better) networks when the signal of + the current one is low. This will make roaming between access points + faster, but will consume more power. + ''; + }; + networks = mkOption { type = types.attrsOf (types.submodule { options = { @@ -89,11 +183,52 @@ in { ''; }; + authProtocols = mkOption { + default = [ + # WPA2 and WPA3 + "WPA-PSK" "WPA-EAP" "SAE" + # 802.11r variants of the above + "FT-PSK" "FT-EAP" "FT-SAE" + ]; + # The list can be obtained by running this command + # awk ' + # /^# key_mgmt: /{ run=1 } + # /^#$/{ run=0 } + # /^# [A-Z0-9-]{2,}/{ if(run){printf("\"%s\"\n", $2)} } + # ' /run/current-system/sw/share/doc/wpa_supplicant/wpa_supplicant.conf.example + type = types.listOf (types.enum [ + "WPA-PSK" + "WPA-EAP" + "IEEE8021X" + "NONE" + "WPA-NONE" + "FT-PSK" + "FT-EAP" + "FT-EAP-SHA384" + "WPA-PSK-SHA256" + "WPA-EAP-SHA256" + "SAE" + "FT-SAE" + "WPA-EAP-SUITE-B" + "WPA-EAP-SUITE-B-192" + "OSEN" + "FILS-SHA256" + "FILS-SHA384" + "FT-FILS-SHA256" + "FT-FILS-SHA384" + "OWE" + "DPP" + ]); + description = '' + The list of authentication protocols accepted by this network. + This corresponds to the key_mgmt option in wpa_supplicant. + ''; + }; + auth = mkOption { type = types.nullOr types.str; default = null; example = '' - key_mgmt=WPA-EAP eap=PEAP identity="user@example.com" password="secret" @@ -200,6 +335,16 @@ in { description = "Members of this group can control wpa_supplicant."; }; }; + + dbusControlled = mkOption { + type = types.bool; + default = lib.length cfg.interfaces < 2; + description = '' + Whether to enable the DBus control interface. + This is only needed when using NetworkManager or connman. + ''; + }; + extraConfig = mkOption { type = types.str; default = ""; @@ -223,80 +368,47 @@ in { assertions = flip mapAttrsToList cfg.networks (name: cfg: { assertion = with cfg; count (x: x != null) [ psk pskRaw auth ] <= 1; message = ''options networking.wireless."${name}".{psk,pskRaw,auth} are mutually exclusive''; - }); - - environment.systemPackages = [ package ]; - - services.dbus.packages = [ package ]; + }) ++ [ + { + assertion = length cfg.interfaces > 1 -> !cfg.dbusControlled; + message = + let daemon = if config.networking.networkmanager.enable then "NetworkManager" else + if config.services.connman.enable then "connman" else null; + n = toString (length cfg.interfaces); + in '' + It's not possible to run multiple wpa_supplicant instances with DBus support. + Note: you're seeing this error because `networking.wireless.interfaces` has + ${n} entries, implying an equal number of wpa_supplicant instances. + '' + optionalString (daemon != null) '' + You don't need to change `networking.wireless.interfaces` when using ${daemon}: + in this case the interfaces will be configured automatically for you. + ''; + } + ]; hardware.wirelessRegulatoryDatabase = true; - # FIXME: start a separate wpa_supplicant instance per interface. - systemd.services.wpa_supplicant = let - ifaces = cfg.interfaces; - deviceUnit = interface: [ "sys-subsystem-net-devices-${utils.escapeSystemdPath interface}.device" ]; - in { - description = "WPA Supplicant"; + environment.systemPackages = [ package ]; + services.dbus.packages = optional cfg.dbusControlled package; - after = lib.concatMap deviceUnit ifaces; - before = [ "network.target" ]; - wants = [ "network.target" ]; - requires = lib.concatMap deviceUnit ifaces; - wantedBy = [ "multi-user.target" ]; - stopIfChanged = false; + systemd.services = + if cfg.interfaces == [] + then { wpa_supplicant = mkUnit null; } + else listToAttrs (map (i: nameValuePair "wpa_supplicant-${i}" (mkUnit i)) cfg.interfaces); - path = [ package pkgs.udev ]; + # Restart wpa_supplicant after resuming from sleep + powerManagement.resumeCommands = concatStringsSep "\n" ( + optional (cfg.interfaces == []) "${systemctl} try-restart wpa_supplicant" + ++ map (i: "${systemctl} try-restart wpa_supplicant-${i}") cfg.interfaces + ); - script = let - configStr = if cfg.allowAuxiliaryImperativeNetworks - then "-c /etc/wpa_supplicant.conf -I ${configFile}" - else "-c ${configFile}"; - in '' - if [ -f /etc/wpa_supplicant.conf -a "/etc/wpa_supplicant.conf" != "${configFile}" ]; then - echo >&2 "<3>/etc/wpa_supplicant.conf present but ignored. Generated ${configFile} is used instead." - fi - - iface_args="-s -u -D${cfg.driver} ${configStr}" - - ${if ifaces == [] then '' - # detect interfaces automatically - - # check if there are no wireless interface - if ! find -H /sys/class/net/* -name wireless | grep -q .; then - # if so, wait until one appears - echo "Waiting for wireless interfaces" - grep -q '^ACTION=add' < <(stdbuf -oL -- udevadm monitor -s net/wlan -pu) - # Note: the above line has been carefully written: - # 1. The process substitution avoids udevadm hanging (after grep has quit) - # until it tries to write to the pipe again. Not even pipefail works here. - # 2. stdbuf is needed because udevadm output is buffered by default and grep - # may hang until more udev events enter the pipe. - fi - - # add any interface found to the daemon arguments - for name in $(find -H /sys/class/net/* -name wireless | cut -d/ -f 5); do - echo "Adding interface $name" - args+="''${args:+ -N} -i$name $iface_args" - done - '' else '' - # add known interfaces to the daemon arguments - args="${concatMapStringsSep " -N " (i: "-i${i} $iface_args") ifaces}" - ''} - - # finally start daemon - exec wpa_supplicant $args - ''; - }; - - powerManagement.resumeCommands = '' - /run/current-system/systemd/bin/systemctl try-restart wpa_supplicant - ''; - - # Restart wpa_supplicant when a wlan device appears or disappears. - services.udev.extraRules = '' - ACTION=="add|remove", SUBSYSTEM=="net", ENV{DEVTYPE}=="wlan", RUN+="/run/current-system/systemd/bin/systemctl try-restart wpa_supplicant.service" + # Restart wpa_supplicant when a wlan device appears or disappears. This is + # only needed when an interface hasn't been specified by the user. + services.udev.extraRules = optionalString (cfg.interfaces == []) '' + ACTION=="add|remove", SUBSYSTEM=="net", ENV{DEVTYPE}=="wlan", \ + RUN+="${systemctl} try-restart wpa_supplicant.service" ''; }; - meta.maintainers = with lib.maintainers; [ globin ]; + meta.maintainers = with lib.maintainers; [ globin rnhmjoj ]; } diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/discourse.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/discourse.nix index 8d5302ba26..050e4ee3d3 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/discourse.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/discourse.nix @@ -771,7 +771,6 @@ in "tmp" "assets/javascripts/plugins" "public" - "plugins" "sockets" ]; RuntimeDirectoryMode = 0750; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/discourse.xml b/third_party/nixpkgs/nixos/modules/services/web-apps/discourse.xml index 1d6866e7b3..184c9c6363 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/discourse.xml +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/discourse.xml @@ -284,11 +284,22 @@ services.discourse = { Ruby dependencies are listed in its plugin.rb file as function calls to gem. To construct the corresponding - Gemfile, run bundle + Gemfile manually, run bundle init, then add the gem lines to it verbatim. + + Much of the packaging can be done automatically by the + nixpkgs/pkgs/servers/web-apps/discourse/update.py + script - just add the plugin to the plugins + list in the update_plugins function and run + the script: + +./update.py update-plugins +. + + Some plugins provide site diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/keycloak.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/keycloak.nix index dc66c29665..b1bea222c7 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/keycloak.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/keycloak.nix @@ -281,7 +281,7 @@ in createLocalPostgreSQL = databaseActuallyCreateLocally && cfg.database.type == "postgresql"; createLocalMySQL = databaseActuallyCreateLocally && cfg.database.type == "mysql"; - mySqlCaKeystore = pkgs.runCommandNoCC "mysql-ca-keystore" {} '' + mySqlCaKeystore = pkgs.runCommand "mysql-ca-keystore" {} '' ${pkgs.jre}/bin/keytool -importcert -trustcacerts -alias MySQLCACert -file ${cfg.database.caCert} -keystore $out -storepass notsosecretpassword -noprompt ''; @@ -553,7 +553,7 @@ in jbossCliScript = pkgs.writeText "jboss-cli-script" (mkJbossScript keycloakConfig'); - keycloakConfig = pkgs.runCommandNoCC "keycloak-config" { + keycloakConfig = pkgs.runCommand "keycloak-config" { nativeBuildInputs = [ cfg.package ]; } '' export JBOSS_BASE_DIR="$(pwd -P)"; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/node-red.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/node-red.nix index 16cfb29cf5..4f6850ace2 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/node-red.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/node-red.nix @@ -6,7 +6,7 @@ let cfg = config.services.node-red; defaultUser = "node-red"; finalPackage = if cfg.withNpmAndGcc then node-red_withNpmAndGcc else cfg.package; - node-red_withNpmAndGcc = pkgs.runCommandNoCC "node-red" { + node-red_withNpmAndGcc = pkgs.runCommand "node-red" { nativeBuildInputs = [ pkgs.makeWrapper ]; } '' diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/caddy.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/caddy.nix index 955b975640..0a059723cc 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/caddy.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/caddy.nix @@ -8,10 +8,10 @@ let tlsConfig = { apps.tls.automation.policies = [{ - issuer = { + issuers = [{ inherit (cfg) ca email; module = "acme"; - }; + }]; }]; }; @@ -23,23 +23,28 @@ let # merge the TLS config options we expose with the ones originating in the Caddyfile configJSON = - let tlsConfigMerge = '' - {"apps": - {"tls": - {"automation": - {"policies": - (if .[0].apps.tls.automation.policies == .[1]?.apps.tls.automation.policies - then .[0].apps.tls.automation.policies - else (.[0].apps.tls.automation.policies + .[1]?.apps.tls.automation.policies) - end) + if cfg.ca != null then + let tlsConfigMerge = '' + {"apps": + {"tls": + {"automation": + {"policies": + (if .[0].apps.tls.automation.policies == .[1]?.apps.tls.automation.policies + then .[0].apps.tls.automation.policies + else (.[0].apps.tls.automation.policies + .[1]?.apps.tls.automation.policies) + end) + } } } - } - }''; - in pkgs.runCommand "caddy-config.json" { } '' - ${pkgs.jq}/bin/jq -s '.[0] * ${tlsConfigMerge}' ${adaptedConfig} ${tlsJSON} > $out - ''; -in { + }''; + in + pkgs.runCommand "caddy-config.json" { } '' + ${pkgs.jq}/bin/jq -s '.[0] * ${tlsConfigMerge}' ${adaptedConfig} ${tlsJSON} > $out + '' + else + adaptedConfig; +in +{ imports = [ (mkRemovedOptionModule [ "services" "caddy" "agree" ] "this option is no longer necessary for Caddy 2") ]; @@ -85,11 +90,24 @@ in { ''; }; + resume = mkOption { + default = false; + type = types.bool; + description = '' + Use saved config, if any (and prefer over configuration passed with ). + ''; + }; + ca = mkOption { default = "https://acme-v02.api.letsencrypt.org/directory"; example = "https://acme-staging-v02.api.letsencrypt.org/directory"; - type = types.str; - description = "Certificate authority ACME server. The default (Let's Encrypt production server) should be fine for most people."; + type = types.nullOr types.str; + description = '' + Certificate authority ACME server. The default (Let's Encrypt + production server) should be fine for most people. Set it to null if + you don't want to include any authority (or if you want to write a more + fine-graned configuration manually) + ''; }; email = mkOption { @@ -132,7 +150,7 @@ in { startLimitIntervalSec = 14400; startLimitBurst = 10; serviceConfig = { - ExecStart = "${cfg.package}/bin/caddy run --config ${configJSON}"; + ExecStart = "${cfg.package}/bin/caddy run ${optionalString cfg.resume "--resume"} --config ${configJSON}"; ExecReload = "${cfg.package}/bin/caddy reload --config ${configJSON}"; Type = "simple"; User = cfg.user; diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix index b8c571ace8..6682472fdb 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix @@ -171,6 +171,14 @@ let map_hash_max_size ${toString cfg.mapHashMaxSize}; ''} + ${optionalString (cfg.serverNamesHashBucketSize != null) '' + server_names_hash_bucket_size ${toString cfg.serverNamesHashBucketSize}; + ''} + + ${optionalString (cfg.serverNamesHashMaxSize != null) '' + server_names_hash_max_size ${toString cfg.serverNamesHashMaxSize}; + ''} + # $connection_upgrade is used for websocket proxying map $http_upgrade $connection_upgrade { default upgrade; @@ -233,7 +241,7 @@ let defaultListen = if vhost.listen != [] then vhost.listen else - let addrs = if vhost.listenAddresses != [] then vhost.listenAddreses else ( + let addrs = if vhost.listenAddresses != [] then vhost.listenAddresses else ( [ "0.0.0.0" ] ++ optional enableIPv6 "[::0]" ); in @@ -643,6 +651,23 @@ in ''; }; + serverNamesHashBucketSize = mkOption { + type = types.nullOr types.ints.positive; + default = null; + description = '' + Sets the bucket size for the server names hash tables. Default + value depends on the processor’s cache line size. + ''; + }; + + serverNamesHashMaxSize = mkOption { + type = types.nullOr types.ints.positive; + default = null; + description = '' + Sets the maximum size of the server names hash tables. + ''; + }; + resolver = mkOption { type = types.submodule { options = { diff --git a/third_party/nixpkgs/nixos/modules/system/boot/loader/grub/grub.nix b/third_party/nixpkgs/nixos/modules/system/boot/loader/grub/grub.nix index e183bc3648..1be6636703 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/loader/grub/grub.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/loader/grub/grub.nix @@ -553,6 +553,8 @@ in apply = toString; description = '' Index of the default menu item to be booted. + Can also be set to "saved", which will make GRUB select + the menu item that was used at the last boot. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/system/boot/loader/grub/install-grub.pl b/third_party/nixpkgs/nixos/modules/system/boot/loader/grub/install-grub.pl index e016765474..4d8537d4c3 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/third_party/nixpkgs/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -85,6 +85,7 @@ my $bootloaderId = get("bootloaderId"); my $forceInstall = get("forceInstall"); my $font = get("font"); my $theme = get("theme"); +my $saveDefault = $defaultEntry eq "saved"; $ENV{'PATH'} = get("path"); die "unsupported GRUB version\n" if $grubVersion != 1 && $grubVersion != 2; @@ -250,6 +251,8 @@ if ($copyKernels == 0) { my $conf .= "# Automatically generated. DO NOT EDIT THIS FILE!\n"; if ($grubVersion == 1) { + # $defaultEntry might be "saved", indicating that we want to use the last selected configuration as default. + # Incidentally this is already the correct value for the grub 1 config to achieve this behaviour. $conf .= " default $defaultEntry timeout $timeout @@ -305,6 +308,10 @@ else { " . $grubStore->search; } # FIXME: should use grub-mkconfig. + my $defaultEntryText = $defaultEntry; + if ($saveDefault) { + $defaultEntryText = "\"\${saved_entry}\""; + } $conf .= " " . $grubBoot->search . " if [ -s \$prefix/grubenv ]; then @@ -318,11 +325,19 @@ else { set next_entry= save_env next_entry set timeout=1 + set boot_once=true else - set default=$defaultEntry + set default=$defaultEntryText set timeout=$timeout fi + function savedefault { + if [ -z \"\${boot_once}\"]; then + saved_entry=\"\${chosen}\" + save_env saved_entry + fi + } + # Setup the graphics stack for bios and efi systems if [ \"\${grub_platform}\" = \"efi\" ]; then insmod efi_gop @@ -468,9 +483,16 @@ sub addEntry { $conf .= " $extraPerEntryConfig\n" if $extraPerEntryConfig; $conf .= " kernel $xen $xenParams\n" if $xen; $conf .= " " . ($xen ? "module" : "kernel") . " $kernel $kernelParams\n"; - $conf .= " " . ($xen ? "module" : "initrd") . " $initrd\n\n"; + $conf .= " " . ($xen ? "module" : "initrd") . " $initrd\n"; + if ($saveDefault) { + $conf .= " savedefault\n"; + } + $conf .= "\n"; } else { $conf .= "menuentry \"$name\" " . ($options||"") . " {\n"; + if ($saveDefault) { + $conf .= " savedefault\n"; + } $conf .= $grubBoot->search . "\n"; if ($copyKernels == 0) { $conf .= $grubStore->search . "\n"; @@ -605,6 +627,11 @@ my $efiTarget = getEfiTarget(); # Append entries detected by os-prober if (get("useOSProber") eq "true") { + if ($saveDefault) { + # os-prober will read this to determine if "savedefault" should be added to generated entries + $ENV{'GRUB_SAVEDEFAULT'} = "true"; + } + my $targetpackage = ($efiTarget eq "no") ? $grub : $grubEfi; system(get("shell"), "-c", "pkgdatadir=$targetpackage/share/grub $targetpackage/etc/grub.d/30_os-prober >> $tmpFile"); } diff --git a/third_party/nixpkgs/nixos/modules/system/boot/stage-1.nix b/third_party/nixpkgs/nixos/modules/system/boot/stage-1.nix index d606d473d9..03133fa1bc 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/stage-1.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/stage-1.nix @@ -375,7 +375,7 @@ let } trap cleanup EXIT - tmp=$(mktemp -d initrd-secrets.XXXXXXXXXX) + tmp=$(mktemp -d ''${TMPDIR:-/tmp}/initrd-secrets.XXXXXXXXXX) ${lib.concatStringsSep "\n" (mapAttrsToList (dest: source: let source' = if source == null then dest else toString source; in diff --git a/third_party/nixpkgs/nixos/modules/tasks/network-interfaces-systemd.nix b/third_party/nixpkgs/nixos/modules/tasks/network-interfaces-systemd.nix index 1c145e8ff4..225f9dc67f 100644 --- a/third_party/nixpkgs/nixos/modules/tasks/network-interfaces-systemd.nix +++ b/third_party/nixpkgs/nixos/modules/tasks/network-interfaces-systemd.nix @@ -32,9 +32,6 @@ in assertions = [ { assertion = cfg.defaultGatewayWindowSize == null; message = "networking.defaultGatewayWindowSize is not supported by networkd."; - } { - assertion = cfg.vswitches == {}; - message = "networking.vswitches are not supported by networkd."; } { assertion = cfg.defaultGateway == null || cfg.defaultGateway.interface == null; message = "networking.defaultGateway.interface is not supported by networkd."; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/google-compute-image.nix b/third_party/nixpkgs/nixos/modules/virtualisation/google-compute-image.nix index 79c3921669..0c72696f80 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/google-compute-image.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/google-compute-image.nix @@ -36,6 +36,14 @@ in ``. ''; }; + + virtualisation.googleComputeImage.compressionLevel = mkOption { + type = types.int; + default = 6; + description = '' + GZIP compression level of the resulting disk image (1-9). + ''; + }; }; #### implementation @@ -47,7 +55,8 @@ in PATH=$PATH:${with pkgs; lib.makeBinPath [ gnutar gzip ]} pushd $out mv $diskImage disk.raw - tar -Szcf nixos-image-${config.system.nixos.label}-${pkgs.stdenv.hostPlatform.system}.raw.tar.gz disk.raw + tar -Sc disk.raw | gzip -${toString cfg.compressionLevel} > \ + nixos-image-${config.system.nixos.label}-${pkgs.stdenv.hostPlatform.system}.raw.tar.gz rm $out/disk.raw popd ''; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/podman.nix b/third_party/nixpkgs/nixos/modules/virtualisation/podman.nix index e245004e04..893afee4c3 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/podman.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/podman.nix @@ -9,7 +9,7 @@ let podmanPackage = (pkgs.podman.override { inherit (cfg) extraPackages; }); # Provides a fake "docker" binary mapping to podman - dockerCompat = pkgs.runCommandNoCC "${podmanPackage.pname}-docker-compat-${podmanPackage.version}" { + dockerCompat = pkgs.runCommand "${podmanPackage.pname}-docker-compat-${podmanPackage.version}" { outputs = [ "out" "man" ]; inherit (podmanPackage) meta; } '' diff --git a/third_party/nixpkgs/nixos/tests/all-tests.nix b/third_party/nixpkgs/nixos/tests/all-tests.nix index 8369f60e7b..e1ad011b22 100644 --- a/third_party/nixpkgs/nixos/tests/all-tests.nix +++ b/third_party/nixpkgs/nixos/tests/all-tests.nix @@ -259,6 +259,7 @@ in miniflux = handleTest ./miniflux.nix {}; minio = handleTest ./minio.nix {}; misc = handleTest ./misc.nix {}; + mod_perl = handleTest ./mod_perl.nix {}; moinmoin = handleTest ./moinmoin.nix {}; mongodb = handleTest ./mongodb.nix {}; moodle = handleTest ./moodle.nix {}; @@ -282,6 +283,7 @@ in nat.firewall = handleTest ./nat.nix { withFirewall = true; }; nat.firewall-conntrack = handleTest ./nat.nix { withFirewall = true; withConntrackHelpers = true; }; nat.standalone = handleTest ./nat.nix { withFirewall = false; }; + navidrome = handleTest ./navidrome.nix {}; ncdns = handleTest ./ncdns.nix {}; ndppd = handleTest ./ndppd.nix {}; nebula = handleTest ./nebula.nix {}; @@ -334,7 +336,7 @@ in pam-oath-login = handleTest ./pam-oath-login.nix {}; pam-u2f = handleTest ./pam-u2f.nix {}; pantheon = handleTest ./pantheon.nix {}; - paperless = handleTest ./paperless.nix {}; + paperless-ng = handleTest ./paperless-ng.nix {}; pdns-recursor = handleTest ./pdns-recursor.nix {}; peerflix = handleTest ./peerflix.nix {}; pgjwt = handleTest ./pgjwt.nix {}; diff --git a/third_party/nixpkgs/nixos/tests/discourse.nix b/third_party/nixpkgs/nixos/tests/discourse.nix index 2ed6fb957c..7dd39085a0 100644 --- a/third_party/nixpkgs/nixos/tests/discourse.nix +++ b/third_party/nixpkgs/nixos/tests/discourse.nix @@ -4,7 +4,7 @@ # 3. replying to that message via email. import ./make-test-python.nix ( - { pkgs, lib, ... }: + { pkgs, lib, package ? pkgs.discourse, ... }: let certs = import ./common/acme/server/snakeoil-certs.nix; clientDomain = "client.fake.domain"; @@ -55,7 +55,7 @@ import ./make-test-python.nix ( services.discourse = { enable = true; - inherit admin; + inherit admin package; hostname = discourseDomain; sslCertificate = "${certs.${discourseDomain}.cert}"; sslCertificateKey = "${certs.${discourseDomain}.key}"; diff --git a/third_party/nixpkgs/nixos/tests/doas.nix b/third_party/nixpkgs/nixos/tests/doas.nix index 9c0a4bdc75..5e9ce4b2c7 100644 --- a/third_party/nixpkgs/nixos/tests/doas.nix +++ b/third_party/nixpkgs/nixos/tests/doas.nix @@ -78,6 +78,13 @@ import ./make-test-python.nix ( 'su - test7 -c "SSH_AUTH_SOCK=HOLEY doas env"' ): raise Exception("failed to exclude SSH_AUTH_SOCK") + + # Test that the doas setuid wrapper precedes the unwrapped version in PATH after + # calling doas. + # The PATH set by doas is defined in + # ../../pkgs/tools/security/doas/0001-add-NixOS-specific-dirs-to-safe-PATH.patch + with subtest("recursive calls to doas from subprocesses should succeed"): + machine.succeed('doas -u test0 sh -c "doas -u test0 true"') ''; } ) diff --git a/third_party/nixpkgs/nixos/tests/hardened.nix b/third_party/nixpkgs/nixos/tests/hardened.nix index 485efc0fb7..a0b629086b 100644 --- a/third_party/nixpkgs/nixos/tests/hardened.nix +++ b/third_party/nixpkgs/nixos/tests/hardened.nix @@ -33,18 +33,7 @@ import ./make-test-python.nix ({ pkgs, latestKernel ? false, ... } : { testScript = let - hardened-malloc-tests = pkgs.stdenv.mkDerivation { - name = "hardened-malloc-tests-${pkgs.graphene-hardened-malloc.version}"; - src = pkgs.graphene-hardened-malloc.src; - buildPhase = '' - cd test/simple-memory-corruption - make -j4 - ''; - - installPhase = '' - find . -type f -executable -exec install -Dt $out/bin '{}' + - ''; - }; + hardened-malloc-tests = pkgs.graphene-hardened-malloc.ld-preload-tests; in '' machine.wait_for_unit("multi-user.target") @@ -107,20 +96,7 @@ import ./make-test-python.nix ({ pkgs, latestKernel ? false, ... } : { machine.fail("systemctl kexec") - # Test hardened memory allocator - def runMallocTestProg(prog_name, error_text): - text = "fatal allocator error: " + error_text - if not text in machine.fail( - "${hardened-malloc-tests}/bin/" - + prog_name - + " 2>&1" - ): - raise Exception("Hardened malloc does not work for {}".format(error_text)) - - with subtest("The hardened memory allocator works"): - runMallocTestProg("double_free_large", "invalid free") - runMallocTestProg("unaligned_free_small", "invalid unaligned free") - runMallocTestProg("write_after_free_small", "detected write after free") + machine.succeed("${hardened-malloc-tests}/bin/run-tests") ''; }) diff --git a/third_party/nixpkgs/nixos/tests/hockeypuck.nix b/third_party/nixpkgs/nixos/tests/hockeypuck.nix index 79313f314f..19df9dee3d 100644 --- a/third_party/nixpkgs/nixos/tests/hockeypuck.nix +++ b/third_party/nixpkgs/nixos/tests/hockeypuck.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: let - gpgKeyring = (pkgs.runCommandNoCC "gpg-keyring" { buildInputs = [ pkgs.gnupg ]; } '' + gpgKeyring = (pkgs.runCommand "gpg-keyring" { buildInputs = [ pkgs.gnupg ]; } '' mkdir -p $out export GNUPGHOME=$out cat > foo < qw(OK); + sub handler { + my $r = shift; + $r->content_type('text/plain'); + print "Hello mod_perl!\n"; + return Apache2::Const::OK; + } + 1; + ''; + startup = pkgs.writeScript "startup.pl" '' + use lib "${inc}", + split ":","${with pkgs.perl.pkgs; makeFullPerlPath ([ mod_perl2 ])}"; + 1; + ''; + in + { + extraConfig = '' + PerlRequire ${startup} + ''; + locations."/modperl" = { + extraConfig = '' + SetHandler perl-script + PerlResponseHandler ModPerlTest + ''; + }; + }; + enablePerl = true; + }; + }; + testScript = { ... }: '' + machine.wait_for_unit("httpd.service") + response = machine.succeed("curl -fvvv -s http://127.0.0.1:80/modperl") + assert "Hello mod_perl!" in response, "/modperl handler did not respond" + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/navidrome.nix b/third_party/nixpkgs/nixos/tests/navidrome.nix new file mode 100644 index 0000000000..42e14720b2 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/navidrome.nix @@ -0,0 +1,12 @@ +import ./make-test-python.nix ({ pkgs, ... }: { + name = "navidrome"; + + machine = { ... }: { + services.navidrome.enable = true; + }; + + testScript = '' + machine.wait_for_unit("navidrome") + machine.wait_for_open_port("4533") + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/paperless-ng.nix b/third_party/nixpkgs/nixos/tests/paperless-ng.nix new file mode 100644 index 0000000000..d8aafc2a08 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/paperless-ng.nix @@ -0,0 +1,36 @@ +import ./make-test-python.nix ({ lib, ... }: { + name = "paperless-ng"; + meta.maintainers = with lib.maintainers; [ earvstedt Flakebi ]; + + nodes.machine = { pkgs, ... }: { + environment.systemPackages = with pkgs; [ imagemagick jq ]; + services.paperless-ng = { + enable = true; + passwordFile = builtins.toFile "password" "admin"; + }; + virtualisation.memorySize = 1024; + }; + + testScript = '' + machine.wait_for_unit("paperless-ng-consumer.service") + + with subtest("Create test doc"): + machine.succeed( + "convert -size 400x40 xc:white -font 'DejaVu-Sans' -pointsize 20 -fill black " + "-annotate +5+20 'hello world 16-10-2005' /var/lib/paperless/consume/doc.png" + ) + + with subtest("Web interface gets ready"): + machine.wait_for_unit("paperless-ng-web.service") + # Wait until server accepts connections + machine.wait_until_succeeds("curl -fs localhost:28981") + + with subtest("Document is consumed"): + machine.wait_until_succeeds( + "(($(curl -u admin:admin -fs localhost:28981/api/documents/ | jq .count) == 1))" + ) + assert "2005-10-16" in machine.succeed( + "curl -u admin:admin -fs localhost:28981/api/documents/ | jq '.results | .[0] | .created'" + ) + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/paperless.nix b/third_party/nixpkgs/nixos/tests/paperless.nix deleted file mode 100644 index fb83e6f976..0000000000 --- a/third_party/nixpkgs/nixos/tests/paperless.nix +++ /dev/null @@ -1,36 +0,0 @@ -import ./make-test-python.nix ({ lib, ... } : { - name = "paperless"; - meta = with lib.maintainers; { - maintainers = [ earvstedt ]; - }; - - machine = { pkgs, ... }: { - environment.systemPackages = with pkgs; [ imagemagick jq ]; - services.paperless = { - enable = true; - ocrLanguages = [ "eng" ]; - }; - }; - - testScript = '' - machine.wait_for_unit("paperless-consumer.service") - - # Create test doc - machine.succeed( - "convert -size 400x40 xc:white -font 'DejaVu-Sans' -pointsize 20 -fill black -annotate +5+20 'hello world 16-10-2005' /var/lib/paperless/consume/doc.png" - ) - - with subtest("Service gets ready"): - machine.wait_for_unit("paperless-server.service") - # Wait until server accepts connections - machine.wait_until_succeeds("curl -fs localhost:28981") - - with subtest("Test document is consumed"): - machine.wait_until_succeeds( - "(($(curl -fs localhost:28981/api/documents/ | jq .count) == 1))" - ) - assert "2005-10-16" in machine.succeed( - "curl -fs localhost:28981/api/documents/ | jq '.results | .[0] | .created'" - ) - ''; -}) diff --git a/third_party/nixpkgs/nixos/tests/pleroma.nix b/third_party/nixpkgs/nixos/tests/pleroma.nix index c1973f88f5..d0ae1488d1 100644 --- a/third_party/nixpkgs/nixos/tests/pleroma.nix +++ b/third_party/nixpkgs/nixos/tests/pleroma.nix @@ -162,7 +162,7 @@ import ./make-test-python.nix ({ pkgs, ... }: pleroma_ctl user new jamy jamy@nixos.test --password 'jamy-password' --moderator --admin -y ''; - tls-cert = pkgs.runCommandNoCC "selfSignedCerts" { buildInputs = [ pkgs.openssl ]; } '' + tls-cert = pkgs.runCommand "selfSignedCerts" { buildInputs = [ pkgs.openssl ]; } '' openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem -nodes -subj '/CN=pleroma.nixos.test' -days 36500 mkdir -p $out cp key.pem cert.pem $out diff --git a/third_party/nixpkgs/nixos/tests/slurm.nix b/third_party/nixpkgs/nixos/tests/slurm.nix index 3702d243b4..a6b02e970b 100644 --- a/third_party/nixpkgs/nixos/tests/slurm.nix +++ b/third_party/nixpkgs/nixos/tests/slurm.nix @@ -43,7 +43,7 @@ let return EXIT_SUCCESS; } ''; - in pkgs.runCommandNoCC "mpitest" {} '' + in pkgs.runCommand "mpitest" {} '' mkdir -p $out/bin ${pkgs.openmpi}/bin/mpicc ${mpitestC} -o $out/bin/mpitest ''; diff --git a/third_party/nixpkgs/nixos/tests/unbound.nix b/third_party/nixpkgs/nixos/tests/unbound.nix index fcfa222299..58a717f98a 100644 --- a/third_party/nixpkgs/nixos/tests/unbound.nix +++ b/third_party/nixpkgs/nixos/tests/unbound.nix @@ -33,7 +33,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: }; }; - cert = pkgs.runCommandNoCC "selfSignedCerts" { buildInputs = [ pkgs.openssl ]; } '' + cert = pkgs.runCommand "selfSignedCerts" { buildInputs = [ pkgs.openssl ]; } '' openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem -nodes -subj '/CN=dns.example.local' mkdir -p $out cp key.pem cert.pem $out diff --git a/third_party/nixpkgs/nixos/tests/xmpp/prosody.nix b/third_party/nixpkgs/nixos/tests/xmpp/prosody.nix index a004b124dd..c343b58087 100644 --- a/third_party/nixpkgs/nixos/tests/xmpp/prosody.nix +++ b/third_party/nixpkgs/nixos/tests/xmpp/prosody.nix @@ -1,5 +1,5 @@ let - cert = pkgs: pkgs.runCommandNoCC "selfSignedCerts" { buildInputs = [ pkgs.openssl ]; } '' + cert = pkgs: pkgs.runCommand "selfSignedCerts" { buildInputs = [ pkgs.openssl ]; } '' openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem -nodes -subj '/CN=example.com/CN=uploads.example.com/CN=conference.example.com' -days 36500 mkdir -p $out cp key.pem cert.pem $out diff --git a/third_party/nixpkgs/pkgs/applications/audio/friture/default.nix b/third_party/nixpkgs/pkgs/applications/audio/friture/default.nix index 99ce726ca1..8383bdbebc 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/friture/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/friture/default.nix @@ -4,13 +4,13 @@ let py = python3Packages; in py.buildPythonApplication rec { pname = "friture"; - version = "unstable-2020-02-16"; + version = "0.47"; src = fetchFromGitHub { owner = "tlecomte"; repo = pname; - rev = "4460b4e72a9c55310d6438f294424b5be74fc0aa"; - sha256 = "1pmxzq78ibifby3gbir1ah30mgsqv0y7zladf5qf3sl5r1as0yym"; + rev = "v${version}"; + sha256 = "1qcsvmgdz9hhv5gaa918147wvng6manc4iq8ci6yr761ljqrgwjx"; }; nativeBuildInputs = (with py; [ numpy cython scipy ]) ++ diff --git a/third_party/nixpkgs/pkgs/applications/audio/friture/factorial.patch b/third_party/nixpkgs/pkgs/applications/audio/friture/factorial.patch deleted file mode 100644 index de05380293..0000000000 --- a/third_party/nixpkgs/pkgs/applications/audio/friture/factorial.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/friture/filter_design.py b/friture/filter_design.py -index 9876c43..1cc749a 100644 ---- a/friture/filter_design.py -+++ b/friture/filter_design.py -@@ -2,7 +2,7 @@ - from numpy import pi, exp, arange, cos, sin, sqrt, zeros, ones, log, arange, set_printoptions - # the three following lines are a workaround for a bug with scipy and py2exe - # together. See http://www.pyinstaller.org/ticket/83 for reference. --from scipy.misc import factorial -+from scipy.special import factorial - import scipy - scipy.factorial = factorial - diff --git a/third_party/nixpkgs/pkgs/applications/audio/friture/unlock_constraints.patch b/third_party/nixpkgs/pkgs/applications/audio/friture/unlock_constraints.patch index ab53f948a4..6ee474794b 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/friture/unlock_constraints.patch +++ b/third_party/nixpkgs/pkgs/applications/audio/friture/unlock_constraints.patch @@ -1,34 +1,34 @@ diff --git a/setup.py b/setup.py -index f31eeec..ac0927b 100644 +index 4092388..6cb7dac 100644 --- a/setup.py +++ b/setup.py @@ -50,19 +50,19 @@ ext_modules = [LateIncludeExtension("friture_extensions.exp_smoothing_conv", # these will be installed when calling 'pip install friture' # they are also retrieved by 'requirements.txt' install_requires = [ -- "sounddevice==0.3.14", -- "rtmixer==0.1.0", -- "PyOpenGL==3.1.4", -- "PyOpenGL-accelerate==3.1.4", -- "docutils==0.15.2", -- "numpy==1.17.4", -- "PyQt5==5.13.2", -- "appdirs==1.4.3", +- "sounddevice==0.4.2", +- "rtmixer==0.1.3", +- "PyOpenGL==3.1.5", +- "PyOpenGL-accelerate==3.1.5", +- "docutils==0.17.1", +- "numpy==1.21.1", +- "PyQt5==5.15.4", +- "appdirs==1.4.4", - "pyrr==0.10.3", -+ "sounddevice>=0.3.14", -+ "rtmixer>=0.1.0", ++ "sounddevice>=0.4.1", ++ "rtmixer>=0.1.1", + "PyOpenGL>=3.1.4", -+ "PyOpenGL-accelerate>=3.1.4", -+ "docutils>=0.15.2", -+ "numpy>=1.17.4", -+ "PyQt5>=5.13.2", -+ "appdirs>=1.4.3", ++ "PyOpenGL-accelerate>=3.1.5", ++ "docutils>=0.17.1", ++ "numpy>=1.20.3", ++ "PyQt5>=5.15.4", ++ "appdirs>=1.4.4", + "pyrr>=0.10.3", ] # Cython and numpy are needed when running setup.py, to build extensions --setup_requires=["numpy==1.17.4", "Cython==0.29.14"] -+setup_requires=["numpy>=1.17.4", "Cython>=0.29.14"] +-setup_requires=["numpy==1.21.1", "Cython==0.29.24"] ++setup_requires=["numpy>=1.20.3", "Cython>=0.29.22"] with open(join(dirname(__file__), 'README.rst')) as f: long_description = f.read() diff --git a/third_party/nixpkgs/pkgs/applications/audio/hqplayer-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/audio/hqplayer-desktop/default.nix index a0443aa9a6..38b7e04060 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/hqplayer-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/hqplayer-desktop/default.nix @@ -18,11 +18,11 @@ mkDerivation rec { pname = "hqplayer-desktop"; - version = "4.12.2-36"; + version = "4.13.1-38"; src = fetchurl { url = "https://www.signalyst.eu/bins/hqplayer/fc34/hqplayer4desktop-${version}.fc34.x86_64.rpm"; - sha256 = "sha256-ng0Tkx6CSnzTxuunStaBhUYjxUmzx31ZaOY2gBWnH6Q="; + sha256 = "sha256-DEZWEGk5SfhcNQddehCBVbfeTH8KfVCdaxQ+F3MrRe8="; }; unpackPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/audio/kid3/default.nix b/third_party/nixpkgs/pkgs/applications/audio/kid3/default.nix index 7f8015e714..7dd5594a9a 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/kid3/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/kid3/default.nix @@ -28,11 +28,11 @@ stdenv.mkDerivation rec { pname = "kid3"; - version = "3.8.6"; + version = "3.8.7"; src = fetchurl { url = "https://download.kde.org/stable/${pname}/${version}/${pname}-${version}.tar.xz"; - hash = "sha256-R4gAWlCw8RezhYbw1XDo+wdp797IbLoM3wqHwr+ul6k="; + sha256 = "sha256-Dr+NLh5ajG42jRKt1Swq6mccPfuAXRvhhoTNuO8lnI0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/mopidy/iris.nix b/third_party/nixpkgs/pkgs/applications/audio/mopidy/iris.nix index c2171d4cec..131b2c680b 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/mopidy/iris.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/mopidy/iris.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "Mopidy-Iris"; - version = "3.54.0"; + version = "3.58.0"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "0qnshn77dv7fl6smwnpnbq67mbc1vic9gf85skiqnqy8v8w5829f"; + sha256 = "1bsmc4p7b6v4mm8fi9zsy0knzdccnz1dc6ckrdr18kw2ji0hiyx2"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/mopidy/spotify.nix b/third_party/nixpkgs/pkgs/applications/audio/mopidy/spotify.nix index e44b9f35da..93f62e23f3 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/mopidy/spotify.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/mopidy/spotify.nix @@ -2,11 +2,11 @@ pythonPackages.buildPythonApplication rec { pname = "mopidy-spotify"; - version = "4.0.1"; + version = "4.1.1"; src = fetchurl { url = "https://github.com/mopidy/mopidy-spotify/archive/v${version}.tar.gz"; - sha256 = "1ac8r8050i5r3ag1hlblbcyskqjqz7wgamndbzsmw52qi6hxk44f"; + sha256 = "0054gqvnx3brpfxr06dcby0z0dirwv9ydi6gj5iz0cxn0fbi6gv2"; }; propagatedBuildInputs = [ mopidy pythonPackages.pyspotify ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/mpdevil/default.nix b/third_party/nixpkgs/pkgs/applications/audio/mpdevil/default.nix index 09256911f8..6dd9b07bdb 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/mpdevil/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/mpdevil/default.nix @@ -6,13 +6,13 @@ python3Packages.buildPythonApplication rec { pname = "mpdevil"; - version = "1.1.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "SoongNoonien"; repo = pname; rev = "v${version}"; - sha256 = "0l7mqv7ys05al2hds4icb32hf14fqi3n7b0f5v1yx54cbl9cqfap"; + sha256 = "1wa5wkkv8kvzlxrhqmmhjmrzcm5v2dij516dk4vlpv9sazc6gzkm"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/mympd/default.nix b/third_party/nixpkgs/pkgs/applications/audio/mympd/default.nix index 03d0556326..0336f8b36d 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/mympd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/mympd/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "mympd"; - version = "7.0.2"; + version = "8.0.3"; src = fetchFromGitHub { owner = "jcorporation"; repo = "myMPD"; rev = "v${version}"; - sha256 = "sha256-2V3LbgnJfTIO71quZ+hfLnw/lNLYxXt19jw2Od6BVvM="; + sha256 = "sha256-J37PH+yRSsPeNCdY2mslrjMoBwutm5xTSIt+TWyf21M="; }; nativeBuildInputs = [ pkg-config cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix b/third_party/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix index 9092ae0b91..2724f88933 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "pt2-clone"; - version = "1.31"; + version = "1.32"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "pt2-clone"; rev = "v${version}"; - sha256 = "sha256-hIm9HWKBTFmxU9jI41PfScZIHpZOZpjvV2jgaMX/KSg="; + sha256 = "sha256-U1q4xCOzV7n31WgCTGlEXvZaUT/TP797cOAHkecQaLo="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/scream/default.nix b/third_party/nixpkgs/pkgs/applications/audio/scream/default.nix index c9eef3ff54..d141935924 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/scream/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/scream/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "scream"; - version = "3.7"; + version = "3.8"; src = fetchFromGitHub { owner = "duncanthrax"; repo = pname; rev = version; - sha256 = "0d9abrw62cd08lcg4il415b7ap89iggbljvbl5jqv2y23il0pvyz"; + sha256 = "sha256-7UzwEoZujTN8i056Wf+0QtjyU+/UZlqcSompiAGHT54="; }; buildInputs = lib.optional pulseSupport libpulseaudio diff --git a/third_party/nixpkgs/pkgs/applications/audio/x42-plugins/default.nix b/third_party/nixpkgs/pkgs/applications/audio/x42-plugins/default.nix index dba9dcc5e5..557802a8a0 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/x42-plugins/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/x42-plugins/default.nix @@ -3,12 +3,12 @@ , libGLU, lv2, gtk2, cairo, pango, fftwFloat, zita-convolver }: stdenv.mkDerivation rec { - version = "20210114"; + version = "20210714"; pname = "x42-plugins"; src = fetchurl { url = "https://gareus.org/misc/x42-plugins/${pname}-${version}.tar.xz"; - sha256 = "sha256-xUiA/k5ZbI/SkY8a20FsyRwqPxxMteiFdEhFF/8e2OA="; + sha256 = "sha256-X389bA+cf3N5eJpAlpDn/CJQ6xM4qzrBQ47fYPIyIHk="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/zita-njbridge/default.nix b/third_party/nixpkgs/pkgs/applications/audio/zita-njbridge/default.nix index 142f9bc4d0..01a2ddf47b 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/zita-njbridge/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/zita-njbridge/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, libjack2, zita-resampler }: stdenv.mkDerivation rec { - version = "0.4.4"; + version = "0.4.8"; pname = "zita-njbridge"; src = fetchurl { url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2"; - sha256 = "1l8rszdjhp0gq7mr54sdgfs6y6cmw11ssmqb1v9yrkrz5rmwzg8j"; + sha256 = "sha256-EBF2oL1AfKt7/9Mm6NaIbBtlshK8M/LvuXsD+SbEeQc="; }; buildInputs = [ libjack2 zita-resampler ]; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/default.nix index ba029aedee..8d549c96c3 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/default.nix @@ -15,13 +15,13 @@ in stdenv.mkDerivation rec { pname = "btcpayserver"; - version = "1.1.2"; + version = "1.2.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-A9XIKCw1dL4vUQYSu6WdmpR82dAbtKVTyjllquyRGgs="; + sha256 = "sha256-pRc0oud8k6ulC6tVXv6Mr7IEC2a/+FhkMDyxz1zFKTE="; }; nativeBuildInputs = [ dotnetSdk dotnetPackages.Nuget makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/deps.nix b/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/deps.nix index 8884dc2fe1..38ce613022 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/deps.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/deps.nix @@ -26,53 +26,48 @@ }) (fetchNuGet { name = "BTCPayServer.Hwi"; - version = "1.1.3"; - sha256 = "1c8hfnrjh2ad8qh75d63gsl170q8czf3j1hk8sv8fnbgnxdnkm7a"; + version = "2.0.1"; + sha256 = "18pp3f0z10c0q1bbllxi2j6ix8f0x58d0dndi5faf9p3hb58ly9k"; }) (fetchNuGet { name = "BTCPayServer.Lightning.All"; - version = "1.2.7"; - sha256 = "0jzmzvlpf6iba2fsc6cyi69vlaim9slqm2sapknmd7drl3gcn2zj"; + version = "1.2.10"; + sha256 = "0c3bi5r7sckzml44bqy0j1cd6l3xc29cdyf6rib52b5gmgrvcam2"; }) (fetchNuGet { name = "BTCPayServer.Lightning.Charge"; - version = "1.2.3"; - sha256 = "1rdrwmijx0v4z0xsq4acyvdcj7hv6arfh3hwjy89rqnkkznrzgwv"; + version = "1.2.5"; + sha256 = "02mf7yhr9lfy5368c5mn1wgxxka52f0s5vx31w97sdkpc5pivng5"; }) (fetchNuGet { name = "BTCPayServer.Lightning.CLightning"; - version = "1.2.3"; - sha256 = "02197rh03q8d0mv40zf67wp1rd2gbxi5l8krd2rzj84n267bcfvc"; + version = "1.2.6"; + sha256 = "1p4bzbrd2d0izjd9q06mnagl31q50hpz5jla9gfja1bhn3xqvwsy"; }) (fetchNuGet { name = "BTCPayServer.Lightning.Common"; - version = "1.2.0"; - sha256 = "17di8ndkw8z0ci0zk15mcrqpmganwkz9ys2snr2rqpw5mrlhpwa0"; - }) - (fetchNuGet { - name = "BTCPayServer.Lightning.Common"; - version = "1.2.2"; - sha256 = "07xb7fsqvfjmcawxylriw60i73h0cvfb765aznhp9ffyrmjaql7z"; + version = "1.2.4"; + sha256 = "1bdj1cdf6sirwm19hq1k2fmh2jiqkcyzrqms6q9d0wqba9xggwyn"; }) (fetchNuGet { name = "BTCPayServer.Lightning.Eclair"; - version = "1.2.2"; - sha256 = "03dymhwxb5s28kb187g5h4aysnz2xzml89p47nmwz9lkg2h4s73h"; + version = "1.2.4"; + sha256 = "1l68sc9g4ffsi1bbgrbbx8zmqw811hjq17761q1han9gsykl5rr1"; }) (fetchNuGet { name = "BTCPayServer.Lightning.LND"; - version = "1.2.4"; - sha256 = "0qnj5rsp6hnybsr58zny9dfbsxksg1674q0z9944jwkzm7pcqyg4"; + version = "1.2.6"; + sha256 = "16wipkzzfrcjhi3whqxdfjq7qxnwjzf4gckpf1qjgdxbzggh6l3d"; }) (fetchNuGet { name = "BTCPayServer.Lightning.Ptarmigan"; - version = "1.2.2"; - sha256 = "17yl85vqfp7l12bv3f3w1b861hm41i7cfhs78gaq04s4drvcnj6k"; + version = "1.2.4"; + sha256 = "1j80m4pb3nn4dnqmxda13lp87pgviwxai456pki097rmc0vmqj83"; }) (fetchNuGet { name = "BuildBundlerMinifier"; - version = "3.2.435"; - sha256 = "0y1p226dbvs7q2ngm9w4mpkhfrhw2y122plv1yff7lx5m84ia02l"; + version = "3.2.449"; + sha256 = "1dcjlfl5w2vfppx2hq3jj6xy24id2x3hcajwylhphlz9jw2bnhsv"; }) (fetchNuGet { name = "BundlerMinifier.Core"; @@ -761,18 +756,8 @@ }) (fetchNuGet { name = "NBitcoin.Altcoins"; - version = "2.0.31"; - sha256 = "13gcfsxpfq8slmsvgzf6iv581x7n535zq0p9c88bqs5p88r6lygm"; - }) - (fetchNuGet { - name = "NBitcoin"; - version = "5.0.33"; - sha256 = "030q609b9lhapq4wfl1w3impjw5m40kz2rg1s9jn3bn8yjfmsi4a"; - }) - (fetchNuGet { - name = "NBitcoin"; - version = "5.0.4"; - sha256 = "04iafda61izzxb691brk72qs01m5dadqb4970nw5ayck6275s71i"; + version = "3.0.3"; + sha256 = "0129mgnyyb55haz68d8z694g1q2rlc0qylx08d5qnfpq1r03cdqd"; }) (fetchNuGet { name = "NBitcoin"; @@ -786,13 +771,18 @@ }) (fetchNuGet { name = "NBitcoin"; - version = "5.0.73"; - sha256 = "0vqgcb0ws5fnkrdzqfkyh78041c6q4l22b93rr0006dd4bmqrmg1"; + version = "5.0.81"; + sha256 = "1fba94kc8yzykb1m5lvpx1hm63mpycpww9cz5zfp85phs1spdn8x"; }) (fetchNuGet { name = "NBitcoin"; - version = "5.0.77"; - sha256 = "0ykz4ii6lh6gdlz6z264wnib5pfnmq9q617qqbg0f04mq654jygb"; + version = "6.0.3"; + sha256 = "1kfq1q86844ssp8myy5vmvg33h3x0p9gqrlc99fl9gm1vzjc723f"; + }) + (fetchNuGet { + name = "NBitcoin"; + version = "6.0.7"; + sha256 = "0mk8n8isrrww0240x63rx3zx12nz5v08i3w62qp1n18mmdw3rdy6"; }) (fetchNuGet { name = "NBitpayClient"; @@ -801,8 +791,8 @@ }) (fetchNuGet { name = "NBXplorer.Client"; - version = "3.0.21"; - sha256 = "1asri2wsjq3ljf2p4r4x52ba9cirh8ccc5ysxpnv4cvladkdazbi"; + version = "4.0.3"; + sha256 = "0x9iggc5cyv06gnwnwrk3riv2j3g0833imdf3jx8ghmrxvim88b3"; }) (fetchNuGet { name = "Nethereum.ABI"; @@ -1116,8 +1106,8 @@ }) (fetchNuGet { name = "Selenium.WebDriver.ChromeDriver"; - version = "88.0.4324.9600"; - sha256 = "0jm8dpfp329xsrg69lzq2m6x9yin1m43qgrhs15cz2qx9f02pdx9"; + version = "90.0.4430.2400"; + sha256 = "18gjm92nzzvxf0hk7c0nnabs0vmh6yyzq3m4si7p21m6xa3bqiga"; }) (fetchNuGet { name = "Selenium.WebDriver"; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/erigon.nix b/third_party/nixpkgs/pkgs/applications/blockchains/erigon.nix index 0d6a395b05..6cdad6bf5f 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/erigon.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/erigon.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "erigon"; - version = "2021.08.01"; + version = "2021.08.02"; src = fetchFromGitHub { owner = "ledgerwatch"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fjMkCCeQa/IHB4yXlL7Qi8J9wtZm90l3xIA72LeoW8M="; + sha256 = "sha256-pyqvzpsDk24UEtSx4qmDew9zRK45pD5i4Qv1uJ03tmk="; }; - vendorSha256 = "1vsgd19an592dblm9afasmh8cd0x2frw5pvnxkxd2fikhy2mibbs"; + vendorSha256 = "sha256-FwKlQH8vEtWNDql1pmHzKneIwmJ7cg5LYkETVswO6pc="; runVend = true; # Build errors in mdbx when format hardening is enabled: diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/go-ethereum/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/go-ethereum/default.nix index 28a7b22a24..f087741254 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/go-ethereum/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/go-ethereum/default.nix @@ -9,17 +9,17 @@ let in buildGoModule rec { pname = "go-ethereum"; - version = "1.10.6"; + version = "1.10.7"; src = fetchFromGitHub { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4lapkoxSKdXlD6rmUxnlSKrfH+DeV6/wV05CqJjuzjA="; + sha256 = "sha256-P0+XPSpvVsjia21F3FIg7KO6Qe2ZbY90tM/dRwBBuBk="; }; runVend = true; - vendorSha256 = "sha256-5qi01y0SIEI0WRYu2I2RN94QFS8rrlioFvnRqqp6wtk="; + vendorSha256 = "sha256-51jt5oBb/3avZnDRfo/NKAtZAU6QBFkzNdVxFnJ+erM="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/lightning-loop/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/lightning-loop/default.nix index f14af0ae79..f33b005cdd 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/lightning-loop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/lightning-loop/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "lightning-loop"; - version = "0.14.2-beta"; + version = "0.15.0-beta"; src = fetchFromGitHub { owner = "lightninglabs"; repo = "loop"; rev = "v${version}"; - sha256 = "02ndln0n5k2pin9pngjcmn3wak761ml923111fyqb379zcfscrfv"; + sha256 = "1yjc04jiam3836w7vn3b1jqj1dq1k8wwfnccir0vh29cn6v0cf63"; }; - vendorSha256 = "1izdd9i4bqzmwagq0ilz2s37jajvzf1xwx3hmmbd1k3ss7mjm72r"; + vendorSha256 = "0c3ly0s438sr9iql2ps4biaswphp7dfxshddyw5fcm0ajqzvhrmw"; subPackages = [ "cmd/loop" "cmd/loopd" ]; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/lndmanage/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/lndmanage/default.nix index 3c7e28d831..450d9b4d44 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/lndmanage/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/lndmanage/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "lndmanage"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "bitromortac"; repo = pname; rev = "v${version}"; - sha256 = "1p73wdxv3fca2ga4nqpjk5lig7bj2v230lh8niw490p5y7hhnggl"; + sha256 = "1vnv03k2d11rw6mry6fmspiy3hqsza8y3daxnn4lp038gw1y0f4z"; }; propagatedBuildInputs = with python3Packages; [ diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/namecoin/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/namecoin/default.nix index dccee1dc05..37a57fac5b 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/namecoin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/namecoin/default.nix @@ -3,14 +3,14 @@ with lib; stdenv.mkDerivation rec { - version = "nc0.20.1"; + version = "nc0.21.1"; name = "namecoin" + toString (optional (!withGui) "d") + "-" + version; src = fetchFromGitHub { owner = "namecoin"; repo = "namecoin-core"; rev = version; - sha256 = "1wpfp9y95lmfg2nk1xqzchwck1wk6gwkya1rj07mf5in9jngxk9z"; + sha256 = "sha256-dA4BGhxHm0EdvqMq27zzWp2vOPyKbCgV1i1jt17TVxU="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/default.nix index 40deef62c2..65d845988f 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/default.nix @@ -15,13 +15,13 @@ in stdenv.mkDerivation rec { pname = "nbxplorer"; - version = "2.1.52"; + version = "2.1.58"; src = fetchFromGitHub { owner = "dgarage"; repo = "NBXplorer"; rev = "v${version}"; - sha256 = "sha256-+BP71TQ8BTGZ/SbS7CrI4D7hcQaVLt+hCpInbOdU5GY="; + sha256 = "sha256-rhD0owLEx7WxZnGPNaq4QpZopMsFQDOTnA0fs539Wxg="; }; nativeBuildInputs = [ dotnetSdk dotnetPackages.Nuget makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/deps.nix b/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/deps.nix index b7b01b14bf..f5ab743e13 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/deps.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/deps.nix @@ -181,23 +181,23 @@ }) (fetchNuGet { name = "NBitcoin.Altcoins"; - version = "2.0.33"; - sha256 = "12r4w89247xzrl2g01iv13kg1wl7gzfz1zikimx6dyhr4iipbmgf"; + version = "3.0.3"; + sha256 = "0129mgnyyb55haz68d8z694g1q2rlc0qylx08d5qnfpq1r03cdqd"; }) (fetchNuGet { name = "NBitcoin.TestFramework"; - version = "2.0.23"; - sha256 = "03jw3gay7brm7s7jwn4zbk1n1sq7gck523cx3ckx87v3wi2062lx"; + version = "3.0.3"; + sha256 = "1j3ajj4jrwqzlhzhkg7vicwab0aq2y50x53rindd8cq09jxvzk62"; }) (fetchNuGet { name = "NBitcoin"; - version = "5.0.78"; - sha256 = "1mfn045l489bm2xgjhvddhfy4xxcy42q6jhq4nyd6fnxg4scxyg9"; + version = "6.0.6"; + sha256 = "1kf2rjrnh97zlh00affsv95f94bwgr2h7b00njqac4qgv9cac7sa"; }) (fetchNuGet { name = "NBitcoin"; - version = "5.0.81"; - sha256 = "1fba94kc8yzykb1m5lvpx1hm63mpycpww9cz5zfp85phs1spdn8x"; + version = "6.0.8"; + sha256 = "1f90zyrd35fzx0vgvd83jhd6hczd4037h2k198xiyxj04l4m3wm5"; }) (fetchNuGet { name = "NETStandard.Library"; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/whirlpool-gui/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/whirlpool-gui/default.nix index c26270beef..62c7c3b3da 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/whirlpool-gui/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/whirlpool-gui/default.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { yarnCache = stdenv.mkDerivation { name = "${pname}-${version}-${system}-yarn-cache"; inherit src; - phases = [ "unpackPhase" "buildPhase" ]; + dontInstall = true; nativeBuildInputs = [ yarn ]; buildPhase = '' export HOME=$NIX_BUILD_ROOT diff --git a/third_party/nixpkgs/pkgs/applications/editors/eclipse/build-eclipse.nix b/third_party/nixpkgs/pkgs/applications/editors/eclipse/build-eclipse.nix index 1ddb670711..c52e43373c 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/eclipse/build-eclipse.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/eclipse/build-eclipse.nix @@ -1,5 +1,5 @@ { lib, stdenv, makeDesktopItem, freetype, fontconfig, libX11, libXrender -, zlib, jdk, glib, gtk, libXtst, gsettings-desktop-schemas, webkitgtk +, zlib, jdk, glib, gtk, libXtst, libsecret, gsettings-desktop-schemas, webkitgtk , makeWrapper, perl, ... }: { name, src ? builtins.getAttr stdenv.hostPlatform.system sources, sources ? null, description }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ fontconfig freetype glib gsettings-desktop-schemas gtk jdk libX11 - libXrender libXtst makeWrapper zlib + libXrender libXtst libsecret makeWrapper zlib ] ++ lib.optional (webkitgtk != null) webkitgtk; buildCommand = '' @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { makeWrapper $out/eclipse/eclipse $out/bin/eclipse \ --prefix PATH : ${jdk}/bin \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ glib gtk libXtst ] ++ lib.optional (webkitgtk != null) webkitgtk)} \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ glib gtk libXtst libsecret ] ++ lib.optional (webkitgtk != null) webkitgtk)} \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ --add-flags "-configuration \$HOME/.eclipse/''${productId}_$productVersion/configuration" 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 adf7d75ed5..332c43996b 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 @@ -96,6 +96,10 @@ self: let postInstall = '' ./install.sh --prefix=$out ''; + + meta = old.meta // { + maintainers = [ lib.maintainers.sternenseemann ]; + }; }); }; diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix index 00cc118a70..015a8e27f8 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix @@ -46,7 +46,7 @@ pname = "agda-mode"; version = pkgs.haskellPackages.Agda.version; - phases = [ "buildPhase" "installPhase" ]; + dontUnpack = true; # already byte-compiled by Agda builder buildPhase = '' @@ -214,6 +214,25 @@ }; }; + urweb-mode = self.trivialBuild { + pname = "urweb-mode"; + + inherit (pkgs.urweb) src version; + + packageRequires = [ + self.cl-lib + self.flycheck + ]; + + postUnpack = "sourceRoot=$sourceRoot/src/elisp"; + + meta = { + description = "Major mode for editing Ur/Web"; + inherit (pkgs.urweb.meta) license homepage; + maintainers = [ lib.maintainers.sternenseemann ]; + }; + }; + # Packages made the classical callPackage way ebuild-mode = callPackage ./ebuild-mode { }; diff --git a/third_party/nixpkgs/pkgs/applications/editors/helix/default.nix b/third_party/nixpkgs/pkgs/applications/editors/helix/default.nix index 315951b0e9..66c0e092fc 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/helix/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/helix/default.nix @@ -1,20 +1,28 @@ -{ fetchFromGitHub, lib, rustPlatform }: +{ fetchFromGitHub, lib, rustPlatform, makeWrapper }: rustPlatform.buildRustPackage rec { pname = "helix"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "helix-editor"; repo = pname; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-dI5yIP5uUmM9pyMpvvdrk8/0jE/REkU/m9BF081LwMU="; + sha256 = "sha256-iCNA+gZer6BycWnhosDFRuxfS6QAb06XTix/vFsaey0="; }; - cargoSha256 = "sha256-l3Ikr4IyUsHItJIC4BaIZZb6vio3bchumbbPI+nxIjQ="; + cargoSha256 = "sha256-sqXPgtLMXa3kMQlnw2xDBEsVfjeRXO6Zp6NEFS/0h20="; - cargoBuildFlags = [ "--features embed_runtime" ]; + nativeBuildInputs = [ makeWrapper ]; + + postInstall = '' + mkdir -p $out/lib + cp -r runtime $out/lib + ''; + postFixup = '' + wrapProgram $out/bin/hx --set HELIX_RUNTIME $out/lib/runtime + ''; meta = with lib; { description = "A post-modern modal text editor"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/neovim/neovide/default.nix b/third_party/nixpkgs/pkgs/applications/editors/neovim/neovide/default.nix index 7733f123ac..75d20a12a0 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/neovim/neovide/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/neovim/neovide/default.nix @@ -116,5 +116,6 @@ rustPlatform.buildRustPackage rec { license = with licenses; [ mit ]; maintainers = with maintainers; [ ck3d ]; platforms = platforms.linux; + mainProgram = "neovide"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/editors/rednotebook/default.nix b/third_party/nixpkgs/pkgs/applications/editors/rednotebook/default.nix index 698eca91a8..4e4835783e 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/rednotebook/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/rednotebook/default.nix @@ -5,13 +5,13 @@ buildPythonApplication rec { pname = "rednotebook"; - version = "2.21"; + version = "2.22"; src = fetchFromGitHub { owner = "jendrikseipp"; repo = "rednotebook"; rev = "v${version}"; - sha256 = "07zm4q9h583sg82ayhn9d0ra3wbsfaqrl5sfw6a1kwhyxxkwp8ad"; + sha256 = "11n970ad0j57vlll5j30ngkrfyil23v1b29ickbnblcldvjbgwa5"; }; # We have not packaged tests. diff --git a/third_party/nixpkgs/pkgs/applications/editors/standardnotes/default.nix b/third_party/nixpkgs/pkgs/applications/editors/standardnotes/default.nix index 0d50c24d39..d3ff564b8f 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/standardnotes/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/standardnotes/default.nix @@ -2,18 +2,18 @@ , fetchurl, libsecret, gtk3, gsettings-desktop-schemas }: let - version = "3.5.18"; + version = "3.8.18"; pname = "standardnotes"; name = "${pname}-${version}"; plat = { - i386-linux = "-i386"; + i386-linux = "i386"; x86_64-linux = "x86_64"; }.${stdenv.hostPlatform.system}; sha256 = { - i386-linux = "009fnnd7ysxkyykkbmhvr0vn13b21j1j5mzwdvqdkhm9v3c9rbgj"; - x86_64-linux = "1zrnvvr9x0s2gp948iajsmgn38xm6x0g2dgxrfjis39rpplsrdww"; + i386-linux = "1xiypsmvpk8i6kab862pipbdfb0y5d5355hdwjmva7v7g26aa7h7"; + x86_64-linux = "03qlxlgyypnvcr40jh6i4wriyax2jbfhrb798cq0n7qlc1y4pg8r"; }.${stdenv.hostPlatform.system}; src = fetchurl { diff --git a/third_party/nixpkgs/pkgs/applications/editors/texmaker/default.nix b/third_party/nixpkgs/pkgs/applications/editors/texmaker/default.nix index 80220241eb..960e730112 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/texmaker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/texmaker/default.nix @@ -1,15 +1,15 @@ -{ lib, mkDerivation, fetchurl, qtbase, qtscript, qmake, zlib, pkg-config, poppler }: +{ lib, mkDerivation, fetchurl, qtbase, qtscript, qtwebengine, qmake, zlib, pkg-config, poppler }: mkDerivation rec { pname = "texmaker"; - version = "5.0.4"; + version = "5.1.0"; src = fetchurl { url = "http://www.xm1math.net/texmaker/${pname}-${version}.tar.bz2"; - sha256 = "1qnh5g8zkjpjmw2l8spcynpfgs3wpcfcla5ms2kkgvkbdlzspqqx"; + sha256 = "0zhqq9s5r2w44p7xhlxkj0c10jyx0hji5bjdpgp7xdlrvckr9yf6"; }; - buildInputs = [ qtbase qtscript poppler zlib ]; + buildInputs = [ qtbase qtscript poppler zlib qtwebengine ]; nativeBuildInputs = [ pkg-config poppler qmake ]; NIX_CFLAGS_COMPILE="-I${poppler.dev}/include/poppler"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/thonny/default.nix b/third_party/nixpkgs/pkgs/applications/editors/thonny/default.nix index fa71a612fa..fb5cb4b8e4 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/thonny/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/thonny/default.nix @@ -4,13 +4,13 @@ with python3.pkgs; buildPythonApplication rec { pname = "thonny"; - version = "3.3.6"; + version = "3.3.14"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "0ga0pqvq3nglr4jgh8ajv0bv8c7q09h1jh6q6r5cwqa49fawkr02"; + sha256 = "13l8blq7y6p7a235x2lfiqml1bd4ba2brm3vfvs8wasjh3fvm9g5"; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/applications/editors/uivonim/yarn.nix b/third_party/nixpkgs/pkgs/applications/editors/uivonim/yarn.nix index aa2b10eac2..c56dad1e41 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/uivonim/yarn.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/uivonim/yarn.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec { +{ fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec { offline_cache = linkFarm "offline" packages; packages = [ { diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/with-extensions.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/with-extensions.nix index 8f4e7f0042..1c9c4be456 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/with-extensions.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/with-extensions.nix @@ -11,7 +11,7 @@ # When the extension is already available in the default extensions set. vscodeExtensions = with vscode-extensions; [ - bbenoist.Nix + bbenoist.nix ] # Concise version from the vscode market place when not available in the default set. diff --git a/third_party/nixpkgs/pkgs/applications/graphics/drawpile/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/drawpile/default.nix index cf37512ad9..f46e1f499c 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/drawpile/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/drawpile/default.nix @@ -69,23 +69,15 @@ let in mkDerivation rec { pname = "drawpile"; - version = "2.1.17"; + version = "2.1.19"; src = fetchFromGitHub { owner = "drawpile"; repo = "drawpile"; rev = version; - sha256 = "sha256-AFFY+FcY9ExAur13OoWR9285RZtBe6jnRIrwi5raiCM="; + sha256 = "sha256-MNmzcqTHfMms6q3ZilrChE5WoGzGxnAOkB0a75udA1I="; }; - patches = [ - # fix for libmicrohttpd 0.9.71 - (fetchpatch { - url = "https://github.com/drawpile/Drawpile/commit/ed1a75deb113da2d1df91a28f557509c4897130e.diff"; - sha256 = "sha256-54wabH5F3Hf+6vv9rpCwCRdhjSaUFtuF/mE1/U+CpOA="; - name = "mhdfix.patch"; }) - ]; - nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/hydrus/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/hydrus/default.nix index d46569028c..1cf1531ef3 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/hydrus/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/hydrus/default.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonPackage rec { pname = "hydrus"; - version = "448"; + version = "450"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "v${version}"; - sha256 = "sha256-h7FQRgxqXDEXDFRQEPeJUIbJYf9fs68oUQv5rCUS0zw="; + sha256 = "sha256-sMy5Yv7PGK3U/XnB8IrutSqSBiq1cfD6pAO5BxbWG5A="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/lightburn/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/lightburn/default.nix index 7ff0b77e6f..5775ba2a52 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/lightburn/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/lightburn/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "lightburn"; - version = "0.9.23"; + version = "1.0.00"; nativeBuildInputs = [ p7zip @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/LightBurnSoftware/deployment/releases/download/${version}/LightBurn-Linux64-v${version}.7z"; - sha256 = "sha256-OiW9UBophyEF3J0FOSMkbwDJ6d8SEDNrr+H0B4Ndo/Y="; + sha256 = "sha256-jNqLykVQjer2lps1gnw4fd2FH+ZQrzqQILAsl4Z5Hqk="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/nomacs/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/nomacs/default.nix index 142c76b2f6..9f3c1e453f 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/nomacs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/nomacs/default.nix @@ -8,6 +8,7 @@ , qtbase , qttools , qtsvg +, qtimageformats , exiv2 , opencv4 @@ -46,6 +47,7 @@ mkDerivation rec { buildInputs = [qtbase qttools qtsvg + qtimageformats exiv2 opencv4 libraw diff --git a/third_party/nixpkgs/pkgs/applications/graphics/pdfcpu/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/pdfcpu/default.nix index 19d3c63ab3..d30437c931 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/pdfcpu/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/pdfcpu/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "pdfcpu"; - version = "0.3.11"; + version = "0.3.12"; src = fetchFromGitHub { owner = "pdfcpu"; repo = pname; rev = "v${version}"; - sha256 = "sha256-kLRxZW89Bm2N/KxFYetIq+auPBW/vFoUnB8uaEcM8Yo="; + sha256 = "sha256-Ts4FJWUeWHVfeBEetgACYMGEsDLHm5JOEEn7EtQduPU="; }; vendorSha256 = "sha256-p/2Bu5h2P3ebgvSC12jdR2Zpd27xCFwtB/KZV0AULAM="; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/qview/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/qview/default.nix index 001616ab41..7f4f4cc1a9 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/qview/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/qview/default.nix @@ -1,4 +1,11 @@ -{ mkDerivation, lib, fetchFromGitHub, qmake, qtbase }: +{ lib +, mkDerivation +, fetchFromGitHub +, qmake +, qtbase +, qtimageformats +, qtsvg +}: mkDerivation rec { pname = "qview"; @@ -15,6 +22,8 @@ mkDerivation rec { buildInputs = [ qtbase + qtimageformats + qtsvg ]; patchPhase = '' @@ -24,7 +33,7 @@ mkDerivation rec { meta = with lib; { description = "Practical and minimal image viewer"; homepage = "https://interversehq.com/qview/"; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = with maintainers; [ acowley ]; platforms = platforms.all; }; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/rx/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/rx/default.nix index 55349e8a08..a40371ddb4 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/rx/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/rx/default.nix @@ -7,16 +7,16 @@ with lib; rustPlatform.buildRustPackage rec { pname = "rx"; - version = "0.4.0"; + version = "0.5.2"; src = fetchFromGitHub { owner = "cloudhead"; repo = pname; rev = "v${version}"; - sha256 = "1pln65pqy39ijrld11d06klwzfhhzmrgdaxijpx9q7w9z66zmqb8"; + sha256 = "sha256-LTpaV/fgYUgA2M6Wz5qLHnTNywh13900g+umhgLvciM="; }; - cargoSha256 = "1mb9wx5h729pc9y1b0d0yiapyk0mlbvdmvwq993fcpkziwjvnl44"; + cargoSha256 = "sha256-4hi1U4jl6QA7H8AKHlU+Hqz5iKGYHRXHDsrcqY7imkU="; nativeBuildInputs = [ cmake pkg-config makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/shutter/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/shutter/default.nix index a561b6f0d7..e901ee29bf 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/shutter/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/shutter/default.nix @@ -64,13 +64,13 @@ let in stdenv.mkDerivation rec { pname = "shutter"; - version = "0.97"; + version = "0.98"; src = fetchFromGitHub { owner = "shutter-project"; repo = "shutter"; rev = "v${version}"; - sha256 = "sha256-/2eQLJJZP0ArQUrxcFdogv/4wy+O021hODkJYLQmLY8="; + sha256 = "sha256-btJVY7+palstydWt5VCdtHwOj6FTXEcsregjaiXbZ5I="; }; nativeBuildInputs = [ wrapGAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/appeditor/default.nix b/third_party/nixpkgs/pkgs/applications/misc/appeditor/default.nix index d0db2b12df..a715681ae9 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/appeditor/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/appeditor/default.nix @@ -11,17 +11,18 @@ , glib , gtk3 , libgee -, wrapGAppsHook }: +, wrapGAppsHook +}: stdenv.mkDerivation rec { pname = "appeditor"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "donadigo"; repo = "appeditor"; rev = version; - sha256 = "04x2f4x4dp5ca2y3qllqjgirbyl6383pfl4bi9bkcqlg8b5081rg"; + sha256 = "14ycw1b6v2sa4vljpnx2lpx4w89mparsxk6s8w3yx4dqjglcg5bp"; }; nativeBuildInputs = [ @@ -41,11 +42,6 @@ stdenv.mkDerivation rec { libgee ]; - patches = [ - # See: https://github.com/donadigo/appeditor/issues/88 - ./fix-build-vala-0.46.patch - ]; - postPatch = '' chmod +x meson/post_install.py patchShebangs meson/post_install.py @@ -62,6 +58,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/donadigo/appeditor"; maintainers = with maintainers; [ xiorcale ] ++ pantheon.maintainers; platforms = platforms.linux; - license = licenses.gpl3; + license = licenses.gpl3Plus; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/appeditor/fix-build-vala-0.46.patch b/third_party/nixpkgs/pkgs/applications/misc/appeditor/fix-build-vala-0.46.patch deleted file mode 100644 index f6c0b4cfd2..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/appeditor/fix-build-vala-0.46.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/src/DesktopApp.vala b/src/DesktopApp.vala -index 0e6fa47..ebcde0c 100644 ---- a/src/DesktopApp.vala -+++ b/src/DesktopApp.vala -@@ -130,7 +130,7 @@ public class AppEditor.DesktopApp : Object { - - public unowned string get_path () { - if (path == null) { -- unowned string _path = info.get_string (KeyFileDesktop.KEY_PATH); -+ string _path = info.get_string (KeyFileDesktop.KEY_PATH); - if (_path == null) { - _path = ""; - } -@@ -150,7 +150,7 @@ public class AppEditor.DesktopApp : Object { - } - - public bool get_should_show () { -- return info.should_show () && !get_terminal (); -+ return info.should_show () && !get_terminal (); - } - - public string[] get_categories () { diff --git a/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix b/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix index 26ca389813..59de687978 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix @@ -26,11 +26,11 @@ let in stdenv.mkDerivation rec { pname = "blender"; - version = "2.93.1"; + version = "2.93.2"; src = fetchurl { url = "https://download.blender.org/source/${pname}-${version}.tar.xz"; - sha256 = "sha256-IdriOBw/DlpH6B0GKqC1nKnhTZwrIL8U9hkMS20BHNg="; + sha256 = "sha256-nG1Kk6UtiCwsQBDz7VELcMRVEovS49QiO3haIpvSfu4="; }; patches = lib.optional stdenv.isDarwin ./darwin.patch; diff --git a/third_party/nixpkgs/pkgs/applications/misc/calibre/default.nix b/third_party/nixpkgs/pkgs/applications/misc/calibre/default.nix index 85a644e5f1..7ba83e7923 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/calibre/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/calibre/default.nix @@ -87,6 +87,7 @@ mkDerivation rec { feedparser html2text html5-parser + jeepney lxml markdown mechanize diff --git a/third_party/nixpkgs/pkgs/applications/misc/chrysalis/default.nix b/third_party/nixpkgs/pkgs/applications/misc/chrysalis/default.nix index 4d6a6943cd..55560c50f1 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/chrysalis/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/chrysalis/default.nix @@ -3,12 +3,15 @@ let pname = "chrysalis"; version = "0.8.4"; -in appimageTools.wrapType2 rec { +in appimageTools.wrapAppImage rec { name = "${pname}-${version}-binary"; - src = fetchurl { - url = "https://github.com/keyboardio/${pname}/releases/download/v${version}/${pname}-${version}.AppImage"; - sha256 = "b41f3e23dac855b1588cff141e3d317f96baff929a0543c79fccee0c6f095bc7"; + src = appimageTools.extract { + inherit name; + src = fetchurl { + url = "https://github.com/keyboardio/${pname}/releases/download/v${version}/${pname}-${version}.AppImage"; + sha256 = "b41f3e23dac855b1588cff141e3d317f96baff929a0543c79fccee0c6f095bc7"; + }; }; profile = '' @@ -20,7 +23,18 @@ in appimageTools.wrapType2 rec { p.glib ]; - extraInstallCommands = "mv $out/bin/${name} $out/bin/${pname}"; + # Also expose the udev rules here, so it can be used as: + # services.udev.packages = [ pkgs.chrysalis ]; + # to allow non-root modifications to the keyboards. + + extraInstallCommands = '' + mv $out/bin/${name} $out/bin/${pname} + + mkdir -p $out/lib/udev/rules.d + ln -s \ + --target-directory=$out/lib/udev/rules.d \ + ${src}/resources/static/udev/60-kaleidoscope.rules + ''; meta = with lib; { description = "A graphical configurator for Kaleidoscope-powered keyboards"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/dasel/default.nix b/third_party/nixpkgs/pkgs/applications/misc/dasel/default.nix index afe7572cbf..96042c99b2 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/dasel/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/dasel/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "dasel"; - version = "1.17.0"; + version = "1.19.0"; src = fetchFromGitHub { owner = "TomWright"; repo = pname; rev = "v${version}"; - sha256 = "sha256-VZsYwsYec6Q9T8xkb60F0CvPVFd2WJgyOfegm5GuN8c="; + sha256 = "sha256-hV8+j66Z8cs6K1TElM+3ar2C8tSqJJBvBYoU+OWcqcU="; }; - vendorSha256 = "sha256-BdX4DO77mIf/+aBdkNVFUzClsIml1UMcgvikDbbdgcY="; + vendorSha256 = "sha256-fRG70f2SZr8BOmF+MNLEdJmK1308h+HY4N0kkTpvuPc="; ldflags = [ "-s" "-w" "-X github.com/tomwright/dasel/internal.Version=${version}" diff --git a/third_party/nixpkgs/pkgs/applications/misc/dbeaver/default.nix b/third_party/nixpkgs/pkgs/applications/misc/dbeaver/default.nix index a15157a937..e1ce1f2f21 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/dbeaver/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/dbeaver/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "dbeaver"; - version = "21.1.2"; # When updating also update fetchedMavenDeps.sha256 + version = "21.1.4"; # When updating also update fetchedMavenDeps.sha256 src = fetchFromGitHub { owner = "dbeaver"; repo = "dbeaver"; rev = version; - sha256 = "sha256-3q5LTllyqw7s8unJHTuasBCM4iaJ9lLpwgbXwBGUtIw="; + sha256 = "jW4ZSHnjBHckfbcvhl+uTuNJb1hu77D6dzoSTA6y8l4="; }; fetchedMavenDeps = stdenv.mkDerivation { @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { dontFixup = true; outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "sha256-QPDnIXP3yB1Dn0LBbBBLvRDbCyguWvG9Zzb1Vjh72UA="; + outputHash = "1K3GvNUT+zC7e8pD15UUCHDRWD7dtxtl8MfAJIsuaYs="; }; nativeBuildInputs = [ @@ -150,6 +150,6 @@ stdenv.mkDerivation rec { ''; license = licenses.asl20; platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ]; - maintainers = with maintainers; [ jojosch ]; + maintainers = with maintainers; [ jojosch mkg20001 ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix index 3f71bd2be2..94852aa138 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix @@ -2,11 +2,11 @@ buildPythonApplication rec { pname = "gallery_dl"; - version = "1.18.2"; + version = "1.18.3"; src = fetchPypi { inherit pname version; - sha256 = "786772ce774929ef1ba64d8394dbab329a72447fd8b930968bc1fb0aacdba567"; + sha256 = "6e058dd25a8a54ead41479579fd73de71472abb980a6254765c5e538b591d162"; }; propagatedBuildInputs = [ requests ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/khal/default.nix b/third_party/nixpkgs/pkgs/applications/misc/khal/default.nix index 8ad7578ade..c20a5bbf6b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/khal/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/khal/default.nix @@ -2,11 +2,11 @@ with python3.pkgs; buildPythonApplication rec { pname = "khal"; - version = "0.10.3"; + version = "0.10.4"; src = fetchPypi { inherit pname version; - sha256 = "sha256-L92PwU/ll+Wn1unGPHho2WC07QIbVjxoSnHwcJDtpDI="; + sha256 = "3fdb980a9a61c0206d7a82b16f77b408a4f341a2b866b9c9fcf6a641850d129f"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/klayout/default.nix b/third_party/nixpkgs/pkgs/applications/misc/klayout/default.nix index d1326848d2..2d75a9da81 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/klayout/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/klayout/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "klayout"; - version = "0.26.10"; + version = "0.27.3"; src = fetchFromGitHub { owner = "KLayout"; repo = "klayout"; rev = "v${version}"; - sha256 = "sha256-h2jCmLZ2pRlK8VblQosBX0ZcoHDnn4oYeSqzA3y1Tzg="; + sha256 = "sha256-6g/QoR16rhUfxhH4JxL6EERcoPVG/6MOxUlo6K/WoE0="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/misc/logseq/default.nix b/third_party/nixpkgs/pkgs/applications/misc/logseq/default.nix index 2bc2a54351..46e170f4db 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/logseq/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/logseq/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "logseq"; - version = "0.3.2"; + version = "0.3.3"; src = fetchurl { url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage"; - sha256 = "4gWpB3uTQsm9oRvT9rGizIU7xgrZim7jxjJGfME7WAg="; + sha256 = "OweKV+vF8H1QMNhIs0Z9/uUAuu1cCTitH2P7barS0ao="; name = "${pname}-${version}.AppImage"; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/mapproxy/default.nix b/third_party/nixpkgs/pkgs/applications/misc/mapproxy/default.nix index 48e2a3960e..b5ec8424e2 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/mapproxy/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/mapproxy/default.nix @@ -6,10 +6,10 @@ with python3.pkgs; buildPythonApplication rec { pname = "MapProxy"; - version = "1.13.0"; + version = "1.13.2"; src = fetchPypi { inherit pname version; - sha256 = "0qi63ap8yi5g2cas33jv4jsmdrl6yv3qp6bh0zxrfpkb704lcng4"; + sha256 = "1c2ba9424f600f35b7b883366296089cf61ac7c803da5d411a334c7a39ccf84b"; }; prePatch = '' substituteInPlace mapproxy/util/ext/serving.py --replace "args = [sys.executable] + sys.argv" "args = sys.argv" diff --git a/third_party/nixpkgs/pkgs/applications/misc/minergate-cli/default.nix b/third_party/nixpkgs/pkgs/applications/misc/minergate-cli/default.nix deleted file mode 100644 index 0fe4103f61..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/minergate-cli/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ fetchurl, lib, stdenv, dpkg, makeWrapper, openssl }: - -stdenv.mkDerivation { - version = "8.2"; - pname = "minergate-cli"; - src = fetchurl { - url = "https://minergate.com/download/ubuntu-cli"; - sha256 = "393c5ba236f6f92c449496fcda9509f4bfd3887422df98ffa59b3072124a99d8"; - }; - - nativeBuildInputs = [ dpkg makeWrapper ]; - - phases = [ "installPhase" ]; - - installPhase = '' - dpkg-deb -x $src $out - pgm=$out/opt/minergate-cli/minergate-cli - - interpreter=${stdenv.glibc}/lib/ld-linux-x86-64.so.2 - patchelf --set-interpreter "$interpreter" $pgm - - wrapProgram $pgm --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ openssl stdenv.cc.cc ]} - - rm $out/usr/bin/minergate-cli - mkdir -p $out/bin - ln -s $pgm $out/bin - ''; - - meta = with lib; { - description = "Minergate CPU/GPU console client mining software"; - homepage = "https://www.minergate.com/"; - license = licenses.unfree; - maintainers = with maintainers; [ bfortz ]; - platforms = [ "x86_64-linux" ]; -}; -} diff --git a/third_party/nixpkgs/pkgs/applications/misc/minergate/default.nix b/third_party/nixpkgs/pkgs/applications/misc/minergate/default.nix deleted file mode 100644 index f6ec20b0df..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/minergate/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ fetchurl, lib, stdenv, dpkg, makeWrapper, fontconfig, freetype, openssl, xorg, xkeyboard_config }: - -stdenv.mkDerivation { - version = "8.1"; - pname = "minergate"; - src = fetchurl { - url = "https://minergate.com/download/ubuntu"; - sha256 = "1dbbbb8e0735cde239fca9e82c096dcc882f6cecda20bba7c14720a614c16e13"; - }; - - nativeBuildInputs = [ dpkg makeWrapper ]; - - phases = [ "installPhase" ]; - - installPhase = '' - dpkg-deb -x $src $out - pgm=$out/opt/minergate/minergate - - interpreter=${stdenv.glibc}/lib/ld-linux-x86-64.so.2 - patchelf --set-interpreter "$interpreter" $pgm - - wrapProgram $pgm --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ fontconfig freetype openssl stdenv.cc.cc xorg.libX11 xorg.libxcb ]} --prefix "QT_XKB_CONFIG_ROOT" ":" "${xkeyboard_config}/share/X11/xkb" - - rm $out/usr/bin/minergate - mkdir -p $out/bin - ln -s $out/opt/minergate/minergate $out/bin - ''; - - meta = with lib; { - description = "Minergate CPU/GPU mining software"; - homepage = "https://www.minergate.com/"; - license = licenses.unfree; - maintainers = with maintainers; [ bfortz ]; - platforms = [ "x86_64-linux" ]; -}; -} diff --git a/third_party/nixpkgs/pkgs/applications/misc/mob/default.nix b/third_party/nixpkgs/pkgs/applications/misc/mob/default.nix index 50e95e3117..507a1aeb90 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/mob/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/mob/default.nix @@ -2,14 +2,14 @@ buildGoPackage rec { pname = "mob"; - version = "1.4.0"; + version = "1.8.0"; goPackagePath = "github.com/remotemobprogramming/mob"; src = fetchFromGitHub { rev = "v${version}"; owner = "remotemobprogramming"; repo = pname; - sha256 = "sha256-JiTRTH8ai27H1xySyKTWiu/MG0C61Tz+hVI6tkSRp+k="; + sha256 = "sha256-GA+MmZU1KEg3HIU225Llr5W4dHGFGiMr/j0N/CslBC4="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/misc/notejot/default.nix b/third_party/nixpkgs/pkgs/applications/misc/notejot/default.nix index b1fac789fe..c0c68ac88a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/notejot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/notejot/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "notejot"; - version = "3.0.4"; + version = "3.1.0"; src = fetchFromGitHub { owner = "lainsce"; repo = pname; rev = version; - hash = "sha256-p8rca3PsnT/3Lp6W30VvqR9aPr6EIuNrH5gsxL0lZ0Q="; + hash = "sha256-jR1zOmVkFGgA5bzMDHQ8HMToi18Y3n2aJDx7pwsZEhM="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix b/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix index 39044301ec..5106234331 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix @@ -30,11 +30,11 @@ let in stdenv.mkDerivation rec { pname = "obsidian"; - version = "0.12.3"; + version = "0.12.12"; src = fetchurl { url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}.tar.gz"; - sha256 = "sha256-nwtQp7BkMZwMzfnA5wdcMAhfezM//Lm9cf0pbvnOVZE="; + sha256 = "sha256-zvWJvMmb0TlFYXrT2QUgMG6uleT42+y+F4bSZQ2ftnE="; }; nativeBuildInputs = [ makeWrapper graphicsmagick ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/remarkable/remarkable-mouse/default.nix b/third_party/nixpkgs/pkgs/applications/misc/remarkable/remarkable-mouse/default.nix index 800170b314..a4012eaed7 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/remarkable/remarkable-mouse/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/remarkable/remarkable-mouse/default.nix @@ -2,11 +2,11 @@ buildPythonApplication rec { pname = "remarkable-mouse"; - version = "5.2.1"; + version = "6.0.0"; src = fetchPypi { inherit pname version; - sha256 = "0k2wjfcgnvb8yqn4c4ddfyyhrvl6hj61kn1ddnyp6ay9vklnw160"; + sha256 = "46eff5d6a07ca60ed652d09eeee9b4c4566da422be4a3dfa2fcd452a3df65ac1"; }; propagatedBuildInputs = with python3Packages; [ screeninfo paramiko pynput libevdev ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/sequeler/default.nix b/third_party/nixpkgs/pkgs/applications/misc/sequeler/default.nix index c8a0e0175f..5fd5176c95 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/sequeler/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/sequeler/default.nix @@ -11,13 +11,13 @@ let in stdenv.mkDerivation rec { pname = "sequeler"; - version = "0.8.0"; + version = "0.8.2"; src = fetchFromGitHub { owner = "Alecaddd"; repo = pname; rev = "v${version}"; - sha256 = "090plqnby2wxzr1waq5kz89w3269j363mgxwfz9g7qg55lddaahz"; + sha256 = "sha256-MsHHTYERe0v+u3KnVtx+jmJTKORJTJ7bNfJMZHV9Ly4="; }; nativeBuildInputs = [ meson ninja pkg-config vala gettext wrapGAppsHook python3 desktop-file-utils ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/sfm/default.nix b/third_party/nixpkgs/pkgs/applications/misc/sfm/default.nix index 1d9dc3811a..355c5915db 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/sfm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/sfm/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sfm"; - version = "0.2"; + version = "0.3.1"; src = fetchFromGitHub { owner = "afify"; repo = pname; rev = "v${version}"; - hash = "sha256-DwXKrSqcebNI5N9REXyMV16W2kr72IH9+sKSVehc5zw="; + hash = "sha256-NmafUezwKK9bYPAWDNhegyjqkb4GY/i1WEtQ9puIaig="; }; configFile = lib.optionalString (conf!=null) (writeText "config.def.h" conf); diff --git a/third_party/nixpkgs/pkgs/applications/misc/ulauncher/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ulauncher/default.nix index 6d9d9deefa..f9bf70b661 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ulauncher/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/ulauncher/default.nix @@ -20,13 +20,13 @@ python3Packages.buildPythonApplication rec { pname = "ulauncher"; - version = "5.9.0"; + version = "5.11.0"; disabled = python3Packages.isPy27; src = fetchurl { url = "https://github.com/Ulauncher/Ulauncher/releases/download/${version}/ulauncher_${version}.tar.gz"; - sha256 = "sha256-jRCrkJcjUHDd3wF+Hkxg0QaW7YgIh7zM/KZ4TAH84/U="; + sha256 = "sha256-xEM7sG0NRWouDu6NxNA94WTycykEhPI4ByjDk2yjHjo="; }; nativeBuildInputs = with python3Packages; [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/unipicker/default.nix b/third_party/nixpkgs/pkgs/applications/misc/unipicker/default.nix index 7ec284f402..26db71e9b4 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/unipicker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/unipicker/default.nix @@ -17,8 +17,12 @@ stdenv.mkDerivation rec { ]; preInstall = '' - substituteInPlace unipicker --replace "/etc/unipickerrc" "$out/etc/unipickerrc" - substituteInPlace unipickerrc --replace "/usr/local" "$out" + substituteInPlace unipicker \ + --replace "/etc/unipickerrc" "$out/etc/unipickerrc" \ + --replace "fzf" "${fzf}/bin/fzf" + substituteInPlace unipickerrc \ + --replace "/usr/local" "$out" \ + --replace "fzf" "${fzf}/bin/fzf" ''; makeFlags = [ @@ -31,6 +35,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/jeremija/unipicker"; license = licenses.mit; maintainers = with maintainers; [ kiyengar ]; - platforms = with platforms; unix; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/upwork/default.nix b/third_party/nixpkgs/pkgs/applications/misc/upwork/default.nix index 976aae7817..e70b875e6f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/upwork/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/upwork/default.nix @@ -1,16 +1,16 @@ { lib, stdenv, fetchurl, dpkg, wrapGAppsHook, autoPatchelfHook , alsa-lib, atk, at-spi2-atk, at-spi2-core, cairo, cups, dbus, expat, fontconfig, freetype -, gdk-pixbuf, glib, gtk3, libnotify, libX11, libXcomposite, libXcursor, libXdamage, libuuid -, libXext, libXfixes, libXi, libXrandr, libXrender, libXtst, nspr, nss, libxcb -, pango, systemd, libXScrnSaver, libcxx, libpulseaudio }: +, gdk-pixbuf, glib, gtk3, libcxx, libdrm, libnotify, libpulseaudio, libuuid, libX11, libxcb +, libXcomposite, libXcursor, libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender +, libXScrnSaver, libXtst, mesa, nspr, nss, pango, systemd }: stdenv.mkDerivation rec { pname = "upwork"; - version = "5.5.0.11"; + version = "5.6.7.13"; src = fetchurl { - url = "https://upwork-usw2-desktopapp.upwork.com/binaries/v5_5_0_11_61df9c99b6df4e7b/${pname}_${version}_amd64.deb"; - sha256 = "db83d5fb1b5383992c6156284f6f3cd3a6b23f727ce324ba90c82817553fb4f7"; + url = "https://upwork-usw2-desktopapp.upwork.com/binaries/v5_6_7_13_9f0e0a44a59e4331/${pname}_${version}_amd64.deb"; + sha256 = "f1d3168cda47f77100192ee97aa629e2452fe62fb364dd59ad361adbc0d1da87"; }; dontWrapGApps = true; @@ -23,10 +23,10 @@ stdenv.mkDerivation rec { buildInputs = [ libcxx systemd libpulseaudio - stdenv.cc.cc alsa-lib atk at-spi2-atk at-spi2-core cairo cups dbus expat fontconfig freetype - gdk-pixbuf glib gtk3 libnotify libX11 libXcomposite libuuid - libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender - libXtst nspr nss libxcb pango systemd libXScrnSaver + stdenv.cc.cc alsa-lib atk at-spi2-atk at-spi2-core cairo cups + dbus expat fontconfig freetype gdk-pixbuf glib gtk3 libdrm libnotify + libuuid libX11 libxcb libXcomposite libXcursor libXdamage libXext libXfixes + libXi libXrandr libXrender libXScrnSaver libXtst mesa nspr nss pango systemd ]; libPath = lib.makeLibraryPath buildInputs; @@ -40,7 +40,6 @@ stdenv.mkDerivation rec { mv usr $out mv opt $out sed -e "s|/opt/Upwork|$out/bin|g" -i $out/share/applications/upwork.desktop - makeWrapper $out/opt/Upwork/upwork \ $out/bin/upwork \ --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ diff --git a/third_party/nixpkgs/pkgs/applications/misc/waybar/default.nix b/third_party/nixpkgs/pkgs/applications/misc/waybar/default.nix index 6a3f33db27..88f0e13e91 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/waybar/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/waybar/default.nix @@ -14,30 +14,33 @@ , scdoc , spdlog , gtk-layer-shell -, howard-hinnant-date, cmake -, traySupport ? true, libdbusmenu-gtk3 -, pulseSupport ? true, libpulseaudio -, sndioSupport ? true, sndio -, nlSupport ? true, libnl -, udevSupport ? true, udev -, swaySupport ? true, sway -, mpdSupport ? true, libmpdclient +, howard-hinnant-date +, libxkbcommon +, traySupport ? true, libdbusmenu-gtk3 +, pulseSupport ? true, libpulseaudio +, sndioSupport ? true, sndio +, nlSupport ? true, libnl +, udevSupport ? true, udev +, evdevSupport ? true, libevdev +, swaySupport ? true, sway +, mpdSupport ? true, libmpdclient +, rfkillSupport ? true , withMediaPlayer ? false, glib, gobject-introspection, python3, python38Packages, playerctl }: stdenv.mkDerivation rec { pname = "waybar"; - version = "0.9.7"; + version = "0.9.8"; src = fetchFromGitHub { owner = "Alexays"; repo = "Waybar"; rev = version; - sha256 = "17cn4d3dx92v40jd9vl41smp8hh3gf5chd1j2f7l1lrpfpnllg5x"; + sha256 = "sha256-XOguhbvlO3iUyk5gWOvimipXV8yqnia0LKoSA1wiKoE="; }; nativeBuildInputs = [ - meson ninja pkg-config scdoc wrapGAppsHook cmake + meson ninja pkg-config scdoc wrapGAppsHook ] ++ lib.optional withMediaPlayer gobject-introspection; propagatedBuildInputs = lib.optionals withMediaPlayer [ @@ -48,12 +51,13 @@ stdenv.mkDerivation rec { strictDeps = false; buildInputs = with lib; - [ wayland wlroots gtkmm3 libsigcxx jsoncpp fmt spdlog gtk-layer-shell howard-hinnant-date ] + [ wayland wlroots gtkmm3 libsigcxx jsoncpp fmt spdlog gtk-layer-shell howard-hinnant-date libxkbcommon ] ++ optional traySupport libdbusmenu-gtk3 ++ optional pulseSupport libpulseaudio ++ optional sndioSupport sndio ++ optional nlSupport libnl ++ optional udevSupport udev + ++ optional evdevSupport libevdev ++ optional swaySupport sway ++ optional mpdSupport libmpdclient; @@ -66,10 +70,12 @@ stdenv.mkDerivation rec { libnl = nlSupport; libudev = udevSupport; mpd = mpdSupport; + rfkill = rfkillSupport; } ) ++ [ - "-Dout=${placeholder "out"}" "-Dsystemd=disabled" + "-Dgtk-layer-shell=enabled" + "-Dman-pages=enabled" ]; preFixup = lib.optional withMediaPlayer '' diff --git a/third_party/nixpkgs/pkgs/applications/misc/worker/default.nix b/third_party/nixpkgs/pkgs/applications/misc/worker/default.nix index 20ed6d55f3..aaadc0cd4b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/worker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/worker/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "worker"; - version = "4.7.0"; + version = "4.8.1"; src = fetchurl { url = "http://www.boomerangsworld.de/cms/worker/downloads/${pname}-${version}.tar.gz"; - sha256 = "sha256-9x/nHd2nUeFSH7a2qH4qlyH4FRH/NfNvTE1LEaMMSwU="; + sha256 = "sha256-Cf4vx1f4GgjlhNtGUuXf8174v8PGJapm5L30XUdqbro="; }; buildInputs = [ libX11 ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/writefreely/default.nix b/third_party/nixpkgs/pkgs/applications/misc/writefreely/default.nix index 50faa50c0e..0f9631edbf 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/writefreely/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/writefreely/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "writefreely"; - version = "0.12.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "writeas"; repo = pname; rev = "v${version}"; - sha256 = "sha256-6LpRfDu3xvE1eIRLfZliKnzsrrG5pjjf2ydxn9HQJJU="; + sha256 = "sha256-qYceijC/u8G9vr7uhApWWyWD9P65pLJCTjePEvh+oXA="; }; - vendorSha256 = "sha256-U17AkMJQr/OIMED0i2ThcNVw3+aOvRLbpLNP/wEv6k8="; + vendorSha256 = "sha256-CBPvtc3K9hr1oEmC+yUe3kPSWx20k6eMRqoxsf3NfCE="; nativeBuildInputs = [ go-bindata ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/wtf/default.nix b/third_party/nixpkgs/pkgs/applications/misc/wtf/default.nix index 962059600a..867dee5bcd 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/wtf/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/wtf/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "wtf"; - version = "0.36.0"; + version = "0.38.0"; src = fetchFromGitHub { owner = "wtfutil"; repo = pname; rev = "v${version}"; - sha256 = "sha256-JVHcunpS+2/0d7XaUZ95m9QpVHCG1Tq8LJ9KNURSRy8="; + sha256 = "sha256-ZKv207pkjgXtCZ6kXGn94i8QtOBHpSkPKo1Sy2Nw9qQ="; }; - vendorSha256 = "sha256-4uRhbRPfCRYwFlfucXOYhLruj7hkV4G9Sxjh9yQkDEQ="; + vendorSha256 = "sha256-E5sfT7uGnruVUfhhjkZM2mgauXzbmcLWS6s1J85nssE="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/misc/xmenu/default.nix b/third_party/nixpkgs/pkgs/applications/misc/xmenu/default.nix index c6a37caf34..9fe7ddf70b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/xmenu/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/xmenu/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "xmenu"; - version = "4.5.4"; + version = "4.5.5"; src = fetchFromGitHub { owner = "phillbush"; repo = "xmenu"; rev = "v${version}"; - sha256 = "1dy3aqqczs7d3f8rf6h7xssgr3881g8m5y4waskizjy9z7chs64q"; + sha256 = "sha256-Gg4hSBBVBOB/wlY44C5bJOuOnLoA/tPvcNZamXae/WE="; }; buildInputs = [ imlib2 libX11 libXft libXinerama ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/xmrig/default.nix b/third_party/nixpkgs/pkgs/applications/misc/xmrig/default.nix index 4ac4630686..affce3a71a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/xmrig/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/xmrig/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "xmrig"; - version = "6.12.2"; + version = "6.14.0"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig"; rev = "v${version}"; - sha256 = "1gjwh509cxs8vqz72v97cir0aazcrd9y9l0k1q5ywbl5l3yf6ryf"; + sha256 = "sha256-h+Y7hXkenoLT83eG0w6YEfOuEocejXgvqRMq1DwWwT0="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/xmrig/moneroocean.nix b/third_party/nixpkgs/pkgs/applications/misc/xmrig/moneroocean.nix new file mode 100644 index 0000000000..4edf2e2567 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/xmrig/moneroocean.nix @@ -0,0 +1,21 @@ +{ fetchFromGitHub, lib, xmrig }: + +xmrig.overrideAttrs (oldAttrs: rec { + pname = "xmrig-mo"; + version = "6.14.1-mo1"; + + src = fetchFromGitHub { + owner = "MoneroOcean"; + repo = "xmrig"; + rev = "v${version}"; + sha256 = "sha256-1YG0llNv1VR8ocNFxYLZFXMzowNNqpqSyIu7iCr/rfM="; + }; + + meta = with lib; { + description = "A fork of the XMRig CPU miner with support for algorithm switching"; + homepage = "https://github.com/MoneroOcean/xmrig"; + license = licenses.gpl3Plus; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; + maintainers = with maintainers; [ j0hax ]; + }; +}) diff --git a/third_party/nixpkgs/pkgs/applications/misc/xmrig/proxy.nix b/third_party/nixpkgs/pkgs/applications/misc/xmrig/proxy.nix index 1b8f794158..22ec54b67b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/xmrig/proxy.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/xmrig/proxy.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "xmrig-proxy"; - version = "6.4.0"; + version = "6.14.0"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig-proxy"; rev = "v${version}"; - sha256 = "0bcbil9b5z95haqbmdqaslckvjflw7h77fqrcdxc6lrn29575nnf"; + sha256 = "sha256-QCjXtn7O4jcPybzMsu2j7jQqWoGzeqjwessZC/dG86s="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/xrandr-invert-colors/default.nix b/third_party/nixpkgs/pkgs/applications/misc/xrandr-invert-colors/default.nix index f1a0f7b5ba..988bf29f29 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/xrandr-invert-colors/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/xrandr-invert-colors/default.nix @@ -1,11 +1,11 @@ { fetchurl, lib, stdenv, libXrandr}: stdenv.mkDerivation rec { - version = "0.01"; + version = "0.02"; pname = "xrandr-invert-colors"; src = fetchurl { url = "https://github.com/zoltanp/xrandr-invert-colors/archive/v${version}.tar.gz"; - sha256 = "1z4hxn56rlflvqanb8ncqa1xqawnda85b1b37w6r2iqs8rw52d75"; + sha256 = "sha256-7rIiBV9zbiLzu5RO5legHfGiqUSU2BuwqOc1dX/7ozA="; }; buildInputs = [ libXrandr ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/asuka/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/asuka/default.nix index b0ef9d890d..54b8a1d315 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/asuka/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/asuka/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "asuka"; - version = "0.8.1"; + version = "0.8.3"; src = fetchFromSourcehut { owner = "~julienxx"; repo = pname; rev = version; - sha256 = "1y8v4qc5dng3v9k0bky1xlf3qi9pk2vdsi29lff4ha5310467f0k"; + sha256 = "sha256-l3SgIyApASllHVhAc2yoUYc2x7QtCdzBrMYaXCp65m8="; }; - cargoSha256 = "0b8wf12bjsy334g04sv3knw8f177xsmh7lrkyvx9gnn0fax0lmnr"; + cargoSha256 = "sha256-twECZM1KcWeQptLhlKlIz16r3Q/xMb0e+lBG+EX79mU="; nativeBuildInputs = [ pkg-config ]; 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 019075592e..924b9a7fb8 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.111"; + version = "1.28.105"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "nQkna1r8wSjTPEWp9RxOz45FVmz97NHzTlb4Hh5lXcs="; + sha256 = "1E2KWG5vHYBuph6Pv9J6FBOsUpegx4Ix/H99ZQ/x4zI="; }; dontConfigure = true; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/browser.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/browser.nix index a86a82fcb5..26c2909da5 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/browser.nix @@ -16,7 +16,8 @@ mkChromiumDerivation (base: rec { cp -v "$buildPath/"*.so "$buildPath/"*.pak "$buildPath/"*.bin "$libExecPath/" cp -v "$buildPath/icudtl.dat" "$libExecPath/" cp -vLR "$buildPath/locales" "$buildPath/resources" "$libExecPath/" - cp -v "$buildPath/crashpad_handler" "$libExecPath/" + ${lib.optionalString (channel != "dev") ''cp -v "$buildPath/crashpad_handler" "$libExecPath/"''} + ${lib.optionalString (channel == "dev") ''cp -v "$buildPath/chrome_crashpad_handler" "$libExecPath/"''} cp -v "$buildPath/chrome" "$libExecPath/$packageName" # Swiftshader diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix index a62999d284..6f08f644b2 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix @@ -1,40 +1,49 @@ -{ stdenv, lib, llvmPackages, gnChromium, ninja, which, nodejs, fetchpatch, fetchurl +{ stdenv, lib, fetchurl, fetchpatch +# Channel data: +, channel, upstream-info -# default dependencies -, gnutar, bzip2, flac, speex, libopus +# Native build inputs: +, ninja, pkg-config +, python2, python3, perl +, gnutar, which +, llvmPackages +# postPatch: +, pkgsBuildHost +# configurePhase: +, gnChromium + +# Build inputs: +, libpng +, bzip2, flac, speex, libopus , libevent, expat, libjpeg, snappy -, libpng, libcap -, xdg-utils, yasm, nasm, minizip, libwebp -, libusb1, pciutils, nss, re2 - -, python2, python3, perl, pkg-config -, nspr, systemd, libkrb5 +, libcap +, xdg-utils, minizip, libwebp +, libusb1, re2 +, ffmpeg, libxslt, libxml2 +, nasm +, nspr, nss, systemd , util-linux, alsa-lib -, bison, gperf +, bison, gperf, libkrb5 , glib, gtk3, dbus-glib -, glibc , libXScrnSaver, libXcursor, libXtst, libxshmfence, libGLU, libGL -, protobuf, speechd, libXdamage, cups -, ffmpeg, libxslt, libxml2, at-spi2-core -, jre8 +, mesa +, pciutils, protobuf, speechd, libXdamage, at-spi2-core , pipewire , libva -, libdrm, wayland, mesa, libxkbcommon # Ozone +, libdrm, wayland, libxkbcommon # Ozone , curl +# postPatch: +, glibc # gconv + locale -# optional dependencies -, libgcrypt ? null # gnomeSupport || cupsSupport - -# package customization +# Package customization: , gnomeSupport ? false, gnome2 ? null , gnomeKeyringSupport ? false, libgnome-keyring3 ? null +, cupsSupport ? true, cups ? null , proprietaryCodecs ? true -, cupsSupport ? true , pulseSupport ? false, libpulseaudio ? null , ungoogled ? false, ungoogled-chromium - -, channel -, upstream-info +# Optional dependencies: +, libgcrypt ? null # gnomeSupport || cupsSupport }: buildFun: @@ -91,17 +100,6 @@ let withCustomModes = true; }; - defaultDependencies = [ - (libpng.override { apngSupport = false; }) # https://bugs.chromium.org/p/chromium/issues/detail?id=752403 - bzip2 flac speex opusWithCustomModes - libevent expat libjpeg snappy - libcap - xdg-utils minizip libwebp - libusb1 re2 - ffmpeg libxslt libxml2 - nasm - ]; - # build paths and release info packageName = extraAttrs.packageName or extraAttrs.name; buildType = "Release"; @@ -136,12 +134,20 @@ let nativeBuildInputs = [ ninja pkg-config - python2WithPackages python3WithPackages perl nodejs + python2WithPackages python3WithPackages perl gnutar which llvmPackages.bintools ]; - buildInputs = defaultDependencies ++ [ + buildInputs = [ + (libpng.override { apngSupport = false; }) # https://bugs.chromium.org/p/chromium/issues/detail?id=752403 + bzip2 flac speex opusWithCustomModes + libevent expat libjpeg snappy + libcap + xdg-utils minizip libwebp + libusb1 re2 + ffmpeg libxslt libxml2 + nasm nspr nss systemd util-linux alsa-lib bison gperf libkrb5 @@ -153,14 +159,16 @@ let libva libdrm wayland mesa.drivers libxkbcommon curl - ] ++ optional gnomeKeyringSupport libgnome-keyring3 - ++ optionals gnomeSupport [ gnome2.GConf libgcrypt ] + ] ++ optionals gnomeSupport [ gnome2.GConf libgcrypt ] + ++ optional gnomeKeyringSupport libgnome-keyring3 ++ optionals cupsSupport [ libgcrypt cups ] ++ optional pulseSupport libpulseaudio; patches = [ - ./patches/no-build-timestamps.patch # Optional patch to use SOURCE_DATE_EPOCH in compute_build_timestamp.py (should be upstreamed) - ./patches/widevine-79.patch # For bundling Widevine (DRM), might be replaceable via bundle_widevine_cdm=true in gnFlags + # Optional patch to use SOURCE_DATE_EPOCH in compute_build_timestamp.py (should be upstreamed): + ./patches/no-build-timestamps.patch + # For bundling Widevine (DRM), might be replaceable via bundle_widevine_cdm=true in gnFlags: + ./patches/widevine-79.patch # Fix the build by adding a missing dependency (s. https://crbug.com/1197837): ./patches/fix-missing-atspi2-dependency.patch ] ++ lib.optionals (versionRange "91" "94.0.4583.0") [ @@ -176,14 +184,6 @@ let commit = "60d5e803ef2a4874d29799b638754152285e0ed9"; sha256 = "0apmsqqlfxprmdmi3qzp3kr9jc52mcc4xzps206kwr8kzwv48b70"; }) - ] ++ lib.optionals (chromiumVersionAtLeast "93") [ - # We need to revert this patch to build M93 with LLVM 12. - (githubPatch { - # Reland "Replace 'blacklist' with 'ignorelist' in ./tools/msan/." - commit = "9d080c0934b848ee4a05013c78641e612fcc1e03"; - sha256 = "1bxdhxmiy6h4acq26lq43x2mxx6rawmfmlgsh5j7w8kyhkw5af0c"; - revert = true; - }) ]; postPatch = '' @@ -239,8 +239,8 @@ let patchShebangs . # Link to our own Node.js and Java (required during the build): mkdir -p third_party/node/linux/node-linux-x64/bin - ln -s "$(command -v node)" third_party/node/linux/node-linux-x64/bin/node - ln -s "${jre8}/bin/java" third_party/jdk/current/bin/ + ln -s "${pkgsBuildHost.nodejs}/bin/node" third_party/node/linux/node-linux-x64/bin/node + ln -s "${pkgsBuildHost.jre8}/bin/java" third_party/jdk/current/bin/ # Allow building against system libraries in official builds sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' tools/generate_shim_headers/generate_shim_headers.py @@ -256,15 +256,28 @@ let gnFlags = mkGnFlags ({ # Main build and toolchain settings: + # Create an official and optimized release build (only official builds + # should be distributed to users, as non-official builds are intended for + # development and may not be configured appropriately for production, + # e.g. unsafe developer builds have developer-friendly features that may + # weaken or disable security measures like sandboxing or ASLR): is_official_build = true; + # Build Chromium using the system toolchain (for Linux distributions): custom_toolchain = "//build/toolchain/linux/unbundle:default"; host_toolchain = "//build/toolchain/linux/unbundle:default"; + # Don't build against a sysroot image downloaded from Cloud Storage: use_sysroot = false; + # The default value is hardcoded instead of using pkg-config: system_wayland_scanner_path = "${wayland}/bin/wayland-scanner"; + # Because we use a different toolchain / compiler version: treat_warnings_as_errors = false; + # We aren't compiling with Chrome's Clang (would enable Chrome-specific + # plugins for enforcing coding guidelines, etc.): clang_use_chrome_plugins = false; - blink_symbol_level = 0; + # Disable symbols (they would negatively affect the performance of the + # build since the symbols are large and dealing with them is slow): symbol_level = 0; + blink_symbol_level = 0; # Google API key, see: https://www.chromium.org/developers/how-tos/api-keys # Note: The API key is for NixOS/nixpkgs use ONLY. @@ -272,9 +285,9 @@ let google_api_key = "AIzaSyDGi15Zwl11UNe6Y-5XW_upsfyw31qwZPI"; # Optional features: - use_cups = cupsSupport; use_gio = gnomeSupport; use_gnome_keyring = gnomeKeyringSupport; + use_cups = cupsSupport; # Feature overrides: # Native Client support was deprecated in 2020 and support will end in June 2021: diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix index c157b64de6..db11bda740 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix @@ -38,7 +38,7 @@ let inherit (upstream-info.deps.gn) url rev sha256; }; }); - } // lib.optionalAttrs (lib.versionAtLeast upstream-info.version "94") rec { + } // lib.optionalAttrs (lib.versionAtLeast upstream-info.version "93") rec { llvmPackages = llvmPackages_13; stdenv = llvmPackages.stdenv; }); diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json index 43a79bfa7d..641742b967 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,8 +1,8 @@ { "stable": { - "version": "92.0.4515.131", - "sha256": "0fnfyh61w6dmavvfbf2x1zzrby0xpx4jd4ifjsgyc39rsl789b5n", - "sha256bin64": "04ykc7vgq47m595j0g0gl28n5rkki6aic7ck8xr08r5cia46gk3g", + "version": "92.0.4515.159", + "sha256": "04gxgimg5ygzx6nvfws5y9dppdfjg1fhyl8zbykmksbh1myk6zfr", + "sha256bin64": "0lxnqsvqr1kw6swvkhhz475j0xvaa58ha8r1gq8zxmk48mp41985", "deps": { "gn": { "version": "2021-05-07", @@ -18,9 +18,9 @@ } }, "beta": { - "version": "93.0.4577.25", - "sha256": "09v7wyy9xwrpzmsa030j8jjww30jps3lbvlq4bzppdg04fk6rbsn", - "sha256bin64": "1l86aqym4dxsrp81ppv5cwyki4wnh7cpqy4dw88kdxgqbiwwii27", + "version": "93.0.4577.42", + "sha256": "180lywcimhlcwbxmn37814hd96bqnqrp3whbzv6ln3hwca2da4hl", + "sha256bin64": "19px9h9vf9p2ipirv8ryaxvhfkls0nfiw7jz1d4h61r3r6ay5fc4", "deps": { "gn": { "version": "2021-07-08", @@ -31,9 +31,9 @@ } }, "dev": { - "version": "94.0.4595.0", - "sha256": "0ksd7vqpbiplbg2xpm566z7p7qp57r27a3pk6ss1qz8v18490092", - "sha256bin64": "1kibyhgwcgby3hnhjdg2vrgbj4dvvbicqlcj4id9761zw1jhz8r4", + "version": "94.0.4603.0", + "sha256": "1mhb7y7mhjbi5m79izcqvc6pjmgxvlk9vvr273k29gr2zq2m2fv3", + "sha256bin64": "1rqprc2vkyygwwwjk25xa2av30bqbx5dzs6nwhnzsdqwic5wdbbz", "deps": { "gn": { "version": "2021-07-31", diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/default.nix index e699115ab2..551453e9a2 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -72,9 +72,9 @@ let policies = { DisableAppUpdate = true; - }; + } // config.firefox.policies or {}; - policiesJson = writeText "no-update-firefox-policy.json" (builtins.toJSON { inherit policies; }); + policiesJson = writeText "firefox-policies.json" (builtins.toJSON { inherit policies; }); defaultSource = lib.findFirst (sourceMatches "en-US") {} sources; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index b59fab0895..8d51e7a2c7 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,985 +1,985 @@ { - version = "91.0"; + version = "91.0.1"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/ach/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/ach/firefox-91.0.1.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "2994fee72d674891a4e05fb32e210f8b2c9f7bf4d3a0a8309bda91f7f3643880"; + sha256 = "d3ffa075821d9c11dcb96e7edaf8e8d71df251d53c9d0451fb01fcaee62ef8f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/af/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/af/firefox-91.0.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "dc3e1370fba43b34513104acfb6027ae16b675649ccccfdf57b95fbb9c969e6e"; + sha256 = "dc51c73414bcffd8b36741f1d6ab2734b15b4bec786502f35a4b9421b9ca3f0a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/an/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/an/firefox-91.0.1.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "c6f9c813bf1ea4d5e9b5f2facea73cee5345c2ce53e6bdc8d9ccef2cc1c11e14"; + sha256 = "4e629d00106765cf22cf4c78d7ad04ba0379838addcd7cb991fae3d0881cb850"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/ar/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/ar/firefox-91.0.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "343e6dac789d95f4c3fd247a62a820289e9829f8e5c183e760137686d3a6a4ac"; + sha256 = "c7054c65464e149d3a59ccaa8e9bf2d69bc77677ea5a2ba3ae918db5be8fdaed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/ast/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/ast/firefox-91.0.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "e7befd2ac2ffd2a03df135c2ed511823996eb00c6ed38b7a53a02f99909d0156"; + sha256 = "8270e3217f302700c0a3771f68bb88df45100d9d1d0631351f22053e891e66b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/az/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/az/firefox-91.0.1.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "82b55afce5a0016f5deffc3e56e52b32b2b0cf8da68d9044ec4b86ce351e7a6e"; + sha256 = "8b1085c48b5e0181c9771763406592bbdbc244d4d3151f33a16988356b5a0952"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/be/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/be/firefox-91.0.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "39929a09ab442795ba39818d39b0190c14c343acca867e6c5b4df5dd4a1d3216"; + sha256 = "447646e47e60981affd8d08c2dba13be7cea36298acf0b5fbb643ad8c65cb3d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/bg/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/bg/firefox-91.0.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "bf0b8704f873acf2a2e1edd415769d57bb0c10a9b60461de4748c5947f98d01c"; + sha256 = "f684ce4051cffe8e5f49450368b11ba92dfe745a7676c815b48d34649594eb08"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/bn/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/bn/firefox-91.0.1.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "9711f2484ede52236b9cbe97b82a1f7ba544421e1c182106d7f2b21d148822e2"; + sha256 = "9ba47714afcd7919c681b426c5df76664e7115b1c29f44082a84fe352f2a55be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/br/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/br/firefox-91.0.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "c14c6a0716f8ced15c27edace60138bead407cdeff3e2b1eab4fa33b424a6576"; + sha256 = "da820985c59c010f6de527347c5e475db73aae93180517451c3b06ed4605515f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/bs/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/bs/firefox-91.0.1.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "c66c10beb69eac9b42dd61e349f7c0593eea7a704a8e8efe60b192c39fefac8c"; + sha256 = "7fcf9509831a7b44b07525d6622a29e8e3f83e1cf2aaf60c66afc73e4514a952"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/ca-valencia/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/ca-valencia/firefox-91.0.1.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "2408cc49bb6e8b091af511dd0321c4a39f6bc70fcc168a605bfae7a667679440"; + sha256 = "6764d541d324578c381fe723a36c5ccb298276f34749ac61e8ae7a2218036d6b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/ca/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/ca/firefox-91.0.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "86712676ca2d4bbb734c6a0e21b9777d0b1ad93e25c85d57e1adaa3d41955a95"; + sha256 = "d598fee99118b2d881326458f8bede038ddf51779bed99d581c6bdc31272fa5b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/cak/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/cak/firefox-91.0.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "b0bec96b9bc4d6e43735964a2350182fd0f6e7ea142ac35b6b93a15926032bc9"; + sha256 = "6c8ed355c7b6b50e9e1752543f7367fd2a1249ab54a7c459f53f0b3e9b5568ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/cs/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/cs/firefox-91.0.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "0e65a190647d2569421d07a12f742989acedb6804dcebe8cffe0582282edd5c2"; + sha256 = "c2f42dc7fa41645583649aac6da440eb6868b42b4522330c282890bbd11a056c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/cy/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/cy/firefox-91.0.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "e45a94e9b12e039e99a061e994e6837037cb197268697ba374bc03d5102f94db"; + sha256 = "0efe41d3566e6ee405f87c7e76c97725580c25cdcf4753eaac925baca52e31d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/da/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/da/firefox-91.0.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "d3798723fb877c8e0b5f0331251ee4088a32f05f2b42f7831792282eb474cc1c"; + sha256 = "76f8dbe67bd73c20b219184337ca36b529ff5afbb38278975acc2579c497c938"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/de/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/de/firefox-91.0.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "e14dbc808f746c828a8c8a81a7d860bcb89135bc7f8efe8975700117a54da18e"; + sha256 = "a0886d38dc116d087f3cd06aad8f496f7c969bdb0761a4da09621b04b1c4dad6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/dsb/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/dsb/firefox-91.0.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "fc9ac755e5d3259e57c292f2b883d88e34c7962e0a9311652d1c5e9978c26bce"; + sha256 = "f84647095269cbe6714109ffc8432606be0e3ec7664c26680fbe9d79eaaf6274"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/el/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/el/firefox-91.0.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "20fb8f044aed5e440c31c201e6b9abd7e167fb2aaab248374a7e109e34048e78"; + sha256 = "5773765759d427f491ee809c89fe038f43fb0e0680047ae072fdca973439107f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/en-CA/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/en-CA/firefox-91.0.1.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "031594c33c321c59a33fae75556c5da68d9ef3553b56a4ebd590ef2205229836"; + sha256 = "694df869386c430f5f410e81ecd1e6d9f50448dc1bf8773ff544e40f86ba9015"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/en-GB/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/en-GB/firefox-91.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "02f3ac078c7e071f73fa4ff1fb6e4d01b4f9417ee6b6d9d03837b8560bc7375c"; + sha256 = "abaccbf19c75df6a077a669f3c70380d589756768f776874c7b44253876cd645"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/en-US/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/en-US/firefox-91.0.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "bced054543003caf29d0c93aa63359809bdf1f1fcbca92b82c57167fe94ca1c9"; + sha256 = "f3cce733e83ea3abc8085a9809a03afc8caafe6d858f9da5f1823789ee740307"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/eo/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/eo/firefox-91.0.1.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "9bf644eb700c30c078377a44cfdfe58ee9cf376d508bd4c815d125255e11dd72"; + sha256 = "0f7a104438d8175f22998c3e626cac6a85ceb955201bc0961c9f50a2d3c6942d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/es-AR/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/es-AR/firefox-91.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "54069c3a8988e50639e3f3a0126c3607360ccbff04ef979f7c5347a395ad9971"; + sha256 = "6622a16486eff0dcb34c77882dccf94f7e85d22c09e04c6ef8e2be2eb7ca4971"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/es-CL/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/es-CL/firefox-91.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "db78bb546dfeb835b1d1a3c22337b388d50ea73a46af94d2f506442e45328725"; + sha256 = "06208db32a2bc11296aa516c83394162e96da2f2e2d947ec56aeacc3711f9c2e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/es-ES/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/es-ES/firefox-91.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "1311a3c391a2b3f3f4487acedb43be984f094e8adbd3e0bba1d9f2554c74899d"; + sha256 = "edeec59af78cea871f1ffcbf49194eb0395300160373c5a51716e3bb3ef528a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/es-MX/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/es-MX/firefox-91.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "6a2a590aa416415dfd2a17646d53bb7430ba79d2b882322e1cddf8a8633ee5ba"; + sha256 = "157f71cde8354b5c8a03cfd106a17a4748592030177b804432e8d61af7a99bd1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/et/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/et/firefox-91.0.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "80ff6ea68418a46059376332a3bb9a476f43a9af2949f50061582bebea8f5635"; + sha256 = "4e90edde6e458a7858e01247c09a585e78eeadfcdd756b0c5cb18a0ea6e587bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/eu/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/eu/firefox-91.0.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "d3a53a13a88fb8071589e81a620b476396ee8e09815b3287733ab3bfd5fc30d1"; + sha256 = "01b398b9ad33b3543a0dbf2d0fbc425044d3204109b14d8d0b9aa894c0a3003b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/fa/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/fa/firefox-91.0.1.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "ec7144fd10c0c34ee41866a55426d9929f139813a1f238f79b48f3c2753595a7"; + sha256 = "7687e30c2812033ad6c36c2abad3bb3e2983bc7c6554ceb8de331e9f168ad4dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/ff/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/ff/firefox-91.0.1.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "9b03ba831ee43a0a44a658c1788a705727c9f38c5a55ec9524547989a624973a"; + sha256 = "05dbe4360ec07378ab16c3e7e0b7554107a7d2277f330a68d48f91177386ecfb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/fi/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/fi/firefox-91.0.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "b3293e17a72b9259e8e124f3bb49f43150c0e44bc987c5e181db91cbe1994a89"; + sha256 = "98c4a8299bad3392ec33315034828a322189f67c90d10dff6cd76c74de0579d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/fr/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/fr/firefox-91.0.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "be60d1bbb97879148d4bda0718ba5b27c6611ff094113e0fe5ac8ec774e5f831"; + sha256 = "f0ebd26d849f54b87e3330629cacf0928804c2bbe739533e64105391e67dc579"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/fy-NL/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/fy-NL/firefox-91.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "dda8ec3b7886874d52402e306f3520818298881cfe60f028d257031747cab7eb"; + sha256 = "5ce2534b6298c2d2796445d5ddb7b6bcd0643dbcf17a96177130df8f481eda86"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/ga-IE/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/ga-IE/firefox-91.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "fdc5645d6896420fa7c4fbd8398dff53a3896ffdfaccf0f3d9a8735e77cb30ac"; + sha256 = "80a422b732154d75b5e6a56082b367506bb04629dff74d26dd412ccab3a94a41"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/gd/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/gd/firefox-91.0.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "741c3e7139eae2ee4825ca7eabc62cfb3c4bbe4bfdaa79632f713344ecbe5b4a"; + sha256 = "f277afca343edbf9dbe56c2fe84d0d7204ba70501894cec0107e6cbab112c213"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/gl/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/gl/firefox-91.0.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "1cb6980e1ab247fc8f60cca701ade8a6a2185adbd413579d38ce0137d6def58c"; + sha256 = "f5d238ec36d881729dc6b92b41cf73fdcf73419f4706e1578bb226769d272f69"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/gn/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/gn/firefox-91.0.1.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "0d8c4f389cdf4ac429b6bc1de5b872f3e1bdec8aae938603cf0ec6318a967357"; + sha256 = "bddab5b3c78078c70d80a99eb963dd7c159f24acaf186f94ef2a032fd15ca1bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/gu-IN/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/gu-IN/firefox-91.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "8bc81a38b954a1a2677942b41c2ea1f8b3daafded0443a88137cdf071e48a4ec"; + sha256 = "a4a62c689fe6aa5b2c0f0d196fccc5ad6dba42fc4616c25ad45ecdfc18db6c39"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/he/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/he/firefox-91.0.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "8772cb5fdab78a1fc713500e03579ec78bca60acd35361a8c073d8155c74be61"; + sha256 = "06a9b9b88f458af96e500d1ddcc58ee587cd3595d152a155a90bfcb9695cf6b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/hi-IN/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/hi-IN/firefox-91.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "cf93177250cfb1c452f34666816db7d35db312db39bcc09c78bd098e5d76cfab"; + sha256 = "65a1f2e57f0ec59e8b1b6995b6f7c2511b56557abb35f4bb77a0b7fa0e07fc53"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/hr/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/hr/firefox-91.0.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "163f82311bcf2828055b6290a140dce79dc764a299857d064b727aac379e9de3"; + sha256 = "1dc71379aed8b5537bd751db50c4810f7fa5940575341921b4e111c6b727ac6c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/hsb/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/hsb/firefox-91.0.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "fd1877100bfd2652b34424c8e8555d3d2dd7ef9e37fd3313247a2b44e6fe63db"; + sha256 = "acd5df918ef7e09d08a6fb94696d9a15431e5c899f8137caa8431b2f38d9962a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/hu/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/hu/firefox-91.0.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "26d98047b977923cac28ae2f8134c2c1291a3b39b733b3ef433366a550b85b4e"; + sha256 = "afeb9429b3aad80c7f92bde3c42c4cf8e6b1e51e221b62a2e7d405da5f1c9ea3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/hy-AM/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/hy-AM/firefox-91.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "c2c4263d6b5052494412b48023b32c27ce4f155e9e1c4f92ef1f49cb40f5fadf"; + sha256 = "bf5fc5658ae5ba925685d06340ef66fe3d80eeb6297406637cb4ee8d05f02f57"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/ia/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/ia/firefox-91.0.1.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "4e1cbbda4d6f0db79ea79c01f442f15216deef7cbb65d302d8ca89f21eba8d6f"; + sha256 = "d5269e41a98722c264fc6a9e3299d667bd2f8796b2640989c853e6f1b0beab39"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/id/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/id/firefox-91.0.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "5e783893a5bc0182e376628a39a2c30c35d97e97f4196161269774771c22c1f5"; + sha256 = "47e2e461b7635f7026af8685c2dc6aed981b3e5c8e6953ea855bd08af2a6ee81"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/is/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/is/firefox-91.0.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "924003de57aab415942d169300f527b4fb1416c85d84c6940c5f480dbdb2e349"; + sha256 = "3d93b22ad196777b13ba6d17871fcc46cb6ecde1e8775171624cbd9d527fa345"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/it/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/it/firefox-91.0.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "f779166a2f93b732cbf12a3877dacc83c57a067d6746919e75134c42a2094c92"; + sha256 = "310b5f10f1ff96805f691dfcf0f8c034a9a1a54e84d6e0ae5ecaafa8ab229764"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/ja/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/ja/firefox-91.0.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "571c88dab620d3b39a306fc4800fe97b1b5a93fc8c91d5363f387b34313efb70"; + sha256 = "6e50b5b236da722a01c11402fc6fb5ff362d9c6476ac43815d5c7f48245d158f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/ka/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/ka/firefox-91.0.1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "947cdd7809a90dc742fff69dfecad91814b7b670d618f7be2958efb0d3b4823e"; + sha256 = "e39a97ca32c43d53e95af91de0e58051fc74174eead6ce4346d8a201fed56800"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/kab/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/kab/firefox-91.0.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "a8815674bb41de86bf4cfcfbae800f1b4f72b7bea75f0fb197f86e49b51283a7"; + sha256 = "851f4eb72487e5a22777905017e91d9b55e6f10eb06ef366e24d4d96272e18e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/kk/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/kk/firefox-91.0.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "11756fdb24cc2627f91b92b62972f5aa17262b04d993c2555e887290388743c4"; + sha256 = "cf83913fd67615c8ed9d542c75d22401b051760eb4c0c4e2a5367f954d473dbc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/km/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/km/firefox-91.0.1.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "3282b75df7fb48207fab2d7079066854a95aed9069ef69a6fd57f527f72a70b4"; + sha256 = "82343a709dbb9061d5a71b1f8c5be6adbd8f27e9c0016ff6d0a0ed395f75e4d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/kn/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/kn/firefox-91.0.1.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "8af46418c39dc85d02749ee2ef42199c90e1d05817bf863df7bf5a102bd9c040"; + sha256 = "56fe5ee2e6abd203252ec8643bef2fd019c53ee298ac063ee492c67c6377dcac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/ko/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/ko/firefox-91.0.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "466117f4af7f2c5bfde4ae6e50e000f28bc438c5c7230235316a7779379f66c4"; + sha256 = "dbcfce2f941e817cdf6427ef70c3ce1b7d14898ee9b3a30e470d7ce604f4d816"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/lij/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/lij/firefox-91.0.1.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "0c8901115e01d2aa332e141b3e01d83afe6f38ffba51fa739bb31d1d6a291b40"; + sha256 = "7764585a7bb44f5d139cf822ddd2f89ae12c32ece08844549724b805ed1c86af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/lt/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/lt/firefox-91.0.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "5c37c92c2ee1bd13cd0a3446ce9442898b2a0d384a27247fbd4306ba1eefb300"; + sha256 = "a64c6ee25e8011f63651085ff3c1c853cbeab97ad24d8988d5c419ac2f3fe660"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/lv/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/lv/firefox-91.0.1.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "f0fd8eaa7ea7b5b89ff7e8c2ee80cd79d9ad8d00a6e1609e0ec7a7b898cb7dd6"; + sha256 = "a7bb8ede18fbe6d9d75d9327104e4f0cef1aa6ae8add6045b6952e4c4c4c9df0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/mk/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/mk/firefox-91.0.1.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "4d382a3c88f53c2430a19d09d59482f574ee950f54a7c7e06abc3d2cde1a131b"; + sha256 = "c8cb79bd2d0f244aa6b236ebd026c79b25ebbc23d53f429bed4d00e333180f6d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/mr/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/mr/firefox-91.0.1.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "7af396b0a6c69ceda9689560b36b4f884c44a7909a6b75494ee1f11b54c0e0dc"; + sha256 = "5b451466b9f21f4163c0339c226c475c1d5519e947f98a544fb4fd2a315b2652"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/ms/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/ms/firefox-91.0.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "d9eb79856c9222ca8ca0c458c38203fa25ecec1dbf480002db5278de87e872bf"; + sha256 = "2fc219544e852aae4bc65b97b6a2cf90509eecfa8728358e9bb747c309d7e3a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/my/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/my/firefox-91.0.1.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "5ce0929aa7b0d12d2ed6e38d72245de0d37fdd3e7e69a618a3301b8bf83c7dfc"; + sha256 = "fb2ef8be7e7e553a9529def262c5b072a4a6f36d459858be81ce4d7d7d7f65ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/nb-NO/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/nb-NO/firefox-91.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "62d9169d11f6e9812dcdbaf19e38168cb9cdb2b1e6b17e9eac87e7c2e518ecea"; + sha256 = "67bd49a41d34a1f2f14f9fa98998b49b4837c9cf90bd0d393eb9454248562f3c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/ne-NP/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/ne-NP/firefox-91.0.1.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "2bab2d066daa1d56e23db20bd65a94a74d8421556eef47fc8c3d5b647ebd196c"; + sha256 = "3cf1ec8e18765292105f092e199806281d8e5c10e24b1a2ad02f3cc8e2a03384"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/nl/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/nl/firefox-91.0.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "c627406d909e1e69c5bb229d87a9f99bfddd5014c5911089384275701b580af4"; + sha256 = "c4254c7b2b54abc68ea1ea01fe3ca3a47745477d7e972c1e242288b799035457"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/nn-NO/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/nn-NO/firefox-91.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "2d365f5aeb223248d3c3f4e40618bcba411f64e3b034ec9f9b1a629e7e416037"; + sha256 = "629b16c5b060d20b4992aa9b4f6601c13495ba8e0f48e6bed299fbb2db1b2dbf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/oc/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/oc/firefox-91.0.1.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "a246c0a9aefd8803aeb20ccfbb9f8613f9028fb590e349e0b277d314e0ddb1ac"; + sha256 = "ddd22460bc90e2b0ea468923478114d55ced9b351b954ce354142a93321e369f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/pa-IN/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/pa-IN/firefox-91.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "d28023509c07e7f8792e2efbfa9d38574a52d82bcf178a34fcf93af5fedd0f59"; + sha256 = "9f8127b05b46dae4d3f953d83d10815f29e3c7c3d84631be488d68005a81f803"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/pl/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/pl/firefox-91.0.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "79a4f0253b27e69abd67a2aba53dc0290e4ad74740f7dc2977230b1761ecce0e"; + sha256 = "05dda135b165b1f3e90432a25846d1f9deb0e0e4eff4985bc0b8156d4ce03db9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/pt-BR/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/pt-BR/firefox-91.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "9c7f200e5777153be99946ef551341e6ad82f123e1d6ca449b369ffaf7fc1b64"; + sha256 = "6fc80a89332e3f7fbb15ef035f53a854a408209e1d1a2e12adeffd51e3c7a49d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/pt-PT/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/pt-PT/firefox-91.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "f8d035f3d1fe0a7c0ef42a416ee74974ddc088c5f2a9c0b1668952ba84c5aa10"; + sha256 = "542e38d07c041845abff165eb17740cf729075020a210e4b11b3a7627c325668"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/rm/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/rm/firefox-91.0.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "600e5dbe6780aa21f2b0738bb2062cf5bbc9b6ccda92512f5d94b4e3410ec15e"; + sha256 = "6a484c541b31400b30c193697d5512ed6cccf228c58bc8953187451ceab255e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/ro/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/ro/firefox-91.0.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "a9c1e0c650d7502e9130c7bfd96acdac87c7cdad4f63dcf963dec2954f45dfc6"; + sha256 = "a235174d99da396b491b0ba802558b6ae8e124ad3baa80bc471b65b34ec8cd33"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/ru/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/ru/firefox-91.0.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "56c911b0973e9ffb0d4ad2252dc75602b6474d0f85d2ecacec5c3cb3895bb374"; + sha256 = "e0e6584185798695f92b34bfef5643a8e60e8d8745e8162b4e1de5962a91f072"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/sco/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/sco/firefox-91.0.1.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "db2b0fefa6089d28a66b5606b7d32535c1c82795c9a45812ca7a606c1fec013e"; + sha256 = "bfc2e413320b9bd4479aa36d41fcf881237f6051b978dfb6e0ac8871dc43f272"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/si/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/si/firefox-91.0.1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "294bc137b4c56d7c65927078bb6adc2f2299d3645749d75b6a66be060f0e6bd6"; + sha256 = "91b68d52ee3f49e922d9bb85fb34ce8f81f4413f4246d2131430606cdf0dbf27"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/sk/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/sk/firefox-91.0.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "a75cc03d71e7b4de99e0976f82fa7771f41179ed1517812bc3de9bae323bb21f"; + sha256 = "6e705eec8f8c99cd8f7761a65df781b094276f3c4ea2483dfab4a2344755aee0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/sl/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/sl/firefox-91.0.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "e4706fc5dcd19aa946f5b3701e4e89b508fffc7c6f89648730f5bc61bacfd894"; + sha256 = "4f868d14d0b0f07e5f2204fae2bf3074e9b4b9ad20c715f3618e20fbf5340046"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/son/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/son/firefox-91.0.1.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "a4ed3b6fd7d4794406daca865db37e9bd69aa8bae0bbd0925ed53a66a1c31601"; + sha256 = "3d9596c5d74aff035ad15178d26d48cafb6baec6a3cbdabf4a9df10560558726"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/sq/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/sq/firefox-91.0.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "7ea16267ca165b630ccf3615778f29c2a8b85f860c179a87735c79a0d1d2d122"; + sha256 = "c52577d01a098c808b83a21b9f49123287e58c2cde78818dcee5541b545c8924"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/sr/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/sr/firefox-91.0.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "bb6024f56521965fd6415d9f5da8442e61a611a5f5e68a08c1b447fdc0ca7b47"; + sha256 = "9ded38976438030a6edb5c4c38b1d6a6c5a32006afd2f72b2aadefd4e6a5e9c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/sv-SE/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/sv-SE/firefox-91.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "84bacbac0f236496e20e4de06de07ac13c86ee3b24ca20f9c878c131ca5d89d2"; + sha256 = "b83c19762d22d7cd0f6f60e095bcc6245bba32695de6672caded6bbb0ebbae62"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/szl/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/szl/firefox-91.0.1.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "a0b13ca6141f650f67b362a8405006abfd46ee967bb51921cbe38a8dc11f03b2"; + sha256 = "470d77255bab962ca51393593f4416e0a6464e9dbf65e2d3c735901709ade7db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/ta/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/ta/firefox-91.0.1.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "35a0d686c5183c7177cfba431716ce8016496d70485464292ec6fa5ff2fb3a50"; + sha256 = "d2dbc50bab3854aa0b16580aeee2836e5a59a9cbbc7283230b8e1367f07cff8e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/te/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/te/firefox-91.0.1.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "1482d773023a6a0b6a9c42bd076f6fd006e60d747ad4f54e4d55b4754208c5f8"; + sha256 = "4f488f890cddeb3726ed745a3503a6efbf25081d91b3008b9b99e5c23753f75e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/th/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/th/firefox-91.0.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "c129a4749f879469d573160e3fcc389fc7c81de38afedf139a16345bc6fa44e3"; + sha256 = "e988d6aa3392c68307767a01bef615186d8c40937f8efb39ddee7b0401a8b216"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/tl/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/tl/firefox-91.0.1.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "c98142f0dd0aea08487b29a5aa59563ada4d66c7d79f0e6cec7dded01739c346"; + sha256 = "d51ca2bcdaabb9bf6ca885cc7b01d1cf4cd13ba98fbc403c9fafe3b8d3870007"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/tr/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/tr/firefox-91.0.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "11ccbbb58e92cae8cbc8a17f4a778d18a311fd8e15dc719a5a1ffb3d9315e853"; + sha256 = "74a188ca542d32bda09a44fc5d7f11f4e0ff77f7cfb65b2b083a233f7ec164d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/trs/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/trs/firefox-91.0.1.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "790bdd26f40c7babfffc4acfec00b63a1e6697448895e9adc9031ec20ffc93ef"; + sha256 = "7f458cd74a2798391cf46ecca3075e2d7a8fcb89bbec699d466fe02aef5ce1e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/uk/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/uk/firefox-91.0.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "59810f729ba81e20e1167d075065a4eba5bac092e6b9716c959ca62f1fa52e3f"; + sha256 = "8b491ad4234b7bf1b920ad4456e1e416287fed0a272e4e49295dee5bbfa3081a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/ur/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/ur/firefox-91.0.1.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "01ab7a50f5def0b0d8981d12c1a82edb5b29ff5f94433d3b94abb1014943f698"; + sha256 = "68ef530ab99c08854d99b7f9315ee4e5a664538be849b5654df47dc205bf2a78"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/uz/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/uz/firefox-91.0.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "177c037b6bd0dbfa11717ee1a0aefe7b2d907d8e32ef2e788f459ce19e3ae5e3"; + sha256 = "865aaed959c41461ba6c7275c36170bf633f8a2064612d6deb68fe98a34e19cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/vi/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/vi/firefox-91.0.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "ef73002956f865aaad63c41f4620c6cb8eb420f6b25b65bd0b2398823c6400b8"; + sha256 = "00f2d6282faa8fcb0ecd7d4f5d07514ed9ae23d8cb8ea64ec9911a327153bb13"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xh/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xh/firefox-91.0.1.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "7d3ab2b3a7e21be7d52f1bb88f76f563d5ce6f2c4d83d242308883e596fc254b"; + sha256 = "9ef4bd1d054ea8c9773082699f1cc7b2493bb3eed8d99386db8ec6910ea828b5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/zh-CN/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/zh-CN/firefox-91.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "48ded67925ff82690e75f17386cdf99f9967700a6eadb2b1b9512fb0d1e39a77"; + sha256 = "b91a7fbd4478b913c29b295be9ca968b4992d38410dcdd63fffdb4750b10b872"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/zh-TW/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/zh-TW/firefox-91.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "58bb86a951dba4b1680890fcd1baf6fe3ca4f9ccc0bb661bcd84c232ae055f52"; + sha256 = "4d2317c96524b21c842af70f6e4096be3518e707f894713d99edfc7d71153dff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/ach/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/ach/firefox-91.0.1.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "9dc06632248c42c4743fcc6c5c06860435b6c316b2db4587a357699ba15e2676"; + sha256 = "d3bf432eec6a56c869c6c3f9cc25e99f6843b806c3a569fcfc8365cdaaf49bdc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/af/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/af/firefox-91.0.1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "8ee2d5fe82aa9b3ab36e2cd6017cc4a83951c19b60a4e9ca8d1f73a186fb5f63"; + sha256 = "bf00fcaf0d322e995ece30f7bc3479d37651f866607ead0090f429a4c582bc91"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/an/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/an/firefox-91.0.1.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "7b6d9bae3389585e2c7733590b665aef2e96056f507309d860db207c00c7c972"; + sha256 = "757247fac4eb7232a2668a56e547d031cb55ac76bd8b4c0143c637483ae8ea13"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/ar/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/ar/firefox-91.0.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "44f858443e0778dc195a6bae64b33d93d052d156479d967fd11bff4a28db8cf5"; + sha256 = "072237ecdaf5bccd8d99aa5ea00e0686a064554bf7039dfb37b05634879e0218"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/ast/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/ast/firefox-91.0.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "b9e8d9bc233e4fab3d889a82dce29e8c53bac412e828bab8471b28a8390c17e8"; + sha256 = "cec45238e8e7291bde4d9bc66e489777280b80b6b2d38445899908ca0acf0251"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/az/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/az/firefox-91.0.1.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "e9e80694c86dbfc21b1b9d001c49a42ee0abb8f961266984f63605497dd2cb11"; + sha256 = "6b178343e28818a29e64b24033e2b5851d77901c372d27ed94fdd93d566527d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/be/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/be/firefox-91.0.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "3fdbfaff86f74acc9566acb4b5df9c052128025fab15fb4d68933bacf64a3b05"; + sha256 = "b7ec62a226648166d5942d6064df72e58a70d5ccb4c8489c7cf691bc10812284"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/bg/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/bg/firefox-91.0.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "becc7d28c6438082355f528867ed56bb812d6256a28d559dac88e8e2096a23db"; + sha256 = "95eabbdb1016491e8daece292f12cad165eadc906bf7929121bef665eb15100b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/bn/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/bn/firefox-91.0.1.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "a65aabb5e1184814a1c6a7275039cf163aeacf0f73f80157c34be9cc419a41a7"; + sha256 = "c07547743841020f6b8072a76e398ad067b9991955c73229e74bb28cbe4ba2f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/br/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/br/firefox-91.0.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "05add35005f3c323529d4cccfa2aad2883a5eaf61d87eba756ed88685b8bb2d7"; + sha256 = "6c8edc45cf932549e92c1baee6bbbe06f2f412b4087f95ad1d77ac60d48742c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/bs/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/bs/firefox-91.0.1.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "8bb57da2a7d59e14fbbbd7c297776e54944e109f007d30fd0efca1cad00deb50"; + sha256 = "7f175edda71591a1ff00679d79c51bb63d777090f8e9920280396dbcc2dd0c47"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/ca-valencia/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/ca-valencia/firefox-91.0.1.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "351b05ed3bb4cfa044fcba00fb36dcbabcc78f7ce0c8a38624b94895b1db43a8"; + sha256 = "30bec0fa1b027f3dfe3255f214cfe2bc10b19346cc0ed9bd546d9ce63fe53de5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/ca/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/ca/firefox-91.0.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "03a71864efa362fbdad5ef7969af2340d59b198404dec6ccd417c380b3b9ee68"; + sha256 = "33dbe31e5613ace4f58e5f748b58c7c6f9b0a2a192df660904d4c03a2f7faa0e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/cak/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/cak/firefox-91.0.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "44592f26bc020539c7a73e9b2bc6f6ca6c847a44b03ca1f37541ce4c3347d317"; + sha256 = "26b995231e3c95b8189114f1682f975b4e6041cb99e081af99ac215e2ad23352"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/cs/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/cs/firefox-91.0.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "24c900672eb370503598638c824efe999d1aa0fe007729c31d59363b93e803f7"; + sha256 = "946a570a68551772a1590fc69f006f9269a3e669b002dfa0c30ae036c47b52ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/cy/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/cy/firefox-91.0.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "c1c7df2abedf6fc54b4051f782be997b2334be7a1d683c89c2291594bb9b3abc"; + sha256 = "b5f2b8b412b149672646775c421d67f2b243d9fe16cabb3cd34e853b4ce2de8e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/da/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/da/firefox-91.0.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "004c4c690e0873cd3b83c5e5ab914a58a3753b9b58ff5211a7ace303d6952417"; + sha256 = "263430400e8fc7e1177923df2dee3eeba05680250e96303f63c8a6c2f163a36b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/de/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/de/firefox-91.0.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "dcc9d81a41c98767087e6936b4fe9db40ac1ef5851406aba0c636747c655c38f"; + sha256 = "b90f12c6f4e09e2b8282bd87ad830932073bd41bece3f2309bc698491e4373ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/dsb/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/dsb/firefox-91.0.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "3bd88e656d10c9f163e96ed2049717021205ffcdc62a15c369775707df94e997"; + sha256 = "e2bb197a3dd9864496e92f9280b2655e27cb4052e3c5ee17ea41b7387bff5a3e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/el/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/el/firefox-91.0.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "af948701e0e5df6246993efa145d23e60f9e7cfb6188cde70f722a42fe7d89c8"; + sha256 = "4018eb187e3534142c5fe760a4d35657693950119ce1aea6d6a0fab7177cbbea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/en-CA/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/en-CA/firefox-91.0.1.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "116109ef5e3a10b0f290eff480f107831673cb0b79f74e418ad92027311d4676"; + sha256 = "3f52e42c0ca74036b65b0221eeceb382c7cf28aa63d70a6e26b7f0278da2086d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/en-GB/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/en-GB/firefox-91.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "0bc9532f7dc70234ae34b8d8121595782eacc9c28f178bb50ef7fdf16cb7a56a"; + sha256 = "7a0e416b48038d7b827ec90d3f5b3656d5099e35283e09f0f9c2833e337f76f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/en-US/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/en-US/firefox-91.0.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "16264125112e0798570e2d9a996750e6ac6d009fd876987e0f3dd708e6c3ee45"; + sha256 = "754be9b9e175fc43f96827dcbd894ac539ab4f882d8d078a1a24a8c60cd78fb4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/eo/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/eo/firefox-91.0.1.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "937b62708e0b5281a14f933e2d599676bd552d06b428e14a1ce79f4b013999e2"; + sha256 = "99c612d0748e8980e80750ca1a0477872bbc8151a0703c69bc85fb603dea352d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/es-AR/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/es-AR/firefox-91.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "e4af8197d74256eb33f67021a4a3a224e5b9fa6140826a74ffed7a3adfe1735a"; + sha256 = "49db8ffbc5c396d7eff390c0bd856ce9f9d38f878584beb8dde90476aaa70fb1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/es-CL/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/es-CL/firefox-91.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "01b1808337c8e14febb6a673364e8fed637c450f6f00800c06af179b24952922"; + sha256 = "9fdcd97e6301c2f650a5354b7284705be071f5736c7d356d19dfb097f033f5e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/es-ES/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/es-ES/firefox-91.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "2e6de3d841defda2ef527c6db82197b448dd5d066d32987f8c62a54b309cb953"; + sha256 = "ec2fadaeb087f75172531077ed034a230d57385a05d170bdc0b1f0e5ccc86b59"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/es-MX/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/es-MX/firefox-91.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "34d6894bda103dfa576b323f1f2fc365557978db64f400a4f98dcaedbd1248bc"; + sha256 = "c268d56c1409c60a1d502b524391ea8cfc221e217cdd9e933b5af785486aaa36"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/et/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/et/firefox-91.0.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "f46e4fc634af77c1a5e0f9a50aaa3f833bc0e023902b3fb02eba4e816cd0aa05"; + sha256 = "e22530e22d58a82b0efc6f7f97b48e6b3a36164b65a7e7851fde4b92f6cfe63c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/eu/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/eu/firefox-91.0.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "fb7aecb90c1654ef0288a1339d95b3142378e6b254e84cc49398dd0e5d6e776d"; + sha256 = "0602c61dc05853c4622cd420c93d85d70931ef4dfa240d9d5a342cc199159762"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/fa/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/fa/firefox-91.0.1.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "3241e8123ca000b90e08de54eb4acac68744acba60b1f90cbf2dc39c6f0f27ae"; + sha256 = "6c77f6673f0b4745596be16273fd126f53798b3ef4c118f6602623f09452c317"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/ff/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/ff/firefox-91.0.1.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "feeede23f94ab3009132d9ba68cc0987fd43a8776eabdcbe82b1aedac75c5d13"; + sha256 = "c492aeb925c7ca214fe74513d4296f6ed8774098709d2383101ff29274f2ef94"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/fi/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/fi/firefox-91.0.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "253e7b236d36418a882e3a02284480b76a28bbf5946c39a128b7439a98a76670"; + sha256 = "164d5579dbb14ad0335afce5fc99ab18e433f7c75920a6836d390eb67b8ac743"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/fr/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/fr/firefox-91.0.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "79afba324b29e3c1e8ddb6a0b1f8fcd352833a18869aa14cf0498fa29a91ef44"; + sha256 = "2b0f336fbb9496ee28d00114c4e6492663573a5e4fad4f1e40ab3a6a498645ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/fy-NL/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/fy-NL/firefox-91.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "b06223a20e076f45b5ed1025d155dea95580b5c9d7b07493b1450701de861c88"; + sha256 = "ebae965bb9faafe4aaa781bc63551a9e885e77501e39aa8db81a03537e802777"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/ga-IE/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/ga-IE/firefox-91.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "30c47a2fc30dfc55f1afe0cc31d884c17cb1ecd052839e034898c038398317ba"; + sha256 = "8b4640af9b69620b0dcbc07eb677624bfb0c210e8204ac421e5efb87ea8c5aed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/gd/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/gd/firefox-91.0.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "28f8328085cc3250893fe0e884b0ff615c794ee2cb4f24b94e165d3741bc6042"; + sha256 = "336df4ba9eb7773eb59e1b437f9cea47ddcb25114f26982402792fae9fb6bc8a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/gl/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/gl/firefox-91.0.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "926069fec9a30185986cbfecd8a9c26915fd1e741e6ea0ffea0f6a20af2ddc99"; + sha256 = "92917b113b9cb7d383e97fa542cedadc6cb37fcaf9f861bb68eafcf46faaf23a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/gn/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/gn/firefox-91.0.1.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "a8e18f3c9d6873e533cd5ccf5bae9567528b46b82c5e8d6f63bbcfeefdd66337"; + sha256 = "8dace2530483ab4774e1d5377ec11b36b71a7af393ca6155db2acf223c74c433"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/gu-IN/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/gu-IN/firefox-91.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "565c9864f773d9815a5116502c0c6f5662f3b07c2f69a1a9ee3c9148e2535098"; + sha256 = "982fa9b19585a12c53436eb4c76e75b0836b8ee55326bee0ca5d979af66094a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/he/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/he/firefox-91.0.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "537998ef23693ffeadc2f15b2a32b8c45473071b859363ba383621bae5b6a92c"; + sha256 = "b74efdb1e0167e9b5fe3849df91b252a3958f308dffcf3d055840832b2f5bbed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/hi-IN/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/hi-IN/firefox-91.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "4cfb83db79ff8537ff210667f00d88f9155693e0872a4eeb5bfd9eff1ea66248"; + sha256 = "4f51b08ce8029f1e4a7f9fd25c949255042b0f7dbd5a0a85800e1e914a56cf1e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/hr/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/hr/firefox-91.0.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "013e10a8b1144242a8bc4d27f3d8218c39982990ffeae323c238bdc65090f2ff"; + sha256 = "48bf30b5955b2232ed55a9c67450662a3f378fe1e2c9e994ce68759540718d81"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/hsb/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/hsb/firefox-91.0.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "8373057ef102f31d3cb262ab060215718eb4487acbd2275cd311be2b4932b091"; + sha256 = "cd4a5758c4073b7d18da174b47e81a82ef828ef5791f49d47ee58fe43426964d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/hu/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/hu/firefox-91.0.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "4143a2d0e1696ec8fcaaaea9ac345bafa976123196fdddec5e94570db1e6f255"; + sha256 = "012beccd9fbb7c561b8cbdaedeefbb2bde6ec5fee18208d9794ad04cecd25c6e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/hy-AM/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/hy-AM/firefox-91.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "097bc98861b1d8396a0753bed6d483cfecc9a4ef63b286d6a150225f7e5a531b"; + sha256 = "512f6679b880bc5b1f4f98dd74ee255f94592692ca7987a172bef20ac2722edd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/ia/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/ia/firefox-91.0.1.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "ccaafbc46e722de7d32ec09319bdd57c68b8ccc02393b5b0d95838507feb019b"; + sha256 = "6d252ec4bcc81917fe61210c60deb87b187b13b6957d07d169339f31bae57ef9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/id/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/id/firefox-91.0.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "3e9497d12226458d962aa94207697c9694fdb30a2dcd42cdd1411bd83dfbdf64"; + sha256 = "80b41c75ba207724bb55521a24292713862057cc1b05056dedf135c3e368346b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/is/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/is/firefox-91.0.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "80c5fb3f6a96195c6e023f37ec3aaf35ac30d6eb777d3b1c74f4d4898f4bbb52"; + sha256 = "be35a2937d4fbab20386574d27dd714704338e313f6c4232005e50aedc52e75d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/it/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/it/firefox-91.0.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "375c5a338adb7acb2c1b192cf0d9e479a954866156f59c264f469a2894f50d39"; + sha256 = "d05ecd1685954054601c848f59af446bdb5b3b1399d20421033448122e093792"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/ja/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/ja/firefox-91.0.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "ab4298e63dd5625d0f7af12af53e5e78ecf50a5f95ae556c5d55ec49659ee74f"; + sha256 = "a71d96f6b3d2e30d422a74b6656b78eb0d43be59c6e46db76bf6c8cae6e65394"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/ka/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/ka/firefox-91.0.1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "a027603bdc4e5d67224a060b6577e3cc389e476df2af2b098c9d97aac3e694ed"; + sha256 = "19629e7c91f887b4e5cb2a9a93ab2002d7409787a7e84ece914cb969724e9c7e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/kab/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/kab/firefox-91.0.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "0b1c986ca661040a9902b875a8a64b83b05dadcbe03bdb0205eecc0886ef0c53"; + sha256 = "36e9bcae974500da350a1f60114845a127862f972ff435378c45d18d950957d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/kk/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/kk/firefox-91.0.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "6cb3ceda7ba9bfa726909f390ed487904a284b84e2c522a7ea36fdeded22066e"; + sha256 = "e19473a3dac5f41bf02b783427161c933257d68d24bddef0381354cd86ad5151"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/km/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/km/firefox-91.0.1.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "3b8c0530b4bff8f7b33d0fb70f322f1fc7a75d219bbdd7badb656e6740fdcce1"; + sha256 = "7f1fc2bd4fafa346838fec02a64bafdf2cbde52550c2b28bc7190c35e72de939"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/kn/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/kn/firefox-91.0.1.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "462468372055c64b94df027aa4a9bd2d02f7c82bd4845667d974e6cf1c58f839"; + sha256 = "3b27a6fe3eb654bf20d7b49e9deef1cd2dd44537b0d1de7b2ad7c63dbb2ad133"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/ko/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/ko/firefox-91.0.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "68ce96d841fc715897297dc0c4f9b9321e84298a789f9de49066d37cef1e368c"; + sha256 = "40e8972a4b20e41ad4a24dc75064748e508e30bd7a33f9926cfa0693348f6222"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/lij/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/lij/firefox-91.0.1.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "843a9f5e1758344f51276d5dd77c901d85b5d2bc1d183c4390a9d7783e8c82a8"; + sha256 = "7a7db77418d2dab962d26107cf54cb8d1eb743fb5324bb507016dd46c84f4fed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/lt/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/lt/firefox-91.0.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "97e3efa010e2fcd07750f808ec533efa858e70a664eab80d9550f0835adbd242"; + sha256 = "094fe53032aa6df3ded2e4eb49d56588267f02c3378054ede51aa221d9d69dbf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/lv/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/lv/firefox-91.0.1.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "860b26016d587e24e9e7f308d39041418618564a6029334beed6b56244be7300"; + sha256 = "668b677734c550c7e707f9e3b9c38e4c65d800fa902d1ee3d8c357116acf2700"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/mk/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/mk/firefox-91.0.1.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "3cf4e7e1a7bd6afa365574c5c8a94a64d6621ac2b40ae7c6f078a20f374f9719"; + sha256 = "10c9760c2eea05c9d1187e3575cf80eee1be3b8eb40a6d401d924a6528ae1359"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/mr/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/mr/firefox-91.0.1.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "334c149ee5079259772f102d81fb6fe31ff6d81755ca253da68fb48d6eb0605b"; + sha256 = "bb1ad7d9dc90237c3bf914c33576024575c634fbdf682e0002a4d1edee011c7b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/ms/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/ms/firefox-91.0.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "203ab92d93c0b867a01b1e1b41e65dc6beac79a5dcad040442d9c9ab54747df4"; + sha256 = "49b4e751d17b6ca9f13d632b6b0e8815bfa503d28ddb22aab62b2247c91aced7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/my/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/my/firefox-91.0.1.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "09f23e56f10c34354bf17cd5f299d54425abb10b3c3ffac13ca70005b9530d32"; + sha256 = "d546e7449ea8e68b948ebf33d9bf94fbce2f62f4b273830fe5f1e8228bbcf339"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/nb-NO/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/nb-NO/firefox-91.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "ea404f454d1a89fafa1591419c942ce9a72b7cdeb4361a0d47c4b8d3842de99f"; + sha256 = "954bc07f32b59fccca996050240dcdfa76240b7f01929665431935834e50e170"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/ne-NP/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/ne-NP/firefox-91.0.1.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "b5a34f466497603b966502af30031a96a33deed13b83c95bdb83ac9b0dfbaf20"; + sha256 = "ebf70abdcea48b9c9a4e0b5d5f4a80568a1c9215c93482a555eff5aacceba0ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/nl/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/nl/firefox-91.0.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "b0767df12075247c2068103bf72adb881fb19ce021615dad7fb6dbbb4f563303"; + sha256 = "1f780554975799773e5a8f158b50b188362f94174916a4e1f4ac005ac3538a6a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/nn-NO/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/nn-NO/firefox-91.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "78767f2a1f367bd211760a3d96397a017c8757efe6da3c3d3db1f3d42a65995c"; + sha256 = "0da1e744122f745522960dae64933f322410ab0439043da9d5785bd8d3af058a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/oc/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/oc/firefox-91.0.1.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "ed7db4b9c07e1ca0cc200aa4b110d069e537b91f3e7165b4e573cdd25722e23d"; + sha256 = "14ff5cd790fba8dee449d7754c3c629db28d35e5ac8d0bae2880f11fdcfc1de1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/pa-IN/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/pa-IN/firefox-91.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "42648d9cbbba903d0b4f0b7c23e729a35a06935cee287e541e6523c051d61d96"; + sha256 = "86366ec7227c08a72d9ba296bbc42401ce2c9cb6f5ed314d0a2eb686f9ec11fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/pl/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/pl/firefox-91.0.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "478244c5a95ff65f0961ecd4cc3479f1824316a62a40a743d1c51a94a20ff0bf"; + sha256 = "a1bec4f47cdef2cfd1c4253a47d1512b69aa5ae1b1f4f88f277387e983b4a2da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/pt-BR/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/pt-BR/firefox-91.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "5a8dd0db2148fd61d104121883fcb8626b8acc193397bc33c5ff6465379fdc2a"; + sha256 = "f553fb4a38dc3c71ee1a37e56aa1719639ad9c83da5bf2c2757e73a362ca50f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/pt-PT/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/pt-PT/firefox-91.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "7a4d9201dbb8f085ae841e90d1c78af9e4c837454b1b9093b0e0d276457c8d8d"; + sha256 = "6194d2616f2fe18b98c107b178014c65bc74c6c00cc744cd97ece3dbc844bb9b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/rm/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/rm/firefox-91.0.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "634402368a039fb0d88f3e5dbec9696166207ba8dd5a1d4f1e8f823e9b30d3ad"; + sha256 = "bf0c9adbd0a0ca0a00414e6ccbb09ef53a722d4cb5640584c95d40422a67a159"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/ro/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/ro/firefox-91.0.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "0323eb9385708a8c95f7fce30a00c7f66c42aa49560fee49e26fa5852165cd23"; + sha256 = "20a69f3723937342eb53cfaa47fcb18ac50c0dfa641052fd3cc113af1804b508"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/ru/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/ru/firefox-91.0.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "67374f18744a069d1e8ae62ae531eafab600fd6082cc709cb2afd0e7a11f0bc6"; + sha256 = "67ee468fed1c544aedb4e11aa217909e1dbf804f720b6899d9ccec396577e229"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/sco/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/sco/firefox-91.0.1.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "1ac45172f8d725b3a6dd96553a0d34d4c0869d83acc0c40951a442fac0db8743"; + sha256 = "70c6309032e919f4b206f6de2b2cd233583422be15510b0fa6b1d1ed28444fec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/si/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/si/firefox-91.0.1.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "1b8d65efbc710cb981895c194fdf51902c88b6e4b7bc90a8a900f8d006783f00"; + sha256 = "d102448eba1055c231ca8983fcbf0cfb57da9f7a43addedcdae44858ff387643"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/sk/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/sk/firefox-91.0.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "da72e14c76bd906f13aec33fb771f944d47cf03c90fcc88a7b4dda5765c62303"; + sha256 = "4cc3e5e2c929a5b3775439509a4f917e85962bd9646397ca1c4d41eea83d6284"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/sl/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/sl/firefox-91.0.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "93f932ce8352aba2dc29bbfd3d4cc68ade4b98194716aa8f00715bb5cc261f78"; + sha256 = "ec8d97a98bf3c72a1dcef53cc09ea13d39f6ec6b60e1fc24ffaa3fdfeccbdc47"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/son/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/son/firefox-91.0.1.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "e4fd4ea76ad67dd640d4046e3829ffc8d347f4754fd828fc9238b91e1e740b47"; + sha256 = "c5452583e32a70cd19f40572bce96f18ff37dd09b2116567c8b2867d0a2a2d10"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/sq/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/sq/firefox-91.0.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "6fb7123f665de0d565cfcab0ed76b78672c3b1b7627c6024a8d4126d9adafbac"; + sha256 = "a6d43eef8633ea4cb94307b40ccd76abffc5b59f28d42eead7cbcc9bb9e4bade"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/sr/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/sr/firefox-91.0.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "d3bfbf5ec2d21c658661a601f1be2173415f0e20a433519d9639645b054553ca"; + sha256 = "442905f80fd06bc19e3422ffe13c1acc98ab86681f1a829c0fc04bbb81f1f757"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/sv-SE/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/sv-SE/firefox-91.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "65e423386062c6d43fb3c1008f7a10d44facdfb113f77ed49a11e2922e1c6f97"; + sha256 = "9943b50c9771a0fd7aca1c3197f8d1f4ceae0fbe2e48f636652c68748bf86826"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/szl/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/szl/firefox-91.0.1.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "e072f5a41ba8f987ba49d33345a09a49fa9b8e170ccc6d3b40fac38c44393f85"; + sha256 = "5de3407570162f1a458aef71f279c0b6a4f496b3e293a7b18d210e154ecafe1d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/ta/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/ta/firefox-91.0.1.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "446149c944787c0ef6fd7735a8811d6510b81013e12642d426e5a9e4952576d8"; + sha256 = "5b8185d511d8d40c8cea1fa542578fda89e3ae6c80b43a64d4942339968e2349"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/te/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/te/firefox-91.0.1.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "6033a318247e51b95d83b345d81825be172a411e47b12f6ab1ad3596a87e559c"; + sha256 = "2afc3041ba9ef4ba74a0a1abd44b5e71270917a8f640dced04dad44da253f787"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/th/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/th/firefox-91.0.1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "b3518819c570140b86b3c1941486e7392c0b4fecd99b74bf431fdc3f20568a6a"; + sha256 = "4cd235f4b74d7e35bcd714acd2c9823ef790b40e77335faef7d024ddb9791adc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/tl/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/tl/firefox-91.0.1.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "527f34fe1b0dc17959a6d02dbc08d436938a0c0dc3d8fc2485fd107934293867"; + sha256 = "885f1ce73b9633dca06ec91332d88e3783ed8a699cd9a56346c7d2a550511d80"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/tr/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/tr/firefox-91.0.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "35f131cec53cd86ca34ee39aa8c827483178a49bf4c602923cc97587f10c6f6a"; + sha256 = "485dbbf6ba54385ac605b627dd63adc1dd0b1f10b8e34f37b1aadc115308bf17"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/trs/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/trs/firefox-91.0.1.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "374436eeb3ec60eb802421cd7aca90b9ddbb9ae986e132c2488474270b4bc349"; + sha256 = "24d04d03c8e936ce614de375410c5da867995688118e469543fc66dafe6e1532"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/uk/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/uk/firefox-91.0.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "7779c3e4e09a5d9ebb4091b59cf699eef0cd758b2da84ba3844a21f74a5a10e9"; + sha256 = "beb3566a07a5f1e1acd2aea6d78fc5b970929d7eab51a10d870866da916095c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/ur/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/ur/firefox-91.0.1.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "9cebe40000b97506e010b3126f7ad9f227933d29abbbcfb2d394d45132e99b4e"; + sha256 = "39cbcffe0a7c4f490ff26366c2bdaec7b432ba4c6d00321141d05637a723b8c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/uz/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/uz/firefox-91.0.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "5a79be67283042db3e9906f19bfa2733dee22973559bc8909ab1dff3c2df6f77"; + sha256 = "511fc678e43522fc8c5f33ea4ab9d1a06cf0b8946c7a520ec774e159be00861f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/vi/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/vi/firefox-91.0.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "6bf11408757a4861f776188efc8b6d88df387adf7870d90ff5d9a5e52f08466c"; + sha256 = "637d3743e5a853a54872053f97b91ac664d303fab76b0d6553a4c5fe3817495c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/xh/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/xh/firefox-91.0.1.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "39b91255e9f61fc8e86025b05b30a8ff84b18cb696835d113247f15c582fd53e"; + sha256 = "10594aaaf2b2fa1a71c90b0b0d900978d33bfdd4db00b133a37b4edb4a13c8e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/zh-CN/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/zh-CN/firefox-91.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "e9454287ed8f73c4829ab764ae7c62d96efce97cdb743b9f2951d010c434d833"; + sha256 = "c6cb4c1d22d380b86910a5ec4971e1d40fd77669be9e16caf1e3962e80f3100d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/zh-TW/firefox-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-i686/zh-TW/firefox-91.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "c425ca54f5130d23b1b2dc513d52942e1b5603c803f138a9dcaf3cfed616af76"; + sha256 = "79722e27df9badbac931d25f77b8d241d5568a34a586d0e34099ce3355677027"; } ]; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix index 52d89d20ff..fdd4dbb9b1 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix @@ -1,4 +1,5 @@ -{ pname, ffversion, meta, updateScript ? null +{ pname, version, meta, updateScript ? null +, binaryName ? "firefox", application ? "browser" , src, unpackPhase ? null, patches ? [] , extraNativeBuildInputs ? [], extraConfigureFlags ? [], extraMakeFlags ? [], tests ? [] }: @@ -81,17 +82,16 @@ let default-toolkit = if stdenv.isDarwin then "cairo-cocoa" else "cairo-gtk3${lib.optionalString waylandSupport "-wayland"}"; - binaryName = "firefox"; binaryNameCapitalized = lib.toUpper (lib.substring 0 1 binaryName) + lib.substring 1 (-1) binaryName; - browserName = if stdenv.isDarwin then binaryNameCapitalized else binaryName; + applicationName = if stdenv.isDarwin then binaryNameCapitalized else binaryName; execdir = if stdenv.isDarwin then "/Applications/${binaryNameCapitalized}.app/Contents/MacOS" else "/bin"; # 78 ESR won't build with rustc 1.47 - inherit (if lib.versionAtLeast ffversion "82" then rustPackages else rustPackages_1_45) + inherit (if lib.versionAtLeast version "82" then rustPackages else rustPackages_1_45) rustc cargo; # Darwin's stdenv provides the default llvmPackages version, match that since @@ -118,7 +118,7 @@ let # Disable p11-kit support in nss until our cacert packages has caught up exposing CKA_NSS_MOZILLA_CA_POLICY # https://github.com/NixOS/nixpkgs/issues/126065 - nss_pkg = if lib.versionOlder ffversion "83" then nss_3_53 else nss.override { useP11kit = false; }; + nss_pkg = if lib.versionOlder version "83" then nss_3_53 else nss.override { useP11kit = false; }; # --enable-release adds -ffunction-sections & LTO that require a big amount of # RAM and the 32-bit memory space cannot handle that linking @@ -129,26 +129,26 @@ let in buildStdenv.mkDerivation ({ - name = "${pname}-unwrapped-${ffversion}"; - version = ffversion; + name = "${pname}-unwrapped-${version}"; + inherit version; inherit src unpackPhase meta; patches = [ ] ++ - lib.optional (lib.versionOlder ffversion "86") ./env_var_for_system_dir-ff85.patch ++ - lib.optional (lib.versionAtLeast ffversion "86") ./env_var_for_system_dir-ff86.patch ++ - lib.optional (lib.versionOlder ffversion "83") ./no-buildconfig-ffx76.patch ++ - lib.optional (lib.versionAtLeast ffversion "90") ./no-buildconfig-ffx90.patch ++ - lib.optional (ltoSupport && lib.versionOlder ffversion "84") ./lto-dependentlibs-generation-ffx83.patch ++ - lib.optional (ltoSupport && lib.versionAtLeast ffversion "84" && lib.versionOlder ffversion "86") + lib.optional (lib.versionOlder version "86") ./env_var_for_system_dir-ff85.patch ++ + lib.optional (lib.versionAtLeast version "86") ./env_var_for_system_dir-ff86.patch ++ + lib.optional (lib.versionOlder version "83") ./no-buildconfig-ffx76.patch ++ + lib.optional (lib.versionAtLeast version "90") ./no-buildconfig-ffx90.patch ++ + lib.optional (ltoSupport && lib.versionOlder version "84") ./lto-dependentlibs-generation-ffx83.patch ++ + lib.optional (ltoSupport && lib.versionAtLeast version "84" && lib.versionOlder version "86") (fetchpatch { url = "https://hg.mozilla.org/mozilla-central/raw-rev/fdff20c37be3"; sha256 = "135n9brliqy42lj3nqgb9d9if7x6x9nvvn0z4anbyf89bikixw48"; }) # This patch adds pipewire support for the ESR release - ++ lib.optional (pipewireSupport && lib.versionOlder ffversion "83") + ++ lib.optional (pipewireSupport && lib.versionOlder version "83") (fetchpatch { # https://src.fedoraproject.org/rpms/firefox/blob/master/f/firefox-pipewire-0-3.patch url = "https://src.fedoraproject.org/rpms/firefox/raw/e99b683a352cf5b2c9ff198756859bae408b5d9d/f/firefox-pipewire-0-3.patch"; @@ -185,11 +185,11 @@ buildStdenv.mkDerivation ({ ++ lib.optional gssSupport libkrb5 ++ lib.optionals waylandSupport [ libxkbcommon libdrm ] ++ lib.optional pipewireSupport pipewire - ++ lib.optional (lib.versionAtLeast ffversion "82") gnum4 + ++ lib.optional (lib.versionAtLeast version "82") gnum4 ++ lib.optionals buildStdenv.isDarwin [ CoreMedia ExceptionHandling Kerberos AVFoundation MediaToolbox CoreLocation Foundation libobjc AddressBook cups ] - ++ lib.optional (lib.versionOlder ffversion "90") gtk2; + ++ lib.optional (lib.versionOlder version "90") gtk2; NIX_LDFLAGS = lib.optionalString ltoSupport '' -rpath ${llvmPackages.libunwind.out}/lib @@ -201,14 +201,14 @@ buildStdenv.mkDerivation ({ rm -rf obj-x86_64-pc-linux-gnu substituteInPlace toolkit/xre/glxtest.cpp \ --replace 'dlopen("libpci.so' 'dlopen("${pciutils}/lib/libpci.so' - '' + lib.optionalString (pipewireSupport && lib.versionOlder ffversion "83") '' + '' + lib.optionalString (pipewireSupport && lib.versionOlder version "83") '' # substitute the /usr/include/ lines for the libraries that pipewire provides. # The patch we pick from fedora only contains the generated moz.build files # which hardcode the dependency paths instead of running pkg_config. substituteInPlace \ media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build \ --replace /usr/include ${pipewire.dev}/include - '' + lib.optionalString (lib.versionAtLeast ffversion "80" && lib.versionOlder ffversion "81") '' + '' + lib.optionalString (lib.versionAtLeast version "80" && lib.versionOlder version "81") '' substituteInPlace dom/system/IOUtils.h \ --replace '#include "nspr/prio.h"' '#include "prio.h"' @@ -279,7 +279,7 @@ buildStdenv.mkDerivation ({ ''); configureFlags = [ - "--enable-application=browser" + "--enable-application=${application}" "--with-system-jpeg" "--with-system-zlib" "--with-system-libevent" @@ -356,19 +356,19 @@ buildStdenv.mkDerivation ({ doInstallCheck = true; installCheckPhase = '' # Some basic testing - "$out${execdir}/${browserName}" --version + "$out${execdir}/${applicationName}" --version ''; passthru = { inherit updateScript; - version = ffversion; + inherit version; inherit alsaSupport; inherit pipewireSupport; inherit nspr; inherit ffmpegSupport; inherit gssSupport; inherit execdir; - inherit browserName; + inherit applicationName; inherit tests; inherit gtk3; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix index 33186ccba4..4bbb98d7a8 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix @@ -7,10 +7,10 @@ in rec { firefox = common rec { pname = "firefox"; - ffversion = "91.0"; + version = "91.0.1"; src = fetchurl { - url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "a02486a3996570e0cc815e92c98890bca1d27ce0018c2ee3d4bff9a6e54dbc8f5926fea8b5864f208e15389d631685b2add1e4e9e51146e40224d16d5c02f730"; + url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; + sha512 = "9388789bfe3dca596542b082d0eca7b1a6d1bbbf69eb97cc445f563d1a5ff0c9b530f3be02ee290805e311b0fcb392a4f5341e9f256d9764a787b43b232bdf67"; }; meta = { @@ -27,16 +27,15 @@ rec { tests = [ nixosTests.firefox ]; updateScript = callPackage ./update.nix { attrPath = "firefox-unwrapped"; - versionKey = "ffversion"; }; }; firefox-esr-91 = common rec { pname = "firefox-esr"; - ffversion = "91.0esr"; + version = "91.0.1esr"; src = fetchurl { - url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "e518e1536094a1da44eb45b3b0f3adc1b5532f17da2dbcc994715419ec4fcec40574fdf633349a8e5de6382942f5706757a35f1b96b11de4754855b9cf7946ae"; + url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; + sha512 = "79703b3ec615d10957350719b2c034df10fd47d140c3557cd7de665ef4430973b97c1906d5408ddaf8855c1424e87eb9b1b568322ad8fbdb956fca219a865d66"; }; meta = { @@ -53,16 +52,15 @@ rec { updateScript = callPackage ./update.nix { attrPath = "firefox-esr-91-unwrapped"; versionSuffix = "esr"; - versionKey = "ffversion"; }; }; firefox-esr-78 = common rec { pname = "firefox-esr"; - ffversion = "78.12.0esr"; + version = "78.13.0esr"; src = fetchurl { - url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "646eb803e0d0e541773e3111708c7eaa85e784e4bae6e4a77dcecdc617ee29e2e349c9ef16ae7e663311734dd7491aebd904359124dda62672dbc18bfb608f0a"; + url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; + sha512 = "78a5dc8713ab879ebfc3b8fd7a8219844d06f0d897342fdf9a11471633d98e148ff85cf10e561899df4910b94a33b57709b64788df4621a8c0b83eb9a7102cef"; }; meta = { @@ -79,7 +77,6 @@ rec { updateScript = callPackage ./update.nix { attrPath = "firefox-esr-78-unwrapped"; versionSuffix = "esr"; - versionKey = "ffversion"; }; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix index c868369b60..0ef5233ff6 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -20,18 +20,18 @@ browser: let wrapper = - { browserName ? browser.browserName or (lib.getName browser) - , pname ? browserName + { applicationName ? browser.applicationName or (lib.getName browser) + , pname ? applicationName , version ? lib.getVersion browser - , desktopName ? # browserName with first letter capitalized - (lib.toUpper (lib.substring 0 1 browserName) + lib.substring 1 (-1) browserName) + , desktopName ? # applicationName with first letter capitalized + (lib.toUpper (lib.substring 0 1 applicationName) + lib.substring 1 (-1) applicationName) , nameSuffix ? "" - , icon ? browserName + , icon ? applicationName , extraNativeMessagingHosts ? [] , pkcs11Modules ? [] , forceWayland ? false , useGlvnd ? true - , cfg ? config.${browserName} or {} + , cfg ? config.${applicationName} or {} ## Following options are needed for extra prefs & policies # For more information about anti tracking (german website) @@ -40,7 +40,7 @@ let # For more information about policies visit # https://github.com/mozilla/policy-templates#enterprisepoliciesenabled , extraPolicies ? {} - , firefoxLibName ? "firefox" # Important for tor package or the like + , libName ? "firefox" # Important for tor package or the like , nixExtensions ? null }: @@ -162,15 +162,15 @@ let "jre" ]; pluginsError = - "Your configuration mentions ${lib.concatMapStringsSep ", " (p: browserName + "." + p) configPlugins}. All plugin related options have been removed, since Firefox from version 52 onwards no longer supports npapi plugins (see https://support.mozilla.org/en-US/kb/npapi-plugins)."; + "Your configuration mentions ${lib.concatMapStringsSep ", " (p: applicationName + "." + p) configPlugins}. All plugin related options have been removed, since Firefox from version 52 onwards no longer supports npapi plugins (see https://support.mozilla.org/en-US/kb/npapi-plugins)."; in if configPlugins != [] then throw pluginsError else (stdenv.mkDerivation { inherit pname version; desktopItem = makeDesktopItem { - name = browserName; - exec = "${browserName}${nameSuffix} %U"; + name = applicationName; + exec = "${applicationName}${nameSuffix} %U"; inherit icon; comment = ""; desktopName = "${desktopName}${nameSuffix}${lib.optionalString forceWayland " (Wayland)"}"; @@ -193,12 +193,12 @@ let buildCommand = lib.optionalString stdenv.isDarwin '' mkdir -p $out/Applications - cp -R --no-preserve=mode,ownership ${browser}/Applications/${browserName}.app $out/Applications - rm -f $out${browser.execdir or "/bin"}/${browserName} + cp -R --no-preserve=mode,ownership ${browser}/Applications/${applicationName}.app $out/Applications + rm -f $out${browser.execdir or "/bin"}/${applicationName} '' + '' - if [ ! -x "${browser}${browser.execdir or "/bin"}/${browserName}" ] + if [ ! -x "${browser}${browser.execdir or "/bin"}/${applicationName}" ] then - echo "cannot find executable file \`${browser}${browser.execdir or "/bin"}/${browserName}'" + echo "cannot find executable file \`${browser}${browser.execdir or "/bin"}/${applicationName}'" exit 1 fi @@ -213,9 +213,9 @@ let cd "${browser}" find . -type d -exec mkdir -p "$out"/{} \; - find . -type f \( -not -name "${browserName}" \) -exec ln -sT "${browser}"/{} "$out"/{} \; + find . -type f \( -not -name "${applicationName}" \) -exec ln -sT "${browser}"/{} "$out"/{} \; - find . -type f -name "${browserName}" -print0 | while read -d $'\0' f; do + find . -type f -name "${applicationName}" -print0 | while read -d $'\0' f; do cp -P --no-preserve=mode,ownership "${browser}/$f" "$out/$f" chmod a+rwx "$out/$f" done @@ -236,11 +236,11 @@ let # create the wrapper executablePrefix="$out${browser.execdir or "/bin"}" - executablePath="$executablePrefix/${browserName}" + executablePath="$executablePrefix/${applicationName}" if [ ! -x "$executablePath" ] then - echo "cannot find executable file \`${browser}${browser.execdir or "/bin"}/${browserName}'" + echo "cannot find executable file \`${browser}${browser.execdir or "/bin"}/${applicationName}'" exit 1 fi @@ -249,25 +249,25 @@ let # Careful here, the file at executablePath may already be # a wrapper. That is why we postfix it with -old instead # of -wrapped. - oldExe="$executablePrefix"/".${browserName}"-old + oldExe="$executablePrefix"/".${applicationName}"-old mv "$executablePath" "$oldExe" else oldExe="$(readlink -v --canonicalize-existing "$executablePath")" fi - if [ ! -x "${browser}${browser.execdir or "/bin"}/${browserName}" ] + if [ ! -x "${browser}${browser.execdir or "/bin"}/${applicationName}" ] then - echo "cannot find executable file \`${browser}${browser.execdir or "/bin"}/${browserName}'" + echo "cannot find executable file \`${browser}${browser.execdir or "/bin"}/${applicationName}'" exit 1 fi makeWrapper "$oldExe" \ - "$out${browser.execdir or "/bin"}/${browserName}${nameSuffix}" \ + "$out${browser.execdir or "/bin"}/${applicationName}${nameSuffix}" \ --prefix LD_LIBRARY_PATH ':' "$libs" \ --suffix-each GTK_PATH ':' "$gtk_modules" \ --prefix PATH ':' "${xdg-utils}/bin" \ --suffix PATH ':' "$out${browser.execdir or "/bin"}" \ - --set MOZ_APP_LAUNCHER "${browserName}${nameSuffix}" \ + --set MOZ_APP_LAUNCHER "${applicationName}${nameSuffix}" \ --set MOZ_SYSTEM_DIR "$out/lib/mozilla" \ --set MOZ_LEGACY_PROFILES 1 \ --set MOZ_ALLOW_DOWNGRADE 1 \ @@ -290,7 +290,7 @@ let mkdir -p "$out/share/icons/hicolor/''${res}x''${res}/apps" icon=( "${browser}/lib/"*"/browser/chrome/icons/default/default''${res}.png" ) if [ -e "$icon" ]; then ln -s "$icon" \ - "$out/share/icons/hicolor/''${res}x''${res}/apps/${browserName}.png" + "$out/share/icons/hicolor/''${res}x''${res}/apps/${applicationName}.png" fi done fi @@ -314,24 +314,24 @@ let # # ######################### # user customization - mkdir -p $out/lib/${firefoxLibName} + mkdir -p $out/lib/${libName} # creating policies.json - mkdir -p "$out/lib/${firefoxLibName}/distribution" + mkdir -p "$out/lib/${libName}/distribution" - POL_PATH="$out/lib/${firefoxLibName}/distribution/policies.json" + POL_PATH="$out/lib/${libName}/distribution/policies.json" rm -f "$POL_PATH" cat ${policiesJson} >> "$POL_PATH" # preparing for autoconfig - mkdir -p "$out/lib/${firefoxLibName}/defaults/pref" + mkdir -p "$out/lib/${libName}/defaults/pref" - echo 'pref("general.config.filename", "mozilla.cfg");' > "$out/lib/${firefoxLibName}/defaults/pref/autoconfig.js" - echo 'pref("general.config.obscure_value", 0);' >> "$out/lib/${firefoxLibName}/defaults/pref/autoconfig.js" + echo 'pref("general.config.filename", "mozilla.cfg");' > "$out/lib/${libName}/defaults/pref/autoconfig.js" + echo 'pref("general.config.obscure_value", 0);' >> "$out/lib/${libName}/defaults/pref/autoconfig.js" - cat > "$out/lib/${firefoxLibName}/mozilla.cfg" < ${mozillaCfg} + cat > "$out/lib/${libName}/mozilla.cfg" < ${mozillaCfg} - mkdir -p $out/lib/${firefoxLibName}/distribution/extensions + mkdir -p $out/lib/${libName}/distribution/extensions ############################# # # diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/vieb/yarn.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/vieb/yarn.nix index a92d6defef..6f045bd27e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/vieb/yarn.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/vieb/yarn.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec { +{ fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec { offline_cache = linkFarm "offline" packages; packages = [ { diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix index ad58a048c3..d136873866 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -18,11 +18,11 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "4.0.2312.38-1"; + version = "4.1.2369.18-1"; src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb"; - sha256 = "1sdg22snphjsrmxi3fvy41dnjsxpajbhni9bpidk8msa9xgxvzpx"; + sha256 = "062zh7a4mr52h9m09dnqrdc48ajnkq887kcbcvzcd20wsnvivi48"; }; unpackPhase = '' @@ -49,10 +49,12 @@ in stdenv.mkDerivation rec { buildPhase = '' runHook preBuild echo "Patching Vivaldi binaries" - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${libPath}" \ - opt/${vivaldiName}/vivaldi-bin + for f in crashpad_handler vivaldi-bin vivaldi-sandbox ; do + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${libPath}" \ + opt/${vivaldiName}/$f + done '' + lib.optionalString proprietaryCodecs '' ln -s ${vivaldi-ffmpeg-codecs}/lib/libffmpeg.so opt/${vivaldiName}/libffmpeg.so.''${version%\.*\.*} '' + '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix index 1f32d5f1cd..af2771f985 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix @@ -8,7 +8,7 @@ buildGoModule rec { owner = "roboll"; repo = "helmfile"; rev = "v${version}"; - sha256 = "sha256-Y1BlvUudxEZ1G893dwYU+R6k2QAYohx4+0yysYaUM0E="; + sha256 = "sha256-D9CyJE6/latz4541NfOtvKy+kui3CVmD483SkdEJzyU="; }; vendorSha256 = "sha256-QYI5HxEUNrZKSjk0LlbhjvxXlWCbbLup51Ht3HJDNC8="; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/istioctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/istioctl/default.nix index f3da970579..747523103a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/istioctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/istioctl/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "istioctl"; - version = "1.10.3"; + version = "1.11.0"; src = fetchFromGitHub { owner = "istio"; repo = "istio"; rev = version; - sha256 = "sha256-MHERRJ9t7EG4sd4gevUnZLA25UnRqZprCXFWkp5roms="; + sha256 = "sha256-pQ8Xhhjpcp9RAUUqEDNWRf9JI7xkDVh2PG2KB0lmScs="; }; - vendorSha256 = "sha256-lzRIXZXrNQOwgl774B9r6OW/O8QwykSk3Mv5oGmvDuY="; + vendorSha256 = "sha256-PBMPTrTk5AzzELitSVQijHnx8YDCiZ7R+cpetUfe2KU="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kuttl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kuttl/default.nix index 6470cd640e..fe92a5ddf9 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kuttl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kuttl/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "kuttl"; - version = "0.11.0"; + version = "0.11.1"; cli = "kubectl-kuttl"; src = fetchFromGitHub { owner = "kudobuilder"; repo = "kuttl"; rev = "v${version}"; - sha256 = "sha256-42acx1UcvuzDZX2A33zExhhdNqWGkN0i6FR/Kx76WVM="; + sha256 = "sha256-jvearvhl2fQV5OOVmvf3C4MjE//wkVs8Ly9BIwv15/8="; }; - vendorSha256 = "sha256-TUNFUI7Lj7twJhM3bIdL6ElygIVFOlRut1MoFwVRGeo="; + vendorSha256 = "sha256-EytHUfr6RbgXowYlfuajvNt9VwmGmvw9TBRtwYMAIh4="; subPackages = [ "cmd/kubectl-kuttl" ]; 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 1e47ccc66f..da77ffad3a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/default.nix @@ -64,8 +64,8 @@ in }; edge = generic { channel = "edge"; - version = "21.7.4"; - sha256 = "sha256-yorxP4SQVV6MWlx8+8l0f7qOaF7aJ1XiPfnMqKC8m/o="; - vendorSha256 = "sha256-2ZDsBiIV9ng8P0cDURbqDqMTxFKUFcBxHsPGWp5WjPo="; + version = "21.8.2"; + sha256 = "sha256-jMYJ/mLWvuje4ZRuRbzMaqhz8kyn1bYGITJxkyw5Fyg="; + vendorSha256 = "sha256-18QB2GOxHfnP4GQaF0aohY5kEOg0xN/c+Sp33Ww/1uQ="; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/multus-cni/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/multus-cni/default.nix index d44e0441d8..9e91589478 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/multus-cni/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/multus-cni/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "multus-cni"; - version = "3.7.1"; + version = "3.7.2"; src = fetchFromGitHub { owner = "k8snetworkplumbingwg"; repo = pname; rev = "v${version}"; - sha256 = "04rn7ypd0cw2c33wqb9wqy1dp6ajvcp7rcv7zybffb1d40mdlds1"; + sha256 = "sha256-eVYRbMijOEa+DNCm4w/+WVrTI9607NF9/l5YKkXJuFs="; }; buildFlagsArray = let diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/node-problem-detector/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/node-problem-detector/default.nix index 0d23e94879..f89e9f9ff3 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/node-problem-detector/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/node-problem-detector/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "node-problem-detector"; - version = "0.8.7"; + version = "0.8.9"; src = fetchFromGitHub { owner = "kubernetes"; repo = pname; rev = "v${version}"; - sha256 = "sha256-GyWvwgLtE8N+HLmGKUOjv5HXl2sdnecjh5y6VCOs+/0="; + sha256 = "sha256-P7niTGe0uzg2R1UHrPWbU4tOhOA1OwlP3dslZPwuF0A="; }; vendorSha256 = null; 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 8d470af513..08a58672c0 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 @@ -2,16 +2,16 @@ buildGoModule rec { pname = "nomad-driver-podman"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - sha256 = "1a2alapqm7wnkjm9cg0gvi63pkaila9lhsa5razv0vprhg1k84gy"; + sha256 = "sha256-aVmXtYIquG0acVlbwNmgXUpuOgpsfMmfbnb5md9CN5w="; }; - vendorSha256 = "1zs5y0zfi8dd9w371hpmah4iwxahgvaf70biqqdw3c9yp6yw2rwq"; + vendorSha256 = "sha256-QXAXDoYN5egl5y0YV4/7yh5K0tjzjN5vRJRHyI8eU2E="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/0.12.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/0.12.nix deleted file mode 100644 index cf4a9cde52..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/0.12.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ callPackage -, buildGoPackage -, nvidia_x11 -, nvidiaGpuSupport -}: - -callPackage ./generic.nix { - inherit buildGoPackage nvidia_x11 nvidiaGpuSupport; - version = "0.12.12"; - sha256 = "0hz5fsqv8jh22zhs0r1yk0c4qf4sf11hmqg4db91kp2xrq72a0qg"; -} diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/1.1.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/1.1.nix index cfc38c2f59..e9c4ff8c96 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/1.1.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/1.1.nix @@ -1,11 +1,12 @@ { callPackage -, buildGoPackage +, buildGoModule , nvidia_x11 , nvidiaGpuSupport }: -callPackage ./generic.nix { - inherit buildGoPackage nvidia_x11 nvidiaGpuSupport; - version = "1.1.2"; - sha256 = "08ynfr2lqzv66ymj37qbc72lf2iq41kf94n76pdvynymk4dq98nq"; +callPackage ./genericModule.nix { + inherit buildGoModule nvidia_x11 nvidiaGpuSupport; + version = "1.1.3"; + sha256 = "0jpc8ff56k9q2kv9l86y3p8h3gqbvx6amvs0cw8sp4i7dqd2ihz2"; + vendorSha256 = "0az4gr7292lfr5wrwbkdknrigqm15lkbnf5mh517hl3yzv4pb8yr"; } 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 99a2585272..586308dd42 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/generic.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/generic.nix @@ -6,7 +6,6 @@ , nvidiaGpuSupport , patchelf , nvidia_x11 -, nixosTests }: buildGoPackage rec { @@ -40,8 +39,6 @@ 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/cluster/nomad/genericModule.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/genericModule.nix new file mode 100644 index 0000000000..c2e6573175 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/genericModule.nix @@ -0,0 +1,54 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, version +, sha256 +, vendorSha256 +, nvidiaGpuSupport +, patchelf +, nvidia_x11 +, nixosTests +}: + +buildGoModule rec { + pname = "nomad"; + inherit version; + + subPackages = [ "." ]; + + src = fetchFromGitHub { + owner = "hashicorp"; + repo = pname; + rev = "v${version}"; + inherit sha256; + }; + + inherit vendorSha256; + + nativeBuildInputs = lib.optionals nvidiaGpuSupport [ + patchelf + ]; + + # ui: + # Nomad release commits include the compiled version of the UI, but the file + # is only included if we build with the ui tag. + 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. + postFixup = lib.optionalString nvidiaGpuSupport '' + for bin in $out/bin/*; do + patchelf --add-needed "${nvidia_x11}/lib/libnvidia-ml.so" "$bin" + done + ''; + + passthru.tests.nomad = nixosTests.nomad; + + meta = with lib; { + homepage = "https://www.nomadproject.io/"; + description = "A Distributed, Highly Available, Datacenter-Aware Scheduler"; + platforms = platforms.unix; + license = licenses.mpl20; + maintainers = with maintainers; [ rushmorem pradeepchhetri endocrimes maxeaubrey ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/popeye/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/popeye/default.nix index 67fde535f5..3751ad25c7 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/popeye/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/popeye/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "popeye"; - version = "0.9.2"; + version = "0.9.7"; src = fetchFromGitHub { rev = "v${version}"; owner = "derailed"; repo = "popeye"; - sha256 = "sha256-GSH9q0hnyuGiJAdbFWKbaaYoHKl4e0SNmBkOvpn5a6s="; + sha256 = "sha256-oft1zLLd5TP8S9GMjp5kYaoPoOYnbhJwL2wBerkhp+c="; }; buildFlagsArray = '' @@ -18,7 +18,7 @@ buildGoModule rec { -X github.com/derailed/popeye/cmd.commit=${version} ''; - vendorSha256 = "sha256-pK04vGL9Izv1aK8UA+/3lSt/SjLyckjnfSCrOalRj3c="; + vendorSha256 = "sha256-vUUDLMicop5QzZmAHi5qrc0hx8oV2xWNFHvCWioLhl8="; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/temporal/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/temporal/default.nix index 534a132af5..767e99a10f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/temporal/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/temporal/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "temporal"; - version = "1.11.2"; + version = "1.11.3"; src = fetchFromGitHub { owner = "temporalio"; repo = "temporal"; rev = "v${version}"; - sha256 = "sha256-DskJtZGp8zmSWC5GJijNbhwKQF0Y0FXXh7wCzlbAgy8="; + sha256 = "sha256-SVcjKiIJqHYYO/zu0u/9GFR4Cg3jZvaVlZFfeCkXJoc="; }; vendorSha256 = "sha256-eO/23MQpdXQNPCIzMC9nxvrgUFuEPABJ7vkBZKv+XZI="; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/velero/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/velero/default.nix index dd64d264ba..80d02eb19e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/velero/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/velero/default.nix @@ -3,7 +3,7 @@ buildGoModule rec { pname = "velero"; # When updating, change the commit underneath - version = "1.6.2"; + version = "1.6.3"; commit = "8c9cdb9603446760452979dc77f93b17054ea1cc"; @@ -11,7 +11,7 @@ buildGoModule rec { rev = "v${version}"; owner = "vmware-tanzu"; repo = "velero"; - sha256 = "sha256-JYa+5lP9uo/6/5wTxNz8xa2usHo6WfXSndbwrMpHhcg="; + sha256 = "sha256-oFDTjpcwlvSiAROG/EKYRCD+qKyZXu1gKotBcD0dfvk="; }; buildFlagsArray = '' @@ -22,7 +22,7 @@ buildGoModule rec { -X github.com/vmware-tanzu/velero/pkg/buildinfo.GitTreeState=clean ''; - vendorSha256 = "sha256-Rmj2qGY2w1gsnKAuRQ8cQyqfoM556t4/MookkuPmbDM="; + vendorSha256 = "sha256-ypgrdv6nVW+AAwyVsiROXs6jGgDTodGrGqiT2s5elOU="; excludedPackages = [ "issue-template-gen" "crd-gen" "release-tools" "velero-restic-restore-helper" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/rss2email/default.nix b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/rss2email/default.nix index 9ecadd56f1..9f0ebc7d93 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/rss2email/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/rss2email/default.nix @@ -4,14 +4,14 @@ with pythonPackages; buildPythonApplication rec { pname = "rss2email"; - version = "3.13"; + version = "3.13.1"; propagatedBuildInputs = [ feedparser html2text ]; checkInputs = [ beautifulsoup4 ]; src = fetchurl { url = "mirror://pypi/r/rss2email/${pname}-${version}.tar.gz"; - sha256 = "09vp2y0ibv20y9yysniv6njzigif4h74pkj31l2a8xw5g19gclna"; + sha256 = "3994444766874bb35c9f886da76f3b24be1cb7bbaf40fad12b16f2af80ac1296"; }; outputs = [ "out" "man" "doc" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/rssguard/default.nix b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/rssguard/default.nix index 7e13408d04..b313e0f87c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/rssguard/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/rssguard/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rssguard"; - version = "3.9.1"; + version = "3.9.2"; src = fetchFromGitHub { owner = "martinrotter"; repo = pname; rev = version; - sha256 = "sha256-zSnSCbBNySc5GQSm0O8NztCKNqdNs6bGNWL/RkmGsUw="; + sha256 = "sha256-vWKPIm8iqgjeC7BEBzd5wyFRkLstmdqEtdsror+HUgU="; }; buildInputs = [ qtwebengine qttools ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/flent/default.nix b/third_party/nixpkgs/pkgs/applications/networking/flent/default.nix index 9e76a73233..8df990ec4f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/flent/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/flent/default.nix @@ -3,10 +3,10 @@ buildPythonApplication rec { pname = "flent"; - version = "1.3.2"; + version = "2.0.1"; src = fetchPypi { inherit pname version; - sha256 = "1k265xxxjld6q38m9lsgy7p0j70qp9a49vh9zg0njbi4i21lxq23"; + sha256 = "300a09938dc2b4a0463c9144626f25e0bd736fd47806a9444719fa024d671796"; }; buildInputs = [ sphinx ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/ftp/filezilla/default.nix b/third_party/nixpkgs/pkgs/applications/networking/ftp/filezilla/default.nix index 56dd02e978..5947826552 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/ftp/filezilla/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/ftp/filezilla/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "filezilla"; - version = "3.55.0"; + version = "3.55.1"; src = fetchurl { url = "https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2"; - sha256 = "sha256-rnDrQYDRNr4pu61vzdGI5JfiBfxBbqPkE9znzYyrnII="; + sha256 = "sha256-Z/jQ4R9T/SMgfTy/yULQPz4j7kOe5IoUohQ8mVD3dqU="; }; # https://www.linuxquestions.org/questions/slackware-14/trouble-building-filezilla-3-47-2-1-current-4175671182/#post6099769 diff --git a/third_party/nixpkgs/pkgs/applications/networking/ftp/taxi/default.nix b/third_party/nixpkgs/pkgs/applications/networking/ftp/taxi/default.nix index 8e9966a3f8..c6015a6696 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/ftp/taxi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/ftp/taxi/default.nix @@ -4,6 +4,7 @@ , gobject-introspection , gtk3 , libgee +, libhandy , libsecret , libsoup , meson @@ -18,13 +19,13 @@ stdenv.mkDerivation rec { pname = "taxi"; - version = "0.0.1-unstable=2020-09-03"; + version = "2.0.2"; src = fetchFromGitHub { owner = "Alecaddd"; repo = pname; - rev = "74aade67fd9ba9e5bc10c950ccd8d7e48adc2ea1"; - sha256 = "sha256-S/FeKJxIdA30CpfFVrQsALdq7Gy4F4+P50Ky5tmqKvM="; + rev = version; + sha256 = "1a4a14b2d5vqbk56drzbbldp0nngfqhwycpyv8d3svi2nchkvpqa"; }; nativeBuildInputs = [ @@ -40,6 +41,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 libgee + libhandy libsecret libsoup pantheon.granite diff --git a/third_party/nixpkgs/pkgs/applications/networking/ids/zeek/default.nix b/third_party/nixpkgs/pkgs/applications/networking/ids/zeek/default.nix index 979d765e9e..e70d6c187c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/ids/zeek/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/ids/zeek/default.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "zeek"; - version = "4.0.3"; + version = "4.1.0"; src = fetchurl { url = "https://download.zeek.org/zeek-${version}.tar.gz"; - sha256 = "1nrkwaj0dilyzhfl6yma214vyakvpi97acyffdr7n4kdm4m6pvik"; + sha256 = "165kva8dgf152ahizqdk0g2y466ij2gyxja5fjxlkxcxr5p357pj"; }; nativeBuildInputs = [ cmake flex bison file ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json index 7968c96fb7..4dd59aa5ee 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json @@ -2,7 +2,7 @@ "name": "element-desktop", "productName": "Element", "main": "lib/electron-main.js", - "version": "1.7.34", + "version": "1.8.1", "description": "A feature-rich client for Matrix.org", "author": "Element", "repository": { @@ -54,6 +54,7 @@ "@types/minimist": "^1.2.1", "@typescript-eslint/eslint-plugin": "^4.17.0", "@typescript-eslint/parser": "^4.17.0", + "allchange": "^1.0.0", "asar": "^2.0.1", "chokidar": "^3.5.2", "electron": "^13.1.7", @@ -63,7 +64,7 @@ "electron-notarize": "^1.0.0", "eslint": "7.18.0", "eslint-config-google": "^0.14.0", - "eslint-plugin-matrix-org": "github:matrix-org/eslint-plugin-matrix-org#main", + "eslint-plugin-matrix-org": "github:matrix-org/eslint-plugin-matrix-org#2306b3d4da4eba908b256014b979f1d3d43d2945", "find-npm-prefix": "^1.0.2", "fs-extra": "^8.1.0", "glob": "^7.1.6", @@ -73,7 +74,7 @@ "node-pre-gyp": "^0.15.0", "pacote": "^11.3.5", "rimraf": "^3.0.2", - "tar": "^6.1.0", + "tar": "^6.1.2", "typescript": "^4.1.3" }, "hakDependencies": { diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix index d4a48f31e9..7af8cc7dc2 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec { +{ fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec { offline_cache = linkFarm "offline" packages; packages = [ { @@ -9,6 +9,30 @@ sha1 = "9274ec7460652f9c632c59addf24efb1684ef876"; }; } + { + name = "_actions_core___core_1.4.0.tgz"; + path = fetchurl { + name = "_actions_core___core_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/@actions/core/-/core-1.4.0.tgz"; + sha1 = "cf2e6ee317e314b03886adfeb20e448d50d6e524"; + }; + } + { + name = "_actions_github___github_5.0.0.tgz"; + path = fetchurl { + name = "_actions_github___github_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/@actions/github/-/github-5.0.0.tgz"; + sha1 = "1754127976c50bd88b2e905f10d204d76d1472f8"; + }; + } + { + name = "_actions_http_client___http_client_1.0.11.tgz"; + path = fetchurl { + name = "_actions_http_client___http_client_1.0.11.tgz"; + url = "https://registry.yarnpkg.com/@actions/http-client/-/http-client-1.0.11.tgz"; + sha1 = "c58b12e9aa8b159ee39e7dd6cbd0e91d905633c0"; + }; + } { name = "_babel_code_frame___code_frame_7.14.5.tgz"; path = fetchurl { @@ -481,6 +505,134 @@ sha1 = "f250a0c5e1a08a792d775a315d0ff42fc3a51e1d"; }; } + { + name = "_octokit_auth_token___auth_token_2.4.5.tgz"; + path = fetchurl { + name = "_octokit_auth_token___auth_token_2.4.5.tgz"; + url = "https://registry.yarnpkg.com/@octokit/auth-token/-/auth-token-2.4.5.tgz"; + sha1 = "568ccfb8cb46f36441fac094ce34f7a875b197f3"; + }; + } + { + name = "_octokit_core___core_3.5.1.tgz"; + path = fetchurl { + name = "_octokit_core___core_3.5.1.tgz"; + url = "https://registry.yarnpkg.com/@octokit/core/-/core-3.5.1.tgz"; + sha1 = "8601ceeb1ec0e1b1b8217b960a413ed8e947809b"; + }; + } + { + name = "_octokit_endpoint___endpoint_6.0.12.tgz"; + path = fetchurl { + name = "_octokit_endpoint___endpoint_6.0.12.tgz"; + url = "https://registry.yarnpkg.com/@octokit/endpoint/-/endpoint-6.0.12.tgz"; + sha1 = "3b4d47a4b0e79b1027fb8d75d4221928b2d05658"; + }; + } + { + name = "_octokit_graphql___graphql_4.6.4.tgz"; + path = fetchurl { + name = "_octokit_graphql___graphql_4.6.4.tgz"; + url = "https://registry.yarnpkg.com/@octokit/graphql/-/graphql-4.6.4.tgz"; + sha1 = "0c3f5bed440822182e972317122acb65d311a5ed"; + }; + } + { + name = "_octokit_openapi_types___openapi_types_9.3.0.tgz"; + path = fetchurl { + name = "_octokit_openapi_types___openapi_types_9.3.0.tgz"; + url = "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-9.3.0.tgz"; + sha1 = "160347858d727527901c6aae7f7d5c2414cc1f2e"; + }; + } + { + name = "_octokit_openapi_types___openapi_types_9.7.0.tgz"; + path = fetchurl { + name = "_octokit_openapi_types___openapi_types_9.7.0.tgz"; + url = "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-9.7.0.tgz"; + sha1 = "9897cdefd629cd88af67b8dbe2e5fb19c63426b2"; + }; + } + { + name = "_octokit_plugin_paginate_rest___plugin_paginate_rest_2.15.1.tgz"; + path = fetchurl { + name = "_octokit_plugin_paginate_rest___plugin_paginate_rest_2.15.1.tgz"; + url = "https://registry.yarnpkg.com/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.15.1.tgz"; + sha1 = "264189dd3ce881c6c33758824aac05a4002e056a"; + }; + } + { + name = "_octokit_plugin_paginate_rest___plugin_paginate_rest_2.15.0.tgz"; + path = fetchurl { + name = "_octokit_plugin_paginate_rest___plugin_paginate_rest_2.15.0.tgz"; + url = "https://registry.yarnpkg.com/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.15.0.tgz"; + sha1 = "9c956c3710b2bd786eb3814eaf5a2b17392c150d"; + }; + } + { + name = "_octokit_plugin_request_log___plugin_request_log_1.0.4.tgz"; + path = fetchurl { + name = "_octokit_plugin_request_log___plugin_request_log_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/@octokit/plugin-request-log/-/plugin-request-log-1.0.4.tgz"; + sha1 = "5e50ed7083a613816b1e4a28aeec5fb7f1462e85"; + }; + } + { + name = "_octokit_plugin_rest_endpoint_methods___plugin_rest_endpoint_methods_5.6.0.tgz"; + path = fetchurl { + name = "_octokit_plugin_rest_endpoint_methods___plugin_rest_endpoint_methods_5.6.0.tgz"; + url = "https://registry.yarnpkg.com/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.6.0.tgz"; + sha1 = "c28833b88d0f07bf94093405d02d43d73c7de99b"; + }; + } + { + name = "_octokit_plugin_rest_endpoint_methods___plugin_rest_endpoint_methods_5.8.0.tgz"; + path = fetchurl { + name = "_octokit_plugin_rest_endpoint_methods___plugin_rest_endpoint_methods_5.8.0.tgz"; + url = "https://registry.yarnpkg.com/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.8.0.tgz"; + sha1 = "33b342fe41f2603fdf8b958e6652103bb3ea3f3b"; + }; + } + { + name = "_octokit_request_error___request_error_2.1.0.tgz"; + path = fetchurl { + name = "_octokit_request_error___request_error_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/@octokit/request-error/-/request-error-2.1.0.tgz"; + sha1 = "9e150357831bfc788d13a4fd4b1913d60c74d677"; + }; + } + { + name = "_octokit_request___request_5.6.0.tgz"; + path = fetchurl { + name = "_octokit_request___request_5.6.0.tgz"; + url = "https://registry.yarnpkg.com/@octokit/request/-/request-5.6.0.tgz"; + sha1 = "6084861b6e4fa21dc40c8e2a739ec5eff597e672"; + }; + } + { + name = "_octokit_rest___rest_18.8.0.tgz"; + path = fetchurl { + name = "_octokit_rest___rest_18.8.0.tgz"; + url = "https://registry.yarnpkg.com/@octokit/rest/-/rest-18.8.0.tgz"; + sha1 = "ba24f7ba554f015a7ae2b7cc2aecef5386ddfea5"; + }; + } + { + name = "_octokit_types___types_6.23.0.tgz"; + path = fetchurl { + name = "_octokit_types___types_6.23.0.tgz"; + url = "https://registry.yarnpkg.com/@octokit/types/-/types-6.23.0.tgz"; + sha1 = "b39f242b20036e89fa8f34f7962b4e9b7ff8f65b"; + }; + } + { + name = "_octokit_types___types_6.25.0.tgz"; + path = fetchurl { + name = "_octokit_types___types_6.25.0.tgz"; + url = "https://registry.yarnpkg.com/@octokit/types/-/types-6.25.0.tgz"; + sha1 = "c8e37e69dbe7ce55ed98ee63f75054e7e808bf1a"; + }; + } { name = "_sindresorhus_is___is_0.14.0.tgz"; path = fetchurl { @@ -745,6 +897,14 @@ sha1 = "2fb45e0e5fcbc0813326c1c3da535d1881bb0571"; }; } + { + name = "allchange___allchange_1.0.0.tgz"; + path = fetchurl { + name = "allchange___allchange_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/allchange/-/allchange-1.0.0.tgz"; + sha1 = "f5177b7d97f8e97a2d059a1524db9a72d94dc6d2"; + }; + } { name = "ansi_align___ansi_align_3.0.0.tgz"; path = fetchurl { @@ -1041,6 +1201,14 @@ sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"; }; } + { + name = "before_after_hook___before_after_hook_2.2.2.tgz"; + path = fetchurl { + name = "before_after_hook___before_after_hook_2.2.2.tgz"; + url = "https://registry.yarnpkg.com/before-after-hook/-/before-after-hook-2.2.2.tgz"; + sha1 = "a6e8ca41028d90ee2c24222f201c90956091613e"; + }; + } { name = "binary_extensions___binary_extensions_2.2.0.tgz"; path = fetchurl { @@ -1297,6 +1465,14 @@ sha1 = "ddd5035d25094fce220e9cab40a45840a440318f"; }; } + { + name = "cli_color___cli_color_2.0.0.tgz"; + path = fetchurl { + name = "cli_color___cli_color_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/cli-color/-/cli-color-2.0.0.tgz"; + sha1 = "11ecfb58a79278cf6035a60c54e338f9d837897c"; + }; + } { name = "cli_truncate___cli_truncate_1.1.0.tgz"; path = fetchurl { @@ -1529,6 +1705,14 @@ sha1 = "408086d409550c2631155619e9fa7bcadc3b991b"; }; } + { + name = "d___d_1.0.1.tgz"; + path = fetchurl { + name = "d___d_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/d/-/d-1.0.1.tgz"; + sha1 = "8698095372d58dbee346ffd0c7093f99f8f9eb5a"; + }; + } { name = "dashdash___dashdash_1.14.1.tgz"; path = fetchurl { @@ -1641,6 +1825,14 @@ sha1 = "9bcd52e14c097763e749b274c4346ed2e560b5a9"; }; } + { + name = "deprecation___deprecation_2.3.1.tgz"; + path = fetchurl { + name = "deprecation___deprecation_2.3.1.tgz"; + url = "https://registry.yarnpkg.com/deprecation/-/deprecation-2.3.1.tgz"; + sha1 = "6368cbdb40abf3373b525ac87e4a260c3a700919"; + }; + } { name = "detect_libc___detect_libc_1.0.3.tgz"; path = fetchurl { @@ -1881,6 +2073,14 @@ sha1 = "23c2f3b756ffdfc608d30e27c9a941024807e7f9"; }; } + { + name = "es5_ext___es5_ext_0.10.53.tgz"; + path = fetchurl { + name = "es5_ext___es5_ext_0.10.53.tgz"; + url = "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.53.tgz"; + sha1 = "93c5a3acfdbef275220ad72644ad02ee18368de1"; + }; + } { name = "es6_error___es6_error_4.1.1.tgz"; path = fetchurl { @@ -1889,6 +2089,30 @@ sha1 = "9e3af407459deed47e9a91f9b885a84eb05c561d"; }; } + { + name = "es6_iterator___es6_iterator_2.0.3.tgz"; + path = fetchurl { + name = "es6_iterator___es6_iterator_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz"; + sha1 = "a7de889141a05a94b0854403b2d0a0fbfa98f3b7"; + }; + } + { + name = "es6_symbol___es6_symbol_3.1.3.tgz"; + path = fetchurl { + name = "es6_symbol___es6_symbol_3.1.3.tgz"; + url = "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.3.tgz"; + sha1 = "bad5d3c1bcdac28269f4cb331e431c78ac705d18"; + }; + } + { + name = "es6_weak_map___es6_weak_map_2.0.3.tgz"; + path = fetchurl { + name = "es6_weak_map___es6_weak_map_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/es6-weak-map/-/es6-weak-map-2.0.3.tgz"; + sha1 = "b6da1f16cc2cc0d9be43e6bdbfc5e7dfcdf31d53"; + }; + } { name = "escalade___escalade_3.1.1.tgz"; path = fetchurl { @@ -1930,11 +2154,11 @@ }; } { - name = "50d6bdf6704dd95016d5f1f824f00cac6eaa64e1"; + name = "2306b3d4da4eba908b256014b979f1d3d43d2945"; path = fetchurl { - name = "50d6bdf6704dd95016d5f1f824f00cac6eaa64e1"; - url = "https://codeload.github.com/matrix-org/eslint-plugin-matrix-org/tar.gz/50d6bdf6704dd95016d5f1f824f00cac6eaa64e1"; - sha1 = "ecd130b39eb8bc2f11acdfb859b3529748a364e1"; + name = "2306b3d4da4eba908b256014b979f1d3d43d2945"; + url = "https://codeload.github.com/matrix-org/eslint-plugin-matrix-org/tar.gz/2306b3d4da4eba908b256014b979f1d3d43d2945"; + sha1 = "e82e07e6163d15ee5243d8df073947540bf0efc9"; }; } { @@ -2041,6 +2265,14 @@ sha1 = "74d2eb4de0b8da1293711910d50775b9b710ef64"; }; } + { + name = "event_emitter___event_emitter_0.3.5.tgz"; + path = fetchurl { + name = "event_emitter___event_emitter_0.3.5.tgz"; + url = "https://registry.yarnpkg.com/event-emitter/-/event-emitter-0.3.5.tgz"; + sha1 = "df8c69eef1647923c7157b9ce83840610b02cc39"; + }; + } { name = "except___except_0.1.3.tgz"; path = fetchurl { @@ -2065,6 +2297,14 @@ sha1 = "0bdd92e87d5285d267daa8171d0eb06159689692"; }; } + { + name = "ext___ext_1.4.0.tgz"; + path = fetchurl { + name = "ext___ext_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/ext/-/ext-1.4.0.tgz"; + sha1 = "89ae7a07158f79d35517882904324077e4379244"; + }; + } { name = "extend___extend_3.0.2.tgz"; path = fetchurl { @@ -2833,6 +3073,22 @@ sha1 = "d231362e53a07ff2b0e0ea7fed049161ffd16283"; }; } + { + name = "is_plain_object___is_plain_object_5.0.0.tgz"; + path = fetchurl { + name = "is_plain_object___is_plain_object_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.0.0.tgz"; + sha1 = "4427f50ab3429e9025ea7d52e9043a9ef4159344"; + }; + } + { + name = "is_promise___is_promise_2.2.2.tgz"; + path = fetchurl { + name = "is_promise___is_promise_2.2.2.tgz"; + url = "https://registry.yarnpkg.com/is-promise/-/is-promise-2.2.2.tgz"; + sha1 = "39ab959ccbf9a774cf079f7b40c7a26f763135f1"; + }; + } { name = "is_typedarray___is_typedarray_1.0.0.tgz"; path = fetchurl { @@ -3050,11 +3306,11 @@ }; } { - name = "jszip___jszip_3.6.0.tgz"; + name = "jszip___jszip_3.7.1.tgz"; path = fetchurl { - name = "jszip___jszip_3.6.0.tgz"; - url = "https://registry.yarnpkg.com/jszip/-/jszip-3.6.0.tgz"; - sha1 = "839b72812e3f97819cc13ac4134ffced95dd6af9"; + name = "jszip___jszip_3.7.1.tgz"; + url = "https://registry.yarnpkg.com/jszip/-/jszip-3.7.1.tgz"; + sha1 = "bd63401221c15625a1228c556ca8a68da6fda3d9"; }; } { @@ -3185,6 +3441,14 @@ sha1 = "679591c564c3bffaae8454cf0b3df370c3d6911c"; }; } + { + name = "loglevel___loglevel_1.7.1.tgz"; + path = fetchurl { + name = "loglevel___loglevel_1.7.1.tgz"; + url = "https://registry.yarnpkg.com/loglevel/-/loglevel-1.7.1.tgz"; + sha1 = "005fde2f5e6e47068f935ff28573e125ef72f197"; + }; + } { name = "lowercase_keys___lowercase_keys_1.0.1.tgz"; path = fetchurl { @@ -3209,6 +3473,14 @@ sha1 = "6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"; }; } + { + name = "lru_queue___lru_queue_0.1.0.tgz"; + path = fetchurl { + name = "lru_queue___lru_queue_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/lru-queue/-/lru-queue-0.1.0.tgz"; + sha1 = "2738bd9f0d3cf4f84490c5736c48699ac632cda3"; + }; + } { name = "make_dir___make_dir_3.1.0.tgz"; path = fetchurl { @@ -3241,6 +3513,14 @@ sha1 = "efbc392e3523669d20b812a6dae2f6efb49b888d"; }; } + { + name = "memoizee___memoizee_0.4.15.tgz"; + path = fetchurl { + name = "memoizee___memoizee_0.4.15.tgz"; + url = "https://registry.yarnpkg.com/memoizee/-/memoizee-0.4.15.tgz"; + sha1 = "e6f3d2da863f318d02225391829a6c5956555b72"; + }; + } { name = "merge2___merge2_1.4.1.tgz"; path = fetchurl { @@ -3481,6 +3761,22 @@ sha1 = "feacf7ccf525a77ae9634436a64883ffeca346fb"; }; } + { + name = "next_tick___next_tick_1.1.0.tgz"; + path = fetchurl { + name = "next_tick___next_tick_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/next-tick/-/next-tick-1.1.0.tgz"; + sha1 = "1836ee30ad56d67ef281b22bd199f709449b35eb"; + }; + } + { + name = "next_tick___next_tick_1.0.0.tgz"; + path = fetchurl { + name = "next_tick___next_tick_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz"; + sha1 = "ca86d1fe8828169b0120208e3dc8424b9db8342c"; + }; + } { name = "node_addon_api___node_addon_api_1.7.2.tgz"; path = fetchurl { @@ -3489,6 +3785,14 @@ sha1 = "3df30b95720b53c24e59948b49532b662444f54d"; }; } + { + name = "node_fetch___node_fetch_2.6.1.tgz"; + path = fetchurl { + name = "node_fetch___node_fetch_2.6.1.tgz"; + url = "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz"; + sha1 = "045bd323631f76ed2e2b55573394416b639a0052"; + }; + } { name = "node_gyp___node_gyp_7.1.2.tgz"; path = fetchurl { @@ -4610,11 +4914,11 @@ }; } { - name = "tar___tar_6.1.0.tgz"; + name = "tar___tar_6.1.2.tgz"; path = fetchurl { - name = "tar___tar_6.1.0.tgz"; - url = "https://registry.yarnpkg.com/tar/-/tar-6.1.0.tgz"; - sha1 = "d1724e9bcc04b977b18d5c573b333a2207229a83"; + name = "tar___tar_6.1.2.tgz"; + url = "https://registry.yarnpkg.com/tar/-/tar-6.1.2.tgz"; + sha1 = "1f045a90a6eb23557a603595f41a16c57d47adc6"; }; } { @@ -4633,6 +4937,14 @@ sha1 = "7f5ee823ae805207c00af2df4a84ec3fcfa570b4"; }; } + { + name = "timers_ext___timers_ext_0.1.7.tgz"; + path = fetchurl { + name = "timers_ext___timers_ext_0.1.7.tgz"; + url = "https://registry.yarnpkg.com/timers-ext/-/timers-ext-0.1.7.tgz"; + sha1 = "6f57ad8578e07a3fb9f91d9387d65647555e25c6"; + }; + } { name = "timm___timm_1.7.1.tgz"; path = fetchurl { @@ -4809,6 +5121,22 @@ sha1 = "09e249ebde851d3b1e48d27c105444667f17b83d"; }; } + { + name = "type___type_1.2.0.tgz"; + path = fetchurl { + name = "type___type_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/type/-/type-1.2.0.tgz"; + sha1 = "848dd7698dafa3e54a6c479e759c4bc3f18847a0"; + }; + } + { + name = "type___type_2.5.0.tgz"; + path = fetchurl { + name = "type___type_2.5.0.tgz"; + url = "https://registry.yarnpkg.com/type/-/type-2.5.0.tgz"; + sha1 = "0a2e78c2e77907b252abe5f298c1b01c63f0db3d"; + }; + } { name = "typedarray_to_buffer___typedarray_to_buffer_3.1.5.tgz"; path = fetchurl { @@ -4857,6 +5185,14 @@ sha1 = "39c6451f81afb2749de2b233e3f7c5e8843bd89d"; }; } + { + name = "universal_user_agent___universal_user_agent_6.0.0.tgz"; + path = fetchurl { + name = "universal_user_agent___universal_user_agent_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/universal-user-agent/-/universal-user-agent-6.0.0.tgz"; + sha1 = "3381f8503b251c0d9cd21bc1de939ec9df5480ee"; + }; + } { name = "universalify___universalify_0.1.2.tgz"; path = fetchurl { 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 fd7074f005..a82fe8ce34 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 @@ -19,12 +19,12 @@ let executableName = "element-desktop"; - version = "1.7.34"; + version = "1.8.1"; src = fetchFromGitHub { owner = "vector-im"; repo = "element-desktop"; rev = "v${version}"; - sha256 = "sha256-4d2IOngiRcKd4k0jnilAR3Sojkfru3dlqtoBYi3zeLY="; + sha256 = "sha256-FIKbyfnRuHBbmtjwxNC//n5UiGTCQNr+PeiZEi3+RGI="; }; electron_exec = if stdenv.isDarwin then "${electron}/Applications/Electron.app/Contents/MacOS/Electron" else "${electron}/bin/electron"; in diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-web.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-web.nix index 8b14820656..a40ccf49f7 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-web.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-web.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { pname = "element-web"; - version = "1.7.34"; + version = "1.8.1"; src = fetchurl { url = "https://github.com/vector-im/element-web/releases/download/v${version}/element-v${version}.tar.gz"; - sha256 = "sha256-0M2LuVSHIGRwzq00wgzlzTVWh3WItNN+JDNf+u+9V30="; + sha256 = "sha256-C2oWYpPxMeSgGKyjUe6Ih13ggZliN4bmAX5cakzW1u8="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/keytar/yarn.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/keytar/yarn.nix index d9c163c4e3..d6b1b99da8 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/keytar/yarn.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/keytar/yarn.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec { +{ fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec { offline_cache = linkFarm "offline" packages; packages = [ { diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/seshat/yarn.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/seshat/yarn.nix index e9a6333cbb..b861502bf7 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/seshat/yarn.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/seshat/yarn.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec { +{ fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec { offline_cache = linkFarm "offline" packages; packages = [ { diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix index 99f9f5aded..6a98df1258 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "jitsi-meet-electron"; - version = "2.8.9"; + version = "2.8.10"; src = fetchurl { url = "https://github.com/jitsi/jitsi-meet-electron/releases/download/v${version}/jitsi-meet-x86_64.AppImage"; - sha256 = "sha256-PsMP0bDxlXAkRu3BgaUWcqnTfUKOGB81oHT94Xi8t8E="; + sha256 = "sha256-k++vumbhcMl9i4s8f04zOUAfYlA1g477FjrGuEGSD1U="; name = "${pname}-${version}.AppImage"; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-cli/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-cli/default.nix index 05ab8b49a6..b282c5c5f2 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-cli/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-cli/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "signal-cli"; - version = "0.8.1"; + version = "0.8.5"; # Building from source would be preferred, but is much more involved. src = fetchurl { url = "https://github.com/AsamK/signal-cli/releases/download/v${version}/signal-cli-${version}.tar.gz"; - sha256 = "sha256-Lq1RSJ1VIa6MFTiTbGqNy7IqliJwGeuegm/1+RRtu+I="; + sha256 = "sha256-H895fyI6fdrrqhcgKMxzGSxO5BFuuizjfjBEwvl1yyg="; }; buildInputs = lib.optionals stdenv.isLinux [ libmatthew_java dbus dbus_java ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/db-reencryption-wrapper.py b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/db-reencryption-wrapper.py deleted file mode 100755 index 8556ee1e4d..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/db-reencryption-wrapper.py +++ /dev/null @@ -1,92 +0,0 @@ -#!@PYTHON@ - -import json -import os -import re -import shlex -import sqlite3 -import subprocess -import sys - - -DB_PATH = os.path.join(os.environ['HOME'], '.config/Signal/sql/db.sqlite') -DB_COPY = os.path.join(os.environ['HOME'], '.config/Signal/sql/db.tmp') -CONFIG_PATH = os.path.join(os.environ['HOME'], '.config/Signal/config.json') - - -def zenity_askyesno(title, text): - args = [ - '@ZENITY@', - '--question', - '--title', - shlex.quote(title), - '--text', - shlex.quote(text) - ] - return subprocess.run(args).returncode == 0 - - -def start_signal(): - os.execvp('@SIGNAL-DESKTOP@', ['@SIGNAL-DESKTOP@'] + sys.argv[1:]) - - -def copy_pragma(name): - result = subprocess.run([ - '@SQLCIPHER@', - DB_PATH, - f"PRAGMA {name};" - ], check=True, capture_output=True).stdout - result = re.search(r'[0-9]+', result.decode()).group(0) - subprocess.run([ - '@SQLCIPHER@', - DB_COPY, - f"PRAGMA key = \"x'{key}'\"; PRAGMA {name} = {result};" - ], check=True, capture_output=True) - - -try: - # Test if DB is encrypted: - con = sqlite3.connect(f'file:{DB_PATH}?mode=ro', uri=True) - cursor = con.cursor() - cursor.execute("SELECT name FROM sqlite_master WHERE type='table';") - con.close() -except: - # DB is encrypted, everything ok: - start_signal() - - -# DB is unencrypted! -answer = zenity_askyesno( - "Error: Signal-Desktop database is not encrypted", - "Should we try to fix this automatically?" - + "You likely want to backup ~/.config/Signal/ first." -) -if not answer: - answer = zenity_askyesno( - "Launch Signal-Desktop", - "DB is unencrypted, should we still launch Signal-Desktop?" - + "Warning: This could result in data loss!" - ) - if not answer: - print('Aborted') - sys.exit(0) - start_signal() - -# Re-encrypt the DB: -with open(CONFIG_PATH) as json_file: - key = json.load(json_file)['key'] -result = subprocess.run([ - '@SQLCIPHER@', - DB_PATH, - f" ATTACH DATABASE '{DB_COPY}' AS signal_db KEY \"x'{key}'\";" - + " SELECT sqlcipher_export('signal_db');" - + " DETACH DATABASE signal_db;" -]).returncode -if result != 0: - print('DB encryption failed') - sys.exit(1) -# Need to copy user_version and schema_version manually: -copy_pragma('user_version') -copy_pragma('schema_version') -os.rename(DB_COPY, DB_PATH) -start_signal() diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index d062e3b74c..9b58931eed 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -10,9 +10,6 @@ , hunspellDicts, spellcheckerLanguage ? null # E.g. "de_DE" # For a full list of available languages: # $ cat pkgs/development/libraries/hunspell/dictionaries.nix | grep "dictFileName =" | awk '{ print $3 }' -, python3 -, gnome -, sqlcipher }: let @@ -28,7 +25,7 @@ let else ""); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "5.12.2"; # Please backport all updates to the stable channel. + version = "5.13.1"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -38,7 +35,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "0z8nphlm3q9gqri6bqh1iaayx5yy0bhrmjb7l7facdkm1aahmaa7"; + sha256 = "0k3gbs6y19vri5n087wc6fdhydkis3h6rhxd3w1j9rhrb5fxjv3q"; }; nativeBuildInputs = [ @@ -115,7 +112,7 @@ in stdenv.mkDerivation rec { # Symlink to bin mkdir -p $out/bin - ln -s $out/lib/Signal/signal-desktop $out/bin/signal-desktop-unwrapped + ln -s $out/lib/Signal/signal-desktop $out/bin/signal-desktop runHook postInstall ''; @@ -140,16 +137,6 @@ in stdenv.mkDerivation rec { patchelf --add-needed ${libpulseaudio}/lib/libpulse.so $out/lib/Signal/resources/app.asar.unpacked/node_modules/ringrtc/build/linux/libringrtc-x64.node ''; - postFixup = '' - # This hack is temporarily required to avoid data-loss for users: - cp ${./db-reencryption-wrapper.py} $out/bin/signal-desktop - substituteInPlace $out/bin/signal-desktop \ - --replace '@PYTHON@' '${python3}/bin/python3' \ - --replace '@ZENITY@' '${gnome.zenity}/bin/zenity' \ - --replace '@SQLCIPHER@' '${sqlcipher}/bin/sqlcipher' \ - --replace '@SIGNAL-DESKTOP@' "$out/bin/signal-desktop-unwrapped" - ''; - # Tests if the application launches and waits for "Link your phone to Signal Desktop": passthru.tests.application-launch = nixosTests.signal-desktop; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix index add76012ad..0405dddf7c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "whatsapp-for-linux"; - version = "1.1.5"; + version = "1.2.0"; src = fetchFromGitHub { owner = "eneshecan"; repo = pname; rev = "v${version}"; - sha256 = "1gzahls4givd2kbjdwx6yb3jv7a3r1krw40qihiz7hkamkrpaiaz"; + sha256 = "sha256-dB+NsoUEYM3cT0cg5ZOkBGW7ozRGFWSsYQMja3CjaHM="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 82eecf17cf..6f15459ab6 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -28,11 +28,11 @@ }: let - version = "5.7.28991.0726"; + version = "5.7.29123.0808"; srcs = { x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz"; - sha256 = "w1oeMKADG5+7EV1OXyuEbotrwcVywob82KOXKoRUifA="; + sha256 = "WAeE/2hUaQbWwDg/iqlKSZVoH3ruVHvh+9SEWdPwCIc="; }; }; @@ -101,12 +101,13 @@ stdenv.mkDerivation rec { rm $out/bin/zoom # Zoom expects "zopen" executable (needed for web login) to be present in CWD. Or does it expect # everybody runs Zoom only after cd to Zoom package directory? Anyway, :facepalm: - # Also clear Qt environment variables to prevent - # zoom from tripping over "foreign" Qt ressources. + # Clear Qt paths to prevent tripping over "foreign" Qt resources. + # Clear Qt screen scaling settings to prevent over-scaling. makeWrapper $out/opt/zoom/ZoomLauncher $out/bin/zoom \ --run "cd $out/opt/zoom" \ --unset QML2_IMPORT_PATH \ --unset QT_PLUGIN_PATH \ + --unset QT_SCREEN_SCALE_FACTORS \ --prefix PATH : ${lib.makeBinPath [ coreutils glib.dev pciutils procps util-linux ]} \ --prefix LD_LIBRARY_PATH ":" ${libs} diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/catgirl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/irc/catgirl/default.nix index 1bc51def0c..936524918e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/irc/catgirl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/irc/catgirl/default.nix @@ -1,16 +1,16 @@ -{ ctags, fetchurl, lib, libressl, man, ncurses, pkg-config, stdenv }: +{ ctags, fetchurl, lib, libressl, ncurses, pkg-config, stdenv }: stdenv.mkDerivation rec { pname = "catgirl"; - version = "1.9"; + version = "1.9a"; src = fetchurl { url = "https://git.causal.agency/catgirl/snapshot/${pname}-${version}.tar.gz"; - sha256 = "182l7yryqm1ffxqgz3i4lcnzwzpbpm2qvadddmj0xc8dh8513s0w"; + sha256 = "sha256-MEm5mrrWfNp+mBHFjGSOGvvfvBJ+Ho/K+mPUxzJDkV0="; }; nativeBuildInputs = [ ctags pkg-config ]; - buildInputs = [ libressl man ncurses ]; + buildInputs = [ libressl ncurses ]; strictDeps = true; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/networking/listadmin/default.nix b/third_party/nixpkgs/pkgs/applications/networking/listadmin/default.nix new file mode 100644 index 0000000000..a59f65995e --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/listadmin/default.nix @@ -0,0 +1,48 @@ +{ lib, stdenvNoCC, fetchurl, makeWrapper, perl, installShellFiles }: + +stdenvNoCC.mkDerivation rec { + pname = "listadmin"; + version = "2.73"; + + src = fetchurl { + url = "mirror://sourceforge/project/listadmin/${version}/listadmin-${version}.tar.gz"; + sha256 = "00333d65ygdbm1hqr4yp2j8vh1cgh3hyfm7iy9y1alf0p0f6aqac"; + }; + + buildInputs = [ perl ]; + nativeBuildInputs = [ makeWrapper installShellFiles ]; + + # There is a Makefile, but we don’t need it, and it prints errors + dontBuild = true; + + installPhase = '' + mkdir -p $out/bin $out/share/man/man1 + install -m 755 listadmin.pl $out/bin/listadmin + installManPage listadmin.1 + + wrapProgram $out/bin/listadmin \ + --prefix PERL5LIB : "${with perl.pkgs; makeFullPerlPath [ + TextReform NetINET6Glue LWPProtocolHttps + ]}" + ''; + + doInstallCheck = true; + installCheckPhase = '' + $out/bin/listadmin --help 2> /dev/null + ''; + + meta = with lib; { + description = "Command line mailman moderator queue manipulation"; + longDescription = '' + listadmin is a command line tool to manipulate the queues of messages + held for moderator approval by mailman. It is designed to keep user + interaction to a minimum, in theory you could run it from cron to prune + the queue. It can use the score from a header added by SpamAssassin to + filter, or it can match specific senders, subjects, or reasons. + ''; + homepage = "https://sourceforge.net/projects/listadmin/"; + license = licenses.publicDomain; + platforms = platforms.unix; + maintainers = with maintainers; [ nomeata ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 3de7ea1bb6..7a656c9505 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,665 +1,655 @@ { - version = "78.13.0"; + version = "91.0"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/af/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/af/thunderbird-91.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "f08190514cb9e7a429e12db93b5423e83f8c4f8b34079e266b797099d6e5b3cb"; + sha256 = "6fb57813f9f0568f3f97aa512c9b94df540e4e2aebdadb11994237bdf167a929"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/ar/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/ar/thunderbird-91.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "cafc6a55a1bd4b1ed0c412cdcce917d803f1d81689a496e09ffd702bf1495c8e"; + sha256 = "398ac9528f19d2457689eb0d4579cfaeb21fe7d0be4a40a66a4216fd6d1e5f16"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/ast/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/ast/thunderbird-91.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "b444e1b6cc64b28069382e97f8b966f6d154fbc4216cc67b20ce0105ebd0be89"; + sha256 = "2ac99b80f8ba4f36406fc9df3eaf6f9290f89a23e99736820b5e9fdc14b549ab"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/be/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/be/thunderbird-91.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "18ef49bc393dfc223638edb54525a336f604c606c36f40e3c0f6e4a883cbb1d9"; + sha256 = "0088a693289b0cdfb441837843dc0342d772c8e0f5d57dd68b620b18e7cc7be5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/bg/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/bg/thunderbird-91.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "2fe1b34fbb43e22f8fb7238baca4aa2d5d5df3dbf4baf0aa276fc8bd0dd5bc02"; + sha256 = "ee23796c539b5c118d39a6dcfd3ebb3b3e9c2f0720a45eb920e782e7a43ded14"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/br/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/br/thunderbird-91.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "e1a46004fefb79e3febf8bcd2b8aa6aa7140b97170740c4b5cc4b6351cb1fd6f"; + sha256 = "5bf147164fbf9dbe3dbe5eba6c4ba81438870da10a6c0e71606ed95a333fcfba"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/ca/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/ca/thunderbird-91.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "d7e9112b78155af6e684f9f306e35fb7aa8862f2008aa842729aedf10e5b62ef"; + sha256 = "a1cab93e6e8c3c22ba65364dfabc39a0fa7fb0c6c35b002036068c894d68a093"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/cak/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/cak/thunderbird-91.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "325acc4638890583fcd2483846cce33a4ed9a2fb376265c926bb8904e37cb6cf"; + sha256 = "9b51ed781b637f417a230901b05018a5a69bbdfee98d1100140bf8e7e1aa8992"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/cs/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/cs/thunderbird-91.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "a9926717859e51e5f66c41c0a11a70e8d4e635b8dae3486f454ad24464ad1e80"; + sha256 = "3384ec93657fb7e93bebb010d24edac3dcda240d87dc3c9be3918a8d559e9e3a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/cy/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/cy/thunderbird-91.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "e8d6edb4ba1b6749517ef5d4ae3300aed654c3aa9d6a6e6d7f4a0ff6c829d139"; + sha256 = "e2e8a9adafc1038872264bedb76a702217502738304a790f887b5cd326c0e58c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/da/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/da/thunderbird-91.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "ab5288a8d809f9979eb3a330ec0cd8bb4c5deab564b755f064470fe13df3d0be"; + sha256 = "40a63673b7f3d2cd68758476448b181e1ef1b0ede3dc1031938bf91cb261ba17"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/de/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/de/thunderbird-91.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "9a477fe13a4a99fc48fae4713b82771ecca367869047ef268d8811dac1aac220"; + sha256 = "4244dbfae753f96287e576680ef8dc9767bcfa1c1ceec68e58580e03d0ef7587"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/dsb/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/dsb/thunderbird-91.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "deb4947364fd806e06b5c69ea4b51b411b9cd10bec92a23d6d7432d8ba0bbdf0"; + sha256 = "3ba7f369886303bff8ab524218ab588dd6521a3c2d2fb98c857dba69992c7352"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/el/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/el/thunderbird-91.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "18cc09ee14827e4a3f155215a11551791e5708106ae0d993145ccce4890d8cf0"; + sha256 = "d8af9b00e7b27be272b22381dcf5dee91acbabee3113a909cd0f12143ced9ce0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/en-CA/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/en-CA/thunderbird-91.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "6afd716eeae087a27a8c75029735e501fd7e32f95a8842bc5ba0e3a64cb31630"; + sha256 = "de8a4a8be9dbf3aedfad1ea8fda7aa14758923d232148f96f1ee356781e87b4f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/en-GB/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/en-GB/thunderbird-91.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "91e0ad90be9e4e89f5245e660e09c3ad06d1ff807a30b3eb696261a883ea77ea"; + sha256 = "b76b69cd6d10ff0140da9c53b35842f04b798235427f5a058d9911e111e1c73c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/en-US/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/en-US/thunderbird-91.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "97515bda6e141aef0d74696db3459711985f7fb526ca0e2d7544725d72f5fb3b"; + sha256 = "74776e073932dc77d24bf8967b6ff09052c3be7f8b78d82fd4684ed395f633e4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/es-AR/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/es-AR/thunderbird-91.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "ef6067e00544e37786694d85957c0fbdf12bb20add6f6f5dadc03b095d24513d"; + sha256 = "449d7b060da5f95b8605a49f1ee12e6633b3bd1b3b96a50837fc641e558331b0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/es-ES/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/es-ES/thunderbird-91.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "be6df6fa4ed5facfb77a5849e0a4008ec42c2629deb5ea2dc3fa5251891e0306"; + sha256 = "b18e38da156c4242a5108eede2c8cdf236d48561175d842fe54b5dcde2ccfbb6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/et/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/et/thunderbird-91.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "6c63ddb05366d3a9d0baadceccb3aac8fe3c6788515feeb2649bdc5d717d6d0c"; + sha256 = "96eae79eec62e2661f01424e4a6363c4f541a22cb47bf8d674606553bcf367fd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/eu/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/eu/thunderbird-91.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "215861f41e59b6e9c5892e9b10483b890a7a4c351376c455001215af4c3bf276"; + sha256 = "68db1e219d0cda1f67ac7f6b4f1de727e1dc2c11bfc705a16f83710b0d265c0b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/fa/thunderbird-78.13.0.tar.bz2"; - locale = "fa"; - arch = "linux-x86_64"; - sha256 = "6486a7b0923d5b689e15eb2082317127e62f050d68f887dbe410619f5c36a470"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/fi/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/fi/thunderbird-91.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "5e6a55e1520174f9cd27a82e3634999df0703f8bbdee82fdec433f862c41daaf"; + sha256 = "90edac8bbac821f7d286ee24042c6b2e993606ea7457b9b132b0e591744d8448"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/fr/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/fr/thunderbird-91.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "7c9573fbf4a0d16e89a9f8d8fae71874cf49577b3749ba942ecb71b1b6a3a8d5"; + sha256 = "abf6c364d18fdd015654f6179be07ff701a3dfac2fcd028a5eeb6b0171da584c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/fy-NL/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/fy-NL/thunderbird-91.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "6ff1fe09e82b723ebc7022744bba0cd064da2fcc7b8b92fc23475bbbea57c0fb"; + sha256 = "dc3226237442171bf23f0781ed9be5fe77fe89514dff0155a34ae224a9109132"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/ga-IE/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/ga-IE/thunderbird-91.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "be25c020f47cf42c05dfd33338b210ad603ede6af97f8b41528d8a18be209fe3"; + sha256 = "1808e5d949005b3adc4ed40f5ed0ad5350a7c6e8e5692347b07bb7db3eb2e85a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/gd/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/gd/thunderbird-91.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "65cd07e5151809ae64a905163c939bfdef60226b4fe24b9657f6de3a2c10eaa6"; + sha256 = "93592836614498d617d60aa0799957371c63747029343836da5f1afaa415cd96"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/gl/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/gl/thunderbird-91.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "882ed57366537562882a5e7822789a7b16d6161b8a68e7292d86741d9c3f4b95"; + sha256 = "917a816447dbc5381b14ca18331a8979aaf65c8b593376ae1dfc5a53953f6150"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/he/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/he/thunderbird-91.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "115e4cb00d50dd7c5c42e94a432b04e4ac6129e1409c5b5c578594917a1b60d0"; + sha256 = "85a78253b374a4134021ff5d8bf3b8146fd864ce5cd40d60668e9130f8ff915c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/hr/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/hr/thunderbird-91.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "325cfc1ea9f0a8cb8bd3cb7c881e1bd84a8d8813b78618dcdc7b1ca7b4647b30"; + sha256 = "38c912e4ab89f49caaea46da01c3042764a859e541f749f94737ccd85594aaa7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/hsb/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/hsb/thunderbird-91.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "c92d6bd04f71dc7379c3777186d094706ea41ad6a3e1fefa515d0a2316c7735d"; + sha256 = "b3e51840364ac97b080008fd1dc65af8ba8f827bf3867d182b0486448c118877"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/hu/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/hu/thunderbird-91.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "ee0ab2733affbbd7f23589f1e07399ef73fd3c8901463085a67d6c9a3f6e5302"; + sha256 = "4b8e82e5726de6ce682b7e0192adb013f036dd9cd6745afc4e227074fee69ebe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/hy-AM/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/hy-AM/thunderbird-91.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "fa5b38c93c4777046213b00e6162a7afe14cafb1a3fec47383f54a9fd11a440b"; + sha256 = "43d70569709895d1ab015dc7f7f984cef05b100b360285ab51bfaef38ed41b3e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/id/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/id/thunderbird-91.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "a5602d079dd6ae9edbd5b1461474d858085c3250edb33573afd7f4ea2b232176"; + sha256 = "11b1a3d2f12ffef1bb434b428ae60a5c40cf7f90186d3b0e301c8422731f9959"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/is/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/is/thunderbird-91.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "eed6de442870f9c4933bef7e94019bbc386465ba5f7f2baa26de2b79973fa567"; + sha256 = "8a62b5defb2abfa1a3f37c1a0fbd890fb650aedb565da97b47def80bc7ef4349"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/it/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/it/thunderbird-91.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "960c1552022ea30da269981d986b5715c971438e5d379d74fde59f18d033d862"; + sha256 = "160440d4f5bbd1d305a3de2096847a692b155a8c4da2b5e1273b2ff2a9595a1b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/ja/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/ja/thunderbird-91.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "0a13ffba546db10ff44ff5c5db7d17813febdf557b8aea7d7399b6987806e8da"; + sha256 = "69ed5d8fb0822991511e70487a90f0b564d84b1f5774bbf493d2b128c49f5852"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/ka/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/ka/thunderbird-91.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "42b41113b2886cc35afe5ed48026d503519e8c318efad6123f5e074caa8ca425"; + sha256 = "b536d8b558296a04b6ce5cee4accca28b286ded4046f6b47f5725f79551947d6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/kab/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/kab/thunderbird-91.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "17f0fdf3f2697256052335808a6ad1ef81d97fc94f848c29df9e717a3e63fba8"; + sha256 = "3ff28c944d78bba5cdca8f859baa9d142e7e26f2cf31a6d3de3e38c9af4ca6af"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/kk/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/kk/thunderbird-91.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "94956589eeaaf7c9dd3c3c5c004907f33d6ee515d1202dad8f651cfbd1726638"; + sha256 = "ae412956e8acfb68c4a36f912940e8b8faa9d3e1240982aea9fd01ec1d86f273"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/ko/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/ko/thunderbird-91.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "0a7efb01da1befb18111c117d2ed4c69e52de0b3f3aa24e6e3e2d0356bf645d8"; + sha256 = "a51368f6ac4efe83873d2e8208aa17b0fc8887c8d6f605ac910ad72a7f4c411c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/lt/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/lt/thunderbird-91.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "810dae8617107773cc0d0de4ed7cc4fad42282edcea81fb2b6419777d7386bae"; + sha256 = "a22d65720566d38eaa75944001d5f077ee3df3787e8b4b5220609f819474c6e4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/ms/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/lv/thunderbird-91.0.tar.bz2"; + locale = "lv"; + arch = "linux-x86_64"; + sha256 = "ec05e9a802dc01349d5226eeb88dbbc980c867cb037404c46e2535587463465d"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/ms/thunderbird-91.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "ae4fdae5ca5a07e3f1b9fdd3b9eaff1cd1d8448eefb0b67cde16124514f075a3"; + sha256 = "540d7f9530515abf49909b4dce562d25f679d2e41e5871b3f8d76410ef6527fb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/nb-NO/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/nb-NO/thunderbird-91.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "ce73218100a0153fee49edaedc78910cfda0784ebf59ec90847b7718eb108b73"; + sha256 = "e4a6790bca7720bbf44bdd7e9dfbdc7b229a536f3054ff497917b60484095bfb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/nl/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/nl/thunderbird-91.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "63e23bba6301b86da1df350e87d107c53bc04b5eaf54c36bb57e0140b79a1479"; + sha256 = "0f0a6ceef0a0e8a9bc05f3bf948a635a05073dc4b7750788ac94ef0ca600fe96"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/nn-NO/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/nn-NO/thunderbird-91.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "287efd5bc94297448895121c8df4fe43beaf39850ce8a82cda31d9a89a4d7b62"; + sha256 = "f13232443a5b5d89c971a07e6867ab8874dbd1fc090e9f5126af1fc3641183ff"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/pa-IN/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/pa-IN/thunderbird-91.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "7079c15ce806ba3cb20bb50b6c36004ffa745ac083f514b2ac5b5dece95eef89"; + sha256 = "a5ff0f2bbc3f1dc52394e3f6c28538af4caf23e9b7b58b9eea07f1df16a2c7ec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/pl/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/pl/thunderbird-91.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "30048a59149c8ca6b9d240140826b61a777752dafa221c47738d291c51e70ccd"; + sha256 = "17326bf010c05bc718bf01f9d080c8b9987ca249809244751a87424d88ac744c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/pt-BR/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/pt-BR/thunderbird-91.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "38cf30326280109a1f08de860ac1045c78b27a1dc851a7972e03e8c8d07bf6b9"; + sha256 = "dc82c57f2577ba459aa90f8394f03944c9322b40ac84d0fa9023334932888b8b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/pt-PT/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/pt-PT/thunderbird-91.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "ef892e822f76b00b06f088335f736552cd7c864212eadfdf4afcd4e6a7eba2dd"; + sha256 = "706e80a83dcd92c32b85da31f5c5e304342ef4f3723bfc45e8a8c0f5b415950d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/rm/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/rm/thunderbird-91.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "c19dc84c5437b1126ab568a5be2c5256403511cb2624c4d5ff253f5579cdd2ab"; + sha256 = "0f616312c7e92e49062df968561096b41f20b0c62283f7647bfc35ec562ed845"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/ro/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/ro/thunderbird-91.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "263d6cfc4efd27849017ae3f13849f6e5be0bd7dd6a9964b6716a948705beb20"; + sha256 = "b61faa886fd34207c4453adbab6e3a83cb45b6ff204ad52d55e9bed591922b13"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/ru/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/ru/thunderbird-91.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "425b1544350335e5a15dc8dfe2525c6c3143e34377bb9bbfb25f9b1a688b202a"; + sha256 = "8042b28e80dccbb2d130f8eaf6c6c6d27f32072a09e6e037fc2df4ec2b4c8364"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/si/thunderbird-78.13.0.tar.bz2"; - locale = "si"; - arch = "linux-x86_64"; - sha256 = "bc506ac571d49e70e330ccbfd62c566985754c7b98f8b484209128ab173a6b08"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/sk/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/sk/thunderbird-91.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "46b479e0085402f43446bd003ff4b9c014e888b4eec0cbcdcdf9336893ffc967"; + sha256 = "7810727d8b959ac680163a1a4c8bea093e50a8ec0a4a7b805cbc3629bf60b06a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/sl/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/sl/thunderbird-91.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "a8a70d172e8d5890394f9974208de1cf422290b6fd8e5629a31b2f7706eaaa35"; + sha256 = "fc9173ee213df06ac278ce2ead827f6ee4dfa897b232281db6d804cd49997962"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/sq/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/sq/thunderbird-91.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "f26287b10e906805984b0beb4ea6890bfb62a82ae8138bd26b7a5febc628be7c"; + sha256 = "4447920125210987660b5fcd19c86127242a10dc2449a61d1c68fac7de1a5c5b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/sr/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/sr/thunderbird-91.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "20fc984078efae2ddcbbe7dbd81238a79342a7fe7d1f8736594c1fb290104ed0"; + sha256 = "f88a957406464a5f8827acbfdcd716cd52807da522825e6c815e6f44c8f79691"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/sv-SE/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/sv-SE/thunderbird-91.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "ea67fdba6f8f3825ed1637fd7f73b9f8159c519de3920165ae58052b351c0936"; + sha256 = "71f11757b02eb9b4ab463ddb61ca283e77a7015c38b2cb1a2f3ecd21506369ca"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/th/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/th/thunderbird-91.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "86f069a0a4ef2e5338754e3a5de369a25b0d8fe96b3b7047dbfd009171e8fcf9"; + sha256 = "497b2c6e3af11c9a53f75db9a6765ac810a82a57e771c42126adbe424104444c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/tr/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/tr/thunderbird-91.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "9e975e5d8493a7f2b4dab36b5719b5a80c239820cd7d1adddb83440e9560d810"; + sha256 = "75de22f190e83058c2e85b88ae5d8775328a4257c60d17ef7be20240ffd4c2c2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/uk/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/uk/thunderbird-91.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "a0d14c98ee3534d7eb7f0098d0fd7b8f64b4c70d5bc0bd78ea695b42babefa17"; + sha256 = "b257f216e2472628c420ed8c09ad98567256ce5d5c89748dbf7562cc2dbbc88a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/uz/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/uz/thunderbird-91.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "e7d1e5b0b6a72d8b0e3611f1d4f245c46222148c1f69805a15057a85cccda9dd"; + sha256 = "6af949a5f1632e98013fe4d9254a62f4d3233cc250eded67f45db89faa82a86f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/vi/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/vi/thunderbird-91.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "67a733ec644060ca58673dccf1e4e534bb1e17f7f40e0c248e6f666450ad8b07"; + sha256 = "28d8125827c79822bf24e7e14b71497b1522bac11fb55e9210b7e86066e48f99"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/zh-CN/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/zh-CN/thunderbird-91.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "324c6f5c203b9ecc050bce51cf657785c7129251130efbe9f216540bbd32438c"; + sha256 = "34d6dcd8e83c5f0ee773b32a3bfdf53bfbef36f3a5a76861e68b5cdd63515dec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/zh-TW/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/zh-TW/thunderbird-91.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "e2df519a3fdfe586edac6ffb9496637df8d6ab3ba93c51c7ee979cd4b901a1e5"; + sha256 = "d67c370be24af901e29833ab4334185186366545d51c4c3c111a4044f199b927"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/af/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/af/thunderbird-91.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "1228035980663d4712877ccbef838522ce8e7c80d04598bc37f42972f6b01b12"; + sha256 = "0251ce2b251bb2637338618dcd2c083b1b99c4337c04b7cd6757dd28005df405"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/ar/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/ar/thunderbird-91.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "1b4950bc1227ae4e38da2db53a381609eb836afb4ee14dd23e7f1d93db58718d"; + sha256 = "d833ebf9924458b8aac37e1de52b3a043bda6b179365fc896be8306afbdccfcb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/ast/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/ast/thunderbird-91.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "ad399d8ec5e48ee79470018df8db138791e4207156f3f7c818d24a9688b83ae4"; + sha256 = "22b051502a38aad41132e05526b4d0e881c9d66e36effaf5c0bb0730a66e4641"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/be/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/be/thunderbird-91.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "00c324154a4d2cfcd1399dec6dea9d60812c89ffb7fa7d8ad0caa699a2826f9f"; + sha256 = "ede16ceae207d1c7bfa3bf909879b701c3eac49cb4a7e133a929ee4ee89ae6a4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/bg/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/bg/thunderbird-91.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "f3b88a019536ca8446600d5f5b35ce5d35d5dc483ae63437d2ee0ed9a8696426"; + sha256 = "a1dbe387348c427ddb9948129a2ec1f8aeb34532103def94a086e1b405c532fc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/br/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/br/thunderbird-91.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "d76b6774e0ca7e25687fe25936f81e80167dca6b7ef1a2cd1248be71e2bb3abd"; + sha256 = "a89b7d357349353d96d608fddb2e2279c5b8a222eab113c56aed7531ccb77848"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/ca/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/ca/thunderbird-91.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "d1a0da69ebf33a8d96110133fe91fd7799e95f303b55aec750d8a3b5ad395e49"; + sha256 = "34086af5fd1b2bf9b603f1379bf7f1ef25583f5021266f2b636853c7d047ba39"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/cak/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/cak/thunderbird-91.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "b61a9548b72fdf5e3211cf238129a17df3d8b3fdf76da3aa06cf83ff9ba43b7e"; + sha256 = "86a8f3938b8dfcd371e043effa0f6a80d2bbdf8046eb5242c8c49f43f27463a9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/cs/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/cs/thunderbird-91.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "605b02fcbc6b1aafa261cbad5aa12d85342f9f9d9458b4a154ee23bbbc91d49b"; + sha256 = "4add72a1fd8cd104b30a51ddf5f73e1e66beb5e416a8552f84cc39c815670586"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/cy/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/cy/thunderbird-91.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "af5bf08dd943334629f60fe139392dfc957bae073bc50ec4e10bdace08b2fe1a"; + sha256 = "539d32830b885ae7790bc9367e45caaa4bd8dcde7328f8b75f6652882aab6533"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/da/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/da/thunderbird-91.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "ac1e4082bc78248ca1dc8760cf71901fc0e0e537b92e7dadb9af5ac9c80c49f8"; + sha256 = "ebffd062f2ede3fa1e4659781e44f1905099882e7fe2a994ea283e865bb9926e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/de/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/de/thunderbird-91.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "a26ba23ae9eeaeba09d2a9fbb4fecbe87e6b5662488d7c0dded0fee89cbb5107"; + sha256 = "3f06fb893e22d9b3e27f433c3e8081c9ced29e87492a6b4c4d0660bbfd427579"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/dsb/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/dsb/thunderbird-91.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "775d9f85cc392e2c219e2c19800d4fba8aba1762e1c7b3a2f328dc61925b9638"; + sha256 = "ff985eb9a3d697fa19d1e803a79e0964607b6803a36b7540b68b37b0ae36b3fb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/el/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/el/thunderbird-91.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "d11d1c2b09d8f9e55dee43e19d64157cf040865729eb2986dbe8aeca8fabfa6f"; + sha256 = "fb463af56b39f8f22d2806174c3a79d3c57f125d88329e3dad14eb448fe21ef5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/en-CA/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/en-CA/thunderbird-91.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "14691fa34a7ced54eec6a7485a5258af4934e0f07cc612588698e88fd624a07a"; + sha256 = "a86e775b7d271766efccbe851c24fcaa2e2abf45bc6099600f68f90db31a9a38"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/en-GB/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/en-GB/thunderbird-91.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "919b63cd0018df0913d9f230d36e5d8124bef5afe9d224072eaa1d40dc45fa28"; + sha256 = "ee83c2d28e66acb52aa969380b2be197f14118172e2f9a9a5e683e65e2fbb3f8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/en-US/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/en-US/thunderbird-91.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "1fc8e76d7840ec8fccdabe4765e72555e75e027d47359e7a3f2fb092a30d2673"; + sha256 = "a96d6e6fd81b1bcebaa47901a1262b339e07321a47f82be0d913ada978f995b8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/es-AR/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/es-AR/thunderbird-91.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "0c38fe5f220b3ed9f096c026e05ebfb195bf6c545e2041fd5d1f84e95bc2c238"; + sha256 = "f7454e9aa448b7f108d4a6f0b74cb943ea7cc5cafe638d7f45ed201bb5e560f4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/es-ES/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/es-ES/thunderbird-91.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "db0dcd82200922451b79a00ad7660ad2e1df6a2abb84ea4ff7ebdc73a751c068"; + sha256 = "d2b2be182440b49b386cd4e4d09e1f4133f3fec08e83fa2ef23ce6de612220be"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/et/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/et/thunderbird-91.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "a3c802a85f607d85c97e955c45ba4e35842da4bc5bebc6dd43407c6aea546d65"; + sha256 = "4e4580b8dd9c84b7921b420b0d336bb866cd82eb93a06bb73f240cd4324f5ab0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/eu/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/eu/thunderbird-91.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "3bc5f4ceb596334fb9a570be31807898efe3684441fe9a9f96a28d16d4269864"; + sha256 = "e2b9a805c5eca39621cbe4927cdd1ecf0582e21fa78d3c27a5df6996fab51cdf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/fa/thunderbird-78.13.0.tar.bz2"; - locale = "fa"; - arch = "linux-i686"; - sha256 = "eba6a5b4bd14860d97a71c7eabcd893c733ae52ebc5e06c9e12afda86552d35a"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/fi/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/fi/thunderbird-91.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "77d8335a6c5fb8e302cc5a4490f6248e51e555e5d5c428116557b0cb560f2b14"; + sha256 = "1f7a337dda1d3a99e174d5d3b26630238560b30fba9a058575b041e44be15d8d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/fr/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/fr/thunderbird-91.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "2fce215ad23039c43624e897353b8b696eff73281c0739050ca5621b1ad209c2"; + sha256 = "1287c936d0f089998484bba6a32d5ee78eb866f7ae0b7bf8eaa832ce1e3796d3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/fy-NL/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/fy-NL/thunderbird-91.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "1c670d870e6e9cc1366467d0c0acfab98a83842442bcd3b7b2bb1d302c2cf331"; + sha256 = "0f88569ae12ac7b3b796d4bd244c242cad29224e2f11aaee7f07b30756b169d8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/ga-IE/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/ga-IE/thunderbird-91.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "77207016b5cd5204c9dcf849ec099c5bdf3bee4d79ec8ecde2cf61dc6719fb8c"; + sha256 = "556ee9841a0588de5dad84062d9d908976f46e92e45659b5ebabb7f3b8bf105d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/gd/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/gd/thunderbird-91.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "5ee8c00cd937b9e7c62b13c594db9138b9550ddefa0c38127f7636cdaea7e420"; + sha256 = "24059e8f399cfafc0847645a2007c958e015e8977639bae75b5bf0cc9e97b160"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/gl/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/gl/thunderbird-91.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "2fe3765c8dcbb2a281f7de1ae481a9f725c2df785552d840e1f65f922e94d42e"; + sha256 = "600bb0d4c4ad77074511d1bfa80f8f752d18ef06d1a861f604189581dec8011e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/he/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/he/thunderbird-91.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "f63094c0bc5cdbdf0640d9281e52bcdbab517f3d72f84e4a01a120c148f39ea0"; + sha256 = "153e8e37ecca9783f1737e699f36b2cd35524e9d8ef8a57e0f0bfa96fd3ffcf0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/hr/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/hr/thunderbird-91.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "0740acd2e924fb424790a806e2fef66ad43cf53e43fbaa87ac984225616b6167"; + sha256 = "aaa099d96c0a05f8b4773483aef740fe125a83b98fe78d73b25cfec35639112a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/hsb/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/hsb/thunderbird-91.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "bf6d4d7230d55ec1ddb7fb9764fc182dc8468bf57663661ef7e87d0762080900"; + sha256 = "2159cabe4a9873ff6d9ca5a12c8e530a027c252f85c9d18c29248223fc402447"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/hu/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/hu/thunderbird-91.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "a4d9f65e964787fba470c0a091edbe7a21e667ab80e1f7dd1fc76290230aa721"; + sha256 = "235a419a02ff897ba82676c2a1a38a274163fc069bb45ef6d49b04b5da575b03"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/hy-AM/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/hy-AM/thunderbird-91.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "9718afe2417006bda611b12c42ed2dc74d397cbd6703d86ca758119535226d0f"; + sha256 = "f36574058412d452951b789610d7752a4db280a38314d4f1c54a2d7c48ecc32d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/id/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/id/thunderbird-91.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "d3b9d86bddb1ed6db4a4e6456d09295d057da47aed4ad23a95021f3a2aa38ec4"; + sha256 = "9e0c91956ad10fe0ba944134ef68a0d58631d74a75804d12f3cb1a7e596ff36d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/is/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/is/thunderbird-91.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "e2dc5cf9120dcaa54516393b9b14659b24a43a86809b3113724cc0480dad7a71"; + sha256 = "5b06606613bc420769b4071ef2781214c8ab918bb7653594753e655aac49282c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/it/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/it/thunderbird-91.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "66c24020386335156d2659f70570f798982f2cf36014fbb8b866f1e3870b9dcb"; + sha256 = "b9d3f3e1a03a256a0c4b835d3b93ca220217f8d628ac05513ff161126effa385"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/ja/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/ja/thunderbird-91.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "ece2f1660ef41a31ae4116a32b9b025547a419fcbd8612d1a36d9bc0b9e821af"; + sha256 = "5ba904085b47370f414d74761394f6ddc71aa3c0fac9cdc023661b70bc708d14"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/ka/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/ka/thunderbird-91.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "b549016df313c46518ee50c03b7f075c78feefeaadfd5a5c0ec2508d0607d999"; + sha256 = "9ae8fecd564a1a8e8c6db848e05adc4655baf42e8b4602c28965a3ee76c5d1d2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/kab/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/kab/thunderbird-91.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "c56fe1f7051a47c05834a7378313b24fe8fdbbd816692dcaeefaf3635f09eab9"; + sha256 = "a9cde5c6b4c41d0ccfedacd5eeb9f6ef946282cf07bc98c45704bb5f7b4b6210"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/kk/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/kk/thunderbird-91.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "86594f4e1d92d495c76bbe20cadeb3bea74d5f57a4b3155edd01ff4f62c5f1a5"; + sha256 = "4710e947dcb3bba71d187ad828ad09011183ef104758e7d79c8dbc528f9460fb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/ko/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/ko/thunderbird-91.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "47c8cb4a58643c56f005fa36b0790344546f5efad5446c2b5b49040906eb9339"; + sha256 = "1b4d7ce21c95ecd2510bd073bdf74e0d7f748ef69d32adc2eefdb0fae42fd717"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/lt/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/lt/thunderbird-91.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "e3afe316e77d4c33e936574f32c3d477643b51fd0f0f228d52cce676c8ab4f82"; + sha256 = "ed69b146a789715f51ed78132a4f32c12afae67847faea9629371221e99e4a8a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/ms/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/lv/thunderbird-91.0.tar.bz2"; + locale = "lv"; + arch = "linux-i686"; + sha256 = "6562ae94bd90af19778df1157da2ee39b9da4ae164111c60adae1064400bcefc"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/ms/thunderbird-91.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "626dd1acb63356a2f531095833b0e697231009f5b0c51f401a17e8551b21a32d"; + sha256 = "812a399146c30e6532eb57597df9a08cce7d769a57df6efd17230db75405be08"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/nb-NO/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/nb-NO/thunderbird-91.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "fe236ce5d719b3ac205f47ab4837ea3ad5d6f2817c44e2e562b0a011480a91ce"; + sha256 = "ac5b0231d8bfbc9d318579dd97c3a4e49d723797224cf3f4e1591520ce9c9e07"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/nl/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/nl/thunderbird-91.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "33fb2a46384f38e887575297ad495eaaea0ff0910b59cc05ea4512dd9498b9eb"; + sha256 = "fb6f8a3e79ec3c41201ef3595608cbc24c2070baee0a60c2fc489ef391db9fa1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/nn-NO/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/nn-NO/thunderbird-91.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "5e724e31b26ae96a0b535495dd10b77c954a5a043e0353fd17962601ec042e3c"; + sha256 = "e258d8ae0b1ee94386015168d6ebbe31ddd69c513a9badbe6b6a910e0ef3f6df"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/pa-IN/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/pa-IN/thunderbird-91.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "ee1db2f6e9000ff4ca6ba4fd4b758109ea0f94d066fad9c20020e75935f5fc05"; + sha256 = "c96de96b276ddff6f6a9592dd1505df946e8c1dd80a0133c039e6969508e1377"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/pl/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/pl/thunderbird-91.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "b09d9c4655b4c32b9554b83fdd2b2635586b9d8f669ec39f5722e7ac8175b79e"; + sha256 = "de159419d5e0123379604cae0e482d8cb3ddd8aa2d879113142e87f809ae3aeb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/pt-BR/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/pt-BR/thunderbird-91.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "f774513c0c23794c69112b962999512485beaa2a97517b06e335e4fce5b23d9a"; + sha256 = "7b58d79a7710669427076bba99d3d6b32e08643a77f722bdc6b89378c943b497"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/pt-PT/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/pt-PT/thunderbird-91.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "39f0f2fd17ea216acc5383f3c65e4da8928d56e4b8bdf2d1bb76d6dfc8491ec1"; + sha256 = "dbbca7893c6d504b493936d1ca364e52da45a71cab69a59ec0352ca68d47b0a7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/rm/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/rm/thunderbird-91.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "3a966692544873281adf12a850ae904e1304ce08d8bd09ede0ad8b0cf66b5f09"; + sha256 = "98649ae64eb9a8d93f7ecfd699e02e8eae5ac0a2a2e837f0704df7772ed44097"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/ro/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/ro/thunderbird-91.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "4514976e0a5d433b64fc28e42f3baca52e871f7c99434e2993984dda9025b370"; + sha256 = "479d886c83f53bcb96ea12ddd27f7134fdfa482800337f9c7cef8d8762710839"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/ru/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/ru/thunderbird-91.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "97915e34bbbf036fbe8093bdf79a426181c57b78bd8d8b7f99b97fd1c3dceb7c"; + sha256 = "c371992e54bf74571596d4b295a10fb00495017c3e40665e6d3d698d9da03bc4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/si/thunderbird-78.13.0.tar.bz2"; - locale = "si"; - arch = "linux-i686"; - sha256 = "e27e823a4a6141141b92c2c1c55cd77e591d3e2b05d0fa6cc9502b4bc21e67a8"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/sk/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/sk/thunderbird-91.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "ff4d89bc1e0ae8d10dc8dcf377c4b3c45ab1db38c0489ca328e0a8f3145772c6"; + sha256 = "95a4e41e6be48bdc4da11864b02d326a85a0dc29faf4acd2297dff03b874e8f7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/sl/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/sl/thunderbird-91.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "27d34b8508afa306d6ce94e73a2251071cf4480c5f55cc087597e56511e85173"; + sha256 = "36e702b13f5c3a75625fb0dfc15403438282acda703c372c69f9c865a26baba3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/sq/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/sq/thunderbird-91.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "3fb60c21d42ae9a961838081c12eea7e98e43a27ebc24ef7470e912bf13053ca"; + sha256 = "0ff2b572ab9751eab4791f960d0f1d4b6658f296251fefb5987b92317c8521e8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/sr/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/sr/thunderbird-91.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "dab84cca4db8412b3ce40690e7b31df1d66b06979cb39f4efd8206684a802edc"; + sha256 = "37798d5093c0f6846984e830fe8a371e7facc2e710874b40774f038aeda7a6ea"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/sv-SE/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/sv-SE/thunderbird-91.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "cec350da20515ca0e5b317264e3969e1465e9d055de743c130c4011d5f3cc825"; + sha256 = "71e34f95f97ea4cf2e213d60f170ade0de5f199b37ba103ee08b2de568d9af7f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/th/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/th/thunderbird-91.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "0a8302af0995624d37c71757c851e8ba3ffdcbe89d90023c69c5f69a6ec888b7"; + sha256 = "385b0dc2137c97976d7cb9f49502f13723865071099c97d0cb9b73cac18fe853"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/tr/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/tr/thunderbird-91.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "8c7013e71cd57795f0bddc5061b24e43fcd5b1f23abc7c1653ad345869d73b24"; + sha256 = "6dd8bb7b49ece0b4b21216bbe4be831bc49c6bcf44d973d5bf4c37372aa6285d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/uk/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/uk/thunderbird-91.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "ed9a30630c0821b515a2984257d6dc19410ca1f6a723e856bfe8758ad32b11f1"; + sha256 = "2bd6803f23fc17b9530055e912e2ff6cdc0284f1c656965a88b50d6adee67e08"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/uz/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/uz/thunderbird-91.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "b834c2f59b3945a362d1ace0dd5b6275a1ba90587c8fcb894678a188301f3848"; + sha256 = "72e0727bb25cfc0d73b81cf782d4e37e6d72f0807284c8f057aa220690047185"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/vi/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/vi/thunderbird-91.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "9f724e2c2e3faf0ad1d1ac6d08f8bc595ad16b408d7e712e3fc2f51b3d6f2a95"; + sha256 = "43a6b740ee93cc0ce99ba2d9fb6ddbae1004c53d209bdb3a4b92c5f685d7bf62"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/zh-CN/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/zh-CN/thunderbird-91.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "7c8f7982d035bebf250542232d782834709becd60c766e6bd85a617bc6a443bd"; + sha256 = "bdfc475d49cd201f8685fab59e273425741335d7c1f83abce7c79cca45116473"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/zh-TW/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/zh-TW/thunderbird-91.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "a4c90eb3a5bf2fcd04b40b60e976accda049d10666e487f477c8d154c8928be5"; + sha256 = "2c3a20d639c793853ae57e850f15910ea3a9d35b1900ae8dc4d14689df080c42"; } ]; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix deleted file mode 100644 index a5a8ab861e..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ /dev/null @@ -1,357 +0,0 @@ -{ autoconf213 -, bzip2 -, cargo -, common-updater-scripts -, copyDesktopItems -, coreutils -, curl -, dbus -, dbus-glib -, fetchpatch -, fetchurl -, file -, fontconfig -, freetype -, glib -, gnugrep -, gnupg -, gnused -, gpgme -, icu -, jemalloc -, lib -, libevent -, libGL -, libGLU -, libjpeg -, libnotify -, libpng -, libstartup_notification -, libvpx -, libwebp -, llvmPackages -, m4 -, makeDesktopItem -, nasm -, nodejs -, nspr -, nss_3_53 -, pango -, perl -, pkg-config -, python2 -, python3 -, runtimeShell -, rust-cbindgen -, rustc -, sqlite -, stdenv -, systemd -, unzip -, which -, writeScript -, xdg-utils -, xidel -, xorg -, yasm -, zip -, zlib - -, debugBuild ? false - -, alsaSupport ? stdenv.isLinux, alsa-lib -, pulseaudioSupport ? stdenv.isLinux, libpulseaudio -, gtk3Support ? true, gtk2, gtk3, wrapGAppsHook -, waylandSupport ? true, libdrm -, libxkbcommon, calendarSupport ? true - -# Use official trademarked branding. Permission obtained at: -# https://github.com/NixOS/nixpkgs/pull/94880#issuecomment-675907971 -, enableOfficialBranding ? true -}: - -assert waylandSupport -> gtk3Support == true; - -stdenv.mkDerivation rec { - pname = "thunderbird"; - version = "78.13.0"; - - src = fetchurl { - url = - "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = - "daee9ea9e57bdfce231a35029807f279a06f8790d71efc8998c78eb42d99a93cf98623170947df99202da038f949ba9111a7ff7adbd43c161794deb6791370a0"; - }; - - nativeBuildInputs = [ - autoconf213 - cargo - copyDesktopItems - gnused - llvmPackages.llvm - m4 - nasm - nodejs - perl - pkg-config - python2 - python3 - rust-cbindgen - rustc - which - yasm - unzip - ] ++ lib.optional gtk3Support wrapGAppsHook; - - buildInputs = [ - bzip2 - dbus - dbus-glib - file - fontconfig - freetype - glib - gtk2 - icu - jemalloc - libGL - libGLU - libevent - libjpeg - libnotify - libpng - libstartup_notification - libvpx - libwebp - nspr - nss_3_53 - pango - perl - sqlite - xorg.libX11 - xorg.libXScrnSaver - xorg.libXcursor - xorg.libXext - xorg.libXft - xorg.libXi - xorg.libXrender - xorg.libXt - xorg.pixman - xorg.xorgproto - xorg.libXdamage - zip - zlib - ] ++ lib.optional alsaSupport alsa-lib - ++ lib.optional gtk3Support gtk3 - ++ lib.optional pulseaudioSupport libpulseaudio - ++ lib.optionals waylandSupport [ libxkbcommon libdrm ]; - - NIX_CFLAGS_COMPILE =[ - "-I${glib.dev}/include/gio-unix-2.0" - "-I${nss_3_53.dev}/include/nss" - ]; - - patches = [ - ./no-buildconfig.patch - ]; - - postPatch = '' - rm -rf obj-x86_64-pc-linux-gnu - ''; - - hardeningDisable = [ "format" ]; - - preConfigure = '' - # remove distributed configuration files - rm -f configure - rm -f js/src/configure - rm -f .mozconfig* - - configureScript="$(realpath ./mach) configure" - # AS=as in the environment causes build failure https://bugzilla.mozilla.org/show_bug.cgi?id=1497286 - unset AS - - export MOZCONFIG=$(pwd)/mozconfig - - # Set C flags for Rust's bindgen program. Unlike ordinary C - # compilation, bindgen does not invoke $CC directly. Instead it - # uses LLVM's libclang. To make sure all necessary flags are - # included we need to look in a few places. - # TODO: generalize this process for other use-cases. - - BINDGEN_CFLAGS="$(< ${stdenv.cc}/nix-support/libc-crt1-cflags) \ - $(< ${stdenv.cc}/nix-support/libc-cflags) \ - $(< ${stdenv.cc}/nix-support/cc-cflags) \ - $(< ${stdenv.cc}/nix-support/libcxx-cxxflags) \ - ${ - lib.optionalString stdenv.cc.isClang - "-idirafter ${stdenv.cc.cc}/lib/clang/${ - lib.getVersion stdenv.cc.cc - }/include" - } \ - ${ - lib.optionalString stdenv.cc.isGNU - "-isystem ${stdenv.cc.cc}/include/c++/${ - lib.getVersion stdenv.cc.cc - } -isystem ${stdenv.cc.cc}/include/c++/${ - lib.getVersion stdenv.cc.cc - }/${stdenv.hostPlatform.config}" - } \ - $NIX_CFLAGS_COMPILE" - - echo "ac_add_options BINDGEN_CFLAGS='$BINDGEN_CFLAGS'" >> $MOZCONFIG - ''; - - configureFlags = let - toolkitSlug = if gtk3Support then - "3${lib.optionalString waylandSupport "-wayland"}" - else - "2"; - toolkitValue = "cairo-gtk${toolkitSlug}"; - in [ - "--enable-application=comm/mail" - - "--with-system-icu" - "--with-system-jpeg" - "--with-system-libevent" - "--with-system-nspr" - "--with-system-nss" - "--with-system-png" # needs APNG support - "--with-system-zlib" - "--with-system-webp" - "--with-system-libvpx" - - "--enable-rust-simd" - "--enable-crashreporter" - "--enable-default-toolkit=${toolkitValue}" - "--enable-js-shell" - "--enable-necko-wifi" - "--enable-system-ffi" - "--enable-system-pixman" - - "--disable-tests" - "--disable-updater" - "--enable-jemalloc" - ] ++ (if debugBuild then [ - "--enable-debug" - "--enable-profiling" - ] else [ - "--disable-debug" - "--enable-release" - "--disable-debug-symbols" - "--enable-optimize" - "--enable-strip" - ]) ++ lib.optionals (!stdenv.hostPlatform.isi686) [ - # on i686-linux: --with-libclang-path is not available in this configuration - "--with-libclang-path=${llvmPackages.libclang.lib}/lib" - "--with-clang-path=${llvmPackages.clang}/bin/clang" - ] ++ lib.optional alsaSupport "--enable-alsa" - ++ lib.optional calendarSupport "--enable-calendar" - ++ lib.optional enableOfficialBranding "--enable-official-branding" - ++ lib.optional pulseaudioSupport "--enable-pulseaudio"; - - enableParallelBuilding = true; - - postConfigure = '' - cd obj-* - ''; - - makeFlags = lib.optionals enableOfficialBranding [ - "MOZILLA_OFFICIAL=1" - "BUILD_OFFICIAL=1" - ]; - - doCheck = false; - - desktopItems = [ - (makeDesktopItem { - categories = lib.concatStringsSep ";" [ "Application" "Network" ]; - desktopName = "Thunderbird"; - genericName = "Mail Reader"; - name = "thunderbird"; - exec = "thunderbird %U"; - icon = "thunderbird"; - mimeType = lib.concatStringsSep ";" [ - # Email - "x-scheme-handler/mailto" - "message/rfc822" - # Feeds - "x-scheme-handler/feed" - "application/rss+xml" - "application/x-extension-rss" - # Newsgroups - "x-scheme-handler/news" - "x-scheme-handler/snews" - "x-scheme-handler/nntp" - ]; - }) - ]; - - postInstall = '' - # TODO: Move to a dev output? - rm -rf $out/include $out/lib/thunderbird-devel-* $out/share/idl - install -Dm 444 $out/lib/thunderbird/chrome/icons/default/default256.png $out/share/icons/hicolor/256x256/apps/thunderbird.png - ''; - - # Note on GPG support: - # Thunderbird's native GPG support does not yet support smartcards. - # The official upstream recommendation is to configure fall back to gnupg - # using the Thunderbird config `mail.openpgp.allow_external_gnupg` - # and GPG keys set up; instructions with pictures at: - # https://anweshadas.in/how-to-use-yubikey-or-any-gpg-smartcard-in-thunderbird-78/ - # For that to work out of the box, it requires `gnupg` on PATH and - # `gpgme` in `LD_LIBRARY_PATH`; we do this below. - - preFixup = '' - # Needed to find Mozilla runtime - gappsWrapperArgs+=( - --argv0 "$out/bin/thunderbird" - --set MOZ_APP_LAUNCHER thunderbird - # https://github.com/NixOS/nixpkgs/pull/61980 - --set SNAP_NAME "thunderbird" - --set MOZ_LEGACY_PROFILES 1 - --set MOZ_ALLOW_DOWNGRADE 1 - --prefix PATH : "${lib.getBin gnupg}/bin" - --prefix PATH : "${lib.getBin xdg-utils}/bin" - --prefix LD_LIBRARY_PATH : "${lib.getLib gpgme}/lib" - ) - ''; - - # FIXME: The XUL portion of this can probably be removed as soon as we - # package a Thunderbird >=71.0 since XUL shouldn't be anymore (in use)? - postFixup = '' - local xul="$out/lib/thunderbird/libxul.so" - patchelf --set-rpath "${libnotify}/lib:${lib.getLib systemd}/lib:$(patchelf --print-rpath $xul)" $xul - ''; - - doInstallCheck = true; - installCheckPhase = '' - "$out/bin/thunderbird" --version - ''; - - disallowedRequisites = [ - stdenv.cc - ]; - - passthru.updateScript = import ./../../browsers/firefox/update.nix { - attrPath = "thunderbird-78"; - baseUrl = "http://archive.mozilla.org/pub/thunderbird/releases/"; - inherit writeScript lib common-updater-scripts xidel coreutils gnused - gnugrep gnupg curl runtimeShell; - }; - - requiredSystemFeatures = [ "big-parallel" ]; - - meta = with lib; { - description = "A full-featured e-mail client"; - homepage = "https://www.thunderbird.net"; - maintainers = with maintainers; [ - eelco - lovesegfault - pierron - vcunat - ]; - platforms = platforms.linux; - license = licenses.mpl20; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig-78.patch b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig-78.patch new file mode 100644 index 0000000000..98b40d83d6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig-78.patch @@ -0,0 +1,13 @@ +Remove about:buildconfig. If used as-is, it would add unnecessary runtime dependencies. +--- a/comm/mail/base/jar.mn ++++ b/comm/mail/base/jar.mn +@@ -119,9 +119,7 @@ + % override chrome://mozapps/content/profile/profileDowngrade.js chrome://messenger/content/profileDowngrade.js + % override chrome://mozapps/content/profile/profileDowngrade.xhtml chrome://messenger/content/profileDowngrade.xhtml + +-* content/messenger/buildconfig.html (content/buildconfig.html) + content/messenger/buildconfig.css (content/buildconfig.css) +-% override chrome://global/content/buildconfig.html chrome://messenger/content/buildconfig.html + % override chrome://global/content/buildconfig.css chrome://messenger/content/buildconfig.css + + # L10n resources and overrides. diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig-90.patch b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig-90.patch new file mode 100644 index 0000000000..c4e29f6355 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig-90.patch @@ -0,0 +1,13 @@ +Remove about:buildconfig. If used as-is, it would add unnecessary runtime dependencies. +--- a/comm/mail/base/jar.mn ++++ b/comm/mail/base/jar.mn +@@ -119,9 +119,6 @@ messenger.jar: + % override chrome://mozapps/content/profile/profileDowngrade.js chrome://messenger/content/profileDowngrade.js + % override chrome://mozapps/content/profile/profileDowngrade.xhtml chrome://messenger/content/profileDowngrade.xhtml + +-* content/messenger/buildconfig.html (content/buildconfig.html) +-% override chrome://global/content/buildconfig.html chrome://messenger/content/buildconfig.html +- + # L10n resources and overrides. + % override chrome://mozapps/locale/profile/profileDowngrade.dtd chrome://messenger/locale/profileDowngrade.dtd + % override chrome://global/locale/netError.dtd chrome://messenger/locale/netError.dtd diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig.patch b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig.patch deleted file mode 100644 index d413a06475..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig.patch +++ /dev/null @@ -1,37 +0,0 @@ -Remove about:buildconfig. If used as-is, it would add unnecessary runtime dependencies. -diff -ru -x '*~' a/docshell/base/nsAboutRedirector.cpp b/docshell/base/nsAboutRedirector.cpp ---- a/docshell/base/nsAboutRedirector.cpp -+++ b/docshell/base/nsAboutRedirector.cpp -@@ -63,8 +63,6 @@ - {"about", "chrome://global/content/aboutAbout.html", 0}, - {"addons", "chrome://mozapps/content/extensions/extensions.xhtml", - nsIAboutModule::ALLOW_SCRIPT}, -- {"buildconfig", "chrome://global/content/buildconfig.html", -- nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT}, - {"checkerboard", "chrome://global/content/aboutCheckerboard.html", - nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | - nsIAboutModule::ALLOW_SCRIPT}, -diff -ru -x '*~' a/toolkit/content/jar.mn b/toolkit/content/jar.mn ---- a/toolkit/content/jar.mn -+++ b/toolkit/content/jar.mn -@@ -35,7 +35,6 @@ - content/global/plugins.js - content/global/browser-child.js - content/global/browser-content.js --* content/global/buildconfig.html - content/global/buildconfig.css - content/global/contentAreaUtils.js - content/global/datepicker.xhtml -diff -ru -x '*~' a/comm/mail/base/jar.mn b/comm/mail/base/jar.mn ---- a/comm/mail/base/jar.mn -+++ b/comm/mail/base/jar.mn -@@ -119,9 +119,7 @@ - % override chrome://mozapps/content/profile/profileDowngrade.js chrome://messenger/content/profileDowngrade.js - % override chrome://mozapps/content/profile/profileDowngrade.xhtml chrome://messenger/content/profileDowngrade.xhtml - --* content/messenger/buildconfig.html (content/buildconfig.html) - content/messenger/buildconfig.css (content/buildconfig.css) --% override chrome://global/content/buildconfig.html chrome://messenger/content/buildconfig.html - % override chrome://global/content/buildconfig.css chrome://messenger/content/buildconfig.css - - # L10n resources and overrides. diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/packages.nix new file mode 100644 index 0000000000..1f94b3eb97 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -0,0 +1,66 @@ +{ stdenv, lib, callPackage, fetchurl, fetchpatch, nixosTests }: + +let + common = opts: callPackage (import ../../browsers/firefox/common.nix opts) { + webrtcSupport = false; + geolocationSupport = false; + }; +in + +rec { + thunderbird = common rec { + pname = "thunderbird"; + version = "91.0"; + application = "comm/mail"; + binaryName = pname; + src = fetchurl { + url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; + sha512 = "f3fcaff97b37ef41850895e44fbd2f42b0f1cb982542861bef89ef7ee606c6332296d61f666106be9455078933a2844c46bf243b71cc4364d9ff457d9c808a7a"; + }; + patches = [ + ./no-buildconfig-90.patch + ]; + + meta = with lib; { + description = "A full-featured e-mail client"; + homepage = "https://thunderbird.net/"; + maintainers = with maintainers; [ eelco lovesegfault pierron vcunat ]; + platforms = platforms.unix; + badPlatforms = platforms.darwin; + broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory". + # not in `badPlatforms` because cross-compilation on 64-bit machine might work. + license = licenses.mpl20; + }; + updateScript = callPackage ./update.nix { + attrPath = "thunderbird-unwrapped"; + }; + }; + + thunderbird-78 = common rec { + pname = "thunderbird"; + version = "78.13.0"; + application = "comm/mail"; + binaryName = pname; + src = fetchurl { + url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; + sha512 = "daee9ea9e57bdfce231a35029807f279a06f8790d71efc8998c78eb42d99a93cf98623170947df99202da038f949ba9111a7ff7adbd43c161794deb6791370a0"; + }; + patches = [ + ./no-buildconfig-78.patch + ]; + + meta = with lib; { + description = "A full-featured e-mail client"; + homepage = "https://thunderbird.net/"; + maintainers = with maintainers; [ eelco lovesegfault pierron vcunat ]; + platforms = platforms.unix; + badPlatforms = platforms.darwin; + broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory". + # not in `badPlatforms` because cross-compilation on 64-bit machine might work. + license = licenses.mpl20; + }; + updateScript = callPackage ./update.nix { + attrPath = "thunderbird-78-unwrapped"; + }; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/update.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/update.nix new file mode 100644 index 0000000000..d6f1a007fa --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/update.nix @@ -0,0 +1,7 @@ +{ callPackage +, ... +}@args: + +callPackage ../../browsers/firefox/update.nix ({ + baseUrl = "http://archive.mozilla.org/pub/thunderbird/releases/"; +} // (builtins.removeAttrs args ["callPackage"])) diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/wrapper.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/wrapper.nix new file mode 100644 index 0000000000..0761232cc5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/wrapper.nix @@ -0,0 +1,23 @@ +{ lib, wrapFirefox, gpgme, gnupg }: + +browser: +args: + +(wrapFirefox browser ({ + libName = "thunderbird"; +} // args)) + +.overrideAttrs (old: { + # Thunderbird's native GPG support does not yet support smartcards. + # The official upstream recommendation is to configure fall back to gnupg + # using the Thunderbird config `mail.openpgp.allow_external_gnupg` + # and GPG keys set up; instructions with pictures at: + # https://anweshadas.in/how-to-use-yubikey-or-any-gpg-smartcard-in-thunderbird-78/ + # For that to work out of the box, it requires `gnupg` on PATH and + # `gpgme` in `LD_LIBRARY_PATH`; we do this below. + buildCommand = old.buildCommand + '' + wrapProgram $out/bin/thunderbird \ + --prefix LD_LIBRARY_PATH ':' "${lib.makeLibraryPath [ gpgme ]}" \ + --prefix PATH ':' "${lib.makeBinPath [ gnupg ]}" + ''; +}) diff --git a/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix b/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix index 7e769b7b0f..0e9e6987e8 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix @@ -21,13 +21,13 @@ mkDerivation rec { pname = "nextcloud-client"; - version = "3.3.0"; + version = "3.3.1"; src = fetchFromGitHub { owner = "nextcloud"; repo = "desktop"; rev = "v${version}"; - sha256 = "sha256-KMFFRxNQUNcu7Q5515lNbEMyCWIvzXXC//s3WAWxw4g="; + sha256 = "sha256-2oX3V84ScUV08/WaWJQPLJIni7KvJa/YBRBTWVdRO2U="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/nextdns/default.nix b/third_party/nixpkgs/pkgs/applications/networking/nextdns/default.nix index a27f1fdad2..dadd17be16 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/nextdns/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/nextdns/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "nextdns"; - version = "1.11.0"; + version = "1.35.0"; src = fetchFromGitHub { owner = "nextdns"; repo = "nextdns"; rev = "v${version}"; - sha256 = "sha256-gnWFgzfMMnn8O7zDN5LW3cMIz5/wmgEW9fI9aJBEah8="; + sha256 = "sha256-AWbUtzh1kJayhg/ssJUqUX4ywIV2Oy1BgTorhb+x3Vg="; }; - vendorSha256 = "sha256-kmszMqkDMaL+Z6GcZmQyeRShKKS/VGdn9vabYPW/kCc="; + vendorSha256 = "sha256-EEDRJj5Iaglk0Y86XL/U512OjipBNJzcAv8Tb09a0g0="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/opsdroid/default.nix b/third_party/nixpkgs/pkgs/applications/networking/opsdroid/default.nix index c007144ac4..ddf06a784f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/opsdroid/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/opsdroid/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonPackage rec { pname = "opsdroid"; - version = "0.22.0"; + version = "0.23.0"; src = fetchFromGitHub { owner = "opsdroid"; repo = "opsdroid"; rev = "v${version}"; - sha256 = "003gpzdjfz2jrwx2bkkd1k2mr7yjpaw5s7fy5l0hw72f9zimznd0"; + sha256 = "1p1x7jbp0jx8anfwvavyn3x8i1vfhmbzyzrm014n26v5y39gabj1"; }; disabled = !python3Packages.isPy3k; diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/gnunet/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/gnunet/default.nix index c1ba42a5e6..fb1abae6bf 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/gnunet/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/gnunet/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "gnunet"; - version = "0.14.1"; + version = "0.15.0"; src = fetchurl { url = "mirror://gnu/gnunet/${pname}-${version}.tar.gz"; - sha256 = "1hhqv994akymf4s593mc1wpsjy6hccd0zbdim3qmc1y3f32hacja"; + sha256 = "sha256-zKI9b7QIkKXrLMrkuPfnTI5OhNP8ovQZ13XLSljdmmc="; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/applications/networking/powerdns-admin/yarndeps.nix b/third_party/nixpkgs/pkgs/applications/networking/powerdns-admin/yarndeps.nix index ce65d28c00..02d9eb0046 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/powerdns-admin/yarndeps.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/powerdns-admin/yarndeps.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec { +{ fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec { offline_cache = linkFarm "offline" packages; packages = [ { diff --git a/third_party/nixpkgs/pkgs/applications/networking/protonmail-bridge/default.nix b/third_party/nixpkgs/pkgs/applications/networking/protonmail-bridge/default.nix index 618234e6ff..c15720ffc3 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/protonmail-bridge/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/protonmail-bridge/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "protonmail-bridge"; - version = "1.6.9"; + version = "1.8.7"; src = fetchFromGitHub { owner = "ProtonMail"; repo = "proton-bridge"; rev = "br-${version}"; - sha256 = "0p2315smxc5knxzr9413w62z65647znh9j9vyb6w5x4dqfp7vhz9"; + sha256 = "sha256-bynPuAdeX4WxYdbjMkR9ANuYWYOINB0OHnKTmIrCB6E="; }; - vendorSha256 = "04aa7syp5hhpqxdpqlsmmbwywnbrh4ia0diym2935jbrqccnvm1k"; + vendorSha256 = "sha256-g2vl1Ctxr2U+D/k9u9oXuZ1OWaABIJs0gmfhWh13ZFM="; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/sieve-connect/default.nix b/third_party/nixpkgs/pkgs/applications/networking/sieve-connect/default.nix index d4866d9f1a..d752dab156 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/sieve-connect/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/sieve-connect/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, perlPackages }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, perlPackages, installShellFiles }: stdenv.mkDerivation rec { pname = "sieve-connect"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ perlPackages.perl ]; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper installShellFiles ]; preBuild = '' # Fixes failing build when not building in git repo @@ -25,9 +25,9 @@ stdenv.mkDerivation rec { buildFlags = [ "PERL5LIB=${perlPackages.makePerlPath [ perlPackages.FileSlurp ]}" "bin" "man" ]; installPhase = '' - mkdir -p $out/bin $out/share/man/man1 + mkdir -p $out/bin install -m 755 sieve-connect $out/bin - gzip -c sieve-connect.1 > $out/share/man/man1/sieve-connect.1.gz + installManPage sieve-connect.1 wrapProgram $out/bin/sieve-connect \ --prefix PERL5LIB : "${with perlPackages; makePerlPath [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/sync/onedrive/default.nix b/third_party/nixpkgs/pkgs/applications/networking/sync/onedrive/default.nix index d53464df7a..3cd95acafd 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/sync/onedrive/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/sync/onedrive/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "onedrive"; - version = "2.4.12"; + version = "2.4.13"; src = fetchFromGitHub { owner = "abraunegg"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rG9W90+wGLnhnfhqJjUIFGP6ZcmaxGkrdhPxQVRyxoc="; + sha256 = "sha256-v1GSHwcP9EQaADIEKO14yotJBEEatbKugVJOCsTLr2w="; }; nativeBuildInputs = [ autoreconfHook ldc installShellFiles pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/office/agenda/default.nix b/third_party/nixpkgs/pkgs/applications/office/agenda/default.nix index 9308fc6c6e..6654ed529f 100644 --- a/third_party/nixpkgs/pkgs/applications/office/agenda/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/agenda/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "agenda"; - version = "1.1.0"; + version = "1.1.2"; src = fetchFromGitHub { owner = "dahenson"; repo = pname; rev = version; - sha256 = "0yfapapsanqacaa83iagar88i335yy2jvay8y6z7gkri7avbs4am"; + sha256 = "sha256-tzGcqCxIkoBNskpadEqv289Sj5bij9u+LdYySiGdop8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/office/grisbi/default.nix b/third_party/nixpkgs/pkgs/applications/office/grisbi/default.nix index f370d94d1c..49344becf0 100644 --- a/third_party/nixpkgs/pkgs/applications/office/grisbi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/grisbi/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "grisbi"; - version = "2.0.2"; + version = "2.0.4"; src = fetchurl { url = "mirror://sourceforge/grisbi/${pname}-${version}.tar.bz2"; - sha256 = "sha256-bCO82EWAf/kiMDdojA5goWeWiKWZNOGYixmIJQwovGM="; + sha256 = "sha256-4ykG310He1aFaUNo5fClaM3QWFBzKERGihYfqaxR1Vo="; }; nativeBuildInputs = [ pkg-config wrapGAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/office/homebank/default.nix b/third_party/nixpkgs/pkgs/applications/office/homebank/default.nix index c77c52774b..54e09783db 100644 --- a/third_party/nixpkgs/pkgs/applications/office/homebank/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/homebank/default.nix @@ -2,15 +2,15 @@ , libsoup, gnome }: stdenv.mkDerivation rec { - name = "homebank-5.5.2"; + pname = "homebank"; + version = "5.5.3"; src = fetchurl { - url = "http://homebank.free.fr/public/${name}.tar.gz"; - sha256 = "sha256-mJ7zeOTJ+CNLYruT1qSxS9TJjciJUZg426H0TxLFHtI="; + url = "http://homebank.free.fr/public/homebank-${version}.tar.gz"; + sha256 = "sha256-BzYHkYqWEAh3kfNvWecNEmH+6OThFGpc/VhxodLZEJM="; }; nativeBuildInputs = [ pkg-config wrapGAppsHook ]; - buildInputs = [ gtk libofx intltool libsoup - gnome.adwaita-icon-theme ]; + buildInputs = [ gtk libofx intltool libsoup gnome.adwaita-icon-theme ]; meta = with lib; { description = "Free, easy, personal accounting for everyone"; diff --git a/third_party/nixpkgs/pkgs/applications/office/minetime/default.nix b/third_party/nixpkgs/pkgs/applications/office/minetime/default.nix index 1241b97b42..1971a78294 100644 --- a/third_party/nixpkgs/pkgs/applications/office/minetime/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/minetime/default.nix @@ -1,4 +1,4 @@ -{ appimageTools, fetchurl, lib, runCommandNoCC, stdenv, gsettings-desktop-schemas, gtk3, zlib }: +{ appimageTools, fetchurl, lib, runCommand, stdenv, gsettings-desktop-schemas, gtk3, zlib }: let name = "${pname}-${version}"; @@ -12,7 +12,7 @@ let inherit name; src = appimage; }; - patched = runCommandNoCC "minetime-patchelf" {} '' + patched = runCommand "minetime-patchelf" {} '' cp -av ${extracted} $out x=$out/resources/app.asar.unpacked/services/scheduling/dist/MinetimeSchedulingService diff --git a/third_party/nixpkgs/pkgs/applications/office/paperless-ng/default.nix b/third_party/nixpkgs/pkgs/applications/office/paperless-ng/default.nix new file mode 100644 index 0000000000..66a548545b --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/office/paperless-ng/default.nix @@ -0,0 +1,197 @@ +{ lib +, fetchurl +, nixosTests +, python3 +, ghostscript +, imagemagick +, jbig2enc +, ocrmypdf +, optipng +, pngquant +, qpdf +, tesseract4 +, unpaper +, liberation_ttf +}: + +let + py = python3.override { + packageOverrides = self: super: { + django = super.django_3; + django-picklefield = super.django-picklefield.overrideAttrs (oldAttrs: { + # Checks do not pass with django 3 + doInstallCheck = false; + }); + # Avoid warning in django-q versions > 1.3.4 + # https://github.com/jonaswinkler/paperless-ng/issues/857 + # https://github.com/Koed00/django-q/issues/526 + django-q = super.django-q.overridePythonAttrs (oldAttrs: rec { + version = "1.3.4"; + src = super.fetchPypi { + inherit (oldAttrs) pname; + inherit version; + sha256 = "Uj1U3PG2YVLBtlj5FPAO07UYo0MqnezUiYc4yo274Q8="; + }; + }); + }; + }; + + path = lib.makeBinPath [ ghostscript imagemagick jbig2enc optipng pngquant qpdf tesseract4 unpaper ]; +in +py.pkgs.pythonPackages.buildPythonApplication rec { + pname = "paperless-ng"; + version = "1.4.5"; + + src = fetchurl { + url = "https://github.com/jonaswinkler/paperless-ng/releases/download/ng-${version}/${pname}-${version}.tar.xz"; + sha256 = "2PJb8j3oimlfiJ3gqjK6uTemzFdtAP2Mlm5RH09bx/E="; + }; + + format = "other"; + + # Make bind address configurable + # Fix tests with Pillow 8.3.1: https://github.com/jonaswinkler/paperless-ng/pull/1183 + prePatch = '' + substituteInPlace gunicorn.conf.py --replace "bind = '0.0.0.0:8000'" "" + substituteInPlace src/paperless_tesseract/parsers.py --replace "return x" "return round(x)" + ''; + + propagatedBuildInputs = with py.pkgs.pythonPackages; [ + aioredis + arrow + asgiref + async-timeout + attrs + autobahn + automat + blessed + certifi + cffi + channels-redis + channels + chardet + click + coloredlogs + concurrent-log-handler + constantly + cryptography + daphne + dateparser + django-cors-headers + django_extensions + django-filter + django-picklefield + django-q + django + djangorestframework + filelock + fuzzywuzzy + gunicorn + h11 + hiredis + httptools + humanfriendly + hyperlink + idna + imap-tools + img2pdf + incremental + inotify-simple + inotifyrecursive + joblib + langdetect + lxml + msgpack + numpy + ocrmypdf + pathvalidate + pdfminer + pikepdf + pillow + pluggy + portalocker + psycopg2 + pyasn1-modules + pyasn1 + pycparser + pyopenssl + python-dateutil + python-dotenv + python-gnupg + python-Levenshtein + python_magic + pytz + pyyaml + redis + regex + reportlab + requests + scikit-learn + scipy + service-identity + six + sortedcontainers + sqlparse + threadpoolctl + tika + tqdm + twisted.extras.tls + txaio + tzlocal + urllib3 + uvicorn + uvloop + watchdog + watchgod + wcwidth + websockets + whitenoise + whoosh + zope_interface + ]; + + doCheck = true; + checkInputs = with py.pkgs.pythonPackages; [ + pytest + pytest-cov + pytest-django + pytest-env + pytest-sugar + pytest-xdist + factory_boy + ]; + + # The tests require: + # - PATH with runtime binaries + # - A temporary HOME directory for gnupg + # - XDG_DATA_DIRS with test-specific fonts + checkPhase = '' + pushd src + PATH="${path}:$PATH" HOME=$(mktemp -d) XDG_DATA_DIRS="${liberation_ttf}/share:$XDG_DATA_DIRS" pytest + popd + ''; + + installPhase = '' + mkdir -p $out/lib + cp -r . $out/lib/paperless-ng + chmod +x $out/lib/paperless-ng/src/manage.py + makeWrapper $out/lib/paperless-ng/src/manage.py $out/bin/paperless-ng \ + --prefix PYTHONPATH : "$PYTHONPATH" \ + --prefix PATH : "${path}" + ''; + + passthru = { + # PYTHONPATH of all dependencies used by the package + pythonPath = python3.pkgs.makePythonPath propagatedBuildInputs; + inherit path; + + tests = { inherit (nixosTests) paperless-ng; }; + }; + + meta = with lib; { + description = "A supercharged version of paperless: scan, index, and archive all of your physical documents"; + homepage = "https://paperless-ng.readthedocs.io/en/latest/"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ earvstedt Flakebi ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/office/paperless/default.nix b/third_party/nixpkgs/pkgs/applications/office/paperless/default.nix deleted file mode 100644 index 74bdacd958..0000000000 --- a/third_party/nixpkgs/pkgs/applications/office/paperless/default.nix +++ /dev/null @@ -1,168 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, makeWrapper -, callPackage - -, python3 -, imagemagick -, ghostscript -, optipng -, tesseract -, unpaper -}: - -## Usage - -# ${paperless}/bin/paperless wraps manage.py - -# ${paperless}/share/paperless/setup-env.sh can be sourced from a -# shell script to setup a Paperless environment - -# paperless.withConfig is a convenience function to setup a -# configured Paperless instance. (See ./withConfig.nix) - -# For WSGI with gunicorn, use a shell script like this: -# let -# pythonEnv = paperless.python.withPackages (ps: paperless.runtimePackages ++ [ ps.gunicorn ]); -# in -# writers.writeBash "run-gunicorn" '' -# source ${paperless}/share/paperless/setup-env.sh -# PYTHONPATH=$paperlessSrc ${pythonEnv}/bin/gunicorn paperless.wsgi -# '' - -let - paperless = stdenv.mkDerivation rec { - pname = "paperless"; - version = "2.7.0"; - - src = fetchFromGitHub { - owner = "the-paperless-project"; - repo = "paperless"; - rev = version; - sha256 = "0pkmyky1crjnsg7r0gfk0fadisfsgzlsq6afpz16wx4hp6yvkkf7"; - }; - - nativeBuildInputs = [ makeWrapper ]; - - doCheck = true; - dontInstall = true; - - pythonEnv = python.withPackages (_: runtimePackages); - pythonCheckEnv = python.withPackages (_: (runtimePackages ++ checkPackages)); - - unpackPhase = '' - srcDir=$out/share/paperless - mkdir -p $srcDir - cp -r --no-preserve=mode $src/src/* $src/LICENSE $srcDir - ''; - - postPatch = '' - # django-cors-headers 3.x requires a scheme for allowed hosts - substituteInPlace $out/share/paperless/paperless/settings.py \ - --replace "localhost:8080" "http://localhost:8080" - ''; - - buildPhase = let - # Paperless has explicit runtime checks that expect these binaries to be in PATH - extraBin = lib.makeBinPath [ imagemagick ghostscript optipng tesseract unpaper ]; - in '' - ${python.interpreter} -m compileall $srcDir - - makeWrapper $pythonEnv/bin/python $out/bin/paperless \ - --set PATH ${extraBin} --add-flags $out/share/paperless/manage.py - - # A shell snippet that can be sourced to setup a paperless env - cat > $out/share/paperless/setup-env.sh <= 3 - factory_boy = customPkgs.factory_boy_2_12_0; - - # These are pre-release versions, hence they are private to this pkg - django-filter = self.callPackage ./python-modules/django-filter.nix {}; - django-crispy-forms = self.callPackage ./python-modules/django-crispy-forms.nix {}; - }; - }; - - runtimePackages = with python.pkgs; [ - dateparser - python-dateutil - django - django-cors-headers - django-crispy-forms - django-filter - django_extensions - djangoql - djangorestframework - factory_boy - filemagic - fuzzywuzzy - langdetect - pdftotext - pillow - psycopg2 - pyocr - python-dotenv - python-gnupg - pytz - termcolor - ] ++ (lib.optional stdenv.isLinux inotify-simple); - - checkPackages = with python.pkgs; [ - pytest - pytest-django - pytest-env - pytest-xdist - ]; - - pyocrWithUserTesseract = pyPkgs: - let - pyocr = pyPkgs.pyocr.override { inherit tesseract; }; - in - if pyocr.outPath == pyPkgs.pyocr.outPath then - pyocr - else - # The user has provided a custom tesseract derivation that might be - # missing some languages that are required for PyOCR's tests. Disable them to - # avoid build errors. - pyocr.overridePythonAttrs (attrs: { - doCheck = false; - }); -in - paperless diff --git a/third_party/nixpkgs/pkgs/applications/office/paperless/python-modules/default.nix b/third_party/nixpkgs/pkgs/applications/office/paperless/python-modules/default.nix deleted file mode 100644 index e1fb227614..0000000000 --- a/third_party/nixpkgs/pkgs/applications/office/paperless/python-modules/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -pyPkgs: fetchFromGitHub: -{ - factory_boy_2_12_0 = pyPkgs.factory_boy.overridePythonAttrs (old: rec { - version = "2.12.0"; - src = pyPkgs.fetchPypi { - inherit (old) pname; - inherit version; - sha256 = "0w53hjgag6ad5i2vmrys8ysk54agsqvgbjy9lg8g0d8pi9h8vx7s"; - }; - }); -} diff --git a/third_party/nixpkgs/pkgs/applications/office/paperless/python-modules/django-crispy-forms.nix b/third_party/nixpkgs/pkgs/applications/office/paperless/python-modules/django-crispy-forms.nix deleted file mode 100644 index f8b91a94cc..0000000000 --- a/third_party/nixpkgs/pkgs/applications/office/paperless/python-modules/django-crispy-forms.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pytestCheckHook -, pytest-django -, django -}: - -buildPythonPackage rec { - pname = "django-crispy-forms"; - version = "1.10.0"; - - src = fetchFromGitHub { - owner = "django-crispy-forms"; - repo = "django-crispy-forms"; - rev = version; - sha256 = "0y6kskfxgckb9npcgwx4zrs5n9px159zh9zhinhxi3i7wlriqpf5"; - }; - - # For reasons unknown, the source dir must contain a dash - # for the tests to run successfully - postUnpack = '' - mv $sourceRoot source- - export sourceRoot=source- - ''; - - checkInputs = [ django pytest-django pytestCheckHook ]; - - preCheck = '' - export DJANGO_SETTINGS_MODULE=crispy_forms.tests.test_settings - ''; - - meta = with lib; { - description = "The best way to have DRY Django forms"; - homepage = "https://github.com/maraujop/django-crispy-forms"; - license = licenses.mit; - maintainers = with maintainers; [ earvstedt ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/office/paperless/python-modules/django-filter.nix b/third_party/nixpkgs/pkgs/applications/office/paperless/python-modules/django-filter.nix deleted file mode 100644 index d7f20bd9d3..0000000000 --- a/third_party/nixpkgs/pkgs/applications/office/paperless/python-modules/django-filter.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, buildPythonPackage, python, pythonOlder, fetchFromGitHub -, django, django-crispy-forms, djangorestframework, mock, pytz }: - -buildPythonPackage rec { - pname = "django-filter"; - version = "2.1.0-pre"; - disabled = pythonOlder "3.4"; - - src = fetchFromGitHub { - owner = "carltongibson"; - repo = pname; - rev = "24adad8c48bc9e7c7539b6510ffde4ce4effdc29"; - sha256 = "0hv4w95jnlzp9vdximl6bb27fyi75001jhvsbs0ikkd8amq8iaj7"; - }; - - checkInputs = [ django django-crispy-forms djangorestframework mock pytz ]; - - checkPhase = "${python.interpreter} runtests.py"; - - meta = with lib; { - description = "A reusable Django application for allowing users to filter querysets dynamically."; - homepage = "https://github.com/carltongibson/django-filter"; - license = licenses.bsd3; - maintainers = with maintainers; [ earvstedt ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/office/paperless/withConfig.nix b/third_party/nixpkgs/pkgs/applications/office/paperless/withConfig.nix deleted file mode 100644 index 652d1478c0..0000000000 --- a/third_party/nixpkgs/pkgs/applications/office/paperless/withConfig.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ paperless, lib, writers }: - -## Usage -# -# nix-build --out-link ./paperless -E ' -# (import {}).paperless.withConfig { -# dataDir = /tmp/paperless-data; -# config = { -# PAPERLESS_DISABLE_LOGIN = "true"; -# }; -# }' -# -# Setup DB -# ./paperless migrate -# -# Consume documents in ${dataDir}/consume -# ./paperless document_consumer --oneshot -# -# Start web interface -# ./paperless runserver --noreload localhost:8000 - -{ config ? {}, dataDir ? null, ocrLanguages ? null -, paperlessPkg ? paperless, extraCmds ? "" }: -with lib; -let - paperless = if ocrLanguages == null then - paperlessPkg - else - (paperlessPkg.override { - tesseract = paperlessPkg.tesseract.override { - enableLanguages = ocrLanguages; - }; - }).overrideDerivation (_: { - # `ocrLanguages` might be missing some languages required by the tests. - doCheck = false; - }); - - envVars = (optionalAttrs (dataDir != null) { - PAPERLESS_CONSUMPTION_DIR = "${dataDir}/consume"; - PAPERLESS_MEDIADIR = "${dataDir}/media"; - PAPERLESS_STATICDIR = "${dataDir}/static"; - PAPERLESS_DBDIR = dataDir; - }) // config; - - envVarDefs = mapAttrsToList (n: v: ''export ${n}="${toString v}"'') envVars; - setupEnvVars = builtins.concatStringsSep "\n" envVarDefs; - - setupEnv = '' - source ${paperless}/share/paperless/setup-env.sh - ${setupEnvVars} - ${optionalString (dataDir != null) '' - mkdir -p "$PAPERLESS_CONSUMPTION_DIR" \ - "$PAPERLESS_MEDIADIR" \ - "$PAPERLESS_STATICDIR" \ - "$PAPERLESS_DBDIR" - ''} - ''; - - runPaperless = writers.writeBash "paperless" '' - set -e - ${setupEnv} - ${extraCmds} - exec python $paperlessSrc/manage.py "$@" - ''; -in - runPaperless // { - inherit paperless setupEnv; - } diff --git a/third_party/nixpkgs/pkgs/applications/office/skrooge/default.nix b/third_party/nixpkgs/pkgs/applications/office/skrooge/default.nix index 8f5beee384..506a2f99f6 100644 --- a/third_party/nixpkgs/pkgs/applications/office/skrooge/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/skrooge/default.nix @@ -7,11 +7,11 @@ mkDerivation rec { pname = "skrooge"; - version = "2.24.6"; + version = "2.26.1"; src = fetchurl { - url = "http://download.kde.org/stable/skrooge/${pname}-${version}.tar.xz"; - sha256 = "sha256-DReIm9lcq0j761wWTpJu7HnfEWz9QsRGgUtyVaXFs6A="; + url = "https://download.kde.org/stable/skrooge/${pname}-${version}.tar.xz"; + sha256 = "sha256-66hoA+FDTeMbNAInr9TlTSnwUywJQjTRz87MkdNYn5Q="; }; nativeBuildInputs = [ @@ -30,6 +30,7 @@ mkDerivation rec { cmakeFlags = [ "-DSKG_DESIGNER=OFF" "-DSKG_WEBENGINE=ON" + "-DSKG_WEBKIT=OFF" "-DBUILD_TESTS=ON" ]; diff --git a/third_party/nixpkgs/pkgs/applications/radio/sdrangel/default.nix b/third_party/nixpkgs/pkgs/applications/radio/sdrangel/default.nix index ff3ca497c7..e9a15aaed1 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/sdrangel/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/sdrangel/default.nix @@ -33,13 +33,13 @@ mkDerivation rec { pname = "sdrangel"; - version = "6.8.0"; + version = "6.16.2"; src = fetchFromGitHub { owner = "f4exb"; repo = "sdrangel"; rev = "v${version}"; - sha256 = "sha256-dFWwEs2nvcaCWpM4tA3/w8PbmNXn/R7JvxP3XEHasSQ="; + sha256 = "sha256-wWGKJWd3JDaT0dDMUrxv9ShMVe+q4zvH8SjyKw7UIbo="; fetchSubmodules = false; }; diff --git a/third_party/nixpkgs/pkgs/applications/radio/urh/default.nix b/third_party/nixpkgs/pkgs/applications/radio/urh/default.nix index 00d3431b6e..a5c687a8db 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/urh/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/urh/default.nix @@ -5,13 +5,13 @@ python3Packages.buildPythonApplication rec { pname = "urh"; - version = "2.9.1"; + version = "2.9.2"; src = fetchFromGitHub { owner = "jopohl"; repo = pname; rev = "v${version}"; - sha256 = "0s8zlq2bx6hp8c522rkxj9kbkf3a0qj6iyg7q9dcxmcl3q2sanq9"; + sha256 = "0ibcr2ypnyl2aq324sbmmr18ksxszg81yrhybawx46ba9vym6j99"; }; nativeBuildInputs = [ qt5.wrapQtAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/radio/wsjtx/default.nix b/third_party/nixpkgs/pkgs/applications/radio/wsjtx/default.nix index ae378b5710..8dbdd5d4ff 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/wsjtx/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/wsjtx/default.nix @@ -4,12 +4,12 @@ stdenv.mkDerivation rec { pname = "wsjtx"; - version = "2.3.1"; + version = "2.4.0"; # This is a "superbuild" tarball containing both wsjtx and a hamlib fork src = fetchurl { url = "http://physics.princeton.edu/pulsar/k1jt/wsjtx-${version}.tgz"; - sha256 = "11wzh4bxp9277kbqkyrc063akkk09czgxnkpk8k07vl4s3dan3hh"; + sha256 = "sha256-LpfGzI/Hpsp7/K0ZZu2EFVlvWcN0cnAQ1RNAxCMugcg="; }; # Hamlib builds with autotools, wsjtx builds with cmake diff --git a/third_party/nixpkgs/pkgs/applications/radio/xlog/default.nix b/third_party/nixpkgs/pkgs/applications/radio/xlog/default.nix index a013fe41d8..06b7c108fa 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/xlog/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/xlog/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, glib, gtk2, pkg-config, hamlib }: stdenv.mkDerivation rec { pname = "xlog"; - version = "2.0.20"; + version = "2.0.23"; src = fetchurl { url = "https://download.savannah.gnu.org/releases/xlog/${pname}-${version}.tar.gz"; - sha256 = "sha256-pSGmKLHGc+Eb9OG27k1rYOMn/2BiRejrBajARjEgsUA="; + sha256 = "sha256-JSPyXOJbYOCeWY6h0v8fbmBkf1Dop1gdmnn4gKdBgac="; }; # glib-2.62 deprecations diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/minimap2/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/minimap2/default.nix index d21ef8b3d7..072826c406 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/minimap2/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/minimap2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "minimap2"; - version = "2.17"; + version = "2.22"; src = fetchFromGitHub { repo = pname; owner = "lh3"; rev = "v${version}"; - sha256 = "0qdwlkib3aa6112372hdgvnvk86hsjjkhjar0p53pq4ajrr2cdlb"; + sha256 = "sha256-jYXJr2T1enZfSABVV5Kmd5OBtWZtQ2D/2eAlW2WHtGU="; }; buildInputs = [ zlib ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/picard-tools/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/picard-tools/default.nix index 979080745f..29c55ac745 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/picard-tools/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/picard-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "picard-tools"; - version = "2.25.1"; + version = "2.25.7"; src = fetchurl { url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar"; - sha256 = "sha256-bW5iLWtGX5/HBMN7y6VbDaxa0U0HCIu9vfreXNAn7hw="; + sha256 = "sha256-3A6DDT6Dje4rT0qhyWMfs6TD7Jgt6N/lFF/HSBBMcUY="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/openhantek6022/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/openhantek6022/default.nix index d2cdf20ab8..1b9d777366 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/openhantek6022/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/openhantek6022/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "openhantek6022"; - version = "3.2.3"; + version = "3.2.4"; src = fetchFromGitHub { owner = "OpenHantek"; repo = "OpenHantek6022"; rev = version; - sha256 = "0hnd3rdmv76dwwlmkykzwhp5sbxd1fr5ss8zdfdybxw28cxlpq8r"; + sha256 = "sha256-Rb0bd2fnnNWEm1n2EVRB2Leb0Or9vxi5oj+FKNY4GSc="; }; nativeBuildInputs = [ cmake makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/verilator/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/verilator/default.nix index 5377a7b3d1..159e15cf24 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/verilator/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/verilator/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "verilator"; - version = "4.202"; + version = "4.210"; src = fetchurl { url = "https://www.veripool.org/ftp/${pname}-${version}.tgz"; - sha256 = "0ydn4304pminzq8zc1hsrb2fjrfqnb6akr45ky43jd29c4jgznnq"; + sha256 = "sha256-KoIfJeV2aITnwiB2eQgQo4ZyXfMe6erFiGKXezR+IBg="; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/elan/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/elan/default.nix index a49262e7cb..1fb4693d64 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/elan/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/elan/default.nix @@ -7,16 +7,16 @@ in rustPlatform.buildRustPackage rec { pname = "elan"; - version = "1.0.6"; + version = "1.0.7"; src = fetchFromGitHub { owner = "leanprover"; repo = "elan"; rev = "v${version}"; - sha256 = "sha256-Ns8vSS/PDlfopigW4Nz3fdR9PCMG8gDoL36+/s0Qkeo="; + sha256 = "sha256-SFY9RbUHoaOXCaK+uIqhnKbzSkbtWiS6os/JvsggagI="; }; - cargoSha256 = "sha256-NDtldiVo4SyE88f6ntKn1WJDFdvwN5Ps4DxQH15iNZE="; + cargoSha256 = "sha256-6TFionZw76V4htYQrz8eLX7ioW7Fbgd63rtz53s0TLU="; nativeBuildInputs = [ pkg-config makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/tlaplus/tlaps.nix b/third_party/nixpkgs/pkgs/applications/science/logic/tlaplus/tlaps.nix index 89bdd979fe..90a4aeb4f8 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/tlaplus/tlaps.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/tlaplus/tlaps.nix @@ -1,6 +1,12 @@ { fetchurl -, lib, stdenv -, ocaml, isabelle, cvc3, perl, wget, which +, lib +, stdenv +, ocaml +, isabelle +, cvc3 +, perl +, wget +, which }: stdenv.mkDerivation rec { @@ -13,8 +19,6 @@ stdenv.mkDerivation rec { buildInputs = [ ocaml isabelle cvc3 perl wget which ]; - phases = [ "unpackPhase" "installPhase" ]; - installPhase = '' mkdir -pv "$out" export HOME="$out" @@ -45,9 +49,9 @@ stdenv.mkDerivation rec { and scalable to large system specifications. It provides a consistent abstraction over the various “backend” verifiers. ''; - homepage = "https://tla.msr-inria.inria.fr/tlaps/content/Home.html"; - license = lib.licenses.bsd2; - platforms = lib.platforms.unix; + homepage = "https://tla.msr-inria.inria.fr/tlaps/content/Home.html"; + license = lib.licenses.bsd2; + platforms = lib.platforms.unix; maintainers = [ ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/tlaplus/toolbox.nix b/third_party/nixpkgs/pkgs/applications/science/logic/tlaplus/toolbox.nix index ef2d97ef6b..21c60d03ac 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/tlaplus/toolbox.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/tlaplus/toolbox.nix @@ -1,5 +1,13 @@ -{ lib, fetchzip, makeWrapper, makeDesktopItem, stdenv -, gtk3, libXtst, glib, zlib, wrapGAppsHook +{ lib +, fetchzip +, makeWrapper +, makeDesktopItem +, stdenv +, gtk3 +, libXtst +, glib +, zlib +, wrapGAppsHook }: let @@ -17,7 +25,8 @@ let }; -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { pname = "tla-toolbox"; version = "1.7.1"; src = fetchzip { @@ -31,8 +40,6 @@ in stdenv.mkDerivation rec { dontWrapGApps = true; - phases = [ "installPhase" ]; - installPhase = '' runHook preInstall diff --git a/third_party/nixpkgs/pkgs/applications/science/machine-learning/vowpal-wabbit/default.nix b/third_party/nixpkgs/pkgs/applications/science/machine-learning/vowpal-wabbit/default.nix index d1523b571f..7ecbe09f5e 100644 --- a/third_party/nixpkgs/pkgs/applications/science/machine-learning/vowpal-wabbit/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/machine-learning/vowpal-wabbit/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "vowpal-wabbit"; - version = "8.10.0"; + version = "8.11.0"; src = fetchFromGitHub { owner = "VowpalWabbit"; repo = "vowpal_wabbit"; rev = version; - sha256 = "1vxnwanflsx6zf8m9mrxms28ii7rl61xfxp3556y3iawmy11d6pl"; + sha256 = "sha256-F3la4n1ULMN2nktr+PVWFPl3V2RfCowR0ozL+dnbhgA="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/math/R/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/R/default.nix index 827c817fd1..5de644dfdf 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/R/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/R/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, bzip2, gfortran, libX11, libXmu, libXt, libjpeg, libpng , libtiff, ncurses, pango, pcre2, perl, readline, tcl, texLive, tk, xz, zlib , less, texinfo, graphviz, icu, pkg-config, bison, imake, which, jdk, blas, lapack -, curl, Cocoa, Foundation, libobjc, libcxx, tzdata, fetchpatch +, curl, Cocoa, Foundation, libobjc, libcxx, tzdata , withRecommendedPackages ? true , enableStrictBarrier ? false # R as of writing does not support outputting both .so and .a files; it outputs: @@ -13,11 +13,11 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "R"; - version = "4.0.4"; + version = "4.1.1"; src = fetchurl { url = "https://cran.r-project.org/src/base/R-${lib.versions.major version}/${pname}-${version}.tar.gz"; - sha256 = "0bl098xcv8v316kqnf43v6gb4kcsv31ydqfm1f7qr824jzb2fgsj"; + sha256 = "0r6kpnxjbvb7gdfg4m1z8zc6xd225vw81wrnf05ps9ajawk06pji"; }; dontUseImakeConfigure = true; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { patches = [ ./no-usr-local-search-paths.patch - ./fix-failing-test.patch + ./skip-check-for-aarch64.patch ]; prePatch = lib.optionalString stdenv.isDarwin '' diff --git a/third_party/nixpkgs/pkgs/applications/science/math/R/fix-failing-test.patch b/third_party/nixpkgs/pkgs/applications/science/math/R/fix-failing-test.patch deleted file mode 100644 index 5fb3b3b9c3..0000000000 --- a/third_party/nixpkgs/pkgs/applications/science/math/R/fix-failing-test.patch +++ /dev/null @@ -1,25 +0,0 @@ -From e8f54bc562eb301d204b5f880614be58a2b39a2b Mon Sep 17 00:00:00 2001 -From: maechler -Date: Mon, 30 Mar 2020 19:15:59 +0000 -Subject: [PATCH] no longer fail in norm() check for broken OpenBLAS Lapack - 3.9.0 - -git-svn-id: https://svn.r-project.org/R/trunk@78112 00db46b3-68df-0310-9c12-caf00c1e9a41 ---- - tests/reg-tests-1d.R | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/tests/reg-tests-1d.R b/tests/reg-tests-1d.R -index 6b7de765a95..fafd6911e7a 100644 ---- a/tests/reg-tests-1d.R -+++ b/tests/reg-tests-1d.R -@@ -3836,7 +3836,8 @@ stopifnot(is.na( norm(diag(c(1, NA)), "2") )) - ## norm(, "F") - (m <- cbind(0, c(NA, 0), 0:-1)) - nTypes <- eval(formals(base::norm)$type) # "O" "I" "F" "M" "2" --stopifnot(is.na( print(vapply(nTypes, norm, 0., x = m)) )) # print(): show NA *or* NaN -+print( # stopifnot( -- for now, as Lapack is still broken in some OpenBLAS -- FIXME -+ is.na( print(vapply(nTypes, norm, 0., x = m)) )) # print(): show NA *or* NaN - ## "F" gave non-NA with LAPACK 3.9.0, before our patch in R-devel and R-patched - - diff --git a/third_party/nixpkgs/pkgs/applications/science/math/R/skip-check-for-aarch64.patch b/third_party/nixpkgs/pkgs/applications/science/math/R/skip-check-for-aarch64.patch new file mode 100644 index 0000000000..8721bf6b42 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/science/math/R/skip-check-for-aarch64.patch @@ -0,0 +1,11 @@ +diff -ur a/src/library/stats/man/nls.Rd b/src/library/stats/man/nls.Rd +--- a/src/library/stats/man/nls.Rd 2021-05-21 19:15:02.000000000 -0300 ++++ b/src/library/stats/man/nls.Rd 2021-08-12 12:39:00.094758280 -0300 +@@ -287,7 +287,7 @@ + options(digits = 10) # more accuracy for 'trace' + ## IGNORE_RDIFF_BEGIN + try(nlm1 <- update(nlmod, control = list(tol = 1e-7))) # where central diff. work here: +- (nlm2 <- update(nlmod, control = list(tol = 8e-8, nDcentral=TRUE), trace=TRUE)) ++ (nlm2 <- update(nlmod, control = list(tol = 8e-8, nDcentral=TRUE, warnOnly=TRUE), trace=TRUE)) + ## --> convergence tolerance 4.997e-8 (in 11 iter.) + ## IGNORE_RDIFF_END diff --git a/third_party/nixpkgs/pkgs/applications/science/math/qalculate-gtk/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/qalculate-gtk/default.nix index 7807ae613e..bc192fe421 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/qalculate-gtk/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/qalculate-gtk/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qalculate-gtk"; - version = "3.19.0"; + version = "3.20.1"; src = fetchFromGitHub { owner = "qalculate"; repo = "qalculate-gtk"; rev = "v${version}"; - sha256 = "1nrx7gp6f1yalbdda1gb97azhbr4xclq2xf08vvbvsk8jfd6fd2v"; + sha256 = "sha256-GTOdJ4dxR491WU6WM47xLHO7RGUGXkdHuQIDxJvVvFE="; }; hardeningDisable = [ "format" ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/math/wxmaxima/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/wxmaxima/default.nix index 94e675d7dd..2205e96383 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/wxmaxima/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/wxmaxima/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "wxmaxima"; - version = "21.02.0"; + version = "21.05.2"; src = fetchFromGitHub { owner = "wxMaxima-developers"; repo = "wxmaxima"; rev = "Version-${version}"; - sha256 = "sha256-5nvaaKsvSEs7QxOszjDK1Xkana2er1BCMZ83b1JZSqc="; + sha256 = "sha256-HPqdxGrPxe5FZNOimTpAP+c9VpDBkXu3Z1c1Aaf3+UA="; }; buildInputs = [ wxGTK maxima gnome.adwaita-icon-theme ]; diff --git a/third_party/nixpkgs/pkgs/applications/system/glances/default.nix b/third_party/nixpkgs/pkgs/applications/system/glances/default.nix index 1d1182ba0d..8ddee9c0b4 100644 --- a/third_party/nixpkgs/pkgs/applications/system/glances/default.nix +++ b/third_party/nixpkgs/pkgs/applications/system/glances/default.nix @@ -9,14 +9,14 @@ buildPythonApplication rec { pname = "glances"; - version = "3.2.2"; + version = "3.2.3"; disabled = isPyPy; src = fetchFromGitHub { owner = "nicolargo"; repo = "glances"; rev = "v${version}"; - sha256 = "13w7bxfizsfi3xyhharnindyn3dv3p9p54a4xwyhnnhczs8kqa8s"; + sha256 = "1nc8bdzzrzaircq3myd32w6arpy2prn739886cq2h47cpinxmvpr"; }; # Some tests fail in the sandbox (they e.g. require access to /sys/class/power_supply): diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/foot/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/foot/default.nix index 8f8a074cc5..8e7bbed909 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/foot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/foot/default.nix @@ -3,7 +3,7 @@ , fetchFromGitea , fetchurl , fetchpatch -, runCommandNoCC +, runCommand , fcft , freetype , pixman @@ -54,7 +54,7 @@ let ''; }; - stimuliFile = runCommandNoCC "pgo-stimulus-file" { } '' + stimuliFile = runCommand "pgo-stimulus-file" { } '' ${stimulusGenerator} \ --rows=67 --cols=135 \ --scroll --scroll-region \ diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/wezterm/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/wezterm/default.nix index e3e10f6e0f..7fdb335707 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/wezterm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/wezterm/default.nix @@ -59,13 +59,13 @@ in rustPlatform.buildRustPackage rec { pname = "wezterm"; - version = "20210502-154244-3f7122cb"; + version = "20210814-124438-54e29167"; src = fetchFromGitHub { owner = "wez"; repo = pname; rev = version; - sha256 = "9HPhb7Vyy5DwBW1xeA6sEIBmmOXlky9lPShu6ZoixPw="; + sha256 = "sha256-6HXTftgAs6JMzOMCY+laN74in8xfjE8yJc5xSl9PQCE="; fetchSubmodules = true; }; @@ -75,7 +75,7 @@ rustPlatform.buildRustPackage rec { echo ${version} > .tag ''; - cargoSha256 = "sha256-cbZg2wc3G2ffMQBB6gd0vBbow5GRbXaj8Xh5ga1cMxU="; + cargoSha256 = "sha256-yjTrWoqIKoRV4oZQ0mfTGrIGmm89AaKJd16WL1Ozhnw="; nativeBuildInputs = [ pkg-config @@ -87,13 +87,18 @@ rustPlatform.buildRustPackage rec { buildInputs = runtimeDeps; postInstall = '' + # terminfo mkdir -p $terminfo/share/terminfo/w $out/nix-support tic -x -o $terminfo/share/terminfo termwiz/data/wezterm.terminfo echo "$terminfo" >> $out/nix-support/propagated-user-env-packages + # desktop icon install -Dm644 assets/icon/terminal.png $out/share/icons/hicolor/128x128/apps/org.wezfurlong.wezterm.png install -Dm644 assets/wezterm.desktop $out/share/applications/org.wezfurlong.wezterm.desktop install -Dm644 assets/wezterm.appdata.xml $out/share/metainfo/org.wezfurlong.wezterm.appdata.xml + + # helper scripts + install -Dm644 assets/shell-integration/wezterm.sh $out/share/wezterm/shell-integration/wezterm.sh ''; preFixup = lib.optionalString stdenv.isLinux '' diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/xterm/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/xterm/default.nix index eafa893037..378fd7df01 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/xterm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/xterm/default.nix @@ -4,23 +4,19 @@ stdenv.mkDerivation rec { pname = "xterm"; - version = "367"; + version = "368"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/xterm/${pname}-${version}.tgz" "https://invisible-mirror.net/archives/xterm/${pname}-${version}.tgz" ]; - sha256 = "07y51l06n344pjyxdddq6sdvxw25nl10irl4avynkqjnqyqsiw97"; + sha256 = "L/UWmTC2tJ7wuvteEzHJTxqYwxBEK7p3mK3YIcdq5xI="; }; strictDeps = true; - nativeBuildInputs = [ - makeWrapper - pkg-config - fontconfig - ]; + nativeBuildInputs = [ makeWrapper pkg-config fontconfig ]; buildInputs = [ xorg.libXaw diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/xtermcontrol/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/xtermcontrol/default.nix index 821d922c6d..ebc7657e8a 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/xtermcontrol/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/xtermcontrol/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "3.7"; + version = "3.8"; pname = "xtermcontrol"; src = fetchurl { url = "https://thrysoee.dk/xtermcontrol/xtermcontrol-${version}.tar.gz"; - sha256 = "04m12ddaps5sdbqvkwkp6lh81i8vh5ya5gzcxkrkilsga3m6qff2"; + sha256 = "sha256-Vh6GNiDkjNhaD9U/3fG2LpMLN39L3jRUgG/FQeG1z40="; }; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/version-management/bcompare/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/bcompare/default.nix index d90de1a526..98c0ad8bc3 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/bcompare/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/bcompare/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bcompare"; - version = "4.3.7.25118"; + version = "4.4.0.25886"; src = fetchurl { url = "https://www.scootersoftware.com/${pname}-${version}_amd64.deb"; - sha256 = "165d6d81vy29pr62y4rcvl4abqqhfwdzcsx77p0dqlzgqswj88v8"; + sha256 = "sha256-zQZrCjXzoOZ5o5M4t1n5/HhGoGTcZSj5rlf9Uz9UZko="; }; unpackPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/version-management/blackbox/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/blackbox/default.nix index aee0e92e80..5c802d8a30 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/blackbox/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/blackbox/default.nix @@ -1,24 +1,62 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib +, stdenv +, fetchFromGitHub +, expect +, which +, gnupg +, coreutils +, git +, pinentry +, gnutar +, procps +}: stdenv.mkDerivation rec { - version = "1.20181219"; - pname = "blackbox"; + pname = "blackbox"; + version = "2.0.0"; src = fetchFromGitHub { - owner = "stackexchange"; - repo = pname; - rev = "v${version}"; - sha256 = "1lpwwwc3rf992vdf3iy1ds07n1xkmad065im2bqzc6kdsbkn7rjx"; + owner = "stackexchange"; + repo = pname; + rev = "v${version}"; + sha256 = "1plwdmzds6dq2rlp84dgiashrfg0kg4yijhnxaapz2q4d1vvx8lq"; }; + buildInputs = [ gnupg ]; + + doCheck = true; + + checkInputs = [ + expect + which + coreutils + pinentry.tty + git + gnutar + procps + ]; + + postPatch = '' + patchShebangs bin tools + substituteInPlace Makefile \ + --replace "PREFIX?=/usr/local" "PREFIX=$out" + + substituteInPlace tools/confidence_test.sh \ + --replace 'PATH="''${blackbox_home}:/usr/local/bin:/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/sbin:/opt/local/bin:/usr/pkg/bin:/usr/pkg/gnu/bin:''${blackbox_home}"' \ + "PATH=/build/source/bin/:$PATH" + ''; + installPhase = '' - mkdir -p $out/bin && cp -r bin/* $out/bin + runHook preInstall + mkdir -p $out/bin + make copy-install + runHook postInstall ''; meta = with lib; { description = "Safely store secrets in a VCS repo"; maintainers = with maintainers; [ ericsagnes ]; - license = licenses.mit; - platforms = platforms.all; + license = licenses.mit; + platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/hub/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/hub/default.nix index e0d7e46d22..9d63642dcb 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/hub/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/hub/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoPackage, fetchFromGitHub, git, groff, installShellFiles, util-linux, nixosTests }: +{ lib, buildGoPackage, fetchFromGitHub, git, groff, installShellFiles, unixtools, nixosTests }: buildGoPackage rec { pname = "hub"; @@ -16,7 +16,7 @@ buildGoPackage rec { sha256 = "1qjab3dpia1jdlszz3xxix76lqrm4zbmqzd9ymld7h06awzsg2vh"; }; - nativeBuildInputs = [ groff installShellFiles util-linux ]; + nativeBuildInputs = [ groff installShellFiles unixtools.col ]; postPatch = '' patchShebangs . diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/yarnPkgs.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/yarnPkgs.nix index 519625a193..a7b91b7df5 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/yarnPkgs.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/yarnPkgs.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec { +{ fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec { offline_cache = linkFarm "offline" packages; packages = [ { diff --git a/third_party/nixpkgs/pkgs/applications/version-management/monotone/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/monotone/default.nix index 48af459260..6ea66b296d 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/monotone/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/monotone/default.nix @@ -30,7 +30,10 @@ stdenv.mkDerivation rec { hash = "sha256:1hfy8vaap3184cd7h3qhz0da7c992idkc6q2nz9frhma45c5vgmd"; }; - patches = [ ./monotone-1.1-Adapt-to-changes-in-pcre-8.42.patch ]; + patches = [ + ./monotone-1.1-Adapt-to-changes-in-pcre-8.42.patch + ./monotone-1.1-adapt-to-botan2.patch + ]; postPatch = '' sed -e 's@/usr/bin/less@${less}/bin/less@' -i src/unix/terminal.cc diff --git a/third_party/nixpkgs/pkgs/applications/version-management/monotone/monotone-1.1-adapt-to-botan2.patch b/third_party/nixpkgs/pkgs/applications/version-management/monotone/monotone-1.1-adapt-to-botan2.patch new file mode 100644 index 0000000000..1df6a4717d --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/version-management/monotone/monotone-1.1-adapt-to-botan2.patch @@ -0,0 +1,15 @@ +Botan2 has switched the parameter order in encryption descriptions + +--- monotone-upstream/src/botan_glue.hh 2021-08-17 19:06:32.736753732 +0200 ++++ monotone-patched/src/botan_glue.hh 2021-08-17 19:07:44.437750535 +0200 +@@ -45,7 +45,9 @@ + // In Botan revision d8021f3e (back when it still used monotone) the name + // of SHA-1 changed to SHA-160. + const static char * PBE_PKCS5_KEY_FORMAT = +-#if BOTAN_VERSION_CODE >= BOTAN_VERSION_CODE_FOR(1,11,0) ++#if BOTAN_VERSION_CODE >= BOTAN_VERSION_CODE_FOR(2,0,0) ++ "PBE-PKCS5v20(TripleDES/CBC,SHA-160)"; ++#elif BOTAN_VERSION_CODE >= BOTAN_VERSION_CODE_FOR(1,11,0) + "PBE-PKCS5v20(SHA-160,TripleDES/CBC)"; + #else + "PBE-PKCS5v20(SHA-1,TripleDES/CBC)"; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/nbstripout/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/nbstripout/default.nix index 5e556b40a8..d7cd89f4de 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/nbstripout/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/nbstripout/default.nix @@ -2,7 +2,7 @@ with python.pkgs; buildPythonApplication rec { - version = "0.3.9"; + version = "0.5.0"; pname = "nbstripout"; # Mercurial should be added as a build input but because it's a Python @@ -14,7 +14,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "b46dddbf78b8b137176bc72729124e378242ef9ce93af63f6e0a8c4850c972e7"; + sha256 = "86ab50136998d62c9fa92478d2eb9ddc4137e51a28568f78fa8f24a6fbb6a7d8"; }; # for some reason, darwin uses /bin/sh echo native instead of echo binary, so diff --git a/third_party/nixpkgs/pkgs/applications/version-management/redmine/Gemfile b/third_party/nixpkgs/pkgs/applications/version-management/redmine/Gemfile index 57a1f07363..9835e23f28 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/redmine/Gemfile +++ b/third_party/nixpkgs/pkgs/applications/version-management/redmine/Gemfile @@ -3,8 +3,9 @@ source 'https://rubygems.org' ruby '>= 2.4.0', '< 2.8.0' gem 'bundler', '>= 1.12.0' -gem 'rails', '5.2.5' +gem 'rails', '5.2.6' gem 'sprockets', '~> 3.7.2' if RUBY_VERSION < '2.5' +gem 'globalid', '~> 0.4.2' if Gem.ruby_version < Gem::Version.new('2.6.0') gem 'rouge', '~> 3.26.0' gem 'request_store', '~> 1.5.0' gem "mini_mime", "~> 1.0.1" diff --git a/third_party/nixpkgs/pkgs/applications/version-management/redmine/Gemfile.lock b/third_party/nixpkgs/pkgs/applications/version-management/redmine/Gemfile.lock index 7f3fc0650c..e90405c9a8 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/redmine/Gemfile.lock +++ b/third_party/nixpkgs/pkgs/applications/version-management/redmine/Gemfile.lock @@ -1,19 +1,19 @@ GEM remote: https://rubygems.org/ specs: - actioncable (5.2.5) - actionpack (= 5.2.5) + actioncable (5.2.6) + actionpack (= 5.2.6) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailer (5.2.5) - actionpack (= 5.2.5) - actionview (= 5.2.5) - activejob (= 5.2.5) + actionmailer (5.2.6) + actionpack (= 5.2.6) + actionview (= 5.2.6) + activejob (= 5.2.6) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.2.5) - actionview (= 5.2.5) - activesupport (= 5.2.5) + actionpack (5.2.6) + actionview (= 5.2.6) + activesupport (= 5.2.6) rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) @@ -21,31 +21,31 @@ GEM actionpack-xml_parser (2.0.1) actionpack (>= 5.0) railties (>= 5.0) - actionview (5.2.5) - activesupport (= 5.2.5) + actionview (5.2.6) + activesupport (= 5.2.6) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.2.5) - activesupport (= 5.2.5) + activejob (5.2.6) + activesupport (= 5.2.6) globalid (>= 0.3.6) - activemodel (5.2.5) - activesupport (= 5.2.5) - activerecord (5.2.5) - activemodel (= 5.2.5) - activesupport (= 5.2.5) + activemodel (5.2.6) + activesupport (= 5.2.6) + activerecord (5.2.6) + activemodel (= 5.2.6) + activesupport (= 5.2.6) arel (>= 9.0) - activestorage (5.2.5) - actionpack (= 5.2.5) - activerecord (= 5.2.5) + activestorage (5.2.6) + actionpack (= 5.2.6) + activerecord (= 5.2.6) marcel (~> 1.0.0) - activesupport (5.2.5) + activesupport (5.2.6) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - addressable (2.7.0) + addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) arel (9.0.0) ast (2.4.2) @@ -60,19 +60,19 @@ GEM xpath (~> 3.2) childprocess (3.0.0) chunky_png (1.4.0) - concurrent-ruby (1.1.8) + concurrent-ruby (1.1.9) crass (1.0.6) - css_parser (1.9.0) + css_parser (1.10.0) addressable csv (3.1.9) - docile (1.3.5) + docile (1.4.0) erubi (1.10.0) - globalid (0.4.2) - activesupport (>= 4.2.0) + globalid (0.5.2) + activesupport (>= 5.0) htmlentities (4.3.4) i18n (1.8.10) concurrent-ruby (~> 1.0) - loofah (2.9.1) + loofah (2.12.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) @@ -81,21 +81,21 @@ GEM method_source (1.0.0) mini_magick (4.11.0) mini_mime (1.0.3) - mini_portile2 (2.5.1) + mini_portile2 (2.5.3) minitest (5.14.4) - mocha (1.12.0) + mocha (1.13.0) mysql2 (0.5.3) net-ldap (0.17.0) - nio4r (2.5.7) - nokogiri (1.11.3) + nio4r (2.5.8) + nokogiri (1.11.7) mini_portile2 (~> 2.5.0) racc (~> 1.4) parallel (1.20.1) - parser (3.0.1.0) + parser (3.0.2.0) ast (~> 2.4.1) pg (1.2.3) public_suffix (4.0.6) - puma (5.2.2) + puma (5.4.0) nio4r (~> 2.0) racc (1.5.2) rack (2.2.3) @@ -104,32 +104,32 @@ GEM ruby-openid (>= 2.1.8) rack-test (1.1.0) rack (>= 1.0, < 3) - rails (5.2.5) - actioncable (= 5.2.5) - actionmailer (= 5.2.5) - actionpack (= 5.2.5) - actionview (= 5.2.5) - activejob (= 5.2.5) - activemodel (= 5.2.5) - activerecord (= 5.2.5) - activestorage (= 5.2.5) - activesupport (= 5.2.5) + rails (5.2.6) + actioncable (= 5.2.6) + actionmailer (= 5.2.6) + actionpack (= 5.2.6) + actionview (= 5.2.6) + activejob (= 5.2.6) + activemodel (= 5.2.6) + activerecord (= 5.2.6) + activestorage (= 5.2.6) + activesupport (= 5.2.6) bundler (>= 1.3.0) - railties (= 5.2.5) + railties (= 5.2.6) sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) rails-html-sanitizer (1.3.0) loofah (~> 2.3) - railties (5.2.5) - actionpack (= 5.2.5) - activesupport (= 5.2.5) + railties (5.2.6) + actionpack (= 5.2.6) + activesupport (= 5.2.6) method_source rake (>= 0.8.7) thor (>= 0.19.0, < 2.0) rainbow (3.0.0) - rake (13.0.3) + rake (13.0.6) rbpdf (1.20.1) htmlentities rbpdf-font (~> 1.19.0) @@ -147,10 +147,10 @@ GEM roadie (>= 3.1, < 5.0) rotp (6.2.0) rouge (3.26.0) - rqrcode (1.2.0) + rqrcode (2.0.0) chunky_png (~> 1.0) - rqrcode_core (~> 0.2) - rqrcode_core (0.2.0) + rqrcode_core (~> 1.0) + rqrcode_core (1.1.0) rubocop (1.12.1) parallel (~> 1.10) parser (>= 3.0.0.0) @@ -160,8 +160,8 @@ GEM rubocop-ast (>= 1.2.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.4.1) - parser (>= 2.7.1.5) + rubocop-ast (1.10.0) + parser (>= 3.0.1.1) rubocop-performance (1.10.2) rubocop (>= 0.90.0, < 2.0) rubocop-ast (>= 0.4.0) @@ -171,7 +171,7 @@ GEM rubocop (>= 0.90.0, < 2.0) ruby-openid (2.9.2) ruby-progressbar (1.11.0) - rubyzip (2.3.0) + rubyzip (2.3.2) selenium-webdriver (3.142.7) childprocess (>= 0.5, < 4.0) rubyzip (>= 1.2.2) @@ -195,7 +195,7 @@ GEM nokogiri (~> 1.6) rubyzip (>= 1.3.0) selenium-webdriver (>= 3.0, < 4.0) - websocket-driver (0.7.3) + websocket-driver (0.7.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) xpath (3.2.0) @@ -224,7 +224,7 @@ DEPENDENCIES pg (~> 1.2.2) puma rack-openid - rails (= 5.2.5) + rails (= 5.2.6) rails-dom-testing rbpdf (~> 1.20.0) redcarpet (~> 3.5.1) @@ -245,7 +245,7 @@ DEPENDENCIES yard RUBY VERSION - ruby 2.6.6p146 + ruby 2.7.3p183 BUNDLED WITH 2.1.4 diff --git a/third_party/nixpkgs/pkgs/applications/version-management/redmine/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/redmine/default.nix index 7eca72ac5f..eb6218826b 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/redmine/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/redmine/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, bundlerEnv, ruby, makeWrapper }: let - version = "4.2.1"; + version = "4.2.2"; rubyEnv = bundlerEnv { name = "redmine-env-${version}"; @@ -16,7 +16,7 @@ in src = fetchurl { url = "https://www.redmine.org/releases/${pname}-${version}.tar.gz"; - sha256 = "1d217fhyvncpwahwlinr3vc20vn7jijaxxk1i56gw72z8b1hjhdd"; + sha256 = "1xlqf7g5imjmc3as2aajvbrs217jh3qpdvvpsd9mka9rk4kykyz6"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/redmine/gemset.nix b/third_party/nixpkgs/pkgs/applications/version-management/redmine/gemset.nix index 2d045a5f29..376084e80d 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/redmine/gemset.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/redmine/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16g623zz4nnwj236xms4n85jbc2b1imddqsx3gd4x4b7xqlwlw9p"; + sha256 = "1s778lwghaf0zwfvbhzvjq691rl75d85raiqg1c7zly8p9afq8ym"; type = "gem"; }; - version = "5.2.5"; + version = "5.2.6"; }; actionmailer = { dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"]; @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ifmlwlm4bs6gm3y4c701wkhyf4ym4kia44npz9fbc92ariawn2z"; + sha256 = "0gwvn4lrkhqmxp96npjp4sfaz78h9ab2lrl20sjph7xxakfwknld"; type = "gem"; }; - version = "5.2.5"; + version = "5.2.6"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; @@ -27,10 +27,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1m9wdcnkls8cs31gfic5hffnrz0l1iyk0dldwx2q2z58qhh3sw0m"; + sha256 = "0b2xl458f2ygnjbvv0hacc8bk9qxbx64m2g7vw6f9y7k8q85930y"; type = "gem"; }; - version = "5.2.5"; + version = "5.2.6"; }; actionpack-xml_parser = { dependencies = ["actionpack" "railties"]; @@ -49,10 +49,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xlcfcbmwlmcp6vi9ay5xw9lqnj70bl1gn19hafygv9w65sw0n2i"; + sha256 = "06f8212kplqhap9jpi49dvqlhwkfxxxm9nh8al6qjvl7mfh9qbzg"; type = "gem"; }; - version = "5.2.5"; + version = "5.2.6"; }; activejob = { dependencies = ["activesupport" "globalid"]; @@ -60,10 +60,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00k5fl4bx9qmrkwn8mdfdh8h2did0bnr3nc3g0fdyvm7ql9981jc"; + sha256 = "1cdvxkbzbs4cdh4bgf2cg7i886a20gvr43hg76kx5rzd8xal7xnd"; type = "gem"; }; - version = "5.2.5"; + version = "5.2.6"; }; activemodel = { dependencies = ["activesupport"]; @@ -71,10 +71,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bb600bsxd0gf4vwqq2qiklg7wd37b0as6ll3k5hjy9v6izj006b"; + sha256 = "1r28kcnzr8dm6idirndd8pvbmg5c678ijxk845g84ykq1l69czs6"; type = "gem"; }; - version = "5.2.5"; + version = "5.2.6"; }; activerecord = { dependencies = ["activemodel" "activesupport" "arel"]; @@ -82,10 +82,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03zijqm7xdmmylzp68hadvq5rps67lsq10hnq6kpmhq496pp7wlj"; + sha256 = "05qqnichgxml6z3d1dpgjy2fi62dppnqxgg37hr9a35hwhn05fzc"; type = "gem"; }; - version = "5.2.5"; + version = "5.2.6"; }; activestorage = { dependencies = ["actionpack" "activerecord" "marcel"]; @@ -93,10 +93,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1706qircxl9agrq5423zv0i9p7gvcxcligw8vvclk049hks87gqd"; + sha256 = "0wnzac1qs4y339p13xyr03rx4ql3i4ywzfhyzn118d2zz82xnpfl"; type = "gem"; }; - version = "5.2.5"; + version = "5.2.6"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; @@ -104,10 +104,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bizrvn05d59l1qzwkhqvwmzicamq4p66z2ziap5ks9y6hqgqmzj"; + sha256 = "1vybx4cj42hr6m8cdwbrqq2idh98zms8c11kr399xjczhl9ywjbj"; type = "gem"; }; - version = "5.2.5"; + version = "5.2.6"; }; addressable = { dependencies = ["public_suffix"]; @@ -115,10 +115,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy"; + sha256 = "022r3m9wdxljpbya69y2i3h9g3dhhfaqzidf95m6qjzms792jvgp"; type = "gem"; }; - version = "2.7.0"; + version = "2.8.0"; }; arel = { groups = ["default"]; @@ -186,10 +186,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mr23wq0szj52xnj0zcn1k0c7j4v79wlwbijkpfcscqww3l6jlg3"; + sha256 = "0nwad3211p7yv9sda31jmbyw6sdafzmdi2i2niaz6f0wk5nq9h0f"; type = "gem"; }; - version = "1.1.8"; + version = "1.1.9"; }; crass = { groups = ["default"]; @@ -207,10 +207,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xs4ind9xd099rb52b73pch8ha143dl8bhivqsbba4wrvxpbx751"; + sha256 = "1q8gj3wkc2mbzsqw5zcsr3kyzrrb2pda03pi769rjbvqr94g3bm5"; type = "gem"; }; - version = "1.9.0"; + version = "1.10.0"; }; csv = { groups = ["default"]; @@ -227,10 +227,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bpdrsdqwv80qqc3f4xxzpii13lx9mlx3zay4bnmmscrx8c0p63z"; + sha256 = "1lxqxgq71rqwj1lpl9q1mbhhhhhhdkkj7my341f2889pwayk85sz"; type = "gem"; }; - version = "1.3.5"; + version = "1.4.0"; }; erubi = { groups = ["default"]; @@ -248,10 +248,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zkxndvck72bfw235bd9nl2ii0lvs5z88q14706cmn702ww2mxv1"; + sha256 = "0k6ww3shk3mv119xvr9m99l6ql0czq91xhd66hm8hqssb18r2lvm"; type = "gem"; }; - version = "0.4.2"; + version = "0.5.2"; }; htmlentities = { groups = ["default"]; @@ -280,10 +280,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1w9mbii8515p28xd4k72f3ab2g6xiyq15497ys5r8jn6m355lgi7"; + sha256 = "1nqcya57x2n58y1dify60i0dpla40n4yir928khp4nj5jrn9mgmw"; type = "gem"; }; - version = "2.9.1"; + version = "2.12.0"; }; mail = { dependencies = ["mini_mime"]; @@ -341,10 +341,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xg1x4708a4pn2wk8qs2d8kfzzdyv9kjjachg2f1phsx62ap2rx2"; + sha256 = "1ad0mli9rc0f17zw4ibp24dbj1y39zkykijsjmnzl4gwpg5s0j6k"; type = "gem"; }; - version = "2.5.1"; + version = "2.5.3"; }; minitest = { groups = ["default" "test"]; @@ -361,10 +361,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05yw6rwgjppq116jgqfg4pv4bql3ci4r2fmmg0m2c3sqib1bq41a"; + sha256 = "15s53ggsykk69kxqvs4416s8yxdhz6caggva55n8sjgy4ixzwp10"; type = "gem"; }; - version = "1.12.0"; + version = "1.13.0"; }; mysql2 = { groups = ["default"]; @@ -399,10 +399,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00fwz0qq7agd2xkdz02i8li236qvwhma3p0jdn5bdvc21b7ydzd5"; + sha256 = "0xk64wghkscs6bv2n22853k2nh39d131c6rfpnlw12mbjnnv9v1v"; type = "gem"; }; - version = "2.5.7"; + version = "2.5.8"; }; nokogiri = { dependencies = ["mini_portile2" "racc"]; @@ -410,10 +410,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19d78mdg2lbz9jb4ph6nk783c9jbsdm8rnllwhga6pd53xffp6x0"; + sha256 = "1vrn31385ix5k9b0yalnlzv360isv6dincbcvi8psllnwz4sjxj9"; type = "gem"; }; - version = "1.11.3"; + version = "1.11.7"; }; parallel = { groups = ["default" "test"]; @@ -431,10 +431,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04ri489irbbx6sbkclpgri7j7p99v2qib5g2i70xx5fay12ilny8"; + sha256 = "06ma6w87ph8lnc9z4hi40ynmcdnjv0p8x53x0s3fjkz4q2p6sxh5"; type = "gem"; }; - version = "3.0.1.0"; + version = "3.0.2.0"; }; pg = { groups = ["default"]; @@ -470,10 +470,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wiprd0v4mjqv5p1vqaidr9ci2xm08lcxdz1k50mb1b6nrw6r74k"; + sha256 = "0bz9y1hxfyv73yb26nvs2kcw08gxi7nxkfc94j82hgx2sifcnv3x"; type = "gem"; }; - version = "5.2.2"; + version = "5.4.0"; }; racc = { groups = ["default" "test"]; @@ -523,10 +523,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p0sa36sngmfkmykcv5qhpr7rzsrc42cd9flhnxjs3r5b0jsl52c"; + sha256 = "1p17dmifd0v3knh9wja4z4rv0qaybwansnwxmvx6f3rcgkszkpnc"; type = "gem"; }; - version = "5.2.5"; + version = "5.2.6"; }; rails-dom-testing = { dependencies = ["activesupport" "nokogiri"]; @@ -556,10 +556,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "072spzdpc8bv35nflr43i67njlriavqkrz6cgyd42adz6bqyval9"; + sha256 = "0rs97fxv13hgpbmyhk8ag8qzgkh25css0797h90k9w1vg9djl84k"; type = "gem"; }; - version = "5.2.5"; + version = "5.2.6"; }; rainbow = { groups = ["default" "test"]; @@ -576,10 +576,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1iik52mf9ky4cgs38fp2m8r6skdkq1yz23vh18lk95fhbcxb6a67"; + sha256 = "15whn7p9nrkxangbs9hh75q585yfn66lv0v2mhj6q6dl6x8bzr2w"; type = "gem"; }; - version = "13.0.3"; + version = "13.0.6"; }; rbpdf = { dependencies = ["htmlentities" "rbpdf-font"]; @@ -691,20 +691,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0f1cv9a9sjqc898qm3h7zmkhwglrjw5blsskbg3gsaws01d4bc47"; + sha256 = "073w0qgjydkqpsqsb9yr8qg0mhvwlzx6z53hqr2b5zifvb9wzh02"; type = "gem"; }; - version = "1.2.0"; + version = "2.0.0"; }; rqrcode_core = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00kqasqja8zyzqvlgiwd9r0wndqk01qk5j68a8lhlz4ayrd4qy0y"; + sha256 = "0d632w2pd34bw9l3bsfnyqaa8vgbz9pxpj29gpf8parqr7wq922k"; type = "gem"; }; - version = "0.2.0"; + version = "1.1.0"; }; rubocop = { dependencies = ["parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"]; @@ -723,10 +723,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gkf1p8yal38nlvdb39qaiy0gr85fxfr09j5dxh8qvrgpncpnk78"; + sha256 = "0x6za0j9wwxr14rkkkmpbnwj04lak4yjmkyrdl8c31m9acba80zw"; type = "gem"; }; - version = "1.4.1"; + version = "1.10.0"; }; rubocop-performance = { dependencies = ["rubocop" "rubocop-ast"]; @@ -775,10 +775,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0590m2pr9i209pp5z4mx0nb1961ishdiqb28995hw1nln1d1b5ji"; + sha256 = "0grps9197qyxakbpw02pda59v45lfgbgiyw48i0mq9f2bn9y6mrz"; type = "gem"; }; - version = "2.3.0"; + version = "2.3.2"; }; selenium-webdriver = { dependencies = ["childprocess" "rubyzip"]; @@ -892,10 +892,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i3rs4kcj0jba8idxla3s6xd1xfln3k8b4cb1dik2lda3ifnp3dh"; + sha256 = "0a3bwxd9v3ghrxzjc4vxmf4xa18c6m4xqy5wb0yk5c6b9psc7052"; type = "gem"; }; - version = "0.7.3"; + version = "0.7.5"; }; websocket-extensions = { groups = ["default"]; diff --git a/third_party/nixpkgs/pkgs/applications/video/ccextractor/default.nix b/third_party/nixpkgs/pkgs/applications/video/ccextractor/default.nix index 1f15e87c73..5bb13e1161 100644 --- a/third_party/nixpkgs/pkgs/applications/video/ccextractor/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/ccextractor/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "ccextractor"; - version = "0.92"; + version = "0.93"; src = fetchFromGitHub { owner = "CCExtractor"; repo = pname; rev = "v${version}"; - sha256 = "sha256-cEC0SF69CDLKQyTPIOZYPgxNR29mJVnzOZraGvPQjdg="; + sha256 = "sha256-usVAKBkdd8uz9cD5eLd0hnwGonOJLscRdc+iWDlNXVc="; }; sourceRoot = "source/src"; diff --git a/third_party/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix b/third_party/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix index 8557c47ad7..0f271dd889 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix @@ -1,6 +1,5 @@ { lib , stdenv -, mkDerivation , fetchFromGitLab , pkg-config , autoreconfHook @@ -46,15 +45,15 @@ let ''; in -mkDerivation rec { +stdenv.mkDerivation rec { pname = "mkvtoolnix"; - version = "59.0.0"; + version = "60.0.0"; src = fetchFromGitLab { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - sha256 = "sha256-bPypOsveXrkz1V961b9GTJKFdgru/kcW15z/yik/4yQ="; + sha256 = "sha256-WtEC/EH0G1Tm6OK6hmVRzloLkO8mxxOYYZY7k/Wi2zE="; }; nativeBuildInputs = [ @@ -123,6 +122,11 @@ mkDerivation rec { dontWrapQtApps = true; + # Avoid Qt 5.12 problem on Big Sur: https://bugreports.qt.io/browse/QTBUG-87014 + qtWrapperArgs = lib.optionals stdenv.isDarwin [ + "--set QT_MAC_WANTS_LAYER 1" + ]; + postFixup = optionalString withGUI '' wrapQtApp $out/bin/mkvtoolnix-gui ''; @@ -132,7 +136,6 @@ mkDerivation rec { homepage = "https://mkvtoolnix.download/"; license = licenses.gpl2Only; maintainers = with maintainers; [ codyopel rnhmjoj ]; - platforms = platforms.linux - ++ optionals (!withGUI) platforms.darwin; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/applications/video/plex-mpv-shim/default.nix b/third_party/nixpkgs/pkgs/applications/video/plex-mpv-shim/default.nix index d1b88da37f..b82b7fd243 100644 --- a/third_party/nixpkgs/pkgs/applications/video/plex-mpv-shim/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/plex-mpv-shim/default.nix @@ -2,13 +2,13 @@ buildPythonApplication rec { pname = "plex-mpv-shim"; - version = "1.10.0"; + version = "1.10.1"; src = fetchFromGitHub { owner = "iwalton3"; repo = pname; rev = "v${version}"; - sha256 = "18bd2nvlwzkmadimlkh7rs8rnp0ppfx1dzkxb11dq84pdpbl25pc"; + sha256 = "1ql7idkm916f1wlkqxqmq1i2pc94gbgq6pvb8szhb21icyy5d1y0"; }; propagatedBuildInputs = [ mpv requests python-mpv-jsonipc ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/tartube/default.nix b/third_party/nixpkgs/pkgs/applications/video/tartube/default.nix index 69f777541a..74ce4446a1 100644 --- a/third_party/nixpkgs/pkgs/applications/video/tartube/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/tartube/default.nix @@ -15,13 +15,13 @@ python3Packages.buildPythonApplication rec { pname = "tartube"; - version = "2.3.110"; + version = "2.3.332"; src = fetchFromGitHub { owner = "axcore"; repo = "tartube"; rev = "v${version}"; - sha256 = "0sdbd2lsc4bvgkwi55arjwbzwmq05abfmv6vsrvz4gsdv8s8wha5"; + sha256 = "1m7p4chpvbh4mswsymh89dksdgwhmnkpfbx9zi2jzqgkinfd6a2k"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/video/xplayer/default.nix b/third_party/nixpkgs/pkgs/applications/video/xplayer/default.nix index d3f87f879c..a4b03e9150 100644 --- a/third_party/nixpkgs/pkgs/applications/video/xplayer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/xplayer/default.nix @@ -34,13 +34,13 @@ in stdenv.mkDerivation rec { pname = "xplayer"; - version = "2.4.0"; + version = "2.4.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "1xcv6nr2gc0vji5afwy283v7bgx46kzgrq79hl8q9pz995qq2kbp"; + sha256 = "sha256-qoBJKY0CZyhp9foUehq5hInEENRGZuy1D6jAMjbjYhA="; }; # configure wants to find gst-inspect-1.0 via pkgconfig but diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/containerd/1.4.nix b/third_party/nixpkgs/pkgs/applications/virtualization/containerd/1.4.nix new file mode 100644 index 0000000000..e4f743013b --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/virtualization/containerd/1.4.nix @@ -0,0 +1,53 @@ +{ lib +, fetchFromGitHub +, buildGoPackage +, btrfs-progs +, go-md2man +, installShellFiles +, util-linux +, nixosTests +}: + +buildGoPackage rec { + pname = "containerd"; + version = "1.4.9"; + + src = fetchFromGitHub { + owner = "containerd"; + repo = "containerd"; + rev = "v${version}"; + sha256 = "1ykikks6ihgg899ibk9m9m0hqrbss0cx7l7z4yjb873b10bacj52"; + }; + + goPackagePath = "github.com/containerd/containerd"; + outputs = [ "out" "man" ]; + + nativeBuildInputs = [ go-md2man installShellFiles util-linux ]; + + buildInputs = [ btrfs-progs ]; + + buildFlags = [ "VERSION=v${version}" "REVISION=${src.rev}" ]; + + buildPhase = '' + cd go/src/${goPackagePath} + patchShebangs . + make binaries man $buildFlags + ''; + + installPhase = '' + install -Dm555 bin/* -t $out/bin + installManPage man/*.[1-9] + installShellCompletion --bash contrib/autocomplete/ctr + installShellCompletion --zsh --name _ctr contrib/autocomplete/zsh_autocomplete + ''; + + passthru.tests = { inherit (nixosTests) docker; }; + + meta = with lib; { + homepage = "https://containerd.io/"; + description = "A daemon to control runC"; + license = licenses.asl20; + maintainers = with maintainers; [ ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/docker/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/docker/default.nix index ec358507c2..a1821aa2a3 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/docker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/docker/default.nix @@ -12,7 +12,7 @@ rec { # package dependencies , stdenv, fetchFromGitHub, buildGoPackage , makeWrapper, installShellFiles, pkg-config, glibc - , go-md2man, go, containerd, runc, docker-proxy, tini, libtool + , go-md2man, go, containerd_1_4, runc, docker-proxy, tini, libtool , sqlite, iproute2, lvm2, systemd, docker-buildx , btrfs-progs, iptables, e2fsprogs, xz, util-linux, xfsprogs, git , procps, libseccomp @@ -33,7 +33,7 @@ rec { patches = []; }); - docker-containerd = containerd.overrideAttrs (oldAttrs: { + docker-containerd = containerd_1_4.overrideAttrs (oldAttrs: { name = "docker-containerd-${version}"; inherit version; src = fetchFromGitHub { @@ -210,7 +210,7 @@ rec { homepage = "https://www.docker.com/"; description = "An open source project to pack, ship and run any application as a lightweight container"; license = licenses.asl20; - maintainers = with maintainers; [ offline tailhook vdemeester periklis mikroskeem ]; + maintainers = with maintainers; [ offline tailhook vdemeester periklis mikroskeem maxeaubrey ]; platforms = with platforms; linux ++ darwin; }; @@ -221,20 +221,20 @@ rec { # Get revisions from # https://github.com/moby/moby/tree/${version}/hack/dockerfile/install/* docker_20_10 = callPackage dockerGen rec { - version = "20.10.7"; + version = "20.10.8"; rev = "v${version}"; - sha256 = "1r854jrjph4v1n5lr82z0cl0241ycili4qr3qh3k3bmqx790cds3"; + sha256 = "sha256-betZIAH4mFpb/OywWyixCjVmy5EGTrg+WbxDXkVRrsI="; moby-src = fetchFromGitHub { owner = "moby"; repo = "moby"; rev = "v${version}"; - sha256 = "0xhn11kgcbzda4z9j0rflvq0nfivizh3jrzhanwn5vnghafy4zqw"; + sha256 = "1pjjdwzad2z337zwby88w5zwl71ch4lcwbw0sy8slvyjv387jjlm"; }; - runcRev = "b9ee9c6314599f1b4a7f497e1f1f856fe433d3b7"; # v1.0.0-rc95 - runcSha256 = "18sbvmlvb6kird4w3rqsfrjdj7n25firabvdxsl0rxjfy9r1g2xb"; - containerdRev = "12dca9790f4cb6b18a6a7a027ce420145cb98ee7"; # v1.5.1 - containerdSha256 = "16q34yiv5q98b9d5vgy1lmmppg8agrmnfd1kzpakkf4czkws0p4d"; - tiniRev = "de40ad007797e0dcd8b7126f27bb87401d224240"; # v0.19.0 + runcRev = "v1.0.1"; # v1.0.1 + runcSha256 = "1zfa1zr8i9n1915nyv7hyaj7q27cy7fiihk9rr1377ayaqg3mpn5"; + containerdRev = "v1.4.9"; # v1.4.9 + containerdSha256 = "1ykikks6ihgg899ibk9m9m0hqrbss0cx7l7z4yjb873b10bacj52"; + tiniRev = "v0.19.0"; # v0.19.0 tiniSha256 = "1h20i3wwlbd8x4jr2gz68hgklh0lb0jj7y5xk1wvr8y58fip1rdn"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/singularity/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/singularity/default.nix index bf3285a78e..e1f1583d03 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/singularity/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/singularity/default.nix @@ -15,11 +15,11 @@ with lib; buildGoPackage rec { pname = "singularity"; - version = "3.8.0"; + version = "3.8.1"; src = fetchurl { url = "https://github.com/hpcng/singularity/releases/download/v${version}/singularity-${version}.tar.gz"; - sha256 = "sha256-6WCLDgqMgFIYu+eV6RdkhIN7L3/LleVGm4U7OAmiQS4="; + sha256 = "sha256-Jkg2b7x+j8up0y+PGH6hSTVsX5CDpXgm1kE1n6hBXZo="; }; goPackagePath = "github.com/sylabs/singularity"; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/x11docker/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/x11docker/default.nix index ea3b87b47e..c7ae948284 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/x11docker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/x11docker/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchFromGitHub, makeWrapper, nx-libs, xorg, getopt, gnugrep, gawk, ps, mount, iproute2 }: stdenv.mkDerivation rec { pname = "x11docker"; - version = "6.6.2"; + version = "6.9.0"; src = fetchFromGitHub { owner = "mviereck"; repo = "x11docker"; rev = "v${version}"; - sha256 = "1skdgr2hipd7yx9c7r7nr3914gm9cm1xj6h3qdsa9f92xxm3aml1"; + sha256 = "sha256-O+lab3K7J2Zz9t+yB/kYWtBOvQGOQMDFNDUVXzTj/h4="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/i3/wmfocus.nix b/third_party/nixpkgs/pkgs/applications/window-managers/i3/wmfocus.nix index 7033e57304..6756afb4a5 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/i3/wmfocus.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/i3/wmfocus.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "wmfocus"; - version = "1.1.5"; + version = "1.2.0"; src = fetchFromGitHub { owner = "svenstaro"; repo = pname; rev = "v${version}"; - sha256 = "09xffklpz62h6yiksxdlv3a9s1z0wr3ax9syl399avwdmq3c0y49"; + sha256 = "sha256-fZbsKu7C+rqggaFVSDNIGDAgn23M7mi+1jhV85s1Co8="; }; - cargoSha256 = "0fmz3q3yadymbqnkdhjd2z2g4zgf3z81ccixwywndd9zb7p47zdr"; + cargoSha256 = "sha256-ejzVJdtOXBPe+14g4aJFBMCvXkmNia9dNAk/BVQ2ZSQ="; nativeBuildInputs = [ python3 pkg-config ]; buildInputs = [ cairo libxkbcommon xorg.xcbutilkeysyms ]; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wrapper.nix b/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wrapper.nix index 6229289854..e972929237 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wrapper.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wrapper.nix @@ -1,4 +1,4 @@ -{ runCommandNoCC, lib, makeWrapper, wayfirePlugins }: +{ runCommand, lib, makeWrapper, wayfirePlugins }: let inherit (lib) escapeShellArg makeBinPath; @@ -17,7 +17,7 @@ let plugins = choosePlugins wayfirePlugins; in -runCommandNoCC "${application.name}-wrapped" { +runCommand "${application.name}-wrapped" { nativeBuildInputs = [ makeWrapper ]; passthru = application.passthru // { diff --git a/third_party/nixpkgs/pkgs/build-support/agda/default.nix b/third_party/nixpkgs/pkgs/build-support/agda/default.nix index 44d5ebb9f5..99cc125902 100644 --- a/third_party/nixpkgs/pkgs/build-support/agda/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/agda/default.nix @@ -1,6 +1,6 @@ # Builder for Agda packages. -{ stdenv, lib, self, Agda, runCommandNoCC, makeWrapper, writeText, ghcWithPackages, nixosTests }: +{ stdenv, lib, self, Agda, runCommand, makeWrapper, writeText, ghcWithPackages, nixosTests }: with lib.strings; @@ -15,7 +15,7 @@ let ''; pname = "agdaWithPackages"; version = Agda.version; - in runCommandNoCC "${pname}-${version}" { + in runCommand "${pname}-${version}" { inherit pname version; nativeBuildInputs = [ makeWrapper ]; passthru = { diff --git a/third_party/nixpkgs/pkgs/build-support/coq/default.nix b/third_party/nixpkgs/pkgs/build-support/coq/default.nix index ba300f2f8c..5f2b5e646b 100644 --- a/third_party/nixpkgs/pkgs/build-support/coq/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/coq/default.nix @@ -27,6 +27,7 @@ in dropDerivationAttrs ? [], useDune2ifVersion ? (x: false), useDune2 ? false, + opam-name ? "coq-${pname}", ... }@args: let @@ -34,7 +35,7 @@ let "version" "fetcher" "repo" "owner" "domain" "releaseRev" "displayVersion" "defaultVersion" "useMelquiondRemake" "release" "extraBuildInputs" "extraPropagatedBuildInputs" "namePrefix" - "meta" "useDune2ifVersion" "useDune2" + "meta" "useDune2ifVersion" "useDune2" "opam-name" "extraInstallFlags" "setCOQBIN" "mlPlugin" "dropAttrs" "dropDerivationAttrs" "keepAttrs" ] ++ dropAttrs) keepAttrs; fetch = import ../coq/meta-fetch/default.nix @@ -90,9 +91,14 @@ stdenv.mkDerivation (removeAttrs ({ extraInstallFlags; }) // (optionalAttrs useDune2 { + buildPhase = '' + runHook preBuild + dune build -p ${opam-name} ''${enableParallelBuilding:+-j $NIX_BUILD_CORES} + runHook postBuild + ''; installPhase = '' runHook preInstall - dune install --prefix=$out + dune install ${opam-name} --prefix=$out mv $out/lib/coq $out/lib/TEMPORARY mkdir $out/lib/coq/ mv $out/lib/TEMPORARY $out/lib/coq/${coq.coq-version} diff --git a/third_party/nixpkgs/pkgs/build-support/docker/examples.nix b/third_party/nixpkgs/pkgs/build-support/docker/examples.nix index f890d0a77a..c66aca56fe 100644 --- a/third_party/nixpkgs/pkgs/build-support/docker/examples.nix +++ b/third_party/nixpkgs/pkgs/build-support/docker/examples.nix @@ -463,7 +463,7 @@ rec { layeredStoreSymlink = let target = pkgs.writeTextDir "dir/target" "Content doesn't matter."; - symlink = pkgs.runCommandNoCC "symlink" {} "ln -s ${target} $out"; + symlink = pkgs.runCommand "symlink" {} "ln -s ${target} $out"; in pkgs.dockerTools.buildLayeredImage { name = "layeredstoresymlink"; diff --git a/third_party/nixpkgs/pkgs/build-support/fetchzip/default.nix b/third_party/nixpkgs/pkgs/build-support/fetchzip/default.nix index cde4d4f579..b174c252fc 100644 --- a/third_party/nixpkgs/pkgs/build-support/fetchzip/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/fetchzip/default.nix @@ -13,10 +13,17 @@ , urls ? [] , extraPostFetch ? "" , name ? "source" +, # Allows to set the extension for the intermediate downloaded + # file. This can be used as a hint for the unpackCmdHooks to select + # an appropriate unpacking tool. + extension ? null , ... } @ args: (fetchurl (let - basename = baseNameOf (if url != "" then url else builtins.head urls); + tmpFilename = + if extension != null + then "download.${extension}" + else baseNameOf (if url != "" then url else builtins.head urls); in { inherit name; @@ -30,7 +37,7 @@ in { mkdir "$unpackDir" cd "$unpackDir" - renamed="$TMPDIR/${basename}" + renamed="$TMPDIR/${tmpFilename}" mv "$downloadedFile" "$renamed" unpackFile "$renamed" '' @@ -56,7 +63,7 @@ in { + '' chmod 755 "$out" ''; -} // removeAttrs args [ "stripRoot" "extraPostFetch" ])).overrideAttrs (x: { +} // removeAttrs args [ "stripRoot" "extraPostFetch" "extension" ])).overrideAttrs (x: { # Hackety-hack: we actually need unzip hooks, too nativeBuildInputs = x.nativeBuildInputs ++ [ unzip ]; }) diff --git a/third_party/nixpkgs/pkgs/build-support/nuget-to-nix/default.nix b/third_party/nixpkgs/pkgs/build-support/nuget-to-nix/default.nix new file mode 100644 index 0000000000..a5fc4e209c --- /dev/null +++ b/third_party/nixpkgs/pkgs/build-support/nuget-to-nix/default.nix @@ -0,0 +1,5 @@ +{ runCommand }: + +runCommand "nuget-to-nix" { preferLocalBuild = true; } '' + install -D -m755 ${./nuget-to-nix.sh} $out/bin/nuget-to-nix +'' diff --git a/third_party/nixpkgs/pkgs/build-support/nuget-to-nix/nuget-to-nix.sh b/third_party/nixpkgs/pkgs/build-support/nuget-to-nix/nuget-to-nix.sh new file mode 100755 index 0000000000..c14844bec5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/build-support/nuget-to-nix/nuget-to-nix.sh @@ -0,0 +1,23 @@ +#!/usr/bin/env bash + +set -euo pipefail + +if [ $# -eq 0 ]; then + >&2 echo "Usage: $0 [packages directory] > deps.nix" + exit 1 +fi + +pkgs=$1 + +echo "{ fetchNuGet }: [" + +while read pkg_spec; do + { read pkg_name; read pkg_version; } < <( + # Build version part should be ignored: `3.0.0-beta2.20059.3+77df2220` -> `3.0.0-beta2.20059.3` + sed -nE 's/.*([^<]*).*/\1/p; s/.*([^<+]*).*/\1/p' "$pkg_spec") + pkg_sha256="$(nix-hash --type sha256 --flat --base32 "$(dirname "$pkg_spec")"/*.nupkg)" + + echo " (fetchNuGet { name = \"$pkg_name\"; version = \"$pkg_version\"; sha256 = \"$pkg_sha256\"; })" +done < <(find $1 -name '*.nuspec' | sort) + +echo "]" diff --git a/third_party/nixpkgs/pkgs/build-support/rust/default-crate-overrides.nix b/third_party/nixpkgs/pkgs/build-support/rust/default-crate-overrides.nix index 61cec2a6ab..eb58f72f55 100644 --- a/third_party/nixpkgs/pkgs/build-support/rust/default-crate-overrides.nix +++ b/third_party/nixpkgs/pkgs/build-support/rust/default-crate-overrides.nix @@ -1,7 +1,7 @@ { lib, stdenv, pkg-config, curl, darwin, libiconv, libgit2, libssh2, openssl, sqlite, zlib, dbus, dbus-glib, gdk-pixbuf, cairo, python3, libsodium, postgresql, gmp, foundationdb, capnproto, nettle, clang, - llvmPackages, ... }: + llvmPackages, linux-pam, ... }: let inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; @@ -104,6 +104,10 @@ in buildInputs = [ openssl ]; }; + pam-sys = attr: { + buildInputs = [ linux-pam ]; + }; + pq-sys = attr: { nativeBuildInputs = [ pkg-config ]; buildInputs = [ postgresql ]; diff --git a/third_party/nixpkgs/pkgs/build-support/rust/default.nix b/third_party/nixpkgs/pkgs/build-support/rust/default.nix index be983af1c1..58b91b88e8 100644 --- a/third_party/nixpkgs/pkgs/build-support/rust/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/rust/default.nix @@ -8,7 +8,6 @@ , cargoSetupHook , fetchCargoTarball , importCargoLock -, runCommandNoCC , rustPlatform , callPackage , remarshal diff --git a/third_party/nixpkgs/pkgs/build-support/skaware/build-skaware-man-pages.nix b/third_party/nixpkgs/pkgs/build-support/skaware/build-skaware-man-pages.nix new file mode 100644 index 0000000000..a1f3977c0d --- /dev/null +++ b/third_party/nixpkgs/pkgs/build-support/skaware/build-skaware-man-pages.nix @@ -0,0 +1,51 @@ +{ lib, stdenv, fetchFromGitHub }: + +{ + # : string + pname + # : string +, version + # : string +, sha256 + # : list (int | string) +, sections + # : string +, description + # : list Maintainer +, maintainers + # : license +, license ? lib.licenses.isc + # : string +, owner ? "flexibeast" + # : string +, rev ? "v${version}" +}: + +let + manDir = "${placeholder "out"}/share/man"; + + src = fetchFromGitHub { + inherit owner rev sha256; + repo = pname; + }; +in + +stdenv.mkDerivation { + inherit pname version src; + + makeFlags = [ + "MANPATH=${manDir}" + ]; + + dontBuild = true; + + preInstall = lib.concatMapStringsSep "\n" + (section: "mkdir -p \"${manDir}/man${builtins.toString section}\"") + sections; + + meta = with lib; { + inherit description license maintainers; + inherit (src.meta) homepage; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/build-support/trivial-builders.nix b/third_party/nixpkgs/pkgs/build-support/trivial-builders.nix index 6f51ba512c..f06d2136b8 100644 --- a/third_party/nixpkgs/pkgs/build-support/trivial-builders.nix +++ b/third_party/nixpkgs/pkgs/build-support/trivial-builders.nix @@ -24,16 +24,13 @@ rec { * `allowSubstitutes = false;` * to a derivation’s attributes. */ - runCommand = runCommandNoCC; - runCommandLocal = runCommandNoCCLocal; - - runCommandNoCC = name: env: runCommandWith { + runCommand = name: env: runCommandWith { stdenv = stdenvNoCC; runLocal = false; inherit name; derivationArgs = env; }; - runCommandNoCCLocal = name: env: runCommandWith { + runCommandLocal = name: env: runCommandWith { stdenv = stdenvNoCC; runLocal = true; inherit name; @@ -616,7 +613,7 @@ rec { command ? "${package.meta.mainProgram or package.pname or package.name} --version", version ? package.version, }: runCommand "test-version" { nativeBuildInputs = [ package ]; meta.timeout = 60; } '' - ${command} | grep -Fw ${version} + ${command} |& grep -Fw ${version} touch $out ''; } diff --git a/third_party/nixpkgs/pkgs/data/documentation/execline-man-pages/default.nix b/third_party/nixpkgs/pkgs/data/documentation/execline-man-pages/default.nix new file mode 100644 index 0000000000..9e325b7974 --- /dev/null +++ b/third_party/nixpkgs/pkgs/data/documentation/execline-man-pages/default.nix @@ -0,0 +1,10 @@ +{ lib, buildManPages }: + +buildManPages { + pname = "execline-man-pages"; + version = "2.8.0.1.1"; + sha256 = "0xv9v39na1qnd8cm4v7xb8wa4ap3djq20iws0lrqz7vn1w40i8b4"; + description = "Port of the documentation for the execline suite to mdoc"; + sections = [ 1 7 ]; + maintainers = [ lib.maintainers.sternenseemann ]; +} diff --git a/third_party/nixpkgs/pkgs/data/documentation/s6-man-pages/default.nix b/third_party/nixpkgs/pkgs/data/documentation/s6-man-pages/default.nix new file mode 100644 index 0000000000..78e3d1a3b8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/data/documentation/s6-man-pages/default.nix @@ -0,0 +1,10 @@ +{ lib, buildManPages }: + +buildManPages { + pname = "s6-man-pages"; + version = "2.10.0.3.1"; + sha256 = "0q9b6v7kbyjsh390s4bw80kjdp92kih609vlmnpl1qzyrr6kivsg"; + description = "Port of the documentation for the s6 supervision suite to mdoc"; + sections = [ 1 7 ]; + maintainers = [ lib.maintainers.sternenseemann ]; +} diff --git a/third_party/nixpkgs/pkgs/data/documentation/s6-networking-man-pages/default.nix b/third_party/nixpkgs/pkgs/data/documentation/s6-networking-man-pages/default.nix new file mode 100644 index 0000000000..4177b502b5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/data/documentation/s6-networking-man-pages/default.nix @@ -0,0 +1,10 @@ +{ lib, buildManPages }: + +buildManPages { + pname = "s6-networking-man-pages"; + version = "2.4.1.1.1"; + sha256 = "1qrqzm2r4rxf8hglz8k4laknjqcx1y0z1kjf636z91w1077qg0pn"; + description = "Port of the documentation for the s6-networking suite to mdoc"; + sections = [ 1 7 ]; + maintainers = [ lib.maintainers.sternenseemann ]; +} diff --git a/third_party/nixpkgs/pkgs/data/fonts/iosevka/bin.nix b/third_party/nixpkgs/pkgs/data/fonts/iosevka/bin.nix index 860a7a8004..cd12033b50 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/iosevka/bin.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/iosevka/bin.nix @@ -10,7 +10,7 @@ let (builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ])); in stdenv.mkDerivation rec { pname = "${name}-bin"; - version = "9.0.1"; + version = "10.0.0"; src = fetchurl { url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/iosevka/variants.nix b/third_party/nixpkgs/pkgs/data/fonts/iosevka/variants.nix index f4847b482f..ce96f18337 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/iosevka/variants.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/iosevka/variants.nix @@ -1,95 +1,95 @@ # This file was autogenerated. DO NOT EDIT! { - iosevka = "051yyvdhb8an7v5qsv9fd70z3dqrvg1y67mr0xf4wsbfpxpd10zh"; - iosevka-aile = "1f7yvybfgf1in9b0w1zqzbcla7brzdx7hh00nk7mjbpl943qjcls"; - iosevka-curly = "0bf294ccnp2ppzqr9xs142pgkch7vvh2p9s4dh2xmilrzrqi1qmr"; - iosevka-curly-slab = "0ga30kwxd6984db4wfqzxfh6frqj3lp7745m4iqknx874p80gg3n"; - iosevka-etoile = "11xxq6c8ppcr2y3wdzk2hklml32ga29vxw1qdmsbnj9pqykm0ik6"; - iosevka-slab = "1b88f6y39d9qfpmv5lkrwnpkn5b6khj6nc2isbc49fprr7i5ycqf"; - iosevka-ss01 = "1q0l0bi19bsq76y485l6mz9nl3bs2jqkyk6ny7z77kzdz3azipg9"; - iosevka-ss02 = "1d44anwkmvvmw3z48w4p1n8pz7w0b7vwng3r087cmad8xhq1hcr1"; - iosevka-ss03 = "1wihzc299f3ybw4c52xxmv2my129qbwmpr5n8z0rx939h951f9m3"; - iosevka-ss04 = "1xzp2bkwl70c3524n7ajvjlb3zpgz35qrjbfhfr6hp42n8gj1ygx"; - iosevka-ss05 = "17y8ham2dpa8yl3x393vic550f11bcjbgqlqdhpikwgb30012znw"; - iosevka-ss06 = "0bb870gxv4f1jx1mc3znk7nh6cqjywx27y1w36brzp44lg20cjkp"; - iosevka-ss07 = "12rh1a2499dr4bbmrq79b9qrf4a27ib5l8yvk817kig0dz8fvr7h"; - iosevka-ss08 = "1bf307b0qr657jy73gq4y1wk3fwwzhpqyvcyhwl8ayanml99yiz8"; - iosevka-ss09 = "1ydr6bjymsbpkplnxkav5v8ghnadrcghjz34gj6xb8lgk1kx5d1n"; - iosevka-ss10 = "0429lnsc3vg1vlr0yxpah7j7bm352ys0yhl9vclqabbmkxjr9fjz"; - iosevka-ss11 = "0ibqd20l3aalf72cia4k7z6a20sdaflb9kdiz90h5g769x0yc10a"; - iosevka-ss12 = "1sjgk4nfgis4qbdyj9lfa7piwdixirx92769xmdgh8b0wwg1vhyq"; - iosevka-ss13 = "0sgrxgss14ar104hc12zfim1pjs9nishmf4w8pyl0yjnxdmap9qq"; - iosevka-ss14 = "176a3y0sk7fw93g8c7gwxsmiid3237k2mlff3qbm1nvcyxqnsxbi"; - iosevka-ss15 = "1cb2g5aqxjbisyvy729sk70b169rvxcb0414nhrwa3jgcr807i31"; - iosevka-ss16 = "12x58vdjchfyp0gak7r5wqfv1bc9scr0d76kmibscyrlc8ml50n0"; - iosevka-ss17 = "1wh5vcch2wlbw9cg44lz8ic8d24r228p7kqjr11sapkcmaxd3dyk"; - iosevka-ss18 = "1vzjad7r8h9k0qb744vbpqcm2l16s52sz53s1pq1jnqkhd3vmhx4"; - sgr-iosevka = "1cd5na66986rjygvkq4b1nlk0f449z5dlz47wlifmqa503faqydd"; - sgr-iosevka-aile = "1735ircj24xv8aajs6plfj9zfmvzjzhswwswjs8ccqc66dlgk47l"; - sgr-iosevka-curly = "1jh9shgqldpqqmpapapagqsqlg3w3gldics9zabwnzbd6g9af8zx"; - sgr-iosevka-curly-slab = "1cyn19c2wvh4mlpgc5zvizcxxlvz1x21ag73hcmn931czlcbxy74"; - sgr-iosevka-etoile = "0kb7bfpj9cdbqmc9xbyq0hnw5sm66811sn330a7z0ypis6l0w2hi"; - sgr-iosevka-fixed = "0lcdzlar9jgxqakb0j6ppwwdkyd4d8ih9dvav56frryikhdxyjxq"; - sgr-iosevka-fixed-curly = "1rvb1yk1yy407pp4bp71zj60xyixxsji3igla8acwxhwv7rd5l66"; - sgr-iosevka-fixed-curly-slab = "0kaifwrvy380i44p4v5h2cm9bpkdfkgdk961igc8v73yahlffyla"; - sgr-iosevka-fixed-slab = "0nla5hma45ys56df9p2f0wr2zc2bg8448bdxif8ssybzm3mpgyqx"; - sgr-iosevka-fixed-ss01 = "13g13jwdis724l1c9y7xbbvg9vik52pwfz4qvzmnxhj4wfvph0zy"; - sgr-iosevka-fixed-ss02 = "08xwpi9nf4vcr3s6nq87sxsihrwdfn7325gdjbfp1pivy7r1bfzm"; - sgr-iosevka-fixed-ss03 = "1gc6xhh388sdpqi1rdhr2kyq5j7z57vgn34fvfavs9l7m8qi5fa9"; - sgr-iosevka-fixed-ss04 = "1bkbfqxkc2z0yvd5kcd5ldva4miz7bc2p29ld46cgb0c21k5wjf7"; - sgr-iosevka-fixed-ss05 = "15bws3g53jzd15mhkj5dnkqqd5jqsq9ci9aiqvdd0q1vdcin28jk"; - sgr-iosevka-fixed-ss06 = "098zqg3vdlkmfaq3aqp3il9im45dvpf3kxf8fqm0x110566vbgsm"; - sgr-iosevka-fixed-ss07 = "0ba135blpvwwm07fp96lzi3c0wj6f3fglp5g0fivrblgy55qz0zg"; - sgr-iosevka-fixed-ss08 = "0894yd8l1f9iymi27kv6wqp8c6s2hqvn60c860xp544vzm2w8xvc"; - sgr-iosevka-fixed-ss09 = "133hw6xn4nx53s5hnlsx75c740w39kdfa04azidk2ar7sln4m1yr"; - sgr-iosevka-fixed-ss10 = "0rlkjp9scawvii23fs9d5pcayarkrnl3pvr4naan2pc0cvcpl83f"; - sgr-iosevka-fixed-ss11 = "07klrb1frrzwi10fc58ws8sykzjja1nnmifrl69489g23nm1dc19"; - sgr-iosevka-fixed-ss12 = "0c22nc9pdmc0024im6xw6ims39qkd9zjd5kc0ndw4pq167w011pg"; - sgr-iosevka-fixed-ss13 = "0lqa9q7y0hl1jwvhv5p7kbm03xgc1xba6ylhpg4yw2gsi2hkmw31"; - sgr-iosevka-fixed-ss14 = "0i0jd33m0dwpyj1wylfa0pqay3qhlipxrlpshgrdjfq0kl8zik9l"; - sgr-iosevka-fixed-ss15 = "0mp3qdd9042i4w2p9c2qrbzhw2rkdw49qcmmxhi0kl8nllfv9lpq"; - sgr-iosevka-fixed-ss16 = "0c15z9m9kbb62d2kpmvsgxqpvcv1yhxwi70cln5s27w4i0nxggkj"; - sgr-iosevka-fixed-ss17 = "17rdqagp7gxyyc2w0q0mjnbwd99v06750vb2ldcwcrq8pghyzr3v"; - sgr-iosevka-fixed-ss18 = "0ghzg6p2ds3rs6nk484gssai9435k2p648l8070v1wj07llki4np"; - sgr-iosevka-slab = "1ndnfnap3pkxfzw2sci7ds49fs2y43ck47xiww616kr8bj8xx852"; - sgr-iosevka-ss01 = "1fvz4zhq4d3cv02y82pjrlmyvq8skvfp5l98walf62yjq2kqaak6"; - sgr-iosevka-ss02 = "0xd67vvi07l8xfjq4pgz6n4xjslp60gdkh5hf9clc7z4y1q9649w"; - sgr-iosevka-ss03 = "17nchy0izlpsi7vaqp9h3nffy0r4f3qh5gvsbxfrl0z5i23sfvif"; - sgr-iosevka-ss04 = "0hpnfci9ddqxzylpl219bv4d9nbbcv5hiknddmdlrdry2ybz7yy3"; - sgr-iosevka-ss05 = "1am0aqzzaqsajs8bk57rnc7r6j3qip6fcgqp4f3i3j6kfvmlvf3l"; - sgr-iosevka-ss06 = "1jwmgxnhj7jninjzkn1vh557lcxxbpq6m6c0qh2wrlqan005q0xw"; - sgr-iosevka-ss07 = "1ls5gbi4789fci20rsf1b4clqj703jzy5ffs78pl5rbxjfxgraqn"; - sgr-iosevka-ss08 = "0c6ksaapnl21dnbmizihbgvkzqcww2bgfxm51sz3a0difgcwn9na"; - sgr-iosevka-ss09 = "1ibpqi67f7rhg1jcpiy28cd4k4wrk542kd84ad10i64jb47lhwqq"; - sgr-iosevka-ss10 = "13wq32l0gxc53hdbj3i8j1zkfm82g8a01xjpmh68hcllpmgr4yvd"; - sgr-iosevka-ss11 = "1mbq0cykvybl487fzp79glbwsiwq1z4xk96992pqbv106nsqh9z9"; - sgr-iosevka-ss12 = "1rggnmmgp33dpvbvlxkkvhlqx9arbwx3nrsxml9vjvf2c7875f3r"; - sgr-iosevka-ss13 = "1nwqlqpqlvkq5h2l3kh04r8jadr4ar4n1w98hv1rd2pmhlh6izq8"; - sgr-iosevka-ss14 = "1b3hlhy1lk8wi7ny9rkbb6my8sbc7k4ypc8hn62sc6a4spvfs14q"; - sgr-iosevka-ss15 = "10b7rgff1jn4j3szrykljklisbmfs4lajii1h2lyx8vbwx1rahbp"; - sgr-iosevka-ss16 = "0p4in5lwa3694lgz745fxsp85aypwgck6m7zgmc2dkjvvrhxxhm2"; - sgr-iosevka-ss17 = "0j7088wnf2rvm0iad1kkkm3pryr2c4rh643mrllzr71dpbzvvxqn"; - sgr-iosevka-ss18 = "1v8jrvjkakc2qks9yjwgg3b28gpgqv42d6k091a4nb8yn8ni7z1m"; - sgr-iosevka-term = "1kwxp9a7ld9xvgf7zhims66yihlz03q6vmzz782xwx5j6rrrvh28"; - sgr-iosevka-term-curly = "00ahf2lfrzpdplrjdgsjxfsfp40i5p79plxz7rz0dsvj6w3xivsg"; - sgr-iosevka-term-curly-slab = "0vyya2p7c89ig2qmgsai45baj69hd5l9jfabnbz7bq78s0a7al9w"; - sgr-iosevka-term-slab = "1fd2h5cnfla140fq8ydwygn156lyy3dyplkhmqvq8i1shgkj5z8i"; - sgr-iosevka-term-ss01 = "0x19yg4w8v1i9r5l5n6azn8kqw89dmj9nv2gsxn3s603fd22yna5"; - sgr-iosevka-term-ss02 = "19c5jz2an9azb1cgx9a9zhv976g3paklcyl8x7a5j9r2lxga75fm"; - sgr-iosevka-term-ss03 = "0718n4x0q08v1m5sk498aw787i1m6fzrp93nqhlql61ym3l9bqvm"; - sgr-iosevka-term-ss04 = "139614513mn6g3rs4dzp0wkdmwiv797w157xg66vcaxp03s2syl3"; - sgr-iosevka-term-ss05 = "094zly2a5y36n152q8bgf00n9pad9qsbb2pniwh1hc3n5ydx9zgj"; - sgr-iosevka-term-ss06 = "1z339061q3c8rj6j35y28qacpf630fd5xjam0lqi0vzxa6dx2x64"; - sgr-iosevka-term-ss07 = "0g15gbihafa30sv2xysr96b99wxq7dfib5h72vfjhp8hrg5p92kc"; - sgr-iosevka-term-ss08 = "17jyx4qb04s66klcw0zmnh55rdkskaifahd0v2xpf9gj5z0zbqvk"; - sgr-iosevka-term-ss09 = "17i9wghxij2vn071hwj1zsn5pw0vgmgb7qay0fy5i6s87pjsnyi4"; - sgr-iosevka-term-ss10 = "0kgmccymijlnamb4ag4gviyg21dm2si3m1p292lym3zw7f2m8is7"; - sgr-iosevka-term-ss11 = "1lals7p4qbl4igsvy03vqfxwbapbqizwcgyk4fwj67padyv7xhca"; - sgr-iosevka-term-ss12 = "181kgmmfllhwmz37gn28b84rffiac30d1dzgvm1hm8h9p5qrpj3q"; - sgr-iosevka-term-ss13 = "1m5vaf22dq2a4hkfm47yy1mwm74sykmw450pxfi194s595kkxxqh"; - sgr-iosevka-term-ss14 = "0gvxk2rsshcp35wg0vb4byrc9091lx1jq3nk4jypfrp97sz19nw7"; - sgr-iosevka-term-ss15 = "1hbmpg4rdsm3fr3v2gvggmjqz80c6rwyjs30ql3bwzzc61cjp13f"; - sgr-iosevka-term-ss16 = "078jcvzc2s490nbyzxa0vkvgws1a60s03xqws70yr5n8advf0px2"; - sgr-iosevka-term-ss17 = "1yklfki4s1il1lgcax8q6sf8ivpqh40yvds97nsik412pyrncsnh"; - sgr-iosevka-term-ss18 = "0qc2kwwl83z3czgfy3jsw1iri1gwxp1f14vz0dmdh2z9i349ayza"; + iosevka = "1730pcbxkcyzfw22hgqsv45sybd79pdsm7vb4l2gm9pfzasypjra"; + iosevka-aile = "1nm0s8zhmg5v181rik4d4nsygxrvfr9wdjwqz6gfl2dmg17r7cyi"; + iosevka-curly = "0kmvj1zhf0xs02rdf2x1f3lnahj36dpc91p6k4mbji5mn9klb547"; + iosevka-curly-slab = "0zklkypyh303gi5gqpdkwmj3g9m1f1xqda3ah232c3d6cfznbyqc"; + iosevka-etoile = "1nj0p25pbjkzc1lg8fp45zxj6r3q4k5yc882rra3jkjmlw2h65b7"; + iosevka-slab = "1vz9443swmxb27iqmimjyg3zs6q0pw7fpwiiaa7k1s7gc5xkyb5s"; + iosevka-ss01 = "1g2xxl9x5apyhhm7lsbmplh19c5aln3jwryzqvrqxpnsngkqmp0h"; + iosevka-ss02 = "1d2b8syvdx8i1dqw9k87yirkyg3wdvr7y2hy5c3nzj62sg7drfla"; + iosevka-ss03 = "0b4y1v6kri4d56h6m58qqmc50bh4r4151h72n1a2q0a0nwkgvlwm"; + iosevka-ss04 = "0fj7rj9xy9sfrzdhjqzv37v34lmkajz4d497i7lvdc2i0w4ia4gf"; + iosevka-ss05 = "0xncnrf8d78iqf3731z0midw4rlza8hdji0m3gvxnigbq3cqxhwd"; + iosevka-ss06 = "15vclj2m5brp1fnw82w5b53cwlwzzsr5hzxm6j2bj9bghc75cigm"; + iosevka-ss07 = "1hs7c5n5pcgmspwrhdxv69dc0wdycfcdfs1mxwbamnal77c9q0s8"; + iosevka-ss08 = "00fz1yb0g1rlzw3pxfpi88vh03k1q9nkzi8h6naqv0hngcbsz1ia"; + iosevka-ss09 = "1ig5lqpk86z7mwr45gqvsdxs00g7b0mvx1i8q8hx5x4pyr36y7yh"; + iosevka-ss10 = "12c50mh3xggz03lqqrkdcmdfvfq3m87x8xb9x0h8lwfslqaa0c0x"; + iosevka-ss11 = "1qvdsfviif8wyms0bkzm7vx0gf8vx5gic3ghincv4ignx8hmrbm9"; + iosevka-ss12 = "17qxrpmbrandlibhshycsgjlwspx7gz0x6mzhy1n8ccycrd7qlii"; + iosevka-ss13 = "07nz5wf99j6m72vkrnbhpr4yhn3pdgb898dinzi4n5k0rmky03zb"; + iosevka-ss14 = "1h9icwqz4qdzm99j17qxmrv1jvm3dzqrcghsffva9yvr32anc5y6"; + iosevka-ss15 = "06362h12vy48ib338dw7vjxx6vqpfzcc47f54f23pp1b73ygrkxp"; + iosevka-ss16 = "1sbby53vmjaq8h09a2izf4w5nha5knpgb0ljfyfd1wj1nnkdbisp"; + iosevka-ss17 = "13l3dindp0x76c3ddx7ibjins65f6xpv8zy7dfjyil8kg2570lfq"; + iosevka-ss18 = "1z0ypy19cj2hlg8qhvg0a54p0704f8szljf0lrrajprc8ws4cqy0"; + sgr-iosevka = "0cl08cxidpvrjy2ifhjb4cgrcjsldv86ipx4i8wh2kvs632hkz42"; + sgr-iosevka-aile = "01a7glrzrifwbfh05jynhmjd78cck4hw8aik3qf8pjr0lmyn8inz"; + sgr-iosevka-curly = "1wl80fn6zk1dvhqnfwxc74i2f925yf362s45d1bshi3n2qd7ixv4"; + sgr-iosevka-curly-slab = "18vvhkqhljnpv75v7cbw5z3d4xc418g0pgh39zyy1sdpq01h6ycj"; + sgr-iosevka-etoile = "0g7brirxpb2s0a94vc00jk8d45wafcimkd1dkilhpc5h862d7y3d"; + sgr-iosevka-fixed = "17g81448bjms88xph2h8cjfz2z2bhy4dc5ialy583zw9hafk0b6k"; + sgr-iosevka-fixed-curly = "18kfz4bdp81ylwjikdyj00m58bb5ykaxnxv288d9qr9r0wav14bf"; + sgr-iosevka-fixed-curly-slab = "1r1223m547ddpjrc0dpzkmkbw4851lvkc2g37yzd97i7g3da0q5g"; + sgr-iosevka-fixed-slab = "006d1cznz5ikclpz6kli69h5jnsr50yd08za3m6k07npnj4g9i9h"; + sgr-iosevka-fixed-ss01 = "0dxjmxvhq7dba7f4dcw2z85mgbx4qmy3w1nz99kbn729pjv3xbnr"; + sgr-iosevka-fixed-ss02 = "1ljq7dxj7dfg8bwmljykbl0lgkw4q9v5h41mflrvxhxkgblghji9"; + sgr-iosevka-fixed-ss03 = "14q5wi4af1mnm6g895zgpmf1qcnadv0mpiyydcizayqxnc015xr0"; + sgr-iosevka-fixed-ss04 = "0szy07dlv9ag7jqahlgyi9wgwpas73rg2vw74jg63fx06svwyx7z"; + sgr-iosevka-fixed-ss05 = "1bm6mqal8jni9za27dmbq9pdqs9j3x58w0cnzx7ma3gyaypfi5jc"; + sgr-iosevka-fixed-ss06 = "08a6mzrbx7wl4z147kv3289fbaccd7cs0r1gp3dnkkypsy4cw907"; + sgr-iosevka-fixed-ss07 = "05l0i4mblgx2zqfp5qvpwqp9671mkfj60i4pg0kznwd13j0ya8qs"; + sgr-iosevka-fixed-ss08 = "15ils79jpa1kibyh3ih5dkjk0qi0ppsy9iibyyl301c4vyhgypzb"; + sgr-iosevka-fixed-ss09 = "1s2m349m7560zz10r0w0nmgixxzn0ys4j8jwy3c1zxzphdq60a10"; + sgr-iosevka-fixed-ss10 = "1iby1afylism23cn70x0bb2qi8mdkf0ysgnmagdr47cgh6n8kgmy"; + sgr-iosevka-fixed-ss11 = "10zn26ijrdj2s0fzc1d1kyi0rpy6qw1bbp6qwf1x1mbhapj0mc8a"; + sgr-iosevka-fixed-ss12 = "1vdxn5qr1h192c1czxifvr4f2mv1jhkb20m5n3wgawyf75p7blcy"; + sgr-iosevka-fixed-ss13 = "1fdki2kf6xy2mvxnna1m77xgk5hm88i1g5ds8dzr6gc5mkm5mw8m"; + sgr-iosevka-fixed-ss14 = "1gaycm1zzm2qnriy76xnyy74rk9ccs54q71br2m55jlr4ifglanv"; + sgr-iosevka-fixed-ss15 = "07b9ss5a2vk4gndwc6zw8qwa4wgsrfnfq9cbrx9zlzj08143q9dr"; + sgr-iosevka-fixed-ss16 = "156yh0hbqqklhpf7czblk43nmq3cw0akgiy4z7jq0904b96v68zs"; + sgr-iosevka-fixed-ss17 = "0wj8j09wvf7m7m1ss47bqf6s0nvrn3vlzdhgnmzwc2jc4rkrvjpa"; + sgr-iosevka-fixed-ss18 = "0zsy2ql3r0419h6ganfdfhmwzn7lprypw26bq7iqzvld03vss45c"; + sgr-iosevka-slab = "10al24w3lglgdz9v86yx6q58mx4qyrxr8kffl0qvjiqvdcyyp460"; + sgr-iosevka-ss01 = "0ipwpjwg14wijzx0qb0zni8rzvw6wwfbwzqv8pzf2dmm6iwnmnqc"; + sgr-iosevka-ss02 = "0nfbw5smfarglma3cddzw397rjh72qjxqhz3g28l0sj26gk2bwma"; + sgr-iosevka-ss03 = "0cdvb5igir3c216niq3i0hbjvff1y9bnzf6fwny17303vjvfqg41"; + sgr-iosevka-ss04 = "0sj62id2ljwsms8xv17j474pdr881r6z8kb7a26gv48p08r225fq"; + sgr-iosevka-ss05 = "13pxfc2s2vxxkqp4jvzam6bx7ywn350phs5xhlzmcdk4sjgml9i2"; + sgr-iosevka-ss06 = "0xscng0a90vlr621pnl3hxpn2la862rgcx7xy8d1i6k47wpp1zbj"; + sgr-iosevka-ss07 = "0yj11jc8fzw9l2316y90mdj7hsqd46y5i1rckxlvih5nv300x1cp"; + sgr-iosevka-ss08 = "15jn1xjafawd5b4y2z4fkbaf22fgbvc861m3sjx4hib5vqjn41p3"; + sgr-iosevka-ss09 = "0kffxk8kr5giisfc10a5h889azgkqs4q9f0gggv8xlml4afdycd0"; + sgr-iosevka-ss10 = "1ldwpx2ysx0v79qfzhcqcc2cwylwnr6x81fy2yqqnv2319v1xrky"; + sgr-iosevka-ss11 = "1rd98yvky9wxgxcp4ps9p1k4ll8hnh9g9vgwf1r0bjlykhv7dhmf"; + sgr-iosevka-ss12 = "0439fg1pvxnv96v77rzrn0sbzna962ixgn8bx4ykpx0wkrigmyrk"; + sgr-iosevka-ss13 = "0qzbf4milkijhmxfkv3al2w5s2aa0a0aqqqxbv2wgza7g3i2glgv"; + sgr-iosevka-ss14 = "0vk8s71lyrdgngdbaasimdg0a5ygckciy7wxkkbixvxh18vi3mfr"; + sgr-iosevka-ss15 = "0c5sai8zbciwpkwrfliakf8091n5zcj7bilkbhzljpgfhalxg43v"; + sgr-iosevka-ss16 = "0a8q3ns3chw6kg77fxc03njlbr4slnq83381lwznhnsziyk7jb6r"; + sgr-iosevka-ss17 = "0bbfq7fjbr718fnmfy4nl7m9n7sjnra89chig9am7571ws66wbxc"; + sgr-iosevka-ss18 = "16sj1g5i75hfd07ghsm6zb655mypgwagxzpz5sk22dkrilxwrdix"; + sgr-iosevka-term = "1ncr05mprm8bar8v9saqsklgm36mymzhzw5x1viz04757s89cqnc"; + sgr-iosevka-term-curly = "0vwi4ccz0fnd7a3adfxffar5qxfzkx4pz23208kzc5zjidl9s9ka"; + sgr-iosevka-term-curly-slab = "0dwjcj8d4am5kqw35w68hm3qnxyk9w5k44z2n1mf9gsj411layi8"; + sgr-iosevka-term-slab = "1i7gp1lirdzzcmcv5lcrdf2mb2l9v3kjx1yhhdydfpapq85q5wma"; + sgr-iosevka-term-ss01 = "0zjx0r7sznzdw1diy88p6bkdki0ihqilvksil6qccbg4fn9f2swm"; + sgr-iosevka-term-ss02 = "1ma8366h42n5ij2czhkhmfyzmv23hmn165ihjxmwkxhg0c58l4jl"; + sgr-iosevka-term-ss03 = "0n23fy0ks0pid1m8z5vl9j7g607nl70h7bxfn015lryl7v8yj2dm"; + sgr-iosevka-term-ss04 = "1a7llxzf4cs9jr7ldnhxdc7r2jviaffq2kvhkj3spqan9bk6ymcx"; + sgr-iosevka-term-ss05 = "1d3sp99f6gycbmxk6z0raa7gk0is0m7bc7dqb4dy6zikra35kv4x"; + sgr-iosevka-term-ss06 = "1vjc785rzzrcbdbcp5j2dljk9flv9inmcjswyf7fyacn4ghszap6"; + sgr-iosevka-term-ss07 = "03pjbr7bp1av2pav1x913j1h18b4nhxvr7k62dg68b019rj1pvfg"; + sgr-iosevka-term-ss08 = "1b9qvkb4zpvwfygvh7i6b6dcwk8jk0y1kg078ma4vlpfag9ay4xb"; + sgr-iosevka-term-ss09 = "0zcg1b1j7113qp5q81s5dx34n1h3lmrshrx8xkvy6kn1n48b17b8"; + sgr-iosevka-term-ss10 = "1nrciywy8fr8x716w087pyyw0vkyd60j3lmxc7ixsr9yl3ff9bb0"; + sgr-iosevka-term-ss11 = "1k4xsl9x6195ap2zg0xxrla4svvzxhwas6xf0dbh7k2baiwyknb3"; + sgr-iosevka-term-ss12 = "16h0i0vj98l0l6hfyjsq4qy8mxkz5p8xpqxnpd56wxm7mnl2b7i9"; + sgr-iosevka-term-ss13 = "1i907injbdamdyfd1ydzdjsygn0b3syab0ahas7xmd438rfkcfj6"; + sgr-iosevka-term-ss14 = "1ypx059ws3pdhkn6lsc4cai4qhm8gzm9chmrsiqk2978yaf2z06c"; + sgr-iosevka-term-ss15 = "1nqbslx44ikj4wd3h1ycqsbk6sk72zz2n49pkn9r3khp9wwz7qwn"; + sgr-iosevka-term-ss16 = "1lpmph22gqzn3zf9zsr5hzb59573xkiz7yq9pfqg5bxnx248byr9"; + sgr-iosevka-term-ss17 = "02d3vs46cg4nbak1y64cw5jlhzgxmlxxkhlz3jzf5wzzb9kli4iv"; + sgr-iosevka-term-ss18 = "1z580s3icbzpivp766cqdc3j8ijgpp5f2yz9a4g4hpz3isa1lpy6"; } diff --git a/third_party/nixpkgs/pkgs/data/fonts/powerline-symbols/default.nix b/third_party/nixpkgs/pkgs/data/fonts/powerline-symbols/default.nix index 69e3bb59df..f8b9935d64 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/powerline-symbols/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/powerline-symbols/default.nix @@ -1,8 +1,8 @@ -{ lib, runCommandNoCC, powerline }: +{ lib, runCommand, powerline }: let inherit (powerline) version; -in runCommandNoCC "powerline-symbols-${version}" { +in runCommand "powerline-symbols-${version}" { meta = { inherit (powerline.meta) license; priority = (powerline.meta.priority or 0) + 1; diff --git a/third_party/nixpkgs/pkgs/data/fonts/recursive/default.nix b/third_party/nixpkgs/pkgs/data/fonts/recursive/default.nix index 320e0cd726..caff63da8c 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/recursive/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/recursive/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "1.078"; + version = "1.079"; in fetchzip { name = "recursive-${version}"; @@ -14,7 +14,7 @@ fetchzip { unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype ''; - sha256 = "0vmdcqz6rlshfk653xpanyxps96p85b1spqahl3yiy29mq4xfdn3"; + sha256 = "sha256-nRFjfbbZG9wDHGbGfS+wzViKF/ogWs8i/6OG0rkDHDg="; meta = with lib; { homepage = "https://recursive.design/"; diff --git a/third_party/nixpkgs/pkgs/data/icons/luna-icons/default.nix b/third_party/nixpkgs/pkgs/data/icons/luna-icons/default.nix index 0a0cba1e98..3b5bc262c0 100644 --- a/third_party/nixpkgs/pkgs/data/icons/luna-icons/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/luna-icons/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "luna-icons"; - version = "1.2"; + version = "1.3"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - sha256 = "0kjnmclil21m9vgybk958nzzlbwryp286rajlgxg05wgjnby4cxk"; + sha256 = "0pww8882qvlnamxzvn7jxyi0h7lffrwld7qqs1q08h73xc3p18nv"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/data/misc/hackage/pin.json b/third_party/nixpkgs/pkgs/data/misc/hackage/pin.json index e474bb8171..764d632ee4 100644 --- a/third_party/nixpkgs/pkgs/data/misc/hackage/pin.json +++ b/third_party/nixpkgs/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "8977803787241e1474bdbb35cbc704c57cce6fcd", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/8977803787241e1474bdbb35cbc704c57cce6fcd.tar.gz", - "sha256": "1ivdqlmpdqpa5m5cdwdk6l258nmnz9a6466y8xs19x0wkdx4b738", - "msg": "Update from Hackage at 2021-08-07T10:52:35Z" + "commit": "dfb0b040033334d2e676906786c7a90805310e7d", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/dfb0b040033334d2e676906786c7a90805310e7d.tar.gz", + "sha256": "0x53gkkpxlcm6qa38yksx8cws9phl2zxvdys5imjpg8dl1sal3pg", + "msg": "Update from Hackage at 2021-08-10T19:15:27Z" } diff --git a/third_party/nixpkgs/pkgs/data/misc/spdx-license-list-data/default.nix b/third_party/nixpkgs/pkgs/data/misc/spdx-license-list-data/default.nix index 107d3804e6..939acc96ce 100644 --- a/third_party/nixpkgs/pkgs/data/misc/spdx-license-list-data/default.nix +++ b/third_party/nixpkgs/pkgs/data/misc/spdx-license-list-data/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "spdx-license-list-data"; - version = "3.13"; + version = "3.14"; src = fetchFromGitHub { owner = "spdx"; repo = "license-list-data"; rev = "v${version}"; - sha256 = "184qfz8jifkd4jvqkdfmcgplf12cdx83gynb7mxzmkfg2xymlr0g"; + sha256 = "07fl31732bvcmm93fqrpa7pfq5ynxc1fpd8n9w2iah39lyz49sjm"; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/data/misc/wireless-regdb/default.nix b/third_party/nixpkgs/pkgs/data/misc/wireless-regdb/default.nix index ca57640e4a..d23733fb03 100644 --- a/third_party/nixpkgs/pkgs/data/misc/wireless-regdb/default.nix +++ b/third_party/nixpkgs/pkgs/data/misc/wireless-regdb/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "wireless-regdb"; - version = "2021.04.21"; + version = "2021.07.14"; src = fetchurl { url = "https://www.kernel.org/pub/software/network/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-nkwCsqlxDfTb2zJ8OWEujLuuZJWYev7drrqyjB6j2Po="; + sha256 = "sha256-Li3SFqXxoxC4SXdK9j5jCdlMIgfDR3GlNMR64YsWJ0I="; }; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/data/themes/marwaita-manjaro/default.nix b/third_party/nixpkgs/pkgs/data/themes/marwaita-manjaro/default.nix index d467526582..5cbf4c1920 100644 --- a/third_party/nixpkgs/pkgs/data/themes/marwaita-manjaro/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/marwaita-manjaro/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , gdk-pixbuf , gtk-engine-murrine @@ -8,13 +9,13 @@ stdenv.mkDerivation rec { pname = "marwaita-manjaro"; - version = "2.0"; + version = "10.3"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - sha256 = "1si0gaa1njyf4194i6rbx4qjp31sw238svvb2x8r8cfhm8mkhm8d"; + sha256 = "0qihxipk7ya6n3p9kg20bk6plnb85pg3ahwd02qq4bqfiw6mx3gw"; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/data/themes/marwaita/default.nix b/third_party/nixpkgs/pkgs/data/themes/marwaita/default.nix index 34f4995576..bdb14be0bd 100644 --- a/third_party/nixpkgs/pkgs/data/themes/marwaita/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/marwaita/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "marwaita"; - version = "10.2"; + version = "10.3"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - sha256 = "09xh7yhnc7szk171n0qgr52xr7sw9qq4cb7qwrkhf0184idf0pik"; + sha256 = "0v9sxjy4x03y3hcgbkn9lj010kd5csiyc019dwxzvx5kg8xh8qca"; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/data/themes/qogir/default.nix b/third_party/nixpkgs/pkgs/data/themes/qogir/default.nix index c4f97ebfbd..c85b5259f6 100644 --- a/third_party/nixpkgs/pkgs/data/themes/qogir/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/qogir/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qogir-theme"; - version = "2021-06-25"; + version = "2021-08-02"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "178lk0zffm4nd8fc872rfpm2aii1nszq0k389gkiyxkqphmknn4n"; + sha256 = "sha256-U048qNBfxjx/5iHIXcqAwXfIwmux+sw4hVQkN3TDLzk="; }; buildInputs = [ gdk-pixbuf librsvg ]; diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/xapps/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/xapps/default.nix index 7be80048e3..011c5c2906 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/xapps/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/xapps/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pname = "xapps"; - version = "2.0.6"; + version = "2.2.3"; outputs = [ "out" "dev" ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "11qbz547qlfsvkz4bdxhryrsf10aw5jc2f1glbik7pvmmm87gf4f"; + sha256 = "sha256-hrSyoHA3XQXQb9N3YJ+NNfBjJNOuUhXhKEimh/n73MM="; }; # TODO: https://github.com/NixOS/nixpkgs/issues/36468 diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/xviewer/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/xviewer/default.nix index 53e88ddb94..20c36827cb 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/xviewer/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/xviewer/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { pname = "xviewer"; - version = "2.8.3"; + version = "3.0.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "0h3qgqaiz5swy09fr6z3ag2952hgzsk5d2fpwmwb78yjrzrhnzpy"; + sha256 = "sha256-hvoTb9afyVdcm5suB1ZxkxUyNFSVRFjYuNVc0jE3RF0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/apps/cheese/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/apps/cheese/default.nix index d0a9d6aaab..71a582993a 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/apps/cheese/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/apps/cheese/default.nix @@ -30,6 +30,7 @@ , ninja , dbus , python3 +, pipewire }: stdenv.mkDerivation rec { @@ -85,6 +86,7 @@ stdenv.mkDerivation rec { gtk3 libcanberra-gtk3 librsvg + pipewire # PipeWire provides a gstreamer plugin for using PipeWire for video ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-maps/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-maps/default.nix index 779f185537..5784fb8d48 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-maps/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-maps/default.nix @@ -29,11 +29,11 @@ stdenv.mkDerivation rec { pname = "gnome-maps"; - version = "40.3"; + version = "40.4"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-p58Fz+u1UMUanGKwgDk2PXDdo90RP+cTR6lCW9cYaIk="; + sha256 = "sha256-LFt+HmX39OVP6G7d2hE46qbAaRoUlAPZXL4i7cgiUJw="; }; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/epiphany/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/epiphany/default.nix index 0b4191b226..73c7a7aa11 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/epiphany/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/epiphany/default.nix @@ -37,11 +37,11 @@ stdenv.mkDerivation rec { pname = "epiphany"; - version = "40.2"; + version = "40.3"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "dRGeIgZWV89w7ytgPU9zg1VzvQNPHmGMD2YkeP1saDU="; + sha256 = "2tE4ufLVXeJxEo/KOLYfU/2YDFh9KeG6a1CP/zsZ9WQ="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/evolution-data-server/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/evolution-data-server/default.nix index 480f95b970..156ffbb1c7 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/evolution-data-server/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/evolution-data-server/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "evolution-data-server"; - version = "3.40.3"; + version = "3.40.4"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "Trs5F9a+tUrVlt5dilxG8PtXJJ7Z24HwXHqUpzDB2SE="; + sha256 = "h8GF8Yw3Jw42EZgfGb2SIayXTIB0Ysjc6QvqCHEsWAA="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-software/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-software/default.nix index c8e637124a..6d71c579d7 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-software/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-software/default.nix @@ -43,11 +43,11 @@ in stdenv.mkDerivation rec { pname = "gnome-software"; - version = "40.3"; + version = "40.4"; src = fetchurl { url = "mirror://gnome/sources/gnome-software/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "y39TbLCfWCyQdVyQl08+g9/5U56it8CWibtOCsP/yF8="; + sha256 = "voxhGoAvcXGNzLvUVE7ZaIcxGYRv03t7dqeq1yx5mL8="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/totem/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/totem/default.nix index 45b99680a1..7d1d4e90ab 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/totem/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/totem/default.nix @@ -30,11 +30,11 @@ stdenv.mkDerivation rec { pname = "totem"; - version = "3.38.0"; + version = "3.38.1"; src = fetchurl { url = "mirror://gnome/sources/totem/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0bs33ijvxbr2prb9yj4dxglsszslsn9k258n311sld84masz4ad8"; + sha256 = "j/rPfA6inO3qBndzCGHUh2qPesTaTGI0u3X3/TcFoQg="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/yelp/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/yelp/default.nix index f4df80f561..746866fc9c 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/yelp/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/yelp/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "yelp"; - version = "40.0"; + version = "40.3"; src = fetchurl { url = "mirror://gnome/sources/yelp/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-B3dfoGzSg2Xs2Cm7FqhaaCiXqyHYzONFlrvvXNRVquA="; + sha256 = "sha256-oXOEeFHyYYm+eOy7EAFdU52Mzv/Hwj6GNUkrw62l7iM="; }; nativeBuildInputs = [ pkg-config gettext itstool wrapGAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/applications/xfdashboard/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/applications/xfdashboard/default.nix index 493a70a75e..527696c995 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/applications/xfdashboard/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/applications/xfdashboard/default.nix @@ -17,11 +17,11 @@ mkXfceDerivation { category = "apps"; pname = "xfdashboard"; - version = "0.9.2"; + version = "0.9.3"; rev-prefix = ""; odd-unstable = false; - sha256 = "sha256-Q6r9FoPl+vvqZWP5paAjT3VX3M/6TvqzrrGKPCH8+xo="; + sha256 = "sha256-xoeqVsfvBH2zzQqDUJGiA47hgVvEkvVf9bNYQmyiytk="; buildInputs = [ clutter diff --git a/third_party/nixpkgs/pkgs/development/beam-modules/elixir_ls.nix b/third_party/nixpkgs/pkgs/development/beam-modules/elixir_ls.nix index 5afab0e1ba..2b6cc4f568 100644 --- a/third_party/nixpkgs/pkgs/development/beam-modules/elixir_ls.nix +++ b/third_party/nixpkgs/pkgs/development/beam-modules/elixir_ls.nix @@ -4,20 +4,20 @@ mixRelease rec { pname = "elixir-ls"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "elixir-lsp"; repo = "elixir-ls"; rev = "v${version}"; - sha256 = "0d0hqc35hfjkpm88vz21mnm2a9rxiqfrdi83whhhh6d2ba216b7s"; + sha256 = "sha256-pUvONMTYH8atF/p2Ep/K3bwJUDxTzCsxLPbpjP0tQpM="; fetchSubmodules = true; }; mixFodDeps = fetchMixDeps { pname = "mix-deps-${pname}"; inherit src version; - sha256 = "0r9x223imq4j9pn9niskyaybvk7jmq8dxcyzk7kwfsi128qig1a1"; + sha256 = "sha256-YRzPASpg1K2kZUga5/aQf4Q33d8aHCwhw7KJxSY56k4="; }; # elixir_ls is an umbrella app diff --git a/third_party/nixpkgs/pkgs/development/beam-modules/erlang-ls/default.nix b/third_party/nixpkgs/pkgs/development/beam-modules/erlang-ls/default.nix index f2ba9a1815..9f7d434193 100644 --- a/third_party/nixpkgs/pkgs/development/beam-modules/erlang-ls/default.nix +++ b/third_party/nixpkgs/pkgs/development/beam-modules/erlang-ls/default.nix @@ -1,10 +1,11 @@ -{ fetchFromGitHub, fetchHex, rebar3Relx, buildRebar3, rebar3-proper, stdenv, lib }: +{ fetchFromGitHub, fetchgit, fetchHex, rebar3Relx, buildRebar3, rebar3-proper +, stdenv, writeScript, lib }: let - version = "0.17.0"; + version = "0.18.0"; owner = "erlang-ls"; repo = "erlang_ls"; deps = import ./rebar-deps.nix { - inherit fetchHex fetchFromGitHub; + inherit fetchHex fetchFromGitHub fetchgit; builder = buildRebar3; overrides = (self: super: { proper = super.proper.overrideAttrs (_: { @@ -18,7 +19,7 @@ rebar3Relx { inherit version; src = fetchFromGitHub { inherit owner repo; - sha256 = "0szg9hx436cvy80sh94dzmf2rainnw3fjc84bv3hlzjwwzmxj9aw"; + sha256 = "sha256-miCl04qqrirVPubOs558yWvXP3Sgs3bcDuGO9DZIsow="; rev = version; }; releaseType = "escript"; @@ -45,4 +46,22 @@ rebar3Relx { platforms = platforms.unix; license = licenses.asl20; }; + passthru.updateScript = writeScript "update.sh" '' + #!/usr/bin/env nix-shell + #! nix-shell -i bash -p common-updater-scripts coreutils git gnused gnutar gzip "rebar3WithPlugins { globalPlugins = [ beamPackages.rebar3-nix ]; }" + + set -ox errexit + latest=$(list-git-tags https://github.com/${owner}/${repo}.git | sed -n '/[\d\.]\+/p' | sort -V | tail -1) + if [[ "$latest" != "${version}" ]]; then + nixpkgs="$(git rev-parse --show-toplevel)" + nix_path="$nixpkgs/pkgs/development/beam-modules/erlang-ls" + update-source-version erlang-ls "$latest" --version-key=version --print-changes --file="$nix_path/default.nix" + tmpdir=$(mktemp -d) + cp -R $(nix-build $nixpkgs --no-out-link -A erlang-ls.src)/* "$tmpdir" + DEBUG=1 + (cd "$tmpdir" && HOME=. rebar3 as test nix lock -o "$nix_path/rebar-deps.nix") + else + echo "erlang-ls is already up-to-date" + fi + ''; } diff --git a/third_party/nixpkgs/pkgs/development/beam-modules/erlang-ls/rebar-deps.nix b/third_party/nixpkgs/pkgs/development/beam-modules/erlang-ls/rebar-deps.nix index 5d55ce0c52..75d033a13d 100644 --- a/third_party/nixpkgs/pkgs/development/beam-modules/erlang-ls/rebar-deps.nix +++ b/third_party/nixpkgs/pkgs/development/beam-modules/erlang-ls/rebar-deps.nix @@ -1,6 +1,6 @@ # Generated by rebar3_nix let fetchOnly = { src, ... }: src; -in { builder ? fetchOnly, fetchHex, fetchFromGitHub, overrides ? (x: y: { }) }: +in { builder ? fetchOnly, fetchHex, fetchgit, fetchFromGitHub, overrides ? (x: y: { }) }: let self = packages // (overrides self packages); packages = with self; { diff --git a/third_party/nixpkgs/pkgs/development/beam-modules/fetch-hex.nix b/third_party/nixpkgs/pkgs/development/beam-modules/fetch-hex.nix index 7f84e23607..9c2ed1ea22 100644 --- a/third_party/nixpkgs/pkgs/development/beam-modules/fetch-hex.nix +++ b/third_party/nixpkgs/pkgs/development/beam-modules/fetch-hex.nix @@ -1,21 +1,25 @@ { lib, stdenv, fetchurl }: -{ pkg, version, sha256 -, meta ? {} +{ pkg +, version +, sha256 +, meta ? { } }: with lib; stdenv.mkDerivation ({ - name = "hex-source-${pkg}-${version}"; + pname = "hex-source-${pkg}"; + inherit version; + dontBuild = true; + dontConfigure = true; + dontFixup = true; src = fetchurl { url = "https://repo.hex.pm/tarballs/${pkg}-${version}.tar"; inherit sha256; }; - phases = [ "unpackPhase" "installPhase" ]; - unpackCmd = '' tar -xf $curSrc contents.tar.gz mkdir contents diff --git a/third_party/nixpkgs/pkgs/development/beam-modules/fetch-rebar-deps.nix b/third_party/nixpkgs/pkgs/development/beam-modules/fetch-rebar-deps.nix index d858b3d81a..31bef024d3 100644 --- a/third_party/nixpkgs/pkgs/development/beam-modules/fetch-rebar-deps.nix +++ b/third_party/nixpkgs/pkgs/development/beam-modules/fetch-rebar-deps.nix @@ -1,27 +1,36 @@ { lib, stdenv, rebar3 }: -{ name, version, sha256, src -, meta ? {} +{ name +, version +, sha256 +, src +, meta ? { } }: with lib; stdenv.mkDerivation ({ - name = "rebar-deps-${name}-${version}"; + pname = "rebar-deps-${name}"; + inherit version; - phases = [ "downloadPhase" "installPhase" ]; + dontUnpack = true; + dontConfigure = true; + dontBuild = true; + dontFixup = true; - downloadPhase = '' + prePhases = '' cp ${src} . HOME='.' DEBUG=1 ${rebar3}/bin/rebar3 get-deps ''; installPhase = '' + runHook preInstall mkdir -p "$out/_checkouts" for i in ./_build/default/lib/* ; do echo "$i" cp -R "$i" "$out/_checkouts" done + runHook postInstall ''; outputHashAlgo = "sha256"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/bigloo/default.nix b/third_party/nixpkgs/pkgs/development/compilers/bigloo/default.nix index a4f4287523..c4fa5712ea 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/bigloo/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/bigloo/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "bigloo"; - version = "4.3h"; + version = "4.4b"; src = fetchurl { url = "ftp://ftp-sop.inria.fr/indes/fp/Bigloo/bigloo-${version}.tar.gz"; - sha256 = "0fw08096sf8ma2cncipnidnysxii0h0pc7kcqkjhkhdchknp8vig"; + sha256 = "sha256-oxOSJwKWmwo7PYAwmeoFrKaYdYvmvQquWXyutolc488="; }; nativeBuildInputs = [ autoconf automake libtool ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/emscripten/yarn.nix b/third_party/nixpkgs/pkgs/development/compilers/emscripten/yarn.nix index d0c3395f28..f053d5f30c 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/emscripten/yarn.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/emscripten/yarn.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec { +{ fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec { offline_cache = linkFarm "offline" packages; packages = [ { diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/common/configure-flags.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/common/configure-flags.nix index 1d75966797..4686a38771 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/common/configure-flags.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/common/configure-flags.nix @@ -158,9 +158,15 @@ let (lib.enableFeature enablePlugin "plugin") ] - # Support -m32 on powerpc64le + # Support -m32 on powerpc64le/be ++ lib.optional (targetPlatform.system == "powerpc64le-linux") "--enable-targets=powerpcle-linux" + ++ lib.optional (targetPlatform.system == "powerpc64-linux") + "--enable-targets=powerpc-linux" + + # Fix "unknown long double size, cannot define BFP_FMT" + ++ lib.optional (targetPlatform.isPower && targetPlatform.isMusl) + "--disable-decimal-float" # Optional features ++ lib.optional (isl != null) "--with-isl=${isl}" diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/head.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/head.nix index 685497b303..35c0bd7621 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ghc/head.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/head.nix @@ -311,6 +311,7 @@ stdenv.mkDerivation (rec { homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; maintainers = with lib.maintainers; [ marcweber andres peti ]; + timeout = 24 * 3600; inherit (ghc.meta) license platforms; # ghcHEAD times out on aarch64-linux on Hydra. hydraPlatforms = builtins.filter (p: p != "aarch64-linux") ghc.meta.platforms; diff --git a/third_party/nixpkgs/pkgs/development/compilers/gprolog/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gprolog/default.nix index b21f0196d4..16a7552dd4 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gprolog/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gprolog/default.nix @@ -1,12 +1,13 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "gprolog-1.5.0"; + pname = "gprolog"; + version = "1.5.0"; src = fetchurl { urls = [ - "mirror://gnu/gprolog/${name}.tar.gz" - "http://www.gprolog.org/${name}.tar.gz" + "mirror://gnu/gprolog/gprolog-${version}.tar.gz" + "http://www.gprolog.org/gprolog-${version}.tar.gz" ]; sha256 = "sha256-ZwZCtDwPqifr1olh77F+vnB2iPkbaAlWbd1gYTlRLAE="; }; @@ -22,13 +23,13 @@ stdenv.mkDerivation rec { configureFlagsArray=( "--with-install-dir=$out" "--without-links-dir" - "--with-examples-dir=$out/share/${name}/examples" - "--with-doc-dir=$out/share/${name}/doc" + "--with-examples-dir=$out/share/gprolog-${version}/examples" + "--with-doc-dir=$out/share/gprolog-${version}/doc" ) ''; postInstall = '' - mv -v $out/[A-Z]* $out/gprolog.ico $out/share/${name}/ + mv -v $out/[A-Z]* $out/gprolog.ico $out/share/gprolog-${version}/ ''; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/compilers/hop/default.nix b/third_party/nixpkgs/pkgs/development/compilers/hop/default.nix index 8e5bd6a7df..00900b6fff 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/hop/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/hop/default.nix @@ -7,10 +7,11 @@ let bigloo-release = ; in stdenv.mkDerivation rec { - name = "hop-3.3.0"; + pname = "hop"; + version = "3.4.4"; src = fetchurl { - url = "ftp://ftp-sop.inria.fr/indes/fp/Hop/${name}.tar.gz"; - sha256 = "14gf9ihmw95zdnxsqhn5jymfivpfq5cg9v0y7yjd5i7c787dncp5"; + url = "ftp://ftp-sop.inria.fr/indes/fp/Hop/hop-${version}.tar.gz"; + sha256 = "sha256-GzXh4HC+SFFoUi7SMqu36iYRPAJ6tMnOHd+he6n9k1I="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/default.nix index 35be7eb03c..5ef24f8f45 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/default.nix @@ -18,11 +18,11 @@ }: let - release_version = "13.0.0"; + release_version = "14.0.0"; candidate = ""; # empty or "rcN" dash-candidate = lib.optionalString (candidate != "") "-${candidate}"; - rev = "f98ed74f6910f8b09e77497aeb30c860c433610d"; # When using a Git commit - rev-version = "unstable-2021-07-16"; # When using a Git commit + rev = "7d9d926a1861e2f6876943d47f297e2a08a57392"; # When using a Git commit + rev-version = "unstable-2021-08-03"; # When using a Git commit version = if rev != "" then rev-version else "${release_version}${dash-candidate}"; targetConfig = stdenv.targetPlatform.config; @@ -30,7 +30,7 @@ let owner = "llvm"; repo = "llvm-project"; rev = if rev != "" then rev else "llvmorg-${version}"; - sha256 = "1dp0n3rpg60xr321mvn2gi268pfcs6ii4nnwgsi2lix0di4h3ccb"; + sha256 = "0v9jk49raazy5vhccagnmf6c3cxjv56rwg3670k9x9snihx2782r"; }; llvm_meta = { diff --git a/third_party/nixpkgs/pkgs/development/compilers/nextpnr/default.nix b/third_party/nixpkgs/pkgs/development/compilers/nextpnr/default.nix index c812a3bb82..2516d9c810 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/nextpnr/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/nextpnr/default.nix @@ -14,14 +14,14 @@ let in stdenv.mkDerivation rec { pname = "nextpnr"; - version = "2021.07.28"; + version = "2021.08.06"; srcs = [ (fetchFromGitHub { owner = "YosysHQ"; repo = "nextpnr"; - rev = "39a7381928359934788aefd670c835dedbbf2cd7"; - sha256 = "1rs95vp5m3fdvhmjilj2r2g54xlabd3vy8wii1ammajqkyamy8x3"; + rev = "dd6376433154e008045695f5420469670b0c3a88"; + sha256 = "197k0a3cjnwinr4nnx7gqvpfi0wdhnmsmvcx12166jg7m1va5kw7"; name = "nextpnr"; }) (fetchFromGitHub { diff --git a/third_party/nixpkgs/pkgs/development/compilers/openjdk/darwin/11.nix b/third_party/nixpkgs/pkgs/development/compilers/openjdk/darwin/11.nix index ae045ddfdb..0b158a1693 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/openjdk/darwin/11.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/openjdk/darwin/11.nix @@ -65,6 +65,12 @@ let EOF ''; + # fixupPhase is moving the man to share/man which breaks it because it's a + # relative symlink. + postFixup = '' + ln -nsf ../zulu-11.jdk/Contents/Home/man $out/share/man + ''; + passthru = { home = jdk; }; diff --git a/third_party/nixpkgs/pkgs/development/compilers/sbcl/common.nix b/third_party/nixpkgs/pkgs/development/compilers/sbcl/common.nix index eb3f6aba20..d81d1bf8f6 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/sbcl/common.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/sbcl/common.nix @@ -1,6 +1,6 @@ { version, sha256 }: -{ lib, stdenv, fetchurl, writeText, sbclBootstrap +{ lib, stdenv, fetchurl, fetchpatch, writeText, sbclBootstrap , sbclBootstrapHost ? "${sbclBootstrap}/bin/sbcl --disable-debugger --no-userinit --no-sysinit" , threadSupport ? (stdenv.isi686 || stdenv.isx86_64 || "aarch64-linux" == stdenv.hostPlatform.system || "aarch64-darwin" == stdenv.hostPlatform.system) , disableImmobileSpace ? false @@ -22,6 +22,14 @@ stdenv.mkDerivation rec { buildInputs = [texinfo]; + patches = lib.optional + (lib.versionAtLeast version "2.1.2" && lib.versionOlder version "2.1.8") + (fetchpatch { + # Fix segfault on ARM when reading large core files + url = "https://github.com/sbcl/sbcl/commit/8fa3f76fba2e8572e86ac6fc5754e6b2954fc774.patch"; + sha256 = "1ic531pjnws1k3xd03a5ixbq8cn10dlh2nfln59k0vbm0253g3lv"; + }); + postPatch = '' echo '"${version}.nixos"' > version.lisp-expr diff --git a/third_party/nixpkgs/pkgs/development/compilers/yosys/default.nix b/third_party/nixpkgs/pkgs/development/compilers/yosys/default.nix index 08f0ee2271..e483fbe293 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/yosys/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/yosys/default.nix @@ -34,13 +34,13 @@ stdenv.mkDerivation rec { pname = "yosys"; - version = "0.9+4221"; + version = "0.9+4272"; src = fetchFromGitHub { owner = "YosysHQ"; repo = "yosys"; - rev = "9600f20be887b707f6d5d3f74dec58b336e2464e"; - sha256 = "0xbvbnhc6qvcq1c8zxfyf4ws959c824z660nrghfxyzkrjl8wi1h"; + rev = "83c0f82dc842fc859dfb4b19e766b23f965cfbb3"; + sha256 = "08lyx2fp34fvnv0lj77r5v3s9a0zr32ywpcz0v8i6wwscjfbp8ba"; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/addition-chains/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/addition-chains/default.nix new file mode 100644 index 0000000000..f2ddacf2e3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/coq-modules/addition-chains/default.nix @@ -0,0 +1,33 @@ +{ lib, mkCoqDerivation, coq, mathcomp-ssreflect, mathcomp-algebra, paramcoq +, version ? null }: +with lib; + +mkCoqDerivation { + pname = "addition-chains"; + repo = "hydra-battles"; + + release."0.4".sha256 = "sha256:1f7pc4w3kir4c9p0fjx5l77401bx12y72nmqxrqs3qqd3iynvqlp"; + releaseRev = (v: "v${v}"); + + inherit version; + defaultVersion = with versions; switch coq.coq-version [ + { case = isGe "8.11"; out = "0.4"; } + ] null; + + propagatedBuildInputs = [ mathcomp-ssreflect mathcomp-algebra paramcoq ]; + + useDune2 = true; + + meta = { + description = "Exponentiation algorithms following addition chains"; + longDescription = '' + Addition chains are algorithms for computations of the p-th + power of some x, with the least number of multiplication as + possible. We present a few implementations of addition chains, + with proofs of their correctness. + ''; + maintainers = with maintainers; [ Zimmi48 ]; + license = licenses.mit; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/gaia/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/gaia/default.nix new file mode 100644 index 0000000000..57a1beead4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/coq-modules/gaia/default.nix @@ -0,0 +1,24 @@ +{ lib, mkCoqDerivation, coq, mathcomp, version ? null }: + +with lib; mkCoqDerivation { + pname = "gaia"; + + release."1.11".sha256 = "sha256:0gwb0blf37sv9gb0qpn34dab71zdcx7jsnqm3j9p58qw65cgsqn5"; + release."1.12".sha256 = "sha256:0c6cim4x6f9944g8v0cp0lxs244lrhb04ms4y2s6y1wh321zj5mi"; + releaseRev = (v: "v${v}"); + + inherit version; + defaultVersion = with versions; switch [ coq.version mathcomp.version ] [ + { cases = [ (range "8.10" "8.13") "1.12.0" ]; out = "1.12"; } + { cases = [ (range "8.10" "8.12") "1.11.0" ]; out = "1.11"; } + ] null; + + propagatedBuildInputs = + [ mathcomp.ssreflect mathcomp.algebra ]; + + meta = { + description = "Implementation of books from Bourbaki's Elements of Mathematics in Coq"; + maintainers = with maintainers; [ Zimmi48 ]; + license = licenses.mit; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/hydra-battles/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/hydra-battles/default.nix index a74eec4b64..6c3c9d88e0 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/hydra-battles/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/hydra-battles/default.nix @@ -1,28 +1,32 @@ -{ lib, mkCoqDerivation, coq, mathcomp, equations, paramcoq, version ? null }: +{ lib, mkCoqDerivation, coq, equations, version ? null }: with lib; mkCoqDerivation { pname = "hydra-battles"; owner = "coq-community"; - release."0.3".rev = "v0.3"; - release."0.3".sha256 = "sha256-rXP/vJqVEg2tN/I9LWV13YQ1+C7M6lzGu3oI+7pSZzg="; + release."0.4".sha256 = "sha256:1f7pc4w3kir4c9p0fjx5l77401bx12y72nmqxrqs3qqd3iynvqlp"; + releaseRev = (v: "v${v}"); inherit version; defaultVersion = with versions; switch coq.coq-version [ - { case = isGe "8.11"; out = "0.3"; } + { case = isGe "8.11"; out = "0.4"; } ] null; - propagatedBuildInputs = [ mathcomp equations paramcoq ]; + propagatedBuildInputs = [ equations ]; + + useDune2 = true; meta = { - description = "Variations on Kirby & Paris' hydra battles and other entertaining math in Coq"; + description = "Exploration of some properties of Kirby and Paris' hydra battles, with the help of Coq"; longDescription = '' - Variations on Kirby & Paris' hydra battles and other - entertaining math in Coq (collaborative, documented, includes - exercises) + An exploration of some properties of Kirby and Paris' hydra + battles, with the help of the Coq Proof assistant. This + development includes the study of several representations of + ordinal numbers, and a part of the so-called Ketonen and Solovay + machinery (combinatorial properties of epsilon0). ''; - maintainers = with maintainers; [ siraben ]; + maintainers = with maintainers; [ siraben Zimmi48 ]; license = licenses.mit; platforms = platforms.unix; }; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp/default.nix index 4637edebdb..ddbad5eea8 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp/default.nix @@ -19,7 +19,7 @@ let owner = "math-comp"; withDoc = single && (args.withDoc or false); defaultVersion = with versions; switch coq.coq-version [ - { case = isGe "8.13"; out = "1.12.0"; } # lower version of coq to 8.10 when all mathcomp packages are ported + { case = isGe "8.10"; out = "1.12.0"; } { case = range "8.7" "8.12"; out = "1.11.0"; } { case = range "8.7" "8.11"; out = "1.10.0"; } { case = range "8.7" "8.11"; out = "1.9.0"; } diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/multinomials/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/multinomials/default.nix index dfa6a63571..acbb602a54 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/multinomials/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/multinomials/default.nix @@ -4,7 +4,10 @@ with lib; mkCoqDerivation { namePrefix = [ "coq" "mathcomp" ]; pname = "multinomials"; + opam-name = "coq-mathcomp-multinomials"; + owner = "math-comp"; + inherit version; defaultVersion = with versions; switch [ coq.version mathcomp.version ] [ { cases = [ (range "8.10" "8.13") "1.12.0" ]; out = "1.5.4"; } diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/serapi/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/serapi/default.nix new file mode 100644 index 0000000000..5505713eb4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/coq-modules/serapi/default.nix @@ -0,0 +1,72 @@ +{ lib, fetchzip, mkCoqDerivation, coq, version ? null }: + +let + ocamlPackages = + coq.ocamlPackages.overrideScope' + (self: super: { + ppxlib = super.ppxlib.override { version = "0.15.0"; }; + # the following does not work + ppx_sexp_conv = super.ppx_sexp_conv.overrideAttrs (_: { + src = fetchzip { + url = "https://github.com/janestreet/ppx_sexp_conv/archive/v0.14.1.tar.gz"; + sha256 = "04bx5id99clrgvkg122nx03zig1m7igg75piphhyx04w33shgkz2"; + }; + }); + }); + + release = { + "8.13.0+0.13.0".sha256 = "sha256:0k69907xn4k61w4mkhwf8kh8drw9pijk9ynijsppihw98j8w38fy"; + "8.12.0+0.12.1".sha256 = "sha256:048x3sgcq4h845hi6hm4j4dsfca8zfj70dm42w68n63qcm6xf9hn"; + "8.11.0+0.11.1".sha256 = "sha256:1phmh99yqv71vlwklqgfxiq2vj99zrzxmryj2j4qvg5vav3y3y6c"; + "8.10.0+0.7.2".sha256 = "sha256:1ljzm63hpd0ksvkyxcbh8rdf7p90vg91gb4h0zz0941v1zh40k8c"; + }; +in + +(with lib; mkCoqDerivation rec { + pname = "serapi"; + inherit version release; + + defaultVersion = with versions; switch coq.version [ + { case = isEq "8.13"; out = "8.13.0+0.13.0"; } + { case = isEq "8.12"; out = "8.12.0+0.12.1"; } + { case = isEq "8.11"; out = "8.11.0+0.11.1"; } + { case = isEq "8.10"; out = "8.10.0+0.7.2"; } + ] null; + + useDune2 = true; + + propagatedBuildInputs = + with ocamlPackages; [ + cmdliner + findlib # run time dependency of SerAPI + ppx_deriving + ppx_deriving_yojson + ppx_import + ppx_sexp_conv + sexplib + yojson + zarith # needed because of Coq + ]; + + installPhase = '' + runHook preInstall + dune install --prefix $out --libdir $OCAMLFIND_DESTDIR coq-serapi + runHook postInstall + ''; + + meta = with lib; { + homepage = https://github.com/ejgallego/coq-serapi; + description = "SerAPI is a library for machine-to-machine interaction with the Coq proof assistant"; + license = licenses.lgpl21Plus; + maintainers = [ maintainers.Zimmi48 ]; + }; +}).overrideAttrs(o: + let inherit (o) version; in { + src = fetchzip { + url = "https://github.com/ejgallego/coq-serapi/releases/download/${version}/coq-serapi-${ + if version == "8.11.0+0.11.1" then version + else builtins.replaceStrings [ "+" ] [ "." ] version + }.tbz"; + sha256 = release."${version}".sha256; + }; +}) diff --git a/third_party/nixpkgs/pkgs/development/arduino/arduino-ci/default.nix b/third_party/nixpkgs/pkgs/development/embedded/arduino/arduino-ci/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/arduino/arduino-ci/default.nix rename to third_party/nixpkgs/pkgs/development/embedded/arduino/arduino-ci/default.nix diff --git a/third_party/nixpkgs/pkgs/development/arduino/arduino-cli/default.nix b/third_party/nixpkgs/pkgs/development/embedded/arduino/arduino-cli/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/arduino/arduino-cli/default.nix rename to third_party/nixpkgs/pkgs/development/embedded/arduino/arduino-cli/default.nix diff --git a/third_party/nixpkgs/pkgs/development/arduino/arduino-core/default.nix b/third_party/nixpkgs/pkgs/development/embedded/arduino/arduino-core/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/arduino/arduino-core/default.nix rename to third_party/nixpkgs/pkgs/development/embedded/arduino/arduino-core/default.nix diff --git a/third_party/nixpkgs/pkgs/development/arduino/arduino-core/downloads.nix b/third_party/nixpkgs/pkgs/development/embedded/arduino/arduino-core/downloads.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/arduino/arduino-core/downloads.nix rename to third_party/nixpkgs/pkgs/development/embedded/arduino/arduino-core/downloads.nix diff --git a/third_party/nixpkgs/pkgs/development/arduino/arduino-mk/default.nix b/third_party/nixpkgs/pkgs/development/embedded/arduino/arduino-mk/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/arduino/arduino-mk/default.nix rename to third_party/nixpkgs/pkgs/development/embedded/arduino/arduino-mk/default.nix diff --git a/third_party/nixpkgs/pkgs/development/arduino/ino/default.nix b/third_party/nixpkgs/pkgs/development/embedded/arduino/ino/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/arduino/ino/default.nix rename to third_party/nixpkgs/pkgs/development/embedded/arduino/ino/default.nix diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/avrdude/default.nix b/third_party/nixpkgs/pkgs/development/embedded/avrdude/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/tools/misc/avrdude/default.nix rename to third_party/nixpkgs/pkgs/development/embedded/avrdude/default.nix diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/blackmagic/default.nix b/third_party/nixpkgs/pkgs/development/embedded/blackmagic/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/tools/misc/blackmagic/default.nix rename to third_party/nixpkgs/pkgs/development/embedded/blackmagic/default.nix diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/blackmagic/helper.sh b/third_party/nixpkgs/pkgs/development/embedded/blackmagic/helper.sh similarity index 100% rename from third_party/nixpkgs/pkgs/development/tools/misc/blackmagic/helper.sh rename to third_party/nixpkgs/pkgs/development/embedded/blackmagic/helper.sh diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/bossa/bin2c.c b/third_party/nixpkgs/pkgs/development/embedded/bossa/bin2c.c similarity index 100% rename from third_party/nixpkgs/pkgs/development/tools/misc/bossa/bin2c.c rename to third_party/nixpkgs/pkgs/development/embedded/bossa/bin2c.c diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/bossa/bossa-no-applet-build.patch b/third_party/nixpkgs/pkgs/development/embedded/bossa/bossa-no-applet-build.patch similarity index 100% rename from third_party/nixpkgs/pkgs/development/tools/misc/bossa/bossa-no-applet-build.patch rename to third_party/nixpkgs/pkgs/development/embedded/bossa/bossa-no-applet-build.patch diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/bossa/default.nix b/third_party/nixpkgs/pkgs/development/embedded/bossa/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/tools/misc/bossa/default.nix rename to third_party/nixpkgs/pkgs/development/embedded/bossa/default.nix diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/cc-tool/default.nix b/third_party/nixpkgs/pkgs/development/embedded/cc-tool/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/tools/misc/cc-tool/default.nix rename to third_party/nixpkgs/pkgs/development/embedded/cc-tool/default.nix diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/easypdkprog/default.nix b/third_party/nixpkgs/pkgs/development/embedded/easypdkprog/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/tools/misc/easypdkprog/default.nix rename to third_party/nixpkgs/pkgs/development/embedded/easypdkprog/default.nix diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/apio/default.nix b/third_party/nixpkgs/pkgs/development/embedded/fpga/apio/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/tools/misc/apio/default.nix rename to third_party/nixpkgs/pkgs/development/embedded/fpga/apio/default.nix diff --git a/third_party/nixpkgs/pkgs/development/tools/ecpdap/default.nix b/third_party/nixpkgs/pkgs/development/embedded/fpga/ecpdap/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/tools/ecpdap/default.nix rename to third_party/nixpkgs/pkgs/development/embedded/fpga/ecpdap/default.nix diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/fujprog/default.nix b/third_party/nixpkgs/pkgs/development/embedded/fpga/fujprog/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/tools/misc/fujprog/default.nix rename to third_party/nixpkgs/pkgs/development/embedded/fpga/fujprog/default.nix diff --git a/third_party/nixpkgs/pkgs/development/tools/icestorm/default.nix b/third_party/nixpkgs/pkgs/development/embedded/fpga/icestorm/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/tools/icestorm/default.nix rename to third_party/nixpkgs/pkgs/development/embedded/fpga/icestorm/default.nix diff --git a/third_party/nixpkgs/pkgs/development/tools/lattice-diamond/default.nix b/third_party/nixpkgs/pkgs/development/embedded/fpga/lattice-diamond/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/tools/lattice-diamond/default.nix rename to third_party/nixpkgs/pkgs/development/embedded/fpga/lattice-diamond/default.nix diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/openfpgaloader/default.nix b/third_party/nixpkgs/pkgs/development/embedded/fpga/openfpgaloader/default.nix similarity index 87% rename from third_party/nixpkgs/pkgs/development/tools/misc/openfpgaloader/default.nix rename to third_party/nixpkgs/pkgs/development/embedded/fpga/openfpgaloader/default.nix index 1e3b3469dc..b08c94439b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/openfpgaloader/default.nix +++ b/third_party/nixpkgs/pkgs/development/embedded/fpga/openfpgaloader/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "openfpgaloader"; - version = "0.2.6"; + version = "0.5.0"; src = fetchFromGitHub { owner = "trabucayre"; repo = "openFPGALoader"; rev = "v${version}"; - sha256 = "sha256-OWRMWNOPm6flgeTKYWYE+LcG3HW6i8s2NQ1dr/oeOEw="; + sha256 = "sha256-g1mr7S9Z70A+dXWptZPLHt90JpuclJAEDwUTicpxtic="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/tinyprog/default.nix b/third_party/nixpkgs/pkgs/development/embedded/fpga/tinyprog/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/tools/misc/tinyprog/default.nix rename to third_party/nixpkgs/pkgs/development/embedded/fpga/tinyprog/default.nix diff --git a/third_party/nixpkgs/pkgs/development/tools/trellis/default.nix b/third_party/nixpkgs/pkgs/development/embedded/fpga/trellis/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/tools/trellis/default.nix rename to third_party/nixpkgs/pkgs/development/embedded/fpga/trellis/default.nix diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/gputils/default.nix b/third_party/nixpkgs/pkgs/development/embedded/gputils/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/tools/misc/gputils/default.nix rename to third_party/nixpkgs/pkgs/development/embedded/gputils/default.nix diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/openocd/default.nix b/third_party/nixpkgs/pkgs/development/embedded/openocd/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/tools/misc/openocd/default.nix rename to third_party/nixpkgs/pkgs/development/embedded/openocd/default.nix diff --git a/third_party/nixpkgs/pkgs/development/arduino/platformio/chrootenv.nix b/third_party/nixpkgs/pkgs/development/embedded/platformio/chrootenv.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/arduino/platformio/chrootenv.nix rename to third_party/nixpkgs/pkgs/development/embedded/platformio/chrootenv.nix diff --git a/third_party/nixpkgs/pkgs/development/arduino/platformio/core.nix b/third_party/nixpkgs/pkgs/development/embedded/platformio/core.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/arduino/platformio/core.nix rename to third_party/nixpkgs/pkgs/development/embedded/platformio/core.nix diff --git a/third_party/nixpkgs/pkgs/development/arduino/platformio/default.nix b/third_party/nixpkgs/pkgs/development/embedded/platformio/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/arduino/platformio/default.nix rename to third_party/nixpkgs/pkgs/development/embedded/platformio/default.nix diff --git a/third_party/nixpkgs/pkgs/development/arduino/platformio/fix-searchpath.patch b/third_party/nixpkgs/pkgs/development/embedded/platformio/fix-searchpath.patch similarity index 100% rename from third_party/nixpkgs/pkgs/development/arduino/platformio/fix-searchpath.patch rename to third_party/nixpkgs/pkgs/development/embedded/platformio/fix-searchpath.patch diff --git a/third_party/nixpkgs/pkgs/development/arduino/platformio/missing-udev-rules-nixos.patch b/third_party/nixpkgs/pkgs/development/embedded/platformio/missing-udev-rules-nixos.patch similarity index 100% rename from third_party/nixpkgs/pkgs/development/arduino/platformio/missing-udev-rules-nixos.patch rename to third_party/nixpkgs/pkgs/development/embedded/platformio/missing-udev-rules-nixos.patch diff --git a/third_party/nixpkgs/pkgs/development/arduino/platformio/use-local-spdx-license-list.patch b/third_party/nixpkgs/pkgs/development/embedded/platformio/use-local-spdx-license-list.patch similarity index 100% rename from third_party/nixpkgs/pkgs/development/arduino/platformio/use-local-spdx-license-list.patch rename to third_party/nixpkgs/pkgs/development/embedded/platformio/use-local-spdx-license-list.patch diff --git a/third_party/nixpkgs/pkgs/development/tools/rshell/default.nix b/third_party/nixpkgs/pkgs/development/embedded/rshell/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/tools/rshell/default.nix rename to third_party/nixpkgs/pkgs/development/embedded/rshell/default.nix diff --git a/third_party/nixpkgs/pkgs/development/misc/stm32/betaflight/default.nix b/third_party/nixpkgs/pkgs/development/embedded/stm32/betaflight/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/misc/stm32/betaflight/default.nix rename to third_party/nixpkgs/pkgs/development/embedded/stm32/betaflight/default.nix diff --git a/third_party/nixpkgs/pkgs/development/misc/stm32/inav/default.nix b/third_party/nixpkgs/pkgs/development/embedded/stm32/inav/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/misc/stm32/inav/default.nix rename to third_party/nixpkgs/pkgs/development/embedded/stm32/inav/default.nix diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/stm32cubemx/default.nix b/third_party/nixpkgs/pkgs/development/embedded/stm32/stm32cubemx/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/tools/misc/stm32cubemx/default.nix rename to third_party/nixpkgs/pkgs/development/embedded/stm32/stm32cubemx/default.nix diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/stm32flash/default.nix b/third_party/nixpkgs/pkgs/development/embedded/stm32/stm32flash/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/tools/misc/stm32flash/default.nix rename to third_party/nixpkgs/pkgs/development/embedded/stm32/stm32flash/default.nix diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/teensy-loader-cli/default.nix b/third_party/nixpkgs/pkgs/development/embedded/teensy-loader-cli/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/tools/misc/teensy-loader-cli/default.nix rename to third_party/nixpkgs/pkgs/development/embedded/teensy-loader-cli/default.nix diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/uisp/default.nix b/third_party/nixpkgs/pkgs/development/embedded/uisp/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/tools/misc/uisp/default.nix rename to third_party/nixpkgs/pkgs/development/embedded/uisp/default.nix diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/xc3sprog/default.nix b/third_party/nixpkgs/pkgs/development/embedded/xc3sprog/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/tools/misc/xc3sprog/default.nix rename to third_party/nixpkgs/pkgs/development/embedded/xc3sprog/default.nix diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix index 6683dcc55b..98482e03a8 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix @@ -1458,6 +1458,10 @@ self: super: { addBuildDepend (unmarkBroken super.hercules-ci-cli) super.hercules-ci-optparse-applicative ); + # Readline uses Distribution.Simple from Cabal 2, in a way that is not + # compatible with Cabal 3. No upstream repository found so far + readline = appendPatch super.readline ./patches/readline-fix-for-cabal-3.patch; + # 2020-12-05: http-client is fixed on too old version essence-of-live-coding-warp = doJailbreak (super.essence-of-live-coding-warp.override { http-client = self.http-client_0_7_8; diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 11a78272fa..a6fafbe8a9 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -735,6 +735,7 @@ broken-packages: - compilation - complex-generic - compose-trans + - composite-dhall - composite-opaleye - composition-tree - comprehensions-ghc @@ -2558,6 +2559,7 @@ broken-packages: - jenga - jenkinsPlugins2nix - jespresso + - jet-stream - jinquantities - jml-web-service - jni @@ -3898,7 +3900,6 @@ broken-packages: - read-bounded - read-ctags - read-io - - readline - readme-lhs - readshp - really-simple-xml-parser diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index fe7cf4b215..1c74de902d 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -58,7 +58,6 @@ dont-distribute-packages: - CC-delcont-alt - CMCompare - CPBrainfuck - - CPL - CSPM-Interpreter - CSPM-ToProlog - CSPM-cspm @@ -371,8 +370,6 @@ dont-distribute-packages: - XSaiga - YACPong - Yablog - - Yogurt - - Yogurt-Standalone - Z-Botan - Z-IO - Z-MessagePack @@ -1559,7 +1556,6 @@ dont-distribute-packages: - hoodle-publish - hoodle-render - hoovie - - hoq - hp2any-graph - hp2any-manager - hpaco @@ -1613,7 +1609,6 @@ dont-distribute-packages: - hset - hsfacter - hslogstash - - hsnock - hspec-expectations-pretty - hspec-pg-transact - hspec-setup @@ -1655,7 +1650,6 @@ dont-distribute-packages: - hunt-searchengine - hunt-server - hurdle - - husky - huzzy - hw-all - hw-dsv @@ -1973,6 +1967,8 @@ dont-distribute-packages: - llvm-tools - lmonad-yesod - lnd-client + - lnurl + - lnurl-authenticator - local-search - localize - locked-poll @@ -2078,7 +2074,6 @@ dont-distribute-packages: - minecraft-data - minesweeper - mini-egison - - miniforth - minilight-lua - minimung - minioperational @@ -2087,7 +2082,6 @@ dont-distribute-packages: - missing-py2 - mixed-strategies - mkbndl - - mkcabal - mlist - mmark-cli - mmark-ext @@ -2107,6 +2101,7 @@ dont-distribute-packages: - monetdb-mapi - mongrel2-handler - monky + - monomer - monte-carlo - moo - moo-nad @@ -2385,6 +2380,7 @@ dont-distribute-packages: - postgresql-tx-query - postgresql-tx-squeal - postgresql-tx-squeal-compat-simple + - postgrest_8_0_0 - postmark - potoki - potoki-cereal @@ -2449,7 +2445,6 @@ dont-distribute-packages: - queryparser-hive - queryparser-presto - queryparser-vertica - - questioner - queuelike - quickbench - quickcheck-combinators @@ -2513,7 +2508,6 @@ dont-distribute-packages: - reactive-fieldtrip - reactive-glut - reactor - - readline-statevar - readpyc - reanimate - record-aeson @@ -2899,7 +2893,6 @@ dont-distribute-packages: - svg2q - svgone - swapper - - swearjure - sweet-egison - switch - sylvia @@ -3041,7 +3034,6 @@ dont-distribute-packages: - twidge - twilight-stm - twill - - twitter - twitter-enumerator - type-assertions - type-cache diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix index 8042c63fbc..e916800ba8 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix @@ -2483,7 +2483,6 @@ self: { ]; description = "An interpreter of Hagino's Categorical Programming Language (CPL)"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "CSPM-CoreLanguage" = callPackage @@ -11589,8 +11588,8 @@ self: { }: mkDerivation { pname = "Jikka"; - version = "5.1.0.0"; - sha256 = "0zr558lds5gqlgdpxgm65zjm4frcln50wr9q01djjq3441cxciqf"; + version = "5.2.0.0"; + sha256 = "0rg96x1y928dd8n2znddp8b2wgmpv6vdkm4s8xcr39rqw4jsqk0l"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -13766,8 +13765,8 @@ self: { pname = "MonadRandom"; version = "0.5.3"; sha256 = "17qaw1gg42p9v6f87dj5vih7l88lddbyd8880ananj8avanls617"; - revision = "1"; - editedCabalFile = "1wpgmcv704i7x38jwalnbmx8c10vdw269gbvzjxaj4rlvff3s4sq"; + revision = "2"; + editedCabalFile = "1diy29if7w1c9ckc465mrrb52fm0zmd8zzym1h5ryh5a58qafwhr"; libraryHaskellDepends = [ base mtl primitive random transformers transformers-compat ]; @@ -21918,7 +21917,6 @@ self: { ]; description = "A MUD client library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "Yogurt-Standalone" = callPackage @@ -21938,7 +21936,6 @@ self: { executableSystemDepends = [ readline ]; description = "A functional MUD client"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) readline;}; "Z-Botan" = callPackage @@ -44686,19 +44683,19 @@ self: { }) {}; "bnb-staking-csvs" = callPackage - ({ mkDerivation, aeson, base, bytestring, cassava, hedgehog, req - , scientific, tasty, tasty-hedgehog, tasty-hunit, text, time + ({ mkDerivation, aeson, base, bytestring, cassava, cmdargs + , cointracking-imports, hedgehog, req, scientific, tasty + , tasty-hedgehog, tasty-hunit, text, time }: mkDerivation { pname = "bnb-staking-csvs"; - version = "0.1.0.0"; - sha256 = "0dy68qklr8zajcmw4zff921n35j99klgndpgpq0ra9k3g6n22gkn"; - revision = "1"; - editedCabalFile = "0pjrkqkjyq3hl14q7k9sx2xia06z06lv2i1sfs0vbcc3fh1s3wn1"; + version = "0.2.0.0"; + sha256 = "1m2bd6cwlgavq3nri3xwbqim2zikzv1dxqf5a5gxkqra1qgbvm4v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base bytestring cassava req scientific text time + aeson base bytestring cassava cmdargs cointracking-imports req + scientific text time ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ @@ -47593,6 +47590,22 @@ self: { license = lib.licenses.gpl3Only; }) {}; + "byte-count-reader_0_10_1_4" = callPackage + ({ mkDerivation, base, extra, hspec, parsec, parsec-numbers, text + }: + mkDerivation { + pname = "byte-count-reader"; + version = "0.10.1.4"; + sha256 = "1rscz0dqz8h4cazf1kb0w628a93ysphrih5x0yppvl3w0iy26sh0"; + libraryHaskellDepends = [ base extra parsec parsec-numbers text ]; + testHaskellDepends = [ + base extra hspec parsec parsec-numbers text + ]; + description = "Read strings describing a number of bytes like 2Kb and 0.5 MiB"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "byte-order" = callPackage ({ mkDerivation, base, primitive, primitive-unaligned }: mkDerivation { @@ -51154,8 +51167,8 @@ self: { }: mkDerivation { pname = "capnp"; - version = "0.11.0.0"; - sha256 = "1pbgnaiv1zlykpc13vgr5aklfjc2bl84nz8fpvga5djjd0x905cw"; + version = "0.12.0.0"; + sha256 = "0wv1rp511vzq7hkzcgcpa0jvc90bflysddz0s69dzl6llr71gb6x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -53858,20 +53871,18 @@ self: { "chassis" = callPackage ({ mkDerivation, base, bytestring, comonad, composite-base - , containers, contravariant, distributive, either, exceptions - , extra, first-class-families, path, profunctors, rio, text, time - , vinyl + , containers, distributive, extra, first-class-families, path + , profunctors, text, time, vinyl }: mkDerivation { pname = "chassis"; - version = "0.0.5.0"; - sha256 = "0f9iipl7l9jhi6754yysk9kkliiab60ds95k8r4gjcch3hh4zbcj"; + version = "0.0.6.0"; + sha256 = "0lb2hkyzyq7rm3h6s5n16v4zvqsan98p3k3a1fig9gf61538rkvy"; libraryHaskellDepends = [ - base bytestring comonad composite-base containers contravariant - distributive either exceptions extra first-class-families path - profunctors rio text time vinyl + base bytestring comonad composite-base containers distributive + extra first-class-families path profunctors text time vinyl ]; - description = "Prelude with algebraic constructs and polykinds on"; + description = "Polykinded Prelude Kernel"; license = lib.licenses.mit; }) {}; @@ -54377,6 +54388,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "chimera_0_3_2_0" = callPackage + ({ mkDerivation, adjunctions, base, distributive, mtl, QuickCheck + , random, tasty, tasty-bench, tasty-hunit, tasty-quickcheck + , tasty-smallcheck, vector + }: + mkDerivation { + pname = "chimera"; + version = "0.3.2.0"; + sha256 = "1p8in1a37hrb0qwvabwi4a9ahzydkd8j3v402cn2i3xmkzcr0kh9"; + libraryHaskellDepends = [ + adjunctions base distributive mtl vector + ]; + testHaskellDepends = [ + base QuickCheck tasty tasty-hunit tasty-quickcheck tasty-smallcheck + vector + ]; + benchmarkHaskellDepends = [ base mtl random tasty-bench ]; + description = "Lazy infinite streams with O(1) indexing and applications for memoization"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "chiphunk" = callPackage ({ mkDerivation, base, c2hs, hashable, safe-exceptions, StateVar , vector-space @@ -58669,6 +58702,27 @@ self: { broken = true; }) {}; + "cointracking-imports" = callPackage + ({ mkDerivation, base, base-compat-batteries, bytestring, cassava + , filepath, hedgehog, lens, scientific, tasty, tasty-hedgehog + , tasty-hunit, text, time, xlsx + }: + mkDerivation { + pname = "cointracking-imports"; + version = "0.1.0.1"; + sha256 = "19in8n8sigcbph29cgrbg1ccbxzadav1siryfjfc1g112p6mrf91"; + libraryHaskellDepends = [ + base base-compat-batteries bytestring cassava filepath lens + scientific text time xlsx + ]; + testHaskellDepends = [ + base base-compat-batteries bytestring cassava filepath hedgehog + lens scientific tasty tasty-hedgehog tasty-hunit text time xlsx + ]; + description = "Generate CSV & XLSX files for importing into CoinTracking"; + license = lib.licenses.bsd3; + }) {}; + "colada" = callPackage ({ mkDerivation, base, bytestring, cereal, cmdargs, containers , fclabels, ghc-prim, ListZipper, monad-atom, mtl, nlp-scores @@ -60132,6 +60186,8 @@ self: { pname = "compdoc"; version = "0.3.0.0"; sha256 = "07gbs64r8qsxw4j0mlk7kldbdjjzz4v34pm8b5cj7a6r1l33w7k5"; + revision = "3"; + editedCabalFile = "1k9hahs857mg72krmhb0n1igfqy344pnlllbishrrj6hknc84xfq"; libraryHaskellDepends = [ aeson base composite-aeson composite-aeson-throw composite-base pandoc pandoc-throw path rio vinyl @@ -60496,16 +60552,21 @@ self: { }) {}; "composite-dhall" = callPackage - ({ mkDerivation, base, composite-base, dhall, lens, text }: + ({ mkDerivation, base, composite-base, dhall, tasty, tasty-hunit + , text, vinyl + }: mkDerivation { pname = "composite-dhall"; - version = "0.0.1.0"; - sha256 = "1hhy3incp4j8n0c8jyk12qi9zgxmwqpvb08zhc8rql855g88rpfq"; - revision = "3"; - editedCabalFile = "0c6mim2i1bzdnm19cglm01i6kf0yka8i5nwjl7wcczvqy27fqlrz"; - libraryHaskellDepends = [ base composite-base dhall lens text ]; + version = "0.0.3.0"; + sha256 = "1ynamdgamlri6ll0vh02kp4iy04vgsplsrda49by1b4vc9b4hcdz"; + libraryHaskellDepends = [ base composite-base dhall text vinyl ]; + testHaskellDepends = [ + base composite-base dhall tasty tasty-hunit text vinyl + ]; description = "Dhall instances for composite records"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "composite-ekg" = callPackage @@ -60533,6 +60594,17 @@ self: { license = lib.licenses.bsd3; }) {}; + "composite-lens-extra" = callPackage + ({ mkDerivation, base, composite-base, lens, vinyl }: + mkDerivation { + pname = "composite-lens-extra"; + version = "0.0.1.0"; + sha256 = "1dcasjymwkgkbpx0ynmdagpazfdnrjidvn5fywnm1jf1r08armzy"; + libraryHaskellDepends = [ base composite-base lens vinyl ]; + description = "Extra lens functions for composite"; + license = lib.licenses.mit; + }) {}; + "composite-opaleye" = callPackage ({ mkDerivation, base, bytestring, composite-base, hspec, lens , opaleye, postgresql-simple, product-profunctors, profunctors @@ -74929,6 +75001,8 @@ self: { pname = "diagrams-builder"; version = "0.8.0.5"; sha256 = "0dz617kfkvjf3f2zbphkdx1scglcjj162qsfk9xj7slbapnj918m"; + revision = "1"; + editedCabalFile = "0rcj755n729gs9rgmjwai1xacigwpyk4b91x0cadfsl7xrgqax0c"; configureFlags = [ "-fcairo" "-fps" "-frasterific" "-fsvg" ]; isLibrary = true; isExecutable = true; @@ -76334,25 +76408,26 @@ self: { }) {}; "diohsc" = callPackage - ({ mkDerivation, asn1-types, base, bytestring, containers - , cryptonite, data-default-class, data-hash, directory + ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring + , containers, cryptonite, data-default-class, data-hash, directory , drunken-bishop, exceptions, filepath, haskeline, hourglass, iconv - , mime, mtl, network, network-simple, network-uri, parsec, pem - , process, regex-compat, safe, temporary, terminal-size, text, tls - , transformers, unix, x509, x509-store, x509-validation + , memory, mime, mtl, network, network-simple, network-uri, parsec + , pem, process, regex-compat, safe, temporary, terminal-size, text + , tls, transformers, unix, x509, x509-store, x509-validation }: mkDerivation { pname = "diohsc"; - version = "0.1.7"; - sha256 = "0xhpj1dhcppvxv8558aai1azx8i3awv4adwl0vffzwj2kas23gjm"; + version = "0.1.8"; + sha256 = "0a614db90pwfc689gb174af6q5fdrb6i9bvhjgvq8vkgldicg4wb"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - asn1-types base bytestring containers cryptonite data-default-class - data-hash directory drunken-bishop exceptions filepath haskeline - hourglass iconv mime mtl network network-simple network-uri parsec - pem process regex-compat safe temporary terminal-size text tls - transformers unix x509 x509-store x509-validation + asn1-encoding asn1-types base bytestring containers cryptonite + data-default-class data-hash directory drunken-bishop exceptions + filepath haskeline hourglass iconv memory mime mtl network + network-simple network-uri parsec pem process regex-compat safe + temporary terminal-size text tls transformers unix x509 x509-store + x509-validation ]; description = "Gemini client"; license = lib.licenses.gpl3Only; @@ -80442,8 +80517,8 @@ self: { }: mkDerivation { pname = "dsv"; - version = "1.0.0.1"; - sha256 = "1lf6fan0mis0hs30yfpslfyj0gpk028z24wca3lylq877pq7z6nz"; + version = "1.0.0.2"; + sha256 = "1499qdsxn6qvavgi0g6x75w0cl21dc1f7nn79ajr0lq56dpdx873"; enableSeparateDataOutput = true; libraryHaskellDepends = [ attoparsec base bytestring cassava containers foldl pipes @@ -83342,6 +83417,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "elm-bridge_0_7_0" = callPackage + ({ mkDerivation, aeson, base, containers, hspec, QuickCheck + , template-haskell, text + }: + mkDerivation { + pname = "elm-bridge"; + version = "0.7.0"; + sha256 = "1ccqsvyy60bzq7vhy9kwbl6rmlnpk0bpy7wyqapm54qxkx71bfk6"; + libraryHaskellDepends = [ aeson base template-haskell ]; + testHaskellDepends = [ + aeson base containers hspec QuickCheck text + ]; + description = "Derive Elm types and Json code from Haskell types, using aeson's options"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "elm-build-lib" = callPackage ({ mkDerivation, base, bytestring, containers, elm-compiler , elm-core-sources, file-embed, template-haskell @@ -89597,6 +89689,25 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "fast-digits_0_3_1_0" = callPackage + ({ mkDerivation, base, integer-gmp, QuickCheck, smallcheck, tasty + , tasty-bench, tasty-quickcheck, tasty-smallcheck + }: + mkDerivation { + pname = "fast-digits"; + version = "0.3.1.0"; + sha256 = "1q6kq5rrd4ivg4s8yhzqsc3gx4n554nz7285mgfqwxgfx8r4mmki"; + libraryHaskellDepends = [ base integer-gmp ]; + testHaskellDepends = [ + base QuickCheck smallcheck tasty tasty-quickcheck tasty-smallcheck + ]; + benchmarkHaskellDepends = [ base tasty-bench ]; + doHaddock = false; + description = "Integer-to-digits conversion"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "fast-downward" = callPackage ({ mkDerivation, base, containers, mtl, process, temporary, text , transformers @@ -102726,8 +102837,8 @@ self: { ({ mkDerivation, base, ghc, transformers }: mkDerivation { pname = "ghc-tcplugin-api"; - version = "0.3.0.0"; - sha256 = "129pcvbyp416gimqva8s368kq64sp17lsyxr2z6j6qbif2xl9pcy"; + version = "0.3.1.0"; + sha256 = "10s9i2n8r3ckdz3kd1s4pwwm4j8p8fg13xhn2m2dy4832iwg12bz"; libraryHaskellDepends = [ base ghc transformers ]; description = "An API for type-checker plugins"; license = lib.licenses.bsd3; @@ -105691,6 +105802,30 @@ self: { license = lib.licenses.bsd3; }) {}; + "github-rest_1_1_0" = callPackage + ({ mkDerivation, aeson, aeson-qq, base, bytestring, http-client + , http-client-tls, http-types, jwt, mtl, scientific, tasty + , tasty-golden, tasty-hunit, tasty-quickcheck, text, time + , transformers, unliftio, unliftio-core + }: + mkDerivation { + pname = "github-rest"; + version = "1.1.0"; + sha256 = "0xyvmc8hj3rfglnhg6xcrdsd9gbii8yzh8qw5xjdyccmdsibckx3"; + libraryHaskellDepends = [ + aeson base bytestring http-client http-client-tls http-types jwt + mtl scientific text time transformers unliftio unliftio-core + ]; + testHaskellDepends = [ + aeson aeson-qq base bytestring http-client http-client-tls + http-types jwt mtl scientific tasty tasty-golden tasty-hunit + tasty-quickcheck text time transformers unliftio unliftio-core + ]; + description = "Query the GitHub REST API programmatically"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "github-tools" = callPackage ({ mkDerivation, base, bytestring, containers, exceptions, github , groom, html, http-client, http-client-tls, monad-parallel @@ -130293,7 +130428,7 @@ self: { maintainers = with lib.maintainers; [ peti ]; }) {}; - "hledger_1_22_1" = callPackage + "hledger_1_22_2" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, base-compat-batteries , bytestring, cmdargs, containers, data-default, Decimal, Diff , directory, extra, filepath, githash, hashable, haskeline @@ -130304,8 +130439,8 @@ self: { }: mkDerivation { pname = "hledger"; - version = "1.22.1"; - sha256 = "0pj0xfjgcfskfm8cfay00jj0amya480846vcv65l2mw191svjb0i"; + version = "1.22.2"; + sha256 = "1g1v56fxgs7ya8yl22brwgrs49a50kd77k8ad8m8l5cnlnviqb3g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -130562,7 +130697,7 @@ self: { license = lib.licenses.gpl3Only; }) {}; - "hledger-lib_1_22_1" = callPackage + "hledger-lib_1_22_2" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, array, base , base-compat-batteries, blaze-markup, bytestring, call-stack , cassava, cassava-megaparsec, cmdargs, containers, data-default @@ -130574,8 +130709,8 @@ self: { }: mkDerivation { pname = "hledger-lib"; - version = "1.22.1"; - sha256 = "090zrvx1af341p0m1n4bdhgv5h5aq93bxnyk9d9yf5bv25zd1r3b"; + version = "1.22.2"; + sha256 = "0xv8g6xyqjlqqlgq4qc0r1nskj4r53q000q5075hzp7gww8lzidl"; libraryHaskellDepends = [ aeson aeson-pretty ansi-terminal array base base-compat-batteries blaze-markup bytestring call-stack cassava cassava-megaparsec @@ -130671,7 +130806,7 @@ self: { maintainers = with lib.maintainers; [ peti ]; }) {}; - "hledger-ui_1_22_1" = callPackage + "hledger-ui_1_22_2" = callPackage ({ mkDerivation, ansi-terminal, async, base, base-compat-batteries , brick, cmdargs, containers, data-default, directory, extra , filepath, fsnotify, hledger, hledger-lib, megaparsec, microlens @@ -130680,8 +130815,8 @@ self: { }: mkDerivation { pname = "hledger-ui"; - version = "1.22.1"; - sha256 = "0q0vrsrg0hblycmrbgibyq8264drli6zjp5ppxpw874vkipjcvip"; + version = "1.22.2"; + sha256 = "07mal5ql3yvx0m38kkfh7zyjqn34m5a07jmhm23mwv4a4pdck4rw"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -130753,7 +130888,7 @@ self: { maintainers = with lib.maintainers; [ peti ]; }) {}; - "hledger-web_1_22_1" = callPackage + "hledger-web_1_22_2" = callPackage ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring , case-insensitive, clientsession, cmdargs, conduit, conduit-extra , containers, data-default, Decimal, directory, extra, filepath @@ -130766,8 +130901,8 @@ self: { }: mkDerivation { pname = "hledger-web"; - version = "1.22.1"; - sha256 = "02ckw3012icz4hmbw7bdiclwwk2cqwrl3ds1f3w9i52lgwk5ncpd"; + version = "1.22.2"; + sha256 = "1ia11h2r6cl1985lij598qighxfhqfcv4am0nyfpvfihik14fq4c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -133737,7 +133872,6 @@ self: { executableToolDepends = [ alex happy ]; description = "A language based on homotopy type theory with an interval type"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; }) {}; "hora" = callPackage @@ -137198,14 +137332,14 @@ self: { , hspec-discover, hspec-expectations, hspec-wai, http-api-data , http-media, http-types, hw-hspec-hedgehog, list-t, microlens , mmorph, mtl, network-uri, retry, scientific, servant - , servant-server, stm, stm-containers, string-conversions - , template-haskell, text, time, unordered-containers, uuid, wai - , wai-extra, warp + , servant-client, servant-client-core, servant-server, stm + , stm-containers, string-conversions, template-haskell, text, time + , unordered-containers, uuid, wai, wai-extra, warp }: mkDerivation { pname = "hscim"; - version = "0.3.4"; - sha256 = "0jyb630gsbiw7zy043mqh9i86nj19y0gn0mgs9hvh21h8xfp6xvj"; + version = "0.3.5"; + sha256 = "16qkrw1a5la2x26d3q1bixxlnf1giqcc8bx4gn4swbynkyrsihr5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -137213,27 +137347,27 @@ self: { email-validate hashable hedgehog hspec hspec-expectations hspec-wai http-api-data http-media http-types hw-hspec-hedgehog list-t microlens mmorph mtl network-uri retry scientific servant - servant-server stm stm-containers string-conversions - template-haskell text time unordered-containers uuid wai wai-extra - warp + servant-client servant-client-core servant-server stm + stm-containers string-conversions template-haskell text time + unordered-containers uuid wai wai-extra warp ]; executableHaskellDepends = [ aeson aeson-qq attoparsec base bytestring case-insensitive email-validate hashable hedgehog hspec hspec-expectations hspec-wai http-api-data http-media http-types hw-hspec-hedgehog list-t microlens mmorph mtl network-uri retry scientific servant - servant-server stm stm-containers string-conversions - template-haskell text time unordered-containers uuid wai wai-extra - warp + servant-client servant-client-core servant-server stm + stm-containers string-conversions template-haskell text time + unordered-containers uuid wai wai-extra warp ]; testHaskellDepends = [ aeson aeson-qq attoparsec base bytestring case-insensitive email-validate hashable hedgehog hspec hspec-expectations hspec-wai http-api-data http-media http-types hw-hspec-hedgehog list-t microlens mmorph mtl network-uri retry scientific servant - servant-server stm stm-containers string-conversions - template-haskell text time unordered-containers uuid wai wai-extra - warp + servant-client servant-client-core servant-server stm + stm-containers string-conversions template-haskell text time + unordered-containers uuid wai wai-extra warp ]; testToolDepends = [ hspec-discover ]; description = "hscim json schema and server implementation"; @@ -138333,7 +138467,6 @@ self: { ]; description = "Nock 5K interpreter"; license = lib.licenses.publicDomain; - hydraPlatforms = lib.platforms.none; }) {}; "hsnoise" = callPackage @@ -143024,7 +143157,6 @@ self: { ]; description = "A simple command line calculator"; license = "GPL"; - hydraPlatforms = lib.platforms.none; }) {}; "hutton" = callPackage @@ -152851,6 +152983,27 @@ self: { broken = true; }) {}; + "jet-stream" = callPackage + ({ mkDerivation, async, base, bytestring, conceit, doctest, foldl + , process, stm, stm-chans, tasty, tasty-hunit, text, time + }: + mkDerivation { + pname = "jet-stream"; + version = "1.0.0.0"; + sha256 = "1nbxm1g83wf2wv0hlrrc37rppj80r4hwij47j98n6rwsm94rvigd"; + libraryHaskellDepends = [ + async base bytestring conceit process stm stm-chans text + ]; + testHaskellDepends = [ + async base bytestring conceit doctest foldl process stm stm-chans + tasty tasty-hunit text time + ]; + description = "Yet another streaming library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "jinquantities" = callPackage ({ mkDerivation, base, containers, doctest, Glob, hlint, hspec, mtl , parsec, process, quantities, regex-compat @@ -167135,6 +167288,47 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "lnurl" = callPackage + ({ mkDerivation, aeson, base, base16, base64, bytestring, cereal + , cryptonite, extra, haskoin-core, http-types, memory, network-uri + , text + }: + mkDerivation { + pname = "lnurl"; + version = "0.1.0.0"; + sha256 = "0rw4z8rg06a1dp0adgnxqgcv75v183apm9lcpc986sx4pns96pjs"; + libraryHaskellDepends = [ + aeson base base16 base64 bytestring cereal cryptonite extra + haskoin-core http-types memory network-uri text + ]; + description = "Support for developing against the LNURL protocol"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + + "lnurl-authenticator" = callPackage + ({ mkDerivation, aeson, base, bech32, bytestring, Clipboard + , containers, cryptonite, directory, filepath, haskeline + , haskoin-core, http-client, http-client-tls, lnurl, memory + , optparse-applicative, text, time + }: + mkDerivation { + pname = "lnurl-authenticator"; + version = "0.1.0.0"; + sha256 = "0jzw0h4rp9i3cqa60i3y0vxhaplqg07qmf1182h6anhzmi16n43h"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bech32 bytestring containers cryptonite directory + filepath haskeline haskoin-core http-client http-client-tls lnurl + memory text time + ]; + executableHaskellDepends = [ base Clipboard optparse-applicative ]; + description = "A command line tool to manage LNURL auth identities"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "load-balancing" = callPackage ({ mkDerivation, base, containers, hslogger, PSQueue, stm }: mkDerivation { @@ -168590,8 +168784,8 @@ self: { }: mkDerivation { pname = "lorentz"; - version = "0.12.0"; - sha256 = "0cx879gb37gbldzhkmkz9bcdq4zkjisqrc7x1i85wqr5xjcaphvb"; + version = "0.12.1"; + sha256 = "1ba511lxmlmv3dj483q6bgk5bvb16d2js0qldz513j4azqjr5f19"; libraryHaskellDepends = [ aeson-pretty base-noprelude bimap bytestring constraints containers data-default first-class-families fmt interpolate lens morley @@ -176326,7 +176520,6 @@ self: { ]; description = "Miniature FORTH-like interpreter"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "minilens" = callPackage @@ -177178,7 +177371,6 @@ self: { ]; description = "Generate cabal files for a Haskell project"; license = "GPL"; - hydraPlatforms = lib.platforms.none; }) {}; "ml-w" = callPackage @@ -180238,6 +180430,48 @@ self: { broken = true; }) {}; + "monomer" = callPackage + ({ mkDerivation, aeson, async, attoparsec, base, bytestring + , bytestring-to-vector, c2hs, containers, data-default, directory + , exceptions, extra, formatting, GLEW, hspec, http-client, HUnit + , JuicyPixels, lens, mtl, nanovg, OpenGL, process, random, safe + , scientific, sdl2, silently, stm, text, text-show, time + , transformers, unordered-containers, vector, websockets, wreq + , wuss + }: + mkDerivation { + pname = "monomer"; + version = "1.0.0.0"; + sha256 = "136ja518hybhdl336772pyl5gfpvq7bzbm4gka53fmw3f42a1gkw"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async attoparsec base bytestring bytestring-to-vector containers + data-default exceptions extra formatting http-client JuicyPixels + lens mtl nanovg OpenGL process safe sdl2 stm text text-show time + transformers unordered-containers vector wreq + ]; + librarySystemDepends = [ GLEW ]; + libraryToolDepends = [ c2hs ]; + executableHaskellDepends = [ + aeson async attoparsec base bytestring bytestring-to-vector + containers data-default exceptions extra formatting http-client + JuicyPixels lens mtl nanovg OpenGL process random safe scientific + sdl2 stm text text-show time transformers unordered-containers + vector websockets wreq wuss + ]; + testHaskellDepends = [ + async attoparsec base bytestring bytestring-to-vector containers + data-default directory exceptions extra formatting hspec + http-client HUnit JuicyPixels lens mtl nanovg OpenGL process safe + sdl2 silently stm text text-show time transformers + unordered-containers vector wreq + ]; + description = "A GUI library for writing native Haskell applications"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {GLEW = null;}; + "monomorphic" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -180528,8 +180762,8 @@ self: { }: mkDerivation { pname = "morley"; - version = "1.15.0"; - sha256 = "174wdjcwkfks7cl3hapm342bf7dgvnfhn6ma6fgdvjd7cag5h8z9"; + version = "1.15.1"; + sha256 = "03r6p37b9hw9n0b143d38z07fjv05jnbw76s1fjx92rm2ybbgh3p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -180561,8 +180795,8 @@ self: { ({ mkDerivation, base-noprelude, lens, universum }: mkDerivation { pname = "morley-prelude"; - version = "0.4.1"; - sha256 = "19d9nxvdr26rmn197rhiwx7nryp6awsmyx6dz1lp9v2f376gs5dh"; + version = "0.4.2"; + sha256 = "0cmrs0hqrbwrmxycqk39csk0y7hswj2r6p1hgzrxyhy536szabby"; libraryHaskellDepends = [ base-noprelude lens universum ]; description = "A custom prelude used in Morley"; license = lib.licenses.mit; @@ -181157,6 +181391,17 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "mpeff" = callPackage + ({ mkDerivation, base, ghc-prim, primitive }: + mkDerivation { + pname = "mpeff"; + version = "0.1.0.0"; + sha256 = "08i06akvjxgxspkz5lrfzyd7fx0pnajb0ksbm38zf66f7zm8dk54"; + libraryHaskellDepends = [ base ghc-prim primitive ]; + description = "Efficient effect handlers based on evidence-passing semantics"; + license = lib.licenses.mit; + }) {}; + "mpg123-bindings" = callPackage ({ mkDerivation, base, mpg123 }: mkDerivation { @@ -195099,6 +195344,34 @@ self: { license = lib.licenses.bsd3; }) {}; + "ormolu_0_2_0_0" = callPackage + ({ mkDerivation, ansi-terminal, base, bytestring, containers, Diff + , dlist, exceptions, filepath, ghc-lib-parser, gitrev, hspec + , hspec-discover, mtl, optparse-applicative, path, path-io, syb + , text + }: + mkDerivation { + pname = "ormolu"; + version = "0.2.0.0"; + sha256 = "0zivz7vcl4m1rjay5md6cdqac9cnfwz9c844l20byiz5h49bwfhb"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal base bytestring containers Diff dlist exceptions + ghc-lib-parser mtl syb text + ]; + executableHaskellDepends = [ + base filepath ghc-lib-parser gitrev optparse-applicative text + ]; + testHaskellDepends = [ + base containers filepath hspec path path-io text + ]; + testToolDepends = [ hspec-discover ]; + description = "A formatter for Haskell source code"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "orthotope" = callPackage ({ mkDerivation, base, deepseq, dlist, HUnit, pretty, QuickCheck , test-framework, test-framework-hunit, test-framework-quickcheck2 @@ -202687,8 +202960,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "phonetic-languages-rhythmicity"; - version = "0.5.2.0"; - sha256 = "05l2nj9rwz0cl3ig8ysi49jjhs7fngfww1rg10klrlg19whwf24j"; + version = "0.6.0.1"; + sha256 = "0rhn5xsqy4b330y17saa78v72dc7lq24y2k5p5r3xfbw621plwba"; libraryHaskellDepends = [ base ]; description = "Allows to estimate the rhythmicity properties for the text"; license = lib.licenses.mit; @@ -202737,8 +203010,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-examples-array"; - version = "0.6.2.0"; - sha256 = "0h6zmvv8zfsaz29z5hyqjw2zcsrjcdxyl76cz8m0yiklinc5b2wb"; + version = "0.7.0.0"; + sha256 = "13v2wizjrnpwi7x42c9aqgsa5yr2x3blpmyqv9jkqxx7ksx0fbfg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -202799,8 +203072,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-generalized-examples-array"; - version = "0.6.2.0"; - sha256 = "03z076ml2wzi521f9p022khhzdg0ymhs52sapqcq6x5xx0x5plzz"; + version = "0.7.0.0"; + sha256 = "1qy4j61mkrkpa5451bzqg92jcbr77djn1jpvdd008pmvzijhnwqr"; libraryHaskellDepends = [ base heaps mmsyn2-array mmsyn3 parallel phonetic-languages-constraints-array @@ -202838,8 +203111,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-generalized-properties-array"; - version = "0.4.2.0"; - sha256 = "09j5j79kclz32g59mbd0djq8hs1r17vy4mcb3n9zvs2ydlsyx2x2"; + version = "0.5.0.0"; + sha256 = "0hxlii3d522ikh6czh720p1x97ixjh3b4s16zr6a2vk3h6pkvqw4"; libraryHaskellDepends = [ base phonetic-languages-phonetics-basics phonetic-languages-rhythmicity phonetic-languages-simplified-base @@ -202890,8 +203163,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-properties-array"; - version = "0.4.2.0"; - sha256 = "0mq7cdlqk6gz54pz394ns7fq3rz0jdwryy6r8kcfpf1qywb61b4s"; + version = "0.5.0.0"; + sha256 = "1zv3ax3idvlhvaspmsalrrw1816rf3w1sza3yscdv221yn1783g7"; libraryHaskellDepends = [ base phonetic-languages-rhythmicity phonetic-languages-simplified-base ukrainian-phonetics-basic-array @@ -209284,6 +209557,53 @@ self: { license = lib.licenses.mit; }) {}; + "postgrest_8_0_0" = callPackage + ({ mkDerivation, aeson, aeson-qq, ansi-wl-pprint, async + , auto-update, base, base64-bytestring, bytestring + , case-insensitive, cassava, configurator-pg, containers + , contravariant, contravariant-extras, cookie, directory, either + , fast-logger, gitrev, hasql, hasql-dynamic-statements + , hasql-notifications, hasql-pool, hasql-transaction, heredoc + , hspec, hspec-wai, hspec-wai-json, HTTP, http-types + , insert-ordered-containers, interpolatedstring-perl6, jose, lens + , lens-aeson, monad-control, mtl, network, network-uri + , optparse-applicative, parsec, process, protolude, Ranged-sets + , regex-tdfa, retry, scientific, swagger2, text, time + , transformers-base, unix, unordered-containers, vector, wai + , wai-cors, wai-extra, wai-logger, wai-middleware-static, warp + }: + mkDerivation { + pname = "postgrest"; + version = "8.0.0"; + sha256 = "0ypgfpm8732rg94yiava27w1pyng9fg0zqad5nb94q1z402rfgfi"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-wl-pprint auto-update base base64-bytestring bytestring + case-insensitive cassava configurator-pg containers contravariant + contravariant-extras cookie directory either fast-logger gitrev + hasql hasql-dynamic-statements hasql-notifications hasql-pool + hasql-transaction heredoc HTTP http-types insert-ordered-containers + interpolatedstring-perl6 jose lens lens-aeson mtl network + network-uri optparse-applicative parsec protolude Ranged-sets + regex-tdfa retry scientific swagger2 text time unix + unordered-containers vector wai wai-cors wai-extra wai-logger + wai-middleware-static warp + ]; + executableHaskellDepends = [ base containers protolude ]; + testHaskellDepends = [ + aeson aeson-qq async auto-update base base64-bytestring bytestring + case-insensitive cassava containers contravariant hasql + hasql-dynamic-statements hasql-pool hasql-transaction heredoc hspec + hspec-wai hspec-wai-json http-types lens lens-aeson monad-control + process protolude regex-tdfa text time transformers-base wai + wai-extra + ]; + description = "REST API for any Postgres database"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "postgrest-ws" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, base, base64-bytestring , bytestring, configurator, containers, contravariant, either @@ -216037,7 +216357,6 @@ self: { ]; description = "A package for prompting values from the command-line"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "queue" = callPackage @@ -219794,8 +220113,6 @@ self: { librarySystemDepends = [ ncurses readline ]; description = "An interface to the GNU readline library"; license = "GPL"; - hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) ncurses; inherit (pkgs) readline;}; "readline-statevar" = callPackage @@ -219807,7 +220124,6 @@ self: { libraryHaskellDepends = [ base readline StateVar ]; description = "Readline with variables (setX/getY) wrapped in state vars"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "readme-lhs" = callPackage @@ -224257,6 +224573,32 @@ self: { broken = true; }) {}; + "req-conduit_1_0_1" = callPackage + ({ mkDerivation, base, bytestring, conduit, conduit-extra, hspec + , hspec-discover, http-client, req, resourcet, temporary + , transformers, weigh + }: + mkDerivation { + pname = "req-conduit"; + version = "1.0.1"; + sha256 = "0zyy9j6iiz8z2jdx25vp77arfbmrck7bjndm3p4s9l9399c5bm62"; + libraryHaskellDepends = [ + base bytestring conduit http-client req resourcet transformers + ]; + testHaskellDepends = [ + base bytestring conduit conduit-extra hspec req resourcet temporary + transformers + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + base bytestring conduit conduit-extra req resourcet temporary weigh + ]; + description = "Conduit helpers for the req HTTP client library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "req-oauth2" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , data-default-class, hspec, http-client, http-types, lens @@ -226197,6 +226539,35 @@ self: { license = lib.licenses.mit; }) {}; + "rio_0_1_21_0" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, directory + , exceptions, filepath, hashable, hspec, hspec-discover, microlens + , microlens-mtl, mtl, primitive, process, QuickCheck, text, time + , typed-process, unix, unliftio, unliftio-core + , unordered-containers, vector + }: + mkDerivation { + pname = "rio"; + version = "0.1.21.0"; + sha256 = "013m4xgsmg8h1rba9krxppz49lc5wz26gksms5zibsjj0w59m58h"; + libraryHaskellDepends = [ + base bytestring containers deepseq directory exceptions filepath + hashable microlens microlens-mtl mtl primitive process text time + typed-process unix unliftio unliftio-core unordered-containers + vector + ]; + testHaskellDepends = [ + base bytestring containers deepseq directory exceptions filepath + hashable hspec microlens microlens-mtl mtl primitive process + QuickCheck text time typed-process unix unliftio unliftio-core + unordered-containers vector + ]; + testToolDepends = [ hspec-discover ]; + description = "A standard library for Haskell"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "rio-app" = callPackage ({ mkDerivation, base, optparse-simple, resourcet, rio }: mkDerivation { @@ -244946,6 +245317,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "snowchecked" = callPackage + ({ mkDerivation, base, bytestring, data-default, deepseq, hedgehog + , time, wide-word + }: + mkDerivation { + pname = "snowchecked"; + version = "0.0.0.3"; + sha256 = "08a4v3i3ky4vbllag7wmmf4qbnf6dan93h7ipcngxk9vhx9wh4vh"; + libraryHaskellDepends = [ + base bytestring data-default deepseq time wide-word + ]; + testHaskellDepends = [ + base bytestring data-default deepseq hedgehog time wide-word + ]; + description = "A checksummed variation on Twitter's Snowflake UID generation algorithm"; + license = lib.licenses.asl20; + }) {}; + "snowflake" = callPackage ({ mkDerivation, base, time }: mkDerivation { @@ -245396,19 +245785,18 @@ self: { "solana-staking-csvs" = callPackage ({ mkDerivation, aeson, base, bytestring, cassava, cmdargs - , hedgehog, mtl, req, scientific, tasty, tasty-hedgehog - , tasty-hunit, text, time + , cointracking-imports, hedgehog, mtl, req, scientific, tasty + , tasty-hedgehog, tasty-hunit, text, time }: mkDerivation { pname = "solana-staking-csvs"; - version = "0.1.0.0"; - sha256 = "1rswlfanbkh6k3f8dnnlrh9wbk8qbi87c61bi30ndw7gndf3gyqj"; - revision = "1"; - editedCabalFile = "0n83h717zi900ph65imqi5z7va00nm492g911m25j0hgnrj0wd06"; + version = "0.1.1.0"; + sha256 = "0ya63vgh0nf4p7hz6fj38m44wr77jj76bf2qxdgra3lpiziqsjd5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base bytestring cassava cmdargs mtl req scientific text time + aeson base bytestring cassava cmdargs cointracking-imports mtl req + scientific text time ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ @@ -254852,7 +255240,6 @@ self: { ]; description = "Clojure without alphanumerics"; license = lib.licenses.lgpl3Only; - hydraPlatforms = lib.platforms.none; }) {}; "sweet-egison" = callPackage @@ -255112,7 +255499,7 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "sydtest_0_3_0_2" = callPackage + "sydtest_0_3_0_3" = callPackage ({ mkDerivation, async, base, bytestring, containers, Diff, dlist , envparse, filepath, MonadRandom, mtl, optparse-applicative, path , path-io, pretty-show, QuickCheck, quickcheck-io, random-shuffle @@ -255121,8 +255508,8 @@ self: { }: mkDerivation { pname = "sydtest"; - version = "0.3.0.2"; - sha256 = "1823g9czwgf0p0jyxlddqwnpwhs3622892c9ah6cacvl9xfl3sg9"; + version = "0.3.0.3"; + sha256 = "1h6x9k5shpsp028d5mhi03pgzg324qglapk1nick1cnr0njr7v7w"; libraryHaskellDepends = [ async base bytestring containers Diff dlist envparse filepath MonadRandom mtl optparse-applicative path path-io pretty-show @@ -261813,18 +262200,29 @@ self: { broken = true; }) {}; - "text_1_2_4_1" = callPackage - ({ mkDerivation, array, base, binary, bytestring, deepseq, ghc-prim - , integer-gmp, template-haskell + "text_1_2_5_0" = callPackage + ({ mkDerivation, array, base, binary, bytestring, bytestring-lexing + , containers, deepseq, directory, filepath, ghc-prim, QuickCheck + , quickcheck-unicode, random, stringsearch, tasty, tasty-bench + , tasty-hunit, tasty-inspection-testing, tasty-quickcheck + , template-haskell, transformers, vector }: mkDerivation { pname = "text"; - version = "1.2.4.1"; - sha256 = "0bnb4g5lpranra58zpwqh14hvwdh6zc4nz3hwppzrpdahi10s7hv"; + version = "1.2.5.0"; + sha256 = "0wwgsq7px8cvmqj3264132xsbj6b92j6mfgd1jlk08vdl8hmx821"; libraryHaskellDepends = [ - array base binary bytestring deepseq ghc-prim integer-gmp + array base binary bytestring deepseq ghc-prim template-haskell + ]; + testHaskellDepends = [ + base bytestring deepseq directory QuickCheck quickcheck-unicode + random tasty tasty-hunit tasty-inspection-testing tasty-quickcheck template-haskell ]; + benchmarkHaskellDepends = [ + base binary bytestring bytestring-lexing containers deepseq + filepath stringsearch tasty-bench transformers vector + ]; doCheck = false; description = "An efficient packed Unicode text type"; license = lib.licenses.bsd2; @@ -267056,8 +267454,8 @@ self: { ({ mkDerivation, base, filepath, hspec, profunctors, text }: mkDerivation { pname = "tophat"; - version = "1.0.3.0"; - sha256 = "07ph3jh84wq9373kzw5xv4gzk2wcq9dj5akw5a79lhzphl9py7w0"; + version = "1.0.4.0"; + sha256 = "1hzppwrdqz4l88r33m1gh9kzialjq82m1mhzqzzlsaicy5ps84zw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base profunctors text ]; @@ -270613,7 +271011,6 @@ self: { ]; description = "A Haskell-based CLI Twitter client"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "twitter-conduit" = callPackage @@ -280813,6 +281210,44 @@ self: { license = lib.licenses.mit; }) {}; + "wai-middleware-auth_0_2_5_1" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, binary + , blaze-builder, blaze-html, bytestring, case-insensitive, cereal + , clientsession, cookie, exceptions, hedgehog, hoauth2, http-client + , http-client-tls, http-conduit, http-reverse-proxy, http-types + , jose, microlens, mtl, optparse-applicative, optparse-simple + , regex-posix, safe-exceptions, shakespeare, tasty, tasty-hedgehog + , tasty-hunit, text, time, unix-compat, unordered-containers + , uri-bytestring, vault, wai, wai-app-static, wai-extra, warp, yaml + }: + mkDerivation { + pname = "wai-middleware-auth"; + version = "0.2.5.1"; + sha256 = "0ch9vh14bhnf7g789rbqqgnn3q2nc892xs73kf7k6l8n9p2md0yd"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base base64-bytestring binary blaze-builder blaze-html + bytestring case-insensitive cereal clientsession cookie exceptions + hoauth2 http-client http-client-tls http-conduit http-reverse-proxy + http-types jose microlens mtl regex-posix safe-exceptions + shakespeare text time unix-compat unordered-containers + uri-bytestring vault wai wai-app-static wai-extra yaml + ]; + executableHaskellDepends = [ + base bytestring cereal clientsession optparse-applicative + optparse-simple wai-extra warp + ]; + testHaskellDepends = [ + aeson base binary bytestring clientsession cookie hedgehog hoauth2 + http-types jose microlens mtl tasty tasty-hedgehog tasty-hunit text + time uri-bytestring wai wai-extra warp + ]; + description = "Authentication middleware that secures WAI application"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "wai-middleware-brotli" = callPackage ({ mkDerivation, base, binary, bytestring, directory, filepath , hs-brotli, http-types, mtl, tasty, tasty-hspec, tasty-hunit, unix @@ -284790,8 +285225,8 @@ self: { }: mkDerivation { pname = "wkt-geom"; - version = "0.0.11"; - sha256 = "19mcfs9php03g3kb7pgfxcpilvmq5bxbyfkx59mk41nx6f0jfl0d"; + version = "0.0.12"; + sha256 = "118wl1g1p4cqbqil0swr5n0czwd5wi2qqngjwdggrhkspzmqbqd1"; libraryHaskellDepends = [ base base16-bytestring binary bytestring containers geojson scientific trifecta utf8-string vector diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/patches/readline-fix-for-cabal-3.patch b/third_party/nixpkgs/pkgs/development/haskell-modules/patches/readline-fix-for-cabal-3.patch new file mode 100644 index 0000000000..95853b32a1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/patches/readline-fix-for-cabal-3.patch @@ -0,0 +1,8 @@ +--- a/Setup.hs 2021-02-04 14:01:09.557970245 +0100 ++++ b/Setup.hs 2021-02-04 14:07:45.047443753 +0100 +@@ -3,4 +3,4 @@ + import Distribution.Simple + + main :: IO () +-main = defaultMainWithHooks defaultUserHooks ++main = defaultMainWithHooks autoconfUserHooks diff --git a/third_party/nixpkgs/pkgs/development/interpreters/acl2/0001-Fix-some-paths-for-Nix-build.patch b/third_party/nixpkgs/pkgs/development/interpreters/acl2/0001-Fix-some-paths-for-Nix-build.patch index 2b7f8b6a53..ac107414a9 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/acl2/0001-Fix-some-paths-for-Nix-build.patch +++ b/third_party/nixpkgs/pkgs/development/interpreters/acl2/0001-Fix-some-paths-for-Nix-build.patch @@ -1,54 +1,46 @@ -From 43d23211dd7d22b5264ed06d446f89d632125da8 Mon Sep 17 00:00:00 2001 +From d0136f350b82ae845d56029db43d153c91d5e494 Mon Sep 17 00:00:00 2001 From: Keshav Kini Date: Sat, 30 May 2020 21:27:47 -0700 -Subject: [PATCH 1/2] Fix some paths for Nix build +Subject: [PATCH] Fix some paths for Nix build --- books/build/features.sh | 1 + - .../ipasir/load-ipasir-sharedlib-raw.lsp | 16 +++---- + .../ipasir/load-ipasir-sharedlib-raw.lsp | 6 +-- books/projects/smtlink/config.lisp | 2 +- books/projects/smtlink/examples/examples.lisp | 4 +- books/projects/smtlink/smtlink-config | 2 +- - .../cl+ssl-20181018-git/src/reload.lisp | 48 ++----------------- - .../shellpool-20150505-git/src/main.lisp | 20 +------- - 7 files changed, 15 insertions(+), 78 deletions(-) + .../cl+ssl-20200610-git/src/reload.lisp | 53 +------------------ + 6 files changed, 8 insertions(+), 60 deletions(-) diff --git a/books/build/features.sh b/books/build/features.sh -index c8493d51a..def853f53 100755 +index d45a7aa61..27256b7cd 100755 --- a/books/build/features.sh +++ b/books/build/features.sh -@@ -84,6 +84,7 @@ fi - +@@ -122,6 +122,7 @@ EOF + fi echo "Determining whether an ipasir shared library is installed" 1>&2 -+IPASIR_SHARED_LIBRARY=${IPASIR_SHARED_LIBRARY:-@libipasirglucose4@/lib/libipasirglucose4.so} - if [[ $IPASIR_SHARED_LIBRARY != '' ]]; - then - if [[ -e $IPASIR_SHARED_LIBRARY ]]; ++IPASIR_SHARED_LIBRARY=${IPASIR_SHARED_LIBRARY:-@libipasir@} + if check_ipasir; then + cat >> Makefile-features < +@@ -30,11 +30,7 @@ --(er-let* ((libname (acl2::getenv$ "IPASIR_SHARED_LIBRARY" acl2::*the-live-state*))) -- (if libname -- (handler-case -- (cffi::load-foreign-library libname) -- (error () (er hard? 'load-ipasir-shardlib-raw -- "Couldn't load the specified ipasir shared library, ~s0." -- libname))) -- (er hard? 'load-ipasir-shardlib-raw -- "Couldn't load an ipasir library because the ~ -- IPASIR_SHARED_LIBRARY environment variable was unset."))) -+(let ((libname "@libipasirglucose4@/lib/libipasirglucose4.so")) -+ (handler-case -+ (cffi::load-foreign-library libname) -+ (error () (er hard? 'load-ipasir-shardlib-raw -+ "Couldn't load the specified ipasir shared library, ~s0." -+ libname)))) + (er-let* ((libname (acl2::getenv$ "IPASIR_SHARED_LIBRARY" acl2::*the-live-state*))) + (handler-case +- (cffi::load-foreign-library +- (or libname +- (cw "WARNING: $IPASIR_SHARED_LIBRARY not specified, ~ +- defaulting to \"libipasirglucose4.so\"") +- "libipasirglucose4.so")) ++ (cffi::load-foreign-library (or libname "@libipasir@")) + (error () (er hard? 'load-ipasir-shardlib-raw + "Couldn't load ipasir shared library from ~s0." + libname)))) diff --git a/books/projects/smtlink/config.lisp b/books/projects/smtlink/config.lisp index c74073174..8d92355f7 100644 --- a/books/projects/smtlink/config.lisp @@ -63,7 +55,7 @@ index c74073174..8d92355f7 100644 ;; ----------------------------------------------------------------- diff --git a/books/projects/smtlink/examples/examples.lisp b/books/projects/smtlink/examples/examples.lisp -index bc66e0165..24f0d639c 100644 +index 90534892f..4ab98b2f0 100644 --- a/books/projects/smtlink/examples/examples.lisp +++ b/books/projects/smtlink/examples/examples.lisp @@ -75,7 +75,7 @@ Subgoal 2 @@ -91,25 +83,32 @@ index 0d2703545..0f58904ea 100644 @@ -1 +1 @@ -smt-cmd=/usr/bin/env python +smt-cmd=python -diff --git a/books/quicklisp/bundle/software/cl+ssl-20181018-git/src/reload.lisp b/books/quicklisp/bundle/software/cl+ssl-20181018-git/src/reload.lisp -index 3f6aa35d0..ac4012363 100644 ---- a/books/quicklisp/bundle/software/cl+ssl-20181018-git/src/reload.lisp -+++ b/books/quicklisp/bundle/software/cl+ssl-20181018-git/src/reload.lisp -@@ -20,54 +20,12 @@ - (in-package :cl+ssl) +diff --git a/books/quicklisp/bundle/software/cl+ssl-20200610-git/src/reload.lisp b/books/quicklisp/bundle/software/cl+ssl-20200610-git/src/reload.lisp +index e5db28645..65eb818a1 100644 +--- a/books/quicklisp/bundle/software/cl+ssl-20200610-git/src/reload.lisp ++++ b/books/quicklisp/bundle/software/cl+ssl-20200610-git/src/reload.lisp +@@ -37,59 +37,10 @@ + ;; These are 32-bit only. (cffi:define-foreign-library libcrypto +- (:windows (:or #+(and windows x86-64) "libcrypto-1_1-x64.dll" +- #+(and windows x86) "libcrypto-1_1.dll" +- "libeay32.dll")) - (:openbsd "libcrypto.so") - (:darwin (:or "/opt/local/lib/libcrypto.dylib" ;; MacPorts - "/sw/lib/libcrypto.dylib" ;; Fink - "/usr/local/opt/openssl/lib/libcrypto.dylib" ;; Homebrew - "/usr/local/lib/libcrypto.dylib" ;; personalized install - "libcrypto.dylib" ;; default system libcrypto, which may have insufficient crypto -- "/usr/lib/libcrypto.dylib"))) +- "/usr/lib/libcrypto.dylib")) +- (:cygwin (:or "cygcrypto-1.1.dll" "cygcrypto-1.0.0.dll"))) + (t "@openssl@/lib/libcrypto.so")) (cffi:define-foreign-library libssl -- (:windows (:or "libssl32.dll" "ssleay32.dll")) +- (:windows (:or #+(and windows x86-64) "libssl-1_1-x64.dll" +- #+(and windows x86) "libssl-1_1.dll" +- "libssl32.dll" +- "ssleay32.dll")) - ;; The default OS-X libssl seems have had insufficient crypto algos - ;; (missing TLSv1_[1,2]_XXX methods, - ;; see https://github.com/cl-plus-ssl/cl-plus-ssl/issues/56) @@ -128,11 +127,13 @@ index 3f6aa35d0..ac4012363 100644 - ;; so we can just use just "libssl.so". - ;; More info at https://github.com/cl-plus-ssl/cl-plus-ssl/pull/2. - (:openbsd "libssl.so") -- ((and :unix (not :cygwin)) (:or "libssl.so.1.0.2m" +- ((and :unix (not :cygwin)) (:or "libssl.so.1.1" +- "libssl.so.1.0.2m" - "libssl.so.1.0.2k" - "libssl.so.1.0.2" - "libssl.so.1.0.1l" - "libssl.so.1.0.1j" +- "libssl.so.1.0.1f" - "libssl.so.1.0.1e" - "libssl.so.1.0.1" - "libssl.so.1.0.0q" @@ -142,49 +143,12 @@ index 3f6aa35d0..ac4012363 100644 - "libssl.so.10" - "libssl.so.4" - "libssl.so")) -- (:cygwin "cygssl-1.0.0.dll") +- (:cygwin (:or "cygssl-1.1.dll" "cygssl-1.0.0.dll")) - (t (:default "libssl3"))) -- --(cffi:define-foreign-library libeay32 -- (:windows "libeay32.dll")) + (t "@openssl@/lib/libssl.so")) -+(cffi:define-foreign-library libeay32) - (unless (member :cl+ssl-foreign-libs-already-loaded *features*) -diff --git a/books/quicklisp/bundle/software/shellpool-20150505-git/src/main.lisp b/books/quicklisp/bundle/software/shellpool-20150505-git/src/main.lisp -index cda8dc94c..11035ea09 100644 ---- a/books/quicklisp/bundle/software/shellpool-20150505-git/src/main.lisp -+++ b/books/quicklisp/bundle/software/shellpool-20150505-git/src/main.lisp -@@ -106,26 +106,8 @@ - ; Glue - - --#-sbcl - (defun find-bash () -- #+windows "bash.exe" -- #-windows "bash") -- --#+sbcl --;; SBCL (on Linux, at least) won't successfully run "bash" all by itself. So, --;; on SBCL, try to find a likely bash. BOZO this probably isn't great. It --;; would be better to search the user's PATH for which bash to use. --(let ((found-bash)) -- (defun find-bash () -- (or found-bash -- (let ((paths-to-try '("/bin/bash" -- "/usr/bin/bash" -- "/usr/local/bin/bash"))) -- (loop for path in paths-to-try do -- (when (cl-fad::file-exists-p path) -- (setq found-bash path) -- (return-from find-bash path))) -- (error "Bash not found among ~s" paths-to-try))))) -+ "@bash@/bin/bash") - - #+(or allegro lispworks) - (defstruct bashprocess -- -2.25.4 +2.31.1 diff --git a/third_party/nixpkgs/pkgs/development/interpreters/acl2/0002-Restrict-RDTSC-to-x86.patch b/third_party/nixpkgs/pkgs/development/interpreters/acl2/0002-Restrict-RDTSC-to-x86.patch deleted file mode 100644 index 74af5adef6..0000000000 --- a/third_party/nixpkgs/pkgs/development/interpreters/acl2/0002-Restrict-RDTSC-to-x86.patch +++ /dev/null @@ -1,29 +0,0 @@ -From b0ccf68f277d0bd5e6fc9d41742f31ddda99a955 Mon Sep 17 00:00:00 2001 -From: Keshav Kini -Date: Mon, 1 Jun 2020 21:42:24 -0700 -Subject: [PATCH 2/2] Restrict RDTSC to x86 - -Backported from [1]. According to Curtis Dunham, this should fix the ACL2 base -system build on ARM. - -[1]: https://github.com/acl2/acl2/commit/292fa2ccc6217e6307d7bb8373eb90f5d258ea5e ---- - memoize-raw.lisp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/memoize-raw.lisp b/memoize-raw.lisp -index 205e78653..478198dee 100644 ---- a/memoize-raw.lisp -+++ b/memoize-raw.lisp -@@ -189,7 +189,7 @@ - ;; RDTSC nonsense, but we still can report mysterious results since we have no - ;; clue about which core we are running on in CCL (or, presumably, SBCL). - --#+(or ccl sbcl) -+#+(and (or ccl sbcl) x86-64) - (eval-when - (:execute :compile-toplevel :load-toplevel) - (when #+ccl (fboundp 'ccl::rdtsc) --- -2.25.4 - diff --git a/third_party/nixpkgs/pkgs/development/interpreters/acl2/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/acl2/default.nix index c089916158..9436cf58e4 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/acl2/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/acl2/default.nix @@ -1,50 +1,53 @@ -{ lib, stdenv, callPackage, fetchFromGitHub, writeShellScriptBin, substituteAll +{ lib, stdenv, callPackage, fetchFromGitHub, runCommandLocal, makeWrapper, substituteAll , sbcl, bash, which, perl, nettools -, openssl, glucose, minisat, abc-verifier, z3, python2 +, openssl, glucose, minisat, abc-verifier, z3, python , certifyBooks ? true } @ args: let - # Disable immobile space so we don't run out of memory on large books; see + # Disable immobile space so we don't run out of memory on large books, and + # supply 2GB of dynamic space to avoid exhausting the heap while building the + # ACL2 system itself; see # https://www.cs.utexas.edu/users/moore/acl2/current/HTML/installation/requirements.html#Obtaining-SBCL - sbcl = args.sbcl.override { disableImmobileSpace = true; }; - - # Wrap to add `-model` argument because some of the books in 8.3 need this. - # Fixed upstream (https://github.com/acl2/acl2/commit/0359538a), so this can - # be removed in ACL2 8.4. - glucose = writeShellScriptBin "glucose" ''exec ${args.glucose}/bin/glucose -model "$@"''; + sbcl' = args.sbcl.override { disableImmobileSpace = true; }; + sbcl = runCommandLocal args.sbcl.name { buildInputs = [ makeWrapper ]; } '' + makeWrapper ${sbcl'}/bin/sbcl $out/bin/sbcl \ + --add-flags "--dynamic-space-size 2000" + ''; in stdenv.mkDerivation rec { pname = "acl2"; - version = "8.3"; + version = "8.4"; src = fetchFromGitHub { owner = "acl2-devel"; repo = "acl2-devel"; rev = version; - sha256 = "0c0wimaf16nrr3d6cxq6p7nr7rxffvpmn66hkpwc1m6zpcipf0y5"; + sha256 = "16rr9zqmd3y1sd6zxff2f9gdd84l99pr7mdp1sjwmh427h661c68"; }; - libipasirglucose4 = callPackage ./libipasirglucose4 { }; + # You can swap this out with any other IPASIR implementation at + # build time by using overrideAttrs (make sure the derivation you + # use has a "libname" attribute so we can plug it into the patch + # below). Or, you can override it at runtime by setting the + # $IPASIR_SHARED_LIBRARY environment variable. + libipasir = callPackage ./libipasirglucose4 { }; - patches = [ - (substituteAll { - src = ./0001-Fix-some-paths-for-Nix-build.patch; - inherit bash libipasirglucose4; - openssl = openssl.out; - }) - ./0002-Restrict-RDTSC-to-x86.patch - ]; + patches = [(substituteAll { + src = ./0001-Fix-some-paths-for-Nix-build.patch; + libipasir = "${libipasir}/lib/${libipasir.libname}"; + openssl = openssl.out; + })]; buildInputs = [ # ACL2 itself only needs a Common Lisp compiler/interpreter: sbcl ] ++ lib.optionals certifyBooks [ # To build community books, we need Perl and a couple of utilities: - which perl nettools + which perl nettools makeWrapper # Some of the books require one or more of these external tools: - openssl.out glucose minisat abc-verifier libipasirglucose4 - z3 (python2.withPackages (ps: [ ps.z3 ])) + openssl.out glucose minisat abc-verifier libipasir + z3 (python.withPackages (ps: [ ps.z3 ])) ]; # NOTE: Parallel building can be memory-intensive depending on the number of @@ -71,7 +74,7 @@ in stdenv.mkDerivation rec { ''; preBuild = "mkdir -p $HOME"; - makeFlags="LISP=${sbcl}/bin/sbcl"; + makeFlags = "LISP=${sbcl}/bin/sbcl ACL2_MAKE_LOG=NONE"; doCheck = true; checkTarget = "mini-proveall"; @@ -90,8 +93,13 @@ in stdenv.mkDerivation rec { # Certify the community books pushd $out/share/${pname}/books makeFlags="ACL2=$out/share/${pname}/saved_acl2" - buildFlags="everything" + buildFlags="all" buildPhase + + # Clean up some stuff to save space + find -name '*@useless-runes.lsp' -execdir rm {} + # saves ~1GB of space + find -name '*.cert.out' -execdir gzip {} + # saves ~400MB of space + popd ''; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/acl2/libipasirglucose4/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/acl2/libipasirglucose4/default.nix index 5c10c176c1..dc8308267f 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/acl2/libipasirglucose4/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/acl2/libipasirglucose4/default.nix @@ -1,17 +1,14 @@ { lib, stdenv, fetchurl, zlib, unzip }: -let - - cxx = "${stdenv.cc.targetPrefix}c++"; - libName = "libipasirglucose4" + stdenv.targetPlatform.extensions.sharedLibrary; - -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "libipasirglucose4"; # This library has no version number AFAICT (beyond generally being based on # Glucose 4.x), but it was submitted to the 2017 SAT competition so let's use # that as the version number, I guess. version = "2017"; + libname = pname + stdenv.targetPlatform.extensions.sharedLibrary; + src = fetchurl { url = "https://baldur.iti.kit.edu/sat-competition-2017/solvers/incremental/glucose-ipasir.zip"; sha256 = "0xchgady9vwdh8frmc8swz6va53igp2wj1y9sshd0g7549n87wdj"; @@ -23,16 +20,16 @@ in stdenv.mkDerivation rec { sourceRoot = "sat/glucose4"; patches = [ ./0001-Support-shared-library-build.patch ]; - makeFlags = [ "CXX=${cxx}" ]; + makeFlags = [ "CXX=${stdenv.cc.targetPrefix}c++" ]; postBuild = '' - ${cxx} -shared -o ${libName} \ - ${if stdenv.cc.isClang then "" else "-Wl,-soname,${libName}"} \ + $CXX -shared -o ${libname} \ + ${if stdenv.cc.isClang then "" else "-Wl,-soname,${libname}"} \ ipasirglucoseglue.o libipasirglucose4.a ''; installPhase = '' - install -D ${libName} $out/lib/${libName} + install -D ${libname} $out/lib/${libname} ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/interpreters/cling/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/cling/default.nix index 73ed5b523d..968817cf06 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/cling/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/cling/default.nix @@ -7,7 +7,6 @@ , fetchgit , makeWrapper , runCommand -, runCommandNoCC , llvmPackages_5 , glibc , ncurses @@ -85,7 +84,7 @@ let # https://github.com/root-project/cling/blob/v0.7/lib/Interpreter/CIFactory.cpp#L107:L111 # Note: it would be nice to just put the compiler in Cling's PATH and let it do this by itself, but # unfortunately passing -nostdinc/-nostdinc++ disables Cling's autodetection logic. - compilerIncludeFlags = runCommandNoCC "compiler-include-flags.txt" {} '' + compilerIncludeFlags = runCommand "compiler-include-flags.txt" {} '' export LC_ALL=C ${stdenv.cc}/bin/c++ -xc++ -E -v /dev/null 2>&1 | sed -n -e '/^.include/,''${' -e '/^ \/.*++/p' -e '}' > tmp sed -e 's/^/-isystem /' -i tmp diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/default.nix index 572cbdccbf..2030fab173 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/default.nix @@ -1,4 +1,4 @@ -{ interpreter, writeText, runCommandNoCC }: +{ interpreter, writeText, runCommand }: let @@ -19,7 +19,7 @@ let print(s) ''; -in runCommandNoCC "${interpreter.name}-site-prefix-mypy-test" {} '' +in runCommand "${interpreter.name}-site-prefix-mypy-test" {} '' ${pythonEnv}/bin/mypy ${pythonScript} touch $out '' diff --git a/third_party/nixpkgs/pkgs/development/java-modules/build-maven-package.nix b/third_party/nixpkgs/pkgs/development/java-modules/build-maven-package.nix index 432f972b0f..baa2eed89c 100644 --- a/third_party/nixpkgs/pkgs/development/java-modules/build-maven-package.nix +++ b/third_party/nixpkgs/pkgs/development/java-modules/build-maven-package.nix @@ -16,7 +16,7 @@ in stdenv.mkDerivation rec { find = ''find ${concatStringsSep " " (map (x: x + "/m2") flatDeps)} -type d -printf '%P\n' | xargs -I {} mkdir -p $out/m2/{}''; copy = ''cp -rsfu ${concatStringsSep " " (map (x: x + "/m2/*") flatDeps)} $out/m2''; - phases = [ "unpackPhase" "buildPhase" ]; + dontInstall = true; buildPhase = '' mkdir -p $out/target diff --git a/third_party/nixpkgs/pkgs/development/libraries/allegro/5.nix b/third_party/nixpkgs/pkgs/development/libraries/allegro/5.nix index 5cd6584f18..380cc1f719 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/allegro/5.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/allegro/5.nix @@ -3,7 +3,7 @@ , libXxf86dga, libXxf86misc , libXxf86vm, openal, libGLU, libGL, libjpeg, flac , libXi, libXfixes, freetype, libopus, libtheora -, physfs, enet, pkg-config, gtk2, pcre, libpulseaudio, libpthreadstubs +, physfs, enet, pkg-config, gtk3, pcre, libpulseaudio, libpthreadstubs , libXdmcp }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { libXxf86vm openal libGLU libGL libjpeg flac libXi libXfixes - enet libtheora freetype physfs libopus pkg-config gtk2 pcre libXdmcp + enet libtheora freetype physfs libopus pkg-config gtk3 pcre libXdmcp libpulseaudio libpthreadstubs ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/aws-c-common/default.nix b/third_party/nixpkgs/pkgs/development/libraries/aws-c-common/default.nix index 5c71d079aa..062a05e64a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/aws-c-common/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/aws-c-common/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "aws-c-common"; - version = "0.6.8"; + version = "0.6.9"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wtgD8txViYu7yXdnID6TTf4gCDmvebD19XRxFnubndY="; + sha256 = "sha256-bnKIL51AW+0T87BxEazXDZElYqiwOUHQVEDKOCUzsbM="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/aws-c-io/default.nix b/third_party/nixpkgs/pkgs/development/libraries/aws-c-io/default.nix index 80112926ca..012d96fca4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/aws-c-io/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/aws-c-io/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "aws-c-io"; - version = "0.9.1"; + version = "0.10.5"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "0lx72p9xmmnjkz4zkfb1lz0ibw0jsy52qpydhvn56bq85nv44rwx"; + sha256 = "sha256-+H6dUKgpgXG1fh8r6k7TpVFMBso4G762zRfLAZD+Nss="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/bobcat/default.nix b/third_party/nixpkgs/pkgs/development/libraries/bobcat/default.nix index 06c7ac81dc..d0d0720f20 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/bobcat/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/bobcat/default.nix @@ -4,10 +4,10 @@ stdenv.mkDerivation rec { pname = "bobcat"; - version = "5.05.00"; + version = "5.09.01"; src = fetchFromGitLab { - sha256 = "sha256:14lvxzkxmkk54s97ah996m6s1wbw1g3iwawbhsf8qw7sf75vlp1h"; + sha256 = "sha256-kaz15mNn/bq1HUknUJqXoLYxPRPX4w340sv9be0M+kQ="; domain = "gitlab.com"; rev = version; repo = "bobcat"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/boost/1.67.nix b/third_party/nixpkgs/pkgs/development/libraries/boost/1.67.nix deleted file mode 100644 index 29993ed02b..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/boost/1.67.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, stdenv, callPackage, fetchurl, fetchpatch, ... } @ args: - -callPackage ./generic.nix (args // { - version = "1.67.0"; - - patches = [ - (fetchpatch { - url = "https://github.com/boostorg/lockfree/commit/12726cda009a855073b9bedbdce57b6ce7763da2.patch"; - sha256 = "0x65nkwzv8fdacj8sw5njl3v63jj19dirrpklbwy6qpsncw7fc7h"; - stripLen = 1; - }) - ] ++ lib.optionals stdenv.cc.isClang [ - # Fixes https://github.com/boostorg/atomic/issues/15 - (fetchpatch { - url = "https://github.com/boostorg/atomic/commit/6e14ca24dab50ad4c1fa8c27c7dd6f1cb791b534.patch"; - sha256 = "102g35ygvv8cxagp9651284xk4vybk93q2fm577y4mdxf5k46b7a"; - stripLen = 1; - }) - - # Needed for the next patch - (fetchpatch { - url = "https://github.com/boostorg/asio/commit/38cb19719748ad56b14d73ca1fff5828f36e5894.patch"; - sha256 = "0cj9cxz9rfbsx8p8f5alxx00dq3r7g0vh23j68bbxbs9gq1arq2n"; - stripLen = 1; - }) - # Fixes https://github.com/boostorg/asio/pull/91 - (fetchpatch { - url = "https://github.com/boostorg/asio/commit/43874d5497414c67655d901e48c939ef01337edb.patch"; - sha256 = "1c2ds164s2ygvpb4785p4ncv8ywbpm08cphirb99xp4mqvb693is"; - stripLen = 1; - }) - ]; - - src = fetchurl { - url = "mirror://sourceforge/boost/boost_1_67_0.tar.bz2"; - # SHA256 from http://www.boost.org/users/history/version_1_66_0.html - sha256 = "2684c972994ee57fc5632e03bf044746f6eb45d4920c343937a465fd67a5adba"; - }; -}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/caf/default.nix b/third_party/nixpkgs/pkgs/development/libraries/caf/default.nix index 60281e7e0c..045595a84f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/caf/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/caf/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "actor-framework"; - version = "0.18.3"; + version = "0.18.5"; src = fetchFromGitHub { owner = "actor-framework"; repo = "actor-framework"; rev = version; - sha256 = "sha256-9oQVsfh2mUVr64PjNXYD1wRBNJ8dCLO9eI5WnZ1SSww="; + sha256 = "04b4kjisb5wzq6pilh8xzbxn7qcjgppl8k65hfv0zi0ja8fyp1xk"; }; nativeBuildInputs = [ cmake ]; @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { homepage = "http://actor-framework.org/"; license = licenses.bsd3; platforms = platforms.unix; + changelog = "https://github.com/actor-framework/actor-framework/raw/${version}/CHANGELOG.md"; maintainers = with maintainers; [ bobakker tobim ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/catch2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/catch2/default.nix index 34d61a519a..5adcc2d1dd 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/catch2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/catch2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "catch2"; - version = "2.13.4"; + version = "2.13.7"; src = fetchFromGitHub { owner = "catchorg"; repo = "Catch2"; rev = "v${version}"; - sha256="sha256-8tR8MCFYK5XXtJQaIuZ59PJ3h3UYbfXKkaOfcBRt1Xo="; + sha256="sha256-NhZ8Hh7dka7KggEKKZyEbIZahuuTYeCT7cYYSUvkPzI="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/cmark/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cmark/default.nix index 1cc1927752..d78db53ea4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/cmark/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/cmark/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake }: stdenv.mkDerivation rec { pname = "cmark"; @@ -11,6 +11,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-UjDM2N6gCwO94F1nW3qCP9JX42MYAicAuGTKAXMy1Gg="; }; + patches = [ + # Fix libcmark.pc paths (should be incorporated next release) + (fetchpatch { + url = "https://github.com/commonmark/cmark/commit/15762d7d391483859c241cdf82b1615c6b6a5a19.patch"; + sha256 = "sha256-wdyK1tQolgfiwYMAaWMQZdCSbMDCijug5ykpoDl/HwI="; + }) + ]; + nativeBuildInputs = [ cmake ]; cmakeFlags = [ @@ -19,10 +27,12 @@ stdenv.mkDerivation rec { "-DCMARK_STATIC=OFF" ]; - doCheck = !stdenv.isDarwin; + doCheck = true; - preCheck = '' - export LD_LIBRARY_PATH=$(readlink -f ./src) + preCheck = let + lib_path = if stdenv.isDarwin then "DYLD_FALLBACK_LIBRARY_PATH" else "LD_LIBRARY_PATH"; + in '' + export ${lib_path}=$(readlink -f ./src) ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/drumstick/default.nix b/third_party/nixpkgs/pkgs/development/libraries/drumstick/default.nix index ba3768227f..36f2ecd84b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/drumstick/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/drumstick/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "drumstick"; - version = "2.2.1"; + version = "2.3.1"; src = fetchurl { url = "mirror://sourceforge/drumstick/${version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-UxXUEkO5qXPIjw99BdkAspikR9Nlu32clf28cTyf+W4="; + sha256 = "sha256-0DUFmL8sifxbC782CYT4eoe4m1kq8T1tEs3YNy8iQuc="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/embree/default.nix b/third_party/nixpkgs/pkgs/development/libraries/embree/default.nix index 3350c046a5..b85c057217 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/embree/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/embree/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "embree"; - version = "3.13.0"; + version = "3.13.1"; src = fetchFromGitHub { owner = "embree"; repo = "embree"; rev = "v${version}"; - sha256 = "sha256-w93GYslQRg0rvguMKv/CuT3+JzIis2CRbY9jYUFKWOM="; + sha256 = "sha256-6BL/NnveIMg+xD8Zsc3sidL0iw0YbJITgd8Zf4Mh28I="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/enchant/2.x.nix b/third_party/nixpkgs/pkgs/development/libraries/enchant/2.x.nix index f2a4ae3134..237ecf148c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/enchant/2.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/enchant/2.x.nix @@ -5,6 +5,7 @@ , glib , hunspell , hspell +, nuspell , unittest-cpp }: @@ -26,6 +27,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib hunspell + nuspell ]; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/fcft/default.nix b/third_party/nixpkgs/pkgs/development/libraries/fcft/default.nix index 2b284c82ae..8f2d56fad2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/fcft/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/fcft/default.nix @@ -11,14 +11,14 @@ in stdenv.mkDerivation rec { pname = "fcft"; - version = "2.4.4"; + version = "2.4.5"; src = fetchFromGitea { domain = "codeberg.org"; owner = "dnkl"; repo = "fcft"; rev = version; - sha256 = "0ycc2xy9jhxcxwbfk9d4jdxgf2zsc664phbf859kshb822m3jf57"; + sha256 = "0z4bqap88pydkgcxrsvm3fmcyhi9x7z8knliarvdcvqlk7qnyzfh"; }; depsBuildBuild = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/fdk-aac/default.nix b/third_party/nixpkgs/pkgs/development/libraries/fdk-aac/default.nix index dc64a6edce..a94c204c2f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/fdk-aac/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/fdk-aac/default.nix @@ -1,25 +1,25 @@ -{ lib, stdenv, fetchurl +{ lib +, stdenv +, fetchurl , exampleSupport ? false # Example encoding program }: -with lib; stdenv.mkDerivation rec { pname = "fdk-aac"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { url = "mirror://sourceforge/opencore-amr/fdk-aac/${pname}-${version}.tar.gz"; - sha256 = "0wgjjc0dfkm2w966lc9c8ir8f671vl1ppch3mya3h58jjjm360c4"; + sha256 = "sha256-yehjDPnUM/POrXSQahUg0iI/ibzT+pJUhhAXRAuOsi8="; }; - configureFlags = [ ] - ++ optional exampleSupport "--enable-example"; + configureFlags = lib.optional exampleSupport "--enable-example"; - meta = { + meta = with lib; { description = "A high-quality implementation of the AAC codec from Android"; - homepage = "https://sourceforge.net/projects/opencore-amr/"; - license = licenses.asl20; + homepage = "https://sourceforge.net/projects/opencore-amr/"; + license = licenses.asl20; maintainers = with maintainers; [ codyopel ]; - platforms = platforms.all; + platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/freetype/default.nix b/third_party/nixpkgs/pkgs/development/libraries/freetype/default.nix index 943a25dcf6..6c66561f29 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/freetype/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/freetype/default.nix @@ -9,13 +9,49 @@ useEncumberedCode ? true }: -let - inherit (lib) optional optionalString; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "freetype"; version = "2.11.0"; + src = fetchurl { + url = "mirror://savannah/${pname}/${pname}-${version}.tar.xz"; + sha256 = "sha256-i+45vTloxIBLcGFKCjrVlyma0OgkvIqtXOiq9IBnvec="; + }; + + propagatedBuildInputs = [ zlib bzip2 libpng ]; # needed when linking against freetype + + # dependence on harfbuzz is looser than the reverse dependence + nativeBuildInputs = [ pkg-config which makeWrapper ] + # FreeType requires GNU Make, which is not part of stdenv on FreeBSD. + ++ lib.optional (!stdenv.isLinux) gnumake; + + patches = [ + ./enable-table-validation.patch + ] ++ lib.optional useEncumberedCode ./enable-subpixel-rendering.patch; + + outputs = [ "out" "dev" ]; + + configureFlags = [ "--bindir=$(dev)/bin" "--enable-freetype-config" ]; + + # native compiler to generate building tool + CC_BUILD = "${buildPackages.stdenv.cc}/bin/cc"; + + # The asm for armel is written with the 'asm' keyword. + CFLAGS = lib.optionalString stdenv.isAarch32 "-std=gnu99"; + + enableParallelBuilding = true; + + doCheck = true; + + postInstall = glib.flattenInclude + '' + substituteInPlace $dev/bin/freetype-config \ + --replace ${buildPackages.pkg-config} ${pkgsHostHost.pkg-config} + + wrapProgram "$dev/bin/freetype-config" \ + --set PKG_CONFIG_PATH "$PKG_CONFIG_PATH:$dev/lib/pkgconfig" + ''; + meta = with lib; { description = "A font rendering engine"; longDescription = '' @@ -30,44 +66,4 @@ in stdenv.mkDerivation rec { platforms = platforms.all; maintainers = with maintainers; [ ttuegel ]; }; - - src = fetchurl { - url = "mirror://savannah/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-i+45vTloxIBLcGFKCjrVlyma0OgkvIqtXOiq9IBnvec="; - }; - - propagatedBuildInputs = [ zlib bzip2 libpng ]; # needed when linking against freetype - - # dependence on harfbuzz is looser than the reverse dependence - nativeBuildInputs = [ pkg-config which makeWrapper ] - # FreeType requires GNU Make, which is not part of stdenv on FreeBSD. - ++ optional (!stdenv.isLinux) gnumake; - - patches = - [ ./enable-table-validation.patch - ] ++ - optional useEncumberedCode ./enable-subpixel-rendering.patch; - - outputs = [ "out" "dev" ]; - - configureFlags = [ "--bindir=$(dev)/bin" "--enable-freetype-config" ]; - - # native compiler to generate building tool - CC_BUILD = "${buildPackages.stdenv.cc}/bin/cc"; - - # The asm for armel is written with the 'asm' keyword. - CFLAGS = optionalString stdenv.isAarch32 "-std=gnu99"; - - enableParallelBuilding = true; - - doCheck = true; - - postInstall = glib.flattenInclude + '' - substituteInPlace $dev/bin/freetype-config \ - --replace ${buildPackages.pkg-config} ${pkgsHostHost.pkg-config} - - wrapProgram "$dev/bin/freetype-config" \ - --set PKG_CONFIG_PATH "$PKG_CONFIG_PATH:$dev/lib/pkgconfig" - ''; - } diff --git a/third_party/nixpkgs/pkgs/development/libraries/gbenchmark/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gbenchmark/default.nix index 456e311a0b..70bd37e40d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gbenchmark/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gbenchmark/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gbenchmark"; - version = "1.5.3"; + version = "1.5.6"; src = fetchFromGitHub { owner = "google"; repo = "benchmark"; rev = "v${version}"; - sha256 = "sha256-h/e2vJacUp7PITez9HPzGc5+ofz7Oplso44VibECmsI="; + sha256 = "sha256-DFm5cQh1b2BX6qCDaQZ1/XBNDeIYXKWbIETYu1EjDww="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gpgme/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gpgme/default.nix index e138c824a4..9cbf5c39a7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gpgme/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gpgme/default.nix @@ -23,12 +23,18 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { # probably included in > 1.16.0 name = "test_t-edit-sign.diff"; # we experienced segmentation fault in this test - url = "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=patch;h=81a33ea5e1b86d586b956e893a5b25c4cd41c969"; + urls = [ + "https://files.gnupg.net/file/data/w43xz2zf73pnyqk5mm5l/PHID-FILE-hm2x5mjntsdyxrxve5tb/file" + "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=patch;h=81a33ea5e1b86d586b956e893a5b25c4cd41c969" + ]; sha256 = "1xxvv0kc9wdj5hzpddzs3cn8dhmm2cb29224a7h9vairraq5272h"; }) (fetchpatch { # gpg: Send --with-keygrip when listing keys name = "c4cf527ea227edb468a84bf9b8ce996807bd6992.patch"; - url = "http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=patch;h=c4cf527ea227edb468a84bf9b8ce996807bd6992"; + urls = [ + "https://files.gnupg.net/file/data/2ufcg7ny5jdnv7hmewb4/PHID-FILE-7iwvryn2btti6txr3bsz/file" + "http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=patch;h=c4cf527ea227edb468a84bf9b8ce996807bd6992" + ]; sha256 = "0y0b0lb2nq5p9kx13b59b2jaz157mvflliw1qdvg1v1hynvgb8m4"; }) # https://lists.gnupg.org/pipermail/gnupg-devel/2020-April/034591.html diff --git a/third_party/nixpkgs/pkgs/development/libraries/graphene-hardened-malloc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/graphene-hardened-malloc/default.nix index 726666ec06..35a4d93626 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/graphene-hardened-malloc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/graphene-hardened-malloc/default.nix @@ -1,15 +1,23 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchurl, python3, runCommand, makeWrapper, stress-ng }: -stdenv.mkDerivation rec { +lib.fix (self: stdenv.mkDerivation rec { pname = "graphene-hardened-malloc"; - version = "2"; + version = "8"; src = fetchurl { url = "https://github.com/GrapheneOS/hardened_malloc/archive/${version}.tar.gz"; - sha256 = "0zsl4vl65ic6lw5rzcjzvcxg8makg683abnwvy60zfap8hvijvjb"; + sha256 = "0lipyd2pb1bmghkyv9zmg25jwcglj7m281f01zlh3ghz3xlfh0ym"; }; + doCheck = true; + checkInputs = [ python3 ]; + # these tests cover use as a build-time-linked library + checkPhase = '' + make test + ''; + installPhase = '' + install -Dm444 -t $out/include include/* install -Dm444 -t $out/lib libhardened_malloc.so mkdir -p $out/bin @@ -19,28 +27,51 @@ stdenv.mkDerivation rec { separateDebugInfo = true; - doInstallCheck = true; - installCheckPhase = '' - pushd test - make - $out/bin/preload-hardened-malloc ./offset + passthru = { + ld-preload-tests = stdenv.mkDerivation { + name = "${self.name}-ld-preload-tests"; + src = self.src; - pushd simple-memory-corruption - make + nativeBuildInputs = [ makeWrapper ]; - # these tests don't actually appear to generate overflows currently - rm read_after_free_small string_overflow eight_byte_overflow_large + # reuse the projects tests to cover use with LD_PRELOAD. we have + # to convince the test programs to build as though they're naive + # standalone executables. this includes disabling tests for + # malloc_object_size, which doesn't make sense to use via LD_PRELOAD. + buildPhase = '' + pushd test/simple-memory-corruption + make LDLIBS= LDFLAGS=-Wl,--unresolved-symbols=ignore-all CXXFLAGS=-lstdc++ + substituteInPlace test_smc.py \ + --replace 'test_malloc_object_size' 'dont_test_malloc_object_size' \ + --replace 'test_invalid_malloc_object_size' 'dont_test_invalid_malloc_object_size' + popd # test/simple-memory-corruption + ''; - for t in `find . -regex ".*/[a-z_]+"` ; do - echo "Running $t..." - # the program being aborted (as it should be) would result in an exit code > 128 - (($out/bin/preload-hardened-malloc $t) && false) \ - || (test $? -gt 128 || (echo "$t was not aborted" && false)) - done - popd + installPhase = '' + mkdir -p $out/test + cp -r test/simple-memory-corruption $out/test/simple-memory-corruption - popd - ''; + mkdir -p $out/bin + makeWrapper ${python3.interpreter} $out/bin/run-tests \ + --add-flags "-I -m unittest discover --start-directory $out/test/simple-memory-corruption" + ''; + }; + tests = { + ld-preload = runCommand "ld-preload-test-run" {} '' + ${self}/bin/preload-hardened-malloc ${self.ld-preload-tests}/bin/run-tests + touch $out + ''; + # to compensate for the lack of tests of correct normal malloc operation + stress = runCommand "stress-test-run" {} '' + ${self}/bin/preload-hardened-malloc ${stress-ng}/bin/stress-ng \ + --no-rand-seed \ + --malloc 8 \ + --malloc-ops 1000000 \ + --verify + touch $out + ''; + }; + }; meta = with lib; { homepage = "https://github.com/GrapheneOS/hardened_malloc"; @@ -54,4 +85,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ ris ]; platforms = [ "x86_64-linux" "aarch64-linux" ]; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/gusb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gusb/default.nix index c3ae6faecf..449a7a1762 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gusb/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gusb/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, gettext, gobject-introspection +{ lib, stdenv, fetchurl, substituteAll, meson, ninja, pkg-config, gettext, gobject-introspection , gtk-doc, docbook_xsl, docbook_xml_dtd_412, docbook_xml_dtd_44, python3 , glib, systemd, libusb1, vala, hwdata }: @@ -10,15 +10,22 @@ let in stdenv.mkDerivation rec { pname = "gusb"; - version = "0.3.5"; + version = "0.3.7"; outputs = [ "bin" "out" "dev" "devdoc" ]; src = fetchurl { url = "https://people.freedesktop.org/~hughsient/releases/libgusb-${version}.tar.xz"; - sha256 = "1pv5ivbwxb9anq2j34i68r8fgs8nwsi4hmss7h9v1i3wk7300ajv"; + sha256 = "sha256-2l8l1oc2ImibM1FIbL4CjvwlRAP2Rt2BIl3+hULYxn0="; }; + patches = [ + (substituteAll { + src = ./fix-python-path.patch; + python = "${pythonEnv}/bin/python3"; + }) + ]; + nativeBuildInputs = [ meson ninja pkg-config gettext pythonEnv gtk-doc docbook_xsl docbook_xml_dtd_412 docbook_xml_dtd_44 diff --git a/third_party/nixpkgs/pkgs/development/libraries/gusb/fix-python-path.patch b/third_party/nixpkgs/pkgs/development/libraries/gusb/fix-python-path.patch new file mode 100644 index 0000000000..5f04387a53 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/gusb/fix-python-path.patch @@ -0,0 +1,14 @@ +diff --git a/gusb/meson.build b/gusb/meson.build +index 8236a2b..282aa48 100644 +--- a/gusb/meson.build ++++ b/gusb/meson.build +@@ -147,7 +147,7 @@ libgusb_gir = libgusb_girtarget[0] + libgusb_typelib = libgusb_girtarget[1] + + pymod = import('python') +-py_installation = pymod.find_installation() ++py_installation = pymod.find_installation('@python@') + + # Verify the map file is correct -- note we can't actually use the generated + # file for two reasons: + diff --git a/third_party/nixpkgs/pkgs/development/libraries/half/default.nix b/third_party/nixpkgs/pkgs/development/libraries/half/default.nix index 5232dfa512..c0d11e9ce7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/half/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/half/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchzip }: stdenv.mkDerivation rec { - version = "2.1.0"; + version = "2.2.0"; pname = "half"; src = fetchzip { url = "mirror://sourceforge/half/${version}/half-${version}.zip"; - sha256 = "04v4rhs1ffd4c9zcnk4yjhq0gdqy020518wb7n8ryk1ckrdd7hbm"; + sha256 = "sha256-ZdGgBMZylFgkvs/XVBnvgBY2EYSHRLY3S4YwXjshpOY="; stripRoot = false; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/imlib2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/imlib2/default.nix index 23550bbc80..6be73c8da4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/imlib2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/imlib2/default.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { pname = "imlib2"; - version = "1.7.1"; + version = "1.7.2"; src = fetchurl { url = "mirror://sourceforge/enlightenment/${pname}-${version}.tar.bz2"; - sha256 = "sha256-AzpqY53LyOA/Zf8F5XBo5zRtUO4vL/8wS7kJWhsrxAc="; + sha256 = "sha256-Ul1OMYknRxveRSB4bcJVC1mriFM4SNstdcYPW05YIaE="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix index 00c80277ea..c0bac7e546 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "intel-media-sdk"; - version = "21.2.3"; + version = "21.3.1"; src = fetchFromGitHub { owner = "Intel-Media-SDK"; repo = "MediaSDK"; rev = "intel-mediasdk-${version}"; - sha256 = "sha256-Id2/d6rRKiei6UQ0pywdcbNLfIQR8gEseiDgqeaT3p8="; + sha256 = "sha256-Ki+gTDL6gj+f3wjhVp4EIVvrPn6NRmCCkCj5g//kAW8="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libargs/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libargs/default.nix new file mode 100644 index 0000000000..f4395d134b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/libargs/default.nix @@ -0,0 +1,22 @@ +{ lib, stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + pname = "args"; + version = "6.2.6"; + + src = fetchFromGitHub { + owner = "Taywee"; + repo = pname; + rev = version; + sha256 = "sha256-g5OXuZNi5bkWuSg7SNmhA6vyHUOFU8suYkH8nGx6tvg="; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + description = "A simple header-only C++ argument parser library"; + homepage = "https://github.com/Taywee/args"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/liberfa/default.nix b/third_party/nixpkgs/pkgs/development/libraries/liberfa/default.nix index 8ffd86cd31..8edc3d7b5a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/liberfa/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/liberfa/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "erfa"; - version = "1.7.1"; + version = "2.0.0"; buildInputs = [ autoreconfHook ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "liberfa"; repo = "erfa"; rev = "v${version}"; - sha256 = "0j7v9y7jsw9vjmhdpksq44ah2af10b9gl1vfm8riw178lvf246wg"; + sha256 = "sha256-xBE8mWwmvlu0v3Up5y6J8jMhToMSACdKeQzPJoG8LWk="; }; configureFlags = [ "--enable-shared" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libfilezilla/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libfilezilla/default.nix index 8107ff3c98..2e0b77d812 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libfilezilla/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libfilezilla/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "libfilezilla"; - version = "0.30.0"; + version = "0.31.1"; src = fetchurl { url = "https://download.filezilla-project.org/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-wW322s2y3tT24FFBtGge2pGloboFKQCiSp+E5lpQ3EA="; + sha256 = "sha256-mX1Yh7YBXzhp03Wwy8S0lC/LJNvktDRohclGz+czFm8="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgpg-error/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgpg-error/default.nix index 7490995e66..8121074f84 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libgpg-error/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libgpg-error/default.nix @@ -1,4 +1,5 @@ { stdenv, lib, buildPackages, fetchurl, gettext +, fetchpatch , genPosixLockObjOnly ? false }: let genPosixLockObjOnlyAttrs = lib.optionalAttrs genPosixLockObjOnly { @@ -24,6 +25,15 @@ in stdenv.mkDerivation (rec { sha256 = "sha256-/AfnD2xhX4xPWQqON6m43S4soelAj45gRZxnRSuSXiM="; }; + patches = lib.optionals (with stdenv; buildPlatform != hostPlatform) [ + # Fix cross-compilation, remove in next release + # TODO apply unconditionally + (fetchpatch { + url = "https://github.com/gpg/libgpg-error/commit/33593864cd54143db594c4237bba41e14179061c.patch"; + sha256 = "1jnd7flaj5nlc7spa6mwwygmh5fajw1n8js8f23jpw4pbgvgdv4r"; + }) + ]; + postPatch = '' sed '/BUILD_TIMESTAMP=/s/=.*/=1970-01-01T00:01+0000/' -i ./configure '' + lib.optionalString (stdenv.hostPlatform.isAarch32 && stdenv.buildPlatform != stdenv.hostPlatform) '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/libint/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libint/default.nix index 330fe8eac2..484125352c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libint/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libint/default.nix @@ -1,76 +1,101 @@ { lib, stdenv, fetchFromGitHub, autoconf, automake, libtool -, python3, perl, gmpxx, mpfr, boost, eigen, gfortran -, enableFMA ? false +, python3, perl, gmpxx, mpfr, boost, eigen, gfortran, cmake +, enableFMA ? false, enableFortran ? true }: -stdenv.mkDerivation rec { - pname = "libint2"; +let + pname = "libint"; version = "2.6.0"; - src = fetchFromGitHub { - owner = "evaleev"; - repo = "libint"; - rev = "v${version}"; - sha256 = "0pbc2j928jyffhdp4x5bkw68mqmx610qqhnb223vdzr0n2yj5y19"; - }; - - patches = [ - ./fix-paths.patch - ]; - - nativeBuildInputs = [ - autoconf - automake - libtool - gfortran - mpfr - python3 - perl - gmpxx - ]; - - buildInputs = [ boost ]; - - enableParallelBuilding = true; - - doCheck = true; - - configureFlags = [ - "--enable-eri=2" - "--enable-eri3=2" - "--enable-eri2=2" - "--with-eri-max-am=7,5,4" - "--with-eri-opt-am=3" - "--with-eri3-max-am=7" - "--with-eri2-max-am=7" - "--with-g12-max-am=5" - "--with-g12-opt-am=3" - "--with-g12dkh-max-am=5" - "--with-g12dkh-opt-am=3" - "--enable-contracted-ints" - "--enable-shared" - ] ++ lib.optional enableFMA "--enable-fma"; - - preConfigure = '' - ./autogen.sh - ''; - - postBuild = '' - # build the fortran interface file - cd export/fortran - make libint_f.o ENABLE_FORTRAN=yes - cd ../.. - ''; - - postInstall = '' - cp export/fortran/libint_f.mod $out/include/ - ''; - meta = with lib; { description = "Library for the evaluation of molecular integrals of many-body operators over Gaussian functions"; homepage = "https://github.com/evaleev/libint"; license = with licenses; [ lgpl3Only gpl3Only ]; - maintainers = [ maintainers.markuskowa ]; + maintainers = with maintainers; [ markuskowa sheepforce ]; platforms = [ "x86_64-linux" ]; }; -} + + codeGen = stdenv.mkDerivation { + inherit pname version; + + src = fetchFromGitHub { + owner = "evaleev"; + repo = pname; + rev = "v${version}"; + sha256 = "0pbc2j928jyffhdp4x5bkw68mqmx610qqhnb223vdzr0n2yj5y19"; + }; + + patches = [ ./fix-paths.patch ]; + + nativeBuildInputs = [ + autoconf + automake + libtool + mpfr + python3 + perl + gmpxx + ] ++ lib.optional enableFortran gfortran; + + buildInputs = [ boost eigen ]; + + preConfigure = "./autogen.sh"; + + configureFlags = [ + "--enable-eri=2" + "--enable-eri3=2" + "--enable-eri2=2" + "--with-eri-max-am=7,5,4" + "--with-eri-opt-am=3" + "--with-eri3-max-am=7" + "--with-eri2-max-am=7" + "--with-g12-max-am=5" + "--with-g12-opt-am=3" + "--with-g12dkh-max-am=5" + "--with-g12dkh-opt-am=3" + "--enable-contracted-ints" + "--enable-shared" + ] ++ lib.optional enableFMA "--enable-fma" + ++ lib.optional enableFortran "--enable-fortran"; + + makeFlags = [ "export" ]; + + installPhase = '' + mkdir -p $out + cp ${pname}-${version}.tgz $out/. + ''; + + enableParallelBuilding = true; + + inherit meta; + }; + + codeComp = stdenv.mkDerivation { + inherit pname version; + + src = "${codeGen}/${pname}-${version}.tgz"; + + nativeBuildInputs = [ + python3 + cmake + ] ++ lib.optional enableFortran gfortran; + + buildInputs = [ boost eigen ]; + + # Default is just "double", but SSE2 is available on all x86_64 CPUs. + # AVX support is advertised, but does not work in 2.6 (possibly in 2.7). + # Fortran interface is incompatible with changing the LIBINT2_REALTYPE. + cmakeFlags = [ + (if enableFortran + then "-DENABLE_FORTRAN=ON" + else "-DLIBINT2_REALTYPE=libint2::simd::VectorSSEDouble" + ) + ]; + + # Can only build in the source-tree. A lot of preprocessing magic fails otherwise. + dontUseCmakeBuildDir = true; + + inherit meta; + }; + +in codeComp diff --git a/third_party/nixpkgs/pkgs/development/libraries/libite/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libite/default.nix index c57876e9c4..4ffb7a5f7f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libite/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libite/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libite"; - version = "2.2.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "troglobit"; repo = "libite"; rev = "v${version}"; - sha256 = "0kad501mrvn0s0sw9pz5spjq7ymk117hnff249z6026gswrxv1mh"; + sha256 = "sha256-EV1YVOxd92z2hBZIqe6jzYV06YfNTAbZntZQdH05lBI="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libopus/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libopus/default.nix index 6776f5ae39..7a3a77931c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libopus/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libopus/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { configureFlags = lib.optional fixedPoint "--enable-fixed-point" ++ lib.optional withCustomModes "--enable-custom-modes"; - doCheck = !stdenv.isi686; # test_unit_LPC_inv_pred_gain fails + doCheck = !stdenv.isi686 && !stdenv.isAarch32; # test_unit_LPC_inv_pred_gain fails meta = with lib; { description = "Open, royalty-free, highly versatile audio codec"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libpg_query/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libpg_query/default.nix index 98f657e293..110a2167fd 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libpg_query/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libpg_query/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libpg_query"; - version = "13-2.0.5"; + version = "13-2.0.7"; src = fetchFromGitHub { owner = "pganalyze"; repo = "libpg_query"; rev = version; - sha256 = "1jr95hrqmxdqvn1546x04hdhp1aq7dv7881rspar14ksz7f7382r"; + sha256 = "sha256-xplp7Z17NlYbXIbBdN7EWDN4numdZUBIIVg5EowFMPA="; }; nativeBuildInputs = [ which ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libqalculate/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libqalculate/default.nix index 9368469f26..75b3dab36c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libqalculate/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libqalculate/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "libqalculate"; - version = "3.19.0"; + version = "3.20.1"; src = fetchFromGitHub { owner = "qalculate"; repo = "libqalculate"; rev = "v${version}"; - sha256 = "1w44407wb552q21dz4m2nwwdi8b9hzjb2w1l3ffsikzqckc7wbyj"; + sha256 = "sha256-8SYI8CoeTfZXX0CgLnfl0rHwUZbYM7OGYzFQ41jm5Qs="; }; outputs = [ "out" "dev" "doc" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libressl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libressl/default.nix index 3dffccf5f4..fb362ebbad 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libressl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libressl/default.nix @@ -63,11 +63,6 @@ let }; in { - libressl_3_1 = generic { - version = "3.1.5"; - sha256 = "1504a1sf43frw43j14pij0q1f48rm5q86ggrlxxhw708qp7ds4rc"; - }; - libressl_3_2 = generic { version = "3.2.5"; sha256 = "1zkwrs3b19s1ybz4q9hrb7pqsbsi8vxcs44qanfy11fkc7ynb2kr"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libtins/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libtins/default.nix index 7279dc9ddf..d1a99fb88a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libtins/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libtins/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { postPatch = '' rm -rf googletest - cp -r ${gtest.src}/googletest googletest + cp -r ${gtest.src} googletest chmod -R a+w googletest ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libxlsxwriter/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libxlsxwriter/default.nix index 3681cb4ac5..f1d4bd298d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libxlsxwriter/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libxlsxwriter/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "libxlsxwriter"; - version = "1.1.1"; + version = "1.1.3"; src = fetchFromGitHub { owner = "jmcnamara"; repo = "libxlsxwriter"; rev = "RELEASE_${version}"; - sha256 = "1bi8a1pj18836yfqsnmfp45nqhq2d9r2r7gzi2v1y0qyk9jh6xln"; + sha256 = "sha256-j+tplk8Fdx92YKj7PnchMZWctVmBmNirUmDw5ADmJy0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libyaml-cpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libyaml-cpp/default.nix index 1314192320..ebfe53b251 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libyaml-cpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libyaml-cpp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libyaml-cpp"; - version = "0.6.3"; + version = "0.7.0"; src = fetchFromGitHub { owner = "jbeder"; repo = "yaml-cpp"; rev = "yaml-cpp-${version}"; - sha256 = "0ykkxzxcwwiv8l8r697gyqh1nl582krpvi7m7l6b40ijnk4pw30s"; + sha256 = "sha256-2tFWccifn0c2lU/U1WNg2FHrBohjx8CXMllPJCevaNk="; }; # implement https://github.com/jbeder/yaml-cpp/commit/52a1378e48e15d42a0b755af7146394c6eff998c diff --git a/third_party/nixpkgs/pkgs/development/libraries/live555/default.nix b/third_party/nixpkgs/pkgs/development/libraries/live555/default.nix index 85302bc7c9..081fa2f175 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/live555/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/live555/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { i686-linux = "linux"; x86_64-linux = "linux-64bit"; aarch64-linux = "linux-64bit"; - }.${stdenv.hostPlatform.system}} + }.${stdenv.hostPlatform.system} or (throw "Unsupported platform ${stdenv.hostPlatform.system}")} runHook postConfigure ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/mlt/qt-5.nix b/third_party/nixpkgs/pkgs/development/libraries/mlt/qt-5.nix index 5a4b6e34e9..f8724703f0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mlt/qt-5.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mlt/qt-5.nix @@ -23,7 +23,7 @@ , mkDerivation , which }: -let inherit (lib) getDev; in + mkDerivation rec { pname = "mlt"; version = "6.24.0"; @@ -71,7 +71,7 @@ mkDerivation rec { # mlt is unable to cope with our multi-prefix Qt build # because it does not use CMake or qmake. - NIX_CFLAGS_COMPILE = "-I${getDev qtsvg}/include/QtSvg"; + NIX_CFLAGS_COMPILE = "-I${lib.getDev qtsvg}/include/QtSvg"; CXXFLAGS = "-std=c++11"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/nco/default.nix b/third_party/nixpkgs/pkgs/development/libraries/nco/default.nix index b7df32633b..e551e43905 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/nco/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/nco/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchzip, netcdf, netcdfcxx4, gsl, udunits, antlr2, which, curl, flex, coreutils }: stdenv.mkDerivation rec { - version = "4.9.8"; + version = "5.0.1"; pname = "nco"; nativeBuildInputs = [ flex which antlr2 ]; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/nco/nco/archive/${version}.tar.gz"; - sha256 = "sha256-fOdmM0I/UGhxacofEBfw9UmOOrMDUXs59ca8uvkQKqw="; + sha256 = "sha256-Mdnko+0ZuMoKgBp//+rCVsbFJx90Tmrnal7FAmwIKEQ="; }; prePatch = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/nuraft/default.nix b/third_party/nixpkgs/pkgs/development/libraries/nuraft/default.nix index f9ae9d5ffe..232fdfc512 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/nuraft/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/nuraft/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nuraft"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "eBay"; repo = "NuRaft"; rev = "v${version}"; - sha256 = "sha256-1k+AWmpAiHcQVEB5kUaMtNWhOnTBnmJiNU8zL1J/PEk="; + sha256 = "sha256-Fyy9B5CXyMcDSOdqaeJ4ejo1svM90ESXuNL0rzsTZpE="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/odpic/default.nix b/third_party/nixpkgs/pkgs/development/libraries/odpic/default.nix index 251a3f9f55..9e4b01ef17 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/odpic/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/odpic/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, fixDarwinDylibNames, oracle-instantclient, libaio }: let - version = "4.1.0"; + version = "4.2.1"; libPath = lib.makeLibraryPath [ oracle-instantclient.lib ]; in stdenv.mkDerivation { @@ -13,7 +13,7 @@ in stdenv.mkDerivation { owner = "oracle"; repo = "odpi"; rev = "v${version}"; - sha256 = "1zk08z74q7njbj329xfy8aszphj27rqlkhsyglai60wfzl6mcf4x"; + sha256 = "sha256-jdDMG6+bvsKQkHSpUrwtwU/ngq1iINcUhWu2b9lJgPY="; }; nativeBuildInputs = lib.optional stdenv.isDarwin fixDarwinDylibNames; diff --git a/third_party/nixpkgs/pkgs/development/libraries/oneDNN/default.nix b/third_party/nixpkgs/pkgs/development/libraries/oneDNN/default.nix index cce17acbf0..42f05a6561 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/oneDNN/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/oneDNN/default.nix @@ -5,13 +5,13 @@ # https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn stdenv.mkDerivation rec { pname = "oneDNN"; - version = "2.2.1"; + version = "2.3.2"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "oneDNN"; rev = "v${version}"; - sha256 = "sha256-orsllgBt2EHuZOy9vkgDK3XT6BfbtyIPvO4REB9tAgs="; + sha256 = "sha256-sfTcBthrnt7m9AnzdwWl9yLu1jRpwUp8i9s9DlA3IJo="; }; outputs = [ "out" "dev" "doc" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/opendht/default.nix b/third_party/nixpkgs/pkgs/development/libraries/opendht/default.nix index 7f4f186c92..3cf29b7351 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/opendht/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/opendht/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub, darwin , cmake, pkg-config , asio, nettle, gnutls, msgpack, readline, libargon2 }: stdenv.mkDerivation rec { pname = "opendht"; - version = "2.1.6"; + version = "2.2.0"; src = fetchFromGitHub { owner = "savoirfairelinux"; repo = "opendht"; rev = version; - sha256 = "0sjb2a3yqnabwgmmn8gapc1dq9m8vp9z8w85zhsj654i5h3gp6zv"; + sha256 = "sha256-u4MWMUbnq2q4FH0TMpbrbhS5erAfT4/3HYGLXaLTz+I="; }; nativeBuildInputs = @@ -26,6 +26,8 @@ stdenv.mkDerivation rec { msgpack readline libargon2 + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security ]; outputs = [ "out" "lib" "dev" "man" ]; @@ -35,6 +37,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/savoirfairelinux/opendht"; license = licenses.gpl3Plus; maintainers = with maintainers; [ taeer olynch thoughtpolice ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/openimagedenoise/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openimagedenoise/default.nix index 6547c321db..c44dccbb5d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openimagedenoise/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openimagedenoise/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "openimagedenoise"; - version = "1.4.0"; + version = "1.4.1"; # The release tarballs include pretrained weights, which would otherwise need to be fetched with git-lfs src = fetchzip { url = "https://github.com/OpenImageDenoise/oidn/releases/download/v${version}/oidn-${version}.src.tar.gz"; - sha256 = "sha256-UsiZT3ufRVo1BQ/md/A3CXpUfMPrJR1DhZg9hrjOG2A="; + sha256 = "sha256-TQ7cL0/6pnSTuW21DESA5I3S/C1BHStrWK9yaPoim6E="; }; nativeBuildInputs = [ cmake python3 ispc ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/openssl/1.0.2/darwin64-arm64.patch b/third_party/nixpkgs/pkgs/development/libraries/openssl/1.0.2/darwin64-arm64.patch new file mode 100644 index 0000000000..5ecfb41755 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/openssl/1.0.2/darwin64-arm64.patch @@ -0,0 +1,12 @@ +diff --git a/Configure b/Configure +index 494e0b3..0b448aa 100755 +--- a/Configure ++++ b/Configure +@@ -652,6 +652,8 @@ my %table=( + "darwin64-x86_64-cc","cc:-arch x86_64 -O3 -DL_ENDIAN -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:".eval{my $asm=$x86_64_asm;$asm=~s/rc4\-[^:]+//;$asm}.":macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch x86_64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", + "debug-darwin64-x86_64-cc","cc:-arch x86_64 -ggdb -g2 -O0 -DL_ENDIAN -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:".eval{my $asm=$x86_64_asm;$asm=~s/rc4\-[^:]+//;$asm}.":macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch x86_64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", + "debug-darwin-ppc-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DB_ENDIAN -g -Wall -O::-D_REENTRANT:MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${ppc32_asm}:osx32:dlfcn:darwin-shared:-fPIC:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", ++"darwin64-arm64-cc","cc:-arch arm64 -O3 -DL_ENDIAN -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-arch arm64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", ++"debug-darwin64-arm64-cc","cc:-arch arm64 -ggdb -g2 -O0 -DL_ENDIAN -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-arch arm64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", + # iPhoneOS/iOS + "iphoneos-cross","llvm-gcc:-O3 -isysroot \$(CROSS_TOP)/SDKs/\$(CROSS_SDK) -fomit-frame-pointer -fno-common::-D_REENTRANT:iOS:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", diff --git a/third_party/nixpkgs/pkgs/development/libraries/openssl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openssl/default.nix index d4be8cc242..fc2c2fad19 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openssl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openssl/default.nix @@ -185,6 +185,8 @@ in { (if stdenv.hostPlatform.isDarwin then ./1.0.2/use-etc-ssl-certs-darwin.patch else ./1.0.2/use-etc-ssl-certs.patch) + ] ++ lib.optionals (stdenv.hostPlatform.system == "aarch64-darwin") [ + ./1.0.2/darwin64-arm64.patch ]; extraMeta.knownVulnerabilities = [ "Support for OpenSSL 1.0.2 ended with 2019." ]; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/openxr-loader/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openxr-loader/default.nix index 452f72146d..44d9c01ded 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openxr-loader/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openxr-loader/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "openxr-loader"; - version = "1.0.14"; + version = "1.0.18"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenXR-SDK-Source"; rev = "release-${version}"; - sha256 = "sha256-ZmaxHm4MPd2q83PLduoavoynqRPEI79IpMfW32gkV14="; + sha256 = "sha256-Ek4gFL10/aRciCoJBNaaSX/Hdbap4X/K4k+KeAfpKDg="; }; nativeBuildInputs = [ cmake python3 ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/orcania/default.nix b/third_party/nixpkgs/pkgs/development/libraries/orcania/default.nix index 157769c777..1058eaa1f6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/orcania/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/orcania/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, cmake, check, subunit }: stdenv.mkDerivation rec { pname = "orcania"; - version = "2.2.0"; + version = "2.2.1"; src = fetchFromGitHub { owner = "babelouest"; repo = pname; rev = "v${version}"; - sha256 = "sha256-tArXiXmoWHd42IGBZKtc4QJIBy3USPlSeW+Dv5xl1EU="; + sha256 = "sha256-6Libn+S5c7sCmKGq8KojiUhI18zO37rgiiVwQxP3p4o="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/precice/default.nix b/third_party/nixpkgs/pkgs/development/libraries/precice/default.nix index c3c75e2413..68084eb52b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/precice/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/precice/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "precice"; - version = "2.2.0"; + version = "2.2.1"; src = fetchFromGitHub { owner = "precice"; repo = pname; rev = "v${version}"; - sha256 = "sha256-AQc+p/twsfkzwpWeznGpLLSqINKSrWCwH+PdNIrdYA8="; + sha256 = "sha256-XEdrKhxG0dhsfJH6glrzc+JZeCgPEVIswj0ofP838lg="; }; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/rdkafka/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rdkafka/default.nix index cdd11c75a7..41a5526fc5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/rdkafka/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/rdkafka/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rdkafka"; - version = "1.6.1"; + version = "1.7.0"; src = fetchFromGitHub { owner = "edenhill"; repo = "librdkafka"; rev = "v${version}"; - sha256 = "sha256-EoNzxwuLiYi6sMhyqD/x+ku6BKA+i5og4XsUy2JBN0U="; + sha256 = "sha256-NLlg9S3bn5rAFyRa1ETeQGhFJYb/1y2ZiDylOy7xNbY="; }; nativeBuildInputs = [ pkg-config python3 ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/reproc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/reproc/default.nix index e7570fdb59..cd5bc5b7dc 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/reproc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/reproc/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "reproc"; - version = "14.2.2"; + version = "14.2.3"; src = fetchFromGitHub { owner = "DaanDeMeyer"; repo = "reproc"; rev = "v${version}"; - sha256 = "sha256-QOQcNDQkG929cEchIZ+XzjRncUUB10DpdB4zqgPqv4A="; + sha256 = "sha256-bdZ7czkeoSl5znGit0AYQ9D4K8qE2Co+F2Z4jLJuQok="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocksdb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rocksdb/default.nix index ef4271ee96..cfac0519c2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/rocksdb/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/rocksdb/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "rocksdb"; - version = "6.23.2"; + version = "6.23.3"; src = fetchFromGitHub { owner = "facebook"; repo = pname; rev = "v${version}"; - sha256 = "0ivdcc012c35f2wcc5qzic2jlrwp4whyz5sbz1nyfyrnv0xf5djw"; + sha256 = "sha256-SsDqhjdCdtIGNlsMj5kfiuS3zSGwcxi4KV71d95h7yk="; }; nativeBuildInputs = [ cmake ninja ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix b/third_party/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix index 5bae8df59e..944c3477fb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "s2n-tls"; - version = "1.0.1"; + version = "1.0.16"; src = fetchFromGitHub { owner = "aws"; repo = pname; rev = "v${version}"; - sha256 = "sha256-V/ZtO6t+Jxu/HmAEVzjkXuGWbZFwkGLsab1UCSG2tdk="; + sha256 = "sha256-gF4VhNEq/gpxXqOKvBtWZ5iZ3Jf98vSuSZYUu8r1jKA="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/simdjson/default.nix b/third_party/nixpkgs/pkgs/development/libraries/simdjson/default.nix index efa007da90..3ee1a1d068 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/simdjson/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/simdjson/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "simdjson"; - version = "0.9.2"; + version = "0.9.7"; src = fetchFromGitHub { owner = "simdjson"; repo = "simdjson"; rev = "v${version}"; - sha256 = "sha256-L/a/vTthh7XkiwuvlGk9q+uLEBf8vaPoV1x1fG44zeg="; + sha256 = "sha256-3ZLEp2RQhQ7QsRGLimWlZQM8PMTv07NlFoe64ES2+Ug="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/totem-pl-parser/default.nix b/third_party/nixpkgs/pkgs/development/libraries/totem-pl-parser/default.nix index 335f2ac2e0..1a180be283 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/totem-pl-parser/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/totem-pl-parser/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "totem-pl-parser"; - version = "3.26.5"; + version = "3.26.6"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "132jihnf51zs98yjkc6jxyqib4f3dawpjm17g4bj4j78y93dww2k"; + sha256 = "wN8PaNXPnX2kPIHH8T8RFYNYNo+Ywi1Hci870EvTrBw="; }; passthru = { diff --git a/third_party/nixpkgs/pkgs/development/libraries/trompeloeil/default.nix b/third_party/nixpkgs/pkgs/development/libraries/trompeloeil/default.nix index 062c441063..8a6f03dd99 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/trompeloeil/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/trompeloeil/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "trompeloeil"; - version = "40"; + version = "41"; src = fetchFromGitHub { owner = "rollbear"; repo = "trompeloeil"; rev = "v${version}"; - sha256 = "sha256-q0iMM3Hb5Y21RUhhxFEd/q4OCJFJ12gozZd5jCDscro="; + sha256 = "sha256-NsWRN520K4FLp+8W83bXT6pgQEADYFnWiB6gy3MjsWY="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix index 8c5a8d6306..90ad985cfb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix @@ -1,5 +1,5 @@ { lib, stdenv -, runCommandNoCC +, runCommand , fetchurl , fetchpatch , perl @@ -172,7 +172,7 @@ stdenv.mkDerivation rec { # (We pick just that one because using the other headers from `sdk` is not # compatible with our C++ standard library. This header is already in # the standard library on aarch64) - runCommandNoCC "${pname}_headers" {} '' + runCommand "${pname}_headers" {} '' install -Dm444 "${lib.getDev apple_sdk.sdk}"/include/libproc.h "$out"/include/libproc.h '' ) ++ lib.optionals stdenv.isLinux [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/zlib-ng/default.nix b/third_party/nixpkgs/pkgs/development/libraries/zlib-ng/default.nix index 7ba07cd924..4323d8adda 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/zlib-ng/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/zlib-ng/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "zlib-ng"; - version = "2.0.2"; + version = "2.0.5"; src = fetchFromGitHub { owner = "zlib-ng"; repo = "zlib-ng"; rev = version; - sha256 = "1cl6asrav2512j7p02zcpibywjljws0m7aazvb3q2r9qiyvyswji"; + sha256 = "sha256-KvV1XtPoagqPmijdr20eejsXWG7PRjMUwGPLXazqUHM="; }; outputs = [ "out" "dev" "bin" ]; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/shell.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/shell.nix index bd6eea65f6..9fc0c0b2aa 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/shell.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/shell.nix @@ -10,7 +10,28 @@ self = rec { freetds lispPackages.quicklisp-to-nix lispPackages.quicklisp-to-nix-system-info ]; - CPATH = "${libfixposix}/include"; - LD_LIBRARY_PATH = "${openssl.out}/lib:${fuse}/lib:${libuv}/lib:${libev}/lib:${libmysqlclient}/lib:${libmysqlclient}/lib/mysql:${postgresql.lib}/lib:${sqlite.out}/lib:${libfixposix}/lib:${freetds}/lib:${openssl_lib_marked}/lib:${glib.out}/lib:${gdk-pixbuf}/lib:${cairo}/lib:${pango.out}/lib:${gtk3}/lib:${webkitgtk}/lib:${gobject-introspection}/lib"; + CPATH = lib.makeSearchPath "include" + [ libfixposix + ]; + LD_LIBRARY_PATH = lib.makeLibraryPath + [ cairo + freetds + fuse + gdk-pixbuf + glib + gobject-introspection + gtk3 + libev + libfixposix + libmysqlclient + libuv + openssl + openssl_lib_marked + pango + postgresql + sqlite + webkitgtk + ] + + ":${libmysqlclient}/lib/mysql"; }; in stdenv.mkDerivation self diff --git a/third_party/nixpkgs/pkgs/development/node-packages/generate.sh b/third_party/nixpkgs/pkgs/development/node-packages/generate.sh index b58c71a088..9e5162676d 100755 --- a/third_party/nixpkgs/pkgs/development/node-packages/generate.sh +++ b/third_party/nixpkgs/pkgs/development/node-packages/generate.sh @@ -1,9 +1,7 @@ #!/usr/bin/env bash set -eu -o pipefail - -DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" +cd "$( dirname "${BASH_SOURCE[0]}" )" node2nix=$(nix-build ../../.. -A nodePackages.node2nix) -cd "$DIR" rm -f ./node-env.nix ${node2nix}/bin/node2nix -i node-packages.json -o node-packages.nix -c composition.nix # using --no-out-link in nix-build argument would cause the 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 4c0ec21eba..7190f39426 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.1202.0" = { + "@angular-devkit/architect-0.1202.1" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.1202.0"; + version = "0.1202.1"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1202.0.tgz"; - sha512 = "99O8iLO9LEVTPYN6kj6XINHxjw13ofTS48hm3D0i44QMEyq3SRH1ctH6HcUAtbgPF3VjOUFr5vRYpQN1OdOCXw=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1202.1.tgz"; + sha512 = "sH2jzzfvXxVvlT7ZE175pHdZ4KW50hFfvF10U8Nry83dpfE54eeCntGfkT40geGwJXG+ibP/T9SG7PsbTssvKQ=="; }; }; "@angular-devkit/core-12.0.5" = { @@ -76,13 +76,13 @@ let sha512 = "KOzGD8JbP/7EeUwPiU5x+fo3ZEQ5R4IVW5WoH92PaO3mdpqXC7UL2MWLct8PUe9il9nqJMvrBMldSSvP9PCT2w=="; }; }; - "@angular-devkit/core-12.2.0" = { + "@angular-devkit/core-12.2.1" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "12.2.0"; + version = "12.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-12.2.0.tgz"; - sha512 = "9H2NfE4eazpMPwbAx4ZbtTNijo6419DZsmQzlzwQWzTInO3+CAjQuyW53W5Nt/IoauNVOgOEsC8/YbYjNmN0Aw=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-12.2.1.tgz"; + sha512 = "To/2a5+PRroaCNEvqm5GluXhUwkThIBgF7I0HsmYkN32OauuLYPvwZYAKuPHMDNEFx9JKkG5RZonslXXycv1kw=="; }; }; "@angular-devkit/schematics-12.0.5" = { @@ -103,13 +103,13 @@ let sha512 = "yD3y3pK/K5piOgvALFoCCiPp4H8emNa3yZL+vlpEpewVLpF1MM55LeTxc0PI5s0uqtOGVnvcbA5wYgMm3YsUEA=="; }; }; - "@angular-devkit/schematics-12.2.0" = { + "@angular-devkit/schematics-12.2.1" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "12.2.0"; + version = "12.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-12.2.0.tgz"; - sha512 = "C+eutMKtOLROk/2zs1NkXeLZJpFtvZm7ctWmcns0Yh83Di2sCgGiSqdqNZFyDplxkt5W5lF2cdBSGyP8ZH+/ug=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-12.2.1.tgz"; + sha512 = "lzW3HuoF0rCbYVqqnZp/68WWD09mjLd8N0WAhiod0vlFwMTq16L5D9zKCbC0unjjsIAJsIiT2ERHQICrOP1OKQ=="; }; }; "@angular-devkit/schematics-cli-12.1.4" = { @@ -625,13 +625,13 @@ let sha512 = "YEdjTCq+LNuNS1WfxsDCNpgXkJaIyqco6DAelTUjT4f2KIWC1nBcaCaSdHTBqQVLnTBexBcVcFhLSU1KnYuePQ=="; }; }; - "@babel/helpers-7.14.8" = { + "@babel/helpers-7.15.3" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.14.8"; + version = "7.15.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.14.8.tgz"; - sha512 = "ZRDmI56pnV+p1dH6d+UN6GINGz7Krps3+270qqI9UJ4wxYThfAIcI5i7j5vXC4FJ3Wap+S9qcebxeYiqn87DZw=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.15.3.tgz"; + sha512 = "HwJiz52XaS96lX+28Tnbu31VeFSQJGOeKHJeaEPQlTl7PnlhFElWPj8tUXtqFIzeN86XxXoBr+WFAyK2PPVz6g=="; }; }; "@babel/highlight-7.14.5" = { @@ -652,13 +652,13 @@ let sha512 = "OhsyMrqygfk5v8HmWwOzlYjJrtLaFhF34MrfG/Z73DgYCI6ojNUTUp2TYbtnjo8PegeJp12eamsNettCQjKjVw=="; }; }; - "@babel/parser-7.15.2" = { + "@babel/parser-7.15.3" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.15.2"; + version = "7.15.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.15.2.tgz"; - sha512 = "bMJXql1Ss8lFnvr11TZDH4ArtwlAS5NG9qBmdiFW2UHHm6MVoR+GDc5XE2b9K938cyjc9O6/+vjjcffLDtfuDg=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.15.3.tgz"; + sha512 = "O0L6v/HvqbdJawj0iBEfVQMc3/6WP+AeOsovsIgBFyJaG+W2w7eqvZB7puddATmWuARlm1SX7DwxJ/JJUnDpEA=="; }; }; "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5" = { @@ -1048,13 +1048,13 @@ let sha512 = "dtqWqdWZ5NqBX3KzsVCWfQI3A53Ft5pWFCT2eCVUftWZgjc5DpDponbIF1+c+7cSGk2wN0YK7HGL/ezfRbpKBQ=="; }; }; - "@babel/plugin-transform-block-scoping-7.14.5" = { + "@babel/plugin-transform-block-scoping-7.15.3" = { name = "_at_babel_slash_plugin-transform-block-scoping"; packageName = "@babel/plugin-transform-block-scoping"; - version = "7.14.5"; + version = "7.15.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.14.5.tgz"; - sha512 = "LBYm4ZocNgoCqyxMLoOnwpsmQ18HWTQvql64t3GvMUzLQrNoV1BDG0lNftC8QKYERkZgCCT/7J5xWGObGAyHDw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.15.3.tgz"; + sha512 = "nBAzfZwZb4DkaGtOes1Up1nOAp9TDRRFw4XBzBBSG9QK7KVFmYzgj9o9sbPv7TX5ofL4Auq4wZnxCoPnI/lz2Q=="; }; }; "@babel/plugin-transform-classes-7.14.9" = { @@ -1462,13 +1462,13 @@ let sha512 = "lt0Y/8V3y06Wq/8H/u0WakrqciZ7Fz7mwPDHWUJAXlABL5hiUG42BNlRXiELNjeWjO5rWmnNKlx+yzJvxezHow=="; }; }; - "@babel/register-7.14.5" = { + "@babel/register-7.15.3" = { name = "_at_babel_slash_register"; packageName = "@babel/register"; - version = "7.14.5"; + version = "7.15.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/register/-/register-7.14.5.tgz"; - sha512 = "TjJpGz/aDjFGWsItRBQMOFTrmTI9tr79CHOK+KIvLeCkbxuOAk2M5QHjvruIMGoo9OuccMh5euplPzc5FjAKGg=="; + url = "https://registry.npmjs.org/@babel/register/-/register-7.15.3.tgz"; + sha512 = "mj4IY1ZJkorClxKTImccn4T81+UKTo4Ux0+OFSV9hME1ooqS9UV+pJ6BjD0qXPK4T3XW/KNa79XByjeEMZz+fw=="; }; }; "@babel/runtime-7.13.9" = { @@ -1480,13 +1480,13 @@ let sha512 = "aY2kU+xgJ3dJ1eU6FMB9EH8dIe8dmusF1xEku52joLvw6eAFN0AI+WxCLDnpev2LEejWBAy2sBvBOBAjI3zmvA=="; }; }; - "@babel/runtime-7.14.8" = { + "@babel/runtime-7.15.3" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.14.8"; + version = "7.15.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.8.tgz"; - sha512 = "twj3L8Og5SaCRCErB4x4ajbvBIVV77CGeFglHpeg5WC5FF8TZzBWXtTJ4MqaD9QszLYTtr+IsaAL2rEUevb+eg=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.3.tgz"; + sha512 = "OvwMLqNXkCXSz1kSm58sEsNuhqOx/fKpnUnKnFB5v8uDda5bLNEHNgKPvhDN6IU0LDcnHQ90LlJ0Q6jnyBSIBA=="; }; }; "@babel/runtime-7.9.0" = { @@ -1498,22 +1498,22 @@ let sha512 = "cTIudHnzuWLS56ik4DnRnqqNf8MkdUzV4iFFI1h7Jo9xvrpQROYaAnaSd2mHLQAzzZAPfATynX5ord6YlNYNMA=="; }; }; - "@babel/runtime-corejs3-7.14.9" = { + "@babel/runtime-corejs3-7.15.3" = { name = "_at_babel_slash_runtime-corejs3"; packageName = "@babel/runtime-corejs3"; - version = "7.14.9"; + version = "7.15.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.14.9.tgz"; - sha512 = "64RiH2ON4/y8qYtoa8rUiyam/tUVyGqRyNYhe+vCRGmjnV4bUlZvY+mwd0RrmLoCpJpdq3RsrNqKb7SJdw/4kw=="; + url = "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.15.3.tgz"; + sha512 = "30A3lP+sRL6ml8uhoJSs+8jwpKzbw8CqBvDc1laeptxPm5FahumJxirigcbD2qTs71Sonvj1cyZB0OKGAmxQ+A=="; }; }; - "@babel/standalone-7.15.2" = { + "@babel/standalone-7.15.3" = { name = "_at_babel_slash_standalone"; packageName = "@babel/standalone"; - version = "7.15.2"; + version = "7.15.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/standalone/-/standalone-7.15.2.tgz"; - sha512 = "q/DsJPZ2v0PjH4UL0DaEOCT/pERnXPsfERLbILXuzS8BWF6NuBAxJwf2/h/XiyJZZ4X/7BVrmoW6H7u3H6nDYQ=="; + url = "https://registry.npmjs.org/@babel/standalone/-/standalone-7.15.3.tgz"; + sha512 = "Bst2YWEyQ2ROyO0+jxPVnnkSmUh44/x54+LSbe5M4N5LGfOkxpajEUKVE4ndXtIVrLlHCyuiqCPwv3eC1ItnCg=="; }; }; "@babel/template-7.14.5" = { @@ -1651,13 +1651,13 @@ let sha512 = "3E4/6sCLEcoPUk6FJHOpLGqBNSE2AHrIrErXKRFU3je/MZotxvWrfrZY3IsENJgjJ69Zv0dxMxTZo/l+BVNa3w=="; }; }; - "@chemzqm/neovim-5.3.4" = { + "@chemzqm/neovim-5.3.5" = { name = "_at_chemzqm_slash_neovim"; packageName = "@chemzqm/neovim"; - version = "5.3.4"; + version = "5.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/@chemzqm/neovim/-/neovim-5.3.4.tgz"; - sha512 = "UVH9xoNSwhzsnEhhcIc4hoDpmyUhGcqBbco5tuISdGV4gEgOKN48c7WhVMmyrsSGogohVCwPHuDugdssUx66tQ=="; + url = "https://registry.npmjs.org/@chemzqm/neovim/-/neovim-5.3.5.tgz"; + sha512 = "khqF4y0Z1WLPJR3LPJRgTAAZHQYTxHFXw3Nzr799aRsKXummSX85SS7ZLnVDyDjzd3x4yonYdWk89K2ZpJslnQ=="; }; }; "@cnakazawa/watch-1.0.4" = { @@ -2506,13 +2506,13 @@ let sha512 = "d4VSA86eL/AFTe5xtyZX+ePUjE8dIFu2T8zmdeNBSa5/kNgXPCx/o/wbFNHAGLJdGnk1vddRuMESD9HbOC8irw=="; }; }; - "@google-cloud/pubsub-2.16.1" = { + "@google-cloud/pubsub-2.16.3" = { name = "_at_google-cloud_slash_pubsub"; packageName = "@google-cloud/pubsub"; - version = "2.16.1"; + version = "2.16.3"; src = fetchurl { - url = "https://registry.npmjs.org/@google-cloud/pubsub/-/pubsub-2.16.1.tgz"; - sha512 = "+uO7r9uRfD/x0BzBI67clbIu0VIdqYLZ5NINuGEsMiAXIGWQWmceuLMixMEb/JOxeaqKygH1mL2rshkDisUmGg=="; + url = "https://registry.npmjs.org/@google-cloud/pubsub/-/pubsub-2.16.3.tgz"; + sha512 = "KkH0IH1PUzgWBquUhWfSG//R/8K3agYRyrqqeNtLjbr2lnehrOVllPtdnroO4q2lxoul3WrK+esPvtVywkb4Ag=="; }; }; "@graphql-cli/common-4.1.0" = { @@ -2605,22 +2605,22 @@ let sha512 = "G5YrOew39fZf16VIrc49q3c8dBqQDD0ax5LYPiNja00xsXDi0T9zsEWVt06ApjtSdSF6HDddlu5S12QjeN8Tow=="; }; }; - "@graphql-tools/merge-7.0.0" = { + "@graphql-tools/merge-8.0.1" = { name = "_at_graphql-tools_slash_merge"; packageName = "@graphql-tools/merge"; - version = "7.0.0"; + version = "8.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-7.0.0.tgz"; - sha512 = "u7TTwKQ7cybAkn6snYPRg3um/C2u690wlD8TgHITAmGQDAExN/yipSSBgu4rXWopsPLsY0G30mJ8tOWToZVE1w=="; + url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-8.0.1.tgz"; + sha512 = "YAozogbjC2Oun+UcwG0LZFumhlCiHBmqe68OIf7bqtBdp4pbPAiVuK/J9oJqRVJmzvUqugo6RD9zz1qDTKZaiQ=="; }; }; - "@graphql-tools/mock-8.1.8" = { + "@graphql-tools/mock-8.2.1" = { name = "_at_graphql-tools_slash_mock"; packageName = "@graphql-tools/mock"; - version = "8.1.8"; + version = "8.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/mock/-/mock-8.1.8.tgz"; - sha512 = "ZLt4THOdDrwzMP5bKYaWJwJFYmacQojNWHt5Oo0c50N0jWe+PD/AbPbrn8Jb7mdVMhnxDgdMGwhsEFBhHSKJVA=="; + url = "https://registry.npmjs.org/@graphql-tools/mock/-/mock-8.2.1.tgz"; + sha512 = "/DyU742thZ3wSR8NxbzeV2K5sxtfPcnRJDuaN+WuHDOE1X1lsFiS49J0TouEnZCfLuAmhSjUMT/2GbD0xu6ggw=="; }; }; "@graphql-tools/schema-7.1.5" = { @@ -2632,13 +2632,13 @@ let sha512 = "uyn3HSNSckf4mvQSq0Q07CPaVZMNFCYEVxroApOaw802m9DcZPgf9XVPy/gda5GWj9AhbijfRYVTZQgHnJ4CXA=="; }; }; - "@graphql-tools/schema-8.0.3" = { + "@graphql-tools/schema-8.1.1" = { name = "_at_graphql-tools_slash_schema"; packageName = "@graphql-tools/schema"; - version = "8.0.3"; + version = "8.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-8.0.3.tgz"; - sha512 = "ufJH7r/RcetVPd3kKCZ16/JTRkOX8aB1yGbYnUjqWEIdYEZc3Fpg7AVlcliu2JlvwR+WSNlgWn2QK76QCsFFdA=="; + url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-8.1.1.tgz"; + sha512 = "u+0kxPtuP+GcKnGNt459Ob7iIpzesIJeJTmPPailaG7ZhB5hkXIizl4uHrzEIAh2Ja1P/VA8sEBYpu1N0n6Mmg=="; }; }; "@graphql-tools/url-loader-6.10.1" = { @@ -2677,6 +2677,15 @@ let sha512 = "gzkavMOgbhnwkHJYg32Adv6f+LxjbQmmbdD5Hty0+CWxvaiuJq+nU6tzb/7VSU4cwhbNLx/lGu2jbCPEW1McZQ=="; }; }; + "@graphql-tools/utils-8.1.1" = { + name = "_at_graphql-tools_slash_utils"; + packageName = "@graphql-tools/utils"; + version = "8.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-8.1.1.tgz"; + sha512 = "QbFNoBmBiZ+ej4y6mOv8Ba4lNhcrTEKXAhZ0f74AhdEXi7b9xbGUH/slO5JaSyp85sGQYIPmxjRPpXBjLklbmw=="; + }; + }; "@graphql-tools/wrap-7.0.8" = { name = "_at_graphql-tools_slash_wrap"; packageName = "@graphql-tools/wrap"; @@ -2713,15 +2722,6 @@ let sha512 = "AxtZcm0mArQhY9z8T3TynCYVEaSKxNCa9mVhVwBCUnsuUEe8Zn94bPYYKVQSLt+hJJ1y0ukr3mUvtWfcATL/IQ=="; }; }; - "@grpc/grpc-js-1.3.5" = { - name = "_at_grpc_slash_grpc-js"; - packageName = "@grpc/grpc-js"; - version = "1.3.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.3.5.tgz"; - sha512 = "V29L2QNKkLWM3bcJfVFMSo+Z7kkO8A1s7MAfdzBXLYEC1PE5/M0n1iXBDiD5aUtyVLh5GILcbme2bGtIHl0FMQ=="; - }; - }; "@grpc/grpc-js-1.3.6" = { name = "_at_grpc_slash_grpc-js"; packageName = "@grpc/grpc-js"; @@ -2866,6 +2866,15 @@ let sha512 = "2JYy//YE2YINTe21hpdVMBNc7aYFkgDeY9JUz/BCjFZmYLn0UjGaCc4BpTcMGXNJwuqoUenw2WGOFGHsJqlIDw=="; }; }; + "@hpcc-js/wasm-1.4.1" = { + name = "_at_hpcc-js_slash_wasm"; + packageName = "@hpcc-js/wasm"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@hpcc-js/wasm/-/wasm-1.4.1.tgz"; + sha512 = "WYeIuG/B1B1cTcM9D9bC6qDFSZnEcJ9R3SpTW5jh10sTh0hD1h1t/dZudfLwarJD+ce8q4/BP43BplbP3CeNkQ=="; + }; + }; "@humanwhocodes/config-array-0.5.0" = { name = "_at_humanwhocodes_slash_config-array"; packageName = "@humanwhocodes/config-array"; @@ -3136,67 +3145,58 @@ let sha512 = "fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ=="; }; }; - "@joplin/fork-htmlparser2-4.1.31" = { + "@joplin/fork-htmlparser2-4.1.33" = { name = "_at_joplin_slash_fork-htmlparser2"; packageName = "@joplin/fork-htmlparser2"; - version = "4.1.31"; + version = "4.1.33"; src = fetchurl { - url = "https://registry.npmjs.org/@joplin/fork-htmlparser2/-/fork-htmlparser2-4.1.31.tgz"; - sha512 = "5v7vYawEQP+0wHjT3sXi5LgRiWWImbnNdsTf6mdKg+IeX9KCjYnc7aZRGdC+yQlEQbcIRpu8bKUQnh/WoaMG7g=="; + url = "https://registry.npmjs.org/@joplin/fork-htmlparser2/-/fork-htmlparser2-4.1.33.tgz"; + sha512 = "Q5GR6mVKS/1JgNTHtS0hc08YexfVZIq9RAj9j33Zm9SXEDstXn0WP4UpULCWLYOen3ffJ2z4uv9a2vLKcvbbIg=="; }; }; - "@joplin/fork-sax-1.2.35" = { + "@joplin/fork-sax-1.2.37" = { name = "_at_joplin_slash_fork-sax"; packageName = "@joplin/fork-sax"; - version = "1.2.35"; + version = "1.2.37"; src = fetchurl { - url = "https://registry.npmjs.org/@joplin/fork-sax/-/fork-sax-1.2.35.tgz"; - sha512 = "+0K4PbooQweodhTIaehh9QdC9g6SH7IpFzeNsv3Eh3T7LT985XJ1mZfXEjRI5pfWrRj9ibvxHcgvMzEQuXPM3g=="; + url = "https://registry.npmjs.org/@joplin/fork-sax/-/fork-sax-1.2.37.tgz"; + sha512 = "3S71WcFLsZQ4tlZ7LNZRBoEE0LJJL8gxhqwAKZXKYTF5syShZDNWwSpntB4AoFWry3L0I+HnjXm2psQfQzo15Q=="; }; }; - "@joplin/lib-2.1.1" = { + "@joplin/lib-2.3.1" = { name = "_at_joplin_slash_lib"; packageName = "@joplin/lib"; - version = "2.1.1"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@joplin/lib/-/lib-2.1.1.tgz"; - sha512 = "mePMxOEC7+T7gTRuIO3ZWxkyDhAhuoNNGi3wsf4g633TcYD0SEX9peokCdjAnQC5l4BjrqxmgY1qTmk2sx+9TA=="; + url = "https://registry.npmjs.org/@joplin/lib/-/lib-2.3.1.tgz"; + sha512 = "/OIyf4AdF/JLFf+ZTYsusrjl5XCDV20wwi0JnvxnySYgG9Y4GgNusDPI0/77+rj+KQA/E91FzGeWoSDc5XOUsA=="; }; }; - "@joplin/renderer-1.8.2" = { + "@joplin/renderer-2.3.1" = { name = "_at_joplin_slash_renderer"; packageName = "@joplin/renderer"; - version = "1.8.2"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@joplin/renderer/-/renderer-1.8.2.tgz"; - sha512 = "Khl2DoM1aFEy15RX9JaMaYinjoNEYQHOgQqzMHq4wuWr+QuAQaX8/SofTe1FU2rS4SJrkObPA+XPavhVSAxpOQ=="; + url = "https://registry.npmjs.org/@joplin/renderer/-/renderer-2.3.1.tgz"; + sha512 = "wOxuScEao2f3kIs+A0qroWe6CiWs1LeZqwBz/w869Qi8MW8wvy2aeyirpnb7yEYh9aCevfiQcUMUvYZ9ekMskg=="; }; }; - "@joplin/renderer-2.1.1" = { - name = "_at_joplin_slash_renderer"; - packageName = "@joplin/renderer"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@joplin/renderer/-/renderer-2.1.1.tgz"; - sha512 = "XxmquKGZxlrjUorx924ogAACc39p22pzWp06DJX/eElU2kLZ/s+RC0EXAFj503EuDj/dd2voV+Tciz0wfCPc0Q=="; - }; - }; - "@joplin/turndown-4.0.53" = { + "@joplin/turndown-4.0.55" = { name = "_at_joplin_slash_turndown"; packageName = "@joplin/turndown"; - version = "4.0.53"; + version = "4.0.55"; src = fetchurl { - url = "https://registry.npmjs.org/@joplin/turndown/-/turndown-4.0.53.tgz"; - sha512 = "uYeROpicdZKWq2WLOuKTAsG5wEZu8cy/kjWRBIkuyql575NRzyONh9e4UtT6tiWmPWtuVNHmaBJJyIzAwstfLg=="; + url = "https://registry.npmjs.org/@joplin/turndown/-/turndown-4.0.55.tgz"; + sha512 = "9IgtCAQXzCtkXNE+/4q6dWnbt90kvZIefTLFXLxE+w/gLbBDxSmTCfhCCFPzUA1ORp3LkAJZIiE710fRM0O3gg=="; }; }; - "@joplin/turndown-plugin-gfm-1.0.35" = { + "@joplin/turndown-plugin-gfm-1.0.37" = { name = "_at_joplin_slash_turndown-plugin-gfm"; packageName = "@joplin/turndown-plugin-gfm"; - version = "1.0.35"; + version = "1.0.37"; src = fetchurl { - url = "https://registry.npmjs.org/@joplin/turndown-plugin-gfm/-/turndown-plugin-gfm-1.0.35.tgz"; - sha512 = "jMc8Cjq3K2szQGsi39yQpxMuR3JCCkIFWjQxKRlOW7JvbaTeMPuGqpEafuNqtn7qU6DoYF72p/glKmU8p2t3Dg=="; + url = "https://registry.npmjs.org/@joplin/turndown-plugin-gfm/-/turndown-plugin-gfm-1.0.37.tgz"; + sha512 = "LRiIezmtnJSdczIT3mPuCvUIdFT01lDYTBDdSNGwBheNt7R9tYIj0nh87OnpBGztktIIsOH/66nbB8KQjVtisQ=="; }; }; "@josephg/resolvable-1.0.1" = { @@ -3217,13 +3217,22 @@ let sha512 = "4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg=="; }; }; - "@jsii/spec-1.32.0" = { + "@jsii/check-node-1.33.0" = { + name = "_at_jsii_slash_check-node"; + packageName = "@jsii/check-node"; + version = "1.33.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@jsii/check-node/-/check-node-1.33.0.tgz"; + sha512 = "Bajxa09dhkuQ8bM1ve6qtm2oFNhW9/+GaKRh4Deewsk/G86ovLXI/rRS6TfCsSw4E0TGPFWzWy0tBeJuEDo7sw=="; + }; + }; + "@jsii/spec-1.33.0" = { name = "_at_jsii_slash_spec"; packageName = "@jsii/spec"; - version = "1.32.0"; + version = "1.33.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jsii/spec/-/spec-1.32.0.tgz"; - sha512 = "XjSnqvmBXvFork9w3ehacqaa0JmUVaEYubOzR1l6z67z2FDZ9C4KP7EqMqjnv/S+j+Ou3tWQPfLICnl6aK1iGA=="; + url = "https://registry.npmjs.org/@jsii/spec/-/spec-1.33.0.tgz"; + sha512 = "JUu4NhmFQiLnzegaj4gJ5xAt7YjB2fUteJppIN/J49TQJd1kWxsFFmYIMJDuUiAUzo0Gx99N4YqgcfKK3kLAbQ=="; }; }; "@kwsites/file-exists-1.1.1" = { @@ -3964,13 +3973,13 @@ let sha512 = "7AQsO0hMmpqDledV7AhBuSYqYPFsKP9PaltMecX9nlnsyFxqtsqUg9/pvB2L/jxvskrDrNkdKYz2KTbQznCtng=="; }; }; - "@mdn/browser-compat-data-3.3.7" = { + "@mdn/browser-compat-data-3.3.14" = { name = "_at_mdn_slash_browser-compat-data"; packageName = "@mdn/browser-compat-data"; - version = "3.3.7"; + version = "3.3.14"; src = fetchurl { - url = "https://registry.npmjs.org/@mdn/browser-compat-data/-/browser-compat-data-3.3.7.tgz"; - sha512 = "X42YckpwhdWwWVWR3UpEUB21oIpYoKGMuswZb34yPcsMCySNwLqHnoE972q/UD8VwtpnmO69fsTFiRT2s1gjfA=="; + url = "https://registry.npmjs.org/@mdn/browser-compat-data/-/browser-compat-data-3.3.14.tgz"; + sha512 = "n2RC9d6XatVbWFdHLimzzUJxJ1KY8LdjqrW6YvGPiRmsHkhOUx74/Ct10x5Yo7bC/Jvqx7cDEW8IMPv/+vwEzA=="; }; }; "@mdx-js/util-2.0.0-next.8" = { @@ -4000,13 +4009,13 @@ let sha512 = "W6CLUJ2eBMw3Rec70qrsEW0jOm/3twwJv21mrmj2yORiaVmVYGS4sSS5yUwvQc1ZlDLYGPnClVWmUUMagKNsfA=="; }; }; - "@microsoft/load-themed-styles-1.10.197" = { + "@microsoft/load-themed-styles-1.10.202" = { name = "_at_microsoft_slash_load-themed-styles"; packageName = "@microsoft/load-themed-styles"; - version = "1.10.197"; + version = "1.10.202"; src = fetchurl { - url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.197.tgz"; - sha512 = "w/RyqDpXR5unGjcFpzla6CE4L/r6AMbVkrxbK8Xq4Wl1GMfmK/5YWUz0wdCBHqCb+FuhQKni+ThGPti2pzI2mg=="; + url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.202.tgz"; + sha512 = "pWoN9hl1vfXnPfu2tS5VndXXKMe+UEWLJXDKNGXSNpmfszVLzG8Ns0TlZHlwtgpSaSD3f0kdVDfqAek8aflD4w=="; }; }; "@mitmaro/errors-1.0.0" = { @@ -4081,31 +4090,31 @@ let sha512 = "b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg=="; }; }; - "@netlify/build-17.10.0" = { + "@netlify/build-18.2.9" = { name = "_at_netlify_slash_build"; packageName = "@netlify/build"; - version = "17.10.0"; + version = "18.2.9"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/build/-/build-17.10.0.tgz"; - sha512 = "3L0ps4b5u34Sj03a7tJMwGkuO+Tg2eXOFVdToINV3StgjB9lTU7fOEm0jCJOw9E9QFAVpemW0tRadofYY/Hzjg=="; + url = "https://registry.npmjs.org/@netlify/build/-/build-18.2.9.tgz"; + sha512 = "0resO0G+O8SKcQ7UGUeYmrZCL1qeki+cWo47lOQduo4RNjHNH6fS2HSLM0CJEwTKw9SNiJNBb7hZbRi7C/KNdQ=="; }; }; - "@netlify/cache-utils-2.0.0" = { + "@netlify/cache-utils-2.0.1" = { name = "_at_netlify_slash_cache-utils"; packageName = "@netlify/cache-utils"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/cache-utils/-/cache-utils-2.0.0.tgz"; - sha512 = "CnWCssqm0pNCt/92zxpn2tfKaCts0envf4NwL7XgUDpPaKOCSwwi9+1ew8POdPmPaPYY0wFvOgejwNopKGzCOQ=="; + url = "https://registry.npmjs.org/@netlify/cache-utils/-/cache-utils-2.0.1.tgz"; + sha512 = "fAw8rMnl14f9TZmKV1g8+/8yVriitfNf4KcdfGPpGLpmQtpnSiynbzhpOLBHsLtViBCJ8O1vy24LK6CJx9JoqA=="; }; }; - "@netlify/config-14.4.3" = { + "@netlify/config-15.3.3" = { name = "_at_netlify_slash_config"; packageName = "@netlify/config"; - version = "14.4.3"; + version = "15.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/config/-/config-14.4.3.tgz"; - sha512 = "lCuhs58xDIkDF34A1Xz4CTXvr9xgVHJn5Y5Xwmj1Tgp78eOSQFozgYLVXEwLqTTg3EFiniPoHy0oSPMmrhCZMw=="; + url = "https://registry.npmjs.org/@netlify/config/-/config-15.3.3.tgz"; + sha512 = "etpctdQCHE/ALOYSWbyXzsquUSswWeUaqMIXfJsJ9pytMmB4oHjB6eu/GIT8FY1R0E6A/aVS2ibeVVexObNXbQ=="; }; }; "@netlify/esbuild-0.13.6" = { @@ -4135,130 +4144,130 @@ let sha512 = "mQI0NX0QPNVcYb2TQF5cpxO350BR9309r7vSOSvfn0DHkPWUea1kl3iiLXi1mm/dUC6pd3p5ctc0UboW0u+iVQ=="; }; }; - "@netlify/git-utils-2.0.0" = { + "@netlify/git-utils-2.0.1" = { name = "_at_netlify_slash_git-utils"; packageName = "@netlify/git-utils"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/git-utils/-/git-utils-2.0.0.tgz"; - sha512 = "O8cGi3yRtdqJ2pDkdcoj3t6F9JSB/SokRwZiCJjp2aBQyC+Jg3RsRH7G0MbYEjrjN6JY4/p6j62NTFqsIBGh2A=="; + url = "https://registry.npmjs.org/@netlify/git-utils/-/git-utils-2.0.1.tgz"; + sha512 = "a9GKmoOJuVTQ4+0x+4utS9XOySIGX5KBhMUgPKXGAZAFNeDXGkJj+ITrzyHcyJ4P8d8WPfQEXIusIqAqlfp+DA=="; }; }; - "@netlify/local-functions-proxy-1.1.0" = { + "@netlify/local-functions-proxy-1.1.1" = { name = "_at_netlify_slash_local-functions-proxy"; packageName = "@netlify/local-functions-proxy"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/local-functions-proxy/-/local-functions-proxy-1.1.0.tgz"; - sha512 = "HoxJuJpBqmzflIcdFsnUSuf/KwYsgzrsF/jh+bXPO+aOB9pzZEH0P/e/qCAr2JbJVzOyxo/36Ti3sXbahSDAYQ=="; + url = "https://registry.npmjs.org/@netlify/local-functions-proxy/-/local-functions-proxy-1.1.1.tgz"; + sha512 = "eXSsayLT6PMvjzFQpjC9nkg2Otc3lZ5GoYele9M6f8PmsvWpaXRhwjNQ0NYhQQ2UZbLMIiO2dH8dbRsT3bMkFw=="; }; }; - "@netlify/local-functions-proxy-darwin-arm64-1.1.0" = { + "@netlify/local-functions-proxy-darwin-arm64-1.1.1" = { name = "_at_netlify_slash_local-functions-proxy-darwin-arm64"; packageName = "@netlify/local-functions-proxy-darwin-arm64"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/local-functions-proxy-darwin-arm64/-/local-functions-proxy-darwin-arm64-1.1.0.tgz"; - sha512 = "EOSEA/mt6IyXqou//vOo17vnQwwBKPu8wO+bZZQNb+NNgyjzYl/8wpZE0CvoYHPsEU2h0hk1xeqwaYBMihunKg=="; + url = "https://registry.npmjs.org/@netlify/local-functions-proxy-darwin-arm64/-/local-functions-proxy-darwin-arm64-1.1.1.tgz"; + sha512 = "lphJ9qqZ3glnKWEqlemU1LMqXxtJ/tKf7VzakqqyjigwLscXSZSb6fupSjQfd4tR1xqxA76ylws/2HDhc/gs+Q=="; }; }; - "@netlify/local-functions-proxy-darwin-x64-1.1.0" = { + "@netlify/local-functions-proxy-darwin-x64-1.1.1" = { name = "_at_netlify_slash_local-functions-proxy-darwin-x64"; packageName = "@netlify/local-functions-proxy-darwin-x64"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/local-functions-proxy-darwin-x64/-/local-functions-proxy-darwin-x64-1.1.0.tgz"; - sha512 = "P+khKO6YwjeEv+zppE7asbInliopo1mJSkQeGT27ebs4UVkZPpYefhtLs8Gs5dau7zFfPBF8PFgE1kCEMKw4+g=="; + url = "https://registry.npmjs.org/@netlify/local-functions-proxy-darwin-x64/-/local-functions-proxy-darwin-x64-1.1.1.tgz"; + sha512 = "4CRB0H+dXZzoEklq5Jpmg+chizXlVwCko94d8+UHWCgy/bA3M/rU/BJ8OLZisnJaAktHoeLABKtcLOhtRHpxZQ=="; }; }; - "@netlify/local-functions-proxy-freebsd-arm64-1.1.0" = { + "@netlify/local-functions-proxy-freebsd-arm64-1.1.1" = { name = "_at_netlify_slash_local-functions-proxy-freebsd-arm64"; packageName = "@netlify/local-functions-proxy-freebsd-arm64"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/local-functions-proxy-freebsd-arm64/-/local-functions-proxy-freebsd-arm64-1.1.0.tgz"; - sha512 = "bqjyD4o7KVWrUPO/cr4HfUfUFUfTJFmjw0KFDFet//itJMSg+RocQGmjkJ8YTqWQZxwDJF7Dp44n/WGhpnWUUg=="; + url = "https://registry.npmjs.org/@netlify/local-functions-proxy-freebsd-arm64/-/local-functions-proxy-freebsd-arm64-1.1.1.tgz"; + sha512 = "u13lWTVMJDF0A6jX7V4N3HYGTIHLe5d1Z2wT43fSIHwXkTs6UXi72cGSraisajG+5JFIwHfPr7asw5vxFC0P9w=="; }; }; - "@netlify/local-functions-proxy-freebsd-x64-1.1.0" = { + "@netlify/local-functions-proxy-freebsd-x64-1.1.1" = { name = "_at_netlify_slash_local-functions-proxy-freebsd-x64"; packageName = "@netlify/local-functions-proxy-freebsd-x64"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/local-functions-proxy-freebsd-x64/-/local-functions-proxy-freebsd-x64-1.1.0.tgz"; - sha512 = "R8a0sW5bcTbX7eKiVzFw1+2F0tO8Sw/+fQL9f9Z+2F4pT5+SKml8CLvfRU5xYl1KcxdHGq5ETcSwu/wyqfMTpA=="; + url = "https://registry.npmjs.org/@netlify/local-functions-proxy-freebsd-x64/-/local-functions-proxy-freebsd-x64-1.1.1.tgz"; + sha512 = "g5xw4xATK5YDzvXtzJ8S1qSkWBiyF8VVRehXPMOAMzpGjCX86twYhWp8rbAk7yA1zBWmmWrWNA2Odq/MgpKJJg=="; }; }; - "@netlify/local-functions-proxy-linux-arm-1.1.0" = { + "@netlify/local-functions-proxy-linux-arm-1.1.1" = { name = "_at_netlify_slash_local-functions-proxy-linux-arm"; packageName = "@netlify/local-functions-proxy-linux-arm"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/local-functions-proxy-linux-arm/-/local-functions-proxy-linux-arm-1.1.0.tgz"; - sha512 = "iGricZd2RqBiF/LjD0EPnH0qSKjfn6RDEIp90I0BKQ2XRkQu7dPFr7m3QhOuoPIHxGERNNGK2FL4OGZ9jXEXtw=="; + url = "https://registry.npmjs.org/@netlify/local-functions-proxy-linux-arm/-/local-functions-proxy-linux-arm-1.1.1.tgz"; + sha512 = "YsTpL+AbHwQrfHWXmKnwUrJBjoUON363nr6jUG1ueYnpbbv6wTUA7gI5snMi/gkGpqFusBthAA7C30e6bixfiA=="; }; }; - "@netlify/local-functions-proxy-linux-arm64-1.1.0" = { + "@netlify/local-functions-proxy-linux-arm64-1.1.1" = { name = "_at_netlify_slash_local-functions-proxy-linux-arm64"; packageName = "@netlify/local-functions-proxy-linux-arm64"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/local-functions-proxy-linux-arm64/-/local-functions-proxy-linux-arm64-1.1.0.tgz"; - sha512 = "G7KGstzhNoQwiiuVjyl64fDnNJ2Z/QsjaLDnElSUEwaqJe+0drog0wUxym/RDuVmBY//XDQfxLtG2Zl5ce4tUA=="; + url = "https://registry.npmjs.org/@netlify/local-functions-proxy-linux-arm64/-/local-functions-proxy-linux-arm64-1.1.1.tgz"; + sha512 = "dPGu1H5n8na7mBKxiXQ+FNmthDAiA57wqgpm5JMAHtcdcmRvcXwJkwWVGvwfj8ShhYJHQaSaS9oPgO+mpKkgmA=="; }; }; - "@netlify/local-functions-proxy-linux-ia32-1.1.0" = { + "@netlify/local-functions-proxy-linux-ia32-1.1.1" = { name = "_at_netlify_slash_local-functions-proxy-linux-ia32"; packageName = "@netlify/local-functions-proxy-linux-ia32"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/local-functions-proxy-linux-ia32/-/local-functions-proxy-linux-ia32-1.1.0.tgz"; - sha512 = "okXWyslbX/mMm3CncfUy+CxnBW0vFoDxFaK2+tIeLz5nVizVVyPaoInTe0bs+sSrAvc3jbtt8AfV9ISmhtPx0A=="; + url = "https://registry.npmjs.org/@netlify/local-functions-proxy-linux-ia32/-/local-functions-proxy-linux-ia32-1.1.1.tgz"; + sha512 = "Ra0FlXDrmPRaq+rYH3/ttkXSrwk1D5Zx/Na7UPfJZxMY7Qo5iY4bgi/FuzjzWzlp0uuKZOhYOYzYzsIIyrSvmw=="; }; }; - "@netlify/local-functions-proxy-linux-ppc64-1.1.0" = { + "@netlify/local-functions-proxy-linux-ppc64-1.1.1" = { name = "_at_netlify_slash_local-functions-proxy-linux-ppc64"; packageName = "@netlify/local-functions-proxy-linux-ppc64"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/local-functions-proxy-linux-ppc64/-/local-functions-proxy-linux-ppc64-1.1.0.tgz"; - sha512 = "E3sPIN9y2QMU0bvPdNF3dmMi8pMUkGd9WYJHthpY9+fcP7j7L2d5h0uuSfG9TPEZS6/SW0c1XhK8wCDGGZIRaQ=="; + url = "https://registry.npmjs.org/@netlify/local-functions-proxy-linux-ppc64/-/local-functions-proxy-linux-ppc64-1.1.1.tgz"; + sha512 = "oXf1satwqwUUxz7LHS1BxbRqc4FFEKIDFTls04eXiLReFR3sqv9H/QuYNTCCDMuRcCOd92qKyDfATdnxT4HR8w=="; }; }; - "@netlify/local-functions-proxy-linux-x64-1.1.0" = { + "@netlify/local-functions-proxy-linux-x64-1.1.1" = { name = "_at_netlify_slash_local-functions-proxy-linux-x64"; packageName = "@netlify/local-functions-proxy-linux-x64"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/local-functions-proxy-linux-x64/-/local-functions-proxy-linux-x64-1.1.0.tgz"; - sha512 = "NFuOmMm5/tCOpQpuG32cFGp4n15++rsy26rWG1u7IVezOTr9SMKOmnsFxQVJGgOT7r3zBBjBJwYJN0CCNj9J3A=="; + url = "https://registry.npmjs.org/@netlify/local-functions-proxy-linux-x64/-/local-functions-proxy-linux-x64-1.1.1.tgz"; + sha512 = "bS3u4JuDg/eC0y4Na3i/29JBOxrdUvsK5JSjHfzUeZEbOcuXYf4KavTpHS5uikdvTgyczoSrvbmQJ5m0FLXfLA=="; }; }; - "@netlify/local-functions-proxy-openbsd-x64-1.1.0" = { + "@netlify/local-functions-proxy-openbsd-x64-1.1.1" = { name = "_at_netlify_slash_local-functions-proxy-openbsd-x64"; packageName = "@netlify/local-functions-proxy-openbsd-x64"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/local-functions-proxy-openbsd-x64/-/local-functions-proxy-openbsd-x64-1.1.0.tgz"; - sha512 = "9G1lrpSAxT+Bd83IYYxlkMU1xNCZeLstL7gZvXymygRpLoE2oFHfSERaIOvOdbbDQ3ZkEWuX12OJ6d7TS7ievg=="; + url = "https://registry.npmjs.org/@netlify/local-functions-proxy-openbsd-x64/-/local-functions-proxy-openbsd-x64-1.1.1.tgz"; + sha512 = "1xLef/kLRNkBTXJ+ZGoRFcwsFxd/B2H3oeJZyXaZ3CN5umd9Mv9wZuAD74NuMt/535yRva8jtAJqvEgl9xMSdA=="; }; }; - "@netlify/local-functions-proxy-win32-ia32-1.1.0" = { + "@netlify/local-functions-proxy-win32-ia32-1.1.1" = { name = "_at_netlify_slash_local-functions-proxy-win32-ia32"; packageName = "@netlify/local-functions-proxy-win32-ia32"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/local-functions-proxy-win32-ia32/-/local-functions-proxy-win32-ia32-1.1.0.tgz"; - sha512 = "F6ET6+XyAcGVIFjX66nAmj6CkgKICPtA9ZpPDLU2b3qYzvdJxW1hgp/UIRyRSRN1IqkIPJtGQZAteHhzBqnFRQ=="; + url = "https://registry.npmjs.org/@netlify/local-functions-proxy-win32-ia32/-/local-functions-proxy-win32-ia32-1.1.1.tgz"; + sha512 = "4IOMDBxp2f8VbIkhZ85zGNDrZR4ey8d68fCMSOIwitjsnKav35YrCf8UmAh3UR6CNIRJdJL4MW1GYePJ7iJ8uA=="; }; }; - "@netlify/local-functions-proxy-win32-x64-1.1.0" = { + "@netlify/local-functions-proxy-win32-x64-1.1.1" = { name = "_at_netlify_slash_local-functions-proxy-win32-x64"; packageName = "@netlify/local-functions-proxy-win32-x64"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/local-functions-proxy-win32-x64/-/local-functions-proxy-win32-x64-1.1.0.tgz"; - sha512 = "8a5rRjDNovZYBEaAPfN1VSwGNG/ExZanrjo7HnuTgphO6i64StqrKNtNW9/h75IgH+WP+8ZmC6Y0lI0BKq/U5A=="; + url = "https://registry.npmjs.org/@netlify/local-functions-proxy-win32-x64/-/local-functions-proxy-win32-x64-1.1.1.tgz"; + sha512 = "VCBXBJWBujVxyo5f+3r8ovLc9I7wJqpmgDn3ixs1fvdrER5Ac+SzYwYH4mUug9HI08mzTSAKZErzKeuadSez3w=="; }; }; "@netlify/open-api-2.5.0" = { @@ -4297,22 +4306,13 @@ let sha512 = "SSlWic9za/0QtfCP7GllJcOV98BWlx2goOF9bLLhmsHGiPfrhlhZfemqdMtKM4BIs+G70wzUqaIYeyjtxVh37A=="; }; }; - "@netlify/run-utils-2.0.0" = { + "@netlify/run-utils-2.0.1" = { name = "_at_netlify_slash_run-utils"; packageName = "@netlify/run-utils"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/run-utils/-/run-utils-2.0.0.tgz"; - sha512 = "bfkyaK73zCm5rAaP6ORvuvk7gIN+yeq1SMeshDzga+xNzu1T9yXt4hoiodJXAhhfgHId5m69hnSoFwaCrnOuIA=="; - }; - }; - "@netlify/zip-it-and-ship-it-4.16.0" = { - name = "_at_netlify_slash_zip-it-and-ship-it"; - packageName = "@netlify/zip-it-and-ship-it"; - version = "4.16.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-4.16.0.tgz"; - sha512 = "DkQemRkLTpAMvwwENRCQ9h5qJDaLrjEa+PpfEh0I64om4hTXVHcTd5+YMHW0wPr4OWABA7JAWlsFOVsZADFxfQ=="; + url = "https://registry.npmjs.org/@netlify/run-utils/-/run-utils-2.0.1.tgz"; + sha512 = "F1YcF2kje0Ttj+t5Cn5d6ojGQcKj4i/GMWgQuoZGVjQ31ToNcDXIbBm5SBKIkMMpNejtR1wF+1a0Q+aBPWiZVQ=="; }; }; "@netlify/zip-it-and-ship-it-4.17.0" = { @@ -4414,13 +4414,13 @@ let sha512 = "oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg=="; }; }; - "@npmcli/arborist-2.8.0" = { + "@npmcli/arborist-2.8.1" = { name = "_at_npmcli_slash_arborist"; packageName = "@npmcli/arborist"; - version = "2.8.0"; + version = "2.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/arborist/-/arborist-2.8.0.tgz"; - sha512 = "R9rTyak1rGdmVTyiU14dgBb+qMllY3B6I8hp7FB4xXsU9dJDrYZJR8I+191CMo5Y1941jTDCtNcXXW9TldPEFQ=="; + url = "https://registry.npmjs.org/@npmcli/arborist/-/arborist-2.8.1.tgz"; + sha512 = "kbBWllN4CcdeN032Rw6b+TIsyoxWcv4YNN5gzkMCe8cCu0llwlq5P7uAD2oyL24QdmGlrlg/Yp0L1JF+HD8g9Q=="; }; }; "@npmcli/ci-detect-1.3.0" = { @@ -4450,13 +4450,13 @@ let sha512 = "9rufe0wnJusCQoLpV9ZPKIVP55itrM5BxOXs10DmdbRfgWtHy1LDyskbwRnBghuB0PrF7pNPOqREVtpz4HqzKw=="; }; }; - "@npmcli/map-workspaces-1.0.3" = { + "@npmcli/map-workspaces-1.0.4" = { name = "_at_npmcli_slash_map-workspaces"; packageName = "@npmcli/map-workspaces"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/map-workspaces/-/map-workspaces-1.0.3.tgz"; - sha512 = "SdlRlOoQw4WKD4vtb/n5gUkobEABYBEOo8fRE4L8CtBkyWDSvIrReTfKvQ/Jc/LQqDaaZ5iv1iMSQzKCUr1n1A=="; + url = "https://registry.npmjs.org/@npmcli/map-workspaces/-/map-workspaces-1.0.4.tgz"; + sha512 = "wVR8QxhyXsFcD/cORtJwGQodeeaDf0OxcHie8ema4VgFeqwYkFsDPnSrIRSytX8xR6nKPAH89WnwTcaU608b/Q=="; }; }; "@npmcli/metavuln-calculator-1.1.1" = { @@ -4549,13 +4549,13 @@ let sha512 = "Lmfuf6ubjQ4ifC/9bz1fSCHc6F6E653oyaRXxg+lgT4+bYf9bk+nqrUpAbrXyABkCqgIBiFr3J4zR/kiFdE1PA=="; }; }; - "@oclif/core-0.5.29" = { + "@oclif/core-0.5.30" = { name = "_at_oclif_slash_core"; packageName = "@oclif/core"; - version = "0.5.29"; + version = "0.5.30"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/core/-/core-0.5.29.tgz"; - sha512 = "v5MMxeTgEKbVcEl7D3jsTVL8Wy3lLTDj0KHX7cOmI751yfjdAOqy9frHQ6IXssxubDkBW6sXzbYN9Bw12zsBqg=="; + url = "https://registry.npmjs.org/@oclif/core/-/core-0.5.30.tgz"; + sha512 = "J655ku+fptWPukM15F4DzGZnD1Q1UAzsS7jUy/nHIVhuwjwhl7u9QHLTjZ+1ud/99N2iXaYsa70UcnC1G3mfHQ=="; }; }; "@oclif/errors-1.3.5" = { @@ -4684,22 +4684,13 @@ let sha512 = "SWTdXsVheRmlotWNjKzPOb6Js6tjSqA2a8z9+glDJng0Aqjzti8MEWOtuT8ZSu6wHnci7LZNuarE87+WJBG4vg=="; }; }; - "@octokit/openapi-types-9.5.0" = { + "@octokit/openapi-types-9.7.0" = { name = "_at_octokit_slash_openapi-types"; packageName = "@octokit/openapi-types"; - version = "9.5.0"; + version = "9.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-9.5.0.tgz"; - sha512 = "AEq5uAZJCnrOuNUg91yDjkE3mXyMq2lSiJpOpDyzy1e2mT1CSpsu8Yf7DuabD7TmQi0UEC8o0YrDjeXgNoI54Q=="; - }; - }; - "@octokit/openapi-types-9.6.0" = { - name = "_at_octokit_slash_openapi-types"; - packageName = "@octokit/openapi-types"; - version = "9.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-9.6.0.tgz"; - sha512 = "L+8x7DpcNtHkMbTxxCxg3cozvHUNP46rOIzFwoMs0piWwQzAGNXqlIQO2GLvnKTWLUh99DkY+UyHVrP4jXlowg=="; + url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-9.7.0.tgz"; + sha512 = "TUJ16DJU8mekne6+KVcMV5g6g/rJlrnIKn7aALG9QrNpnEipFc1xjoarh0PKaAWf2Hf+HwthRKYt+9mCm5RsRg=="; }; }; "@octokit/plugin-enterprise-rest-6.0.1" = { @@ -4729,22 +4720,22 @@ let sha512 = "mLUsMkgP7K/cnFEw07kWqXGF5LKrOkD+lhCrKvPHXWDywAwuDUeDwWBpc69XK3pNX0uKiVt8g5z96PJ6z9xCFA=="; }; }; - "@octokit/plugin-rest-endpoint-methods-5.7.0" = { + "@octokit/plugin-rest-endpoint-methods-5.8.0" = { name = "_at_octokit_slash_plugin-rest-endpoint-methods"; packageName = "@octokit/plugin-rest-endpoint-methods"; - version = "5.7.0"; + version = "5.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.7.0.tgz"; - sha512 = "G7sgccWRYQMwcHJXkDY/sDxbXeKiZkFQqUtzBCwmrzCNj2GQf3VygQ4T/BFL2crLVpIbenkE/c0ErhYOte2MPw=="; + url = "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.8.0.tgz"; + sha512 = "qeLZZLotNkoq+it6F+xahydkkbnvSK0iDjlXFo3jNTB+Ss0qIbYQb9V/soKLMkgGw8Q2sHjY5YEXiA47IVPp4A=="; }; }; - "@octokit/request-5.6.0" = { + "@octokit/request-5.6.1" = { name = "_at_octokit_slash_request"; packageName = "@octokit/request"; - version = "5.6.0"; + version = "5.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/request/-/request-5.6.0.tgz"; - sha512 = "4cPp/N+NqmaGQwbh3vUsYqokQIzt7VjsgTYVXiwpUP2pxd5YiZB2XuTedbb0SPtv9XS7nzAKjAuQxmY8/aZkiA=="; + url = "https://registry.npmjs.org/@octokit/request/-/request-5.6.1.tgz"; + sha512 = "Ls2cfs1OfXaOKzkcxnqw5MR6drMA/zWX/LIS/p8Yjdz7QKTPQLMsB3R+OvoxE6XnXeXEE2X7xe4G4l4X0gRiKQ=="; }; }; "@octokit/request-error-2.1.0" = { @@ -4756,13 +4747,13 @@ let sha512 = "1VIvgXxs9WHSjicsRwq8PlR2LR2x6DwsJAaFgzdi0JfJoGSO8mYI/cHJQ+9FbN21aa+DrgNLnwObmyeSC8Rmpg=="; }; }; - "@octokit/rest-18.9.0" = { + "@octokit/rest-18.9.1" = { name = "_at_octokit_slash_rest"; packageName = "@octokit/rest"; - version = "18.9.0"; + version = "18.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/rest/-/rest-18.9.0.tgz"; - sha512 = "VrmrE8gjpuOoDAGjrQq2j9ZhOE6LxaqxaQg0yMrrEnnQZy2ZcAnr5qbVfKsMF0up/48PRV/VFS/2GSMhA7nTdA=="; + url = "https://registry.npmjs.org/@octokit/rest/-/rest-18.9.1.tgz"; + sha512 = "idZ3e5PqXVWOhtZYUa546IDHTHjkGZbj3tcJsN0uhCy984KD865e8GB2WbYDc2ZxFuJRiyd0AftpL2uPNhF+UA=="; }; }; "@octokit/types-6.25.0" = { @@ -4819,13 +4810,13 @@ let sha512 = "DCF9oC89ao8/EJUqrp/beBlDR8Bp2R43jqtzayqCoomIvkwTuPfLcHdVhIGRR69GFlkykFjcDW+V92t0AS7Tww=="; }; }; - "@opentelemetry/semantic-conventions-0.22.0" = { + "@opentelemetry/semantic-conventions-0.24.0" = { name = "_at_opentelemetry_slash_semantic-conventions"; packageName = "@opentelemetry/semantic-conventions"; - version = "0.22.0"; + version = "0.24.0"; src = fetchurl { - url = "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-0.22.0.tgz"; - sha512 = "t4fKikazahwNKmwD+CE/icHyuZldWvNMupJhjxdk9T/KxHFx3zCGjHT3MKavwYP6abzgAAm5WwzD1oHlmj7dyg=="; + url = "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-0.24.0.tgz"; + sha512 = "a/szuMQV0Quy0/M7kKdglcbRSoorleyyOwbTNNJ32O+RBN766wbQlMTvdimImTmwYWGr+NJOni1EcC242WlRcA=="; }; }; "@ot-builder/bin-composite-types-1.1.0" = { @@ -5179,22 +5170,22 @@ let sha512 = "USSjRAAQYsZFlv43FUPdD+jEGML5/8oLF0rUzPQTtK4q9kvaXr49F5ZplyLz5lox78cLZ0TxN2bIDQ1xhOkulQ=="; }; }; - "@percy/config-1.0.0-beta.63" = { + "@percy/config-1.0.0-beta.65" = { name = "_at_percy_slash_config"; packageName = "@percy/config"; - version = "1.0.0-beta.63"; + version = "1.0.0-beta.65"; src = fetchurl { - url = "https://registry.npmjs.org/@percy/config/-/config-1.0.0-beta.63.tgz"; - sha512 = "mc2DQwk0uMHV+C7vJOcLm5hrxVqAKLgJvgsN+49Y/fbl6fUTNwY2s1usTi3kfCThdGpnIkqRooVxisnOIxLEUg=="; + url = "https://registry.npmjs.org/@percy/config/-/config-1.0.0-beta.65.tgz"; + sha512 = "q6mkrBq+nmDtIDj793lNIodEYmc5wVE7ZwsQ2kNRQIAq4aiIIrD8L5CfhEOSYQ5OzhFq+qUjcZK5GptmheF0sw=="; }; }; - "@percy/logger-1.0.0-beta.63" = { + "@percy/logger-1.0.0-beta.65" = { name = "_at_percy_slash_logger"; packageName = "@percy/logger"; - version = "1.0.0-beta.63"; + version = "1.0.0-beta.65"; src = fetchurl { - url = "https://registry.npmjs.org/@percy/logger/-/logger-1.0.0-beta.63.tgz"; - sha512 = "iumIt1JjrZQiD9fPShbqaUtyqgRBA1crJzwhh6MPZz4s0XJLxcEzhawKzqhtOoiB8Wr5AxVygswLOkTfPcVuFg=="; + url = "https://registry.npmjs.org/@percy/logger/-/logger-1.0.0-beta.65.tgz"; + sha512 = "BJV0pjNlvcj4Y3nuMUGdb5RhjMduK40fRJJ9Lh/2qNk3pmnkGb9rH+GY+/0WY7quupNKxQjjyXcIP7I46/azNg=="; }; }; "@percy/migrate-0.10.0" = { @@ -5422,15 +5413,6 @@ let sha512 = "9uIC8HZOnVLrLHxayq/PTzw+uS25E14KPUBh5ktF+18Mjo5yK0ToMMx6epY0uEgkjwJw0aBW4x2horYXh8juWw=="; }; }; - "@rollup/plugin-commonjs-17.1.0" = { - name = "_at_rollup_slash_plugin-commonjs"; - packageName = "@rollup/plugin-commonjs"; - version = "17.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-17.1.0.tgz"; - sha512 = "PoMdXCw0ZyvjpCMT5aV4nkL0QywxP29sODQsSGeDpr/oI49Qq9tRtAsb/LbYbDzFlOydVEqHmmZWFtXJEAX9ew=="; - }; - }; "@rollup/plugin-commonjs-18.1.0" = { name = "_at_rollup_slash_plugin-commonjs"; packageName = "@rollup/plugin-commonjs"; @@ -5467,15 +5449,6 @@ let sha512 = "yc2n43jcqVyGE2sqV5/YCmocy9ArjVAP/BeXyTtADTBBX6V0e5UMqwO8CdQ0kzjb6zu5P1qMzsScCMRvE9OlVg=="; }; }; - "@rollup/plugin-node-resolve-13.0.4" = { - name = "_at_rollup_slash_plugin-node-resolve"; - packageName = "@rollup/plugin-node-resolve"; - version = "13.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-13.0.4.tgz"; - sha512 = "eYq4TFy40O8hjeDs+sIxEH/jc9lyuI2k9DM557WN6rO5OpnC2qXMBNj4IKH1oHrnAazL49C5p0tgP0/VpqJ+/w=="; - }; - }; "@rollup/pluginutils-3.1.0" = { name = "_at_rollup_slash_pluginutils"; packageName = "@rollup/pluginutils"; @@ -5512,13 +5485,13 @@ let sha512 = "c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ=="; }; }; - "@schematics/angular-12.2.0" = { + "@schematics/angular-12.2.1" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "12.2.0"; + version = "12.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-12.2.0.tgz"; - sha512 = "2NolT/PNKgjINIHvz6o4sYFj4D4ai7Usf+HspQCi9W30qtLV4Z6hRXoEhmDxrGSlF67vJdwUwDM3sP+6Tg8XEw=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-12.2.1.tgz"; + sha512 = "v6+LWx688PBmp+XWLtwu+UL1AAZsd0RsBrLmruSul70vFQ0xBB3MIuYlF5NHUukaBP/GMn426UkiTUgYUUM8ww=="; }; }; "@segment/loosely-validate-event-2.0.0" = { @@ -5548,13 +5521,13 @@ let sha512 = "lOUyRopNTKJYVEU9T6stp2irwlTDsYMmUKBOUjnMcwGveuUfIJqrCOtFLtIPPj3XJlbZy5F68l4KP9rZ8Ipang=="; }; }; - "@serverless/components-3.14.2" = { + "@serverless/components-3.15.0" = { name = "_at_serverless_slash_components"; packageName = "@serverless/components"; - version = "3.14.2"; + version = "3.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/components/-/components-3.14.2.tgz"; - sha512 = "mizSDUxNKT+V1hx5edZFFbMBvtWY8FkponU3seWpmkkbv1FjNPpa2wURec89T5m4WadYJDQMCpKKCwYD4DOSow=="; + url = "https://registry.npmjs.org/@serverless/components/-/components-3.15.0.tgz"; + sha512 = "oi5a1QjyAoH4CiSCNB+kIyvXMcs3tfLMGXM+pk7Ns1ra5ZWoD3PImRQKRUu/2BTSYqB6iUM3+HmMQGT1yORgBg=="; }; }; "@serverless/core-1.1.2" = { @@ -7330,15 +7303,6 @@ let sha512 = "7EIraBEyRHEe7CH+Fm1XvgqU6uwZN8Q7jppJGcqjROMT29qhAuuOxYB1uEY5UMYQKEmA5D+5tBnhdaPXSsLONA=="; }; }; - "@types/node-16.3.2" = { - name = "_at_types_slash_node"; - packageName = "@types/node"; - version = "16.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-16.3.2.tgz"; - sha512 = "jJs9ErFLP403I+hMLGnqDRWT0RYKSvArxuBVh2veudHV7ifEC1WAmjJADacZ7mRbA2nWgHtn8xyECMAot0SkAw=="; - }; - }; "@types/node-16.3.3" = { name = "_at_types_slash_node"; packageName = "@types/node"; @@ -7348,22 +7312,22 @@ let sha512 = "8h7k1YgQKxKXWckzFCMfsIwn0Y61UK6tlD6y2lOb3hTOIMlK3t9/QwHOhc81TwU+RMf0As5fj7NPjroERCnejQ=="; }; }; - "@types/node-16.4.13" = { + "@types/node-16.6.0" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "16.4.13"; + version = "16.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-16.4.13.tgz"; - sha512 = "bLL69sKtd25w7p1nvg9pigE4gtKVpGTPojBFLMkGHXuUgap2sLqQt2qUnqmVCDfzGUL0DRNZP+1prIZJbMeAXg=="; + url = "https://registry.npmjs.org/@types/node/-/node-16.6.0.tgz"; + sha512 = "OyiZPohMMjZEYqcVo/UJ04GyAxXOJEZO/FpzyXxcH4r/ArrVoXHf4MbUrkLp0Tz7/p1mMKpo5zJ6ZHl8XBNthQ=="; }; }; - "@types/node-16.4.3" = { + "@types/node-16.6.1" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "16.4.3"; + version = "16.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-16.4.3.tgz"; - sha512 = "GKM4FLMkWDc0sfx7tXqPWkM6NBow1kge0fgQh0bOnlqo4iT1kvTvMEKE0c1RtUGnbLlGRXiAA8SumE//90uKAg=="; + url = "https://registry.npmjs.org/@types/node/-/node-16.6.1.tgz"; + sha512 = "Sr7BhXEAer9xyGuCN3Ek9eg9xPviCF2gfu9kTfuU2HkTVAMYSDeX40fvpmo72n5nansg3nsBjuQBrsS28r+NUw=="; }; }; "@types/node-6.14.13" = { @@ -7510,13 +7474,13 @@ let sha512 = "qw1q31xPnaeExbOA1daA3nfeKW2uZQN4Xg8QqZDM3vsXPHK/lyDpjWXJQIcrByRDcBzZJ3ccchSMMTDtCWgFpA=="; }; }; - "@types/react-16.14.12" = { + "@types/react-16.14.13" = { name = "_at_types_slash_react"; packageName = "@types/react"; - version = "16.14.12"; + version = "16.14.13"; src = fetchurl { - url = "https://registry.npmjs.org/@types/react/-/react-16.14.12.tgz"; - sha512 = "7nOJgNsRbARhZhvwPm7cnzahtzEi5VJ9OvcQk8ExEEb1t+zaFklwLVkJz7G1kfxX4X/mDa/icTmzE0vTmqsqBg=="; + url = "https://registry.npmjs.org/@types/react/-/react-16.14.13.tgz"; + sha512 = "KznsRYfqPmbcA5pMxc4mYQ7UgsJa2tAgKE2YwEmY5xKaTVZXLAY/ImBohyQHnEoIjxIJR+Um4FmaEYDr3q3zlg=="; }; }; "@types/react-dom-16.9.14" = { @@ -7780,13 +7744,13 @@ let sha512 = "awrJu8yML4E/xTwr2EMatC+HBnHGoDxc2+ImA9QyeUELI1S7dOCIZcyjki1rkwoA8P2D2NVgLAJLjnclkdLtAw=="; }; }; - "@types/url-parse-1.4.3" = { + "@types/url-parse-1.4.4" = { name = "_at_types_slash_url-parse"; packageName = "@types/url-parse"; - version = "1.4.3"; + version = "1.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/url-parse/-/url-parse-1.4.3.tgz"; - sha512 = "4kHAkbV/OfW2kb5BLVUuUMoumB3CP8rHqlw48aHvFy5tf9ER0AfOonBlX29l/DD68G70DmyhRlSYfQPSYpC5Vw=="; + url = "https://registry.npmjs.org/@types/url-parse/-/url-parse-1.4.4.tgz"; + sha512 = "KtQLad12+4T/NfSxpoDhmr22+fig3T7/08QCgmutYA6QSznSRmEtuL95GrhVV40/0otTEdFc+etRcCTqhh1q5Q=="; }; }; "@types/uuid-8.3.1" = { @@ -7879,15 +7843,6 @@ let sha512 = "8mbDgtc8xpxDDem5Gwj76stBDJX35KQ3YBoayxlqUQcL5BZUthiqP/VQ4PQnLHqM4PmlbyO74t98eJpURO+gPA=="; }; }; - "@types/ws-7.4.6" = { - name = "_at_types_slash_ws"; - packageName = "@types/ws"; - version = "7.4.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/ws/-/ws-7.4.6.tgz"; - sha512 = "ijZ1vzRawI7QoWnTNL8KpHixd2b2XVb9I9HAqI3triPsh1EC0xH0Eg6w2O3TKbDCgiNNlJqfrof6j4T2I+l9vw=="; - }; - }; "@types/ws-7.4.7" = { name = "_at_types_slash_ws"; packageName = "@types/ws"; @@ -7960,13 +7915,13 @@ let sha512 = "fbF6oTd4sGGy0xjHPKAt+eS2CrxJ3+6gQ3FGcBoIJR2TLAyCkCyI8JqZNy+FeON0AhVgNJoUumVoZQjBFUqHkw=="; }; }; - "@typescript-eslint/eslint-plugin-4.29.1" = { + "@typescript-eslint/eslint-plugin-4.29.2" = { name = "_at_typescript-eslint_slash_eslint-plugin"; packageName = "@typescript-eslint/eslint-plugin"; - version = "4.29.1"; + version = "4.29.2"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.29.1.tgz"; - sha512 = "AHqIU+SqZZgBEiWOrtN94ldR3ZUABV5dUG94j8Nms9rQnHFc8fvDOue/58K4CFz6r8OtDDc35Pw9NQPWo0Ayrw=="; + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.29.2.tgz"; + sha512 = "x4EMgn4BTfVd9+Z+r+6rmWxoAzBaapt4QFqE+d8L8sUtYZYLDTK6VG/y/SMMWA5t1/BVU5Kf+20rX4PtWzUYZg=="; }; }; "@typescript-eslint/experimental-utils-3.10.1" = { @@ -7978,13 +7933,13 @@ let sha512 = "DewqIgscDzmAfd5nOGe4zm6Bl7PKtMG2Ad0KG8CUZAHlXfAKTF9Ol5PXhiMh39yRL2ChRH1cuuUGOcVyyrhQIw=="; }; }; - "@typescript-eslint/experimental-utils-4.29.1" = { + "@typescript-eslint/experimental-utils-4.29.2" = { name = "_at_typescript-eslint_slash_experimental-utils"; packageName = "@typescript-eslint/experimental-utils"; - version = "4.29.1"; + version = "4.29.2"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.29.1.tgz"; - sha512 = "kl6QG6qpzZthfd2bzPNSJB2YcZpNOrP6r9jueXupcZHnL74WiuSjaft7WSu17J9+ae9zTlk0KJMXPUj0daBxMw=="; + url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.29.2.tgz"; + sha512 = "P6mn4pqObhftBBPAv4GQtEK7Yos1fz/MlpT7+YjH9fTxZcALbiiPKuSIfYP/j13CeOjfq8/fr9Thr2glM9ub7A=="; }; }; "@typescript-eslint/parser-3.10.1" = { @@ -7996,22 +7951,22 @@ let sha512 = "Ug1RcWcrJP02hmtaXVS3axPPTTPnZjupqhgj+NnZ6BCkwSImWk/283347+x9wN+lqOdK9Eo3vsyiyDHgsmiEJw=="; }; }; - "@typescript-eslint/parser-4.29.1" = { + "@typescript-eslint/parser-4.29.2" = { name = "_at_typescript-eslint_slash_parser"; packageName = "@typescript-eslint/parser"; - version = "4.29.1"; + version = "4.29.2"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.29.1.tgz"; - sha512 = "3fL5iN20hzX3Q4OkG7QEPFjZV2qsVGiDhEwwh+EkmE/w7oteiOvUNzmpu5eSwGJX/anCryONltJ3WDmAzAoCMg=="; + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.29.2.tgz"; + sha512 = "WQ6BPf+lNuwteUuyk1jD/aHKqMQ9jrdCn7Gxt9vvBnzbpj7aWEf+aZsJ1zvTjx5zFxGCt000lsbD9tQPEL8u6g=="; }; }; - "@typescript-eslint/scope-manager-4.29.1" = { + "@typescript-eslint/scope-manager-4.29.2" = { name = "_at_typescript-eslint_slash_scope-manager"; packageName = "@typescript-eslint/scope-manager"; - version = "4.29.1"; + version = "4.29.2"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.29.1.tgz"; - sha512 = "Hzv/uZOa9zrD/W5mftZa54Jd5Fed3tL6b4HeaOpwVSabJK8CJ+2MkDasnX/XK4rqP5ZTWngK1ZDeCi6EnxPQ7A=="; + url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.29.2.tgz"; + sha512 = "mfHmvlQxmfkU8D55CkZO2sQOueTxLqGvzV+mG6S/6fIunDiD2ouwsAoiYCZYDDK73QCibYjIZmGhpvKwAB5BOA=="; }; }; "@typescript-eslint/types-3.10.1" = { @@ -8023,13 +7978,13 @@ let sha512 = "+3+FCUJIahE9q0lDi1WleYzjCwJs5hIsbugIgnbB+dSCYUxl8L6PwmsyOPFZde2hc1DlTo/xnkOgiTLSyAbHiQ=="; }; }; - "@typescript-eslint/types-4.29.1" = { + "@typescript-eslint/types-4.29.2" = { name = "_at_typescript-eslint_slash_types"; packageName = "@typescript-eslint/types"; - version = "4.29.1"; + version = "4.29.2"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.29.1.tgz"; - sha512 = "Jj2yu78IRfw4nlaLtKjVaGaxh/6FhofmQ/j8v3NXmAiKafbIqtAPnKYrf0sbGjKdj0hS316J8WhnGnErbJ4RCA=="; + url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.29.2.tgz"; + sha512 = "K6ApnEXId+WTGxqnda8z4LhNMa/pZmbTFkDxEBLQAbhLZL50DjeY0VIDCml/0Y3FlcbqXZrABqrcKxq+n0LwzQ=="; }; }; "@typescript-eslint/typescript-estree-3.10.1" = { @@ -8041,13 +7996,13 @@ let sha512 = "QbcXOuq6WYvnB3XPsZpIwztBoquEYLXh2MtwVU+kO8jgYCiv4G5xrSP/1wg4tkvrEE+esZVquIPX/dxPlePk1w=="; }; }; - "@typescript-eslint/typescript-estree-4.29.1" = { + "@typescript-eslint/typescript-estree-4.29.2" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; - version = "4.29.1"; + version = "4.29.2"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.29.1.tgz"; - sha512 = "lIkkrR9E4lwZkzPiRDNq0xdC3f2iVCUjw/7WPJ4S2Sl6C3nRWkeE1YXCQ0+KsiaQRbpY16jNaokdWnm9aUIsfw=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.29.2.tgz"; + sha512 = "TJ0/hEnYxapYn9SGn3dCnETO0r+MjaxtlWZ2xU+EvytF0g4CqTpZL48SqSNn2hXsPolnewF30pdzR9a5Lj3DNg=="; }; }; "@typescript-eslint/visitor-keys-3.10.1" = { @@ -8059,13 +8014,13 @@ let sha512 = "9JgC82AaQeglebjZMgYR5wgmfUdUc+EitGUUMW8u2nDckaeimzW+VsoLV6FoimPv2id3VQzfjwBxEMVz08ameQ=="; }; }; - "@typescript-eslint/visitor-keys-4.29.1" = { + "@typescript-eslint/visitor-keys-4.29.2" = { name = "_at_typescript-eslint_slash_visitor-keys"; packageName = "@typescript-eslint/visitor-keys"; - version = "4.29.1"; + version = "4.29.2"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.29.1.tgz"; - sha512 = "zLqtjMoXvgdZY/PG6gqA73V8BjqPs4af1v2kiiETBObp+uC6gRYnJLmJHxC0QyUrrHDLJPIWNYxoBV3wbcRlag=="; + url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.29.2.tgz"; + sha512 = "bDgJLQ86oWHJoZ1ai4TZdgXzJxsea3Ee9u9wsTAvjChdj2WLcVsgWYAPeY7RQMn16tKrlQaBnpKv7KBfs4EQag=="; }; }; "@uifabric/foundation-7.9.26" = { @@ -8248,31 +8203,31 @@ let sha512 = "B6PedV/H2kcGEAgnqncwjHe3E8fqUNXCLv1BsrNwkHHWQJXkDN7dFeuEB4oaucBOVbjhH7KGLJ6JAiXPE3S7xA=="; }; }; - "@vue/compiler-core-3.2.1" = { + "@vue/compiler-core-3.2.2" = { name = "_at_vue_slash_compiler-core"; packageName = "@vue/compiler-core"; - version = "3.2.1"; + version = "3.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.1.tgz"; - sha512 = "UEJf2ZGww5wGVdrWIXIZo04KdJFGPmI2bHRUsBZ3AdyCAqJ5ykRXKOBn1OR1hvA2YzimudOEyHM+DpbBv91Kww=="; + url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.2.tgz"; + sha512 = "QhCI0ZU5nAR0LMcLgzW3v75374tIrHGp8XG5CzJS7Nsy+iuignbE4MZ2XJfh5TGIrtpuzfWA4eTIfukZf/cRdg=="; }; }; - "@vue/compiler-dom-3.2.1" = { + "@vue/compiler-dom-3.2.2" = { name = "_at_vue_slash_compiler-dom"; packageName = "@vue/compiler-dom"; - version = "3.2.1"; + version = "3.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.1.tgz"; - sha512 = "tXg8tkPb3j54zNfWqoao9T1JI41yWPz8TROzmif/QNNA46eq8/SRuRsBd36i47GWaz7mh+yg3vOJ87/YBjcMyQ=="; + url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.2.tgz"; + sha512 = "ggcc+NV/ENIE0Uc3TxVE/sKrhYVpLepMAAmEiQ047332mbKOvUkowz4TTFZ+YkgOIuBOPP0XpCxmCMg7p874mA=="; }; }; - "@vue/shared-3.2.1" = { + "@vue/shared-3.2.2" = { name = "_at_vue_slash_shared"; packageName = "@vue/shared"; - version = "3.2.1"; + version = "3.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/shared/-/shared-3.2.1.tgz"; - sha512 = "INN92dVBNgd0TW9BqfQQKx/HWGCHhUUbAV5EZ5FgSCiEdwuZsJbGt1mdnaD9IxGhpiyOjP2ClxGG8SFp7ELcWg=="; + url = "https://registry.npmjs.org/@vue/shared/-/shared-3.2.2.tgz"; + sha512 = "dvYb318tk9uOzHtSaT3WII/HscQSIRzoCZ5GyxEb3JlkEXASpAUAQwKnvSe2CudnF8XHFRTB7VITWSnWNLZUtA=="; }; }; "@webassemblyjs/ast-1.11.1" = { @@ -8788,13 +8743,13 @@ let sha512 = "ASiVB3t9LOKHs5DyVUcxpraBXDOKubYu/ihHhU+t1UPpxsivg6Od2E2qU4gJCekfEddzRBzHhzA/Acyw/mlK/w=="; }; }; - "@webpack-cli/serve-1.5.1" = { + "@webpack-cli/serve-1.5.2" = { name = "_at_webpack-cli_slash_serve"; packageName = "@webpack-cli/serve"; - version = "1.5.1"; + version = "1.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.5.1.tgz"; - sha512 = "4vSVUiOPJLmr45S8rMGy7WDvpWxfFxfP/Qx/cxZFCfvoypTYpPPL1X8VIZMe0WTA+Jr7blUxwUSEZNkjoMTgSw=="; + url = "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.5.2.tgz"; + sha512 = "vgJ5OLWadI8aKjDlOH3rb+dYyPd2GTZuQC/Tihjct6F9GpXGZINo3Y/IVuZVTM1eDQB+/AOsjPUWH/WySDaXvw=="; }; }; "@wry/context-0.6.1" = { @@ -8869,13 +8824,13 @@ let sha512 = "FYjcPNTfDfMKLFafQPt49EY28jnYC82Z2S7oMwLPUh144BL8v8YXzb4aCnFyi5nFC5h2kcrJfZh7+Pm/qvCqGw=="; }; }; - "@yarnpkg/fslib-2.5.0" = { + "@yarnpkg/fslib-2.5.1" = { name = "_at_yarnpkg_slash_fslib"; packageName = "@yarnpkg/fslib"; - version = "2.5.0"; + version = "2.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/@yarnpkg/fslib/-/fslib-2.5.0.tgz"; - sha512 = "xkKmuW3HwQeWOPqOhBCbDjTGbgimP/VWN2bPpx4FnfgbVj1xjULyOtZR5h9p49jA7IIZsccG91+Ad9kLZ2A4DA=="; + url = "https://registry.npmjs.org/@yarnpkg/fslib/-/fslib-2.5.1.tgz"; + sha512 = "Y360rwoaUBCF8i9nRepyuFQFNF5OybHafO4PQ5Pf68sT3H6ulmT2t/KjdtMey8zyJkDu5qrC3IgHk0c7zWRIrg=="; }; }; "@yarnpkg/json-proxy-2.1.1" = { @@ -9328,22 +9283,22 @@ let sha1 = "6a7990437ca736d5e1288db92bd3266d5f5cb2aa"; }; }; - "addons-linter-3.8.0" = { + "addons-linter-3.12.0" = { name = "addons-linter"; packageName = "addons-linter"; - version = "3.8.0"; + version = "3.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/addons-linter/-/addons-linter-3.8.0.tgz"; - sha512 = "k2s7PS7Oiq9NZnpf1SjG6hyefMC082a91BhSw30QEUgvDT54E2d6j8wfbar1WEigc9uYZgGv3VfzEeqTgoLUpw=="; + url = "https://registry.npmjs.org/addons-linter/-/addons-linter-3.12.0.tgz"; + sha512 = "GAvHjjqxVn8cQYBD6xshneACdaY2KjakWIyUhXrVbx3g8TZSF78ISucKZ1+XtKZLDvEr1LIJjeeYlR49LNH3CQ=="; }; }; - "addons-scanner-utils-4.8.0" = { + "addons-scanner-utils-4.9.0" = { name = "addons-scanner-utils"; packageName = "addons-scanner-utils"; - version = "4.8.0"; + version = "4.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/addons-scanner-utils/-/addons-scanner-utils-4.8.0.tgz"; - sha512 = "LjwZql59OKrQgppreOvRcgJDYrnj9XKVW2gb5Q1ZyGG3CH46VCiiNHJB6nYMgOntLo+DPQwQQPOSknZ1zW+wTw=="; + url = "https://registry.npmjs.org/addons-scanner-utils/-/addons-scanner-utils-4.9.0.tgz"; + sha512 = "RF+pVMSj3CcWV6NH4pBboCZnpzfr48ZmJCBXt/LZbU59PNepZDFxax9tl2MXzX01AXNwKUGa321pPyc5h4zV5A=="; }; }; "addr-to-ip-port-1.5.4" = { @@ -9580,6 +9535,15 @@ let sha512 = "USH2jBb+C/hIpwD2iRjp0pe0k+MvzG0mlSn/FIdCgQhUb9ALPRjt2KIQdfZDS9r0ZIeUAg7gOu9KL0PFqGqr5Q=="; }; }; + "ajv-formats-2.1.1" = { + name = "ajv-formats"; + packageName = "ajv-formats"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz"; + sha512 = "Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA=="; + }; + }; "ajv-keywords-1.5.1" = { name = "ajv-keywords"; packageName = "ajv-keywords"; @@ -11686,22 +11650,13 @@ let sha512 = "tbMZ/Y2rRo6R6TTBODJXTiil+MXaoT6Qzotws3yvI1IWGpYxKo7N/3L06XB8ul8tCG0TigxIOY70SMICM70Ppg=="; }; }; - "aws-sdk-2.964.0" = { + "aws-sdk-2.968.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.964.0"; + version = "2.968.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.964.0.tgz"; - sha512 = "yDRLkPUiGvIXpccFd1PqOQZ1MJvYkh0RVBNWfquDoPonQuJ9QOCZoPrpe3VlB8IGMOODbVRSH1NRqPa12gNjBA=="; - }; - }; - "aws-sdk-2.965.0" = { - name = "aws-sdk"; - packageName = "aws-sdk"; - version = "2.965.0"; - src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.965.0.tgz"; - sha512 = "jifeFsA6IEKXM65WI5gvBNSCXKw4n64Wf9Q7/8E7wZ5vzRbBGoHzGpyhK6ZBBRvE2YvNp/ykTWChO7RydkA+AQ=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.968.0.tgz"; + sha512 = "6kXJ/4asP+zI8oFJAUqEmVoaLOnAYriorigKy8ZjFe3ISl4w0PEOXBG1TtQFuLiNPR3BAvhRuOQ5yH6JfqDNNw=="; }; }; "aws-sign2-0.6.0" = { @@ -11821,15 +11776,6 @@ let sha512 = "z3U7eMY6r/3f3/JB9mTsLjyxrv0Yb1zb8PCWCLpguxfCzBIZUwy23R1t/XKewP+8mEN2Ck8Dtr4q20z6ce6SoA=="; }; }; - "babel-eslint-10.1.0" = { - name = "babel-eslint"; - packageName = "babel-eslint"; - version = "10.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-eslint/-/babel-eslint-10.1.0.tgz"; - sha512 = "ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg=="; - }; - }; "babel-helper-evaluate-path-0.5.0" = { name = "babel-helper-evaluate-path"; packageName = "babel-helper-evaluate-path"; @@ -15098,13 +15044,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001249" = { + "caniuse-lite-1.0.30001251" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001249"; + version = "1.0.30001251"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001249.tgz"; - sha512 = "vcX4U8lwVXPdqzPWi6cAJ3FnQaqXbBqy/GZseKNQzRj37J7qZdGcBtxq/QLFNLLlfsoXLUdHw8Iwenri86Tagw=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001251.tgz"; + sha512 = "HOe1r+9VkU4TFmnU70z+r7OLmtR+/chB1rdcJUeQlAinjEeb0cKL20tlAtOagNZhbrtLnCvV19B4FmF1rgzl6A=="; }; }; "canvas-2.8.0" = { @@ -16781,13 +16727,13 @@ let sha512 = "3WQV/Fpa77nvzjUlc+0u53uIroJyyMB2Qwl++aXpAiDIsrsiAQq4uCURwdRBRX+eLkOTIAmT0L4qna3T7+2pUg=="; }; }; - "codemaker-1.32.0" = { + "codemaker-1.33.0" = { name = "codemaker"; packageName = "codemaker"; - version = "1.32.0"; + version = "1.33.0"; src = fetchurl { - url = "https://registry.npmjs.org/codemaker/-/codemaker-1.32.0.tgz"; - sha512 = "RYHzKPI83NJi0u7KjUVeAm4rmMwIPjLsFjcSv8sIZizNiVFwWNxON99YhtFvbg0YMbdMnjpkx0W/VADNuwETGA=="; + url = "https://registry.npmjs.org/codemaker/-/codemaker-1.33.0.tgz"; + sha512 = "u9PYqE1HaKINgMDpV7HyYVbtPDbHJNSPn1rTsYSsUkmi1DH1/3tK5nBJ7eUGNbkMP+k2hz7SQGTVcWEMRNAZ0w=="; }; }; "codepage-1.4.0" = { @@ -17375,13 +17321,13 @@ let sha1 = "34fc3672cd24393e8bb47e70caa0293811f4f2c5"; }; }; - "commonmark-0.29.3" = { + "commonmark-0.30.0" = { name = "commonmark"; packageName = "commonmark"; - version = "0.29.3"; + version = "0.30.0"; src = fetchurl { - url = "https://registry.npmjs.org/commonmark/-/commonmark-0.29.3.tgz"; - sha512 = "fvt/NdOFKaL2gyhltSy6BC4LxbbxbnPxBMl923ittqO/JBM0wQHaoYZliE4tp26cRxX/ZZtRsJlZzQrVdUkXAA=="; + url = "https://registry.npmjs.org/commonmark/-/commonmark-0.30.0.tgz"; + sha512 = "j1yoUo4gxPND1JWV9xj5ELih0yMv1iCWDG6eEQIPLSWLxzCXiFoyS7kvB+WwU+tZMf4snwJMMtaubV0laFpiBA=="; }; }; "compact2string-1.4.1" = { @@ -17834,13 +17780,13 @@ let sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75"; }; }; - "constructs-3.3.118" = { + "constructs-3.3.124" = { name = "constructs"; packageName = "constructs"; - version = "3.3.118"; + version = "3.3.124"; src = fetchurl { - url = "https://registry.npmjs.org/constructs/-/constructs-3.3.118.tgz"; - sha512 = "Fe3XE/kVbfFomPtogd3h+5X9JHyMSLO8swjKYqUexgifX4qwOjsUYMHfZpB0a3xNBHr/YfJjbVikfY8Wzr0wNA=="; + url = "https://registry.npmjs.org/constructs/-/constructs-3.3.124.tgz"; + sha512 = "Jj/I48WUvCUudNOJYslOXCFgPK+rg8x0JQdUpfUHh1YA2/uE9LheTHgm+yMg9BGlrfgulAUIc8bg3eUJlVNK0g=="; }; }; "consume-http-header-1.0.0" = { @@ -18339,13 +18285,13 @@ let sha512 = "Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="; }; }; - "core-js-3.12.0" = { + "core-js-3.16.0" = { name = "core-js"; packageName = "core-js"; - version = "3.12.0"; + version = "3.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.12.0.tgz"; - sha512 = "SaMnchL//WwU2Ot1hhkPflE8gzo7uq1FGvUJ8GKmi3TOU7rGTHIU+eir1WGf6qOtTyxdfdcp10yPdGZ59sQ3hw=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.16.0.tgz"; + sha512 = "5+5VxRFmSf97nM8Jr2wzOwLqRo6zphH2aX+7KsAUONObyzakDNq2G/bgbhinxB4PoV9L3aXQYhiDKyIKWd2c8g=="; }; }; "core-js-3.16.1" = { @@ -19437,6 +19383,15 @@ let sha512 = "4PL5hHaHwX4m7Zr1UapXW23apo6pexCgdetdJ5kTmADpG/7T9Gkxw0M0tf/pjoB63ezCCm0u5UaFYy2aMt0Mcw=="; }; }; + "d3-7.0.0" = { + name = "d3"; + packageName = "d3"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/d3/-/d3-7.0.0.tgz"; + sha512 = "t+jEKGO2jQiSBLJYYq6RFc500tsCeXBB4x41oQaSnZD3Som95nQrlw9XJGrFTMUOQOkwSMauWy9+8Tz1qm9UZw=="; + }; + }; "d3-array-1.2.4" = { name = "d3-array"; packageName = "d3-array"; @@ -19455,6 +19410,15 @@ let sha512 = "B0ErZK/66mHtEsR1TkPEEkwdy+WDesimkM5gpZr5Dsg54BiTA5RXtYW5qTLIAcekaS9xfZrzBLF/OAkB3Qn1YQ=="; }; }; + "d3-array-3.0.1" = { + name = "d3-array"; + packageName = "d3-array"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-array/-/d3-array-3.0.1.tgz"; + sha512 = "l3Bh5o8RSoC3SBm5ix6ogaFW+J6rOUm42yOtZ2sQPCEvCqUMepeX7zgrlLLGIemxgOyo9s2CsWEidnLv5PwwRw=="; + }; + }; "d3-axis-1.0.12" = { name = "d3-axis"; packageName = "d3-axis"; @@ -19464,6 +19428,15 @@ let sha512 = "ejINPfPSNdGFKEOAtnBtdkpr24c4d4jsei6Lg98mxf424ivoDP2956/5HDpIAtmHo85lqT4pruy+zEgvRUBqaQ=="; }; }; + "d3-axis-3.0.0" = { + name = "d3-axis"; + packageName = "d3-axis"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-axis/-/d3-axis-3.0.0.tgz"; + sha512 = "IH5tgjV4jE/GhHkRV0HiVYPDtvfjHQlQfJHs0usq7M30XcSBvOotpmH1IgkcXsO/5gEQZD43B//fc7SRT5S+xw=="; + }; + }; "d3-brush-1.1.6" = { name = "d3-brush"; packageName = "d3-brush"; @@ -19473,6 +19446,15 @@ let sha512 = "7RW+w7HfMCPyZLifTz/UnJmI5kdkXtpCbombUSs8xniAyo0vIbrDzDwUJB6eJOgl9u5DQOt2TQlYumxzD1SvYA=="; }; }; + "d3-brush-3.0.0" = { + name = "d3-brush"; + packageName = "d3-brush"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-brush/-/d3-brush-3.0.0.tgz"; + sha512 = "ALnjWlVYkXsVIGlOsuWH1+3udkYFI48Ljihfnh8FZPF2QS9o+PzGLBslO0PjzVoHLZ2KCVgAM8NVkXPJB2aNnQ=="; + }; + }; "d3-chord-1.0.6" = { name = "d3-chord"; packageName = "d3-chord"; @@ -19482,6 +19464,15 @@ let sha512 = "JXA2Dro1Fxw9rJe33Uv+Ckr5IrAa74TlfDEhE/jfLOaXegMQFQTAgAw9WnZL8+HxVBRXaRGCkrNU7pJeylRIuA=="; }; }; + "d3-chord-3.0.1" = { + name = "d3-chord"; + packageName = "d3-chord"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-chord/-/d3-chord-3.0.1.tgz"; + sha512 = "VE5S6TNa+j8msksl7HwjxMHDM2yNK3XCkusIlpX5kwauBfXuyLAtNg9jCp/iHH61tgI4sb6R/EIMWCqEIdjT/g=="; + }; + }; "d3-collection-1.0.7" = { name = "d3-collection"; packageName = "d3-collection"; @@ -19509,6 +19500,15 @@ let sha512 = "SPXi0TSKPD4g9tw0NMZFnR95XVgUZiBH+uUTqQuDu1OsE2zomHU7ho0FISciaPvosimixwHFl3WHLGabv6dDgQ=="; }; }; + "d3-color-3.0.1" = { + name = "d3-color"; + packageName = "d3-color"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-color/-/d3-color-3.0.1.tgz"; + sha512 = "6/SlHkDOBLyQSJ1j1Ghs82OIUXpKWlR0hCsw0XrLSQhuUPuCSmLQ1QPH98vpnQxMUQM2/gfAkUEWsupVpd9JGw=="; + }; + }; "d3-contour-1.3.2" = { name = "d3-contour"; packageName = "d3-contour"; @@ -19518,6 +19518,15 @@ let sha512 = "hoPp4K/rJCu0ladiH6zmJUEz6+u3lgR+GSm/QdM2BBvDraU39Vr7YdDCicJcxP1z8i9B/2dJLgDC1NcvlF8WCg=="; }; }; + "d3-contour-3.0.1" = { + name = "d3-contour"; + packageName = "d3-contour"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-contour/-/d3-contour-3.0.1.tgz"; + sha512 = "0Oc4D0KyhwhM7ZL0RMnfGycLN7hxHB8CMmwZ3+H26PWAG0ozNuYG5hXSDNgmP1SgJkQMrlG6cP20HoaSbvcJTQ=="; + }; + }; "d3-delaunay-5.3.0" = { name = "d3-delaunay"; packageName = "d3-delaunay"; @@ -19527,6 +19536,15 @@ let sha512 = "amALSrOllWVLaHTnDLHwMIiz0d1bBu9gZXd1FiLfXf8sHcX9jrcj81TVZOqD4UX7MgBZZ07c8GxzEgBpJqc74w=="; }; }; + "d3-delaunay-6.0.2" = { + name = "d3-delaunay"; + packageName = "d3-delaunay"; + version = "6.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-delaunay/-/d3-delaunay-6.0.2.tgz"; + sha512 = "IMLNldruDQScrcfT+MWnazhHbDJhcRJyOEBAJfwQnHle1RPh6WDuLvxNArUju2VSMSUuKlY5BGHRJ2cYyoFLQQ=="; + }; + }; "d3-dispatch-1.0.6" = { name = "d3-dispatch"; packageName = "d3-dispatch"; @@ -19545,6 +19563,15 @@ let sha512 = "S/m2VsXI7gAti2pBoLClFFTMOO1HTtT0j99AuXLoGFKO6deHDdnv6ZGTxSTTUTgO1zVcv82fCOtDjYK4EECmWA=="; }; }; + "d3-dispatch-3.0.1" = { + name = "d3-dispatch"; + packageName = "d3-dispatch"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-3.0.1.tgz"; + sha512 = "rzUyPU/S7rwUflMyLc1ETDeBj0NRuHKKAcvukozwhshr6g6c5d8zh4c2gQjY2bZ0dXeGLWc1PF174P2tVvKhfg=="; + }; + }; "d3-drag-1.2.5" = { name = "d3-drag"; packageName = "d3-drag"; @@ -19554,6 +19581,24 @@ let sha512 = "rD1ohlkKQwMZYkQlYVCrSFxsWPzI97+W+PaEIBNTMxRuxz9RF0Hi5nJWHGVJ3Om9d2fRTe1yOBINJyy/ahV95w=="; }; }; + "d3-drag-2.0.0" = { + name = "d3-drag"; + packageName = "d3-drag"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-drag/-/d3-drag-2.0.0.tgz"; + sha512 = "g9y9WbMnF5uqB9qKqwIIa/921RYWzlUDv9Jl1/yONQwxbOfszAWTCm8u7HOTgJgRDXiRZN56cHT9pd24dmXs8w=="; + }; + }; + "d3-drag-3.0.0" = { + name = "d3-drag"; + packageName = "d3-drag"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-drag/-/d3-drag-3.0.0.tgz"; + sha512 = "pWbUJLdETVA8lQNJecMxoXfH6x+mO2UQo8rSmZ+QqxcbyA3hfeprFgIT//HW2nlHChWeIIMwS2Fq+gEARkhTkg=="; + }; + }; "d3-dsv-1.2.0" = { name = "d3-dsv"; packageName = "d3-dsv"; @@ -19572,6 +19617,15 @@ let sha512 = "E+Pn8UJYx9mViuIUkoc93gJGGYut6mSDKy2+XaPwccwkRGlR+LO97L2VCCRjQivTwLHkSnAJG7yo00BWY6QM+w=="; }; }; + "d3-dsv-3.0.1" = { + name = "d3-dsv"; + packageName = "d3-dsv"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-dsv/-/d3-dsv-3.0.1.tgz"; + sha512 = "UG6OvdI5afDIFP9w4G0mNq50dSOsXHJaRE8arAS5o9ApWnIElp8GZw1Dun8vP8OyHOZ/QJUKUJwxiiCCnUwm+Q=="; + }; + }; "d3-ease-1.0.7" = { name = "d3-ease"; packageName = "d3-ease"; @@ -19581,6 +19635,24 @@ let sha512 = "lx14ZPYkhNx0s/2HX5sLFUI3mbasHjSSpwO/KaaNACweVwxUruKyWVcb293wMv1RqTPZyZ8kSZ2NogUZNcLOFQ=="; }; }; + "d3-ease-2.0.0" = { + name = "d3-ease"; + packageName = "d3-ease"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-ease/-/d3-ease-2.0.0.tgz"; + sha512 = "68/n9JWarxXkOWMshcT5IcjbB+agblQUaIsbnXmrzejn2O82n3p2A9R2zEB9HIEFWKFwPAEDDN8gR0VdSAyyAQ=="; + }; + }; + "d3-ease-3.0.1" = { + name = "d3-ease"; + packageName = "d3-ease"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-ease/-/d3-ease-3.0.1.tgz"; + sha512 = "wR/XK3D3XcLIZwpbvQwQ5fK+8Ykds1ip7A2Txe0yxncXSdq1L9skcG7blcedkOX+ZcgxGAmLX1FrRGbADwzi0w=="; + }; + }; "d3-fetch-1.2.0" = { name = "d3-fetch"; packageName = "d3-fetch"; @@ -19590,6 +19662,15 @@ let sha512 = "yC78NBVcd2zFAyR/HnUiBS7Lf6inSCoWcSxFfw8FYL7ydiqe80SazNwoffcqOfs95XaLo7yebsmQqDKSsXUtvA=="; }; }; + "d3-fetch-3.0.1" = { + name = "d3-fetch"; + packageName = "d3-fetch"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-fetch/-/d3-fetch-3.0.1.tgz"; + sha512 = "kpkQIM20n3oLVBKGg6oHrUchHM3xODkTzjMoj7aWQFq5QEM+R6E4WkzT5+tojDY7yjez8KgCBRoj4aEr99Fdqw=="; + }; + }; "d3-force-1.2.1" = { name = "d3-force"; packageName = "d3-force"; @@ -19608,6 +19689,15 @@ let sha512 = "nAuHEzBqMvpFVMf9OX75d00OxvOXdxY+xECIXjW6Gv8BRrXu6gAWbv/9XKrvfJ5i5DCokDW7RYE50LRoK092ew=="; }; }; + "d3-force-3.0.0" = { + name = "d3-force"; + packageName = "d3-force"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-force/-/d3-force-3.0.0.tgz"; + sha512 = "zxV/SsA+U4yte8051P4ECydjD/S+qeYtnaIyAs9tgHCqfguma/aAQDjo85A9Z6EKhBirHRJHXIgJUlffT4wdLg=="; + }; + }; "d3-format-1.4.5" = { name = "d3-format"; packageName = "d3-format"; @@ -19626,6 +19716,15 @@ let sha512 = "Ab3S6XuE/Q+flY96HXT0jOXcM4EAClYFnRGY5zsjRGNy6qCYrQsMffs7cV5Q9xejb35zxW5hf/guKw34kvIKsA=="; }; }; + "d3-format-3.0.1" = { + name = "d3-format"; + packageName = "d3-format"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-format/-/d3-format-3.0.1.tgz"; + sha512 = "hdL7+HBIohpgfolhBxr1KX47VMD6+vVD/oEFrxk5yhmzV2prk99EkFKYpXuhVkFpTgHdJ6/4bYcjdLPPXV4tIA=="; + }; + }; "d3-geo-1.12.1" = { name = "d3-geo"; packageName = "d3-geo"; @@ -19644,6 +19743,15 @@ let sha512 = "8pM1WGMLGFuhq9S+FpPURxic+gKzjluCD/CHTuUF3mXMeiCo0i6R0tO1s4+GArRFde96SLcW/kOFRjoAosPsFA=="; }; }; + "d3-geo-3.0.1" = { + name = "d3-geo"; + packageName = "d3-geo"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-geo/-/d3-geo-3.0.1.tgz"; + sha512 = "Wt23xBych5tSy9IYAM1FR2rWIBFWa52B/oF/GYe5zbdHrg08FU8+BuI6X4PvTwPDdqdAdq04fuWJpELtsaEjeA=="; + }; + }; "d3-geo-projection-3.0.0" = { name = "d3-geo-projection"; packageName = "d3-geo-projection"; @@ -19653,6 +19761,15 @@ let sha512 = "1JE+filVbkEX2bT25dJdQ05iA4QHvUwev6o0nIQHOSrNlHCAKfVss/U10vEM3pA4j5v7uQoFdQ4KLbx9BlEbWA=="; }; }; + "d3-graphviz-4.0.0" = { + name = "d3-graphviz"; + packageName = "d3-graphviz"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-graphviz/-/d3-graphviz-4.0.0.tgz"; + sha512 = "j+fRjPiLnMa3C2QLIWld13vJQzkd9uBhYXZJQSgKI7z2uTvCdMcrvvxJYg7vGdzqceMImKq5Is/oX8kDw+1xng=="; + }; + }; "d3-hierarchy-1.1.9" = { name = "d3-hierarchy"; packageName = "d3-hierarchy"; @@ -19671,6 +19788,15 @@ let sha512 = "SwIdqM3HxQX2214EG9GTjgmCc/mbSx4mQBn+DuEETubhOw6/U3fmnji4uCVrmzOydMHSO1nZle5gh6HB/wdOzw=="; }; }; + "d3-hierarchy-3.0.1" = { + name = "d3-hierarchy"; + packageName = "d3-hierarchy"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-hierarchy/-/d3-hierarchy-3.0.1.tgz"; + sha512 = "RlLTaofEoOrMK1JoXYIGhKTkJFI/6rFrYPgxy6QlZo2BcVc4HGTqEU0rPpzuMq5T/5XcMtAzv1XiLA3zRTfygw=="; + }; + }; "d3-interpolate-1.4.0" = { name = "d3-interpolate"; packageName = "d3-interpolate"; @@ -19689,6 +19815,15 @@ let sha512 = "c5UhwwTs/yybcmTpAVqwSFl6vrQ8JZJoT5F7xNFK9pymv5C0Ymcc9/LIJHtYIggg/yS9YHw8i8O8tgb9pupjeQ=="; }; }; + "d3-interpolate-3.0.1" = { + name = "d3-interpolate"; + packageName = "d3-interpolate"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-3.0.1.tgz"; + sha512 = "3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g=="; + }; + }; "d3-path-1.0.9" = { name = "d3-path"; packageName = "d3-path"; @@ -19707,6 +19842,15 @@ let sha512 = "ZwZQxKhBnv9yHaiWd6ZU4x5BtCQ7pXszEV9CU6kRgwIQVQGLMv1oiL4M+MK/n79sYzsj+gcgpPQSctJUsLN7fA=="; }; }; + "d3-path-3.0.1" = { + name = "d3-path"; + packageName = "d3-path"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-path/-/d3-path-3.0.1.tgz"; + sha512 = "gq6gZom9AFZby0YLduxT1qmrp4xpBA1YZr19OI717WIdKE2OM5ETq5qrHLb301IgxhLwcuxvGZVLeeWc/k1I6w=="; + }; + }; "d3-polygon-1.0.6" = { name = "d3-polygon"; packageName = "d3-polygon"; @@ -19716,6 +19860,15 @@ let sha512 = "k+RF7WvI08PC8reEoXa/w2nSg5AUMTi+peBD9cmFc+0ixHfbs4QmxxkarVal1IkVkgxVuk9JSHhJURHiyHKAuQ=="; }; }; + "d3-polygon-3.0.1" = { + name = "d3-polygon"; + packageName = "d3-polygon"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-polygon/-/d3-polygon-3.0.1.tgz"; + sha512 = "3vbA7vXYwfe1SYhED++fPUQlWSYTTGmFmQiany/gdbiWgU/iEyQzyymwL9SkJjFFuCS4902BSzewVGsHHmHtXg=="; + }; + }; "d3-quadtree-1.0.7" = { name = "d3-quadtree"; packageName = "d3-quadtree"; @@ -19734,6 +19887,15 @@ let sha512 = "b0Ed2t1UUalJpc3qXzKi+cPGxeXRr4KU9YSlocN74aTzp6R/Ud43t79yLLqxHRWZfsvWXmbDWPpoENK1K539xw=="; }; }; + "d3-quadtree-3.0.1" = { + name = "d3-quadtree"; + packageName = "d3-quadtree"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-quadtree/-/d3-quadtree-3.0.1.tgz"; + sha512 = "04xDrxQTDTCFwP5H6hRhsRcb9xxv2RzkcsygFzmkSIOJy3PeRJP7sNk3VRIbKXcog561P9oU0/rVH6vDROAgUw=="; + }; + }; "d3-random-1.1.2" = { name = "d3-random"; packageName = "d3-random"; @@ -19743,6 +19905,15 @@ let sha512 = "6AK5BNpIFqP+cx/sreKzNjWbwZQCSUatxq+pPRmFIQaWuoD+NrbVWw7YWpHiXpCQ/NanKdtGDuB+VQcZDaEmYQ=="; }; }; + "d3-random-3.0.1" = { + name = "d3-random"; + packageName = "d3-random"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-random/-/d3-random-3.0.1.tgz"; + sha512 = "FXMe9GfxTxqd5D6jFsQ+DJ8BJS4E/fT5mqqdjovykEB2oFbTMDVdg1MGFxfQW+FBOGoB++k8swBrgwSHT1cUXQ=="; + }; + }; "d3-scale-2.2.2" = { name = "d3-scale"; packageName = "d3-scale"; @@ -19761,6 +19932,15 @@ let sha512 = "1JGp44NQCt5d1g+Yy+GeOnZP7xHo0ii8zsQp6PGzd+C1/dl0KGsp9A7Mxwp+1D1o4unbTTxVdU/ZOIEBoeZPbQ=="; }; }; + "d3-scale-4.0.0" = { + name = "d3-scale"; + packageName = "d3-scale"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-scale/-/d3-scale-4.0.0.tgz"; + sha512 = "foHQYKpWQcyndH1CGoHdUC4PECxTxonzwwBXGT8qu+Drb1FIc6ON6dG2P5f4hRRMkLiIKeWK7iFtdznDUrnuPQ=="; + }; + }; "d3-scale-chromatic-1.5.0" = { name = "d3-scale-chromatic"; packageName = "d3-scale-chromatic"; @@ -19770,6 +19950,15 @@ let sha512 = "ACcL46DYImpRFMBcpk9HhtIyC7bTBR4fNOPxwVSl0LfulDAwyiHyPOTqcDG1+t5d4P9W7t/2NAuWu59aKko/cg=="; }; }; + "d3-scale-chromatic-3.0.0" = { + name = "d3-scale-chromatic"; + packageName = "d3-scale-chromatic"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-scale-chromatic/-/d3-scale-chromatic-3.0.0.tgz"; + sha512 = "Lx9thtxAKrO2Pq6OO2Ua474opeziKr279P/TKZsMAhYyNDD3EnCffdbgeSYN5O7m2ByQsxtuP2CSDczNUIZ22g=="; + }; + }; "d3-selection-1.4.2" = { name = "d3-selection"; packageName = "d3-selection"; @@ -19779,6 +19968,24 @@ let sha512 = "SJ0BqYihzOjDnnlfyeHT0e30k0K1+5sR3d5fNueCNeuhZTnGw4M4o8mqJchSwgKMXCNFo+e2VTChiSJ0vYtXkg=="; }; }; + "d3-selection-2.0.0" = { + name = "d3-selection"; + packageName = "d3-selection"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-selection/-/d3-selection-2.0.0.tgz"; + sha512 = "XoGGqhLUN/W14NmaqcO/bb1nqjDAw5WtSYb2X8wiuQWvSZUsUVYsOSkOybUrNvcBjaywBdYPy03eXHMXjk9nZA=="; + }; + }; + "d3-selection-3.0.0" = { + name = "d3-selection"; + packageName = "d3-selection"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-selection/-/d3-selection-3.0.0.tgz"; + sha512 = "fmTRWbNMmsmWq6xJV8D19U/gw/bwrHfNXxrIN+HfZgnzqTHp9jOmKMhsTUjXOJnZOdZY9Q28y4yebKzqDKlxlQ=="; + }; + }; "d3-shape-1.3.7" = { name = "d3-shape"; packageName = "d3-shape"; @@ -19797,6 +20004,15 @@ let sha512 = "PnjUqfM2PpskbSLTJvAzp2Wv4CZsnAgTfcVRTwW03QR3MkXF8Uo7B1y/lWkAsmbKwuecto++4NlsYcvYpXpTHA=="; }; }; + "d3-shape-3.0.1" = { + name = "d3-shape"; + packageName = "d3-shape"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-shape/-/d3-shape-3.0.1.tgz"; + sha512 = "HNZNEQoDhuCrDWEc/BMbF/hKtzMZVoe64TvisFLDp2Iyj0UShB/E6/lBsLlJTfBMbYgftHj90cXJ0SEitlE6Xw=="; + }; + }; "d3-time-1.1.0" = { name = "d3-time"; packageName = "d3-time"; @@ -19815,6 +20031,15 @@ let sha512 = "/eIQe/eR4kCQwq7yxi7z4c6qEXf2IYGcjoWB5OOQy4Tq9Uv39/947qlDcN2TLkiTzQWzvnsuYPB9TrWaNfipKQ=="; }; }; + "d3-time-3.0.0" = { + name = "d3-time"; + packageName = "d3-time"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-time/-/d3-time-3.0.0.tgz"; + sha512 = "zmV3lRnlaLI08y9IMRXSDshQb5Nj77smnfpnd2LrBa/2K281Jijactokeak14QacHs/kKq0AQ121nidNYlarbQ=="; + }; + }; "d3-time-format-2.3.0" = { name = "d3-time-format"; packageName = "d3-time-format"; @@ -19833,6 +20058,15 @@ let sha512 = "UXJh6EKsHBTjopVqZBhFysQcoXSv/5yLONZvkQ5Kk3qbwiUYkdX17Xa1PT6U1ZWXGGfB1ey5L8dKMlFq2DO0Ag=="; }; }; + "d3-time-format-4.0.0" = { + name = "d3-time-format"; + packageName = "d3-time-format"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-time-format/-/d3-time-format-4.0.0.tgz"; + sha512 = "nzaCwlj+ZVBIlFuVOT1RmU+6xb/7D5IcnhHzHQcBgS/aTa5K9fWZNN5LCXA27LgF5WxoSNJqKBbLcGMtM6Ca6A=="; + }; + }; "d3-timer-1.0.10" = { name = "d3-timer"; packageName = "d3-timer"; @@ -19851,6 +20085,15 @@ let sha512 = "TO4VLh0/420Y/9dO3+f9abDEFYeCUr2WZRlxJvbp4HPTQcSylXNiL6yZa9FIUvV1yRiFufl1bszTCLDqv9PWNA=="; }; }; + "d3-timer-3.0.1" = { + name = "d3-timer"; + packageName = "d3-timer"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-timer/-/d3-timer-3.0.1.tgz"; + sha512 = "ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA=="; + }; + }; "d3-transition-1.3.2" = { name = "d3-transition"; packageName = "d3-transition"; @@ -19860,6 +20103,24 @@ let sha512 = "sc0gRU4PFqZ47lPVHloMn9tlPcv8jxgOQg+0zjhfZXMQuvppjG6YuwdMBE0TuqCZjeJkLecku/l9R0JPcRhaDA=="; }; }; + "d3-transition-2.0.0" = { + name = "d3-transition"; + packageName = "d3-transition"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-transition/-/d3-transition-2.0.0.tgz"; + sha512 = "42ltAGgJesfQE3u9LuuBHNbGrI/AJjNL2OAUdclE70UE6Vy239GCBEYD38uBPoLeNsOhFStGpPI0BAOV+HMxog=="; + }; + }; + "d3-transition-3.0.1" = { + name = "d3-transition"; + packageName = "d3-transition"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-transition/-/d3-transition-3.0.1.tgz"; + sha512 = "ApKvfjsSR6tg06xrL434C0WydLr7JewBB3V+/39RMHsaXTOG0zmt/OAXeng5M5LBm0ojmxJrpomQVZ1aPvBL4w=="; + }; + }; "d3-voronoi-1.1.4" = { name = "d3-voronoi"; packageName = "d3-voronoi"; @@ -19878,6 +20139,24 @@ let sha512 = "VoLXTK4wvy1a0JpH2Il+F2CiOhVu7VRXWF5M/LroMIh3/zBAC3WAt7QoIvPibOavVo20hN6/37vwAsdBejLyKQ=="; }; }; + "d3-zoom-2.0.0" = { + name = "d3-zoom"; + packageName = "d3-zoom"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-zoom/-/d3-zoom-2.0.0.tgz"; + sha512 = "fFg7aoaEm9/jf+qfstak0IYpnesZLiMX6GZvXtUSdv8RH2o4E2qeelgdU09eKS6wGuiGMfcnMI0nTIqWzRHGpw=="; + }; + }; + "d3-zoom-3.0.0" = { + name = "d3-zoom"; + packageName = "d3-zoom"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-zoom/-/d3-zoom-3.0.0.tgz"; + sha512 = "b8AmV3kfQaqWAuacbPuNbL6vahnOJflOhexLzMMNLga62+/nh0JzvJ0aO/5a5MVgUFGS7Hu1P9P03o3fJkDCyw=="; + }; + }; "dag-map-1.0.2" = { name = "dag-map"; packageName = "dag-map"; @@ -20949,6 +21228,15 @@ let sha512 = "WNPWi1IRKZfCt/qIDMfERkDp93+iZEmOxN2yy4Jg+Xhv8SLk2UTqqbe1sfiipn0and9QrE914/ihdx82Y/Giag=="; }; }; + "delaunator-5.0.0" = { + name = "delaunator"; + packageName = "delaunator"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/delaunator/-/delaunator-5.0.0.tgz"; + sha512 = "AyLvtyJdbv/U1GkiS6gUUzclRoAY4Gs75qkMygJJhU75LW4DNuSF2RMzpxs9jw9Oz1BobHjTdkG3zdP55VxAqw=="; + }; + }; "delay-4.4.1" = { name = "delay"; packageName = "delay"; @@ -22065,6 +22353,15 @@ let sha512 = "VV5C6Kr53YVHGOBKO/F86OYX6/iLTw2yVSI721gKetxpHCK/V5TaLEf9ODjRgl1KLSWRMY6cUhAbv/c+IUnwQw=="; }; }; + "dompurify-2.3.1" = { + name = "dompurify"; + packageName = "dompurify"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dompurify/-/dompurify-2.3.1.tgz"; + sha512 = "xGWt+NHAQS+4tpgbOAI08yxW0Pr256Gu/FNE2frZVTbgrBUn8M7tz7/ktS/LZ2MHeGqz6topj0/xY+y8R5FBFw=="; + }; + }; "domutils-1.4.3" = { name = "domutils"; packageName = "domutils"; @@ -22596,13 +22893,13 @@ let sha512 = "1sQ1DRtQGpglFhc3urD4olMJzt/wxlbnAAsf+WY2xHf5c50ZovivZvCXSpVgTOP9f4TzOMvelWyspyfhxQKHzQ=="; }; }; - "electron-to-chromium-1.3.801" = { + "electron-to-chromium-1.3.806" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.801"; + version = "1.3.806"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.801.tgz"; - sha512 = "xapG8ekC+IAHtJrGBMQSImNuN+dm+zl7UP1YbhvTkwQn8zf/yYuoxfTSAEiJ9VDD+kjvXaAhNDPSxJ+VImtAJA=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.806.tgz"; + sha512 = "AH/otJLAAecgyrYp0XK1DPiGVWcOgwPeJBOLeuFQ5l//vhQhwC9u6d+GijClqJAmsHG4XDue81ndSQPohUu0xA=="; }; }; "electrum-client-git://github.com/janoside/electrum-client" = { @@ -23444,6 +23741,15 @@ let sha512 = "HBL8I3mIki5C1Cc9QjKUenHtnG0A5/xA8Q/AllRcfiwl2CZFXGK7ddBiCoRwAix4i2KxcQfjtIVcrVbB3vbmwg=="; }; }; + "es6-promisify-7.0.0" = { + name = "es6-promisify"; + packageName = "es6-promisify"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-promisify/-/es6-promisify-7.0.0.tgz"; + sha512 = "ginqzK3J90Rd4/Yz7qRrqUeIpe3TwSXTPPZtPne7tGBPeAaQiU8qt4fpKApnxHcq1AwtUdHVg5P77x/yrggG8Q=="; + }; + }; "es6-set-0.1.5" = { name = "es6-set"; packageName = "es6-set"; @@ -23651,15 +23957,6 @@ let sha512 = "S3Rz11i7c8AA5JPv7xAH+dOyq/Cu/VXHiHXBPOU1k/JAM5dXqQPt3qcrhpHSorXmrpu2g0gkIBVXAqCpzfoZIg=="; }; }; - "eslint-7.28.0" = { - name = "eslint"; - packageName = "eslint"; - version = "7.28.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-7.28.0.tgz"; - sha512 = "UMfH0VSjP0G4p3EWirscJEQ/cHqnT/iuH6oNZOB94nBjWbMnhGEPxsZm1eyIW0C/9jLI0Fow4W5DXLjEI7mn1g=="; - }; - }; "eslint-7.32.0" = { name = "eslint"; packageName = "eslint"; @@ -23669,15 +23966,6 @@ let sha512 = "VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA=="; }; }; - "eslint-config-prettier-8.3.0" = { - name = "eslint-config-prettier"; - packageName = "eslint-config-prettier"; - version = "8.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.3.0.tgz"; - sha512 = "BgZuLUSeKzvlL/VUjx/Yb787VQ26RU3gGjA3iiFvdsp/2bMfVIWUVP7tjxtjS0e+HP409cPlPvNkQloz8C91ew=="; - }; - }; "eslint-plugin-no-unsanitized-3.1.5" = { name = "eslint-plugin-no-unsanitized"; packageName = "eslint-plugin-no-unsanitized"; @@ -23687,15 +23975,6 @@ let sha512 = "s/6w++p1590h/H/dE2Wo660bOkaM/3OEK14Y7xm1UT0bafxkKw1Cq0ksjxkxLdH/WWd014DlsLKuD6CyNrR2Dw=="; }; }; - "eslint-plugin-prettier-3.4.0" = { - name = "eslint-plugin-prettier"; - packageName = "eslint-plugin-prettier"; - version = "3.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-3.4.0.tgz"; - sha512 = "UDK6rJT6INSfcOo545jiaOwB701uAIt2/dR7WnFQoGCVl1/EMqdANBmwUaqqQ45aXprsTGzSa39LI1PyuRBxxw=="; - }; - }; "eslint-plugin-vue-6.2.2" = { name = "eslint-plugin-vue"; packageName = "eslint-plugin-vue"; @@ -23786,6 +24065,15 @@ let sha512 = "0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw=="; }; }; + "eslint-visitor-keys-3.0.0" = { + name = "eslint-visitor-keys"; + packageName = "eslint-visitor-keys"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.0.0.tgz"; + sha512 = "mJOZa35trBTb3IyRmo8xmKBZlxf+N7OnUl4+ZhJHs/r+0770Wh/LEACE2pqMGMe27G/4y8P2bYGk4J70IC5k1Q=="; + }; + }; "esmangle-1.0.1" = { name = "esmangle"; packageName = "esmangle"; @@ -23840,6 +24128,15 @@ let sha512 = "v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g=="; }; }; + "espree-8.0.0" = { + name = "espree"; + packageName = "espree"; + version = "8.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/espree/-/espree-8.0.0.tgz"; + sha512 = "y/+i23dwTjIDJrYCcjcAMr3c3UGbPIjC6THMQKjWmhP97fW0FPiI89kmpKfmgV/5jrkIi6toQP+CMm3qBE1Hig=="; + }; + }; "esprima-1.1.1" = { name = "esprima"; packageName = "esprima"; @@ -25127,13 +25424,13 @@ let sha512 = "4j5uBaTnsYAV5ebkidvxiLUYOwjQ+JSFljeqfTxCrH9bDmlCQaOJFS84oDJ2rAXZq2yskmk3ORfoP9DCwqFNig=="; }; }; - "fast-json-patch-3.0.0-1" = { + "fast-json-patch-3.1.0" = { name = "fast-json-patch"; packageName = "fast-json-patch"; - version = "3.0.0-1"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-3.0.0-1.tgz"; - sha512 = "6pdFb07cknxvPzCeLsFHStEy+MysPJPgZQ9LbQ/2O67unQF93SNqfdSqnPPl71YMHX+AD8gbl7iuoGFzHEdDuw=="; + url = "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-3.1.0.tgz"; + sha512 = "IhpytlsVTRndz0hU5t0/MGzS/etxLlfrpG5V5M9mVbuj9TrJLWaMfsox9REM5rkuGX0T+5qjpe8XA1o0gZ42nA=="; }; }; "fast-json-stable-stringify-2.1.0" = { @@ -28161,13 +28458,13 @@ let sha512 = "WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="; }; }; - "globals-13.10.0" = { + "globals-13.11.0" = { name = "globals"; packageName = "globals"; - version = "13.10.0"; + version = "13.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-13.10.0.tgz"; - sha512 = "piHC3blgLGFjvOuMmWZX60f+na1lXFDhQXBf1UYp2fXPXqvEUbOhNwi6BsQ0bQishwedgnjkwv1d9zKf+MWw3g=="; + url = "https://registry.npmjs.org/globals/-/globals-13.11.0.tgz"; + sha512 = "08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g=="; }; }; "globals-9.18.0" = { @@ -28359,13 +28656,13 @@ let sha512 = "Q+ZjUEvLQj/lrVHF/IQwRo6p3s8Nc44Zk/DALsN+ac3T4HY/g/3rrufkgtl+nZ1TW7DNAw5cTChdVp4apUXVgQ=="; }; }; - "google-auth-library-7.5.0" = { + "google-auth-library-7.6.1" = { name = "google-auth-library"; packageName = "google-auth-library"; - version = "7.5.0"; + version = "7.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/google-auth-library/-/google-auth-library-7.5.0.tgz"; - sha512 = "iRMwc060kiA6ncZbAoQN90nlwT8jiHVmippofpMgo4YFEyRBaPouyM7+ZB742wKetByyy+TahshVRTx0tEyXGQ=="; + url = "https://registry.npmjs.org/google-auth-library/-/google-auth-library-7.6.1.tgz"; + sha512 = "aP/WTx+rE3wQ3zPgiCZsJ1EIb2v7P+QwxVwAqrKjcPz4SK57kyAfcX75VoAgjtwZzl70upcNlvFn8FSmC4nMBQ=="; }; }; "google-closure-compiler-js-20170910.0.1" = { @@ -28377,22 +28674,22 @@ let sha512 = "Vric7QFWxzHFxITZ10bmlG1H/5rhODb7hJuWyKWMD8GflpQzRmbMVqkFp3fKvN+U9tPwZItGVhkiOR+84PX3ew=="; }; }; - "google-gax-2.22.1" = { + "google-gax-2.24.0" = { name = "google-gax"; packageName = "google-gax"; - version = "2.22.1"; + version = "2.24.0"; src = fetchurl { - url = "https://registry.npmjs.org/google-gax/-/google-gax-2.22.1.tgz"; - sha512 = "/X5Ym6f6Q4sH/3blMr1w/QzFhH0ZKnx9kOusUPwwZH6JmSwLpbuyUDbOc7MAvadl4r7yI2AASILLWK3fT+1Thg=="; + url = "https://registry.npmjs.org/google-gax/-/google-gax-2.24.0.tgz"; + sha512 = "PtE/Zk3jPrUIAL9YsIq5e+04U3aqEg6/0DmtR/tXKhbcS7SRA1sbPZja+vevuUavIdCXEiBbaKkrBqcQvSxXmw=="; }; }; - "google-p12-pem-3.1.1" = { + "google-p12-pem-3.1.2" = { name = "google-p12-pem"; packageName = "google-p12-pem"; - version = "3.1.1"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-3.1.1.tgz"; - sha512 = "e9CwdD2QYkpvJsktki3Bm8P8FSGIneF+/42a9F9QHcQvJ73C2RoYZdrwRl6BhwksWtzl65gT4OnBROhUIFw95Q=="; + url = "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-3.1.2.tgz"; + sha512 = "tjf3IQIt7tWCDsa0ofDQ1qqSCNzahXDxdAGJDbruWqu3eCg5CKLYKN+hi0s6lfvzYZ1GDVr+oDF9OOWlDSdf0A=="; }; }; "goosig-0.10.0" = { @@ -28791,13 +29088,13 @@ let sha512 = "GD7cTz0I4SAede1/+pAbmJRG44zFLPipVtdL9o3vqx9IEyb7b4/Y3s7r6ofI3CchR5GvYJ+8buCSioDv5dQLiA=="; }; }; - "gtoken-5.3.0" = { + "gtoken-5.3.1" = { name = "gtoken"; packageName = "gtoken"; - version = "5.3.0"; + version = "5.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/gtoken/-/gtoken-5.3.0.tgz"; - sha512 = "mCcISYiaRZrJpfqOs0QWa6lfEM/C1V9ASkzFmuz43XBb5s1Vynh+CZy1ECeeJXVGx2PRByjYzb4Y4/zr1byr0w=="; + url = "https://registry.npmjs.org/gtoken/-/gtoken-5.3.1.tgz"; + sha512 = "yqOREjzLHcbzz1UrQoxhBtpk8KjrVhuqPE7od1K2uhyxG2BHjKZetlbLw/SPZak/QqTIQW+addS+EcjqQsZbwQ=="; }; }; "guard-timeout-2.0.0" = { @@ -29628,6 +29925,15 @@ let sha512 = "tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A=="; }; }; + "highlight.js-11.2.0" = { + name = "highlight.js"; + packageName = "highlight.js"; + version = "11.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/highlight.js/-/highlight.js-11.2.0.tgz"; + sha512 = "JOySjtOEcyG8s4MLR2MNbLUyaXqUunmSnL2kdV/KuGJOmHZuAR5xC54Ko7goAXBWNhf09Vy3B+U7vR62UZ/0iw=="; + }; + }; "highlight.js-8.2.0" = { name = "highlight.js"; packageName = "highlight.js"; @@ -30421,13 +30727,13 @@ let sha512 = "yozWXZx3yXVprf/MM9WqMt5WY60Im8k6ELJDNFGfyMeO+UieITbDmkvVwMnKQA3ptWqUK8fPf/tEGgklWh7Weg=="; }; }; - "hyperbee-1.5.5" = { + "hyperbee-1.6.2" = { name = "hyperbee"; packageName = "hyperbee"; - version = "1.5.5"; + version = "1.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/hyperbee/-/hyperbee-1.5.5.tgz"; - sha512 = "0zX5JzBgB0kW7stpq2RXiVxzETckGuXJX43hAD5Fom60NUvpnEl6Q2VGKGjfDET04FjPCZAqA08pM2JXa48LjQ=="; + url = "https://registry.npmjs.org/hyperbee/-/hyperbee-1.6.2.tgz"; + sha512 = "0pn4srJRD8edAOfJpSsdYGO9bwteD+A9OzHjjZZrfIdWZXXwtg862Wi/6L6JZhJ9ITfhlkEZTYJnOwi+wNwWqA=="; }; }; "hypercore-7.7.1" = { @@ -31573,6 +31879,15 @@ let sha512 = "lDB5YccMydFBtasVtxnZ3MRBHuaoE8GKsppq+EchKL2U4nK/DmEpPHNH8MZe5HkMtpSiTSOZwfN0tzYjO/lJEw=="; }; }; + "internmap-2.0.1" = { + name = "internmap"; + packageName = "internmap"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/internmap/-/internmap-2.0.1.tgz"; + sha512 = "Ujwccrj9FkGqjbY3iVoxD1VV+KdZZeENx0rphrtzmRXbFvkFO88L80BL/zeSIguX/7T+y8k04xqtgWgS5vxwxw=="; + }; + }; "interpret-1.1.0" = { name = "interpret"; packageName = "interpret"; @@ -31987,13 +32302,13 @@ let sha1 = "f02ad0259a0921cd199ff21ce1b09e0f6b4e3929"; }; }; - "is-bigint-1.0.3" = { + "is-bigint-1.0.4" = { name = "is-bigint"; packageName = "is-bigint"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.3.tgz"; - sha512 = "ZU538ajmYJmzysE5yU4Y7uIrPQ2j704u+hXFiIPQExpqzzUbpe5jCPdTfmz7jXRxZdvjY3KZ3ZNenoXQovX+Dg=="; + url = "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz"; + sha512 = "zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg=="; }; }; "is-binary-path-1.0.1" = { @@ -33688,13 +34003,13 @@ let sha512 = "dZ6Ra7u1G8c4Letq/B5EzAxj4tLFHL+cGtdpR+PVm4yzPDj+lCk+AbivWt1eOM+ikzkowtyV7qSqX6qr3t71Ww=="; }; }; - "jitdb-3.1.6" = { + "jitdb-3.1.7" = { name = "jitdb"; packageName = "jitdb"; - version = "3.1.6"; + version = "3.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/jitdb/-/jitdb-3.1.6.tgz"; - sha512 = "FnOJmSyz/z4GfULcJSuvGfHlXFuosXws77GnR9M7wgCH/KAE5TovcQkjbFt5x69o6myacPYdzWr8yHVLJMuKWA=="; + url = "https://registry.npmjs.org/jitdb/-/jitdb-3.1.7.tgz"; + sha512 = "AV5AnBPlrQO75I3MKJFQMzQyM0ZQDwKcij299C1kBXt/U7dDqwQa8FaYYiHnbK8w9J4qXsvQOlM8P5HGY24zBQ=="; }; }; "jju-1.4.0" = { @@ -34102,49 +34417,49 @@ let sha512 = "xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g=="; }; }; - "jsii-1.32.0" = { + "jsii-1.33.0" = { name = "jsii"; packageName = "jsii"; - version = "1.32.0"; + version = "1.33.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii/-/jsii-1.32.0.tgz"; - sha512 = "Vw/xjiRgMdb+wbSSUaA7DTvVfSYfCR0k8Gdei43xSOOqmRfyLsmrWkN4ypnsbfaWfEYLpTj/HXGc4rJmw9Vnrw=="; + url = "https://registry.npmjs.org/jsii/-/jsii-1.33.0.tgz"; + sha512 = "0WIWlrRtoQNrp7iyEyNMoPRzvjd2EK8/Zgn/tWyzpjaMZur9HevZuk4lduCthTly/Gs9A7u1Ajdyp1cBrALeBQ=="; }; }; - "jsii-pacmak-1.32.0" = { + "jsii-pacmak-1.33.0" = { name = "jsii-pacmak"; packageName = "jsii-pacmak"; - version = "1.32.0"; + version = "1.33.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.32.0.tgz"; - sha512 = "zH+5ys4w9rSz7ZbfDTX0XZ8zhqpoygikuAppiWWVqjMmdk8qqZUgY9fLncZliMnI42YCXSz7q43g4tVL7dd3ng=="; + url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.33.0.tgz"; + sha512 = "STcsk5wmAlJSCEzl5nTPAJ5emSZLIPJYoYjBCMcwv62MI1B4zozSSsmbpI/4oPQWh9c2fD2CJIEbwyct4KTPKQ=="; }; }; - "jsii-reflect-1.32.0" = { + "jsii-reflect-1.33.0" = { name = "jsii-reflect"; packageName = "jsii-reflect"; - version = "1.32.0"; + version = "1.33.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.32.0.tgz"; - sha512 = "BJN8pgxSa3LlP5yPfxtaviSjsHKpG9b4xOr2kXv6w/SElIX15Q5/tKauI4/ZHTnBHGimRWh9ACNtxXAxvH0Vqg=="; + url = "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.33.0.tgz"; + sha512 = "FH3lextueMXDFezWEPRYNEmEDcFg2Tvh4Wdjs0tBi+oSmewK3I+xCAVXmnpE8CRC2RW1zOLutH9hQbQnrKtsOw=="; }; }; - "jsii-rosetta-1.32.0" = { + "jsii-rosetta-1.33.0" = { name = "jsii-rosetta"; packageName = "jsii-rosetta"; - version = "1.32.0"; + version = "1.33.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.32.0.tgz"; - sha512 = "NrhHIJ0BNKxpjyvqtqhunIcHhJiA5dhlRSPPuO+EGsCQB+yc94aRj+hZZXYvWj+X1o61kdLVudJLn54sn7ESoQ=="; + url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.33.0.tgz"; + sha512 = "cUhDs2V2wYg7LFgm/X/uken8oF9re3vRORD08s0+z9Re8tt0pEehKmCotx3HYFhYrRhCEVvm66xjQt0t62GzXg=="; }; }; - "jsii-srcmak-0.1.320" = { + "jsii-srcmak-0.1.326" = { name = "jsii-srcmak"; packageName = "jsii-srcmak"; - version = "0.1.320"; + version = "0.1.326"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.320.tgz"; - sha512 = "+XiaSKCrauom9xazpWr7O8pAEEDrrW1qYJ6O0vHG4YKZxJYJN7md6qwAurk3iamwtyuIW/Io2XEnB6ZypAk3bw=="; + url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.326.tgz"; + sha512 = "euZGdUcdZHI/cycrBZ7AVDea7Du2qu7TIzctEXUDuubtZ/n66rxWCQnlo/NsaQYx4HXkY47xaoVlRg69lhciZA=="; }; }; "json-bigint-1.0.0" = { @@ -34444,13 +34759,13 @@ let sha512 = "0/4Lv6IenJV0qj2oBdgPIAmFiKKnh8qh7bmLFJ+/ZZHLjSeiL3fKKGX3UryvKPbxFbhV+JcYo9KUC19GJ/Z/4A=="; }; }; - "json2jsii-0.1.290" = { + "json2jsii-0.1.296" = { name = "json2jsii"; packageName = "json2jsii"; - version = "0.1.290"; + version = "0.1.296"; src = fetchurl { - url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.1.290.tgz"; - sha512 = "r6Ab98tTR1NiD385ce5VpwH98Frhhmg7Kzq0t1Vte4FEx0icDcZIDIngqOoQWpMTMYFctTNggrswxkAvFeFBVA=="; + url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.1.296.tgz"; + sha512 = "sr2xUhMuUMMtDqxckludB4fZ+64xJ8K+HODXVO/jbkv0QND5I8PmHwz0IqjqGkpUNHqJkYvXzn06tgXy/V1WeQ=="; }; }; "json3-3.2.6" = { @@ -34714,13 +35029,13 @@ let sha512 = "dxLob7q65Xg2DvstYkRpkYtmKm2sPJ9oFhrhmudT1dZvNFFTlroai3AWSpLey/w5vMcLBXRgOJsbXpdN9HzU/A=="; }; }; - "jstat-1.9.4" = { + "jstat-1.9.5" = { name = "jstat"; packageName = "jstat"; - version = "1.9.4"; + version = "1.9.5"; src = fetchurl { - url = "https://registry.npmjs.org/jstat/-/jstat-1.9.4.tgz"; - sha512 = "IiTPlI7pcrsq41EpDzrghlA1fhiC9GXxNqO4k5ogsjsM1XAWQ8zESH/bZsExLVgQsYpXE+7c11kEbbuxTLUpJQ=="; + url = "https://registry.npmjs.org/jstat/-/jstat-1.9.5.tgz"; + sha512 = "cWnp4vObF5GmB2XsIEzxI/1ZTcYlcfNqxQ/9Fp5KFUa0Jf/4tO0ZkGVnqoEHDisJvYgvn5n3eWZbd2xTVJJPUQ=="; }; }; "jstransform-10.1.0" = { @@ -35831,15 +36146,6 @@ let sha512 = "tq7AAMpjQ9sl58pW/qis/vOBzN7MCQ4F4n+ox4VQhyv1qVA+P2LgJq36I1Y6b4RX68+hK48u1eHDzSt527fEXA=="; }; }; - "lightning-3.3.16" = { - name = "lightning"; - packageName = "lightning"; - version = "3.3.16"; - src = fetchurl { - url = "https://registry.npmjs.org/lightning/-/lightning-3.3.16.tgz"; - sha512 = "5rltlQighO0X6IjTbdsabtfT3ZY3kE6MZN6jmK4wz6Jt3eikxMbmzVBC5/UeyMb/3Fad3iHJIneXuhu76/eY/A=="; - }; - }; "lightning-3.3.9" = { name = "lightning"; packageName = "lightning"; @@ -35858,13 +36164,13 @@ let sha512 = "lD6PgHipqedfFcTEf/9mDF3s4KGO/lecr02W6zHBJHohNphuBUZS1z68kKRJAl3N4iHmDEfLxt+G86PBP0jhHw=="; }; }; - "lightning-3.5.0" = { + "lightning-4.0.0" = { name = "lightning"; packageName = "lightning"; - version = "3.5.0"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/lightning/-/lightning-3.5.0.tgz"; - sha512 = "6Kj1JX8tG3JiV5LXYGuZkKckiRJ/OU8ukb/R5qsp7RWq/xw32LDccCKvOK8oRnOGw9K+G8jcZAOY21exr9OSFA=="; + url = "https://registry.npmjs.org/lightning/-/lightning-4.0.0.tgz"; + sha512 = "HtEF7Lsw8qdEeQTsYY6c6QK6PFrG0YV3OBPWL6VnsAr25t+HDEsH/Fna6EIivqrQ8SVDjqX5YwMcAhunTelaVA=="; }; }; "lilconfig-2.0.3" = { @@ -36020,15 +36326,6 @@ let sha512 = "EBEeBymqktoaViGAG5aVmgIOZpWc6IwDqxq93ZYYIw+Uc9Vy/86nUDPx8A/jJC0f8lwEGcqT+hnSIiBF4SyqeA=="; }; }; - "ln-service-51.10.1" = { - name = "ln-service"; - packageName = "ln-service"; - version = "51.10.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ln-service/-/ln-service-51.10.1.tgz"; - sha512 = "fXsA/gDh65+YYVYJ6GNDB2ALPa0rjXV59I9kgciOCkgiJo3F7AYkhNULYIGu0r2FK83J1M85AsH6tycImRVWRQ=="; - }; - }; "ln-service-51.8.2" = { name = "ln-service"; packageName = "ln-service"; @@ -36047,22 +36344,13 @@ let sha512 = "1SU0eG9/LDy6k3UGXaahmoe1wOahAJkaidWpLX5Nmlfq72I0arad420smma5ZGXAW4wNlGR/gx68KZzzYI5D4A=="; }; }; - "ln-service-51.9.0" = { + "ln-service-52.0.0" = { name = "ln-service"; packageName = "ln-service"; - version = "51.9.0"; + version = "52.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/ln-service/-/ln-service-51.9.0.tgz"; - sha512 = "4lbC1QZ/a4BuvO/0wd8DxRr5DxdYGugENoDo9X8xnUts9tGmYLb7g5yEXuk/Ff2LPTVUlK5imAsduobUVXOzlA=="; - }; - }; - "ln-sync-0.4.6" = { - name = "ln-sync"; - packageName = "ln-sync"; - version = "0.4.6"; - src = fetchurl { - url = "https://registry.npmjs.org/ln-sync/-/ln-sync-0.4.6.tgz"; - sha512 = "FMfcEISlboFVz+wLTAJ+FnEIQkoMR7IHcUg4l5JNwsU/UOijM1vTQDFhHVqg5fEQAFboZe3lNd7Rh1uxxqs47Q=="; + url = "https://registry.npmjs.org/ln-service/-/ln-service-52.0.0.tgz"; + sha512 = "JxGGEqu1MJ1jnJN0cWWBsmEqi9qwbvsfM/AHslvKv7WHhMYFthp9HgGGcLn23oiYMM1boGtvqtkWuvqMf9P8AQ=="; }; }; "ln-sync-0.4.7" = { @@ -36074,13 +36362,13 @@ let sha512 = "2yqc59OhK0affnkwhgw7iY4x2tKZTb8y8KSWxRHn6cSXL3clUJgXdTNOGr4Jp8j1TkTl0iRVnLSNZlRbtU4vVA=="; }; }; - "ln-telegram-3.2.9" = { + "ln-telegram-3.2.10" = { name = "ln-telegram"; packageName = "ln-telegram"; - version = "3.2.9"; + version = "3.2.10"; src = fetchurl { - url = "https://registry.npmjs.org/ln-telegram/-/ln-telegram-3.2.9.tgz"; - sha512 = "pjAkD1VLGLvwu1Dso3HvQDcK25L/slRX8nB7hTDDEznn+rRzxBJd1sXuNaFovwJHughvK3ZxUxAHC0BfzIatEw=="; + url = "https://registry.npmjs.org/ln-telegram/-/ln-telegram-3.2.10.tgz"; + sha512 = "FEI6wPb/DzpzwfWV8PPFPWq/OSWp6ETv7rEofCTCCodd/hRQGzXoJ7mDmyKFTune5TASXDBMlghol/EgZswkNg=="; }; }; "load-ip-set-2.2.1" = { @@ -38099,13 +38387,13 @@ let sha512 = "zTU3DaZaF3Rt9rhN3uBMGQD3dD2/vFQqnvZCDv4dl5iOzq2IZQqTxu90r4E5J+nP70J3ilqVCrbho2eWaeW8Ow=="; }; }; - "luxon-2.0.1" = { + "luxon-2.0.2" = { name = "luxon"; packageName = "luxon"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/luxon/-/luxon-2.0.1.tgz"; - sha512 = "8Eawf81c9ZlQj62W3eq4mp+C7SAIAnmaS7ZuEAiX503YMcn+0C1JnMQRtfaQj6B5qTZLgHv0F4H5WabBCvi1fw=="; + url = "https://registry.npmjs.org/luxon/-/luxon-2.0.2.tgz"; + sha512 = "ZRioYLCgRHrtTORaZX1mx+jtxKtKuI5ZDvHNAmqpUzGqSrR+tL4FVLn/CUGMA3h0+AKD1MAxGI5GnCqR5txNqg=="; }; }; "lzma-native-6.0.1" = { @@ -39557,13 +39845,13 @@ let sha512 = "TIurLf/ustQNMXi5foClGTcEsRvH6DCvxeAKu68OrwHMOSM/M1pgPXb7qe52Svk1ClvmZuAVpLtP5FWKzPr/sw=="; }; }; - "mermaid-8.11.4" = { + "mermaid-8.11.5" = { name = "mermaid"; packageName = "mermaid"; - version = "8.11.4"; + version = "8.11.5"; src = fetchurl { - url = "https://registry.npmjs.org/mermaid/-/mermaid-8.11.4.tgz"; - sha512 = "iUJylv5VmsOm/6dkAVpSYRSD8iZ8NOjuiHG0Q6nMgPdmmQ9xy8z61v8MuRZn81K51JlvOeWMN06blejmsMQHqg=="; + url = "https://registry.npmjs.org/mermaid/-/mermaid-8.11.5.tgz"; + sha512 = "lbIaDQlFoIQLxnLy8hZgfS6L7gt2Wxlk83fudLslUEhj4yafHyVjzGOlojJQxgsLU5khEANhxLbo0xebtOrhXQ=="; }; }; "meros-1.1.4" = { @@ -41429,6 +41717,15 @@ let sha512 = "FiB0kzdP0FFVGDKlRLEQ1BgDzU87dy5NnzjeW9YZNt+/c3+q82EQDUwniSAUxp/F0gFNI1ZhKU1FqYsMuqZVnw=="; }; }; + "nanoid-3.1.25" = { + name = "nanoid"; + packageName = "nanoid"; + version = "3.1.25"; + src = fetchurl { + url = "https://registry.npmjs.org/nanoid/-/nanoid-3.1.25.tgz"; + sha512 = "rdwtIXaXCLFAQbnfqDRnI6jaRHp9fTcYBjtFKE8eezcZ7LuLjhUaQGNeMXf1HmRoCH32CLz6XwX0TtxEOS/A3Q=="; + }; + }; "nanoiterator-1.2.1" = { name = "nanoiterator"; packageName = "nanoiterator"; @@ -41853,13 +42150,22 @@ let sha512 = "BiQblBf85/GmerTZYxVH/1A4/O8qBvg0Qr8QX0MvxjAvO3j+jDUk1PSudMxNgJjU1zFw5pKM2/DBk70hP5gt+Q=="; }; }; - "netlify-redirect-parser-8.2.0" = { + "netlify-headers-parser-3.0.1" = { + name = "netlify-headers-parser"; + packageName = "netlify-headers-parser"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/netlify-headers-parser/-/netlify-headers-parser-3.0.1.tgz"; + sha512 = "32oDkPa7+JdTFOp0M4H31AZDQ8YVJWgNlPkPuilb1C1dgvmAFXa8k4x+ADpgCbQfTMP3exO3vobvlfj8SUHxnA=="; + }; + }; + "netlify-redirect-parser-11.0.2" = { name = "netlify-redirect-parser"; packageName = "netlify-redirect-parser"; - version = "8.2.0"; + version = "11.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-redirect-parser/-/netlify-redirect-parser-8.2.0.tgz"; - sha512 = "XaCojsgAKs19vlT2C4CEs4bp166bBsgA/brt10x2HLsgp4tF3dSacClPfZgGknyHB1MnMK8j3SFp9yq6rYm8CQ=="; + url = "https://registry.npmjs.org/netlify-redirect-parser/-/netlify-redirect-parser-11.0.2.tgz"; + sha512 = "ngGSxRUv8dsao586J0MsfQFpi66TnIlYND1KRl1vCgjuuMBzvO9WbV8maqJA9d0G6f9NVKb+LqufmOQj4AkkFw=="; }; }; "netlify-redirector-0.2.1" = { @@ -42186,6 +42492,15 @@ let sha512 = "Yt3384If5H6BYGVHiHwTL+99OzJKHhgp82S8/dktEK73T26BazdgZ4JZh92xSVtGNJvz9UbXdNAc5hcrXV42vw=="; }; }; + "node-emoji-1.11.0" = { + name = "node-emoji"; + packageName = "node-emoji"; + version = "1.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-emoji/-/node-emoji-1.11.0.tgz"; + sha512 = "wo2DpQkQp7Sjm2A0cq+sN7EHKO6Sl0ctXeBdFZrL9T9+UywORbufTcTZxom8YqpLQt/FqNMUkOpkZrJVYSKD3A=="; + }; + }; "node-emoji-git+https://github.com/laurent22/node-emoji.git" = { name = "node-emoji"; packageName = "node-emoji"; @@ -43889,13 +44204,13 @@ let sha512 = "fvaSZRzprpwLFge/mcwE0CItfniNisVNamDdMK1FQUjh4ArQZ8ZWSkDaJbZc3XaANKZHq0xIa8NJpZ2HSe3oXA=="; }; }; - "oo-ascii-tree-1.32.0" = { + "oo-ascii-tree-1.33.0" = { name = "oo-ascii-tree"; packageName = "oo-ascii-tree"; - version = "1.32.0"; + version = "1.33.0"; src = fetchurl { - url = "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.32.0.tgz"; - sha512 = "QCYSWgdhbQwvMzw1OguyZ+K2KwZeQ1xvhFXa0/XV8XfmUXgr07MlnUoNthntfYgY6w7w+KI8WvqIxr+Q/NF5gw=="; + url = "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.33.0.tgz"; + sha512 = "pthBVMVqOl3GZ6t9WjgLP9p24Oz4oVQCabhhIsY+nG9rywUtHOfqgmSm5AD3BbrJc0cP84dyDJFVlu/bVaKyjw=="; }; }; "opal-runtime-1.0.11" = { @@ -46499,6 +46814,15 @@ let sha512 = "drPtqkkSf0ufx2gaea3TryFiBHdNIdXKf5LN0hTM82SXI4xVIve2wLwNg92e1MT6m3jASLu6VO7eGY6+mmGeyw=="; }; }; + "pino-6.13.0" = { + name = "pino"; + packageName = "pino"; + version = "6.13.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pino/-/pino-6.13.0.tgz"; + sha512 = "mRXSTfa34tbfrWqCIp1sUpZLqBhcoaGapoyxfEwaWwJGMpLijlRdDKIQUyvq4M3DUfFH5vEglwSw8POZYwbThA=="; + }; + }; "pino-std-serializers-3.2.0" = { name = "pino-std-serializers"; packageName = "pino-std-serializers"; @@ -46986,15 +47310,6 @@ let sha512 = "BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw=="; }; }; - "postcss-8.3.4" = { - name = "postcss"; - packageName = "postcss"; - version = "8.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-8.3.4.tgz"; - sha512 = "/tZY0PXExXXnNhKv3TOvZAOUYRyuqcCbBm2c17YMDK0PlVII3K7/LKdt3ScHL+hhouddjUWi+1sKDf9xXW+8YA=="; - }; - }; "postcss-8.3.6" = { name = "postcss"; packageName = "postcss"; @@ -47679,13 +47994,13 @@ let sha512 = "7GOJrLuow8yeiyv75rmvZyeMGzl8mdEX5gY69d6a6bHWmiPevwqFw+tQavhK0EYMaSg3/KD24cWqeQv1EWsqDQ=="; }; }; - "prebuild-install-6.1.3" = { + "prebuild-install-6.1.4" = { name = "prebuild-install"; packageName = "prebuild-install"; - version = "6.1.3"; + version = "6.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-6.1.3.tgz"; - sha512 = "iqqSR84tNYQUQHRXalSKdIaM8Ov1QxOVuBNWI7+BzZWv6Ih9k75wOnH1rGQ9WWTaaLkTpxWKIciOF0KyfM74+Q=="; + url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-6.1.4.tgz"; + sha512 = "Z4vpywnK1lBg+zdPCVCsKq0xO66eEV9rWo2zrROGGiRS4JtueBOdlB1FnY8lcy7JsUud/Q3ijUxyWN26Ika0vQ=="; }; }; "precinct-8.1.0" = { @@ -47832,15 +48147,6 @@ let sha512 = "2UzApPuxi2yRoyMlXMazgR6UcH9DKJhNgCviIwY3ixZ9THWSSrUww5vkiZ3C48WvpFl1M1y/oU63deSy1puWEA=="; }; }; - "prettier-linter-helpers-1.0.0" = { - name = "prettier-linter-helpers"; - packageName = "prettier-linter-helpers"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz"; - sha512 = "GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w=="; - }; - }; "prettier-plugin-svelte-2.3.1" = { name = "prettier-plugin-svelte"; packageName = "prettier-plugin-svelte"; @@ -47958,15 +48264,6 @@ let sha1 = "b7e3ea42435a4c9b2759d99e0f201eb195802ee1"; }; }; - "pretty-ms-5.1.0" = { - name = "pretty-ms"; - packageName = "pretty-ms"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pretty-ms/-/pretty-ms-5.1.0.tgz"; - sha512 = "4gaK1skD2gwscCfkswYQRmddUb2GJZtzDGRjHWadVHtK/DIKFufa12MvES6/xu1tVbUYeia5bmLcwJtZJQUqnw=="; - }; - }; "pretty-ms-7.0.1" = { name = "pretty-ms"; packageName = "pretty-ms"; @@ -48543,13 +48840,13 @@ let sha512 = "5aFshI9SbhtcMiDiZZu3g2tMlZeS5lhni//AGJ7V34PQLU5JA91Cva7TIs6inZhYikS3OpnUzAUuL6YtS0CyDA=="; }; }; - "protocol-buffers-schema-3.5.1" = { + "protocol-buffers-schema-3.5.2" = { name = "protocol-buffers-schema"; packageName = "protocol-buffers-schema"; - version = "3.5.1"; + version = "3.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/protocol-buffers-schema/-/protocol-buffers-schema-3.5.1.tgz"; - sha512 = "YVCvdhxWNDP8/nJDyXLuM+UFsuPk4+1PB7WGPVDzm3HTHbzFLxQYeW2iZpS4mmnXrQJGBzt230t/BbEb7PrQaw=="; + url = "https://registry.npmjs.org/protocol-buffers-schema/-/protocol-buffers-schema-3.5.2.tgz"; + sha512 = "LPzSaBYp/TcbuSlpGwqT5jR9kvJ3Zp5ic2N5c2ybx6XB/lSfEHq2D7ja8AgoxHoMD91wXFALJoXsvshKPuXyew=="; }; }; "protocols-1.4.8" = { @@ -49623,13 +49920,13 @@ let sha1 = "15931d3cd967ade52206f523aa7331aef7d43af7"; }; }; - "pyright-1.1.161" = { + "pyright-1.1.162" = { name = "pyright"; packageName = "pyright"; - version = "1.1.161"; + version = "1.1.162"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.161.tgz"; - sha512 = "ahZ8KyDAMdyFTt9j0P/WL6SAeZWKI9qxoFRmTxw71JwyCVPSqXaeo2rK3304YjfKZKAtuHNMgtuZiAVT8U/Pbw=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.162.tgz"; + sha512 = "3YEM8rf/39CtuHMzZmVjsV/2cJJB6N3RfCuNR5QgUeib0VRQ303zhb4jh5RRRF9P6JpZku/waX+i16TrfSqDEQ=="; }; }; "q-0.9.7" = { @@ -50433,13 +50730,13 @@ let sha512 = "dx0LvIGHcOPtKbeiSUM4jqpBl3TcY7CDjZdfOIcKeznE7BWr9dg0iPG90G5yfVQ+p/rGNMXdbfStvzQZEVEi4A=="; }; }; - "react-devtools-core-4.14.0" = { + "react-devtools-core-4.15.0" = { name = "react-devtools-core"; packageName = "react-devtools-core"; - version = "4.14.0"; + version = "4.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/react-devtools-core/-/react-devtools-core-4.14.0.tgz"; - sha512 = "cE7tkSUkGCDxTA79pntDGJCBgzNN/XxA3kgPdXujdfSfEfVhzrItQIEsN0kCN/hJJACDvH2Q8p5+tJb/K4B3qA=="; + url = "https://registry.npmjs.org/react-devtools-core/-/react-devtools-core-4.15.0.tgz"; + sha512 = "Y1NwrWSKRg4TtwcES2upzXFDmccAW9jrGQG2D8EGQrZhK+0hmuhgFnSdKpFc3z04CSeDT5t83RMXcmX5TkR1dA=="; }; }; "react-dom-16.14.0" = { @@ -51162,13 +51459,13 @@ let sha1 = "b66d828cdcafe6b4b8a428a7def4c6bcac31c8b4"; }; }; - "redoc-2.0.0-rc.55" = { + "redoc-2.0.0-rc.56" = { name = "redoc"; packageName = "redoc"; - version = "2.0.0-rc.55"; + version = "2.0.0-rc.56"; src = fetchurl { - url = "https://registry.npmjs.org/redoc/-/redoc-2.0.0-rc.55.tgz"; - sha512 = "32sUHhc33m8zQKz2V7xREwlf05S52dDOkn7K0WMquu2GDl6ZquxmrQfqnlj0IPoVCWQPR+XosmmIJj4rZbqjeA=="; + url = "https://registry.npmjs.org/redoc/-/redoc-2.0.0-rc.56.tgz"; + sha512 = "ir2TtQ2d/1FqZWIoLmUZ3qvAAnO6jg8dt0SV75TanmfCXpEABcElXWH3mtUf6qKlvgDVt40diDCVuSvyPPxkAw=="; }; }; "reduce-component-1.0.1" = { @@ -53106,6 +53403,15 @@ let sha512 = "CHhPh+UNHD2GTXNYhPWLnU8ONHdI+5DI+4EYIAOaiD63rHeYlZvyh8P+in5999TTSFgUYuKUAjzRI4mdh/p+2A=="; }; }; + "robust-predicates-3.0.1" = { + name = "robust-predicates"; + packageName = "robust-predicates"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/robust-predicates/-/robust-predicates-3.0.1.tgz"; + sha512 = "ndEIpszUHiG4HtDsQLeIuMvRsDnn8c8rYStabochtUeCvfuvNptb5TUbVD68LRAILPX7p9nqQGh4xJgn3EHS/g=="; + }; + }; "rollup-1.32.1" = { name = "rollup"; packageName = "rollup"; @@ -53115,15 +53421,6 @@ let sha512 = "/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A=="; }; }; - "rollup-2.51.1" = { - name = "rollup"; - packageName = "rollup"; - version = "2.51.1"; - src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.51.1.tgz"; - sha512 = "8xfDbAtBleXotb6qKEHWuo/jkn94a9dVqGc7Rwl3sqspCVlnCfbRek7ldhCARSi7h32H0xR4QThm1t9zHN+3uw=="; - }; - }; "rollup-2.56.2" = { name = "rollup"; packageName = "rollup"; @@ -54717,13 +55014,13 @@ let sha1 = "3ff21f198cad2175f9f3b781853fd94d0d19b590"; }; }; - "sign-addon-3.5.0" = { + "sign-addon-3.7.0" = { name = "sign-addon"; packageName = "sign-addon"; - version = "3.5.0"; + version = "3.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/sign-addon/-/sign-addon-3.5.0.tgz"; - sha512 = "Mc/Cg9P10Zyz8cnz8jSuvUDBnoY6rPExQf1vZvH4l5rfLZCLZVaLhJQ40QOAnbu8sE4TD2VzqB9Zogq7nTPrVA=="; + url = "https://registry.npmjs.org/sign-addon/-/sign-addon-3.7.0.tgz"; + sha512 = "XPLjMCcGuP5pPJSXpqFwKguIKxcteOx6dE1Bm2j92Brsro6pZYcklOpv4ohfRNW1UQp0J2cdi9zN2oNF4lMiRg=="; }; }; "signal-exit-3.0.3" = { @@ -54807,13 +55104,13 @@ let sha512 = "rohCHmEjD/ESXFLxF4bVeqgdb4Awc65ZyyuCKl3f7BvgMbZOBa/Ye3HN/GFnvruiUOAWWNupxhz3Rz5/3vJLTg=="; }; }; - "simple-git-2.42.0" = { + "simple-git-2.44.0" = { name = "simple-git"; packageName = "simple-git"; - version = "2.42.0"; + version = "2.44.0"; src = fetchurl { - url = "https://registry.npmjs.org/simple-git/-/simple-git-2.42.0.tgz"; - sha512 = "illpUX0bcrdB3AyvBGLz0ToRVP7lXNJOGVybGVuVk7PpivPNK5YKJx2aagKdKbveaMtt0DCLK4/jfjDb6b2M2g=="; + url = "https://registry.npmjs.org/simple-git/-/simple-git-2.44.0.tgz"; + sha512 = "wIjcAmymhzgdaM0Y/a+XxmNGlivvHQTPZDYXVmyHMShVDwdeVqu3+OOyDbYu0DnfVzqLs2EOxRTgMNbC3YquwQ=="; }; }; "simple-handshake-3.0.0" = { @@ -55293,13 +55590,13 @@ let sha512 = "NFwVLMCqKTocY66gcim0ukF6e31VRDJqDapg5sy3vCHqlD1OCNUXSK/aI4VQEEndDrsnFmQepsL5KpEU0dDRIQ=="; }; }; - "snyk-docker-plugin-4.22.1" = { + "snyk-docker-plugin-4.23.0" = { name = "snyk-docker-plugin"; packageName = "snyk-docker-plugin"; - version = "4.22.1"; + version = "4.23.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-4.22.1.tgz"; - sha512 = "fpXGkBu69Vb5meSrq0KjSKr0nlibA8z18fuH/O8HuDh1b5XyqKNz412njybpJtW07JPpA9rKX9gewRBZWch6fQ=="; + url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-4.23.0.tgz"; + sha512 = "hcQnDH6kN+Q9FU5/ulqfS/zmrM3YYM5cuCBjU9SZlDE/U3kpqDFePqHPmDdUBuQCdT0/3Os5A3qyg9Y7iNz8fg=="; }; }; "snyk-go-parser-1.4.1" = { @@ -55356,22 +55653,22 @@ let sha512 = "fSjer9Ic8cdA2HvInUmhwbAhoLFXIokAzGB1PeGKwr0zzyfo3dSX3ReTMEbkhrEg+h0eES13px/KiiJ0EKRKMg=="; }; }; - "snyk-nodejs-lockfile-parser-1.35.1" = { + "snyk-nodejs-lockfile-parser-1.36.0" = { name = "snyk-nodejs-lockfile-parser"; packageName = "snyk-nodejs-lockfile-parser"; - version = "1.35.1"; + version = "1.36.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.35.1.tgz"; - sha512 = "NiXN+MdWaZxseXVDgCM4CZ5aBgI5LloUbwUP9c3oMZDih9Zj6Vf5edDcL8eM3BGl+a6LceJzB6w+xrIqKCXgQA=="; + url = "https://registry.npmjs.org/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.36.0.tgz"; + sha512 = "IYg1Kbz/juuXrZNe7UoWTyHV+QKDveahxM3y1h/gZDwoOC9fgyVlC0p0v/RyeYRtvScxQcJchCr94V1VStwroA=="; }; }; - "snyk-nuget-plugin-1.22.0" = { + "snyk-nuget-plugin-1.22.1" = { name = "snyk-nuget-plugin"; packageName = "snyk-nuget-plugin"; - version = "1.22.0"; + version = "1.22.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.22.0.tgz"; - sha512 = "R0pmcEYeoM3B6BUMUf30jPQgQo8ngHW0gAabyGMnBV3ZDvJ99TCa7McSIjI/3obdT1ERIKKF6bZxuzps4uzVOA=="; + url = "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.22.1.tgz"; + sha512 = "Z/NAM7DECBTMXSGPQ9Ubc4AJsFw8ioq+UVpDQu3tkbjd83Pp0JODRjH6rElN7PnsvEADfJt8THfyC0ehXxZD/Q=="; }; }; "snyk-paket-parser-1.6.0" = { @@ -55392,13 +55689,13 @@ let sha512 = "IQcdsQBqqXVRY5DatlI7ASy4flbhtU2V7cr4P2rK9rkFnVHO6LHcitwKXVZa9ocdOmpZDzk7U6iwHJkVFcR6OA=="; }; }; - "snyk-poetry-lockfile-parser-1.1.6" = { + "snyk-poetry-lockfile-parser-1.1.7" = { name = "snyk-poetry-lockfile-parser"; packageName = "snyk-poetry-lockfile-parser"; - version = "1.1.6"; + version = "1.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-poetry-lockfile-parser/-/snyk-poetry-lockfile-parser-1.1.6.tgz"; - sha512 = "MoekbWOZPj9umfukjk2bd2o3eRj0OyO+58sxq9crMtHmTlze4h0/Uj4+fb0JFPBOtBO3c2zwbA+dvFQmpKoOTA=="; + url = "https://registry.npmjs.org/snyk-poetry-lockfile-parser/-/snyk-poetry-lockfile-parser-1.1.7.tgz"; + sha512 = "5waaslW7odDlox3WQMouSh/BjBrKq2rolMox3Ij/Vaju8r/3eWvs7anikzJUzNKwNcLm8AR5u4ftG/hxqDJJgA=="; }; }; "snyk-policy-1.22.0" = { @@ -55410,13 +55707,13 @@ let sha512 = "torzlNhDWcoMQLcX2xsTbCXfKXE614+5YvLHxEefQPwC1JNkbCN5u3/pU0c+2RfC2cPCa1AKEBqIx5gvr6mNyQ=="; }; }; - "snyk-python-plugin-1.19.11" = { + "snyk-python-plugin-1.20.1" = { name = "snyk-python-plugin"; packageName = "snyk-python-plugin"; - version = "1.19.11"; + version = "1.20.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.19.11.tgz"; - sha512 = "zUKbSbw+wU1FCUDYt+IDjaES0pc1UKBECOqjHSJMxWm9VhstvPtI4KccetwOfne2oUcmaEJJvcEp4s9VTK04XQ=="; + url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.20.1.tgz"; + sha512 = "BW5e5o59ev9PzwjVYmWWCgQpVIsMwK3rkEh1BYPMNHFbRC9QXvKsZmr9UX+jSo1rOWNy3fUIjh8t9NAK536YPQ=="; }; }; "snyk-resolve-1.1.0" = { @@ -55464,13 +55761,13 @@ let sha1 = "6e026f92e64af7fcccea1ee53d524841e418a212"; }; }; - "snyk-try-require-2.0.1" = { + "snyk-try-require-2.0.2" = { name = "snyk-try-require"; packageName = "snyk-try-require"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-try-require/-/snyk-try-require-2.0.1.tgz"; - sha512 = "VCOfFIvqLMXgCXEdooQgu3A40XYIFBnj0X8Y01RJ5iAbu08b4WKGN/uAKaRVF30dABS4EcjsalmCO+YlKUPEIA=="; + url = "https://registry.npmjs.org/snyk-try-require/-/snyk-try-require-2.0.2.tgz"; + sha512 = "kohtSHpe42qzS8QUi6dUv43S0O6puUt3W8j16ZAbmQhW2Rnf5TyTXL4DR4ZBQDC0uyWunuDK7KsalAlQGDNl8w=="; }; }; "socket.io-1.0.6" = { @@ -56778,13 +57075,13 @@ let sha512 = "zZ/Q1M+9ZWlrchgh4QauD/MEUFa6eC6H6FYq6T8Of/y82JqsQBLwN6YlzbO09evE7Rx6x0oliXDCnQSjwGwQRA=="; }; }; - "sscaff-1.2.41" = { + "sscaff-1.2.47" = { name = "sscaff"; packageName = "sscaff"; - version = "1.2.41"; + version = "1.2.47"; src = fetchurl { - url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.41.tgz"; - sha512 = "l0TA0Wp/06N+P9qrpX70/ueNOukRkfF3aasxtfVSbvrwy2gi8xCA31/rTtJ/Kb2OcqU1vdxWIDUOB82JCG+wqg=="; + url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.47.tgz"; + sha512 = "0SSqDSLkF9sRHwO6g80D74S5iAqupqcG9EsHCv4BRvwlrqu2Jr3ury5PF0tyyA2wPZejwHZ+u5XgEo8GIVQ6rA=="; }; }; "ssh-config-1.1.6" = { @@ -58957,13 +59254,13 @@ let sha512 = "FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA=="; }; }; - "tar-4.4.16" = { + "tar-4.4.17" = { name = "tar"; packageName = "tar"; - version = "4.4.16"; + version = "4.4.17"; src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-4.4.16.tgz"; - sha512 = "gOVUT/KWPkGFZQmCRDVFNUWBl7niIo/PRR7lzrIqtZpit+st54lGROuVjc6zEQM9FhH+dJfQIl+9F0k8GNXg5g=="; + url = "https://registry.npmjs.org/tar/-/tar-4.4.17.tgz"; + sha512 = "q7OwXq6NTdcYIa+k58nEMV3j1euhDhGCs/VRw9ymx/PbH0jtIM2+VTgDE/BW3rbLkrBUXs5fzEKgic5oUciu7g=="; }; }; "tar-4.4.6" = { @@ -58993,13 +59290,13 @@ let sha512 = "EwKEgqJ7nJoS+s8QfLYVGMDmAsj+StbI2AM/RTHeUSsOw6Z8bwNBRv5z3CY0m7laC5qUAqruLX5AhMuc5deY3Q=="; }; }; - "tar-6.1.7" = { + "tar-6.1.8" = { name = "tar"; packageName = "tar"; - version = "6.1.7"; + version = "6.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-6.1.7.tgz"; - sha512 = "PBoRkOJU0X3lejJ8GaRCsobjXTgFofRDSPdSUhRSdlwJfifRlQBwGXitDItdGFu0/h0XDMCkig0RN1iT7DBxhA=="; + url = "https://registry.npmjs.org/tar/-/tar-6.1.8.tgz"; + sha512 = "sb9b0cp855NbkMJcskdSYA7b11Q8JsX4qe4pyUAfHp+Y6jBjJeek2ZVlwEfWayshEIwlIzXx0Fain3QG9JPm2A=="; }; }; "tar-fs-1.16.3" = { @@ -60802,13 +61099,13 @@ let sha512 = "gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w=="; }; }; - "tslib-2.3.0" = { + "tslib-2.3.1" = { name = "tslib"; packageName = "tslib"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz"; - sha512 = "N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="; + url = "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz"; + sha512 = "77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw=="; }; }; "tslint-5.20.1" = { @@ -61207,13 +61504,13 @@ let sha512 = "TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g=="; }; }; - "typed-rest-client-1.8.4" = { + "typed-rest-client-1.8.5" = { name = "typed-rest-client"; packageName = "typed-rest-client"; - version = "1.8.4"; + version = "1.8.5"; src = fetchurl { - url = "https://registry.npmjs.org/typed-rest-client/-/typed-rest-client-1.8.4.tgz"; - sha512 = "MyfKKYzk3I6/QQp6e1T50py4qg+c+9BzOEl2rBmQIpStwNUoqQ73An+Tkfy9YuV7O+o2mpVVJpe+fH//POZkbg=="; + url = "https://registry.npmjs.org/typed-rest-client/-/typed-rest-client-1.8.5.tgz"; + sha512 = "952/Aegu3lTqUAI1anbDLbewojnF/gh8at9iy1CIrfS1h/+MtNjB1Y9z6ZF5n2kZd+97em56lZ9uu7Zz3y/pwg=="; }; }; "typed-styles-0.0.7" = { @@ -63854,13 +64151,13 @@ let sha512 = "DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ=="; }; }; - "vfile-message-3.0.1" = { + "vfile-message-3.0.2" = { name = "vfile-message"; packageName = "vfile-message"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/vfile-message/-/vfile-message-3.0.1.tgz"; - sha512 = "gYmSHcZZUEtYpTmaWaFJwsuUD70/rTY4v09COp8TGtOkix6gGxb/a8iTQByIY9ciTk9GwAwIXd/J9OPfM4Bvaw=="; + url = "https://registry.npmjs.org/vfile-message/-/vfile-message-3.0.2.tgz"; + sha512 = "UUjZYIOg9lDRwwiBAuezLIsu9KlXntdxwG+nXnjuQAHvBpcX3x0eN8h+I7TkY5nkCXj+cWVp4ZqebtGBvok8ww=="; }; }; "vfile-reporter-1.5.0" = { @@ -64214,13 +64511,13 @@ let sha512 = "QW2SFk4kln5lTPQajGNuXWtmr2z9hVA6Sfi4qPFEW2vjt2XaUAp38/1OrcUQYiJXOyXntbWN2jZJaGxg+hDUxw=="; }; }; - "vscode-json-languageservice-4.1.6" = { + "vscode-json-languageservice-4.1.7" = { name = "vscode-json-languageservice"; packageName = "vscode-json-languageservice"; - version = "4.1.6"; + version = "4.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-4.1.6.tgz"; - sha512 = "DIKb3tcfRtb3tIE6g9SLOl5E9tNSt6kljH08Wa5RwFlVshtXGrDDzttchze4CYy9pJpE9mBtCbRHmLvY1Z1ZXA=="; + url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-4.1.7.tgz"; + sha512 = "cwG5TwZyHYthsk2aS3W1dVgVP6Vwn3o+zscwN58uMgZt/nKuyxd9vdEB1F58Ix+S5kSKAnkUCP6hvulcoImQQQ=="; }; }; "vscode-jsonrpc-3.5.0" = { @@ -64934,15 +65231,6 @@ let sha512 = "tB0F+ccobsfw5jTWBinWJKyd/YdCdRbKj+CFSnsJeEgFYysOULvWFYyeCxn9KuQvG/3UF1t3cTAcJzBec5LCWA=="; }; }; - "web-tree-sitter-0.16.4" = { - name = "web-tree-sitter"; - packageName = "web-tree-sitter"; - version = "0.16.4"; - src = fetchurl { - url = "https://registry.npmjs.org/web-tree-sitter/-/web-tree-sitter-0.16.4.tgz"; - sha512 = "n1CfuJcJ+dynIx/fmavB6haPx37N3GZvY5HIGIselymDiSwNRC+8pAxOzoB4eVwUBJnbP3+aA8vWttrAZbgs7A=="; - }; - }; "web-tree-sitter-0.17.1" = { name = "web-tree-sitter"; packageName = "web-tree-sitter"; @@ -64952,13 +65240,22 @@ let sha512 = "QgaeV+wmlB1Qaw9rS5a0ZDBt8GRcKkF+hGNSVxQ/HLm1lPCow3BKOhoILaXkYm7YozCcL7TjppRADBwFJugbuA=="; }; }; - "web3-utils-1.5.1" = { + "web-tree-sitter-0.19.4" = { + name = "web-tree-sitter"; + packageName = "web-tree-sitter"; + version = "0.19.4"; + src = fetchurl { + url = "https://registry.npmjs.org/web-tree-sitter/-/web-tree-sitter-0.19.4.tgz"; + sha512 = "8G0xBj05hqZybCqBtW7RPZ/hWEtP3DiLTauQzGJZuZYfVRgw7qj7iaZ+8djNqJ4VPrdOO+pS2dR1JsTbsLxdYg=="; + }; + }; + "web3-utils-1.5.2" = { name = "web3-utils"; packageName = "web3-utils"; - version = "1.5.1"; + version = "1.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/web3-utils/-/web3-utils-1.5.1.tgz"; - sha512 = "U8ULaMBwjkp9Rn+kRLjUmgAUHwPqDrM5/Q9tPKgvuDKtMWUggTLC33/KF8RY+PyAhSAlnD+lmNGfZnbjmVKBxQ=="; + url = "https://registry.npmjs.org/web3-utils/-/web3-utils-1.5.2.tgz"; + sha512 = "quTtTeQJHYSxAwIBOCGEcQtqdVcFWX6mCFNoqnp+mRbq+Hxbs8CGgO/6oqfBx4OvxIOfCpgJWYVHswRXnbEu9Q=="; }; }; "webassemblyjs-1.11.1" = { @@ -65078,13 +65375,13 @@ let sha512 = "NVWBaz9k839ZH/sinurM+HcDvJOTXwSjYp1ku+5XKeOC03z8v5QitnK/x+lAxGXFyhdayoIf/GOpv85z3/xPag=="; }; }; - "webpack-cli-4.7.2" = { + "webpack-cli-4.8.0" = { name = "webpack-cli"; packageName = "webpack-cli"; - version = "4.7.2"; + version = "4.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.7.2.tgz"; - sha512 = "mEoLmnmOIZQNiRl0ebnjzQ74Hk0iKS5SiEEnpq3dRezoyR3yPaeQZCMCe+db4524pj1Pd5ghZXjT41KLzIhSLw=="; + url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.8.0.tgz"; + sha512 = "+iBSWsX16uVna5aAYN6/wjhJy1q/GKk4KjKvfg90/6hykCTSgozbfz5iRgDTSJt/LgSbYxdBX3KBHeobIs+ZEw=="; }; }; "webpack-core-0.6.9" = { @@ -65258,13 +65555,13 @@ let sha512 = "OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg=="; }; }; - "webtorrent-1.3.9" = { + "webtorrent-1.3.10" = { name = "webtorrent"; packageName = "webtorrent"; - version = "1.3.9"; + version = "1.3.10"; src = fetchurl { - url = "https://registry.npmjs.org/webtorrent/-/webtorrent-1.3.9.tgz"; - sha512 = "K52E15SutGIgrBj0YzYNYgkuQMucKePdGk2zxMwLHtFh9sJ0KVPlQgkmORhSbJqC51cRVq/4Xt2jToZde8ioRQ=="; + url = "https://registry.npmjs.org/webtorrent/-/webtorrent-1.3.10.tgz"; + sha512 = "w0+y6YRyfdS37on5ialAyxpM8XzIB6nFWZOO1O9MgMzG8asLEa1uJ7aGfXoZ+030FCRj235eyhzlnTxYEWBvKg=="; }; }; "well-known-symbols-2.0.0" = { @@ -66086,13 +66383,13 @@ let sha512 = "kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg=="; }; }; - "ws-8.0.0" = { + "ws-8.1.0" = { name = "ws"; packageName = "ws"; - version = "8.0.0"; + version = "8.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-8.0.0.tgz"; - sha512 = "6AcSIXpBlS0QvCVKk+3cWnWElLsA6SzC0lkQ43ciEglgXJXiCWK3/CGFEJ+Ybgp006CMibamAsqOlxE9s4AvYA=="; + url = "https://registry.npmjs.org/ws/-/ws-8.1.0.tgz"; + sha512 = "0UWlCD2s3RSclw8FN+D0zDTUyMO+1kHwJQQJzkgUh16S8d3NYON0AKCEQPffE0ez4JyRFu76QDA9KR5bOG/7jw=="; }; }; "x-default-browser-0.3.1" = { @@ -66464,6 +66761,16 @@ let sha512 = "iAcin401y58LckRZ0TkI4k0VSM1Qg0KGSc3i8rU+xrxe19A/BN1zHyVSJY7uoutVlaTSzYyk/v5AmkewAP7jtg=="; }; }; + "xmldom-git://github.com/xmldom/xmldom#0.7.0" = { + name = "xmldom"; + packageName = "xmldom"; + version = "0.7.0"; + src = fetchgit { + url = "git://github.com/xmldom/xmldom"; + rev = "c568938641cc1f121cef5b4df80fcfda1e489b6e"; + sha256 = "98ae57c19ccf66bc4d67e649250f1c28adda223064fb3c8572d245cb5aa3d440"; + }; + }; "xmlhttprequest-1.8.0" = { name = "xmlhttprequest"; packageName = "xmlhttprequest"; @@ -66852,6 +67159,15 @@ let sha512 = "SQr7qqmQ2sNijjJGHL4u7t8vyDZdZ3Ahkmo4sc1w5xI9TBX0QDdG/g4SFnxtWOsGLjwHQue57eFALfwFCnixgg=="; }; }; + "yargs-17.1.1" = { + name = "yargs"; + packageName = "yargs"; + version = "17.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-17.1.1.tgz"; + sha512 = "c2k48R0PwKIqKhPMWjeiF6y2xY/gPMUlro0sgxqXpbOIohWiLNXWslsootttv7E1e73QPAMQSg5FeySbVcpsPQ=="; + }; + }; "yargs-3.10.0" = { name = "yargs"; packageName = "yargs"; @@ -67113,13 +67429,13 @@ let sha512 = "XIJoCQDNlttjFubWL+tpf+t1MkFUdsqwtJvR2qhfzhHi8Z7ZzAwiBPgCtTiLK1mwPTfqzV/V0E9l7zX7hrhBdg=="; }; }; - "yeoman-generator-5.4.0" = { + "yeoman-generator-5.4.1" = { name = "yeoman-generator"; packageName = "yeoman-generator"; - version = "5.4.0"; + version = "5.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/yeoman-generator/-/yeoman-generator-5.4.0.tgz"; - sha512 = "ZOzoe8pAenTw8q7X3TdG3u5S7EM/ErCNue7Jvcb/ZDfank6Nnu3J249PtgTbyAuN+VYVZ/VVFIAJxjlrqJpldQ=="; + url = "https://registry.npmjs.org/yeoman-generator/-/yeoman-generator-5.4.1.tgz"; + sha512 = "ZlO++ByvxiapJo3TZy1/Bx5S2LRnNoQ7IMnJRjMtP6bWP1BldfoPMJAP4PztQOc6okufBFDUVR9Yjt6MB2G9YA=="; }; }; "yesno-0.3.1" = { @@ -67299,22 +67615,22 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "12.2.0"; + version = "12.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-12.2.0.tgz"; - sha512 = "gxw4e3Wb1YgNE+f9sX90xea5vXatqvlYq3mOWFUWVKYcayAgnt9z97a1ULEkSytS1aVjyL44zzkU/QFufPpadQ=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-12.2.1.tgz"; + sha512 = "D0SMVRLEYOEJYaxWm4a5TjQzfQt4BI8R9Dz/Dk/FNFtiuFyaRgbrFgicLF8ePyHWzmHi+KN9i5bgBcWMEtY5SQ=="; }; dependencies = [ - sources."@angular-devkit/architect-0.1202.0" - sources."@angular-devkit/core-12.2.0" - sources."@angular-devkit/schematics-12.2.0" + sources."@angular-devkit/architect-0.1202.1" + sources."@angular-devkit/core-12.2.1" + sources."@angular-devkit/schematics-12.2.1" 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.2.0" + sources."@schematics/angular-12.2.1" sources."@tootallnate/once-1.1.2" sources."@yarnpkg/lockfile-1.1.0" sources."abbrev-1.1.1" @@ -67535,7 +67851,7 @@ in sources."strip-ansi-6.0.0" sources."supports-color-7.2.0" sources."symbol-observable-4.0.0" - sources."tar-6.1.7" + sources."tar-6.1.8" sources."through-2.3.8" sources."tmp-0.0.33" sources."tough-cookie-2.5.0" @@ -68091,7 +68407,7 @@ in sources."@hyperswarm/hypersign-2.1.1" sources."@hyperswarm/network-2.1.0" sources."@leichtgewicht/ip-codec-2.0.3" - sources."@types/node-16.4.13" + sources."@types/node-16.6.1" sources."abstract-extension-3.1.1" sources."abstract-leveldown-6.2.3" sources."ansi-colors-3.2.3" @@ -68240,7 +68556,7 @@ in sources."hrpc-2.2.0" sources."hrpc-runtime-2.1.1" sources."hyperbeam-1.1.3" - sources."hyperbee-1.5.5" + sources."hyperbee-1.6.2" sources."hypercore-9.10.0" (sources."hypercore-byte-stream-1.0.12" // { dependencies = [ @@ -68281,7 +68597,7 @@ in sources."inspect-custom-symbol-1.1.1" sources."internal-slot-1.0.3" sources."ipv4-peers-2.0.0" - sources."is-bigint-1.0.3" + sources."is-bigint-1.0.4" sources."is-binary-path-2.1.0" sources."is-boolean-object-1.1.2" sources."is-buffer-2.0.5" @@ -68401,7 +68717,7 @@ in sources."progress-string-1.2.2" sources."protocol-buffers-4.2.0" sources."protocol-buffers-encodings-1.1.1" - sources."protocol-buffers-schema-3.5.1" + sources."protocol-buffers-schema-3.5.2" sources."prr-1.0.1" sources."pseudomap-1.0.2" sources."pump-3.0.0" @@ -68625,7 +68941,7 @@ in sources."@types/eslint-scope-3.7.1" sources."@types/estree-0.0.50" sources."@types/json-schema-7.0.9" - sources."@types/node-16.4.13" + sources."@types/node-16.6.1" sources."@types/parse-json-4.0.0" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" @@ -68664,7 +68980,7 @@ in sources."buffer-5.7.1" sources."buffer-from-1.1.2" sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001249" + sources."caniuse-lite-1.0.30001251" sources."chalk-3.0.0" sources."chardet-0.7.0" sources."chokidar-3.5.2" @@ -68691,7 +69007,7 @@ in sources."cross-spawn-7.0.3" sources."deepmerge-4.2.2" sources."defaults-1.0.3" - sources."electron-to-chromium-1.3.801" + sources."electron-to-chromium-1.3.806" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" (sources."enhanced-resolve-5.8.2" // { @@ -68964,9 +69280,9 @@ in sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/helper-validator-option-7.14.5" sources."@babel/helper-wrap-function-7.14.5" - sources."@babel/helpers-7.14.8" + sources."@babel/helpers-7.15.3" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.15.2" + sources."@babel/parser-7.15.3" 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" @@ -69002,7 +69318,7 @@ in sources."@babel/plugin-transform-arrow-functions-7.14.5" sources."@babel/plugin-transform-async-to-generator-7.14.5" sources."@babel/plugin-transform-block-scoped-functions-7.14.5" - sources."@babel/plugin-transform-block-scoping-7.14.5" + sources."@babel/plugin-transform-block-scoping-7.15.3" sources."@babel/plugin-transform-classes-7.14.9" sources."@babel/plugin-transform-computed-properties-7.14.5" sources."@babel/plugin-transform-destructuring-7.14.7" @@ -69037,14 +69353,14 @@ in sources."@babel/preset-flow-7.14.5" sources."@babel/preset-modules-0.1.4" sources."@babel/preset-typescript-7.15.0" - (sources."@babel/register-7.14.5" // { + (sources."@babel/register-7.15.3" // { dependencies = [ sources."make-dir-2.1.0" sources."pify-4.0.1" sources."semver-5.7.1" ]; }) - sources."@babel/runtime-7.14.8" + sources."@babel/runtime-7.15.3" sources."@babel/template-7.14.5" sources."@babel/traverse-7.15.0" sources."@babel/types-7.15.0" @@ -69100,7 +69416,7 @@ in sources."@types/long-4.0.1" sources."@types/mime-1.3.2" sources."@types/minimatch-3.0.5" - sources."@types/node-16.4.13" + sources."@types/node-16.6.1" sources."@types/normalize-package-data-2.4.1" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" @@ -69115,13 +69431,13 @@ in }) sources."@vue/cli-ui-addon-webpack-4.5.13" sources."@vue/cli-ui-addon-widgets-4.5.13" - (sources."@vue/compiler-core-3.2.1" // { + (sources."@vue/compiler-core-3.2.2" // { dependencies = [ sources."source-map-0.6.1" ]; }) - sources."@vue/compiler-dom-3.2.1" - sources."@vue/shared-3.2.1" + sources."@vue/compiler-dom-3.2.2" + sources."@vue/shared-3.2.2" sources."@wry/equality-0.1.11" sources."accepts-1.3.7" sources."aggregate-error-3.1.0" @@ -69243,7 +69559,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.30001249" + sources."caniuse-lite-1.0.30001251" sources."caseless-0.12.0" sources."caw-2.0.1" sources."chalk-2.4.2" @@ -69371,7 +69687,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.801" + sources."electron-to-chromium-1.3.806" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -69508,7 +69824,7 @@ in sources."graphql-subscriptions-1.2.1" (sources."graphql-tag-2.12.5" // { dependencies = [ - sources."tslib-2.3.0" + sources."tslib-2.3.1" ]; }) sources."graphql-tools-4.0.8" @@ -69563,7 +69879,7 @@ in sources."ipaddr.js-1.9.1" sources."is-accessor-descriptor-1.0.0" sources."is-arrayish-0.2.1" - sources."is-bigint-1.0.3" + sources."is-bigint-1.0.4" sources."is-boolean-object-1.1.2" sources."is-buffer-1.1.6" sources."is-callable-1.2.4" @@ -69615,7 +69931,7 @@ in sources."ast-types-0.14.2" sources."recast-0.20.5" sources."source-map-0.6.1" - sources."tslib-2.3.0" + sources."tslib-2.3.1" ]; }) sources."jsesc-2.5.2" @@ -70270,7 +70586,7 @@ in sources."@babel/generator-7.15.0" sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.15.2" + sources."@babel/parser-7.15.3" sources."@babel/template-7.14.5" sources."@babel/types-7.15.0" sources."@webassemblyjs/ast-1.11.1" @@ -70371,9 +70687,9 @@ in 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/helpers-7.15.3" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.15.2" + sources."@babel/parser-7.15.3" sources."@babel/template-7.14.5" sources."@babel/traverse-7.15.0" sources."@babel/types-7.15.0" @@ -70384,7 +70700,7 @@ in sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."browserslist-4.16.7" - sources."caniuse-lite-1.0.30001249" + sources."caniuse-lite-1.0.30001251" sources."chalk-2.4.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" @@ -70395,7 +70711,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.801" + sources."electron-to-chromium-1.3.806" sources."ensure-posix-path-1.1.1" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" @@ -70489,7 +70805,7 @@ in dependencies = [ sources."@types/glob-7.1.4" sources."@types/minimatch-3.0.5" - sources."@types/node-16.4.13" + sources."@types/node-16.6.1" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."chromium-pickle-js-0.2.0" @@ -70524,9 +70840,9 @@ in }; dependencies = [ sources."browserslist-4.16.7" - sources."caniuse-lite-1.0.30001249" + sources."caniuse-lite-1.0.30001251" sources."colorette-1.3.0" - sources."electron-to-chromium-1.3.801" + sources."electron-to-chromium-1.3.806" sources."escalade-3.1.1" sources."fraction.js-4.1.1" sources."node-releases-1.1.74" @@ -70553,14 +70869,14 @@ in }; dependencies = [ sources."@tootallnate/once-1.1.2" - sources."@types/node-16.4.13" + sources."@types/node-16.6.1" sources."@types/yauzl-2.9.2" sources."agent-base-6.0.2" sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" sources."ast-types-0.13.4" - (sources."aws-sdk-2.964.0" // { + (sources."aws-sdk-2.968.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -70728,7 +71044,7 @@ in sources."through-2.3.8" sources."tmp-0.0.33" sources."toidentifier-1.0.0" - sources."tslib-2.3.0" + sources."tslib-2.3.1" sources."type-check-0.3.2" sources."type-fest-0.21.3" (sources."unbzip2-stream-1.3.3" // { @@ -70764,10 +71080,10 @@ in balanceofsatoshis = nodeEnv.buildNodePackage { name = "balanceofsatoshis"; packageName = "balanceofsatoshis"; - version = "10.7.6"; + version = "10.7.8"; src = fetchurl { - url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-10.7.6.tgz"; - sha512 = "dzYzWcLVcwbHwKfTp60ml7IYvWOmX6rD2rC/J9A2HT6VzefbcQ4/59YdzoPRhdlvmhblvj17jwExN0xQxOQJhQ=="; + url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-10.7.8.tgz"; + sha512 = "lBtaJP9EmDdvaYcsjvKhkS84sG79uZwhhoZ/Xb8Onj1FS8zwLPWFqzpRZ1SJ32COq9aJUWumLD+6LCnWH6Xbsg=="; }; dependencies = [ sources."@alexbosworth/html2unicode-1.1.5" @@ -70780,7 +71096,7 @@ in sources."@cto.af/textdecoder-0.0.0" (sources."@grpc/grpc-js-1.3.2" // { dependencies = [ - sources."@types/node-16.4.13" + sources."@types/node-16.6.1" ]; }) sources."@grpc/proto-loader-0.6.2" @@ -70844,8 +71160,12 @@ in sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."astral-regex-2.0.0" - sources."async-3.2.0" - sources."asyncjs-util-1.2.6" + sources."async-3.2.1" + (sources."asyncjs-util-1.2.6" // { + dependencies = [ + sources."async-3.2.0" + ]; + }) sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" sources."aws4-1.9.1" @@ -70946,7 +71266,7 @@ in sources."code-point-at-1.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."colorette-1.2.2" + sources."colorette-1.3.0" sources."colors-1.4.0" sources."combined-stream-1.0.8" sources."commander-6.2.1" @@ -71027,6 +71347,7 @@ in sources."global-dirs-3.0.0" (sources."goldengate-10.1.0" // { dependencies = [ + sources."async-3.2.0" sources."bech32-2.0.0" sources."bn.js-5.2.0" sources."cbor-7.0.5" @@ -71122,13 +71443,14 @@ in sources."json2csv-5.0.6" sources."jsonparse-1.3.1" sources."jsprim-1.4.1" - sources."jstat-1.9.4" + sources."jstat-1.9.5" sources."keyv-3.1.0" sources."kind-of-6.0.3" sources."latest-version-5.1.0" (sources."lightning-3.3.9" // { dependencies = [ sources."@types/node-15.6.1" + sources."async-3.2.0" sources."bech32-2.0.0" sources."bn.js-5.2.0" sources."cbor-7.0.5" @@ -71142,6 +71464,7 @@ in sources."@grpc/proto-loader-0.6.3" sources."@types/node-15.12.5" sources."@types/ws-7.4.5" + sources."async-3.2.0" sources."bn.js-5.2.0" sources."cbor-7.0.5" sources."lightning-3.3.12" @@ -71150,20 +71473,18 @@ in sources."ws-7.5.0" ]; }) - (sources."ln-service-51.10.1" // { + (sources."ln-service-52.0.0" // { dependencies = [ - sources."@grpc/grpc-js-1.3.6" + sources."@grpc/grpc-js-1.3.7" sources."@grpc/proto-loader-0.6.4" sources."@types/express-4.17.13" - sources."@types/node-16.4.3" - sources."@types/request-2.48.6" + sources."@types/node-16.6.0" + sources."@types/request-2.48.7" sources."@types/ws-7.4.7" sources."bn.js-5.2.0" - sources."cbor-7.0.6" sources."form-data-2.5.1" - sources."lightning-3.5.0" - sources."nofilter-2.0.3" - sources."ws-8.0.0" + sources."lightning-4.0.0" + sources."ws-8.1.0" ]; }) (sources."ln-sync-0.4.7" // { @@ -71174,42 +71495,16 @@ in sources."@types/node-16.3.3" sources."@types/request-2.48.6" sources."@types/ws-7.4.7" + sources."async-3.2.0" sources."bn.js-5.2.0" sources."cbor-7.0.6" + sources."colorette-1.2.2" sources."form-data-2.5.1" sources."lightning-3.4.0" sources."nofilter-2.0.3" ]; }) - (sources."ln-telegram-3.2.9" // { - dependencies = [ - sources."@grpc/grpc-js-1.3.5" - sources."@grpc/proto-loader-0.6.4" - sources."@types/express-4.17.13" - sources."@types/node-16.3.2" - sources."@types/request-2.48.6" - sources."@types/ws-7.4.6" - sources."bn.js-5.2.0" - sources."cbor-7.0.6" - sources."form-data-2.5.1" - sources."lightning-3.3.16" - sources."ln-service-51.9.0" - (sources."ln-sync-0.4.6" // { - dependencies = [ - sources."@grpc/grpc-js-1.3.4" - sources."@grpc/proto-loader-0.6.3" - sources."@types/express-4.17.12" - sources."@types/node-15.12.5" - sources."@types/request-2.48.5" - sources."@types/ws-7.4.5" - sources."cbor-7.0.5" - sources."lightning-3.3.12" - ]; - }) - sources."nofilter-2.0.3" - sources."ws-7.5.3" - ]; - }) + sources."ln-telegram-3.2.10" sources."lodash-4.17.21" sources."lodash.camelcase-4.3.0" sources."lodash.clonedeep-4.5.0" @@ -71230,7 +71525,7 @@ in sources."long-4.0.0" sources."lowercase-keys-1.0.1" sources."lru-cache-6.0.0" - sources."luxon-2.0.1" + sources."luxon-2.0.2" (sources."macaroon-3.0.4" // { dependencies = [ sources."tweetnacl-1.0.3" @@ -71307,6 +71602,7 @@ in sources."@grpc/proto-loader-0.6.3" sources."@types/node-15.12.5" sources."@types/ws-7.4.5" + sources."async-3.2.0" sources."bn.js-5.2.0" sources."cbor-7.0.5" sources."lightning-3.3.12" @@ -71324,6 +71620,7 @@ in sources."prettyjson-1.2.1" (sources."probing-1.3.6" // { dependencies = [ + sources."async-3.2.0" sources."bech32-2.0.0" sources."bn.js-5.2.0" sources."invoices-1.2.1" @@ -71333,7 +71630,7 @@ in sources."process-nextick-args-2.0.1" (sources."protobufjs-6.11.2" // { dependencies = [ - sources."@types/node-16.4.13" + sources."@types/node-16.6.1" ]; }) sources."proxy-addr-2.0.7" @@ -71523,10 +71820,10 @@ in bash-language-server = nodeEnv.buildNodePackage { name = "bash-language-server"; packageName = "bash-language-server"; - version = "1.17.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/bash-language-server/-/bash-language-server-1.17.0.tgz"; - sha512 = "t80ktUFL9DPaTO7yydoNYXIDKINweWbFvvUXesltmWj7UaIyepIVRAWUp4+62udJtor1VxVFEAXnsVDA640flw=="; + url = "https://registry.npmjs.org/bash-language-server/-/bash-language-server-2.0.0.tgz"; + sha512 = "yp6KF2GCVgj64kU2qknE+CFydb8IHc+2ZTRFc6UrN8FugOAHEfO7PzkxfJ/SDWbqa7wIJyjdEFtbTOy/qbHtbQ=="; }; dependencies = [ sources."abab-2.0.5" @@ -71640,7 +71937,7 @@ in sources."vscode-languageserver-textdocument-1.0.1" sources."vscode-languageserver-types-3.16.0" sources."w3c-hr-time-1.0.2" - sources."web-tree-sitter-0.16.4" + sources."web-tree-sitter-0.19.4" sources."webidl-conversions-4.0.2" sources."whatwg-encoding-1.0.5" sources."whatwg-mimetype-2.3.0" @@ -72087,7 +72384,7 @@ in sources."insert-module-globals-7.2.1" sources."internal-slot-1.0.3" sources."is-arguments-1.1.1" - sources."is-bigint-1.0.3" + sources."is-bigint-1.0.4" sources."is-boolean-object-1.1.2" sources."is-buffer-1.1.6" sources."is-callable-1.2.4" @@ -72219,7 +72516,7 @@ 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.15.2" + sources."@babel/parser-7.15.3" sources."@babel/types-7.15.0" sources."@kwsites/file-exists-1.1.1" sources."@kwsites/promise-deferred-1.1.1" @@ -72591,7 +72888,7 @@ in sources."set-blocking-2.0.0" sources."setprototypeof-1.1.1" sources."sha.js-2.4.11" - sources."simple-git-2.42.0" + sources."simple-git-2.44.0" sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" @@ -72681,7 +72978,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-16.4.13" + sources."@types/node-16.6.1" sources."addr-to-ip-port-1.5.4" sources."airplay-js-0.2.16" sources."ajv-6.12.6" @@ -73083,13 +73380,14 @@ in cdk8s-cli = nodeEnv.buildNodePackage { name = "cdk8s-cli"; packageName = "cdk8s-cli"; - version = "1.0.0-beta.35"; + version = "1.0.0-beta.37"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.0-beta.35.tgz"; - sha512 = "gmIhIZyAJyEi/2GV6wmLF/HGswJK+pxWijH1jS/WPgcJHRaeaIMysrdsCWpucVA6Zz/OwgrmG1Fp09gZAKdskw=="; + url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.0-beta.37.tgz"; + sha512 = "0xRmM6/5EwTbzpqinQujvrVZKJhTkLfD8hXEuSASNAv/5uKLRa5pfdOD53ALq7n0eVeOqZaGNtwKhGRcPuNDxw=="; }; dependencies = [ - sources."@jsii/spec-1.32.0" + sources."@jsii/check-node-1.33.0" + sources."@jsii/spec-1.33.0" sources."@types/node-10.17.60" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" @@ -73100,9 +73398,10 @@ in sources."case-1.6.3" sources."cdk8s-1.0.0-beta.27" sources."cdk8s-plus-17-1.0.0-beta.42" + sources."chalk-4.1.2" sources."cliui-7.0.4" sources."clone-2.1.2" - (sources."codemaker-1.32.0" // { + (sources."codemaker-1.33.0" // { dependencies = [ sources."fs-extra-9.1.0" ]; @@ -73110,8 +73409,8 @@ in sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."colors-1.4.0" - sources."commonmark-0.29.3" - sources."constructs-3.3.118" + sources."commonmark-0.30.0" + sources."constructs-3.3.124" sources."date-format-3.0.0" sources."debug-4.3.2" sources."decamelize-5.0.0" @@ -73142,11 +73441,12 @@ in sources."graceful-fs-4.2.8" sources."has-1.0.3" sources."has-bigints-1.0.1" + sources."has-flag-4.0.0" sources."has-symbols-1.0.2" sources."has-tostringtag-1.0.0" sources."internal-slot-1.0.3" sources."is-arguments-1.1.1" - sources."is-bigint-1.0.3" + sources."is-bigint-1.0.4" sources."is-boolean-object-1.1.2" sources."is-callable-1.2.4" sources."is-date-object-1.0.5" @@ -73162,37 +73462,37 @@ in sources."is-weakmap-2.0.1" sources."is-weakset-2.0.1" sources."isarray-2.0.5" - (sources."jsii-1.32.0" // { + (sources."jsii-1.33.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-pacmak-1.32.0" // { + (sources."jsii-pacmak-1.33.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-reflect-1.32.0" // { + (sources."jsii-reflect-1.33.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-rosetta-1.32.0" // { + (sources."jsii-rosetta-1.33.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.320" // { + (sources."jsii-srcmak-0.1.326" // { dependencies = [ sources."fs-extra-9.1.0" ]; }) sources."json-schema-0.3.0" - sources."json2jsii-0.1.290" + sources."json2jsii-0.1.296" sources."jsonfile-6.1.0" sources."jsonschema-1.4.0" sources."locate-path-5.0.0" @@ -73208,7 +73508,7 @@ in sources."object-is-1.1.5" sources."object-keys-1.1.1" sources."object.assign-4.1.2" - sources."oo-ascii-tree-1.32.0" + sources."oo-ascii-tree-1.33.0" sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" @@ -73228,7 +73528,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.41" + sources."sscaff-1.2.47" (sources."streamroller-2.2.4" // { dependencies = [ sources."date-format-2.1.0" @@ -73239,7 +73539,8 @@ in sources."string.prototype.trimend-1.0.4" sources."string.prototype.trimstart-1.0.4" sources."strip-ansi-6.0.0" - sources."tslib-2.3.0" + sources."supports-color-7.2.0" + sources."tslib-2.3.1" sources."typescript-3.9.10" sources."unbox-primitive-1.0.1" sources."universalify-2.0.0" @@ -73249,7 +73550,7 @@ in sources."which-typed-array-1.1.6" sources."wrap-ansi-7.0.0" sources."xmlbuilder-15.1.1" - sources."xmldom-0.6.0" + sources."xmldom-git://github.com/xmldom/xmldom#0.7.0" sources."y18n-5.0.8" sources."yallist-4.0.0" sources."yaml-1.10.2" @@ -73304,7 +73605,7 @@ in sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.15.2" + sources."@babel/parser-7.15.3" sources."@babel/template-7.14.5" sources."@babel/types-7.15.0" sources."@cdktf/hcl2cdk-0.5.0" @@ -73329,16 +73630,15 @@ in sources."@graphql-tools/utils-8.0.2" ]; }) - (sources."@graphql-tools/mock-8.1.8" // { + (sources."@graphql-tools/mock-8.2.1" // { dependencies = [ - sources."@graphql-tools/merge-7.0.0" - sources."@graphql-tools/utils-8.0.2" + sources."@graphql-tools/utils-8.1.1" ]; }) - (sources."@graphql-tools/schema-8.0.3" // { + (sources."@graphql-tools/schema-8.1.1" // { dependencies = [ - sources."@graphql-tools/merge-7.0.0" - sources."@graphql-tools/utils-8.0.2" + sources."@graphql-tools/merge-8.0.1" + sources."@graphql-tools/utils-8.1.1" ]; }) (sources."@graphql-tools/utils-7.10.0" // { @@ -73348,7 +73648,8 @@ in }) sources."@graphql-typed-document-node/core-3.1.0" sources."@josephg/resolvable-1.0.1" - sources."@jsii/spec-1.32.0" + sources."@jsii/check-node-1.33.0" + sources."@jsii/spec-1.33.0" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -73403,7 +73704,7 @@ in sources."apollo-server-caching-3.0.1" (sources."apollo-server-core-3.1.2" // { dependencies = [ - sources."@graphql-tools/utils-8.0.2" + sources."@graphql-tools/utils-8.1.1" ]; }) sources."apollo-server-env-4.0.3" @@ -73484,14 +73785,14 @@ in sources."colors-1.4.0" sources."combined-stream-1.0.8" sources."commander-2.20.3" - sources."commonmark-0.29.3" + sources."commonmark-0.30.0" (sources."compress-commons-4.1.1" // { dependencies = [ sources."normalize-path-3.0.0" ]; }) sources."concat-map-0.0.1" - sources."constructs-3.3.118" + sources."constructs-3.3.124" (sources."content-disposition-0.5.3" // { dependencies = [ sources."safe-buffer-5.1.2" @@ -73632,7 +73933,7 @@ in sources."internal-slot-1.0.3" sources."ipaddr.js-1.9.1" sources."is-arguments-1.1.1" - sources."is-bigint-1.0.3" + sources."is-bigint-1.0.4" sources."is-binary-path-2.1.0" sources."is-boolean-object-1.1.2" sources."is-callable-1.2.4" @@ -73663,35 +73964,35 @@ in sources."iterall-1.3.0" sources."js-tokens-4.0.0" sources."jsesc-2.5.2" - (sources."jsii-1.32.0" // { + (sources."jsii-1.33.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-pacmak-1.32.0" // { + (sources."jsii-pacmak-1.33.0" // { dependencies = [ sources."clone-2.1.2" - sources."codemaker-1.32.0" + sources."codemaker-1.33.0" sources."decamelize-5.0.0" sources."escape-string-regexp-4.0.0" sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-reflect-1.32.0" // { + (sources."jsii-reflect-1.33.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-rosetta-1.32.0" // { + (sources."jsii-rosetta-1.33.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.320" // { + (sources."jsii-srcmak-0.1.326" // { dependencies = [ sources."fs-extra-9.1.0" ]; @@ -73756,7 +74057,7 @@ in sources."on-finished-2.3.0" sources."once-1.4.0" sources."onetime-5.1.2" - sources."oo-ascii-tree-1.32.0" + sources."oo-ascii-tree-1.33.0" sources."open-7.4.2" sources."optimism-0.16.1" sources."ora-5.4.1" @@ -73792,7 +74093,7 @@ in sources."range-parser-1.2.1" sources."raw-body-2.4.0" sources."react-16.14.0" - sources."react-devtools-core-4.14.0" + sources."react-devtools-core-4.15.0" sources."react-is-16.13.1" sources."react-reconciler-0.24.0" sources."readable-stream-3.6.0" @@ -73849,7 +74150,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.41" + sources."sscaff-1.2.47" (sources."stack-utils-2.0.3" // { dependencies = [ sources."escape-string-regexp-2.0.0" @@ -73889,7 +74190,7 @@ in sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" sources."ts-invariant-0.9.1" - sources."tslib-2.3.0" + sources."tslib-2.3.1" sources."type-fest-0.15.1" sources."type-is-1.6.18" sources."typescript-3.9.10" @@ -73921,7 +74222,7 @@ in sources."wrappy-1.0.2" sources."ws-7.5.3" sources."xmlbuilder-15.1.1" - sources."xmldom-0.6.0" + sources."xmldom-git://github.com/xmldom/xmldom#0.7.0" sources."xss-1.0.9" sources."y18n-5.0.8" sources."yallist-4.0.0" @@ -74227,10 +74528,10 @@ in coc-diagnostic = nodeEnv.buildNodePackage { name = "coc-diagnostic"; packageName = "coc-diagnostic"; - version = "0.21.0"; + version = "0.21.2"; src = fetchurl { - url = "https://registry.npmjs.org/coc-diagnostic/-/coc-diagnostic-0.21.0.tgz"; - sha512 = "donSKELS/XuVyTpYrfuQDXej340xKZDknKyek4+4ThDYU7Xh5mVeITarDEbi882su0xQBYQsSSwy3zYDocQy7w=="; + url = "https://registry.npmjs.org/coc-diagnostic/-/coc-diagnostic-0.21.2.tgz"; + sha512 = "KqwsIOrPFWgrNA16PAosZlpHLdfv9YpxcaKGcPBpCRFl+QZqOlrxlHnPLb+8jsLLrxo8QnROa+6RWoCUZWo9Rw=="; }; buildInputs = globalBuildInputs; meta = { @@ -74398,7 +74699,7 @@ in dependencies = [ sources."isexe-2.0.0" sources."node-fetch-2.6.1" - sources."tslib-2.3.0" + sources."tslib-2.3.1" sources."vscode-languageserver-textdocument-1.0.1" sources."vscode-uri-3.0.2" sources."which-2.0.2" @@ -74522,7 +74823,7 @@ in sources."ms-2.0.0" sources."request-light-0.4.0" sources."vscode-json-languageserver-1.3.4" - (sources."vscode-json-languageservice-4.1.6" // { + (sources."vscode-json-languageservice-4.1.7" // { dependencies = [ sources."vscode-nls-5.0.0" ]; @@ -74589,7 +74890,7 @@ in sha512 = "EiD4lpcGW2WyzxEDpRMYPrjxAa0FhG69SzDoc1KbDht2Do/vgnRzvrtIsufPT14dALAesieN3kVVMCCfA9S6jA=="; }; dependencies = [ - sources."@chemzqm/neovim-5.3.4" + sources."@chemzqm/neovim-5.3.5" sources."@tootallnate/once-1.1.2" sources."agent-base-6.0.2" sources."arch-2.2.0" @@ -74660,7 +74961,7 @@ in sources."ini-1.3.8" sources."int64-buffer-0.1.10" sources."internal-slot-1.0.3" - sources."is-bigint-1.0.3" + sources."is-bigint-1.0.4" sources."is-boolean-object-1.1.2" sources."is-callable-1.2.4" sources."is-date-object-1.0.5" @@ -74740,9 +75041,9 @@ in sources."string_decoder-1.1.1" sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" - sources."tar-6.1.7" + sources."tar-6.1.8" sources."traverse-0.3.9" - sources."tslib-2.3.0" + sources."tslib-2.3.1" sources."unbox-primitive-1.0.1" sources."universalify-0.1.2" sources."unzipper-0.10.11" @@ -74878,7 +75179,7 @@ in sources."callsites-3.1.0" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" - sources."caniuse-lite-1.0.30001249" + sources."caniuse-lite-1.0.30001251" sources."capture-stack-trace-1.0.1" sources."ccount-1.1.0" (sources."chalk-4.1.2" // { @@ -74976,7 +75277,7 @@ in sources."domutils-1.7.0" sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.801" + sources."electron-to-chromium-1.3.806" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."enquirer-2.3.6" @@ -75117,7 +75418,7 @@ in sources."glob-parent-5.1.2" sources."glob-to-regexp-0.3.0" sources."global-dirs-0.1.1" - sources."globals-13.10.0" + sources."globals-13.11.0" (sources."globby-6.1.0" // { dependencies = [ sources."pify-2.3.0" @@ -75775,13 +76076,13 @@ in coc-pyright = nodeEnv.buildNodePackage { name = "coc-pyright"; packageName = "coc-pyright"; - version = "1.1.161"; + version = "1.1.162"; src = fetchurl { - url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.161.tgz"; - sha512 = "CFWLqQ3t0o73tioZHqJip0avZ7K9p9sBCMz81voAkBDoaSvUvrqT/SGpbhwXjzsvwBF6H1WY9aEK8FDMVAh+XA=="; + url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.162.tgz"; + sha512 = "FD/aHp65QH2dDH3+0vdEPfJi7BVndL6DFa1OF+87OHQZ+wCuMPfFWcd1/izj8y907cpwv1/nCg9y/lvxJfrrRg=="; }; dependencies = [ - sources."pyright-1.1.161" + sources."pyright-1.1.162" ]; buildInputs = globalBuildInputs; meta = { @@ -75855,10 +76156,10 @@ in coc-rust-analyzer = nodeEnv.buildNodePackage { name = "coc-rust-analyzer"; packageName = "coc-rust-analyzer"; - version = "0.48.0"; + version = "0.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.48.0.tgz"; - sha512 = "qI+bODEl34n6dFTrbQoc5kjXhRUCLxVhfs0TFvz3iqKBj4Yz9lI5fYxH76DXce9ETlTQNQDt1XQVycC5pPyUdA=="; + url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.49.0.tgz"; + sha512 = "NVERNgvvYwGR4sIopZhMbUkRpr0uaGTukU6BWgUvt6BZghn+Es25xqDmruuZK5iXt8Kvd77jM2XkqXImHJDyWQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -75891,10 +76192,10 @@ in coc-snippets = nodeEnv.buildNodePackage { name = "coc-snippets"; packageName = "coc-snippets"; - version = "2.4.3"; + version = "2.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/coc-snippets/-/coc-snippets-2.4.3.tgz"; - sha512 = "1vIMSDI8zKbr7J/jD4Ey9EFfYnipRaYzbaY9WZHnStEb0H2M/obIjwl5k9gRFGfJV00vB7zDpHp19FXLXVqzhQ=="; + url = "https://registry.npmjs.org/coc-snippets/-/coc-snippets-2.4.4.tgz"; + sha512 = "vlb40ZzIob1sjxzMZL484QT+hlsxKto2oZ6w+dnr45CyWJE/OL+fIlBMiy+xELYuxLXxkfLy1dz8d3N4PDy57A=="; }; buildInputs = globalBuildInputs; meta = { @@ -75948,13 +76249,13 @@ in 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/helpers-7.15.3" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.15.2" + sources."@babel/parser-7.15.3" sources."@babel/template-7.14.5" sources."@babel/traverse-7.15.0" sources."@babel/types-7.15.0" @@ -75987,7 +76288,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001249" + sources."caniuse-lite-1.0.30001251" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -76025,7 +76326,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.801" + sources."electron-to-chromium-1.3.806" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -76399,10 +76700,10 @@ in coc-tsserver = nodeEnv.buildNodePackage { name = "coc-tsserver"; packageName = "coc-tsserver"; - version = "1.8.3"; + version = "1.8.5"; src = fetchurl { - url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.8.3.tgz"; - sha512 = "dOvu5TY1zuZ/d7l/v3pGhbgYrhBVQSsmTiLNUL1dYzXCuVUuzNNm5CzZcr8yLTr3diCPU2eavLKs8iBwBvs/8g=="; + url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.8.5.tgz"; + sha512 = "wFjtKm9KeXOpI/po5unbnju1H6/pm1wT3fHHfNo3LYF5PVKgz39Suvv09XCEAUSBC5PPu8wXNZLoBeVRMI4yuQ=="; }; dependencies = [ sources."typescript-4.3.5" @@ -76512,7 +76813,7 @@ in sources."functional-red-black-tree-1.0.1" sources."glob-7.1.7" sources."glob-parent-5.1.2" - sources."globals-13.10.0" + sources."globals-13.11.0" sources."has-1.0.3" sources."has-flag-3.0.0" sources."ignore-4.0.6" @@ -77401,7 +77702,7 @@ in sources."strip-json-comments-2.0.1" sources."supports-color-7.2.0" sources."systeminformation-4.34.23" - sources."tar-6.1.7" + sources."tar-6.1.8" sources."term-size-2.2.1" sources."through-2.3.8" sources."tmp-0.2.1" @@ -77492,7 +77793,7 @@ in sources."@types/glob-7.1.4" sources."@types/minimatch-3.0.5" sources."@types/minimist-1.2.2" - sources."@types/node-16.4.13" + sources."@types/node-16.6.1" sources."@types/normalize-package-data-2.4.1" sources."aggregate-error-3.1.0" sources."ansi-styles-3.2.1" @@ -77863,7 +78164,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.2" - sources."@types/node-16.4.13" + sources."@types/node-16.6.1" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -78876,9 +79177,9 @@ in sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/helper-validator-option-7.14.5" sources."@babel/helper-wrap-function-7.14.5" - sources."@babel/helpers-7.14.8" + sources."@babel/helpers-7.15.3" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.15.2" + sources."@babel/parser-7.15.3" 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" @@ -78913,7 +79214,7 @@ in sources."@babel/plugin-transform-arrow-functions-7.14.5" sources."@babel/plugin-transform-async-to-generator-7.14.5" sources."@babel/plugin-transform-block-scoped-functions-7.14.5" - sources."@babel/plugin-transform-block-scoping-7.14.5" + sources."@babel/plugin-transform-block-scoping-7.15.3" sources."@babel/plugin-transform-classes-7.14.9" sources."@babel/plugin-transform-computed-properties-7.14.5" sources."@babel/plugin-transform-destructuring-7.14.7" @@ -78949,7 +79250,7 @@ in sources."@babel/preset-env-7.15.0" sources."@babel/preset-modules-0.1.4" sources."@babel/preset-react-7.14.5" - sources."@babel/runtime-7.14.8" + sources."@babel/runtime-7.15.3" sources."@babel/template-7.14.5" sources."@babel/traverse-7.15.0" sources."@babel/types-7.15.0" @@ -78983,11 +79284,11 @@ in sources."@types/node-fetch-2.5.12" sources."@types/prop-types-15.7.4" sources."@types/rc-1.1.0" - sources."@types/react-16.14.12" + sources."@types/react-16.14.13" sources."@types/react-dom-16.9.14" sources."@types/react-virtualized-9.21.13" sources."@types/scheduler-0.16.2" - sources."@types/url-parse-1.4.3" + sources."@types/url-parse-1.4.4" sources."ansi-styles-3.2.1" (sources."anymatch-2.0.0" // { dependencies = [ @@ -79036,7 +79337,7 @@ in ]; }) sources."call-bind-1.0.2" - sources."caniuse-lite-1.0.30001249" + sources."caniuse-lite-1.0.30001251" sources."chalk-2.4.2" sources."chokidar-2.1.8" (sources."class-utils-0.3.6" // { @@ -79106,7 +79407,7 @@ in sources."duplexer3-0.1.4" sources."earcut-2.2.3" sources."electron-13.1.9" - sources."electron-to-chromium-1.3.801" + sources."electron-to-chromium-1.3.806" sources."emoji-js-clean-4.0.0" sources."emoji-mart-3.0.1" sources."emoji-regex-9.2.2" @@ -79328,7 +79629,7 @@ in sources."progress-2.0.3" sources."prop-types-15.7.2" sources."proto-list-1.2.4" - sources."protocol-buffers-schema-3.5.1" + sources."protocol-buffers-schema-3.5.2" sources."pump-3.0.0" sources."punycode-2.1.1" sources."qr.js-0.0.0" @@ -79893,7 +80194,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.2" sources."@types/minimatch-3.0.5" - sources."@types/node-16.4.13" + sources."@types/node-16.6.1" sources."@types/responselike-1.0.0" sources."@types/yauzl-2.9.2" sources."abbrev-1.1.1" @@ -80244,7 +80545,7 @@ in (sources."node-pre-gyp-0.11.0" // { dependencies = [ sources."semver-5.7.1" - sources."tar-4.4.16" + sources."tar-4.4.17" ]; }) sources."nopt-4.0.3" @@ -80391,7 +80692,7 @@ in sources."sudo-prompt-9.2.1" sources."sumchecker-3.0.1" sources."supports-color-7.2.0" - (sources."tar-6.1.7" // { + (sources."tar-6.1.8" // { dependencies = [ sources."chownr-2.0.0" sources."fs-minipass-2.1.0" @@ -80528,9 +80829,9 @@ in 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/helpers-7.15.3" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.15.2" + sources."@babel/parser-7.15.3" 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" @@ -80546,7 +80847,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.2" sources."@types/minimist-1.2.2" - sources."@types/node-16.4.13" + sources."@types/node-16.6.1" sources."@types/normalize-package-data-2.4.1" sources."@types/responselike-1.0.0" sources."@types/yoga-layout-1.9.2" @@ -80581,7 +80882,7 @@ in sources."quick-lru-4.0.1" ]; }) - sources."caniuse-lite-1.0.30001249" + sources."caniuse-lite-1.0.30001251" sources."chalk-2.4.2" sources."ci-info-2.0.0" sources."cli-boxes-2.2.1" @@ -80618,7 +80919,7 @@ in }) sources."defer-to-connect-2.0.1" sources."dot-prop-5.3.0" - sources."electron-to-chromium-1.3.801" + sources."electron-to-chromium-1.3.806" sources."emoji-regex-8.0.0" sources."emojilib-2.4.0" sources."end-of-stream-1.4.4" @@ -80752,7 +81053,7 @@ in sources."punycode-2.1.1" sources."quick-lru-5.1.1" sources."react-16.14.0" - sources."react-devtools-core-4.14.0" + sources."react-devtools-core-4.15.0" sources."react-is-16.13.1" sources."react-reconciler-0.24.0" (sources."read-pkg-5.2.0" // { @@ -80886,7 +81187,7 @@ in sources."normalize-path-2.1.1" ]; }) - sources."@microsoft/load-themed-styles-1.10.197" + sources."@microsoft/load-themed-styles-1.10.202" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -81128,7 +81429,7 @@ in sources."minizlib-2.1.2" sources."p-map-4.0.0" sources."rimraf-3.0.2" - sources."tar-6.1.7" + sources."tar-6.1.8" ]; }) sources."cache-base-1.0.1" @@ -82319,7 +82620,7 @@ in sources."swagger-ui-dist-3.34.0" sources."tail-2.2.3" sources."tapable-1.1.3" - (sources."tar-4.4.16" // { + (sources."tar-4.4.17" // { dependencies = [ sources."mkdirp-0.5.5" sources."safe-buffer-5.2.1" @@ -82639,7 +82940,7 @@ in sources."functional-red-black-tree-1.0.1" sources."glob-7.1.7" sources."glob-parent-5.1.2" - sources."globals-13.10.0" + sources."globals-13.11.0" sources."has-flag-3.0.0" sources."ignore-4.0.6" sources."import-fresh-3.3.0" @@ -82803,7 +83104,7 @@ in sources."functional-red-black-tree-1.0.1" sources."glob-7.1.7" sources."glob-parent-5.1.2" - sources."globals-13.10.0" + sources."globals-13.11.0" sources."has-flag-4.0.0" sources."ignore-4.0.6" sources."import-fresh-3.3.0" @@ -82946,13 +83247,13 @@ in 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/helpers-7.15.3" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.15.2" + sources."@babel/parser-7.15.3" sources."@babel/plugin-proposal-class-properties-7.14.5" sources."@babel/plugin-proposal-export-default-from-7.14.5" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.14.5" @@ -82971,7 +83272,7 @@ in sources."@babel/plugin-syntax-typescript-7.14.5" sources."@babel/plugin-transform-arrow-functions-7.14.5" sources."@babel/plugin-transform-block-scoped-functions-7.14.5" - sources."@babel/plugin-transform-block-scoping-7.14.5" + sources."@babel/plugin-transform-block-scoping-7.15.3" sources."@babel/plugin-transform-classes-7.14.9" sources."@babel/plugin-transform-computed-properties-7.14.5" sources."@babel/plugin-transform-destructuring-7.14.7" @@ -83367,12 +83668,12 @@ in sources."callsites-2.0.0" (sources."camel-case-4.1.2" // { dependencies = [ - sources."tslib-2.3.0" + sources."tslib-2.3.1" ]; }) sources."camelcase-6.2.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001249" + sources."caniuse-lite-1.0.30001251" sources."caseless-0.12.0" (sources."chalk-4.1.2" // { dependencies = [ @@ -83628,7 +83929,7 @@ in }) (sources."dot-case-3.0.4" // { dependencies = [ - sources."tslib-2.3.0" + sources."tslib-2.3.1" ]; }) sources."dot-prop-5.3.0" @@ -83637,7 +83938,7 @@ in sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.801" + sources."electron-to-chromium-1.3.806" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -83937,7 +84238,7 @@ in sources."is-accessor-descriptor-1.0.0" sources."is-arguments-1.1.1" sources."is-arrayish-0.2.1" - sources."is-bigint-1.0.3" + sources."is-bigint-1.0.4" sources."is-binary-path-2.1.0" sources."is-boolean-object-1.1.2" sources."is-buffer-1.1.6" @@ -84083,7 +84384,7 @@ in sources."loose-envify-1.4.0" (sources."lower-case-2.0.2" // { dependencies = [ - sources."tslib-2.3.0" + sources."tslib-2.3.1" ]; }) sources."lowercase-keys-2.0.0" @@ -84210,7 +84511,7 @@ in sources."nice-try-1.0.5" (sources."no-case-3.0.4" // { dependencies = [ - sources."tslib-2.3.0" + sources."tslib-2.3.1" ]; }) sources."nocache-2.1.0" @@ -84361,7 +84662,7 @@ in sources."parallel-transform-1.2.0" (sources."param-case-3.0.4" // { dependencies = [ - sources."tslib-2.3.0" + sources."tslib-2.3.1" ]; }) sources."parse-asn1-5.1.6" @@ -84371,7 +84672,7 @@ in sources."parseurl-1.3.3" (sources."pascal-case-3.1.2" // { dependencies = [ - sources."tslib-2.3.0" + sources."tslib-2.3.1" ]; }) sources."pascalcase-0.1.1" @@ -84890,7 +85191,7 @@ in }) sources."symbol-observable-1.2.0" sources."tapable-1.1.3" - (sources."tar-6.1.7" // { + (sources."tar-6.1.8" // { dependencies = [ sources."minipass-3.1.3" sources."mkdirp-1.0.4" @@ -85288,9 +85589,9 @@ in 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/helpers-7.15.3" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.15.2" + sources."@babel/parser-7.15.3" 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" @@ -85301,7 +85602,7 @@ in sources."@babel/traverse-7.15.0" sources."@babel/types-7.15.0" sources."@types/minimist-1.2.2" - sources."@types/node-16.4.13" + sources."@types/node-16.6.1" sources."@types/normalize-package-data-2.4.1" sources."@types/yauzl-2.9.2" sources."@types/yoga-layout-1.9.2" @@ -85328,7 +85629,7 @@ in sources."callsites-2.0.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001249" + sources."caniuse-lite-1.0.30001251" sources."chalk-2.4.2" sources."chownr-1.1.4" sources."ci-info-2.0.0" @@ -85353,7 +85654,7 @@ in }) sources."delay-5.0.0" sources."devtools-protocol-0.0.869402" - sources."electron-to-chromium-1.3.801" + sources."electron-to-chromium-1.3.806" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" @@ -85447,7 +85748,7 @@ in sources."puppeteer-9.1.1" sources."quick-lru-4.0.1" sources."react-16.14.0" - sources."react-devtools-core-4.14.0" + sources."react-devtools-core-4.15.0" sources."react-is-16.13.1" sources."react-reconciler-0.24.0" (sources."read-pkg-5.2.0" // { @@ -85538,24 +85839,12 @@ in fauna-shell = nodeEnv.buildNodePackage { name = "fauna-shell"; packageName = "fauna-shell"; - version = "0.12.4"; + version = "0.12.5"; src = fetchurl { - url = "https://registry.npmjs.org/fauna-shell/-/fauna-shell-0.12.4.tgz"; - sha512 = "KqaoGSmcIBLY6Vr1wWRMu0acuLUpxpKEtjekdwYs+JxMk74vRa8Mwxd96SmEoBat28cPCoLAPfvDyEtzUzkjEg=="; + url = "https://registry.npmjs.org/fauna-shell/-/fauna-shell-0.12.5.tgz"; + sha512 = "yDfb49A/9LCm7/xwk7zRzcjzt4w6FKUPLtSy+sRuOA9h26sNwhh4CYOqj57VOF+N7G55XFixEb0/FGKvDl7AyA=="; }; dependencies = [ - sources."@babel/code-frame-7.14.5" - 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.15.2" - sources."@babel/template-7.14.5" - 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" @@ -85577,10 +85866,10 @@ in (sources."@oclif/config-1.17.0" // { dependencies = [ sources."globby-11.0.4" - sources."tslib-2.3.0" + sources."tslib-2.3.1" ]; }) - (sources."@oclif/core-0.5.29" // { + (sources."@oclif/core-0.5.30" // { dependencies = [ sources."chalk-4.1.2" (sources."cli-ux-5.6.3" // { @@ -85594,7 +85883,7 @@ in sources."has-flag-4.0.0" sources."jsonfile-6.1.0" sources."supports-color-7.2.0" - sources."tslib-2.3.0" + sources."tslib-2.3.1" sources."universalify-2.0.0" ]; }) @@ -85651,7 +85940,6 @@ in sources."atob-2.1.2" sources."aws-sign2-0.7.0" sources."aws4-1.11.0" - sources."babel-eslint-10.1.0" sources."balanced-match-1.0.2" (sources."base-0.11.2" // { dependencies = [ @@ -85660,6 +85948,11 @@ in }) sources."base64-js-1.5.1" sources."bcrypt-pbkdf-1.0.2" + (sources."bl-4.1.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) sources."bluebird-3.7.2" (sources."boxen-5.0.1" // { dependencies = [ @@ -85672,6 +85965,7 @@ in sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."btoa-lite-1.0.0" + sources."buffer-5.7.1" sources."cache-base-1.0.1" (sources."cacheable-request-2.1.4" // { dependencies = [ @@ -85690,6 +85984,7 @@ in sources."escape-string-regexp-1.0.5" ]; }) + sources."chardet-0.7.0" (sources."class-utils-0.3.6" // { dependencies = [ sources."define-property-0.2.5" @@ -85709,7 +86004,9 @@ in }) sources."clean-stack-3.0.1" sources."cli-boxes-2.2.1" + sources."cli-cursor-3.1.0" sources."cli-progress-3.9.0" + sources."cli-spinners-2.6.0" (sources."cli-table-0.3.6" // { dependencies = [ sources."colors-1.0.3" @@ -85733,6 +86030,8 @@ in sources."supports-hyperlinks-1.0.1" ]; }) + sources."cli-width-3.0.0" + sources."clone-1.0.4" sources."clone-response-1.0.2" sources."co-4.6.0" sources."collection-visit-1.0.0" @@ -85755,6 +86054,7 @@ in sources."decode-uri-component-0.2.0" sources."decompress-response-3.3.0" sources."deep-is-0.1.3" + sources."defaults-1.0.3" sources."define-property-2.0.2" sources."delayed-stream-1.0.0" sources."dir-glob-3.0.1" @@ -85763,14 +86063,7 @@ in sources."ecc-jsbn-0.1.2" sources."emoji-regex-8.0.0" sources."escape-string-regexp-4.0.0" - (sources."escodegen-1.14.3" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) - sources."eslint-config-prettier-8.3.0" - sources."eslint-plugin-prettier-3.4.0" - sources."eslint-visitor-keys-1.3.0" + sources."escodegen-1.14.3" sources."esprima-4.0.1" sources."estraverse-4.3.0" sources."esutils-2.0.3" @@ -85802,6 +86095,7 @@ in sources."is-extendable-1.0.1" ]; }) + sources."external-editor-3.1.0" (sources."extglob-2.0.4" // { dependencies = [ sources."define-property-1.0.0" @@ -85811,7 +86105,6 @@ in sources."extract-stack-2.0.0" sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" - sources."fast-diff-1.2.0" sources."fast-glob-3.2.7" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" @@ -85823,6 +86116,11 @@ in sources."supports-color-7.2.0" ]; }) + (sources."figures-3.2.0" // { + dependencies = [ + sources."escape-string-regexp-1.0.5" + ]; + }) sources."fill-range-7.0.1" sources."fn-annotate-1.2.0" sources."for-in-1.0.2" @@ -85832,7 +86130,6 @@ in sources."from2-2.3.0" sources."fs-extra-8.1.0" sources."fs.realpath-1.0.0" - sources."function-bind-1.1.1" sources."get-package-type-0.1.0" sources."get-stream-3.0.0" sources."get-value-2.0.6" @@ -85840,7 +86137,6 @@ in sources."glob-7.1.7" sources."glob-parent-5.1.2" sources."glob-to-regexp-0.3.0" - sources."globals-11.12.0" (sources."globby-8.0.2" // { dependencies = [ sources."@nodelib/fs.stat-1.1.3" @@ -85875,7 +86171,6 @@ in sources."graceful-fs-4.2.8" sources."har-schema-2.0.0" sources."har-validator-5.1.5" - sources."has-1.0.3" sources."has-flag-3.0.0" sources."has-symbol-support-x-1.4.2" sources."has-to-string-tag-x-1.4.1" @@ -85904,15 +86199,23 @@ in sources."http-cache-semantics-3.8.1" sources."http-signature-1.2.0" sources."hyperlinker-1.0.0" + sources."iconv-lite-0.4.24" + sources."ieee754-1.2.1" sources."ignore-5.1.8" sources."indent-string-4.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" + (sources."inquirer-8.1.2" // { + dependencies = [ + sources."chalk-4.1.2" + sources."has-flag-4.0.0" + sources."supports-color-7.2.0" + ]; + }) sources."into-stream-3.1.0" sources."is-accessor-descriptor-1.0.0" sources."is-buffer-1.1.6" - sources."is-core-module-2.5.0" sources."is-data-descriptor-1.0.0" sources."is-descriptor-1.0.2" sources."is-docker-2.2.1" @@ -85920,6 +86223,7 @@ in sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.1" + sources."is-interactive-1.0.0" sources."is-number-7.0.0" sources."is-object-1.0.2" sources."is-plain-obj-1.1.0" @@ -85927,6 +86231,7 @@ in sources."is-retry-allowed-1.2.0" sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" + sources."is-unicode-supported-0.1.0" sources."is-windows-1.0.2" sources."is-wsl-2.2.0" sources."isarray-1.0.0" @@ -85934,10 +86239,8 @@ in sources."isobject-3.0.1" sources."isstream-0.1.2" sources."isurl-1.0.0" - sources."js-tokens-4.0.0" sources."js-yaml-3.14.1" sources."jsbn-0.1.1" - sources."jsesc-2.5.2" sources."json-buffer-3.0.0" sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" @@ -85951,6 +86254,13 @@ in sources."lodash._reinterpolate-3.0.0" sources."lodash.template-4.5.0" sources."lodash.templatesettings-4.2.0" + (sources."log-symbols-4.1.0" // { + dependencies = [ + sources."chalk-4.1.2" + sources."has-flag-4.0.0" + sources."supports-color-7.2.0" + ]; + }) sources."lowercase-keys-1.0.1" sources."lru-cache-6.0.0" sources."map-cache-0.2.2" @@ -85959,6 +86269,7 @@ in sources."micromatch-4.0.4" sources."mime-db-1.49.0" sources."mime-types-2.1.32" + sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" (sources."mixin-deep-1.3.2" // { @@ -85968,6 +86279,7 @@ in }) sources."moment-2.29.1" sources."ms-2.1.2" + sources."mute-stream-0.0.8" sources."nanomatch-1.2.13" sources."natural-orderby-2.0.3" (sources."netrc-parser-3.1.6" // { @@ -85998,8 +86310,17 @@ in sources."object-visit-1.0.1" sources."object.pick-1.3.0" sources."once-1.4.0" + sources."onetime-5.1.2" sources."opn-3.0.3" sources."optionator-0.8.3" + (sources."ora-5.4.1" // { + dependencies = [ + sources."chalk-4.1.2" + sources."has-flag-4.0.0" + sources."supports-color-7.2.0" + ]; + }) + sources."os-tmpdir-1.0.2" sources."p-cancelable-0.4.1" sources."p-finally-1.0.0" sources."p-is-promise-1.1.0" @@ -86013,7 +86334,6 @@ in sources."path-dirname-1.0.2" sources."path-is-absolute-1.0.1" sources."path-key-2.0.1" - sources."path-parse-1.0.7" sources."path-type-4.0.0" sources."performance-now-2.1.0" sources."picomatch-2.3.0" @@ -86022,7 +86342,6 @@ in sources."prelude-ls-1.1.2" sources."prepend-http-2.0.0" sources."prettier-2.3.2" - sources."prettier-linter-helpers-1.0.0" sources."process-nextick-args-2.0.1" sources."psl-1.8.0" sources."punycode-2.1.1" @@ -86041,12 +86360,18 @@ in sources."request-2.88.2" sources."request-promise-4.2.6" sources."request-promise-core-1.1.4" - sources."resolve-1.20.0" sources."resolve-url-0.2.1" sources."responselike-1.0.2" + sources."restore-cursor-3.1.0" sources."ret-0.1.15" sources."reusify-1.0.4" + sources."run-async-2.4.1" sources."run-parallel-1.2.0" + (sources."rxjs-7.3.0" // { + dependencies = [ + sources."tslib-2.1.0" + ]; + }) sources."safe-buffer-5.2.1" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" @@ -86078,6 +86403,7 @@ in sources."is-descriptor-0.1.6" sources."kind-of-5.1.0" sources."ms-2.0.0" + sources."source-map-0.5.7" ]; }) (sources."snapdragon-node-2.1.1" // { @@ -86091,7 +86417,7 @@ in ]; }) sources."sort-keys-2.0.0" - sources."source-map-0.5.7" + sources."source-map-0.6.1" sources."source-map-resolve-0.5.3" sources."source-map-url-0.4.1" sources."split-string-3.1.0" @@ -86131,8 +86457,9 @@ in sources."supports-color-7.2.0" ]; }) + sources."through-2.3.8" sources."timed-out-4.0.1" - sources."to-fast-properties-2.0.0" + sources."tmp-0.0.33" (sources."to-object-path-0.3.0" // { dependencies = [ sources."kind-of-3.2.2" @@ -86167,6 +86494,7 @@ in sources."util-deprecate-1.0.2" sources."uuid-3.4.0" sources."verror-1.10.0" + sources."wcwidth-1.0.1" sources."which-1.3.1" sources."widest-line-3.1.0" sources."word-wrap-1.2.3" @@ -86187,10 +86515,10 @@ in firebase-tools = nodeEnv.buildNodePackage { name = "firebase-tools"; packageName = "firebase-tools"; - version = "9.16.0"; + version = "9.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/firebase-tools/-/firebase-tools-9.16.0.tgz"; - sha512 = "H/zyDDrQuZKM6ZFyI8t2kDEC+/Ewhk771sM8NLZyEXIQnX5qKAwhi3sJUB+5yrXt+SJQYqUYksBLK6/gqxe9Eg=="; + url = "https://registry.npmjs.org/firebase-tools/-/firebase-tools-9.16.5.tgz"; + sha512 = "dp/cvt+39wv5CO+MzX36snmRnvn5j7Nn73QfKiIvHXAT5Ek/fRJn2pWnaxP+bhd19SuEY1Buf8PcdlMl42hzlw=="; }; dependencies = [ (sources."@apidevtools/json-schema-ref-parser-9.0.9" // { @@ -86203,9 +86531,9 @@ in sources."@google-cloud/precise-date-2.0.3" sources."@google-cloud/projectify-2.1.0" sources."@google-cloud/promisify-2.0.3" - (sources."@google-cloud/pubsub-2.16.1" // { + (sources."@google-cloud/pubsub-2.16.3" // { dependencies = [ - sources."google-auth-library-7.5.0" + sources."google-auth-library-7.6.1" ]; }) sources."@grpc/grpc-js-1.3.7" @@ -86217,7 +86545,7 @@ in ]; }) sources."@opentelemetry/api-1.0.2" - sources."@opentelemetry/semantic-conventions-0.22.0" + sources."@opentelemetry/semantic-conventions-0.24.0" sources."@protobufjs/aspromise-1.1.2" sources."@protobufjs/base64-1.1.2" sources."@protobufjs/codegen-2.0.4" @@ -86237,7 +86565,7 @@ in sources."@types/json-schema-7.0.9" sources."@types/long-4.0.1" sources."@types/minimatch-3.0.5" - sources."@types/node-16.4.13" + sources."@types/node-16.6.1" sources."JSONStream-1.3.5" sources."abbrev-1.1.1" sources."abort-controller-3.0.0" @@ -86327,7 +86655,7 @@ in (sources."cacache-15.2.0" // { dependencies = [ sources."mkdirp-1.0.4" - sources."tar-6.1.7" + sources."tar-6.1.8" ]; }) (sources."cacheable-request-6.1.0" // { @@ -86586,15 +86914,15 @@ in sources."glob-slasher-1.0.1" sources."global-dirs-2.1.0" sources."google-auth-library-6.1.6" - (sources."google-gax-2.22.1" // { + (sources."google-gax-2.24.0" // { dependencies = [ - sources."google-auth-library-7.5.0" + sources."google-auth-library-7.6.1" ]; }) - sources."google-p12-pem-3.1.1" + sources."google-p12-pem-3.1.2" sources."got-9.6.0" sources."graceful-fs-4.2.8" - sources."gtoken-5.3.0" + sources."gtoken-5.3.1" sources."har-schema-2.0.0" sources."har-validator-5.1.5" (sources."has-ansi-2.0.0" // { @@ -86726,7 +87054,6 @@ in sources."lodash.keys-2.4.1" sources."lodash.once-4.1.1" sources."lodash.snakecase-4.1.1" - sources."lodash.toarray-4.4.0" sources."lodash.union-4.6.0" sources."lodash.values-2.4.1" sources."log-symbols-2.2.0" @@ -86789,14 +87116,14 @@ in sources."netmask-2.0.2" sources."next-tick-1.0.0" sources."nice-try-1.0.5" - sources."node-emoji-1.10.0" + sources."node-emoji-1.11.0" sources."node-fetch-2.6.1" sources."node-forge-0.10.0" (sources."node-gyp-8.1.0" // { dependencies = [ sources."mkdirp-1.0.4" sources."semver-7.3.5" - sources."tar-6.1.7" + sources."tar-6.1.8" sources."which-2.0.2" ]; }) @@ -86977,7 +87304,7 @@ in sources."has-flag-2.0.0" ]; }) - (sources."tar-4.4.16" // { + (sources."tar-4.4.17" // { dependencies = [ sources."chownr-1.1.4" sources."fs-minipass-1.2.7" @@ -87011,7 +87338,7 @@ in sources."toxic-1.0.1" sources."traverse-0.3.9" sources."triple-beam-1.3.0" - sources."tslib-2.3.0" + sources."tslib-2.3.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" (sources."tweetsodium-0.0.5" // { @@ -87344,7 +87671,7 @@ in dependencies = [ sources."@types/atob-2.1.2" sources."@types/inquirer-6.5.0" - sources."@types/node-16.4.13" + sources."@types/node-16.6.1" sources."@types/through-0.0.30" sources."ajv-6.12.6" sources."ansi-escapes-4.3.2" @@ -87517,7 +87844,7 @@ in sources."utf8-3.0.0" sources."uuid-3.4.0" sources."verror-1.10.0" - sources."web3-utils-1.5.1" + sources."web3-utils-1.5.2" sources."which-module-2.0.0" sources."wrap-ansi-6.2.0" sources."wrappy-1.0.2" @@ -87724,7 +88051,7 @@ in sources."internal-slot-1.0.3" sources."is-accessor-descriptor-1.0.0" sources."is-arguments-1.1.1" - sources."is-bigint-1.0.3" + sources."is-bigint-1.0.4" sources."is-binary-path-1.0.1" sources."is-boolean-object-1.1.2" sources."is-buffer-1.1.6" @@ -88073,13 +88400,13 @@ in 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/helpers-7.15.3" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.15.2" + sources."@babel/parser-7.15.3" 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" @@ -88087,8 +88414,8 @@ in sources."@babel/plugin-syntax-optional-chaining-7.8.3" 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.15.2" + sources."@babel/runtime-7.15.3" + sources."@babel/standalone-7.15.3" sources."@babel/template-7.14.5" sources."@babel/traverse-7.15.0" sources."@babel/types-7.15.0" @@ -88127,7 +88454,7 @@ in sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" sources."@types/json-patch-0.0.30" - sources."@types/node-16.4.13" + sources."@types/node-16.6.1" sources."@types/node-fetch-2.5.12" sources."@types/unist-2.0.6" sources."@types/yargs-15.0.14" @@ -88194,7 +88521,7 @@ in sources."call-bind-1.0.2" sources."camel-case-4.1.2" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001249" + sources."caniuse-lite-1.0.30001251" sources."ccount-1.1.0" (sources."chalk-4.1.2" // { dependencies = [ @@ -88290,7 +88617,7 @@ in sources."dotenv-8.6.0" sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.801" + sources."electron-to-chromium-1.3.806" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -88809,13 +89136,13 @@ in sources."@octokit/core-3.5.1" sources."@octokit/endpoint-6.0.12" sources."@octokit/graphql-4.6.4" - sources."@octokit/openapi-types-9.5.0" + sources."@octokit/openapi-types-9.7.0" sources."@octokit/plugin-paginate-rest-2.15.1" sources."@octokit/plugin-request-log-1.0.4" - sources."@octokit/plugin-rest-endpoint-methods-5.7.0" - sources."@octokit/request-5.6.0" + sources."@octokit/plugin-rest-endpoint-methods-5.8.0" + sources."@octokit/request-5.6.1" sources."@octokit/request-error-2.1.0" - sources."@octokit/rest-18.9.0" + sources."@octokit/rest-18.9.1" sources."@octokit/types-6.25.0" sources."@types/normalize-package-data-2.4.1" sources."agent-base-4.3.0" @@ -88941,7 +89268,7 @@ in }) sources."wrappy-1.0.2" sources."yallist-4.0.0" - (sources."yeoman-generator-5.4.0" // { + (sources."yeoman-generator-5.4.1" // { dependencies = [ sources."debug-4.3.2" sources."ms-2.1.2" @@ -89261,7 +89588,7 @@ in sources."@types/normalize-package-data-2.4.1" sources."agent-base-6.0.2" sources."ajv-8.6.2" - sources."ajv-formats-2.1.0" + sources."ajv-formats-2.1.1" (sources."ansi-align-3.0.0" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -89658,7 +89985,7 @@ in }) (sources."camel-case-4.1.2" // { dependencies = [ - sources."tslib-2.3.0" + sources."tslib-2.3.1" ]; }) ]; @@ -89667,14 +89994,14 @@ in (sources."@graphql-tools/merge-6.2.17" // { dependencies = [ sources."@graphql-tools/utils-8.0.2" - sources."tslib-2.3.0" + sources."tslib-2.3.1" ]; }) - (sources."@graphql-tools/schema-8.0.3" // { + (sources."@graphql-tools/schema-8.1.1" // { dependencies = [ - sources."@graphql-tools/merge-7.0.0" - sources."@graphql-tools/utils-8.0.2" - sources."tslib-2.3.0" + sources."@graphql-tools/merge-8.0.1" + sources."@graphql-tools/utils-8.1.1" + sources."tslib-2.3.1" ]; }) (sources."@graphql-tools/url-loader-6.10.1" // { @@ -89704,7 +90031,7 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-16.4.13" + sources."@types/node-16.6.1" sources."@types/parse-json-4.0.0" sources."@types/websocket-1.0.2" sources."abort-controller-3.0.0" @@ -89892,7 +90219,7 @@ in sources."internal-slot-1.0.3" sources."is-arguments-1.1.1" sources."is-arrayish-0.2.1" - sources."is-bigint-1.0.3" + sources."is-bigint-1.0.4" sources."is-boolean-object-1.1.2" sources."is-callable-1.2.4" sources."is-date-object-1.0.5" @@ -89955,7 +90282,7 @@ in }) (sources."lower-case-2.0.2" // { dependencies = [ - sources."tslib-2.3.0" + sources."tslib-2.3.1" ]; }) sources."lowercase-keys-1.0.1" @@ -89982,7 +90309,7 @@ in sources."nice-try-1.0.5" (sources."no-case-3.0.4" // { dependencies = [ - sources."tslib-2.3.0" + sources."tslib-2.3.1" ]; }) sources."node-emoji-1.10.0" @@ -89996,7 +90323,7 @@ in sources."oas-linter-3.2.2" (sources."oas-resolver-2.5.6" // { dependencies = [ - sources."yargs-17.1.0" + sources."yargs-17.1.1" ]; }) sources."oas-schema-walker-1.1.5" @@ -90040,7 +90367,7 @@ in sources."parse-json-5.2.0" (sources."pascal-case-3.1.2" // { dependencies = [ - sources."tslib-2.3.0" + sources."tslib-2.3.1" ]; }) sources."passwd-user-3.0.0" @@ -90109,7 +90436,7 @@ in sources."supports-color-7.2.0" (sources."swagger2openapi-7.0.8" // { dependencies = [ - sources."yargs-17.1.0" + sources."yargs-17.1.1" ]; }) sources."symbol-observable-1.2.0" @@ -90422,7 +90749,6 @@ in sources."inherits-2.0.4" sources."isarray-0.0.1" sources."lodash-4.17.21" - sources."lodash.toarray-4.4.0" sources."map-canvas-0.1.5" sources."marked-2.1.3" (sources."marked-terminal-4.1.1" // { @@ -90434,7 +90760,7 @@ in }) sources."memory-streams-0.1.3" sources."memorystream-0.3.1" - sources."node-emoji-1.10.0" + sources."node-emoji-1.11.0" sources."nopt-2.1.2" sources."optimist-0.3.7" sources."picture-tuber-1.0.2" @@ -92098,7 +92424,7 @@ in sources."ansi-styles-3.2.1" (sources."ast-types-0.13.4" // { dependencies = [ - sources."tslib-2.3.0" + sources."tslib-2.3.1" ]; }) sources."astral-regex-2.0.0" @@ -92339,7 +92665,7 @@ in ]; }) sources."supports-color-7.2.0" - sources."tar-4.4.16" + sources."tar-4.4.17" sources."through-2.3.8" sources."through2-3.0.2" sources."tmp-0.0.33" @@ -92555,7 +92881,7 @@ in sources."through-2.3.8" sources."toposort-2.0.2" sources."traverse-0.3.9" - sources."tslib-2.3.0" + sources."tslib-2.3.1" sources."type-check-0.3.2" sources."typo-geom-0.12.1" sources."unicoderegexp-0.4.1" @@ -92569,7 +92895,7 @@ in sources."color-name-1.1.4" sources."has-flag-4.0.0" sources."supports-color-7.2.0" - sources."yargs-17.1.0" + sources."yargs-17.1.1" ]; }) sources."wawoff2-2.0.0" @@ -92720,20 +93046,27 @@ in joplin = nodeEnv.buildNodePackage { name = "joplin"; packageName = "joplin"; - version = "2.2.1"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/joplin/-/joplin-2.2.1.tgz"; - sha512 = "6meo5eWRPmmZACLY+5atvtaecNsclzxcwYeFOUyAPf1JctSH/nCGow2nVkZoLtwNJGgXAnIEzwn08CpNIecDEQ=="; + url = "https://registry.npmjs.org/joplin/-/joplin-2.3.2.tgz"; + sha512 = "Gg0s1NP2mRJqzv68aT8cdt2+71iSYLDTWusAmlX7c8g13ZniSzCEHXywFvpILYm76lzCWxMazPleZhEEuBjqxQ=="; }; dependencies = [ sources."@babel/code-frame-7.14.5" sources."@babel/compat-data-7.15.0" (sources."@babel/core-7.15.0" // { dependencies = [ + sources."debug-4.3.2" + sources."ms-2.1.2" sources."semver-6.3.0" + sources."source-map-0.5.7" + ]; + }) + (sources."@babel/generator-7.15.0" // { + dependencies = [ + sources."source-map-0.5.7" ]; }) - sources."@babel/generator-7.15.0" sources."@babel/helper-annotate-as-pure-7.14.5" (sources."@babel/helper-compilation-targets-7.15.0" // { dependencies = [ @@ -92755,17 +93088,15 @@ in 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/helpers-7.15.3" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" sources."escape-string-regexp-1.0.5" ]; }) - sources."@babel/parser-7.15.2" + sources."@babel/parser-7.15.3" 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" @@ -92778,58 +93109,68 @@ in sources."@babel/plugin-transform-typescript-7.15.0" sources."@babel/preset-flow-7.14.5" sources."@babel/preset-typescript-7.15.0" - sources."@babel/register-7.14.5" + sources."@babel/register-7.15.3" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.15.0" + (sources."@babel/traverse-7.15.0" // { + dependencies = [ + sources."debug-4.3.2" + sources."ms-2.1.2" + ]; + }) 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.31" - sources."@joplin/fork-sax-1.2.35" - (sources."@joplin/lib-2.1.1" // { - dependencies = [ - (sources."@joplin/renderer-1.8.2" // { - dependencies = [ - sources."fs-extra-8.1.0" - sources."uslug-git+https://github.com/laurent22/uslug.git#emoji-support" - ]; - }) - ]; - }) - (sources."@joplin/renderer-2.1.1" // { + sources."@joplin/fork-htmlparser2-4.1.33" + sources."@joplin/fork-sax-1.2.37" + sources."@joplin/lib-2.3.1" + (sources."@joplin/renderer-2.3.1" // { dependencies = [ sources."fs-extra-8.1.0" + sources."jsonfile-4.0.0" sources."uslug-git+https://github.com/laurent22/uslug.git#emoji-support" ]; }) - (sources."@joplin/turndown-4.0.53" // { + (sources."@joplin/turndown-4.0.55" // { dependencies = [ sources."css-2.2.4" - sources."source-map-0.6.1" ]; }) - sources."@joplin/turndown-plugin-gfm-1.0.35" + sources."@joplin/turndown-plugin-gfm-1.0.37" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@oclif/command-1.8.0" - (sources."@oclif/config-1.17.0" // { + (sources."@oclif/command-1.8.0" // { dependencies = [ - sources."tslib-2.3.0" + sources."debug-4.3.2" + sources."ms-2.1.2" ]; }) - (sources."@oclif/core-0.5.29" // { + (sources."@oclif/config-1.17.0" // { dependencies = [ + sources."debug-4.3.2" + sources."ms-2.1.2" + sources."tslib-2.3.1" + ]; + }) + (sources."@oclif/core-0.5.30" // { + dependencies = [ + sources."ansi-regex-5.0.0" + sources."debug-4.3.2" sources."fs-extra-9.1.0" + sources."is-fullwidth-code-point-3.0.0" sources."jsonfile-6.1.0" + sources."ms-2.1.2" + sources."string-width-4.2.2" sources."strip-ansi-6.0.0" - sources."tslib-2.3.0" + sources."tslib-2.3.1" sources."universalify-2.0.0" ]; }) (sources."@oclif/errors-1.3.5" // { dependencies = [ + sources."ansi-regex-5.0.0" sources."fs-extra-8.1.0" + sources."jsonfile-4.0.0" sources."strip-ansi-6.0.0" ]; }) @@ -92838,15 +93179,18 @@ in dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" sources."escape-string-regexp-1.0.5" ]; }) sources."@oclif/plugin-help-3.3.0" sources."@oclif/screen-1.0.4" - sources."@percy/config-1.0.0-beta.63" - sources."@percy/logger-1.0.0-beta.63" + (sources."@percy/config-1.0.0-beta.65" // { + dependencies = [ + sources."ajv-8.6.2" + sources."json-schema-traverse-1.0.0" + ]; + }) + sources."@percy/logger-1.0.0-beta.65" sources."@percy/migrate-0.10.0" sources."@types/parse-json-4.0.0" sources."abab-2.0.5" @@ -92858,25 +93202,24 @@ in ]; }) sources."acorn-walk-6.2.0" - sources."ajv-8.6.2" + sources."ajv-6.12.6" (sources."ansi-escape-sequences-4.1.0" // { dependencies = [ sources."array-back-3.1.0" ]; }) sources."ansi-escapes-4.3.2" - sources."ansi-regex-5.0.0" - sources."ansi-styles-4.3.0" + sources."ansi-regex-2.1.1" + (sources."ansi-styles-4.3.0" // { + dependencies = [ + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + ]; + }) sources."ansicolors-0.3.2" sources."anymatch-3.1.2" sources."aproba-1.2.0" - (sources."are-we-there-yet-1.1.5" // { - dependencies = [ - sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" - ]; - }) + sources."are-we-there-yet-1.1.5" (sources."argparse-1.0.10" // { dependencies = [ sources."sprintf-js-1.0.3" @@ -92896,19 +93239,21 @@ in sources."assign-symbols-1.0.0" (sources."ast-types-0.14.2" // { dependencies = [ - sources."tslib-2.3.0" + sources."tslib-2.3.1" ]; }) sources."async-mutex-0.1.4" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" sources."atob-2.1.2" - (sources."aws-sdk-2.965.0" // { + (sources."aws-sdk-2.968.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" + sources."sax-1.2.1" sources."uuid-3.3.2" sources."xml2js-0.4.19" + sources."xmlbuilder-9.0.7" ]; }) sources."aws-sign2-0.7.0" @@ -92919,6 +93264,7 @@ in (sources."base-0.11.2" // { dependencies = [ sources."define-property-1.0.0" + sources."isobject-3.0.1" ]; }) sources."base-64-0.1.0" @@ -92926,7 +93272,11 @@ in sources."base64-stream-1.0.0" sources."bcrypt-pbkdf-1.0.2" sources."binary-extensions-2.2.0" - sources."bl-4.1.0" + (sources."bl-4.1.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) sources."block-stream-0.0.9" sources."brace-expansion-1.1.11" sources."braces-3.0.2" @@ -92935,12 +93285,16 @@ in sources."buffer-5.7.1" sources."buffer-from-1.1.2" sources."builtin-modules-3.2.0" - sources."cache-base-1.0.1" + (sources."cache-base-1.0.1" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) sources."call-bind-1.0.2" sources."callsites-3.1.0" sources."camel-case-3.0.0" sources."camelcase-4.1.0" - sources."caniuse-lite-1.0.30001249" + sources."caniuse-lite-1.0.30001251" sources."cardinal-2.1.1" sources."caseless-0.12.0" (sources."chalk-4.1.2" // { @@ -92968,25 +93322,33 @@ in ]; }) sources."is-descriptor-0.1.6" + sources."isobject-3.0.1" sources."kind-of-5.1.0" ]; }) - (sources."clean-css-4.2.3" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) + sources."clean-css-4.2.3" sources."clean-stack-3.0.1" sources."cli-cursor-3.1.0" - sources."cli-progress-3.9.0" + (sources."cli-progress-3.9.0" // { + dependencies = [ + sources."ansi-regex-5.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.2" + sources."strip-ansi-6.0.0" + ]; + }) sources."cli-spinners-2.6.0" (sources."cli-ux-5.6.3" // { dependencies = [ + sources."ansi-regex-5.0.0" sources."fs-extra-8.1.0" sources."has-flag-4.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."jsonfile-4.0.0" + sources."string-width-4.2.2" sources."strip-ansi-6.0.0" sources."supports-color-8.1.1" - sources."tslib-2.3.0" + sources."tslib-2.3.1" ]; }) sources."cli-width-3.0.0" @@ -92995,20 +93357,15 @@ in sources."clone-deep-4.0.1" sources."code-point-at-1.1.0" sources."collection-visit-1.0.0" - (sources."color-3.1.2" // { - dependencies = [ - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - ]; - }) - sources."color-convert-2.0.1" - sources."color-name-1.1.4" + sources."color-3.1.2" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" sources."color-string-1.6.0" sources."colorette-1.3.0" sources."colors-1.4.0" sources."combined-stream-1.0.8" sources."command-line-usage-4.1.0" - sources."commander-6.2.1" + sources."commander-2.17.1" sources."commondir-1.0.1" sources."compare-version-0.1.2" sources."compare-versions-3.6.0" @@ -93029,13 +93386,11 @@ in sources."path-key-3.1.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."which-2.0.2" ]; }) sources."crypt-0.0.2" (sources."css-3.0.0" // { dependencies = [ - sources."source-map-0.6.1" sources."source-map-resolve-0.6.0" ]; }) @@ -93056,11 +93411,7 @@ in sources."d3-contour-1.3.2" sources."d3-dispatch-1.0.6" sources."d3-drag-1.2.5" - (sources."d3-dsv-1.2.0" // { - dependencies = [ - sources."commander-2.20.3" - ]; - }) + sources."d3-dsv-1.2.0" sources."d3-ease-1.0.7" sources."d3-fetch-1.2.0" sources."d3-force-1.2.1" @@ -93086,7 +93437,7 @@ in sources."dagre-d3-0.6.4" sources."dashdash-1.14.1" sources."data-urls-1.1.0" - sources."debug-4.3.2" + sources."debug-3.2.7" sources."decode-uri-component-0.2.0" sources."decompress-response-4.2.1" sources."deep-extend-0.6.0" @@ -93094,7 +93445,11 @@ in sources."deepmerge-2.2.1" sources."defaults-1.0.3" sources."define-properties-1.1.3" - sources."define-property-2.0.2" + (sources."define-property-2.0.2" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."depd-1.1.2" @@ -93116,11 +93471,10 @@ in ]; }) sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.801" + sources."electron-to-chromium-1.3.806" sources."emoji-regex-8.0.0" (sources."emphasize-1.5.0" // { dependencies = [ - sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" sources."chalk-1.1.3" sources."escape-string-regexp-1.0.5" @@ -93136,15 +93490,15 @@ in }) sources."end-of-stream-1.4.4" sources."entities-2.2.0" - sources."error-ex-1.3.2" + (sources."error-ex-1.3.2" // { + dependencies = [ + sources."is-arrayish-0.2.1" + ]; + }) sources."es6-promise-pool-2.5.0" sources."escalade-3.1.1" sources."escape-string-regexp-4.0.0" - (sources."escodegen-1.14.3" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) + sources."escodegen-1.14.3" sources."esprima-4.0.1" sources."estraverse-4.3.0" sources."esutils-2.0.3" @@ -93200,7 +93554,7 @@ in sources."file-uri-to-path-1.0.0" sources."fill-range-7.0.1" sources."find-cache-dir-2.1.0" - sources."find-up-3.0.0" + sources."find-up-2.1.0" sources."flow-parser-0.157.0" sources."follow-redirects-1.14.1" sources."font-awesome-filetypes-2.1.0" @@ -93212,7 +93566,11 @@ in sources."format-0.2.2" sources."fragment-cache-0.2.1" sources."fs-constants-1.0.0" - sources."fs-extra-5.0.0" + (sources."fs-extra-5.0.0" // { + dependencies = [ + sources."jsonfile-4.0.0" + ]; + }) sources."fs-minipass-1.2.7" sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" @@ -93220,9 +93578,6 @@ in sources."function-bind-1.1.1" (sources."gauge-2.7.4" // { dependencies = [ - sources."ansi-regex-2.1.1" - sources."is-fullwidth-code-point-1.0.0" - sources."string-width-1.0.2" sources."strip-ansi-3.0.1" ]; }) @@ -93242,22 +93597,17 @@ in sources."graphlib-2.1.8" sources."growly-1.3.0" sources."har-schema-2.0.0" - (sources."har-validator-5.1.5" // { - dependencies = [ - sources."ajv-6.12.6" - sources."json-schema-traverse-0.4.1" - ]; - }) + sources."har-validator-5.1.5" sources."has-1.0.3" - (sources."has-ansi-2.0.0" // { - dependencies = [ - sources."ansi-regex-2.1.1" - ]; - }) + sources."has-ansi-2.0.0" sources."has-flag-3.0.0" sources."has-symbols-1.0.2" sources."has-unicode-2.0.1" - sources."has-value-1.0.0" + (sources."has-value-1.0.0" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) (sources."has-values-1.0.0" // { dependencies = [ (sources."is-number-3.0.0" // { @@ -93269,14 +93619,10 @@ in ]; }) sources."he-1.2.0" - sources."highlight.js-10.7.3" + sources."highlight.js-11.2.0" sources."html-encoding-sniffer-1.0.2" sources."html-entities-1.4.0" - (sources."html-minifier-3.5.21" // { - dependencies = [ - sources."commander-2.17.1" - ]; - }) + sources."html-minifier-3.5.21" sources."http-errors-1.8.0" sources."http-signature-1.2.0" sources."hyperlinker-1.0.0" @@ -93287,7 +93633,6 @@ in (sources."image-data-uri-2.0.1" // { dependencies = [ sources."fs-extra-0.26.7" - sources."jsonfile-2.4.0" ]; }) sources."image-type-3.1.0" @@ -93300,6 +93645,9 @@ in sources."ini-1.3.8" (sources."inquirer-8.1.2" // { dependencies = [ + sources."ansi-regex-5.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.2" sources."strip-ansi-6.0.0" ]; }) @@ -93315,13 +93663,11 @@ in }) (sources."inspect-parameters-declaration-0.0.9" // { dependencies = [ - sources."commander-2.20.3" sources."magicli-0.0.5" ]; }) (sources."inspect-property-0.0.6" // { dependencies = [ - sources."commander-2.20.3" sources."inspect-function-0.3.4" (sources."inspect-parameters-declaration-0.0.8" // { dependencies = [ @@ -93338,13 +93684,9 @@ in }) sources."iota-array-1.0.0" sources."ip-regex-2.1.0" - (sources."is-absolute-0.2.6" // { - dependencies = [ - sources."is-windows-0.2.0" - ]; - }) + sources."is-absolute-0.2.6" sources."is-accessor-descriptor-1.0.0" - sources."is-arrayish-0.2.1" + sources."is-arrayish-0.3.2" sources."is-binary-path-2.1.0" sources."is-buffer-1.1.6" sources."is-data-descriptor-1.0.0" @@ -93352,17 +93694,21 @@ in sources."is-docker-2.2.1" sources."is-extendable-0.1.1" sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-3.0.0" + sources."is-fullwidth-code-point-1.0.0" sources."is-glob-4.0.1" sources."is-interactive-1.0.0" sources."is-number-7.0.0" - sources."is-plain-object-2.0.4" + (sources."is-plain-object-2.0.4" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) sources."is-relative-0.2.1" sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" sources."is-unc-path-0.1.2" sources."is-unicode-supported-0.1.0" - sources."is-windows-1.0.2" + sources."is-windows-0.2.0" sources."is-wsl-2.2.0" (sources."is2-0.0.9" // { dependencies = [ @@ -93371,7 +93717,7 @@ in }) sources."isarray-1.0.0" sources."isexe-2.0.0" - sources."isobject-3.0.1" + sources."isobject-2.1.0" sources."isstream-0.1.2" sources."jmespath-0.15.0" sources."jpeg-js-0.4.3" @@ -93391,6 +93737,7 @@ in ]; }) sources."is-number-3.0.0" + sources."isobject-3.0.1" sources."kind-of-3.2.2" sources."micromatch-3.1.10" sources."to-regex-range-2.1.1" @@ -93400,12 +93747,16 @@ in sources."jsesc-2.5.2" sources."json-parse-even-better-errors-2.3.1" sources."json-schema-0.2.3" - sources."json-schema-traverse-1.0.0" + sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."json5-2.2.0" - sources."jsonfile-4.0.0" + sources."jsonfile-2.4.0" sources."jsprim-1.4.1" - sources."katex-0.13.13" + (sources."katex-0.13.13" // { + dependencies = [ + sources."commander-6.2.1" + ]; + }) sources."keytar-7.7.0" sources."khroma-1.4.1" sources."kind-of-6.0.3" @@ -93414,8 +93765,8 @@ in sources."levenshtein-1.0.5" sources."levn-0.3.0" sources."lines-and-columns-1.1.6" - sources."linkify-it-3.0.2" - sources."locate-path-3.0.0" + sources."linkify-it-2.2.0" + sources."locate-path-2.0.0" sources."lodash-4.17.21" sources."lodash-es-4.17.21" sources."lodash._reinterpolate-3.0.0" @@ -93434,15 +93785,7 @@ in ]; }) sources."lru-cache-6.0.0" - (sources."magicli-0.0.8" // { - dependencies = [ - sources."find-up-2.1.0" - sources."locate-path-2.0.0" - sources."p-limit-1.3.0" - sources."p-locate-2.0.0" - sources."p-try-1.0.0" - ]; - }) + sources."magicli-0.0.8" (sources."make-dir-2.1.0" // { dependencies = [ sources."semver-5.7.1" @@ -93453,7 +93796,6 @@ in (sources."markdown-it-10.0.0" // { dependencies = [ sources."entities-2.0.3" - sources."linkify-it-2.2.0" ]; }) sources."markdown-it-abbr-1.0.4" @@ -93467,6 +93809,7 @@ in (sources."markdown-it-multimd-table-4.1.0" // { dependencies = [ sources."entities-2.0.3" + sources."linkify-it-3.0.2" sources."markdown-it-11.0.1" ]; }) @@ -93477,7 +93820,7 @@ in sources."md5-file-4.0.0" sources."mdurl-1.0.1" sources."merge2-1.4.1" - sources."mermaid-8.11.4" + sources."mermaid-8.11.5" sources."micromatch-4.0.4" sources."mime-db-1.49.0" sources."mime-types-2.1.32" @@ -93500,22 +93843,21 @@ in sources."mkdirp-classic-0.5.3" sources."moment-2.29.1" sources."moment-mini-2.24.0" - sources."ms-2.1.2" + sources."ms-2.1.3" sources."multiparty-4.2.2" sources."mustache-4.2.0" sources."mute-stream-0.0.8" - sources."nanoid-3.1.23" - sources."nanomatch-1.2.13" + sources."nanoid-3.1.25" + (sources."nanomatch-1.2.13" // { + dependencies = [ + sources."is-windows-1.0.2" + ]; + }) sources."napi-build-utils-1.0.2" sources."natural-orderby-2.0.3" sources."ndarray-1.0.19" sources."ndarray-pack-1.2.1" - (sources."needle-2.8.0" // { - dependencies = [ - sources."debug-3.2.7" - sources."sax-1.2.4" - ]; - }) + sources."needle-2.8.0" sources."neo-async-2.6.2" sources."nextgen-events-1.5.2" sources."nice-try-1.0.5" @@ -93528,20 +93870,20 @@ in sources."node-addon-api-3.2.1" sources."node-bitmap-0.0.1" sources."node-dir-0.1.17" - sources."node-emoji-1.10.0" + sources."node-emoji-1.11.0" sources."node-fetch-1.7.3" (sources."node-gyp-3.8.0" // { dependencies = [ sources."nopt-3.0.6" sources."semver-5.3.0" sources."tar-2.2.2" + sources."which-1.3.1" ]; }) sources."node-modules-regexp-1.0.0" (sources."node-notifier-8.0.2" // { dependencies = [ sources."uuid-8.3.2" - sources."which-2.0.2" ]; }) sources."node-persist-2.1.0" @@ -93577,15 +93919,22 @@ in sources."object-keys-1.1.1" (sources."object-to-arguments-0.0.8" // { dependencies = [ - sources."commander-2.20.3" sources."inspect-parameters-declaration-0.0.10" sources."magicli-0.0.5" ]; }) sources."object-treeify-1.1.33" - sources."object-visit-1.0.1" + (sources."object-visit-1.0.1" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) sources."object.assign-4.1.2" - sources."object.pick-1.3.0" + (sources."object.pick-1.3.0" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) sources."omggif-1.0.10" sources."once-1.4.0" sources."onetime-5.1.2" @@ -93593,15 +93942,16 @@ in sources."optionator-0.8.3" (sources."ora-5.4.1" // { dependencies = [ + sources."ansi-regex-5.0.0" sources."strip-ansi-6.0.0" ]; }) sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" - sources."p-limit-2.3.0" - sources."p-locate-3.0.0" - sources."p-try-2.2.0" + sources."p-limit-1.3.0" + sources."p-locate-2.0.0" + sources."p-try-1.0.0" sources."param-case-2.1.1" sources."parent-module-1.0.1" sources."parse-json-5.2.0" @@ -93612,6 +93962,7 @@ in sources."ansi-escapes-3.2.0" sources."cross-spawn-6.0.5" sources."semver-5.7.1" + sources."which-1.3.1" ]; }) sources."path-exists-3.0.0" @@ -93623,11 +93974,19 @@ in sources."pify-4.0.1" sources."pipe-functions-1.3.0" sources."pirates-4.0.1" - sources."pkg-dir-3.0.0" + (sources."pkg-dir-3.0.0" // { + dependencies = [ + sources."find-up-3.0.0" + sources."locate-path-3.0.0" + sources."p-limit-2.3.0" + sources."p-locate-3.0.0" + sources."p-try-2.2.0" + ]; + }) sources."pn-1.1.0" sources."pngjs-5.0.0" sources."posix-character-classes-0.1.1" - sources."prebuild-install-6.1.3" + sources."prebuild-install-6.1.4" sources."prelude-ls-1.1.2" sources."process-nextick-args-2.0.1" sources."promise-7.3.1" @@ -93649,12 +94008,15 @@ in sources."pify-3.0.0" ]; }) - sources."readable-stream-3.6.0" + (sources."readable-stream-2.3.7" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) sources."readdirp-3.6.0" (sources."recast-0.20.5" // { dependencies = [ - sources."source-map-0.6.1" - sources."tslib-2.3.0" + sources."tslib-2.3.1" ]; }) sources."redeyed-2.1.1" @@ -93662,11 +94024,7 @@ in sources."redux-3.7.2" sources."regex-not-1.0.2" sources."relateurl-0.2.7" - (sources."relative-3.0.2" // { - dependencies = [ - sources."isobject-2.1.0" - ]; - }) + sources."relative-3.0.2" sources."repeat-element-1.1.4" sources."repeat-string-1.6.1" (sources."request-2.88.2" // { @@ -93690,7 +94048,7 @@ in sources."ret-0.1.15" sources."retry-0.10.1" sources."reusify-1.0.4" - sources."rimraf-2.6.3" + sources."rimraf-2.7.1" sources."run-async-2.4.1" sources."run-parallel-1.2.0" sources."rw-1.3.3" @@ -93702,7 +94060,7 @@ in sources."safe-buffer-5.2.1" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" - sources."sax-1.2.1" + sources."sax-1.2.4" sources."saxes-3.1.11" sources."semver-7.3.5" sources."server-destroy-1.0.1" @@ -93719,8 +94077,6 @@ in (sources."sharp-0.26.3" // { dependencies = [ sources."color-3.2.1" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" sources."decompress-response-6.0.0" sources."mimic-response-3.1.0" sources."simple-get-4.0.0" @@ -93732,11 +94088,7 @@ in sources."signal-exit-3.0.3" sources."simple-concat-1.0.1" sources."simple-get-3.1.0" - (sources."simple-swizzle-0.2.2" // { - dependencies = [ - sources."is-arrayish-0.3.2" - ]; - }) + sources."simple-swizzle-0.2.2" sources."slash-3.0.0" (sources."slice-ansi-1.0.0" // { dependencies = [ @@ -93761,11 +94113,13 @@ in sources."is-descriptor-0.1.6" sources."kind-of-5.1.0" sources."ms-2.0.0" + sources."source-map-0.5.7" ]; }) (sources."snapdragon-node-2.1.1" // { dependencies = [ sources."define-property-1.0.0" + sources."isobject-3.0.1" ]; }) (sources."snapdragon-util-3.0.1" // { @@ -93773,13 +94127,9 @@ in sources."kind-of-3.2.2" ]; }) - sources."source-map-0.5.7" + sources."source-map-0.6.1" sources."source-map-resolve-0.5.3" - (sources."source-map-support-0.5.19" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) + sources."source-map-support-0.5.19" sources."source-map-url-0.4.1" sources."split-skip-0.0.2" sources."split-string-3.1.0" @@ -93808,22 +94158,19 @@ in sources."strict-uri-encode-1.1.0" sources."string-kit-0.11.10" sources."string-padding-1.0.2" - (sources."string-to-stream-1.1.1" // { + sources."string-to-stream-1.1.1" + (sources."string-width-1.0.2" // { + dependencies = [ + sources."strip-ansi-3.0.1" + ]; + }) + (sources."string_decoder-1.1.1" // { dependencies = [ - sources."readable-stream-2.3.7" sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" ]; }) - (sources."string-width-4.2.2" // { - dependencies = [ - sources."strip-ansi-6.0.0" - ]; - }) - sources."string_decoder-1.3.0" (sources."stringify-parameters-0.0.4" // { dependencies = [ - sources."commander-2.20.3" sources."magicli-0.0.5" ]; }) @@ -93844,28 +94191,34 @@ in sources."symbol-observable-1.2.0" sources."symbol-tree-3.2.4" sources."table-layout-0.4.5" - (sources."tar-4.4.16" // { + (sources."tar-4.4.17" // { dependencies = [ sources."yallist-3.1.1" ]; }) sources."tar-fs-2.1.1" - sources."tar-stream-2.2.0" + (sources."tar-stream-2.2.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) (sources."tcp-port-used-0.1.2" // { dependencies = [ sources."debug-0.7.4" sources."q-0.9.7" ]; }) - sources."temp-0.8.4" + (sources."temp-0.8.4" // { + dependencies = [ + sources."rimraf-2.6.3" + ]; + }) sources."terminal-kit-1.49.4" sources."through-2.3.8" (sources."tkwidgets-0.5.26" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" sources."escape-string-regexp-1.0.5" sources."is-fullwidth-code-point-2.0.0" sources."node-emoji-git+https://github.com/laurent22/node-emoji.git" @@ -93896,7 +94249,6 @@ in (sources."uglify-js-3.4.10" // { dependencies = [ sources."commander-2.19.0" - sources."source-map-0.6.1" ]; }) sources."uglifycss-0.0.29" @@ -93915,6 +94267,7 @@ in ]; }) sources."has-values-0.1.4" + sources."isobject-3.0.1" ]; }) sources."upper-case-1.1.3" @@ -93939,18 +94292,23 @@ in sources."whatwg-encoding-1.0.5" sources."whatwg-mimetype-2.3.0" sources."whatwg-url-7.1.0" - sources."which-1.3.1" - (sources."wide-align-1.1.3" // { + sources."which-2.0.2" + sources."wide-align-1.1.3" + (sources."widest-line-3.1.0" // { dependencies = [ - sources."is-fullwidth-code-point-2.0.0" - sources."string-width-2.1.1" + sources."ansi-regex-5.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.2" + sources."strip-ansi-6.0.0" ]; }) - sources."widest-line-3.1.0" sources."word-wrap-1.2.3" sources."wordwrapjs-3.0.0" (sources."wrap-ansi-7.0.0" // { dependencies = [ + sources."ansi-regex-5.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.2" sources."strip-ansi-6.0.0" ]; }) @@ -93958,12 +94316,8 @@ in sources."write-file-atomic-2.4.3" sources."ws-7.5.3" sources."xml-name-validator-3.0.0" - (sources."xml2js-0.4.23" // { - dependencies = [ - sources."xmlbuilder-11.0.1" - ]; - }) - sources."xmlbuilder-9.0.7" + sources."xml2js-0.4.23" + sources."xmlbuilder-11.0.1" sources."xmlchars-2.2.0" sources."yallist-4.0.0" sources."yaml-1.10.2" @@ -94052,7 +94406,7 @@ in sha512 = "sxKt7h0vzCd+3Y81Ey2qinupL6DpRSZJclS04ugHDNmRUXGzqicMJ6iwayhSA0S0DwwX30c5ozyUthr1QKF6uw=="; }; dependencies = [ - sources."@babel/parser-7.15.2" + sources."@babel/parser-7.15.3" sources."argparse-1.0.10" sources."bluebird-3.7.2" sources."catharsis-0.9.0" @@ -94089,10 +94443,10 @@ in jshint = nodeEnv.buildNodePackage { name = "jshint"; packageName = "jshint"; - version = "2.13.0"; + version = "2.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/jshint/-/jshint-2.13.0.tgz"; - sha512 = "Nd+md9wIeyfDK+RGrbOBzwLONSTdihGMtyGYU/t7zYcN2EgUa4iuY3VK2oxtPYrW5ycTj18iC+UbhNTxe4C66g=="; + url = "https://registry.npmjs.org/jshint/-/jshint-2.13.1.tgz"; + sha512 = "vymzfR3OysF5P774x6zYv0bD4EpH6NWRxpq54wO9mA9RuY49yb1teKSICkLx2Ryx+mfzlVVNNbTBtsRtg78t7g=="; }; dependencies = [ sources."balanced-match-1.0.2" @@ -94386,7 +94740,7 @@ in ]; }) sources."ms-2.0.0" - sources."nanoid-3.1.23" + sources."nanoid-3.1.25" sources."negotiator-0.6.2" sources."normalize-url-4.5.1" sources."object-assign-4.1.1" @@ -95090,14 +95444,14 @@ in sources."@oclif/command-1.8.0" (sources."@oclif/config-1.17.0" // { dependencies = [ - sources."tslib-2.3.0" + sources."tslib-2.3.1" ]; }) - (sources."@oclif/core-0.5.29" // { + (sources."@oclif/core-0.5.30" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" - sources."tslib-2.3.0" + sources."tslib-2.3.1" sources."universalify-2.0.0" ]; }) @@ -95152,7 +95506,7 @@ in dependencies = [ sources."has-flag-4.0.0" sources."supports-color-8.1.1" - sources."tslib-2.3.0" + sources."tslib-2.3.1" ]; }) sources."cli-width-3.0.0" @@ -95361,7 +95715,7 @@ in sources."@types/component-emitter-1.2.10" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.12" - sources."@types/node-16.4.13" + sources."@types/node-16.6.1" sources."accepts-1.3.7" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" @@ -95644,7 +95998,7 @@ in sources."insert-module-globals-7.2.1" sources."internal-slot-1.0.3" sources."is-arguments-1.1.1" - sources."is-bigint-1.0.3" + sources."is-bigint-1.0.4" sources."is-boolean-object-1.1.2" sources."is-buffer-1.1.6" sources."is-callable-1.2.4" @@ -96508,18 +96862,18 @@ in ]; }) sources."@octokit/graphql-4.6.4" - sources."@octokit/openapi-types-9.6.0" + sources."@octokit/openapi-types-9.7.0" sources."@octokit/plugin-enterprise-rest-6.0.1" sources."@octokit/plugin-paginate-rest-2.15.1" sources."@octokit/plugin-request-log-1.0.4" - sources."@octokit/plugin-rest-endpoint-methods-5.7.0" - (sources."@octokit/request-5.6.0" // { + sources."@octokit/plugin-rest-endpoint-methods-5.8.0" + (sources."@octokit/request-5.6.1" // { dependencies = [ sources."is-plain-object-5.0.0" ]; }) sources."@octokit/request-error-2.1.0" - sources."@octokit/rest-18.9.0" + sources."@octokit/rest-18.9.1" sources."@octokit/types-6.25.0" sources."@tootallnate/once-1.1.2" sources."@types/minimatch-3.0.5" @@ -96778,7 +97132,7 @@ in sources."internal-slot-1.0.3" sources."ip-1.1.5" sources."is-arrayish-0.2.1" - sources."is-bigint-1.0.3" + sources."is-bigint-1.0.4" sources."is-boolean-object-1.1.2" sources."is-callable-1.2.4" sources."is-ci-2.0.0" @@ -96915,7 +97269,7 @@ in sources."resolve-from-4.0.0" sources."rimraf-2.7.1" sources."semver-5.7.1" - sources."tar-4.4.16" + sources."tar-4.4.17" sources."which-1.3.1" sources."yallist-3.1.1" ]; @@ -97061,7 +97415,7 @@ in sources."strip-indent-3.0.0" sources."strong-log-transformer-2.1.0" sources."supports-color-7.2.0" - sources."tar-6.1.7" + sources."tar-6.1.8" sources."temp-dir-1.0.0" (sources."temp-write-4.0.0" // { dependencies = [ @@ -98078,13 +98432,13 @@ in sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/helper-validator-option-7.14.5" sources."@babel/helper-wrap-function-7.14.5" - sources."@babel/helpers-7.14.8" + sources."@babel/helpers-7.15.3" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.15.2" + sources."@babel/parser-7.15.3" 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" @@ -98121,7 +98475,7 @@ in sources."@babel/plugin-transform-arrow-functions-7.14.5" sources."@babel/plugin-transform-async-to-generator-7.14.5" sources."@babel/plugin-transform-block-scoped-functions-7.14.5" - sources."@babel/plugin-transform-block-scoping-7.14.5" + sources."@babel/plugin-transform-block-scoping-7.15.3" sources."@babel/plugin-transform-classes-7.14.9" sources."@babel/plugin-transform-computed-properties-7.14.5" sources."@babel/plugin-transform-destructuring-7.14.7" @@ -98154,7 +98508,7 @@ in 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/runtime-7.15.3" sources."@babel/template-7.14.5" sources."@babel/traverse-7.15.0" sources."@babel/types-7.15.0" @@ -98178,7 +98532,7 @@ in sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" sources."@types/json-schema-7.0.9" - sources."@types/node-16.4.13" + sources."@types/node-16.6.1" sources."@types/normalize-package-data-2.4.1" sources."@types/resolve-0.0.8" sources."@types/yargs-15.0.14" @@ -98351,7 +98705,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.30001249" + sources."caniuse-lite-1.0.30001251" sources."capture-exit-2.0.0" sources."caseless-0.12.0" (sources."chalk-3.0.0" // { @@ -98475,7 +98829,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.801" + sources."electron-to-chromium-1.3.806" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -99751,7 +100105,7 @@ in 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/helpers-7.15.3" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -99763,7 +100117,7 @@ in sources."supports-color-5.5.0" ]; }) - sources."@babel/parser-7.15.2" + sources."@babel/parser-7.15.3" 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" @@ -99776,7 +100130,7 @@ in sources."@babel/plugin-transform-typescript-7.15.0" sources."@babel/preset-flow-7.14.5" sources."@babel/preset-typescript-7.15.0" - sources."@babel/register-7.14.5" + sources."@babel/register-7.15.3" sources."@babel/template-7.14.5" sources."@babel/traverse-7.15.0" sources."@babel/types-7.15.0" @@ -99787,14 +100141,14 @@ in sources."@oclif/command-1.8.0" (sources."@oclif/config-1.17.0" // { dependencies = [ - sources."tslib-2.3.0" + sources."tslib-2.3.1" ]; }) - (sources."@oclif/core-0.5.29" // { + (sources."@oclif/core-0.5.30" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" - sources."tslib-2.3.0" + sources."tslib-2.3.1" sources."universalify-2.0.0" ]; }) @@ -99813,10 +100167,10 @@ in }) sources."@oclif/plugin-help-3.3.0" sources."@oclif/screen-1.0.4" - sources."@percy/config-1.0.0-beta.63" - sources."@percy/logger-1.0.0-beta.63" + sources."@percy/config-1.0.0-beta.65" + sources."@percy/logger-1.0.0-beta.65" sources."@percy/migrate-0.10.0" - sources."@types/node-16.4.13" + sources."@types/node-16.6.1" sources."@types/parse-json-4.0.0" sources."@types/yauzl-2.9.2" sources."agent-base-6.0.2" @@ -99834,7 +100188,7 @@ in sources."assign-symbols-1.0.0" (sources."ast-types-0.14.2" // { dependencies = [ - sources."tslib-2.3.0" + sources."tslib-2.3.1" ]; }) sources."at-least-node-1.0.0" @@ -99858,7 +100212,7 @@ in sources."cache-base-1.0.1" sources."call-bind-1.0.2" sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001249" + sources."caniuse-lite-1.0.30001251" sources."cardinal-2.1.1" sources."chalk-4.1.2" sources."chardet-0.7.0" @@ -99887,7 +100241,7 @@ in (sources."cli-ux-5.6.3" // { dependencies = [ sources."supports-color-8.1.1" - sources."tslib-2.3.0" + sources."tslib-2.3.1" ]; }) sources."cli-width-3.0.0" @@ -99963,7 +100317,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.801" + sources."electron-to-chromium-1.3.806" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" @@ -100134,7 +100488,7 @@ in sources."map-cache-0.2.2" sources."map-visit-1.0.0" sources."merge2-1.4.1" - sources."mermaid-8.11.4" + sources."mermaid-8.11.5" sources."micromatch-4.0.4" sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" @@ -100211,7 +100565,7 @@ in (sources."recast-0.20.5" // { dependencies = [ sources."source-map-0.6.1" - sources."tslib-2.3.0" + sources."tslib-2.3.1" ]; }) sources."redeyed-2.1.1" @@ -100390,7 +100744,7 @@ in sources."@fluentui/style-utilities-8.2.2" sources."@fluentui/theme-2.2.1" sources."@fluentui/utilities-8.2.2" - sources."@microsoft/load-themed-styles-1.10.197" + sources."@microsoft/load-themed-styles-1.10.202" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."accepts-1.3.7" @@ -100655,7 +101009,7 @@ in sources."to-readable-stream-1.0.0" sources."toidentifier-1.0.0" sources."ts-log-2.2.3" - sources."tslib-2.3.0" + sources."tslib-2.3.1" sources."type-is-1.6.18" sources."unpipe-1.0.0" sources."uri-js-4.4.1" @@ -101010,10 +101364,10 @@ in netlify-cli = nodeEnv.buildNodePackage { name = "netlify-cli"; packageName = "netlify-cli"; - version = "6.1.0"; + version = "6.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-6.1.0.tgz"; - sha512 = "1jNmgR6DA3aoMLVhEfuagYBzxHVqK7x6pLRY+4c5Atn3PJ/hX1SU56rBED6BRTNiPfGTuudPNXHjWj75MUpj/w=="; + url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-6.4.2.tgz"; + sha512 = "3w4D4AG3j0+diPu284sWPenkyTIjZ/j0M3DQ+MU6Vp3298fV/yncpC0taAPk/7NxqAH90Z+iWpdvoO9IUahzzA=="; }; dependencies = [ sources."@babel/code-frame-7.14.5" @@ -101055,17 +101409,18 @@ in sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/helper-validator-option-7.14.5" sources."@babel/helper-wrap-function-7.14.5" - sources."@babel/helpers-7.14.8" + sources."@babel/helpers-7.15.3" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" + sources."escape-string-regexp-1.0.5" sources."supports-color-5.5.0" ]; }) - sources."@babel/parser-7.15.2" + sources."@babel/parser-7.15.3" 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" @@ -101099,7 +101454,7 @@ in sources."@babel/plugin-transform-arrow-functions-7.14.5" sources."@babel/plugin-transform-async-to-generator-7.14.5" sources."@babel/plugin-transform-block-scoped-functions-7.14.5" - sources."@babel/plugin-transform-block-scoping-7.14.5" + sources."@babel/plugin-transform-block-scoping-7.15.3" sources."@babel/plugin-transform-classes-7.14.9" sources."@babel/plugin-transform-computed-properties-7.14.5" sources."@babel/plugin-transform-destructuring-7.14.7" @@ -101134,7 +101489,7 @@ in ]; }) sources."@babel/preset-modules-0.1.4" - sources."@babel/runtime-7.14.8" + sources."@babel/runtime-7.15.3" sources."@babel/template-7.14.5" sources."@babel/traverse-7.15.0" sources."@babel/types-7.15.0" @@ -101147,112 +101502,77 @@ in sources."@dabh/diagnostics-2.0.2" sources."@jest/types-24.9.0" sources."@mrmlnc/readdir-enhanced-2.2.1" - (sources."@netlify/build-17.10.0" // { + (sources."@netlify/build-18.2.9" // { dependencies = [ - (sources."@netlify/zip-it-and-ship-it-4.17.0" // { - dependencies = [ - sources."execa-5.1.1" - sources."locate-path-6.0.0" - sources."p-locate-5.0.0" - sources."pkg-dir-5.0.0" - sources."semver-7.3.5" - sources."yargs-16.2.0" - ]; - }) - sources."ansi-styles-4.3.0" - (sources."boxen-4.2.0" // { - dependencies = [ - sources."chalk-3.0.0" - ]; - }) - sources."cp-file-9.1.0" - (sources."execa-3.4.0" // { - dependencies = [ - sources."get-stream-5.2.0" - sources."human-signals-1.1.1" - ]; - }) - sources."get-stream-6.0.1" - sources."human-signals-2.1.0" sources."is-plain-obj-2.1.0" - sources."locate-path-5.0.0" - sources."resolve-2.0.0-next.3" - sources."semver-6.3.0" - sources."type-fest-0.8.1" - (sources."update-notifier-4.1.3" // { + (sources."locate-path-5.0.0" // { dependencies = [ - sources."chalk-3.0.0" + sources."p-locate-4.1.0" ]; }) + sources."resolve-2.0.0-next.3" ]; }) - (sources."@netlify/cache-utils-2.0.0" // { + (sources."@netlify/cache-utils-2.0.1" // { dependencies = [ sources."del-5.1.0" sources."locate-path-5.0.0" + sources."p-locate-4.1.0" sources."p-map-3.0.0" sources."slash-3.0.0" ]; }) - (sources."@netlify/config-14.4.3" // { + (sources."@netlify/config-15.3.3" // { dependencies = [ sources."dot-prop-5.3.0" - sources."execa-3.4.0" - sources."find-up-4.1.0" sources."is-plain-obj-2.1.0" - sources."locate-path-5.0.0" ]; }) sources."@netlify/esbuild-0.13.6" - (sources."@netlify/framework-info-5.8.0" // { - dependencies = [ - sources."p-locate-5.0.0" - ]; - }) + sources."@netlify/framework-info-5.8.0" sources."@netlify/functions-utils-2.0.2" - (sources."@netlify/git-utils-2.0.0" // { + (sources."@netlify/git-utils-2.0.1" // { dependencies = [ sources."braces-3.0.2" - sources."execa-3.4.0" sources."fill-range-7.0.1" sources."is-number-7.0.0" sources."micromatch-4.0.4" sources."to-regex-range-5.0.1" ]; }) - sources."@netlify/local-functions-proxy-1.1.0" - sources."@netlify/local-functions-proxy-darwin-arm64-1.1.0" - sources."@netlify/local-functions-proxy-darwin-x64-1.1.0" - sources."@netlify/local-functions-proxy-freebsd-arm64-1.1.0" - sources."@netlify/local-functions-proxy-freebsd-x64-1.1.0" - sources."@netlify/local-functions-proxy-linux-arm-1.1.0" - sources."@netlify/local-functions-proxy-linux-arm64-1.1.0" - sources."@netlify/local-functions-proxy-linux-ia32-1.1.0" - sources."@netlify/local-functions-proxy-linux-ppc64-1.1.0" - sources."@netlify/local-functions-proxy-linux-x64-1.1.0" - sources."@netlify/local-functions-proxy-openbsd-x64-1.1.0" - sources."@netlify/local-functions-proxy-win32-ia32-1.1.0" - sources."@netlify/local-functions-proxy-win32-x64-1.1.0" + sources."@netlify/local-functions-proxy-1.1.1" + sources."@netlify/local-functions-proxy-darwin-arm64-1.1.1" + sources."@netlify/local-functions-proxy-darwin-x64-1.1.1" + sources."@netlify/local-functions-proxy-freebsd-arm64-1.1.1" + sources."@netlify/local-functions-proxy-freebsd-x64-1.1.1" + sources."@netlify/local-functions-proxy-linux-arm-1.1.1" + sources."@netlify/local-functions-proxy-linux-arm64-1.1.1" + sources."@netlify/local-functions-proxy-linux-ia32-1.1.1" + sources."@netlify/local-functions-proxy-linux-ppc64-1.1.1" + sources."@netlify/local-functions-proxy-linux-x64-1.1.1" + sources."@netlify/local-functions-proxy-openbsd-x64-1.1.1" + sources."@netlify/local-functions-proxy-win32-ia32-1.1.1" + sources."@netlify/local-functions-proxy-win32-x64-1.1.1" sources."@netlify/open-api-2.5.0" (sources."@netlify/plugin-edge-handlers-1.11.22" // { dependencies = [ sources."@types/node-14.17.9" - sources."typescript-4.3.5" ]; }) sources."@netlify/plugins-list-3.3.0" sources."@netlify/routing-local-proxy-0.31.0" - (sources."@netlify/run-utils-2.0.0" // { - dependencies = [ - sources."execa-3.4.0" - ]; - }) - (sources."@netlify/zip-it-and-ship-it-4.16.0" // { + sources."@netlify/run-utils-2.0.1" + (sources."@netlify/zip-it-and-ship-it-4.17.0" // { dependencies = [ + sources."ansi-styles-4.3.0" + sources."cliui-7.0.4" sources."cp-file-9.1.0" sources."pkg-dir-5.0.0" sources."resolve-2.0.0-next.3" + sources."wrap-ansi-7.0.0" + sources."y18n-5.0.8" sources."yargs-16.2.0" + sources."yargs-parser-20.2.9" ]; }) (sources."@nodelib/fs.scandir-2.1.5" // { @@ -101300,17 +101620,16 @@ in sources."micromatch-4.0.4" sources."slash-3.0.0" sources."to-regex-range-5.0.1" - sources."tslib-2.3.0" + sources."tslib-2.3.1" ]; }) - (sources."@oclif/core-0.5.29" // { + (sources."@oclif/core-0.5.30" // { dependencies = [ sources."@nodelib/fs.stat-2.0.5" + sources."ansi-styles-4.3.0" sources."array-union-2.1.0" sources."braces-3.0.2" - sources."clean-stack-3.0.1" sources."dir-glob-3.0.1" - sources."escape-string-regexp-4.0.0" sources."fast-glob-3.2.7" sources."fill-range-7.0.1" sources."fs-extra-9.1.0" @@ -101322,14 +101641,15 @@ in sources."micromatch-4.0.4" sources."slash-3.0.0" sources."to-regex-range-5.0.1" - sources."tslib-2.3.0" + sources."tslib-2.3.1" sources."universalify-2.0.0" + sources."wrap-ansi-7.0.0" ]; }) (sources."@oclif/errors-1.3.5" // { dependencies = [ - sources."clean-stack-3.0.1" - sources."escape-string-regexp-4.0.0" + sources."ansi-styles-4.3.0" + sources."wrap-ansi-7.0.0" ]; }) sources."@oclif/linewrap-1.0.0" @@ -101339,6 +101659,7 @@ in sources."chalk-2.4.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" + sources."escape-string-regexp-1.0.5" sources."supports-color-5.5.0" ]; }) @@ -101348,9 +101669,11 @@ in sources."ansi-escapes-3.2.0" sources."ansi-styles-3.2.1" sources."chalk-2.4.2" + sources."clean-stack-2.2.0" sources."cli-ux-4.9.3" sources."color-convert-1.9.3" sources."color-name-1.1.3" + sources."escape-string-regexp-1.0.5" sources."fs-extra-7.0.1" sources."indent-string-3.2.0" sources."is-wsl-1.1.0" @@ -101363,7 +101686,8 @@ in dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" - sources."tslib-2.3.0" + sources."npm-run-path-4.0.1" + sources."tslib-2.3.1" sources."universalify-2.0.0" ]; }) @@ -101376,17 +101700,17 @@ in ]; }) sources."@octokit/graphql-4.6.4" - sources."@octokit/openapi-types-9.6.0" + sources."@octokit/openapi-types-9.7.0" sources."@octokit/plugin-paginate-rest-2.15.1" sources."@octokit/plugin-request-log-1.0.4" - sources."@octokit/plugin-rest-endpoint-methods-5.7.0" - (sources."@octokit/request-5.6.0" // { + sources."@octokit/plugin-rest-endpoint-methods-5.8.0" + (sources."@octokit/request-5.6.1" // { dependencies = [ sources."is-plain-object-5.0.0" ]; }) sources."@octokit/request-error-2.1.0" - sources."@octokit/rest-18.9.0" + sources."@octokit/rest-18.9.1" sources."@octokit/types-6.25.0" sources."@rollup/plugin-babel-5.3.0" (sources."@rollup/plugin-commonjs-18.1.0" // { @@ -101400,11 +101724,7 @@ in sources."@rollup/pluginutils-3.1.0" sources."@samverschueren/stream-to-observable-0.3.1" sources."@sindresorhus/is-0.14.0" - (sources."@sindresorhus/slugify-1.1.2" // { - dependencies = [ - sources."escape-string-regexp-4.0.0" - ]; - }) + sources."@sindresorhus/slugify-1.1.2" (sources."@sindresorhus/transliterate-0.1.2" // { dependencies = [ sources."escape-string-regexp-2.0.0" @@ -101424,7 +101744,7 @@ in sources."@types/istanbul-reports-1.1.2" sources."@types/keyv-3.1.2" sources."@types/minimatch-3.0.5" - sources."@types/node-16.4.13" + sources."@types/node-16.6.1" sources."@types/node-fetch-2.5.12" sources."@types/normalize-package-data-2.4.1" sources."@types/resolve-1.17.1" @@ -101432,8 +101752,8 @@ in sources."@types/semver-7.3.8" sources."@types/yargs-13.0.12" sources."@types/yargs-parser-20.2.1" - sources."@typescript-eslint/types-4.29.1" - (sources."@typescript-eslint/typescript-estree-4.29.1" // { + sources."@typescript-eslint/types-4.29.2" + (sources."@typescript-eslint/typescript-estree-4.29.2" // { dependencies = [ sources."@nodelib/fs.stat-2.0.5" sources."array-union-2.1.0" @@ -101450,12 +101770,16 @@ in sources."to-regex-range-5.0.1" ]; }) - sources."@typescript-eslint/visitor-keys-4.29.1" + sources."@typescript-eslint/visitor-keys-4.29.2" sources."@ungap/from-entries-0.2.1" sources."accepts-1.3.7" sources."acorn-8.4.1" sources."agent-base-6.0.2" - sources."aggregate-error-3.1.0" + (sources."aggregate-error-3.1.0" // { + dependencies = [ + sources."clean-stack-2.2.0" + ]; + }) sources."ajv-8.6.2" (sources."all-node-versions-8.0.0" // { dependencies = [ @@ -101464,9 +101788,12 @@ in sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" sources."chalk-3.0.0" + sources."get-stream-5.2.0" + sources."has-flag-4.0.0" sources."jest-get-type-25.2.6" sources."jest-validate-25.5.0" sources."pretty-format-25.5.0" + sources."supports-color-7.2.0" ]; }) (sources."ansi-align-3.0.0" // { @@ -101541,8 +101868,10 @@ in }) (sources."boxen-5.0.1" // { dependencies = [ + sources."ansi-styles-4.3.0" sources."camelcase-6.2.0" sources."type-fest-0.20.2" + sources."wrap-ansi-7.0.0" ]; }) sources."brace-expansion-1.1.11" @@ -101572,6 +101901,7 @@ in }) (sources."cacheable-request-6.1.0" // { dependencies = [ + sources."get-stream-5.2.0" sources."lowercase-keys-2.0.0" ]; }) @@ -101580,11 +101910,13 @@ in sources."call-me-maybe-1.0.1" sources."callsite-1.0.0" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001249" + sources."caniuse-lite-1.0.30001251" sources."cardinal-2.1.1" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" + sources."has-flag-4.0.0" + sources."supports-color-7.2.0" ]; }) sources."chardet-0.7.0" @@ -101616,7 +101948,7 @@ in ]; }) sources."clean-deep-3.4.0" - sources."clean-stack-2.2.0" + sources."clean-stack-3.0.1" sources."cli-boxes-2.2.1" sources."cli-cursor-2.1.0" sources."cli-progress-3.9.0" @@ -101633,22 +101965,19 @@ in dependencies = [ sources."ansi-styles-4.3.0" sources."argparse-1.0.10" - sources."clean-stack-3.0.1" - sources."escape-string-regexp-4.0.0" sources."extract-stack-2.0.0" sources."has-flag-4.0.0" sources."js-yaml-3.14.1" - sources."supports-color-8.1.1" (sources."supports-hyperlinks-2.2.0" // { dependencies = [ sources."supports-color-7.2.0" ]; }) - sources."tslib-2.3.0" + sources."tslib-2.3.1" ]; }) sources."cli-width-2.2.1" - sources."cliui-7.0.4" + sources."cliui-6.0.0" sources."clone-1.0.4" sources."clone-response-1.0.2" sources."code-point-at-1.1.0" @@ -101715,7 +102044,12 @@ in }) sources."crc-32-1.2.0" sources."crc32-stream-4.0.2" - sources."cross-spawn-7.0.3" + (sources."cross-spawn-6.0.5" // { + dependencies = [ + sources."path-key-2.0.1" + sources."semver-5.7.1" + ]; + }) sources."crypto-random-string-2.0.0" sources."cyclist-1.0.1" sources."date-fns-1.30.1" @@ -101743,7 +102077,6 @@ in dependencies = [ sources."bl-1.2.3" sources."file-type-5.2.0" - sources."is-stream-1.1.0" sources."readable-stream-2.3.7" sources."safe-buffer-5.1.2" sources."tar-stream-1.6.2" @@ -101752,13 +102085,11 @@ in (sources."decompress-tarbz2-4.1.1" // { dependencies = [ sources."file-type-6.2.0" - sources."is-stream-1.1.0" ]; }) (sources."decompress-targz-4.1.1" // { dependencies = [ sources."file-type-5.2.0" - sources."is-stream-1.1.0" ]; }) (sources."decompress-unzip-4.0.1" // { @@ -101804,7 +102135,11 @@ in sources."detective-sass-3.0.1" sources."detective-scss-2.0.1" sources."detective-stylus-1.0.0" - sources."detective-typescript-7.0.0" + (sources."detective-typescript-7.0.0" // { + dependencies = [ + sources."typescript-3.9.10" + ]; + }) (sources."dir-glob-2.2.2" // { dependencies = [ sources."path-type-3.0.0" @@ -101842,7 +102177,7 @@ in }) sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.801" + sources."electron-to-chromium-1.3.806" sources."elegant-spinner-1.0.1" sources."elf-cam-0.1.1" sources."emoji-regex-8.0.0" @@ -101856,7 +102191,7 @@ in sources."escalade-3.1.1" sources."escape-goat-2.1.1" sources."escape-html-1.0.3" - sources."escape-string-regexp-1.0.5" + sources."escape-string-regexp-4.0.0" (sources."escodegen-2.0.0" // { dependencies = [ sources."source-map-0.6.1" @@ -101871,8 +102206,12 @@ in sources."eventemitter3-4.0.7" (sources."execa-5.1.1" // { dependencies = [ - sources."get-stream-6.0.1" - sources."human-signals-2.1.0" + sources."cross-spawn-7.0.3" + sources."is-stream-2.0.1" + sources."npm-run-path-4.0.1" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" + sources."which-2.0.2" ]; }) sources."exit-on-epipe-1.0.1" @@ -101947,7 +102286,9 @@ in sources."cacheable-request-7.0.2" sources."decompress-response-5.0.0" sources."defer-to-connect-2.0.1" + sources."get-stream-5.2.0" sources."got-10.7.0" + sources."has-flag-4.0.0" sources."jest-get-type-25.2.6" (sources."jest-validate-25.5.0" // { dependencies = [ @@ -101962,10 +102303,15 @@ in sources."p-cancelable-2.1.1" sources."pretty-format-25.5.0" sources."responselike-2.0.0" + sources."supports-color-7.2.0" sources."type-fest-0.10.0" ]; }) - sources."figures-3.2.0" + (sources."figures-3.2.0" // { + dependencies = [ + sources."escape-string-regexp-1.0.5" + ]; + }) sources."file-size-0.0.5" sources."file-type-11.1.0" sources."filename-reserved-regex-2.0.0" @@ -102011,7 +102357,7 @@ in sources."get-intrinsic-1.1.1" sources."get-package-type-0.1.0" sources."get-port-5.1.1" - sources."get-stream-5.2.0" + sources."get-stream-6.0.1" sources."get-value-2.0.6" sources."gh-release-fetch-2.0.2" sources."git-repo-info-2.1.1" @@ -102024,7 +102370,11 @@ in }) sources."glob-to-regexp-0.3.0" sources."global-cache-dir-2.0.0" - sources."global-dirs-2.1.0" + (sources."global-dirs-3.0.0" // { + dependencies = [ + sources."ini-2.0.0" + ]; + }) sources."globals-11.12.0" (sources."globby-10.0.2" // { dependencies = [ @@ -102079,6 +102429,7 @@ in }) (sources."hasha-5.2.2" // { dependencies = [ + sources."is-stream-2.0.1" sources."type-fest-0.8.1" ]; }) @@ -102086,6 +102437,7 @@ in sources."http-cache-semantics-4.1.0" (sources."http-call-5.3.0" // { dependencies = [ + sources."is-stream-2.0.1" sources."parse-json-4.0.0" ]; }) @@ -102105,7 +102457,7 @@ in ]; }) sources."https-proxy-agent-5.0.0" - sources."human-signals-1.1.1" + sources."human-signals-2.1.0" sources."hyperlinker-1.0.0" sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" @@ -102116,7 +102468,7 @@ in sources."indexes-of-1.0.1" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."ini-1.3.7" + sources."ini-1.3.8" (sources."inquirer-6.5.2" // { dependencies = [ sources."ansi-escapes-3.2.0" @@ -102125,6 +102477,7 @@ in sources."chalk-2.4.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" + sources."escape-string-regexp-1.0.5" sources."figures-2.0.0" sources."is-fullwidth-code-point-2.0.0" (sources."string-width-2.1.1" // { @@ -102160,11 +102513,11 @@ in sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.1" - sources."is-installed-globally-0.3.2" + sources."is-installed-globally-0.4.0" sources."is-interactive-1.0.0" sources."is-module-1.0.0" sources."is-natural-number-4.0.1" - sources."is-npm-4.0.0" + sources."is-npm-5.0.0" (sources."is-number-3.0.0" // { dependencies = [ sources."kind-of-3.2.2" @@ -102180,7 +102533,7 @@ in sources."is-promise-2.2.2" sources."is-reference-1.2.1" sources."is-retry-allowed-1.2.0" - sources."is-stream-2.0.1" + sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" sources."is-unicode-supported-0.1.0" sources."is-url-1.2.4" @@ -102199,10 +102552,16 @@ in sources."chalk-2.4.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" + sources."escape-string-regexp-1.0.5" sources."supports-color-5.5.0" ]; }) - sources."jest-worker-26.6.2" + (sources."jest-worker-26.6.2" // { + dependencies = [ + sources."has-flag-4.0.0" + sources."supports-color-7.2.0" + ]; + }) sources."js-string-escape-1.0.1" sources."js-tokens-4.0.0" sources."js-yaml-4.1.0" @@ -102215,11 +102574,7 @@ in sources."jsonfile-4.0.0" sources."junk-3.1.0" sources."jwt-decode-3.1.2" - (sources."keep-func-props-3.0.1" // { - dependencies = [ - sources."mimic-fn-3.1.0" - ]; - }) + sources."keep-func-props-3.0.1" sources."keyv-3.1.0" sources."kind-of-6.0.3" sources."kuler-2.0.0" @@ -102240,7 +102595,6 @@ in sources."lines-and-columns-1.1.6" (sources."listr-0.14.3" // { dependencies = [ - sources."is-stream-1.1.0" sources."p-map-2.1.0" ]; }) @@ -102250,6 +102604,7 @@ in sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" sources."chalk-1.1.3" + sources."escape-string-regexp-1.0.5" sources."figures-1.7.0" sources."indent-string-3.2.0" sources."log-symbols-1.0.2" @@ -102263,6 +102618,7 @@ in sources."chalk-2.4.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" + sources."escape-string-regexp-1.0.5" sources."figures-2.0.0" sources."supports-color-5.5.0" ]; @@ -102273,11 +102629,7 @@ in sources."type-fest-0.3.1" ]; }) - (sources."locate-path-6.0.0" // { - dependencies = [ - sources."p-locate-5.0.0" - ]; - }) + sources."locate-path-6.0.0" sources."lodash-4.17.21" sources."lodash._reinterpolate-3.0.0" sources."lodash.camelcase-4.3.0" @@ -102297,8 +102649,10 @@ in sources."ansi-styles-4.3.0" sources."chalk-3.0.0" sources."fast-equals-1.6.3" + sources."has-flag-4.0.0" sources."micro-memoize-2.1.2" sources."moize-5.4.7" + sources."supports-color-7.2.0" ]; }) sources."log-symbols-4.1.0" @@ -102353,7 +102707,7 @@ in sources."mime-1.6.0" sources."mime-db-1.49.0" sources."mime-types-2.1.32" - sources."mimic-fn-2.1.0" + sources."mimic-fn-3.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -102384,7 +102738,7 @@ in ]; }) sources."mute-stream-0.0.7" - sources."nanoid-3.1.23" + sources."nanoid-3.1.25" sources."nanomatch-1.2.13" sources."natural-orderby-2.0.3" sources."negotiator-0.6.2" @@ -102394,11 +102748,8 @@ in sources."qs-6.10.1" ]; }) - (sources."netlify-redirect-parser-8.2.0" // { - dependencies = [ - sources."is-plain-obj-2.1.0" - ]; - }) + sources."netlify-headers-parser-3.0.1" + sources."netlify-redirect-parser-11.0.2" sources."netlify-redirector-0.2.1" sources."nice-try-1.0.5" sources."node-fetch-2.6.1" @@ -102411,9 +102762,11 @@ in sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" sources."chalk-3.0.0" + sources."has-flag-4.0.0" sources."jest-get-type-25.2.6" sources."jest-validate-25.5.0" sources."pretty-format-25.5.0" + sources."supports-color-7.2.0" ]; }) sources."noop2-2.0.0" @@ -102424,9 +102777,11 @@ in sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" sources."chalk-3.0.0" + sources."has-flag-4.0.0" sources."jest-get-type-25.2.6" sources."jest-validate-25.5.0" sources."pretty-format-25.5.0" + sources."supports-color-7.2.0" ]; }) (sources."normalize-package-data-2.5.0" // { @@ -102437,7 +102792,11 @@ in sources."normalize-path-3.0.0" sources."normalize-url-4.5.1" sources."npm-normalize-package-bin-1.0.1" - sources."npm-run-path-4.0.1" + (sources."npm-run-path-2.0.2" // { + dependencies = [ + sources."path-key-2.0.1" + ]; + }) sources."number-is-nan-1.0.1" sources."object-assign-4.1.1" (sources."object-copy-0.1.0" // { @@ -102461,7 +102820,7 @@ in sources."object.pick-1.3.0" (sources."oclif-plugin-completion-0.6.0" // { dependencies = [ - sources."tslib-2.3.0" + sources."tslib-2.3.1" ]; }) sources."omit.js-2.0.2" @@ -102469,7 +102828,11 @@ in sources."on-headers-1.0.2" sources."once-1.4.0" sources."one-time-1.0.0" - sources."onetime-5.1.2" + (sources."onetime-5.1.2" // { + dependencies = [ + sources."mimic-fn-2.1.0" + ]; + }) sources."open-7.4.2" (sources."opn-5.5.0" // { dependencies = [ @@ -102493,7 +102856,6 @@ in sources."p-cancelable-1.1.0" (sources."p-event-4.2.0" // { dependencies = [ - sources."p-finally-1.0.0" sources."p-timeout-3.2.0" ]; }) @@ -102507,25 +102869,20 @@ in sources."p-map-2.1.0" ]; }) - sources."p-finally-2.0.1" + sources."p-finally-1.0.0" sources."p-is-promise-1.1.0" - sources."p-limit-3.1.0" - (sources."p-locate-4.1.0" // { + sources."p-limit-2.3.0" + (sources."p-locate-5.0.0" // { dependencies = [ - sources."p-limit-2.3.0" + sources."p-limit-3.1.0" ]; }) sources."p-map-4.0.0" sources."p-reduce-2.1.0" - (sources."p-timeout-2.0.1" // { - dependencies = [ - sources."p-finally-1.0.0" - ]; - }) + sources."p-timeout-2.0.1" sources."p-try-2.2.0" (sources."p-wait-for-3.2.0" // { dependencies = [ - sources."p-finally-1.0.0" sources."p-timeout-3.2.0" ]; }) @@ -102549,12 +102906,6 @@ in (sources."password-prompt-1.1.2" // { dependencies = [ sources."ansi-escapes-3.2.0" - sources."cross-spawn-6.0.5" - sources."path-key-2.0.1" - sources."semver-5.7.1" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" - sources."which-1.3.1" ]; }) sources."path-dirname-1.0.2" @@ -102573,6 +102924,7 @@ in dependencies = [ sources."find-up-4.1.0" sources."locate-path-5.0.0" + sources."p-locate-4.1.0" ]; }) sources."posix-character-classes-0.1.1" @@ -102589,13 +102941,13 @@ in sources."color-name-1.1.3" ]; }) - sources."pretty-ms-5.1.0" + sources."pretty-ms-7.0.1" sources."prettyjson-1.2.1" sources."printj-1.1.2" sources."process-es6-0.11.6" sources."process-nextick-args-2.0.1" sources."proxy-addr-2.0.7" - sources."ps-list-6.3.0" + sources."ps-list-7.2.0" sources."pump-3.0.0" sources."punycode-2.1.1" sources."pupa-2.1.1" @@ -102622,6 +102974,7 @@ in dependencies = [ sources."find-up-4.1.0" sources."locate-path-5.0.0" + sources."p-locate-4.1.0" sources."type-fest-0.8.1" ]; }) @@ -102710,8 +103063,8 @@ in ]; }) sources."setprototypeof-1.1.1" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" sources."side-channel-1.0.4" sources."signal-exit-3.0.3" (sources."simple-swizzle-0.2.2" // { @@ -102798,6 +103151,7 @@ in sources."ansi-regex-0.2.1" sources."ansi-styles-1.1.0" sources."chalk-0.5.1" + sources."escape-string-regexp-1.0.5" sources."has-ansi-0.1.0" sources."strip-ansi-0.3.0" sources."supports-color-0.2.0" @@ -102823,8 +103177,12 @@ in sources."strip-eof-1.0.0" sources."strip-final-newline-2.0.0" sources."strip-json-comments-2.0.1" - sources."strip-outer-1.0.1" - (sources."supports-color-7.2.0" // { + (sources."strip-outer-1.0.1" // { + dependencies = [ + sources."escape-string-regexp-1.0.5" + ]; + }) + (sources."supports-color-8.1.1" // { dependencies = [ sources."has-flag-4.0.0" ]; @@ -102844,10 +103202,10 @@ in sources."temp-dir-2.0.0" (sources."tempy-1.0.1" // { dependencies = [ + sources."is-stream-2.0.1" sources."type-fest-0.16.0" ]; }) - sources."term-size-2.2.1" (sources."terser-5.7.1" // { dependencies = [ sources."source-map-0.7.3" @@ -102881,7 +103239,11 @@ in sources."toml-3.0.0" sources."tomlify-j0.4-3.0.0" sources."treeify-1.1.0" - sources."trim-repeated-1.0.0" + (sources."trim-repeated-1.0.0" // { + dependencies = [ + sources."escape-string-regexp-1.0.5" + ]; + }) sources."triple-beam-1.3.0" sources."tslib-1.14.1" sources."tsutils-3.21.0" @@ -102890,7 +103252,7 @@ in sources."type-fest-0.21.3" sources."type-is-1.6.18" sources."typedarray-to-buffer-3.1.5" - sources."typescript-3.9.10" + sources."typescript-4.3.5" sources."uid-safe-2.1.5" sources."unbzip2-stream-1.4.3" sources."unicode-canonical-property-names-ecmascript-1.0.4" @@ -102918,14 +103280,7 @@ in sources."has-values-0.1.4" ]; }) - (sources."update-notifier-5.1.0" // { - dependencies = [ - sources."global-dirs-3.0.0" - sources."ini-2.0.0" - sources."is-installed-globally-0.4.0" - sources."is-npm-5.0.0" - ]; - }) + sources."update-notifier-5.1.0" sources."uri-js-4.4.1" sources."urix-0.1.0" sources."url-parse-lax-3.0.0" @@ -102944,30 +103299,26 @@ in sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."commander-3.0.2" + sources."escape-string-regexp-1.0.5" sources."supports-color-5.5.0" ]; }) sources."wcwidth-1.0.1" sources."well-known-symbols-2.0.0" - sources."which-2.0.2" + sources."which-1.3.1" sources."which-module-2.0.0" sources."widest-line-3.1.0" (sources."windows-release-3.3.3" // { dependencies = [ - sources."cross-spawn-6.0.5" sources."execa-1.0.0" sources."get-stream-4.1.0" - sources."is-stream-1.1.0" - sources."npm-run-path-2.0.2" - sources."p-finally-1.0.0" - sources."path-key-2.0.1" - sources."semver-5.7.1" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" - sources."which-1.3.1" ]; }) - sources."winston-3.3.3" + (sources."winston-3.3.3" // { + dependencies = [ + sources."is-stream-2.0.1" + ]; + }) (sources."winston-transport-4.4.0" // { dependencies = [ sources."readable-stream-2.3.7" @@ -102975,7 +103326,7 @@ in ]; }) sources."word-wrap-1.2.3" - (sources."wrap-ansi-7.0.0" // { + (sources."wrap-ansi-6.2.0" // { dependencies = [ sources."ansi-styles-4.3.0" ]; @@ -102984,20 +103335,16 @@ in sources."write-file-atomic-3.0.3" sources."xdg-basedir-4.0.0" sources."xtend-4.0.2" - sources."y18n-5.0.8" + sources."y18n-4.0.3" sources."yallist-4.0.0" (sources."yargs-15.4.1" // { dependencies = [ - sources."ansi-styles-4.3.0" - sources."cliui-6.0.0" sources."find-up-4.1.0" sources."locate-path-5.0.0" - sources."wrap-ansi-6.2.0" - sources."y18n-4.0.3" - sources."yargs-parser-18.1.3" + sources."p-locate-4.1.0" ]; }) - sources."yargs-parser-20.2.9" + sources."yargs-parser-18.1.3" sources."yarn-1.22.11" sources."yauzl-2.10.0" sources."yocto-queue-0.1.0" @@ -103126,7 +103473,7 @@ in sources."string-width-1.0.2" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" - sources."tar-6.1.7" + sources."tar-6.1.8" sources."unique-filename-1.1.1" sources."unique-slug-2.0.2" sources."util-deprecate-1.0.2" @@ -103530,7 +103877,7 @@ in sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" - (sources."tar-4.4.16" // { + (sources."tar-4.4.17" // { dependencies = [ sources."safe-buffer-5.2.1" ]; @@ -103559,7 +103906,7 @@ in sha512 = "S3vhm/EqQwEvHDBw/375j4f5vVT9YknfTEeQjbA/Fa2XAK0WLCC+ENLV+4HzkpSAIi+9hmrF3TpdhjVLksmk1A=="; }; dependencies = [ - sources."@babel/runtime-7.14.8" + sources."@babel/runtime-7.15.3" sources."@mapbox/node-pre-gyp-1.0.5" sources."@node-red/editor-api-2.0.5" sources."@node-red/editor-client-2.0.5" @@ -103584,7 +103931,7 @@ in sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.2" - sources."@types/node-16.4.13" + sources."@types/node-16.6.1" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."accepts-1.3.7" @@ -103920,7 +104267,7 @@ in }) sources."toidentifier-1.0.0" sources."tough-cookie-4.0.0" - sources."tslib-2.3.0" + sources."tslib-2.3.1" sources."type-is-1.6.18" sources."typedarray-0.0.6" sources."uglify-js-3.13.10" @@ -104113,7 +104460,7 @@ in ]; }) sources."strip-ansi-3.0.1" - (sources."tar-6.1.7" // { + (sources."tar-6.1.8" // { dependencies = [ sources."mkdirp-1.0.4" ]; @@ -104344,7 +104691,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.2" sources."@types/minimist-1.2.2" - sources."@types/node-16.4.13" + sources."@types/node-16.6.1" sources."@types/normalize-package-data-2.4.1" sources."@types/parse-json-4.0.0" sources."@types/responselike-1.0.0" @@ -104848,10 +105195,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "7.20.5"; + version = "7.20.6"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-7.20.5.tgz"; - sha512 = "vRyu1V79n5BzKn4vkanag1xEjEMLIZ48Ry1V7IyAvHQHi8syOEiYWvUMxNpeDk+e8JKAKCNG3lIYJDm3pM8VMQ=="; + url = "https://registry.npmjs.org/npm/-/npm-7.20.6.tgz"; + sha512 = "SRx0i1sMZDf8cd0/JokYD0EPZg0BS1iTylU9MSWw07N6/9CZHjMpZL/p8gsww7m2JsWAsTamhmGl15dQ9UgUgw=="; }; buildInputs = globalBuildInputs; meta = { @@ -105169,7 +105516,7 @@ in sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" sources."supports-color-7.2.0" - sources."tar-6.1.7" + sources."tar-6.1.8" sources."to-readable-stream-1.0.0" sources."to-regex-range-5.0.1" sources."tough-cookie-2.5.0" @@ -105509,9 +105856,9 @@ in sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/helper-validator-option-7.14.5" sources."@babel/helper-wrap-function-7.14.5" - sources."@babel/helpers-7.14.8" + sources."@babel/helpers-7.15.3" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.15.2" + sources."@babel/parser-7.15.3" 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" @@ -105547,7 +105894,7 @@ in sources."@babel/plugin-transform-arrow-functions-7.14.5" sources."@babel/plugin-transform-async-to-generator-7.14.5" sources."@babel/plugin-transform-block-scoped-functions-7.14.5" - sources."@babel/plugin-transform-block-scoping-7.14.5" + sources."@babel/plugin-transform-block-scoping-7.15.3" sources."@babel/plugin-transform-classes-7.14.9" sources."@babel/plugin-transform-computed-properties-7.14.5" sources."@babel/plugin-transform-destructuring-7.14.7" @@ -105584,7 +105931,7 @@ in ]; }) sources."@babel/preset-modules-0.1.4" - sources."@babel/runtime-7.14.8" + sources."@babel/runtime-7.15.3" sources."@babel/template-7.14.5" sources."@babel/traverse-7.15.0" sources."@babel/types-7.15.0" @@ -105709,7 +106056,7 @@ in sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001249" + sources."caniuse-lite-1.0.30001251" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -105847,7 +106194,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.801" + sources."electron-to-chromium-1.3.806" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -105984,7 +106331,7 @@ in ]; }) sources."is-arrayish-0.2.1" - sources."is-bigint-1.0.3" + sources."is-bigint-1.0.4" sources."is-binary-path-1.0.1" sources."is-boolean-object-1.1.2" sources."is-buffer-1.1.6" @@ -107791,7 +108138,7 @@ in sources."estraverse-4.3.0" sources."esutils-2.0.3" sources."eventemitter2-5.0.1" - sources."fast-json-patch-3.0.0-1" + sources."fast-json-patch-3.1.0" sources."fast-levenshtein-2.0.6" sources."fast-printf-1.6.6" sources."fclone-1.0.11" @@ -107901,7 +108248,7 @@ in sources."systeminformation-5.8.0" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" - sources."tslib-2.3.0" + sources."tslib-2.3.1" sources."tv4-1.3.0" sources."tx2-1.0.4" sources."type-check-0.3.2" @@ -107933,10 +108280,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "6.12.1"; + version = "6.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-6.12.1.tgz"; - sha512 = "p2fowre11u8/f6rw6n1zadtpNLQd2XNux40sUUdcVQqwryUG0YO7xveP96iRTBSWi+RdyCRlXnDgppyvb31d8g=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-6.13.0.tgz"; + sha512 = "dQE0WtzS8Rs6UEpsKeFxHjLPqMHM94v45IhmHX5A/w3V5tEvx4A2PzKBtOF5brJp7SPLyzAnY4L/w/BpBV6qxw=="; }; buildInputs = globalBuildInputs; meta = { @@ -107986,7 +108333,7 @@ in }; dependencies = [ sources."colorette-1.3.0" - sources."nanoid-3.1.23" + sources."nanoid-3.1.25" sources."source-map-js-0.6.2" ]; buildInputs = globalBuildInputs; @@ -108439,10 +108786,10 @@ in purescript-language-server = nodeEnv.buildNodePackage { name = "purescript-language-server"; packageName = "purescript-language-server"; - version = "0.15.3"; + version = "0.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/purescript-language-server/-/purescript-language-server-0.15.3.tgz"; - sha512 = "qAlUEFQRTRKnKet3SxRbLmrC5mOyBIiR5CDqzOmorDN10jgcFIR6mL1sJujQc5cRRcE+HNbBuBeoVdiDvznOGg=="; + url = "https://registry.npmjs.org/purescript-language-server/-/purescript-language-server-0.15.4.tgz"; + sha512 = "llUv605I8yvraO98rb5RmmqPdpWBno7IpIlgNlX3Nq3Q4lvB7G0OxGK89JuAoVZ8T/xkTzhjyuzw0sty0DoY3Q=="; }; dependencies = [ sources."isexe-2.0.0" @@ -108605,10 +108952,10 @@ in pyright = nodeEnv.buildNodePackage { name = "pyright"; packageName = "pyright"; - version = "1.1.161"; + version = "1.1.162"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.161.tgz"; - sha512 = "ahZ8KyDAMdyFTt9j0P/WL6SAeZWKI9qxoFRmTxw71JwyCVPSqXaeo2rK3304YjfKZKAtuHNMgtuZiAVT8U/Pbw=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.162.tgz"; + sha512 = "3YEM8rf/39CtuHMzZmVjsV/2cJJB6N3RfCuNR5QgUeib0VRQ303zhb4jh5RRRF9P6JpZku/waX+i16TrfSqDEQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -108887,7 +109234,7 @@ in sources."inherits-2.0.4" sources."internal-slot-1.0.3" sources."is-arguments-1.1.1" - sources."is-bigint-1.0.3" + sources."is-bigint-1.0.4" sources."is-boolean-object-1.1.2" sources."is-callable-1.2.4" sources."is-date-object-1.0.5" @@ -108998,9 +109345,9 @@ in sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/helper-validator-option-7.14.5" sources."@babel/helper-wrap-function-7.14.5" - sources."@babel/helpers-7.14.8" + sources."@babel/helpers-7.15.3" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.15.2" + sources."@babel/parser-7.15.3" 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" @@ -109037,7 +109384,7 @@ in sources."@babel/plugin-transform-arrow-functions-7.14.5" sources."@babel/plugin-transform-async-to-generator-7.14.5" sources."@babel/plugin-transform-block-scoped-functions-7.14.5" - sources."@babel/plugin-transform-block-scoping-7.14.5" + sources."@babel/plugin-transform-block-scoping-7.15.3" sources."@babel/plugin-transform-classes-7.14.9" sources."@babel/plugin-transform-computed-properties-7.14.5" sources."@babel/plugin-transform-destructuring-7.14.7" @@ -109083,8 +109430,8 @@ in sources."@babel/preset-modules-0.1.4" sources."@babel/preset-react-7.14.5" sources."@babel/preset-stage-0-7.8.3" - sources."@babel/register-7.14.5" - sources."@babel/runtime-7.14.8" + sources."@babel/register-7.15.3" + sources."@babel/runtime-7.15.3" sources."@babel/template-7.14.5" sources."@babel/traverse-7.15.0" sources."@babel/types-7.15.0" @@ -109093,7 +109440,7 @@ in sources."@types/glob-7.1.4" sources."@types/json-schema-7.0.9" sources."@types/minimatch-3.0.5" - sources."@types/node-16.4.13" + sources."@types/node-16.6.1" sources."@types/parse-json-4.0.0" sources."@types/q-1.5.5" sources."@webassemblyjs/ast-1.9.0" @@ -109281,7 +109628,7 @@ in sources."camel-case-3.0.0" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001249" + sources."caniuse-lite-1.0.30001251" sources."case-sensitive-paths-webpack-plugin-2.4.0" sources."caw-2.0.1" (sources."chalk-2.4.2" // { @@ -109510,7 +109857,7 @@ in sources."duplexify-3.7.1" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.801" + sources."electron-to-chromium-1.3.806" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -109803,7 +110150,7 @@ in sources."is-accessor-descriptor-1.0.0" sources."is-arguments-1.1.1" sources."is-arrayish-0.2.1" - sources."is-bigint-1.0.3" + sources."is-bigint-1.0.4" sources."is-binary-path-2.1.0" sources."is-boolean-object-1.1.2" sources."is-buffer-1.1.6" @@ -110802,7 +111149,7 @@ in sources."webidl-conversions-5.0.0" ]; }) - sources."dompurify-2.3.0" + sources."dompurify-2.3.1" sources."emoji-regex-8.0.0" sources."escalade-3.1.1" sources."escodegen-2.0.0" @@ -110853,7 +111200,7 @@ in sources."xml-name-validator-3.0.0" sources."xmlchars-2.2.0" sources."y18n-5.0.8" - sources."yargs-17.1.0" + sources."yargs-17.1.1" sources."yargs-parser-20.2.9" ]; buildInputs = globalBuildInputs; @@ -110869,10 +111216,10 @@ in redoc-cli = nodeEnv.buildNodePackage { name = "redoc-cli"; packageName = "redoc-cli"; - version = "0.12.2"; + version = "0.12.3"; src = fetchurl { - url = "https://registry.npmjs.org/redoc-cli/-/redoc-cli-0.12.2.tgz"; - sha512 = "GyOCEr1g+U/Js7lgHj+0vH9L2uCwbc0m9CJrlb099qp6jzmxnJQ6sC85BiN9DOwr4/fsQfVhoNpWQSkkpFBo5Q=="; + url = "https://registry.npmjs.org/redoc-cli/-/redoc-cli-0.12.3.tgz"; + sha512 = "qTBaEfwVqCvqLbuloZ9sMBQA49WfMOQrLVBGiVyT7pNMAjosQCpMyFESqQL8WqVxDzV2olPCZ1L2rG9cuDGOsA=="; }; dependencies = [ sources."@babel/code-frame-7.14.5" @@ -110889,8 +111236,8 @@ 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.15.2" - sources."@babel/runtime-7.14.8" + sources."@babel/parser-7.15.3" + sources."@babel/runtime-7.15.3" sources."@babel/template-7.14.5" sources."@babel/traverse-7.15.0" sources."@babel/types-7.15.0" @@ -110983,7 +111330,7 @@ in ]; }) sources."domain-browser-1.2.0" - sources."dompurify-2.3.0" + sources."dompurify-2.3.1" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -111108,7 +111455,7 @@ in ]; }) sources."readdirp-3.6.0" - (sources."redoc-2.0.0-rc.55" // { + (sources."redoc-2.0.0-rc.56" // { dependencies = [ sources."path-browserify-1.0.1" ]; @@ -111178,7 +111525,7 @@ in sources."y18n-5.0.8" sources."yaml-1.10.2" sources."yaml-ast-parser-0.0.43" - sources."yargs-17.1.0" + sources."yargs-17.1.1" sources."yargs-parser-20.2.9" ]; buildInputs = globalBuildInputs; @@ -111404,7 +111751,7 @@ in "rust-analyzer-build-deps-../../misc/vscode-extensions/rust-analyzer/build-deps" = nodeEnv.buildNodePackage { name = "rust-analyzer"; packageName = "rust-analyzer"; - version = "0.2.702"; + version = "0.2.710"; src = ../../misc/vscode-extensions/rust-analyzer/build-deps; dependencies = [ sources."@babel/code-frame-7.12.11" @@ -111420,35 +111767,27 @@ in sources."ignore-4.0.6" ]; }) + sources."@hpcc-js/wasm-1.4.1" sources."@humanwhocodes/config-array-0.5.0" sources."@humanwhocodes/object-schema-1.2.0" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@rollup/plugin-commonjs-17.1.0" - sources."@rollup/plugin-node-resolve-13.0.4" - (sources."@rollup/pluginutils-3.1.0" // { - dependencies = [ - sources."estree-walker-1.0.1" - ]; - }) sources."@tootallnate/once-1.1.2" - sources."@types/estree-0.0.39" sources."@types/glob-7.1.4" sources."@types/json-schema-7.0.9" sources."@types/minimatch-3.0.5" sources."@types/mocha-8.2.3" sources."@types/node-14.17.9" sources."@types/node-fetch-2.5.12" - sources."@types/resolve-1.17.1" sources."@types/vscode-1.59.0" - sources."@typescript-eslint/eslint-plugin-4.29.1" - sources."@typescript-eslint/experimental-utils-4.29.1" - sources."@typescript-eslint/parser-4.29.1" - sources."@typescript-eslint/scope-manager-4.29.1" - sources."@typescript-eslint/types-4.29.1" - sources."@typescript-eslint/typescript-estree-4.29.1" - sources."@typescript-eslint/visitor-keys-4.29.1" + sources."@typescript-eslint/eslint-plugin-4.29.2" + sources."@typescript-eslint/experimental-utils-4.29.2" + sources."@typescript-eslint/parser-4.29.2" + sources."@typescript-eslint/scope-manager-4.29.2" + sources."@typescript-eslint/types-4.29.2" + sources."@typescript-eslint/typescript-estree-4.29.2" + sources."@typescript-eslint/visitor-keys-4.29.2" sources."@ungap/promise-all-settled-1.1.2" sources."acorn-7.4.1" sources."acorn-jsx-5.3.2" @@ -111475,7 +111814,6 @@ in sources."buffer-crc32-0.2.13" sources."buffer-indexof-polyfill-1.0.2" sources."buffers-0.1.1" - sources."builtin-modules-3.2.0" sources."call-bind-1.0.2" sources."callsites-3.1.0" sources."camelcase-6.2.0" @@ -111496,18 +111834,63 @@ in sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."combined-stream-1.0.8" - sources."commander-2.20.3" + sources."commander-7.2.0" sources."commandpost-1.4.0" - sources."commondir-1.0.1" sources."concat-map-0.0.1" sources."core-util-is-1.0.2" sources."cross-spawn-7.0.3" sources."css-select-4.1.3" sources."css-what-5.0.1" + sources."d3-7.0.0" + sources."d3-array-3.0.1" + sources."d3-axis-3.0.0" + sources."d3-brush-3.0.0" + sources."d3-chord-3.0.1" + sources."d3-color-3.0.1" + sources."d3-contour-3.0.1" + sources."d3-delaunay-6.0.2" + sources."d3-dispatch-3.0.1" + sources."d3-drag-3.0.0" + sources."d3-dsv-3.0.1" + sources."d3-ease-3.0.1" + sources."d3-fetch-3.0.1" + sources."d3-force-3.0.0" + sources."d3-format-3.0.1" + sources."d3-geo-3.0.1" + (sources."d3-graphviz-4.0.0" // { + dependencies = [ + sources."d3-color-2.0.0" + sources."d3-dispatch-2.0.0" + sources."d3-drag-2.0.0" + sources."d3-ease-2.0.0" + sources."d3-format-2.0.0" + sources."d3-interpolate-2.0.1" + sources."d3-path-2.0.0" + sources."d3-selection-2.0.0" + sources."d3-timer-2.0.0" + sources."d3-transition-2.0.0" + sources."d3-zoom-2.0.0" + ]; + }) + sources."d3-hierarchy-3.0.1" + sources."d3-interpolate-3.0.1" + sources."d3-path-3.0.1" + sources."d3-polygon-3.0.1" + sources."d3-quadtree-3.0.1" + sources."d3-random-3.0.1" + sources."d3-scale-4.0.0" + sources."d3-scale-chromatic-3.0.0" + sources."d3-selection-3.0.0" + sources."d3-shape-3.0.1" + sources."d3-time-3.0.0" + sources."d3-time-format-4.0.0" + sources."d3-timer-3.0.1" + sources."d3-transition-3.0.1" + sources."d3-zoom-3.0.0" sources."debug-4.3.2" sources."decamelize-4.0.0" sources."deep-is-0.1.3" - sources."deepmerge-4.2.2" + sources."delaunator-5.0.0" sources."delayed-stream-1.0.0" sources."denodeify-1.2.1" sources."diff-5.0.0" @@ -111520,6 +111903,7 @@ in sources."duplexer2-0.1.4" (sources."editorconfig-0.15.3" // { dependencies = [ + sources."commander-2.20.3" sources."lru-cache-4.1.5" sources."semver-5.7.1" sources."yallist-2.1.2" @@ -111560,7 +111944,6 @@ in ]; }) sources."estraverse-4.3.0" - sources."estree-walker-2.0.2" sources."esutils-2.0.3" sources."fast-deep-equal-3.1.3" sources."fast-glob-3.2.7" @@ -111588,7 +111971,7 @@ in sources."get-intrinsic-1.1.1" sources."glob-7.1.7" sources."glob-parent-5.1.2" - sources."globals-13.10.0" + sources."globals-13.11.0" sources."globby-11.0.4" sources."graceful-fs-4.2.8" sources."growl-1.10.5" @@ -111599,20 +111982,19 @@ in sources."htmlparser2-6.1.0" sources."http-proxy-agent-4.0.1" sources."https-proxy-agent-5.0.0" + sources."iconv-lite-0.6.3" sources."ignore-5.1.8" sources."import-fresh-3.3.0" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" + sources."internmap-2.0.1" sources."is-binary-path-2.1.0" - sources."is-core-module-2.5.0" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.1" - sources."is-module-1.0.0" sources."is-number-7.0.0" sources."is-plain-obj-2.1.0" - sources."is-reference-1.2.1" sources."is-unicode-supported-0.1.0" sources."isarray-1.0.0" sources."isexe-2.0.0" @@ -111631,7 +112013,6 @@ in sources."lodash.truncate-4.4.2" sources."log-symbols-4.1.0" sources."lru-cache-6.0.0" - sources."magic-string-0.25.7" (sources."markdown-it-10.0.0" // { dependencies = [ sources."entities-2.0.3" @@ -111686,7 +112067,6 @@ in sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" - sources."path-parse-1.0.7" sources."path-type-4.0.0" sources."pend-1.2.0" sources."picomatch-2.3.0" @@ -111708,13 +112088,14 @@ in sources."regexpp-3.2.0" sources."require-directory-2.1.1" sources."require-from-string-2.0.2" - sources."resolve-1.20.0" sources."resolve-from-4.0.0" sources."reusify-1.0.4" sources."rimraf-3.0.2" - sources."rollup-2.51.1" + sources."robust-predicates-3.0.1" sources."run-parallel-1.2.0" + sources."rw-1.3.3" sources."safe-buffer-5.2.1" + sources."safer-buffer-2.1.2" sources."semver-7.3.5" sources."serialize-javascript-6.0.0" sources."setimmediate-1.0.5" @@ -111730,7 +112111,6 @@ in sources."color-name-1.1.4" ]; }) - sources."sourcemap-codec-1.4.8" sources."sprintf-js-1.0.3" sources."string-width-4.2.2" (sources."string_decoder-1.1.1" // { @@ -111751,7 +112131,7 @@ in sources."tmp-0.2.1" sources."to-regex-range-5.0.1" sources."traverse-0.3.9" - sources."tslib-2.3.0" + sources."tslib-2.3.1" (sources."tsutils-3.21.0" // { dependencies = [ sources."tslib-1.14.1" @@ -111760,7 +112140,7 @@ in sources."tunnel-0.0.6" sources."type-check-0.4.0" sources."type-fest-0.20.2" - sources."typed-rest-client-1.8.4" + sources."typed-rest-client-1.8.5" sources."typescript-4.3.5" sources."typescript-formatter-7.2.2" sources."uc.micro-1.0.6" @@ -112090,10 +112470,10 @@ in serverless = nodeEnv.buildNodePackage { name = "serverless"; packageName = "serverless"; - version = "2.53.1"; + version = "2.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/serverless/-/serverless-2.53.1.tgz"; - sha512 = "LK7BWPCpMq0p1TcnJb4uCkxYYrbsM2J7FOCd29BYKmvvUrB+NzFeAVGE1sR/cPF6ECT0PWsR9NEADb24o5D2WA=="; + url = "https://registry.npmjs.org/serverless/-/serverless-2.54.0.tgz"; + sha512 = "z/cVR0jg7QN2YRP9SvcJGM2nZPGI2b+EWxrbJy3PfY1VhBfJsODQjkdwOpsmiYVxX8UYxOrjO507JJRm2Fn3Aw=="; }; dependencies = [ sources."2-thenable-1.0.0" @@ -112126,7 +112506,7 @@ in ]; }) sources."@serverless/component-metrics-1.0.8" - (sources."@serverless/components-3.14.2" // { + (sources."@serverless/components-3.15.0" // { dependencies = [ (sources."@serverless/utils-4.1.0" // { dependencies = [ @@ -112185,7 +112565,7 @@ in sources."@types/keyv-3.1.2" sources."@types/lodash-4.14.172" sources."@types/long-4.0.1" - sources."@types/node-16.4.13" + sources."@types/node-16.6.1" sources."@types/request-2.48.7" sources."@types/request-promise-native-1.0.18" sources."@types/responselike-1.0.0" @@ -112246,7 +112626,7 @@ in sources."async-2.6.3" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - (sources."aws-sdk-2.965.0" // { + (sources."aws-sdk-2.968.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -112791,7 +113171,7 @@ in sources."signal-exit-3.0.3" sources."simple-concat-1.0.1" sources."simple-get-2.8.1" - (sources."simple-git-2.42.0" // { + (sources."simple-git-2.44.0" // { dependencies = [ sources."debug-4.3.2" sources."ms-2.1.2" @@ -112864,7 +113244,7 @@ in sources."untildify-3.0.3" ]; }) - (sources."tar-6.1.7" // { + (sources."tar-6.1.8" // { dependencies = [ sources."chownr-2.0.0" sources."mkdirp-1.0.4" @@ -113601,14 +113981,15 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.677.0"; + version = "1.683.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.677.0.tgz"; - sha512 = "2CALWUc+gOmOmpK9ehsJiaU0SYJEEmpJYalVw1Gh8pk4S/8bZWx5OdaQyD3ep29ZX5BCVSDQvOE22NPtTs8X7g=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.683.0.tgz"; + sha512 = "cvdSuSuHyb7ijF68afG/Nbxm4wxnPQQCMjB0SYqTln+W7tMY8wLUr86QaQZIBN2Umb7zgY40gBRDq2R2nYVZGQ=="; }; dependencies = [ sources."@arcanis/slice-ansi-1.0.2" sources."@deepcode/dcignore-1.0.2" + sources."@iarna/toml-2.2.5" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -113669,13 +114050,13 @@ in }) (sources."@snyk/mix-parser-1.3.2" // { dependencies = [ - sources."tslib-2.3.0" + sources."tslib-2.3.1" ]; }) sources."@snyk/rpm-parser-2.2.1" (sources."@snyk/snyk-cocoapods-plugin-2.5.2" // { dependencies = [ - sources."tslib-2.3.0" + sources."tslib-2.3.1" ]; }) (sources."@snyk/snyk-docker-pull-3.7.0" // { @@ -113686,7 +114067,7 @@ in }) (sources."@snyk/snyk-hex-plugin-1.1.4" // { dependencies = [ - sources."tslib-2.3.0" + sources."tslib-2.3.1" ]; }) sources."@szmarczak/http-timer-4.0.6" @@ -113723,7 +114104,7 @@ in sources."which-2.0.2" ]; }) - sources."@yarnpkg/fslib-2.5.0" + sources."@yarnpkg/fslib-2.5.1" sources."@yarnpkg/json-proxy-2.1.1" sources."@yarnpkg/libzip-2.2.2" sources."@yarnpkg/lockfile-1.1.0" @@ -113740,13 +114121,6 @@ in }) sources."abbrev-1.1.1" sources."aggregate-error-3.1.0" - (sources."ansi-align-3.0.0" // { - dependencies = [ - sources."emoji-regex-7.0.3" - sources."is-fullwidth-code-point-2.0.0" - sources."string-width-3.1.0" - ]; - }) sources."ansi-escapes-3.2.0" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" @@ -113771,15 +114145,6 @@ in sources."bl-4.1.0" sources."boolean-3.1.2" sources."bottleneck-2.19.5" - (sources."boxen-5.0.1" // { - dependencies = [ - sources."camelcase-6.2.0" - sources."chalk-4.1.2" - sources."strip-ansi-6.0.0" - sources."type-fest-0.20.2" - sources."wrap-ansi-7.0.0" - ]; - }) sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."browserify-zlib-0.1.4" @@ -113807,7 +114172,6 @@ in sources."chownr-2.0.0" sources."ci-info-2.0.0" sources."clean-stack-2.2.0" - sources."cli-boxes-2.2.1" sources."cli-cursor-3.1.0" sources."cli-spinner-0.2.10" sources."cli-spinners-2.6.0" @@ -113837,7 +114201,6 @@ in sources."mimic-response-3.1.0" ]; }) - sources."deep-extend-0.6.0" sources."defaults-1.0.3" sources."defer-to-connect-2.0.1" sources."define-properties-1.1.3" @@ -113853,7 +114216,6 @@ in sources."dockerfile-ast-0.2.1" sources."dot-prop-5.3.0" sources."dotnet-deps-parser-5.1.0" - sources."duplexer3-0.1.4" (sources."duplexify-3.7.1" // { dependencies = [ sources."readable-stream-2.3.7" @@ -113867,12 +114229,11 @@ in sources."end-of-stream-1.4.4" sources."endian-reader-0.3.0" sources."es6-error-4.1.1" - sources."escape-goat-2.1.1" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" (sources."event-loop-spinner-2.1.0" // { dependencies = [ - sources."tslib-2.3.0" + sources."tslib-2.3.1" ]; }) sources."execa-1.0.0" @@ -113898,7 +114259,6 @@ in sources."semver-7.3.5" ]; }) - sources."global-dirs-3.0.0" sources."globalthis-1.0.2" sources."globby-11.0.4" sources."got-11.8.2" @@ -113908,7 +114268,6 @@ in sources."has-1.0.3" sources."has-flag-4.0.0" sources."has-symbols-1.0.2" - sources."has-yarn-2.1.0" sources."hosted-git-info-3.0.8" sources."http-cache-semantics-4.1.0" sources."http2-wrapper-1.0.3" @@ -113916,24 +114275,19 @@ in sources."ieee754-1.2.1" sources."ignore-5.1.8" sources."immediate-3.0.6" - sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" sources."indent-string-4.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."ini-2.0.0" sources."is-3.3.0" sources."is-callable-1.2.4" - sources."is-ci-2.0.0" sources."is-deflate-1.0.0" sources."is-docker-2.2.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.1" sources."is-gzip-1.0.0" - sources."is-installed-globally-0.4.0" sources."is-interactive-1.0.0" - sources."is-npm-5.0.0" sources."is-number-7.0.0" sources."is-obj-2.0.0" sources."is-path-cwd-2.2.0" @@ -113942,7 +114296,6 @@ in sources."is-typedarray-1.0.0" sources."is-unicode-supported-0.1.0" sources."is-wsl-2.2.0" - sources."is-yarn-global-0.3.0" sources."isarray-1.0.0" sources."isexe-2.0.0" sources."js-yaml-3.14.1" @@ -113958,7 +114311,6 @@ in ]; }) sources."keyv-4.0.3" - sources."latest-version-5.1.0" sources."lie-3.3.0" sources."lodash-4.17.21" sources."lodash.assign-4.2.0" @@ -114062,27 +114414,6 @@ in sources."p-limit-2.3.0" sources."p-map-4.0.0" sources."p-try-2.2.0" - (sources."package-json-6.5.0" // { - dependencies = [ - sources."@sindresorhus/is-0.14.0" - sources."@szmarczak/http-timer-1.1.2" - (sources."cacheable-request-6.1.0" // { - dependencies = [ - sources."lowercase-keys-2.0.0" - ]; - }) - sources."decompress-response-3.3.0" - sources."defer-to-connect-1.1.3" - sources."get-stream-5.2.0" - sources."got-9.6.0" - sources."json-buffer-3.0.0" - sources."keyv-3.1.0" - sources."lowercase-keys-1.0.1" - sources."normalize-url-4.5.1" - sources."p-cancelable-1.1.0" - sources."responselike-1.0.2" - ]; - }) sources."pako-0.2.9" sources."parse-link-header-1.0.1" sources."path-is-absolute-1.0.1" @@ -114092,7 +114423,6 @@ in sources."pegjs-0.10.0" sources."picomatch-2.3.0" sources."pluralize-7.0.0" - sources."prepend-http-2.0.0" sources."pretty-bytes-5.6.0" sources."process-nextick-args-2.0.1" sources."progress-2.0.3" @@ -114109,18 +114439,10 @@ in sources."pump-2.0.1" ]; }) - sources."pupa-2.1.1" sources."queue-6.0.2" sources."queue-microtask-1.2.3" sources."quick-lru-5.1.1" - (sources."rc-1.2.8" // { - dependencies = [ - sources."ini-1.3.8" - ]; - }) sources."readable-stream-3.6.0" - sources."registry-auth-token-4.2.1" - sources."registry-url-5.1.0" sources."resolve-alpn-1.2.0" sources."responselike-2.0.0" sources."restore-cursor-3.1.0" @@ -114135,7 +114457,6 @@ in sources."sax-1.2.4" sources."semver-6.3.0" sources."semver-compare-1.0.0" - sources."semver-diff-3.1.1" (sources."serialize-error-7.0.1" // { dependencies = [ sources."type-fest-0.13.1" @@ -114150,16 +114471,16 @@ in (sources."snyk-cpp-plugin-2.2.1" // { dependencies = [ sources."chalk-4.1.2" - sources."tslib-2.3.0" + sources."tslib-2.3.1" ]; }) - (sources."snyk-docker-plugin-4.22.1" // { + (sources."snyk-docker-plugin-4.23.0" // { dependencies = [ sources."argparse-2.0.1" sources."js-yaml-4.1.0" sources."rimraf-3.0.2" sources."semver-7.3.5" - sources."snyk-nodejs-lockfile-parser-1.35.1" + sources."snyk-nodejs-lockfile-parser-1.36.0" sources."tmp-0.2.1" ]; }) @@ -114175,7 +114496,7 @@ in sources."chalk-3.0.0" sources."rimraf-3.0.2" sources."tmp-0.2.1" - sources."tslib-2.3.0" + sources."tslib-2.3.1" ]; }) sources."snyk-module-3.1.0" @@ -114192,7 +114513,7 @@ in sources."p-map-2.1.0" ]; }) - (sources."snyk-nuget-plugin-1.22.0" // { + (sources."snyk-nuget-plugin-1.22.1" // { dependencies = [ sources."jszip-3.7.0" sources."pako-1.0.11" @@ -114207,20 +114528,20 @@ in sources."tslib-1.11.1" ]; }) - (sources."snyk-poetry-lockfile-parser-1.1.6" // { + (sources."snyk-poetry-lockfile-parser-1.1.7" // { dependencies = [ - sources."tslib-2.3.0" + sources."tslib-2.3.1" ]; }) (sources."snyk-policy-1.22.0" // { dependencies = [ sources."lru-cache-5.1.1" sources."semver-7.3.5" - sources."snyk-try-require-2.0.1" + sources."snyk-try-require-2.0.2" sources."yallist-3.1.1" ]; }) - (sources."snyk-python-plugin-1.19.11" // { + (sources."snyk-python-plugin-1.20.1" // { dependencies = [ sources."rimraf-3.0.2" sources."tmp-0.2.1" @@ -114275,9 +114596,8 @@ in ]; }) sources."strip-eof-1.0.0" - sources."strip-json-comments-2.0.1" sources."supports-color-7.2.0" - sources."tar-6.1.7" + sources."tar-6.1.8" sources."tar-stream-2.2.0" sources."temp-dir-2.0.0" (sources."tempy-1.0.1" // { @@ -114296,7 +114616,6 @@ in ]; }) sources."tmp-0.0.33" - sources."to-readable-stream-1.0.0" sources."to-regex-range-5.0.1" sources."toml-3.0.0" sources."tree-kill-1.2.2" @@ -114308,20 +114627,12 @@ in sources."typedarray-to-buffer-3.1.5" sources."unique-string-2.0.0" sources."upath-2.0.1" - (sources."update-notifier-5.1.0" // { - dependencies = [ - sources."chalk-4.1.2" - sources."semver-7.3.5" - ]; - }) - sources."url-parse-lax-3.0.0" sources."utf8-3.0.0" sources."util-deprecate-1.0.2" sources."uuid-8.3.2" sources."vscode-languageserver-types-3.16.0" sources."wcwidth-1.0.1" sources."which-1.3.1" - sources."widest-line-3.1.0" sources."windows-release-3.3.3" (sources."wrap-ansi-5.1.0" // { dependencies = [ @@ -114366,7 +114677,7 @@ in sources."@types/component-emitter-1.2.10" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.12" - sources."@types/node-16.4.13" + sources."@types/node-16.6.1" sources."accepts-1.3.7" sources."base64-arraybuffer-0.1.4" sources."base64id-2.0.0" @@ -114855,7 +115166,7 @@ in sources."is-alphabetical-1.0.4" sources."is-alphanumerical-1.0.4" sources."is-arguments-1.1.1" - sources."is-bigint-1.0.3" + sources."is-bigint-1.0.4" sources."is-binary-path-1.0.1" sources."is-boolean-object-1.1.2" sources."is-buffer-1.1.6" @@ -114906,7 +115217,7 @@ in sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isobject-2.1.0" - (sources."jitdb-3.1.6" // { + (sources."jitdb-3.1.7" // { dependencies = [ sources."mkdirp-1.0.4" sources."push-stream-11.0.1" @@ -115568,7 +115879,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.965.0" // { + (sources."aws-sdk-2.968.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -116368,13 +116679,13 @@ in 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/helpers-7.15.3" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.15.2" + sources."@babel/parser-7.15.3" sources."@babel/template-7.14.5" sources."@babel/traverse-7.15.0" sources."@babel/types-7.15.0" @@ -116407,7 +116718,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001249" + sources."caniuse-lite-1.0.30001251" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -116445,7 +116756,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.801" + sources."electron-to-chromium-1.3.806" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -116687,7 +116998,7 @@ in sources."@emmetio/abbreviation-2.2.2" sources."@emmetio/css-abbreviation-2.1.4" sources."@emmetio/scanner-1.0.0" - sources."@types/node-16.4.13" + sources."@types/node-16.6.1" sources."@types/pug-2.0.5" sources."@types/sass-1.16.1" sources."anymatch-3.1.2" @@ -116732,7 +117043,7 @@ in sources."svelte-preprocess-4.7.4" sources."svelte2tsx-0.4.5" sources."to-regex-range-5.0.1" - sources."tslib-2.3.0" + sources."tslib-2.3.1" sources."typescript-4.3.5" sources."vscode-css-languageservice-5.0.0" sources."vscode-emmet-helper-2.1.2" @@ -116769,7 +117080,7 @@ in sha512 = "eGEuZ3UEanOhlpQhICLjKejDxcZ9uYJlGnBGKAPW7uugolaBE6HpEBIiKFZN/TMRFFHQUURgGvsVn8/HJUBfeQ=="; }; dependencies = [ - sources."@types/node-16.4.13" + sources."@types/node-16.6.1" sources."@types/pug-2.0.5" sources."@types/sass-1.16.1" sources."ansi-styles-4.3.0" @@ -116831,18 +117142,15 @@ in svgo = nodeEnv.buildNodePackage { name = "svgo"; packageName = "svgo"; - version = "2.3.1"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/svgo/-/svgo-2.3.1.tgz"; - sha512 = "riDDIQgXpEnn0BEl9Gvhh1LNLIyiusSpt64IR8upJu7MwxnzetmF/Y57pXQD2NMX2lVyMRzXt5f2M5rO4wG7Dw=="; + url = "https://registry.npmjs.org/svgo/-/svgo-2.4.0.tgz"; + sha512 = "W25S1UUm9Lm9VnE0TvCzL7aso/NCzDEaXLaElCUO/KaVitw0+IBicSVfM1L1c0YHK5TOFh73yQ2naCpVHEQ/OQ=="; }; dependencies = [ sources."@trysound/sax-0.1.1" - sources."ansi-styles-4.3.0" sources."boolbase-1.0.0" - sources."chalk-4.1.2" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" + sources."colorette-1.3.0" sources."commander-7.2.0" sources."css-select-4.1.3" sources."css-tree-1.1.3" @@ -116853,12 +117161,10 @@ in sources."domhandler-4.2.0" sources."domutils-2.7.0" sources."entities-2.2.0" - sources."has-flag-4.0.0" sources."mdn-data-2.0.14" sources."nth-check-2.0.0" sources."source-map-0.6.1" sources."stable-0.1.8" - sources."supports-color-7.2.0" ]; buildInputs = globalBuildInputs; meta = { @@ -118736,7 +119042,7 @@ in sources."has-symbols-1.0.2" sources."has-tostringtag-1.0.0" sources."internal-slot-1.0.3" - sources."is-bigint-1.0.3" + sources."is-bigint-1.0.4" sources."is-boolean-object-1.1.2" sources."is-callable-1.2.4" sources."is-date-object-1.0.5" @@ -118845,7 +119151,7 @@ in sources."has-symbols-1.0.2" sources."has-tostringtag-1.0.0" sources."internal-slot-1.0.3" - sources."is-bigint-1.0.3" + sources."is-bigint-1.0.4" sources."is-boolean-object-1.1.2" sources."is-callable-1.2.4" sources."is-capitalized-1.0.0" @@ -118925,7 +119231,7 @@ in sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.2" - sources."@types/node-16.4.13" + sources."@types/node-16.6.1" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -119312,7 +119618,7 @@ in sources."strip-outer-1.0.1" sources."strtok3-6.2.4" sources."supports-color-7.2.0" - sources."tar-4.4.16" + sources."tar-4.4.17" sources."tlds-1.208.0" sources."to-array-0.1.4" sources."to-readable-stream-1.0.0" @@ -119809,10 +120115,10 @@ in typescript-language-server = nodeEnv.buildNodePackage { name = "typescript-language-server"; packageName = "typescript-language-server"; - version = "0.5.4"; + version = "0.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/typescript-language-server/-/typescript-language-server-0.5.4.tgz"; - sha512 = "MQbCaq+ZUGfibp91reQJGYPXWbEdsY8G+iAkOaKRLOs3MDIssacEYF3v1nFne8iWWYPSsYs4HvuiIzbuUAO8GA=="; + url = "https://registry.npmjs.org/typescript-language-server/-/typescript-language-server-0.6.1.tgz"; + sha512 = "ZqqD4XK1EgITEoW1SaOnNe473K5EMr7vSYwFeqK4Fe37TjNyEwB+2vXuqW01kPujiw7tRpv3teDAl7WtP9AmIw=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.5" @@ -119871,17 +120177,16 @@ in sources."unique-string-2.0.0" sources."universalify-2.0.0" sources."vscode-jsonrpc-6.0.0" - sources."vscode-languageserver-5.3.0-next.10" + sources."vscode-languageserver-7.0.0" sources."vscode-languageserver-protocol-3.16.0" + sources."vscode-languageserver-textdocument-1.0.1" sources."vscode-languageserver-types-3.16.0" - sources."vscode-textbuffer-1.0.0" sources."vscode-uri-1.0.8" sources."wrappy-1.0.2" ]; buildInputs = globalBuildInputs; meta = { description = "Language Server Protocol (LSP) implementation for TypeScript using tsserver"; - homepage = "https://github.com/theia-ide/typescript-language-server#readme"; license = "Apache-2.0"; }; production = true; @@ -120221,7 +120526,7 @@ in sha512 = "N+ENrder8z9zJQF9UM7K3/1LcfVW60omqeyaQsu6GN1BGdCgPm8gdHssn7WRD7vx+ABKc82IE1+pJyHOPkwe+w=="; }; dependencies = [ - sources."@types/node-16.4.13" + sources."@types/node-16.6.1" sources."@types/unist-2.0.6" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -120339,7 +120644,7 @@ in ]; }) sources."vfile-location-2.0.6" - (sources."vfile-message-3.0.1" // { + (sources."vfile-message-3.0.2" // { dependencies = [ sources."unist-util-stringify-position-3.0.0" ]; @@ -120476,7 +120781,7 @@ in sources."string-width-1.0.2" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" - sources."tar-6.1.7" + sources."tar-6.1.8" sources."topojson-client-3.1.0" sources."util-deprecate-1.0.2" sources."vega-5.20.2" @@ -120599,7 +120904,7 @@ in dependencies = [ sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-16.4.13" + sources."@types/node-16.6.1" sources."@vercel/build-utils-2.12.2" sources."@vercel/go-1.2.3" sources."@vercel/node-1.12.1" @@ -120830,7 +121135,7 @@ in sources."functional-red-black-tree-1.0.1" sources."glob-7.1.7" sources."glob-parent-5.1.2" - sources."globals-13.10.0" + sources."globals-13.11.0" sources."has-1.0.3" sources."has-flag-3.0.0" sources."ignore-4.0.6" @@ -121015,7 +121320,7 @@ in sources."jsonc-parser-3.0.0" sources."ms-2.0.0" sources."request-light-0.4.0" - (sources."vscode-json-languageservice-4.1.6" // { + (sources."vscode-json-languageservice-4.1.7" // { dependencies = [ sources."vscode-nls-5.0.0" ]; @@ -121113,7 +121418,7 @@ in sources."typescript-4.3.5" sources."vscode-css-languageservice-5.1.4" sources."vscode-html-languageservice-4.0.7" - sources."vscode-json-languageservice-4.1.6" + sources."vscode-json-languageservice-4.1.7" sources."vscode-jsonrpc-6.0.0" sources."vscode-languageserver-7.0.0" sources."vscode-languageserver-protocol-3.16.0" @@ -121165,7 +121470,7 @@ in sources."@webassemblyjs/wast-printer-1.11.1" sources."@webpack-cli/configtest-1.0.4" sources."@webpack-cli/info-1.3.0" - sources."@webpack-cli/serve-1.5.1" + sources."@webpack-cli/serve-1.5.2" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" sources."acorn-8.4.1" @@ -121190,7 +121495,7 @@ in sources."buffer-from-1.1.2" sources."call-bind-1.0.2" sources."camelcase-6.2.0" - sources."caniuse-lite-1.0.30001249" + sources."caniuse-lite-1.0.30001251" (sources."chalk-4.1.2" // { dependencies = [ sources."supports-color-7.2.0" @@ -121230,7 +121535,7 @@ in sources."domelementtype-2.2.0" sources."domhandler-4.2.0" sources."domutils-2.7.0" - sources."electron-to-chromium-1.3.801" + sources."electron-to-chromium-1.3.806" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" sources."enhanced-resolve-5.8.2" @@ -121415,9 +121720,9 @@ in sources."tapable-1.1.3" ]; }) - sources."tslib-2.3.0" + sources."tslib-2.3.1" sources."tunnel-0.0.6" - sources."typed-rest-client-1.8.4" + sources."typed-rest-client-1.8.5" sources."typescript-4.3.5" sources."uc.micro-1.0.6" sources."underscore-1.13.1" @@ -121440,7 +121745,7 @@ in sources."vscode-debugprotocol-1.48.0" sources."watchpack-2.2.0" sources."webpack-5.50.0" - (sources."webpack-cli-4.7.2" // { + (sources."webpack-cli-4.8.0" // { dependencies = [ sources."commander-7.2.0" ]; @@ -121796,7 +122101,7 @@ in sources."@starptech/rehype-webparser-0.10.0" sources."@starptech/webparser-0.10.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-16.4.13" + sources."@types/node-16.6.1" sources."@types/unist-2.0.6" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -122634,7 +122939,7 @@ in sources."vfile-message-2.0.4" ]; }) - sources."vfile-message-3.0.1" + sources."vfile-message-3.0.2" (sources."vfile-reporter-6.0.2" // { dependencies = [ sources."ansi-regex-5.0.0" @@ -122719,7 +123024,7 @@ in sha512 = "uhSNGU27KDT2e2v51l/NqMc59O7X0DG7CHonZOwsnvMHLvyudCLZgXCU8Rw4T8gpqg2asn50vfPHq7l3DGlN5w=="; }; dependencies = [ - sources."@babel/runtime-corejs3-7.14.9" + sources."@babel/runtime-corejs3-7.15.3" sources."@mapbox/node-pre-gyp-1.0.5" sources."@tootallnate/once-1.1.2" sources."@types/raf-3.4.0" @@ -122748,7 +123053,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.1.0" + sources."yargs-17.1.1" ]; }) sources."brace-expansion-1.1.11" @@ -122878,7 +123183,7 @@ in sources."svg-pathdata-5.0.5" sources."svg2img-0.9.3" sources."symbol-tree-3.2.4" - sources."tar-6.1.7" + sources."tar-6.1.8" (sources."tough-cookie-4.0.0" // { dependencies = [ sources."universalify-0.1.2" @@ -122935,10 +123240,10 @@ in web-ext = nodeEnv.buildNodePackage { name = "web-ext"; packageName = "web-ext"; - version = "6.2.0"; + version = "6.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/web-ext/-/web-ext-6.2.0.tgz"; - sha512 = "vibPf31/5NajygV85b6PSki2gZwOK0lQYfC2q30VdEHeS1d4hJU39mnDXM0D2nM6t7REYR8xRNgmTiDcsHCS8A=="; + url = "https://registry.npmjs.org/web-ext/-/web-ext-6.3.0.tgz"; + sha512 = "yMpSFUN6396oMs09zN+gqYM8gozfz932gduLdRCtspt16qt33c8p+7crGkHkAQmLRloMn2c4I/1RKgMq02Vnhg=="; }; dependencies = [ sources."@babel/code-frame-7.12.11" @@ -122961,23 +123266,32 @@ in (sources."@eslint/eslintrc-0.4.3" // { dependencies = [ sources."debug-4.3.2" + sources."eslint-visitor-keys-1.3.0" + sources."espree-7.3.1" sources."ms-2.1.2" ]; }) - sources."@mdn/browser-compat-data-3.3.7" + (sources."@humanwhocodes/config-array-0.5.0" // { + dependencies = [ + sources."debug-4.3.2" + sources."ms-2.1.2" + ]; + }) + sources."@humanwhocodes/object-schema-1.2.0" + sources."@mdn/browser-compat-data-3.3.14" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/minimatch-3.0.5" - sources."@types/node-16.4.13" + sources."@types/node-16.6.1" sources."@types/yauzl-2.9.1" sources."acorn-7.4.1" sources."acorn-jsx-5.3.2" - (sources."addons-linter-3.8.0" // { + (sources."addons-linter-3.12.0" // { dependencies = [ - sources."yargs-17.0.1" + sources."yargs-17.1.0" ]; }) - sources."addons-scanner-utils-4.8.0" + sources."addons-scanner-utils-4.9.0" sources."adm-zip-0.5.5" sources."ajv-6.12.6" sources."ajv-merge-patch-4.1.0" @@ -123029,7 +123343,7 @@ in sources."callsites-3.1.0" sources."camelcase-6.2.0" sources."caseless-0.12.0" - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."cheerio-1.0.0-rc.10" sources."cheerio-select-1.5.0" sources."chrome-launcher-0.14.0" @@ -123053,7 +123367,7 @@ in sources."concat-map-0.0.1" sources."concat-stream-1.6.2" sources."configstore-5.0.1" - sources."core-js-3.12.0" + sources."core-js-3.16.0" sources."core-util-is-1.0.2" sources."cross-spawn-7.0.3" sources."crypto-random-string-2.0.0" @@ -123076,6 +123390,7 @@ in (sources."dispensary-0.62.0" // { dependencies = [ sources."async-3.2.1" + sources."pino-6.11.3" ]; }) sources."doctrine-3.0.0" @@ -123094,14 +123409,20 @@ in sources."entities-2.2.0" sources."error-ex-1.3.2" sources."es6-error-4.1.1" - sources."es6-promisify-6.1.1" + sources."es6-promisify-7.0.0" sources."escalade-3.1.1" sources."escape-goat-2.1.1" sources."escape-string-regexp-4.0.0" - (sources."eslint-7.28.0" // { + (sources."eslint-7.32.0" // { dependencies = [ sources."ansi-regex-5.0.0" sources."debug-4.3.2" + sources."eslint-visitor-keys-2.1.0" + (sources."espree-7.3.1" // { + dependencies = [ + sources."eslint-visitor-keys-1.3.0" + ]; + }) sources."ms-2.1.2" sources."strip-ansi-6.0.0" ]; @@ -123113,10 +123434,10 @@ in sources."eslint-visitor-keys-1.3.0" ]; }) - sources."eslint-visitor-keys-2.1.0" - (sources."espree-7.3.1" // { + sources."eslint-visitor-keys-3.0.0" + (sources."espree-8.0.0" // { dependencies = [ - sources."eslint-visitor-keys-1.3.0" + sources."acorn-8.4.1" ]; }) sources."esprima-4.0.1" @@ -123183,7 +123504,7 @@ in sources."glob-parent-5.1.2" sources."glob-to-regexp-0.4.1" sources."global-dirs-3.0.0" - sources."globals-13.10.0" + sources."globals-13.11.0" (sources."got-9.6.0" // { dependencies = [ sources."get-stream-4.1.0" @@ -123311,7 +123632,7 @@ in }) sources."mz-2.7.0" sources."nan-2.15.0" - sources."nanoid-3.1.23" + sources."nanoid-3.1.25" sources."natural-compare-1.4.0" sources."natural-compare-lite-1.4.0" sources."ncp-2.0.0" @@ -123351,9 +123672,9 @@ in sources."path-key-3.1.1" sources."pend-1.2.0" sources."performance-now-2.1.0" - sources."pino-6.11.3" + sources."pino-6.13.0" sources."pino-std-serializers-3.2.0" - sources."postcss-8.3.4" + sources."postcss-8.3.6" sources."prelude-ls-1.2.1" sources."prepend-http-2.0.0" sources."process-nextick-args-2.0.1" @@ -123414,7 +123735,7 @@ in sources."shebang-regex-3.0.0" sources."shell-quote-1.6.1" sources."shellwords-0.1.1" - sources."sign-addon-3.5.0" + sources."sign-addon-3.7.0" sources."signal-exit-3.0.3" sources."slice-ansi-4.0.0" sources."sonic-boom-1.4.1" @@ -123461,7 +123782,7 @@ in sources."to-readable-stream-1.0.0" sources."tosource-1.0.0" sources."tough-cookie-2.5.0" - sources."tslib-2.3.0" + sources."tslib-2.3.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-check-0.4.0" @@ -123532,7 +123853,7 @@ in sources."@types/eslint-scope-3.7.1" sources."@types/estree-0.0.50" sources."@types/json-schema-7.0.9" - sources."@types/node-16.4.13" + sources."@types/node-16.6.1" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" sources."@webassemblyjs/helper-api-error-1.11.1" @@ -123556,11 +123877,11 @@ in sources."ajv-keywords-3.5.2" sources."browserslist-4.16.7" sources."buffer-from-1.1.2" - sources."caniuse-lite-1.0.30001249" + sources."caniuse-lite-1.0.30001251" sources."chrome-trace-event-1.0.3" sources."colorette-1.3.0" sources."commander-2.20.3" - sources."electron-to-chromium-1.3.801" + sources."electron-to-chromium-1.3.806" sources."enhanced-resolve-5.8.2" sources."es-module-lexer-0.7.1" sources."escalade-3.1.1" @@ -123620,16 +123941,16 @@ in webpack-cli = nodeEnv.buildNodePackage { name = "webpack-cli"; packageName = "webpack-cli"; - version = "4.7.2"; + version = "4.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.7.2.tgz"; - sha512 = "mEoLmnmOIZQNiRl0ebnjzQ74Hk0iKS5SiEEnpq3dRezoyR3yPaeQZCMCe+db4524pj1Pd5ghZXjT41KLzIhSLw=="; + url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.8.0.tgz"; + sha512 = "+iBSWsX16uVna5aAYN6/wjhJy1q/GKk4KjKvfg90/6hykCTSgozbfz5iRgDTSJt/LgSbYxdBX3KBHeobIs+ZEw=="; }; dependencies = [ sources."@discoveryjs/json-ext-0.5.3" sources."@webpack-cli/configtest-1.0.4" sources."@webpack-cli/info-1.3.0" - sources."@webpack-cli/serve-1.5.1" + sources."@webpack-cli/serve-1.5.2" sources."clone-deep-4.0.1" sources."colorette-1.3.0" sources."commander-7.2.0" @@ -123697,7 +124018,7 @@ in dependencies = [ sources."@types/glob-7.1.4" sources."@types/minimatch-3.0.5" - sources."@types/node-16.4.13" + sources."@types/node-16.6.1" sources."accepts-1.3.7" sources."ajv-6.12.6" sources."ajv-errors-1.0.1" @@ -124352,7 +124673,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-16.4.13" + sources."@types/node-16.6.1" sources."addr-to-ip-port-1.5.4" sources."airplay-js-0.3.0" sources."ansi-regex-5.0.0" @@ -124643,7 +124964,7 @@ in sources."utp-native-2.5.3" sources."videostream-3.2.2" sources."vlc-command-1.2.0" - (sources."webtorrent-1.3.9" // { + (sources."webtorrent-1.3.10" // { dependencies = [ sources."debug-4.3.2" sources."decompress-response-6.0.0" @@ -124660,7 +124981,7 @@ in sources."xmlbuilder-11.0.1" sources."xmldom-0.1.31" sources."y18n-5.0.8" - sources."yargs-17.1.0" + sources."yargs-17.1.1" sources."yargs-parser-20.2.9" ]; buildInputs = globalBuildInputs; @@ -124738,7 +125059,7 @@ in sources."jsonc-parser-3.0.0" sources."ms-2.0.0" sources."request-light-0.2.5" - (sources."vscode-json-languageservice-4.1.6" // { + (sources."vscode-json-languageservice-4.1.7" // { dependencies = [ sources."vscode-nls-5.0.0" sources."vscode-uri-3.0.2" @@ -124789,11 +125110,11 @@ in sha512 = "0V5CpR62BY1EOevIxXq5BL84YJeIunEzRsFlqb00tc7D77I51/0bvgdGRZhEwhNI2rFxKZ1i77eoisT56gfMTQ=="; }; dependencies = [ - sources."@babel/runtime-7.14.8" + sources."@babel/runtime-7.15.3" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - (sources."@npmcli/arborist-2.8.0" // { + (sources."@npmcli/arborist-2.8.1" // { dependencies = [ sources."mkdirp-1.0.4" sources."semver-7.3.5" @@ -124807,7 +125128,7 @@ in ]; }) sources."@npmcli/installed-package-contents-1.0.7" - sources."@npmcli/map-workspaces-1.0.3" + sources."@npmcli/map-workspaces-1.0.4" (sources."@npmcli/metavuln-calculator-1.1.1" // { dependencies = [ sources."semver-7.3.5" @@ -125533,7 +125854,7 @@ in ]; }) sources."taketalk-1.0.0" - (sources."tar-6.1.7" // { + (sources."tar-6.1.8" // { dependencies = [ sources."mkdirp-1.0.4" ]; @@ -125708,10 +126029,10 @@ in zx = nodeEnv.buildNodePackage { name = "zx"; packageName = "zx"; - version = "2.1.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/zx/-/zx-2.1.0.tgz"; - sha512 = "7mCJ92ev894l94w5aXkdQoZ9iE6qXERLMPp/uMhTumGKtyhvN8tWprqFFHiXGS/31HxEy1NtNd9NHmYjGHd85A=="; + url = "https://registry.npmjs.org/zx/-/zx-3.0.0.tgz"; + sha512 = "GPaKTImhbKfc3TmJ43g8vRT6PMhiifcUZ0ndhHqhqtJMbteTQYNzTZT+vBtdZsDMkoqxE54Vjm3bDsplE2qWFg=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.5" @@ -125719,7 +126040,7 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@types/fs-extra-9.0.12" sources."@types/minimist-1.2.2" - sources."@types/node-16.4.13" + sources."@types/node-16.6.1" sources."@types/node-fetch-2.5.12" sources."ansi-styles-4.3.0" sources."array-union-3.0.1" diff --git a/third_party/nixpkgs/pkgs/development/perl-modules/mod_perl2-PL_hash_seed.patch b/third_party/nixpkgs/pkgs/development/perl-modules/mod_perl2-PL_hash_seed.patch new file mode 100644 index 0000000000..a8aac88de3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/perl-modules/mod_perl2-PL_hash_seed.patch @@ -0,0 +1,13 @@ +From https://github.com/Perl/perl5/issues/18617#issuecomment-822056978 by Leont + +--- a/src/modules/perl/modperl_perl.c ++++ a/src/modules/perl/modperl_perl.c +@@ -268,7 +268,7 @@ + #ifdef MP_NEED_HASH_SEED_FIXUP + if (MP_init_hash_seed_set) { + #if MP_PERL_VERSION_AT_LEAST(5, 17, 6) +- memcpy(&PL_hash_seed, &MP_init_hash_seed, ++ memcpy(PL_hash_seed, &MP_init_hash_seed, + sizeof(PL_hash_seed) > sizeof(MP_init_hash_seed) ? + sizeof(MP_init_hash_seed) : sizeof(PL_hash_seed)); + PL_hash_seed_set = MP_init_hash_seed_set; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/couchbase/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/couchbase/default.nix index 7e72af65a3..18513945bf 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/couchbase/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/couchbase/default.nix @@ -1,7 +1,7 @@ { lib, buildPecl, fetchFromGitHub, writeText, libcouchbase, zlib, php, substituteAll }: let pname = "couchbase"; - version = "3.1.2"; + version = "3.2.0"; in buildPecl { inherit pname version; @@ -10,7 +10,7 @@ buildPecl { owner = "couchbase"; repo = "php-couchbase"; rev = "v${version}"; - sha256 = "0zm2jm5lzjjqlhkiivm4v5gr4286pwqaf5nar1ga816hhwnyhj42"; + sha256 = "sha256-rvlyH28xWLIVwK3yqqdhkoD1h6kl8FDq3Byo7mhV3jM="; }; configureFlags = [ "--with-couchbase" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/WSME/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/WSME/default.nix index 118288acb5..624bb4388a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/WSME/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/WSME/default.nix @@ -22,13 +22,13 @@ buildPythonPackage rec { pname = "WSME"; - version = "0.10.1"; + version = "0.11.0"; disabled = pythonAtLeast "3.9"; src = fetchPypi { inherit pname version; - sha256 = "34209b623635a905bcdbc654f53ac814d038da65e4c2bc070ea1745021984079"; + sha256 = "bd2dfc715bedcc8f4649611bc0c8a238f483dc01cff7102bc1efa6bea207b64b"; }; nativeBuildInputs = [ pbr ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/adax/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/adax/default.nix index 849d0d9cf8..867b08e28a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/adax/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/adax/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "adax"; - version = "0.1.0"; + version = "0.1.1"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "Danielhiversen"; repo = "pyadax"; rev = version; - sha256 = "06qk8xbv8lsaabdpi6pclnbkp3vmb4k18spahldazqj8235ii237"; + sha256 = "sha256-ekpI5GTLbKjlbWH9GSmpp/3URurc7UN+agxMfyGxrVA="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiomusiccast/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiomusiccast/default.nix index 267ca5b4a5..e728c7dc7c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiomusiccast/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiomusiccast/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "aiomusiccast"; - version = "0.8.2"; + version = "0.9.1"; format = "pyproject"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "vigonotion"; repo = "aiomusiccast"; rev = version; - sha256 = "sha256-XmDE704c9KJst8hrvdyQdS52Sd6RnprQZjBCIWAaiho="; + sha256 = "sha256-+BmymfRKwNPlksYcAUb/5cZYeOD5h85YhobmsNFJVE8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiotractive/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiotractive/default.nix index 78d9ef4350..859fd0dc5c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiotractive/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiotractive/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "aiotractive"; - version = "0.5.1"; + version = "0.5.2"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "zhulik"; repo = pname; - rev = "v${version}"; - sha256 = "09zbca84dn1sprwqpfanmxxnmaknbzjz98xa87agpgy8xb3wpw7j"; + rev = "v.${version}"; + sha256 = "04qdjyxq35063jpn218vw94a4r19fknk1q2kkxr8gnaabkpkjrnf"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/alectryon/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/alectryon/default.nix new file mode 100644 index 0000000000..30ae647b05 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/alectryon/default.nix @@ -0,0 +1,29 @@ +{ lib, buildPythonPackage, fetchPypi, pygments, dominate, beautifulsoup4, docutils, sphinx }: + +buildPythonPackage rec { + pname = "alectryon"; + owner = "cpitclaudel"; + version = "1.3.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256:0mca25jv917myb4n91ccpl5fz058aiqsn8cniflwfw5pp6lqnfg7"; + }; + + propagatedBuildInputs = [ + pygments + dominate + beautifulsoup4 + docutils + sphinx + ]; + + doCheck = false; + + meta = with lib; { + homepage = "https://github.com/cpitclaudel/alectryon"; + description = "A collection of tools for writing technical documents that mix Coq code and prose"; + license = licenses.mit; + maintainers = with maintainers; [ Zimmi48 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/amqtt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/amqtt/default.nix index d0cc2bd5da..1f5fee4d71 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/amqtt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/amqtt/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "amqtt"; - version = "0.10.0-alpha.4"; + version = "0.10.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Yakifo"; repo = pname; rev = "v${version}"; - sha256 = "1v5hlcciyicnhwk1xslh3kxyjqaw526fb05pvhjpp3zqrmbxya4d"; + sha256 = "sha256-27LmNR1KC8w3zRJ7YBlBolQ4Q70ScTPqypMCpU6fO+I="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/apache-airflow/yarn.nix b/third_party/nixpkgs/pkgs/development/python-modules/apache-airflow/yarn.nix index a0388a1af3..c1c9b8d785 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/apache-airflow/yarn.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/apache-airflow/yarn.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec { +{ fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec { offline_cache = linkFarm "offline" packages; packages = [ { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/apprise/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/apprise/default.nix index 04a3e11be3..1aa9dc2b10 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/apprise/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/apprise/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "apprise"; - version = "0.9.3"; + version = "0.9.4"; src = fetchPypi { inherit pname version; - sha256 = "sha256-yKzpyJHUIkVYVwrL6oCPMd+QSVML2czWmQHCemXWAMQ="; + sha256 = "sha256-Q7iZD9GG8vPxITpn87l3yGtU+L8jwvs2Qi329LHlKrI="; }; nativeBuildInputs = [ Babel installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asyncpg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asyncpg/default.nix index 5525f7940c..9c9e2d623d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asyncpg/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asyncpg/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "asyncpg"; - version = "0.23.0"; + version = "0.24.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "812dafa4c9e264d430adcc0f5899f0dc5413155a605088af696f952d72d36b5e"; + sha256 = "sha256-3S+gY8M0SCNIfZ3cy0CALwJiLd+L+KbMU4he56LBwMY="; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/authlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/authlib/default.nix index 4fa14a60ff..1ac9954730 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/authlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/authlib/default.nix @@ -8,14 +8,14 @@ }: buildPythonPackage rec { - version = "0.15.3"; + version = "0.15.4"; pname = "authlib"; src = fetchFromGitHub { owner = "lepture"; repo = "authlib"; rev = "v${version}"; - sha256 = "1lqicv8awyygqh1z8vhwvx38dw619kgbirdn8c9sc3qilagq1rdx"; + sha256 = "1jc7rssi1y6brkwjplj8qmi4q5w9h9wz03fbhg01c0y5bmy0g1nj"; }; propagatedBuildInputs = [ cryptography requests ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/awesomeversion/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/awesomeversion/default.nix index eed1728680..7b7d432f0c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/awesomeversion/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/awesomeversion/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "awesomeversion"; - version = "21.6.0"; + version = "21.8.0"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "ludeeus"; repo = pname; rev = version; - sha256 = "sha256-TODlLaj3bcNVHrly614oKe2OkhmowsJojpR7apUIojc="; + sha256 = "sha256-j5y3f6F+8PzOPxpBHE3LKF3kdRzP4d21N/1Bd6v+MQg="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-batch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-batch/default.nix index 5f4b005b6e..c153534cc6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-batch/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-batch/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-batch"; - version = "15.0.0"; + version = "16.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "9b793bb31a0d4dc8c29186db61db24d83795851a75846aadb187cf95bf853ccb"; + sha256 = "1b3cecd6f16813879c6ac1a1bb01f9a6f2752cd1f9157eb04d5e41e4a89f3c34"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix index 7a4d8005c9..9d83e092f5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-containerinstance"; - version = "7.0.0"; + version = "8.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "9f624df0664ba80ba886bc96ffe5e468c620eb5b681bc3bc2a28ce26042fd465"; + sha256 = "7aeb380af71fc35a71d6752fa25eb5b95fdb2a0027fa32e6f50bce87e2622916"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix index e903e553b4..9d172701bb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-containerservice"; - version = "16.0.0"; + version = "16.1.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "d6aa95951d32fe2cb390b3d8ae4f6459746de51bbaad94b5d1842dd35c4d0c11"; + sha256 = "3654c8ace2b8868d0ea9c4c78c74f51e86e23330c7d8a636d132253747e6f3f4"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-redis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-redis/default.nix index fb43f130ba..79045a4b4b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-redis/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-redis/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-redis"; - version = "12.0.0"; + version = "13.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "8ae563e3df82a2f206d0483ae6f05d93d0d1835111c0bbca7236932521eed356"; + sha256 = "283f776afe329472c20490b1f2c21c66895058cb06fb941eccda42cc247217f1"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-servicebus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-servicebus/default.nix index bc88fece77..611508b424 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-servicebus/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-servicebus/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-servicebus"; - version = "7.3.1"; + version = "7.3.2"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "dc162fc572087cdf53065a2ea9517b002a6702cf382f998d69903d68c16c731e"; + sha256 = "6c9bef0bfb4ac2bb8158fdfb3938884cd42542be3162ac288fa8df4e254d3810"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bids-validator/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bids-validator/default.nix index aee7147f5b..e3ee7b9ba7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bids-validator/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bids-validator/default.nix @@ -4,12 +4,12 @@ }: buildPythonPackage rec { - version = "1.7.2"; + version = "1.8.0"; pname = "bids-validator"; src = fetchPypi { inherit pname version; - sha256 = "12398831a3a3a2ed7c67e693cf596610c23dd23e0889bfeae0830bbd1d41e5b9"; + sha256 = "6d4ecc384121899e0cd5af773419c5ba722585cb176544560ec9a48f17dfd777"; }; # needs packages which are not available in nixpkgs diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bimmer-connected/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bimmer-connected/default.nix index c7abe9cfd9..3f69907feb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bimmer-connected/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bimmer-connected/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "bimmer-connected"; - version = "0.7.15"; + version = "0.7.18"; disabled = pythonOlder "3.5"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "bimmerconnected"; repo = "bimmer_connected"; rev = version; - sha256 = "193m16rrq7mfvzjcq823icdr9fp3i8grqqn3ci8zhcsq6w3vnb90"; + sha256 = "sha256-90Rli0tiZIO2gtx3EfPXg8U6CSKEmHUiRePjITvov/E="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/binwalk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/binwalk/default.nix index 609c0392c7..9f4966ffe8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/binwalk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/binwalk/default.nix @@ -22,13 +22,13 @@ buildPythonPackage rec { pname = "binwalk"; - version = "2.3.1"; + version = "2.3.2"; src = fetchFromGitHub { owner = "ReFirmLabs"; repo = "binwalk"; rev = "v${version}"; - sha256 = "108mj4jjffdmaz6wjvglbv44j7fkhspaxz1rj2bi1fcnwsri5wsm"; + sha256 = "sha256-lfHXutAp06Xr/TSBpDwBUBC/mWI9XuyImoKwA3inqgU="; }; propagatedBuildInputs = [ zlib xz ncompress gzip bzip2 gnutar p7zip cabextract squashfsTools xz pycrypto ] diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cachelib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cachelib/default.nix index 9521d3ee03..0838558e11 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cachelib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cachelib/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "cachelib"; - version = "0.2.0"; + version = "0.3.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "pallets"; repo = pname; rev = version; - sha256 = "1jh1ghvrv1mnw6mdq19s6x6fblz9qi0vskc6mjp0cxjpnxxblaml"; + sha256 = "sha256-ssyHNlrSrG8YHRS131jJtmgl6eMTNdet1Hf0nTxL8sM="; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/celery/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/celery/default.nix index a48f865129..cd6d21b7c6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/celery/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/celery/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "celery"; - version = "5.1.1"; + version = "5.1.2"; src = fetchPypi { inherit pname version; - sha256 = "54436cd97b031bf2e08064223240e2a83d601d9414bcb1b702f94c6c33c29485"; + sha256 = "8d9a3de9162965e97f8e8cc584c67aad83b3f7a267584fa47701ed11c3e0d4b0"; }; # click is only used for the repl, in most cases this shouldn't impact diff --git a/third_party/nixpkgs/pkgs/development/python-modules/certbot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/certbot/default.nix index 61ec6c2125..c5f0fafde8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/certbot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/certbot/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "certbot"; - version = "1.16.0"; + version = "1.17.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "0jdq6pvq7af2x483857qyp1qvqs4yb4nqcv66qi70glmbanhlxd4"; + sha256 = "sha256-07UfTIZUbRD19BQ0xlZXlZo/oiVLDFNq+N2pDnWwbwI="; }; sourceRoot = "source/${pname}"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/chess/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/chess/default.nix new file mode 100644 index 0000000000..baef04eab5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/chess/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, python +, pythonOlder +}: + +buildPythonPackage rec { + pname = "chess"; + version = "1.6.1"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "niklasf"; + repo = "python-${pname}"; + rev = "v${version}"; + sha256 = "sha256-2pyABmr6q1Y2/ivtvMYqRHE2Zjlyz2QO0us0w4l2HQM="; + }; + + pythonImportsCheck = [ "chess" ]; + + checkPhase = '' + ${python.interpreter} ./test.py -v + ''; + + meta = with lib; { + description = "A chess library for Python, with move generation, move validation, and support for common formats"; + homepage = "https://github.com/niklasf/python-chess"; + maintainers = with maintainers; [ smancill ]; + license = licenses.gpl3Plus; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/connexion/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/connexion/default.nix index 0429ee7a50..ed6f2da514 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/connexion/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/connexion/default.nix @@ -7,6 +7,7 @@ , clickclick , decorator , fetchFromGitHub +, fetchpatch , flask , inflection , jsonschema @@ -22,14 +23,14 @@ buildPythonPackage rec { pname = "connexion"; - version = "2.7.0"; + version = "2.9.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "zalando"; repo = pname; rev = version; - sha256 = "15iflq5403diwda6n6qrpq67wkdcvl3vs0gsg0fapxqnq3a2m7jj"; + sha256 = "13smcg2w24zr2sv1968g9p9m6f18nqx688c96qdlmldnszgzf5ik"; }; propagatedBuildInputs = [ @@ -54,6 +55,15 @@ buildPythonPackage rec { testfixtures ]; + patches = [ + # No minor release for later versions, https://github.com/zalando/connexion/pull/1402 + (fetchpatch { + name = "allow-later-flask-and-werkzeug-releases.patch"; + url = "https://github.com/zalando/connexion/commit/4a225d554d915fca17829652b7cb8fe119e14b37.patch"; + sha256 = "0dys6ymvicpqa3p8269m4yv6nfp58prq3fk1gcx1z61h9kv84g1k"; + }) + ]; + pythonImportsCheck = [ "connexion" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/crytic-compile/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/crytic-compile/default.nix index 127e6f9293..8ed07d9597 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/crytic-compile/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/crytic-compile/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "crytic-compile"; - version = "0.2.0"; + version = "0.2.1"; disabled = pythonOlder "3.6"; @@ -10,7 +10,7 @@ buildPythonPackage rec { owner = "crytic"; repo = "crytic-compile"; rev = version; - sha256 = "sha256-Kuc7g5+4TIcQTWYjG4uPN0Rxfom/A/xpek5K5ErlbdU="; + sha256 = "sha256-RDb4Dc+igt2JKskBFIFvYt4xTAMujp8uXnkWsgnwdJE="; }; propagatedBuildInputs = [ pysha3 setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dash-core-components/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dash-core-components/default.nix index 8802f0f0e7..7f2169cd98 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dash-core-components/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dash-core-components/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "dash_core_components"; - version = "1.16.0"; + version = "1.17.1"; src = fetchPypi { inherit pname version; - sha256 = "e8cdfaf3580577670bb2d1c3168efa06f5a7b439fbe5527cfaefa3e32394542f"; + sha256 = "sha256-flA/Xt22MDTdIMI9IYzA2KgeyI6aFbfLxg4maw4rYKk="; }; # No tests in archive diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dash-html-components/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dash-html-components/default.nix index 28faf24481..1b4e5d6a47 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dash-html-components/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dash-html-components/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "dash_html_components"; - version = "1.1.3"; + version = "1.1.4"; src = fetchPypi { inherit pname version; - sha256 = "88adb77a674d5d7d0835d71c469f6e7b4aa692f9673808a474d244b71863c58a"; + sha256 = "dc4f423e13716d179d51a42b3c7e2a2ed02e05185c742f88214b58d59e24bbd4"; }; # No tests in archive diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dash-table/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dash-table/default.nix index 31be5e6853..5a2ada1b56 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dash-table/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dash-table/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "dash_table"; - version = "4.11.3"; + version = "4.12.0"; src = fetchPypi { inherit pname version; - sha256 = "0a4f22a5cf5120882a252a3348fc15ef45a1b75bf900934783e338aceac52f56"; + sha256 = "sha256-TJlomoh7/QNSeLFOzV23BwYCM4nlNzXV48zMQW+s2+Q="; }; # No tests in archive diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dash/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dash/default.nix index c9b259b073..807a08de67 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dash/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dash/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "dash"; - version = "1.20.0"; + version = "1.21.0"; src = fetchFromGitHub { owner = "plotly"; repo = pname; rev = "v${version}"; - sha256 = "1205xwi0w33g3c8gcba50fjj38dzgn7nhfk5w186kd6dwmvz02yg"; + sha256 = "sha256-X2yRlW6aXgRgKgRxLNBUHjkjMaw7K4iydzpWLBNt+Y8="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/desktop-notifier/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/desktop-notifier/default.nix index 29ddb16f27..ee6e1db06a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/desktop-notifier/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/desktop-notifier/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , pythonOlder , stdenv , packaging @@ -10,12 +10,14 @@ buildPythonPackage rec { pname = "desktop-notifier"; - version = "3.3.0"; + version = "3.3.1"; disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-ROSZorkA2wAp2Ubh3B3KWIUxM/4r7cv/1aSJqeKnPqg="; + src = fetchFromGitHub { + owner = "SamSchott"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-GbsbwCKRTgLk0xK6MGKb1Tp6cd8q3h6OUdJ2f+VPyzk="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-jinja2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-jinja2/default.nix index 8f20313556..266160fc17 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-jinja2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-jinja2/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "django-jinja"; - version = "2.8.0"; + version = "2.9.0"; meta = { description = "Simple and nonobstructive jinja2 integration with Django"; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "bba30a7ea4394bccfaa9bc8620996c25ede446ab06104b51b3a16fe81232cbf2"; + sha256 = "69433ea312264a541acf1e3e9748e44783ad33381e48e6a7230762e02f005276"; }; buildInputs = [ django pytz tox ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/doc8/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/doc8/default.nix index c2a7df098f..9ffb579639 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/doc8/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/doc8/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "doc8"; - version = "0.8.1"; + version = "0.9.0"; src = fetchPypi { inherit pname version; - sha256 = "4d1df12598807cf08ffa9a1d5ef42d229ee0de42519da01b768ff27211082c12"; + sha256 = "380b660474be40ce88b5f04fa93470449124dbc850a0318f2ef186162bc1360b"; }; buildInputs = [ pbr ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fastecdsa/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fastecdsa/default.nix index 04d9da87c5..8d104a889a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fastecdsa/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fastecdsa/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "fastecdsa"; - version = "2.1.5"; + version = "2.2.1"; src = fetchPypi { inherit pname version; - sha256 = "d0772f7fe243e8a82d33e95c542ea6cc0ef7f3cfcced7440d6defa71a35addfa"; + sha256 = "48d59fcd18d0892a6b76463d4c98caa217975414f6d853af7cfcbbb0284cb52d"; }; buildInputs = [ gmp ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flowlogs_reader/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flowlogs_reader/default.nix index f8468209bb..885c688225 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flowlogs_reader/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flowlogs_reader/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "flowlogs_reader"; - version = "2.4.0"; + version = "3.1.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "e47637b40a068a0c814ba2087fb691b43aa12e6174ab06b6cdb7109bb94624e4"; + sha256 = "d99636423abc83bb4042d63edd56852ede9e2949cadcc3339eda8f3367826dd4"; }; propagatedBuildInputs = [ botocore boto3 docutils ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fontparts/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fontparts/default.nix index 8ed3ef17ad..158806f1be 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fontparts/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fontparts/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "fontParts"; - version = "0.9.10"; + version = "0.9.11"; src = fetchPypi { inherit pname version; - sha256 = "0hwjnqbkcfkhigx581w4532vddsx5wiy73gx46kjisp0hlir9628"; + sha256 = "558a5f681fcf7ca0bb5a1c68917b5d9b61c77d517833a01ea1667773d13f4012"; extension = "zip"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/furo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/furo/default.nix new file mode 100644 index 0000000000..e516612378 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/furo/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, sphinx +, beautifulsoup4 +}: + +buildPythonPackage rec { + pname = "furo"; + version = "2021.8.11b42"; + format = "flit"; + disable = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-rhi2T57EfidQV1IHBkplCbzLlBCC5gVGmbkCf40s0qU="; + }; + + propagatedBuildInputs = [ + sphinx + beautifulsoup4 + ]; + + pythonImportsCheck = [ "furo" ]; + + meta = with lib; { + description = "A clean customizable documentation theme for Sphinx"; + homepage = "https://github.com/pradyunsg/furo"; + license = licenses.mit; + maintainers = with maintainers; [ Luflosi ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gensim/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gensim/default.nix index c79fbb6b90..548dd1214f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gensim/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gensim/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "gensim"; - version = "4.0.0"; + version = "4.0.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "a9c9fed52e2901ad04f9caf73a5dd782e5ce8054f71b346d72f04ddff1b7b432"; + sha256 = "b4d0b9562796968684028e06635e0f7aff39ffb33719057fd1667754ea09a6e4"; }; propagatedBuildInputs = [ smart-open numpy six scipy ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gipc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gipc/default.nix index 8dc87ffa88..a059495d00 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gipc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gipc/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "gipc"; - version = "1.2.0"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "6045b22dfbd8aec5542fe15d71684e46df0a4de852ccae6a02c9db3a24076e01"; + sha256 = "a25ccfd2f8c94b24d2113fa50a0de5c7a44499ca9f2ab7c91c3bec0ed96ddeb1"; }; propagatedBuildInputs = [ gevent ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix index 2d0af0717b..2fd9247c88 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "google-api-python-client"; - version = "2.9.0"; + version = "2.15.0"; src = fetchPypi { inherit pname version; - sha256 = "2b5274f06799d80222fd3f20fd4ebcd19f57c009703bd4cf7b00492e7e05e15a"; + sha256 = "sha256-g3VIkjKCP0TGARlqlgUF4D7FjJXdtkFcax0ddrRo+Lo="; }; # No tests included in archive diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-auth-oauthlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-auth-oauthlib/default.nix index 6e4c139d8d..940d04e5a4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-auth-oauthlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-auth-oauthlib/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-auth-oauthlib"; - version = "0.4.4"; + version = "0.4.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-CYMsbnUDL5OBjt8a/+R0YSHWQMYlpb75tclq9nbpju4="; + sha256 = "sha256-SrWObD3GzPES+SH8ztQOVCb7omZ2iYbqUCIoSIJ26ro="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-auth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-auth/default.nix index 1a39296d62..bfca445a96 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-auth/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-auth/default.nix @@ -20,11 +20,11 @@ buildPythonPackage rec { pname = "google-auth"; - version = "1.31.0"; + version = "1.34.0"; src = fetchPypi { inherit pname version; - sha256 = "154f7889c5d679a6f626f36adb12afbd4dbb0a9a04ec575d989d6ba79c4fd65e"; + sha256 = "sha256-8QlAiLrgRvsG89Gj198UcX6NlZ6RBbecV3Jb1OF1l6I="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix index 556bc09ed6..27e79bdd06 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , google-api-core -, grpc_google_iam_v1 +, grpc-google-iam-v1 , mock , proto-plus , pytest-asyncio @@ -12,16 +12,16 @@ buildPythonPackage rec { pname = "google-cloud-appengine-logging"; - version = "0.1.0"; + version = "0.1.4"; src = fetchPypi { inherit pname version; - sha256 = "0rkayy2qzsc70b0rdvzd2bxwp5f07rfqb95cyj57dkphq71mrrhw"; + sha256 = "sha256-1E+3fXcGsIbTh7nXnBOcVT1UtY3cjulnu/MqU+e77lY="; }; propagatedBuildInputs = [ google-api-core - grpc_google_iam_v1 + grpc-google-iam-v1 proto-plus ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-asset/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-asset/default.nix index 61e69c5b29..437417323f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-asset/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-asset/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, grpc_google_iam_v1 +, grpc-google-iam-v1 , google-api-core , google-cloud-access-context-manager , google-cloud-org-policy @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "google-cloud-asset"; - version = "2.2.0"; + version = "3.3.0"; src = fetchPypi { inherit pname version; - sha256 = "05q0yaw6b553qmzylr45zin17h8mvi8yyyxhbv3cxa7f0ahviw8w"; + sha256 = "sha256-/iTpO1Y+v//ZzaXUpOfBOXDRfftpmUV4hxsFmMj3tM0="; }; postPatch = '' @@ -30,7 +30,7 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ - grpc_google_iam_v1 + grpc-google-iam-v1 google-api-core google-cloud-access-context-manager google-cloud-org-policy diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-automl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-automl/default.nix index 1d40dcac26..f7a5673573 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-automl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-automl/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "google-cloud-automl"; - version = "2.3.0"; + version = "2.4.2"; src = fetchPypi { inherit pname version; - sha256 = "523633496b4fe1ca74a7b22cdaa206581804863813bf461e2f437d0fb7ad21b6"; + sha256 = "sha256-c3zlpCejXB/RO8RnyFUpDknefpoMZWXWgaS7ACpqdAw="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix index ec3be9e2ab..f6a62c544c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-datatransfer"; - version = "3.1.1"; + version = "3.3.1"; src = fetchPypi { inherit pname version; - sha256 = "9ac8cd06a60bfdc504f39fbcd086e5180c8684cffefe7745a9ff6a639c575629"; + sha256 = "sha256-oCktt8wAYKewz6Ga4mIGVy0IWonXTqQvaO5MT4MkHMY="; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix index 566c566bbe..3d18612d10 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , google-api-core -, grpc_google_iam_v1 +, grpc-google-iam-v1 , mock , proto-plus , pytest-asyncio @@ -12,16 +12,16 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-logging"; - version = "0.1.0"; + version = "0.2.1"; src = fetchPypi { inherit pname version; - sha256 = "0s8vlw157z10yzzkrfyzfl31iad96wfl3ywk9g3gmmh0jfgy0gfj"; + sha256 = "sha256-5ixj9MnJVVcU9NR4ZBe0TAp8ogJLAKrPlyGm5d/iQwA="; }; propagatedBuildInputs = [ google-api-core - grpc_google_iam_v1 + grpc-google-iam-v1 proto-plus ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix index acb66394bd..0bd663b4f1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix @@ -4,6 +4,7 @@ , pytestCheckHook , freezegun , google-cloud-core +, google-cloud-datacatalog , google-cloud-storage , google-cloud-testutils , google-resumable-media @@ -17,11 +18,11 @@ buildPythonPackage rec { pname = "google-cloud-bigquery"; - version = "2.20.0"; + version = "2.23.3"; src = fetchPypi { inherit pname version; - sha256 = "ff728f9a4a64d6b4ec5beb7fd2f6ed550b49bfe2b8bb3755c00821716e0d1f91"; + sha256 = "sha256-FQXtRM7YaU+S+Jqkn9dTQqJR3A1hL/XQjgPTXmANO0I="; }; propagatedBuildInputs = [ @@ -38,6 +39,7 @@ buildPythonPackage rec { mock pandas psutil + google-cloud-datacatalog google-cloud-storage pytestCheckHook ]; @@ -53,6 +55,12 @@ buildPythonPackage rec { "TestBigQuery" # Mocking of _ensure_bqstorage_client fails "test_to_arrow_ensure_bqstorage_client_wo_bqstorage" + # requires network + "test_dbapi_create_view" + "test_list_rows_nullable_scalars_dtypes" + "test_parameterized_types_round_trip" + "test_structs" + "test_table_snapshots" ]; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigtable/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigtable/default.nix index f7eb9a51a8..5f61ac7f88 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigtable/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigtable/default.nix @@ -3,7 +3,7 @@ , fetchPypi , google-api-core , google-cloud-core -, grpc_google_iam_v1 +, grpc-google-iam-v1 , libcst , mock , proto-plus @@ -12,17 +12,17 @@ buildPythonPackage rec { pname = "google-cloud-bigtable"; - version = "2.2.0"; + version = "2.3.3"; src = fetchPypi { inherit pname version; - sha256 = "sha256-89fXmr3jHTtp8QOMFeueJwslHJ7Q6srQ/Kxsp0mLlKU="; + sha256 = "sha256-4rMnGnDQtuu55mzrYkeJjrU0ykQXd+pOYAw2yVcqJAQ="; }; propagatedBuildInputs = [ google-api-core google-cloud-core - grpc_google_iam_v1 + grpc-google-iam-v1 libcst proto-plus ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix index 095e0a8447..fccae98ac0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , google-api-core -, grpc_google_iam_v1 +, grpc-google-iam-v1 , libcst , mock , proto-plus @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-container"; - version = "2.4.1"; + version = "2.7.1"; src = fetchPypi { inherit pname version; - sha256 = "e7d93ca399dd6fb5fd0f99190248531c9c583d1a85e7cd2c9ee485495459ee78"; + sha256 = "sha256-nMUMGFU383TC7cXkj6EHaEe4HHS5NzcLBIxp1xgWUzg="; }; - propagatedBuildInputs = [ google-api-core grpc_google_iam_v1 libcst proto-plus ]; + propagatedBuildInputs = [ google-api-core grpc-google-iam-v1 libcst proto-plus ]; checkInputs = [ mock pytestCheckHook pytest-asyncio ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-core/default.nix index 3e9a3d1851..b9edb4224d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-core/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-core"; - version = "1.7.0"; + version = "1.7.2"; src = fetchPypi { inherit pname version; - sha256 = "2ab0cf260c11d0cc334573301970419abb6a1f3909c6cd136e4be996616372fe"; + sha256 = "sha256-sQMKrcuyrrTuUUdUJjUa+DwQckVrkY+4/bgGZsS7Y7U="; }; propagatedBuildInputs = [ google-api-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-datacatalog/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-datacatalog/default.nix new file mode 100644 index 0000000000..669d06b305 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-datacatalog/default.nix @@ -0,0 +1,24 @@ +{ lib, buildPythonPackage, fetchPypi, libcst, google-api-core, grpc-google-iam-v1, proto-plus, pytest-asyncio, pytestCheckHook, mock }: + +buildPythonPackage rec { + pname = "google-cloud-datacatalog"; + version = "3.4.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "2faca51e974c46203c09fd4cb2c03fd6e82cd572cc06a2bbc3b401aa419cb09f"; + }; + + propagatedBuildInputs = [ libcst google-api-core grpc-google-iam-v1 proto-plus ]; + + checkInputs = [ pytest-asyncio pytestCheckHook mock ]; + + pythonImportsCheck = [ "google.cloud.datacatalog" ]; + + meta = with lib; { + description = "Google Cloud Data Catalog API API client library"; + homepage = "https://github.com/googleapis/python-datacatalog"; + license = licenses.asl20; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dataproc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dataproc/default.nix index e98c8be0b4..718c5998a3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dataproc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dataproc/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-dataproc"; - version = "2.4.0"; + version = "2.5.0"; src = fetchPypi { inherit pname version; - sha256 = "6e5373febe420e2b2375d2252b272129f11a37ff1b88a7587322931063be8d38"; + sha256 = "sha256-wRGIuut2mJ6RJh8fRUAT0JDmnUreQYXhgVgsfRxvyxo="; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-datastore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-datastore/default.nix index 5ffeac605e..f1449bbccd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-datastore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-datastore/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "google-cloud-datastore"; - version = "2.1.3"; + version = "2.1.6"; src = fetchPypi { inherit pname version; - sha256 = "e7a510759b9d55ff63c983e3c42cbf5c35f9b7310f4d611ebe3697da6576bcb4"; + sha256 = "sha256-31PBHWnU0KbX8ymFh7+dP0uVbM6BWexdaumMVQbBO6o="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dlp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dlp/default.nix index ea5d20142d..a433ccdc69 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dlp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dlp/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-dlp"; - version = "3.1.1"; + version = "3.2.2"; src = fetchPypi { inherit pname version; - sha256 = "0863e90f9a9cae70af7962dd17d99cb6dde44bf3a029ce5990cb8226557a9e95"; + sha256 = "sha256-ZxGWTsqCIvpTSN+aThVgjPuMJE7hHMVn4zsidpXk7xk="; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dns/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dns/default.nix index 94576499b9..be463f6a96 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dns/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dns/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-cloud-dns"; - version = "0.32.3"; + version = "0.33.0"; src = fetchPypi { inherit pname version; - sha256 = "bbb1c855524bd3f0f2a3b3db883af0d3f618befb976aa694d7e507dd68fc7a71"; + sha256 = "sha256-iPAJMzxefRjLA0tGUfjAs15ZJvcyBUJB1QCMfMBo96I="; }; propagatedBuildInputs = [ google-api-core google-cloud-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-error-reporting/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-error-reporting/default.nix index 8aae0c072a..28d2d538e0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-error-reporting/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-error-reporting/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-error-reporting"; - version = "1.1.2"; + version = "1.2.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-NT/+2mtIaEMyXnmM1fWX4kEV9pb1+aNas2lNobUPR14="; + sha256 = "sha256-LKESEpQLvjmyo8VcZ1fxMcPCbUE+mxvmnexoZEKramc="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-firestore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-firestore/default.nix index 1c2dfe88a6..87bd997ae8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-firestore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-firestore/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "google-cloud-firestore"; - version = "2.1.3"; + version = "2.2.0"; src = fetchPypi { inherit pname version; - sha256 = "143a88ef2b90c98f16d2b0bc192631ca3e2b7c66a236d93ba9961de64e50870e"; + sha256 = "sha256-QMwvMPebC2a09XmKQKYFPwVIbZlnUEaXxTh8hlnS9Js="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-iam-logging/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-iam-logging/default.nix index 55d36ac2a7..9e5dd9fa21 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-iam-logging/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-iam-logging/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , google-api-core -, grpc_google_iam_v1 +, grpc-google-iam-v1 , mock , proto-plus , pytest-asyncio @@ -12,16 +12,16 @@ buildPythonPackage rec { pname = "google-cloud-iam-logging"; - version = "0.1.0"; + version = "0.1.2"; src = fetchPypi { inherit pname version; - sha256 = "19a8s634w2m1b16zq8f185cpaw7k6d0c7c61g1vzm19jl213rhiw"; + sha256 = "sha256-yX58Pq2+YB3ylN92RUIGlQKnvKYD7sabCKtZsDNV5sc="; }; propagatedBuildInputs = [ google-api-core - grpc_google_iam_v1 + grpc-google-iam-v1 proto-plus ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-iot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-iot/default.nix index 5fc87b31c3..f3a5642927 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-iot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-iot/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, grpc_google_iam_v1 +, grpc-google-iam-v1 , google-api-core , libcst , proto-plus @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-iot"; - version = "2.1.0"; + version = "2.2.1"; src = fetchPypi { inherit pname version; - sha256 = "f4d7c55636e8cb57a4dde41d933cd8663b1369ab3542b287957959ee59828559"; + sha256 = "sha256-vMzq4ffA7877zRtdZ+VpFdEHU0BZhDdhgxuk5154hMU="; }; - propagatedBuildInputs = [ grpc_google_iam_v1 google-api-core libcst proto-plus ]; + propagatedBuildInputs = [ grpc-google-iam-v1 google-api-core libcst proto-plus ]; checkInputs = [ mock pytestCheckHook pytest-asyncio ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-kms/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-kms/default.nix index 1caf22bdd2..9992dc7bc7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-kms/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-kms/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , pytestCheckHook -, grpc_google_iam_v1 +, grpc-google-iam-v1 , google-api-core , libcst , mock @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-kms"; - version = "2.3.0"; + version = "2.5.0"; src = fetchPypi { inherit pname version; - sha256 = "39c6aa1633e45dc0364397b24c83718bd63f833db41d8c93b76019c16208d0f1"; + sha256 = "sha256-OuvpnIJeG+O+2Teopq8FYJOHIyi1V3RdlmJEq/fFSxM="; }; - propagatedBuildInputs = [ grpc_google_iam_v1 google-api-core libcst proto-plus ]; + propagatedBuildInputs = [ grpc-google-iam-v1 google-api-core libcst proto-plus ]; checkInputs = [ mock pytestCheckHook pytest-asyncio ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-language/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-language/default.nix index b6414355a1..140f5be3cf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-language/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-language/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-language"; - version = "2.1.0"; + version = "2.2.2"; src = fetchPypi { inherit pname version; - sha256 = "63ca2d772e16e4440858848e8c3298859b931b1652f663683fb5d7413b7c9a1b"; + sha256 = "sha256-X8lh+90HyyktxgJiRaiJF9ExKHmgiVcQiYDotg3AqaQ="; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-logging/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-logging/default.nix index 6e11f78347..00abd81606 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-logging/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-logging/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "google-cloud-logging"; - version = "2.5.0"; + version = "2.6.0"; src = fetchPypi { inherit pname version; - sha256 = "ab9d6ee1156cabe8c2483ca5a67bdf3a8582c596dd4e498a59781b6670b085f0"; + sha256 = "sha256-SZ7tXxPKuAXIeAsNFKDZMan/HWXvzN2eaHctQOfa1MU="; }; propagatedBuildInputs = [ google-api-core google-cloud-core proto-plus ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-monitoring/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-monitoring/default.nix index 2638a4bda8..c2a08fd7be 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-monitoring/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-monitoring/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "google-cloud-monitoring"; - version = "2.3.0"; + version = "2.4.2"; src = fetchPypi { inherit pname version; - sha256 = "fcbf644622709277d47b0dd8884efd1d62703bffda3c1030e06404709690c06c"; + sha256 = "sha256-PQjTAqSzjCBPH58nZHAc6Oa12NSDVvt2E0ZHewTFZfY="; }; propagatedBuildInputs = [ libcst google-api-core proto-plus ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-os-config/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-os-config/default.nix index 766ed90376..d86a40d57b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-os-config/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-os-config/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "google-cloud-os-config"; - version = "1.2.0"; + version = "1.3.2"; src = fetchPypi { inherit pname version; - sha256 = "2b828513c1cea481d03d0218516e5c5d8b53756db3637f02cd69ae3c171832dc"; + sha256 = "sha256-sC80RGY4lDVebpoz2hDGH5WfyrAjaOKTSDp/BhGmZS0="; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-pubsub/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-pubsub/default.nix index f0615bd5a2..47af89d4be 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-pubsub/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-pubsub/default.nix @@ -4,7 +4,7 @@ , pytestCheckHook , google-api-core , google-cloud-testutils -, grpc_google_iam_v1 +, grpc-google-iam-v1 , libcst , mock , proto-plus @@ -13,15 +13,15 @@ buildPythonPackage rec { pname = "google-cloud-pubsub"; - version = "2.5.0"; + version = "2.7.0"; src = fetchPypi { inherit pname version; - sha256 = "8706557b71532c76aec48409dcac189caac47cf2decb8850ae75694bf70326b2"; + sha256 = "sha256-F4itJadl6oNJnY9EENTIugJll8uC20bS9yF/HCUlrWU="; }; propagatedBuildInputs = [ - grpc_google_iam_v1 + grpc-google-iam-v1 google-api-core libcst proto-plus diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-redis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-redis/default.nix index fe4ea4249c..e149f031b9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-redis/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-redis/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-redis"; - version = "2.1.1"; + version = "2.2.2"; src = fetchPypi { inherit pname version; - sha256 = "d97fde9361026ab67f53557a8fe9f3db26121959ab586fe453f42a401d40fb4c"; + sha256 = "sha256-lxjxkBK/7up+t2dF2hZz3QXeXLwo9L0Z78mH6aC4Icc="; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-resource-manager/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-resource-manager/default.nix index 8a265182fb..8e7953384e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-resource-manager/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-resource-manager/default.nix @@ -4,19 +4,21 @@ , pytestCheckHook , google-cloud-core , google-api-core +, grpc-google-iam-v1 +, proto-plus , mock }: buildPythonPackage rec { pname = "google-cloud-resource-manager"; - version = "0.30.3"; + version = "1.0.2"; src = fetchPypi { inherit pname version; - sha256 = "1la643vkf6fm2gapz57cm92xzvmhzgpzv3bb6112yz1cizrvnxrm"; + sha256 = "sha256-5njC5yO7NTU81i9vmJoe1RBYPS1fU/3K5tgH7twyT+I="; }; - propagatedBuildInputs = [ google-api-core google-cloud-core ]; + propagatedBuildInputs = [ google-api-core google-cloud-core grpc-google-iam-v1 proto-plus ]; checkInputs = [ mock pytestCheckHook ]; @@ -25,7 +27,10 @@ buildPythonPackage rec { rm -r google ''; - pythonImportsCheck = [ "google.cloud.resource_manager" ]; + pythonImportsCheck = [ + "google.cloud.resourcemanager" + "google.cloud.resourcemanager_v3" + ]; meta = with lib; { description = "Google Cloud Resource Manager API client library"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix index 6e741a4e29..7784b910e1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-cloud-runtimeconfig"; - version = "0.32.2"; + version = "0.32.4"; src = fetchPypi { inherit pname version; - sha256 = "5285aef98fdb9a691e7c54789e7c493c51674b6e77fe6c967172ae8eadbba026"; + sha256 = "ee239455a5393b51018071678ec0f4cc58ddf0904390e9f317f704f158ab16ab"; }; propagatedBuildInputs = [ google-api-core google-cloud-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-secret-manager/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-secret-manager/default.nix index cf1ac538f1..30174afcbb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-secret-manager/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-secret-manager/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , google-api-core -, grpc_google_iam_v1 +, grpc-google-iam-v1 , libcst , mock , proto-plus @@ -12,16 +12,16 @@ buildPythonPackage rec { pname = "google-cloud-secret-manager"; - version = "2.5.0"; + version = "2.7.0"; src = fetchPypi { inherit pname version; - sha256 = "e99eb9f77373b97bfc1becb7d23fae5574a33fd9e44b44a3e700abcbfbc9f94d"; + sha256 = "sha256-gfNoCfh2ssHgYcQ1kfQedcfhpqsu3x50hdYrm11SKGo="; }; propagatedBuildInputs = [ google-api-core - grpc_google_iam_v1 + grpc-google-iam-v1 libcst proto-plus ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-securitycenter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-securitycenter/default.nix index cc83868079..79fe9221d1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-securitycenter/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-securitycenter/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, grpc_google_iam_v1 +, grpc-google-iam-v1 , google-api-core , libcst , mock @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-securitycenter"; - version = "1.3.1"; + version = "1.5.0"; src = fetchPypi { inherit pname version; - sha256 = "872507adad97f452e0998730cd1993c0433c05a0757c268f5c02fbfabe7720d4"; + sha256 = "sha256-DrdzC7Oe/8cq41OLcN51Qm208L0zPa9cxscHqmYji04="; }; - propagatedBuildInputs = [ grpc_google_iam_v1 google-api-core libcst proto-plus ]; + propagatedBuildInputs = [ grpc-google-iam-v1 google-api-core libcst proto-plus ]; checkInputs = [ mock pytestCheckHook pytest-asyncio ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-spanner/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-spanner/default.nix index 17fe6be971..5f03a18118 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-spanner/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-spanner/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, grpc_google_iam_v1 +, grpc-google-iam-v1 , google-cloud-core , google-cloud-testutils , libcst @@ -14,16 +14,16 @@ buildPythonPackage rec { pname = "google-cloud-spanner"; - version = "3.5.0"; + version = "3.7.0"; src = fetchPypi { inherit pname version; - sha256 = "19656140f180aef84e023c3a8fd534ac964247a52199317ea33abc701d5a8c5a"; + sha256 = "sha256-4LGSB7KU+RGvjSQ/w1vXxa5fkfFT4C5omhk/LnGSUng="; }; propagatedBuildInputs = [ google-cloud-core - grpc_google_iam_v1 + grpc-google-iam-v1 libcst proto-plus sqlparse diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix index 8a72a3e006..80f5318284 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-speech"; - version = "2.4.0"; + version = "2.7.0"; src = fetchPypi { inherit pname version; - sha256 = "991ee0601bc956110e873aee1a74441d66227b10cd581195575435884384f38b"; + sha256 = "3c2d533a524d35c036d0387e8b2e0c7ce6aa7cdaa80392ec7fe68bce6cd2f152"; }; propagatedBuildInputs = [ libcst google-api-core proto-plus ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-storage/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-storage/default.nix index 037e96c0e7..dcf4028aee 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-storage/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-storage/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "google-cloud-storage"; - version = "1.38.0"; + version = "1.42.0"; src = fetchPypi { inherit pname version; - sha256 = "162011d66f64b8dc5d7936609a5daf0066cc521231546aea02c126a5559446c4"; + sha256 = "c1dd3d09198edcf24ec6803dd4545e867d82b998f06a68ead3b6857b1840bdae"; }; propagatedBuildInputs = [ @@ -42,12 +42,18 @@ buildPythonPackage rec { "post" "test_build_api_url" "test_ctor_mtls" + "test_hmac_key_crud" + "test_list_buckets" "test_open" + "test_anonymous_client_access_to_public_bucket" ]; - pytestFlagsArray = [ - "--ignore=tests/unit/test_bucket.py" - "--ignore=tests/system/test_system.py" + disabledTestPaths = [ + "tests/unit/test_bucket.py" + "tests/system/test_blob.py" + "tests/system/test_bucket.py" + "tests/system/test_fileio.py" + "tests/system/test_kms_integration.py" ]; # prevent google directory from shadowing google imports diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-tasks/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-tasks/default.nix index 420aacb1e4..db74ce3981 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-tasks/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-tasks/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , google-api-core -, grpc_google_iam_v1 +, grpc-google-iam-v1 , libcst , mock , proto-plus @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-tasks"; - version = "2.3.0"; + version = "2.5.1"; src = fetchPypi { inherit pname version; - sha256 = "7cc24d389073c40af41e2fc091417dec6e58af07db9b1295853fc3d545c80cfe"; + sha256 = "sha256-4QOKG7Forf3x5l1XQbbX4A8upIxe+eCiwhPily26du4="; }; - propagatedBuildInputs = [ google-api-core grpc_google_iam_v1 libcst proto-plus ]; + propagatedBuildInputs = [ google-api-core grpc-google-iam-v1 libcst proto-plus ]; checkInputs = [ mock pytestCheckHook pytest-asyncio ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-testutils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-testutils/default.nix index cf8bb20e61..05a66406ce 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-testutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-testutils/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "google-cloud-testutils"; - version = "0.2.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "a23be7cc23bccb1ae6debb74a47dc5b51858b6322fcf034ca92fe7a4acb896f3"; + sha256 = "sha256-2RaRhRvgnmr/trjAE+RBlVO5AZ54YEFcoRwcPCKCTKs="; }; propagatedBuildInputs = [ click google-auth six ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-texttospeech/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-texttospeech/default.nix index 44055e84ce..b2af89fff5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-texttospeech/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-texttospeech/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-texttospeech"; - version = "2.4.0"; + version = "2.5.2"; src = fetchPypi { inherit pname version; - sha256 = "c50cc21b5df88b696680d8aac3ab6c86820c0e4d071d6a5dcd9b634a456cf59f"; + sha256 = "sha256-LcX7qSGMBMU72ZTNBLKaDd+M/2En+mc7/IZsZg2dF9I="; }; propagatedBuildInputs = [ libcst google-api-core proto-plus ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-trace/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-trace/default.nix index 3e96e06c8a..4201506871 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-trace/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-trace/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-trace"; - version = "1.2.0"; + version = "1.3.2"; src = fetchPypi { inherit pname version; - sha256 = "3683477a5d747451332a38d6c8cea652b5991db1f6e4c39907fa3679708ac218"; + sha256 = "sha256-N2Y/DZXyxMSw+S/s58iJvrK/p2FM/B5O467Pctr+tdQ="; }; propagatedBuildInputs = [ google-api-core google-cloud-core proto-plus ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-translate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-translate/default.nix index 3469043cda..f750e7bd54 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-translate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-translate/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "google-cloud-translate"; - version = "3.2.0"; + version = "3.3.2"; src = fetchPypi { inherit pname version; - sha256 = "8cd957f4b29a8c7a983e0a427c2712533c41bb7007b76a8cc88d6c65075c679a"; + sha256 = "sha256-XkHNIu7KWPUpgBceIBqzWgYPCay+Ud1/nM0KbeRnHk0="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-videointelligence/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-videointelligence/default.nix index 4240a4aa2e..ed719f0de1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-videointelligence/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-videointelligence/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-videointelligence"; - version = "2.2.0"; + version = "2.3.2"; src = fetchPypi { inherit pname version; - sha256 = "08106ddeec90a27f4bc706f7267ec1c52f2bff745bafd4710bc6898460c8e9a6"; + sha256 = "sha256-+2HwsRZM/h2eVmX6uVEb1s9etDggoGuQg3qj7hXj/AQ="; }; propagatedBuildInputs = [ google-api-core proto-plus ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-vision/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-vision/default.nix index 96360d8dc4..fe5860dc2b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-vision/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-vision/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-vision"; - version = "2.3.2"; + version = "2.4.2"; src = fetchPypi { inherit pname version; - sha256 = "65ed06725377670fc1b21d474237922f29674d0f99a472b0c84683aa02af70a4"; + sha256 = "sha256-BZiBSH2nZ2tnHi6K1+Ii5i/ZrGJyyH1+6hurmqVfYcM="; }; propagatedBuildInputs = [ libcst google-api-core proto-plus]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix index a5e462b64a..cbe06a7226 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-websecurityscanner"; - version = "1.3.0"; + version = "1.4.1"; src = fetchPypi { inherit pname version; - sha256 = "632ac3c50eee704ed2a6e87d5a09379589841cf53459813c76f8bea01e77c49d"; + sha256 = "sha256-oq7AMZ1so8IR7nn8fIhUr4oOJEJp1FQPxiJIh+1bMLA="; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-resumable-media/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-resumable-media/default.nix index 77346282cd..83b192522f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-resumable-media/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-resumable-media/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-resumable-media"; - version = "1.3.1"; + version = "1.3.3"; src = fetchPypi { inherit pname version; - sha256 = "1a1eb743d13f782d1405437c266b2c815ef13c2b141ba40835c74a3317539d01"; + sha256 = "sha256-zjhVXSUL1wsMJZi/YemQA8uMVpsBduwOPzi4b5//9YE="; }; propagatedBuildInputs = [ google-auth google-crc32c requests ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/googlemaps/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/googlemaps/default.nix index 938a472edd..58b50f5f84 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/googlemaps/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/googlemaps/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "googlemaps"; - version = "4.4.5"; + version = "4.5.3"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "googlemaps"; repo = "google-maps-services-python"; rev = "v${version}"; - sha256 = "sha256-Rdfp98UqTMbqcOpkzh0Dz8fNSSbuvCnCztCkxiBgaAA="; + sha256 = "1yfsfspvjngrb1lwaq04ahm94j9y2dwzdf4dsg3yl1c8w0vgf9yw"; }; propagatedBuildInputs = [ requests ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gpsoauth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gpsoauth/default.nix index b821c7e1f5..20d2e51e92 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gpsoauth/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gpsoauth/default.nix @@ -16,12 +16,12 @@ }: buildPythonPackage rec { - version = "0.4.3"; + version = "1.0.0"; pname = "gpsoauth"; src = fetchPypi { inherit pname version; - sha256 = "b38f654450ec55f130c9414d457355d78030a2c29c5ad8f20b28304a9fc8fad7"; + sha256 = "1c4d6a980625b8ab6f6f1cf3e30d9b10a6c61ababb2b60bfe4870649e9c82be0"; }; propagatedBuildInputs = [ cffi cryptography enum34 idna ipaddress ndg-httpsclient pyopenssl pyasn1 pycparser pycryptodomex requests six ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/growattserver/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/growattserver/default.nix index 64c6e7bf2b..02c8bce05a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/growattserver/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/growattserver/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "growattserver"; - version = "1.0.1"; + version = "1.0.2"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "indykoning"; repo = "PyPi_GrowattServer"; rev = version; - sha256 = "1vgb92axlz1kkszmamjbsqgi74afnbr2mc1np3pmbn3bx5rmk1d9"; + sha256 = "sha256-0i7pMJ4gAVOkvj2uYZJygr3rehgIAfyxq9cWbozwRIQ="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/grpc_google_iam_v1/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/grpc-google-iam-v1/default.nix similarity index 71% rename from third_party/nixpkgs/pkgs/development/python-modules/grpc_google_iam_v1/default.nix rename to third_party/nixpkgs/pkgs/development/python-modules/grpc-google-iam-v1/default.nix index 9a74206f02..1be825227e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/grpc_google_iam_v1/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/grpc-google-iam-v1/default.nix @@ -3,7 +3,6 @@ , fetchPypi , grpcio , googleapis-common-protos -, pytest }: buildPythonPackage rec { @@ -17,15 +16,18 @@ buildPythonPackage rec { propagatedBuildInputs = [ grpcio googleapis-common-protos ]; - # non-standard test format, and python3 will load local google folder first - # but tests cannot be ran if google folder is removed or moved + # no tests run doCheck = false; - checkInputs = [ pytest ]; + + pythonImportsCheck = [ + "google.iam" + "google.iam.v1" + ]; meta = with lib; { description = "GRPC library for the google-iam-v1 service"; homepage = "https://github.com/googleapis/googleapis"; license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gspread/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gspread/default.nix index beaf1e4f90..df2615cd3b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gspread/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gspread/default.nix @@ -7,12 +7,12 @@ }: buildPythonPackage rec { - version = "3.7.0"; + version = "4.0.1"; pname = "gspread"; src = fetchPypi { inherit pname version; - sha256 = "4bda4ab8c5edb9e41cf4ae40d4d5fb30447522b4e43608e05c01351ab1b96912"; + sha256 = "236a0f24e3724b49bae4cbd5144ed036b0ae6feaf5828ad033eb2824bf05e5be"; }; propagatedBuildInputs = [ requests google-auth google-auth-oauthlib ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hcloud/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hcloud/default.nix index 8f359d39e2..3183560ba0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hcloud/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hcloud/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "hcloud"; - version = "1.13.0"; + version = "1.16.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "0f84nwr3ddzivlnswwmhvm3lgq9fy3n7nryy93xqpk5nxcd1ybpn"; + sha256 = "c8b94557d93bcfe437f20a8176693ea4f54358b74986cc19d94ebc23f48e40cc"; }; propagatedBuildInputs = [ future requests python-dateutil ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hg-evolve/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hg-evolve/default.nix index a0229d1e50..00791ac642 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hg-evolve/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hg-evolve/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "hg-evolve"; - version = "10.3.2"; + version = "10.3.3"; src = fetchPypi { inherit pname version; - sha256 = "ba819732409d39ddd4ff2fc507dc921408bf30535d2d78313637b29eeac98860"; + sha256 = "ca3b0ae45a2c3a811c0dc39153b8a1ea8a5c8f786c56370a41dfd83a5bff2502"; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/howdoi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/howdoi/default.nix index b886e3c8b4..8cd90765ec 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/howdoi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/howdoi/default.nix @@ -1,43 +1,61 @@ { lib +, appdirs , buildPythonPackage -, fetchPypi -, six +, cachelib +, cssselect +, fetchFromGitHub +, keep +, lxml , pygments , pyquery -, cachelib -, appdirs -, keep +, requests +, six +, pytestCheckHook }: buildPythonPackage rec { pname = "howdoi"; - version = "2.0.16"; + version = "2.0.17"; - src = fetchPypi { - inherit pname version; - sha256 = "0257fbb328eb3a15ed3acc498314902f00908b130209073509eec21cb7235b2b"; + src = fetchFromGitHub { + owner = "gleitz"; + repo = pname; + rev = "v${version}"; + sha256 = "1cc9hbnalbsd5la9wsm8s6drb79vlzin9qnv86ic81r5nq27n180"; }; - postPatch = '' - substituteInPlace setup.py --replace 'cachelib==0.1' 'cachelib' - ''; + propagatedBuildInputs = [ + appdirs + cachelib + cssselect + keep + lxml + pygments + pyquery + requests + six + ]; - propagatedBuildInputs = [ six pygments pyquery cachelib appdirs keep ]; + checkInputs = [ + pytestCheckHook + ]; - # author hasn't included page_cache directory (which allows tests to run without - # external requests) in pypi tarball. github repo doesn't have release revisions - # clearly tagged. re-enable tests when either is sorted. - doCheck = false; preCheck = '' - mv howdoi _howdoi export HOME=$(mktemp -d) ''; + + disabledTests = [ + # AssertionError: "The... + "test_get_text_with_one_link" + "test_get_text_without_links" + ]; + pythonImportsCheck = [ "howdoi" ]; meta = with lib; { description = "Instant coding answers via the command line"; homepage = "https://pypi.python.org/pypi/howdoi"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hvac/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hvac/default.nix index 70cd9ca5ab..5eaf6f1199 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hvac/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hvac/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "hvac"; - version = "0.10.14"; + version = "0.11.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-DGFvKdZkKtqrzUCKBEaTdO2DvhKyRQG7M36PN7rf7yI="; + sha256 = "9d5504e35388e665db5086edf75d2425831573c6569bb0bf3c2c6eaff30e034e"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/icmplib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/icmplib/default.nix index fdbf45edaa..9d1ccab3d9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/icmplib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/icmplib/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "icmplib"; - version = "3.0.0"; + version = "3.0.1"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "ValentinBELYN"; repo = pname; rev = "v${version}"; - sha256 = "sha256-i5cmL8kOrehldOwX2RfVAfL4HdzJ+9S3BojJI2raUSA="; + sha256 = "sha256-avCy/s54JOeHf6py4sPDV+QC2oq2AU6A6J2YOnrQsm0="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/identify/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/identify/default.nix index 7e753e2e05..c3232c1811 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/identify/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/identify/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "identify"; - version = "2.2.11"; + version = "2.2.13"; src = fetchFromGitHub { owner = "pre-commit"; repo = pname; rev = "v${version}"; - sha256 = "sha256-E95tUg1gglDXfeCTead2c1e0JOynKu+TBd4LKklrtAE="; + sha256 = "sha256-lKdFHynKraN+eUeO1hFzoNsdMzRgmnBHQzPuKLH0Xvs="; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/inotifyrecursive/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/inotifyrecursive/default.nix new file mode 100644 index 0000000000..d0f81abaa4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/inotifyrecursive/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchPypi +, inotify-simple +}: + +buildPythonPackage rec { + pname = "inotifyrecursive"; + version = "0.3.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "osRQsxdpPkU4QW+Q6x14WFBtr+a4uIUDe9LdmuLa+h4="; + }; + + propagatedBuildInputs = [ inotify-simple ]; + + # No tests included + doCheck = false; + pythonImportsCheck = [ pname ]; + + meta = with lib; { + description = "Simple recursive inotify watches for Python"; + homepage = "https://github.com/letorbi/inotifyrecursive"; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ Flakebi ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/locationsharinglib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/locationsharinglib/default.nix index 4baf8600ac..42cf477ca1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/locationsharinglib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/locationsharinglib/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "locationsharinglib"; - version = "4.1.6"; - disabled = pythonOlder "3.6"; + version = "4.1.8"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "092j8z01nwjqh5zr7aj8mxl1zjd3j2irhrs39dhn47bd6db2a6ij"; + sha256 = "sha256-69NzKSWpuU0Riwlj6cFC4h/shc/83e1mpq++zxDqftY="; }; propagatedBuildInputs = [ @@ -39,6 +39,8 @@ buildPythonPackage rec { # Tests requirements want to pull in multiple modules which we don't need substituteInPlace setup.py \ --replace "tests_require=test_requirements" "tests_require=[]" + substituteInPlace requirements.txt \ + --replace "coloredlogs>=15.0.1" "coloredlogs" ''; checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mautrix/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mautrix/default.nix index 9ab850ed01..ad7d9b62bb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mautrix/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mautrix/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "mautrix"; - version = "0.9.8"; + version = "0.10.3"; src = fetchPypi { inherit pname version; - sha256 = "1yx9ybpw9ppym8k2ky5pxh3f2icpmk887i8ipwixrcrnml3q136p"; + sha256 = "53d02ba86d53613833ca54ddad097ae048b2aa4f6e7a435a4de979d89abb8be0"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/numcodecs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/numcodecs/default.nix index ab529e0439..525f1a8bf9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/numcodecs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/numcodecs/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "numcodecs"; - version = "0.8.0"; + version = "0.8.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "7c7d0ea56b5e2a267ae785bdce47abed62829ef000f03be8e32e30df62d3749c"; + sha256 = "63e75114131f704ff46ca2fe437fdae6429bfd9b4377e356253eb5dacc9e093a"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/parsedatetime/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/parsedatetime/default.nix index ba3662a44b..c6a4d19392 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/parsedatetime/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/parsedatetime/default.nix @@ -2,9 +2,8 @@ , buildPythonPackage , fetchPypi , isPy27 -, pytest -, pytest-runner , future +, pytestCheckHook }: buildPythonPackage rec { @@ -17,13 +16,24 @@ buildPythonPackage rec { sha256 = "4cb368fbb18a0b7231f4d76119165451c8d2e35951455dfee97c62a87b04d455"; }; - buildInputs = [ pytest pytest-runner ]; propagatedBuildInputs = [ future ]; + checkInputs = [ pytestCheckHook ]; + + pytestFlagsArray = [ "tests/Test*.py" ]; + + disabledTests = [ + # https://github.com/bear/parsedatetime/issues/263 + "testDate3ConfusedHourAndYear" + # https://github.com/bear/parsedatetime/issues/215 + "testFloat" + ]; + + pythonImportChecks = [ "parsedatetime" ]; + meta = with lib; { description = "Parse human-readable date/time text"; homepage = "https://github.com/bear/parsedatetime"; license = licenses.asl20; }; - } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pre-commit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pre-commit/default.nix index 0cb853abf2..9f752626e5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pre-commit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pre-commit/default.nix @@ -17,13 +17,13 @@ buildPythonPackage rec { pname = "pre-commit"; - version = "2.13.0"; + version = "2.14.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit version; pname = "pre_commit"; - sha256 = "sha256-dklyxgaT3GaLqOhuspZU7DFEUBMQ9xmHQqdnvsOFo3g="; + sha256 = "sha256-I4butM9mM3EsfMnt6DaE1TyMr8prWfecc4CYtRxtIGw="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/proto-plus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/proto-plus/default.nix index 3fa782cb47..df97d1c4d7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/proto-plus/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/proto-plus/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "proto-plus"; - version = "1.18.1"; + version = "1.19.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "cfc45474c7eda0fe3c4b9eca2542124f2a0ff5543242bec61e8d08bce0f5bd48"; + sha256 = "sha256-zmaVzoBDg61vOSxLsYdMMjiWKQofZWVg3jZBa6gy2R4="; }; propagatedBuildInputs = [ protobuf ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pybids/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pybids/default.nix index 3ed34b4e73..97187abd75 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pybids/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pybids/default.nix @@ -42,5 +42,8 @@ buildPythonPackage rec { homepage = "https://github.com/bids-standard/pybids"; license = licenses.mit; maintainers = with maintainers; [ jonringer ]; + # Doesn't support sqlalchemy >=1.4 + # See https://github.com/bids-standard/pybids/issues/680 + broken = true; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyezviz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyezviz/default.nix index 323b58e825..ebd0dc2aeb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyezviz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyezviz/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pyezviz"; - version = "0.1.8.9"; + version = "0.1.9.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "baqs"; repo = "pyEzviz"; rev = version; - sha256 = "sha256-ZjHDha7hSRXy86wm61bMMF8zMi5Lux6RbD0yFD/78J4="; + sha256 = "sha256-KsdJC09KugvAgkRZ5H5zrIJ5hC5Vt4QwGWML8kNnR7Y="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyfaidx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyfaidx/default.nix index 13c00d80a6..c179688a8a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyfaidx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyfaidx/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pyfaidx"; - version = "0.5.9.5"; + version = "0.6.1"; src = fetchPypi { inherit pname version; - sha256 = "9965644c5bd62bedc0ff7f336cbb2baef6406a36b4ec5c786b199872ce46192b"; + sha256 = "fae5d2264f62f40e6f37090422a764197de610df36afb5ae827b167d34b8621a"; }; propagatedBuildInputs = [ six ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyhomematic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyhomematic/default.nix index 2784719ff1..2027953443 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyhomematic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyhomematic/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "pyhomematic"; - version = "0.1.73"; + version = "0.1.74"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-KaeheCIJgAqC68rgE71b1sSatSH25phGk662fnuOOsk="; + sha256 = "sha256-Z0226G0eivU+Uo7MShGv9xqcl1QtAmbEzhI1IBjPL5M="; }; checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymeteireann/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymeteireann/default.nix index 7e48a4089a..711392b4a3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymeteireann/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymeteireann/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "pymeteireann"; - version = "0.2"; + version = "2021.8.0"; src = fetchFromGitHub { owner = "DylanGore"; repo = "PyMetEireann"; rev = version; - sha256 = "1904f8mvv4ghzbniswmdwyj5v71m6y3yn1b4grjvfds05skalm67"; + sha256 = "1xcfb3f2a2q99i8anpdzq8s743jgkk2a3rpar48b2dhs7l15rbsd"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymyq/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymyq/default.nix index 9fffbab038..917eac02c5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymyq/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymyq/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pymyq"; - version = "3.1.0"; + version = "3.1.2"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "arraylabs"; repo = pname; rev = "v${version}"; - sha256 = "0nrsivgd3andlq9c0p72x06mz1s4ihhibbphccrm5v1fmbzj09zp"; + sha256 = "sha256-DvwnbZa1/Y08rrxdXgffkjaGAVdRkPmYCD+Xkv0h7OE="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyppeteer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyppeteer/default.nix index 6da76a5cdb..37a40f867b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyppeteer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyppeteer/default.nix @@ -2,7 +2,6 @@ , appdirs , buildPythonPackage , fetchFromGitHub -, fetchpatch , poetry-core , pyee , pytest-xdist @@ -16,7 +15,7 @@ buildPythonPackage rec { pname = "pyppeteer"; - version = "0.2.5"; + version = "0.2.6"; disabled = pythonOlder "3.6"; format = "pyproject"; @@ -24,7 +23,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = version; - sha256 = "1hl4rw8j5yiak0d34vx1l1blr8125bscjd8m46a5m8xzm98csjc7"; + sha256 = "sha256-mMFQp8GMjKUc3yyB4c8Tgxut7LkMFa2cySO3iSA/aI4="; }; nativeBuildInputs = [ @@ -45,21 +44,6 @@ buildPythonPackage rec { pytestCheckHook ]; - patches = [ - # Switch to poetry-core, https://github.com/pyppeteer/pyppeteer/pull/262 - (fetchpatch { - name = "switch-poetry-core.patch"; - url = "https://github.com/pyppeteer/pyppeteer/commit/e248baebefcf262fd96f261d940e74ed49ba2df9.patch"; - sha256 = "03g8n35kn2alqki37s0hf2231fk2zkr4nr1x1g2rfrhps9d6fyvw"; - }) - ]; - - postPatch = '' - # https://github.com/pyppeteer/pyppeteer/pull/252 - substituteInPlace pyproject.toml \ - --replace 'websockets = "^8.1"' 'websockets = "*"' - ''; - disabledTestPaths = [ # Requires network access "tests/test_browser.py" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-box/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-box/default.nix index cb176109fe..54a06d09f8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-box/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-box/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "python-box"; - version = "5.3.0"; + version = "5.4.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "cdgriffith"; repo = "Box"; rev = version; - sha256 = "0fhmkjdcacpwyg7fajqfvnv3n9xd9rxjdpvi8z3j73a1gls36gf4"; + sha256 = "sha256-1eRuTpwANyLjnAK1guPOQmH2EW0ITvC7nvyFcEUErz8="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-gammu/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-gammu/default.nix index 1548a13894..f3a3672e65 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-gammu/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-gammu/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "python-gammu"; - version = "3.1"; + version = "3.2.2"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "gammu"; repo = pname; rev = version; - sha256 = "1hw2mfrps6wqfyi40p5mp9r59n1ick6pj4hw5njz0k822pbb33p0"; + sha256 = "sha256-HFI4LBrVf+kBoZfdZrZL1ty9N5DxZ2SOvhiIAFVxqaI="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-miio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-miio/default.nix index b441971d44..4daaaa1617 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-miio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-miio/default.nix @@ -24,13 +24,13 @@ buildPythonPackage rec { pname = "python-miio"; - version = "0.5.6"; + version = "0.5.7"; disabled = pythonOlder "3.6"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-tmGt50xBDV++/pqyXsuxHdrwv+XbkjvtrzsYBzQh7zE="; + sha256 = "sha256-Dl/9aiCb8RYcSGEkO9X51Oaqg7FOv5mWYIDZs9fpOIg="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytwitchapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytwitchapi/default.nix new file mode 100644 index 0000000000..78cd978bc9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytwitchapi/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, aiohttp +, python-dateutil +, requests +, websockets +}: + +buildPythonPackage rec { + pname = "pytwitchapi"; + version = "2.3.0"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "Teekeks"; + repo = "pyTwitchAPI"; + rev = "v${version}"; + sha256 = "sha256-ax3FHyyyRfXSWKsoUi8ao5TL2alo0bQP+lWiDaPjf34="; + }; + + propagatedBuildInputs = [ + aiohttp + python-dateutil + requests + websockets + ]; + + # Project has no tests. + doCheck = false; + + pythonImportsCheck = [ "twitchAPI" ]; + + meta = with lib; { + description = "Python implementation of the Twitch Helix API, its Webhook and PubSub"; + homepage = "https://github.com/Teekeks/pyTwitchAPI"; + license = licenses.mit; + maintainers = with maintainers; [ wolfangaukang ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyvicare/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyvicare/default.nix index b9b983666a..ed7a83bdae 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyvicare/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyvicare/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pyvicare"; - version = "2.4"; + version = "2.7"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "somm15"; repo = "PyViCare"; rev = version; - sha256 = "1lih5hdyc3y0ickvfxd0gdgqv19zmqsfrnlxfwg8aqr73hl3ca8z"; + sha256 = "0hsmn3irixrgmd04pm0f89gn44fdn2nkcp92x7gc2kncwkval6hc"; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/responses/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/responses/default.nix index 8b700701d3..ebb4716cd8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/responses/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/responses/default.nix @@ -1,16 +1,46 @@ -{ buildPythonPackage, fetchPypi -, cookies, mock, requests, six }: +{ lib +, buildPythonPackage +, cookies +, fetchPypi +, mock +, pytest-localserver +, pytestCheckHook +, pythonOlder +, requests +, six +, urllib3 +}: buildPythonPackage rec { pname = "responses"; - version = "0.13.3"; + version = "0.13.4"; src = fetchPypi { inherit pname version; - sha256 = "18a5b88eb24143adbf2b4100f328a2f5bfa72fbdacf12d97d41f07c26c45553d"; + sha256 = "sha256-lHZ3XYVtPCSuZgu+vin7bXidStFqzXI++/tu4gmQuJk="; }; - propagatedBuildInputs = [ cookies mock requests six ]; + propagatedBuildInputs = [ + requests + urllib3 + six + ] ++ lib.optionals (pythonOlder "3.4") [ + cookies + ] ++ lib.optionals (pythonOlder "3.3") [ + mock + ]; - doCheck = false; + checkInputs = [ + pytest-localserver + pytestCheckHook + ]; + + pythonImportsCheck = [ "responses" ]; + + meta = with lib; { + description = "Python module for mocking out the requests Python library"; + homepage = "https://github.com/getsentry/responses"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rokuecp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rokuecp/default.nix index baf12741b8..9804507423 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rokuecp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rokuecp/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "rokuecp"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "ctalkington"; repo = "python-rokuecp"; rev = version; - sha256 = "02mbmwljcvqj3ksj2irdm8849lcxzwa6fycgjqb0i75cgidxpans"; + sha256 = "sha256-2FAnshIxaA52EwwwABBQ0sedAsz561YYxXDQo2Vcp1c="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sendgrid/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sendgrid/default.nix index 34ef235590..f4c913b163 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sendgrid/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sendgrid/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "sendgrid"; - version = "6.7.1"; + version = "6.8.0"; src = fetchFromGitHub { owner = pname; repo = "sendgrid-python"; rev = version; - sha256 = "0g9yifv3p3zbcxbcdyg4p9k3vwvaq0vym40j3yrv534m4qbynwhk"; + sha256 = "sha256-PtTsFwE6+6/HzyR721Y9+qaI7gwYtYwuY+wrZpoGY2Q="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/simplisafe-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/simplisafe-python/default.nix index f362c0686f..d808407507 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/simplisafe-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/simplisafe-python/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "simplisafe-python"; - version = "11.0.3"; + version = "11.0.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = version; - sha256 = "17zld62q4qw2z2q7i5kkpnyc3immgc4xs009hp53jq4qc38w0jm5"; + sha256 = "0ad0f3xghp77kg0vdns5m1lj796ysk9jrgl5k5h80imnnh9mz9b8"; }; nativeBuildInputs = [ poetry-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/slack-sdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/slack-sdk/default.nix index a52d3144aa..fcf0cdd06d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/slack-sdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/slack-sdk/default.nix @@ -8,7 +8,8 @@ , fetchFromGitHub , flake8 , flask-sockets -, isPy3k +, moto +, pythonOlder , psutil , pytest-asyncio , pytestCheckHook @@ -19,14 +20,14 @@ buildPythonPackage rec { pname = "slack-sdk"; - version = "3.8.0"; - disabled = !isPy3k; + version = "3.9.0"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "slackapi"; repo = "python-slack-sdk"; rev = "v${version}"; - sha256 = "sha256-r3GgcU4K2jj+4aIytpY2HiVqHzChynn2BCn1VNTL2t0="; + sha256 = "sha256-9iV/l2eX4WB8PkTz+bMJIshdD/Q3K0ig8hIK9R8S/oM="; }; propagatedBuildInputs = [ @@ -43,6 +44,7 @@ buildPythonPackage rec { databases flake8 flask-sockets + moto psutil pytest-asyncio pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/slither-analyzer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/slither-analyzer/default.nix index a4f907a1aa..a49c2a8b74 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/slither-analyzer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/slither-analyzer/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "slither-analyzer"; - version = "0.8.0"; + version = "0.8.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "0b8a2e2145daefd9443ffa43639608203532e78a858af99c4c52c2b128ca681f"; + sha256 = "sha256-5JgF53ip72bne8AlGf126FIIvXi+u7rovJmMSCcZjEQ="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/smart-meter-texas/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/smart-meter-texas/default.nix index abdcd7317b..f8bd682567 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/smart-meter-texas/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/smart-meter-texas/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "smart-meter-texas"; - version = "0.4.3"; + version = "0.4.4"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "grahamwetzler"; repo = "smart-meter-texas"; rev = "v${version}"; - sha256 = "09n03wbyjh1b1gsiibf17fg86x7k1i1r1kpp94p7w1lcdbmn8v5c"; + sha256 = "sha256-jewibcsqWnl0OQ2oEEOSOcyyDCIGZiG4EZQfuFUbxK4="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/solax/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/solax/default.nix index 2ed8d7086b..09e09d9418 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/solax/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/solax/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "solax"; - version = "0.2.7"; + version = "0.2.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-02cIOIow+eHBgYa7Dnl7b31j3I8WRxGuTpwHFKL4XYQ="; + sha256 = "sha256-bOpDrbRbdsb4XgEksAQG4GE26XSTwGAECq9Fh//zoYc="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spotipy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spotipy/default.nix index 4493eb3d97..c6a488e4a2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spotipy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/spotipy/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "spotipy"; - version = "2.18.0"; + version = "2.19.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-9yk7gIaWgH6azsa9z/Y/fcw8wbFIwMS0KZ70PJZvcXc="; + sha256 = "sha256-kE9ugT26g3dY6VEMG+5R18ohfxaSRmJaE+aTcz3DNUM="; }; propagatedBuildInputs = [ requests six ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/subprocess-tee/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/subprocess-tee/default.nix new file mode 100644 index 0000000000..e2e9ad081e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/subprocess-tee/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools-scm +, pytestCheckHook +, enrich +}: + +buildPythonPackage rec { + pname = "subprocess-tee"; + version = "0.3.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "01b0z8mcm568v9carhi0py1hs34wrbnlzyvdmhqzipql407kdpk2"; + }; + + nativeBuildInputs = [ + setuptools-scm + ]; + + checkInputs = [ + pytestCheckHook + enrich + ]; + + pythonImportsCheck = [ + "subprocess_tee" + ]; + + meta = with lib; { + homepage = "https://github.com/pycontribs/subprocess-tee"; + description = "A subprocess.run drop-in replacement that supports a tee mode"; + license = licenses.mit; + maintainers = with maintainers; [ putchar ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/systembridge/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/systembridge/default.nix index 62dbc118a9..ec35b41182 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/systembridge/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/systembridge/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "systembridge"; - version = "2.0.4"; + version = "2.1.0"; src = fetchFromGitHub { owner = "timmo001"; repo = "system-bridge-connector-py"; rev = "v${version}"; - sha256 = "03scbn6khvw1nj73j8kmvyfrxnqcc0wh3ncck4byby6if1an5dvd"; + sha256 = "sha256-P148xEcvPZMizUyRlVeMfX6rGVNf0Efw2Ekvm5SEvKQ="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/telethon/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/telethon/default.nix index 041b102ce3..c4479ca632 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/telethon/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/telethon/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "telethon"; - version = "1.21.1"; + version = "1.23.0"; src = fetchPypi { inherit version; pname = "Telethon"; - sha256 = "sha256-mTyDfvdFrd+XKifXv7oM5Riihj0aUOBzclW3ZNI+DvI="; + sha256 = "sha256-unVRzkR+lUqtZ/PuukurdXTMoHosb0HlvmmQTm4OwxM="; }; patchPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tika/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tika/default.nix new file mode 100644 index 0000000000..375560ad98 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/tika/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pyyaml +, requests +}: + +buildPythonPackage rec { + pname = "tika"; + version = "1.24"; + + src = fetchPypi { + inherit pname version; + sha256 = "wsUPQFYi90UxhBEE+ehcF1Ea7eEd6OU4XqsaKaMfGRs="; + }; + + propagatedBuildInputs = [ pyyaml requests ]; + + # Requires network + doCheck = false; + pythonImportsCheck = [ pname ]; + + meta = with lib; { + description = "A Python binding to the Apache Tika™ REST services"; + homepage = "https://github.com/chrismattmann/tika-python"; + license = licenses.asl20; + maintainers = with maintainers; [ Flakebi ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/total-connect-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/total-connect-client/default.nix index 1347ecab3e..93d401bf9a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/total-connect-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/total-connect-client/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "total-connect-client"; - version = "0.58"; + version = "2021.7.1"; src = fetchFromGitHub { owner = "craigjmidwinter"; repo = "total-connect-client"; rev = version; - sha256 = "1dqmgvgvwjh235wghygan2jnfvmn9vz789in2as3asig9cifix9z"; + sha256 = "sha256-F7qVvQVU6OlVU98zmFSQ1SLVCAx+lhz+cFS//d0SHUQ="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/typer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/typer/default.nix index 5b7b17c8bb..620ec7ce68 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/typer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/typer/default.nix @@ -44,6 +44,9 @@ buildPythonPackage rec { homepage = "https://typer.tiangolo.com/"; description = "Typer, build great CLIs. Easy to code. Based on Python type hints."; license = licenses.mit; + # is incompatible with click8 + # https://github.com/tiangolo/typer/issues/280 + broken = true; maintainers = [ maintainers.winpat ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wrapio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wrapio/default.nix index 3e6a4372a6..e04424ba49 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wrapio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wrapio/default.nix @@ -1,15 +1,18 @@ { lib , buildPythonPackage +, pythonOlder , fetchPypi }: buildPythonPackage rec { pname = "wrapio"; - version = "1.0.0"; + version = "2.0.0"; + + disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-JWcPsqZy1wM6/mbU3H0W3EkpLg0wrEUUg3pT/QrL+rE="; + sha256 = "sha256-CUocIbdZ/tJQCxAHzhFpB267ynlXf8Mu+thcRRc0yeg="; }; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yamllint/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yamllint/default.nix index 832eb3f6b5..cd314b60a8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yamllint/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/yamllint/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "yamllint"; - version = "1.26.1"; + version = "1.26.2"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-h9lGKz7X6d+hnKoXf3p3zZiIs9xARER9auCrIzvNEyQ="; + sha256 = "sha256-CwipZ1Akj98h8egZPLd4dVTvde1Xsn9iHNazvwmvEaE="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix index edd5819177..4cda57cd9a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "zeroconf"; - version = "0.34.3"; + version = "0.36.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "jstasiak"; repo = "python-zeroconf"; rev = version; - sha256 = "sha256-HJSqQl7dd8sN490lqGHWg6QiJblGKKlVMn7UJDQb7ZA="; + sha256 = "sha256-HeqsyAmqCUZ1htTv0tHywqYl3ZZBklTU37qaPV++vhU="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/r-modules/default.nix b/third_party/nixpkgs/pkgs/development/r-modules/default.nix index 4406bb41ae..eb244ae91d 100644 --- a/third_party/nixpkgs/pkgs/development/r-modules/default.nix +++ b/third_party/nixpkgs/pkgs/development/r-modules/default.nix @@ -328,6 +328,7 @@ let RSclient = [ pkgs.openssl.dev ]; Rserve = [ pkgs.openssl ]; Rssa = [ pkgs.fftw.dev ]; + rsvg = [ pkgs.pkg-config ]; runjags = [ pkgs.jags ]; RVowpalWabbit = [ pkgs.zlib.dev pkgs.boost ]; rzmq = [ pkgs.zeromq pkgs.pkg-config ]; @@ -450,6 +451,7 @@ let glmnet = [ pkgs.libiconv ]; mvtnorm = [ pkgs.libiconv ]; statmod = [ pkgs.libiconv ]; + rsvg = [ pkgs.librsvg.dev ]; }; packagesRequireingX = [ 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 edcaddbd9c..2ea5ce3090 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.57.1"; + version = "0.58.4"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "0g3yq2y9z7vnaznmdmdb98djsv8nbai8jvbhfs2g12q55dlm3vf3"; + sha256 = "sha256-gnipQyjisi1iY1SSmESrwNvxyacq9fsva8IY3W6Gpd8="; }; goPackagePath = "github.com/aquasecurity/tfsec"; diff --git a/third_party/nixpkgs/pkgs/development/tools/aws-sam-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/aws-sam-cli/default.nix index f07bcdd5fd..41059a37da 100644 --- a/third_party/nixpkgs/pkgs/development/tools/aws-sam-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/aws-sam-cli/default.nix @@ -44,8 +44,8 @@ python3.pkgs.buildPythonApplication rec { --replace "Flask~=1.1.2" "Flask~=2.0" \ --replace "dateparser~=0.7" "dateparser>=0.7" \ --replace "docker~=4.2.0" "docker>=4.2.0" \ - --replace "requests==2.23.0" "requests~=2.24" \ - --replace "watchdog==0.10.3" "watchdog" + --replace "requests==" "requests~=" \ + --replace "watchdog==" "watchdog #" ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/buf/default.nix b/third_party/nixpkgs/pkgs/development/tools/buf/default.nix index 230f5b09b9..f3271b0563 100644 --- a/third_party/nixpkgs/pkgs/development/tools/buf/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/buf/default.nix @@ -3,19 +3,21 @@ , fetchFromGitHub , protobuf , git +, testVersion +, buf }: buildGoModule rec { pname = "buf"; - version = "0.49.0"; + version = "0.51.1"; src = fetchFromGitHub { owner = "bufbuild"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xP2UbcHwimN09IXrGp3zhBLL74l/8YKotqBNRTITF18="; + sha256 = "sha256-iFSmanP+2PgmOXtubDdLfa+AIQSAWHFNpyB1IP6IF5I="; }; - vendorSha256 = "sha256-WgQSLe99CbOwJC8ewDcSq6PcBJdmiPRmvAonq8drQ1w="; + vendorSha256 = "sha256-0rVHINb04GZlH6DSjMt/h7UdNtZJERAyO1S99rAxUyY="; patches = [ # Skip a test that requires networking to be available to work. @@ -54,13 +56,7 @@ buildGoModule rec { runHook postInstall ''; - doInstallCheck = true; - installCheckPhase = '' - runHook preInstallCheck - $out/bin/buf --help - $out/bin/buf --version 2>&1 | grep "${version}" - runHook postInstallCheck - ''; + passthru.tests.version = testVersion { package = buf; }; meta = with lib; { homepage = "https://buf.build"; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/arpa2cm/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/arpa2cm/default.nix index 0af9e77acf..500afa7c95 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/arpa2cm/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/arpa2cm/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitLab, cmake }: stdenv.mkDerivation rec { pname = "arpa2cm"; - version = "0.5"; + version = "0.9.0"; - src = fetchFromGitHub { - sha256 = "093h7njj8d8iiwnw5byfxkkzlbny60fwv1w57j8f1lsd4yn6rih4"; - rev = "version-${version}"; + src = fetchFromGitLab { + sha256 = "sha256-1z0fH8vZJiPkY/C654us9s2BULM1tlvvYcszNqk34yI="; + rev = "v${version}"; repo = pname; owner = "arpa2"; }; @@ -15,7 +15,19 @@ stdenv.mkDerivation rec { meta = with lib; { description = "CMake Module library for the ARPA2 project"; + longDescription = '' + The CMake module library for the ARPA2 project, including the LillyDAP, + TLSPool and IdentityHub software stacks. Like the KDE Extra CMake Modules (ECM) + which is a large-ish collection of curated CMake modules of particular + interest to Qt-based and KDE Frameworks-based applications, the ARPA2 + CMake Modules (ARPA2CM) is a collection of modules for the software + stack from the ARPA2 project. This is largely oriented towards + TLS, SSL, X509, DER and LDAP technologies. The ARPA2 CMake Modules + also include modules used for product release and deployment of + the ARPA2 software stack. + ''; + homepage = "https://gitlab.com/arpa2/arpa2cm"; license = licenses.bsd2; - maintainers = with maintainers; [ leenaars ]; + maintainers = with maintainers; [ leenaars fufexan ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/scons/common.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/scons/common.nix index 6af3028512..da276be728 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/scons/common.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/scons/common.nix @@ -1,8 +1,8 @@ { version, sha256 }: -{ fetchurl, python3Packages, lib }: +{ fetchurl, python, lib }: -python3Packages.buildPythonApplication rec { +python.pkgs.buildPythonApplication rec { pname = "scons"; inherit version; @@ -29,6 +29,12 @@ python3Packages.buildPythonApplication rec { mv "$out/"*.1 "$out/share/man/man1/" ''; + passthru = { + # expose the used python version so tools using this (and extensing scos with other python modules) + # can use the exact same python version. + inherit python; + }; + meta = with lib; { description = "An improved, cross-platform substitute for Make"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/scons/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/scons/default.nix index 4b07eb0501..da11bdb28a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/scons/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/scons/default.nix @@ -1,16 +1,18 @@ -{ callPackage, python2Packages }: +{ callPackage, python2, python3 }: let - mkScons = args: callPackage (import ./common.nix args) { }; + mkScons = args: callPackage (import ./common.nix args) { + python = python3; + }; in { scons_3_0_1 = (mkScons { version = "3.0.1"; sha256 = "0wzid419mlwqw9llrg8gsx4nkzhqy16m4m40r0xnh6cwscw5wir4"; - }).override { python3Packages = python2Packages; }; + }).override { python = python2; }; scons_3_1_2 = (mkScons { version = "3.1.2"; sha256 = "1yzq2gg9zwz9rvfn42v5jzl3g4qf1khhny6zfbi2hib55zvg60bq"; - }).override { python3Packages = python2Packages; }; + }).override { python = python2; }; scons_latest = mkScons { version = "4.1.0"; sha256 = "11axk03142ziax6i3wwy9qpqp7r3i7h5jg9y2xzph9i15rv8vlkj"; diff --git a/third_party/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix index 3b221e5ce4..cd9779c45e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "sqlfluff"; - version = "0.6.2"; + version = "0.6.3"; disabled = python3.pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-N1ZIm5LsKXXu3CyqFJZd7biaIhVW1EMBLKajgSAwc0g="; + sha256 = "sha256-rGtaxa75cFv7LjRI5yuTgKW7F2t8llejcrnjKlUdyEY="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/development/tools/database/webdis/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/webdis/default.nix index 226fc049e0..91d501a050 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/webdis/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/webdis/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "webdis"; - version = "0.1.15"; + version = "0.1.16"; src = fetchFromGitHub { owner = "nicolasff"; repo = pname; rev = version; - sha256 = "sha256-ViU/CKkmBY8WwQq/oJ2/qETqr2k8JNFtNPhozw5BmEc="; + sha256 = "sha256-I+Nq3kjXoQlwfj8r7oNu6KFE6hnB076M9aJMdwCas3k="; }; buildInputs = [ hiredis http-parser jansson libevent ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/esbuild/default.nix b/third_party/nixpkgs/pkgs/development/tools/esbuild/default.nix index f8817ffe37..1ff54223d0 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.19"; + version = "0.12.20"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - sha256 = "sha256-keYKYSWQOiO3d38qrMicYWRZ0jpkzhdZhqOr5JcbA4M="; + sha256 = "sha256-40r0f+bzzD0M97pbiSoVSJvVvcCizQvw9PPeXhw7U48="; }; vendorSha256 = "sha256-2ABWPqhK2Cf4ipQH7XvRrd+ZscJhYPc3SV2cGT0apdg="; diff --git a/third_party/nixpkgs/pkgs/development/tools/flyway/default.nix b/third_party/nixpkgs/pkgs/development/tools/flyway/default.nix index 3db9e0f386..4674ae5170 100644 --- a/third_party/nixpkgs/pkgs/development/tools/flyway/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/flyway/default.nix @@ -1,10 +1,10 @@ { lib, stdenv, fetchurl, jre_headless, makeWrapper }: stdenv.mkDerivation rec{ pname = "flyway"; - version = "7.12.1"; + version = "7.13.0"; src = fetchurl { url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz"; - sha256 = "sha256-EwS4prlZlI6V0mUidE7Kaz/rYy5ji/DB0huDt0ATxGs="; + sha256 = "sha256-rZUVxswJdCFKwuXlzko+t+ZO1plRgH2VcZFJ5kkiM2s="; }; nativeBuildInputs = [ makeWrapper ]; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/golangci-lint/default.nix b/third_party/nixpkgs/pkgs/development/tools/golangci-lint/default.nix index 32af811c00..4e7711926e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/golangci-lint/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/golangci-lint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "golangci-lint"; - version = "1.41.1"; + version = "1.42.0"; src = fetchFromGitHub { owner = "golangci"; repo = "golangci-lint"; rev = "v${version}"; - sha256 = "sha256-7xokU2uw7oiXhirTKuNfqJ143PlnI7M1zSixT0S6jtE="; + sha256 = "sha256-xwJZfWDtA/6HkYZmGyhL/44xU8qLmJ2kk3Uqft0yivE="; }; - vendorSha256 = "sha256-s0ZFQJIhF23FtLol1Gegljf6eyGkCmVxTKmHbQBtPvM="; + vendorSha256 = "sha256-lOVGyxQcWG99hO+Eff2cNA5gW4DhsDrBY5Ejj0s4v4Q="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/gopls/default.nix b/third_party/nixpkgs/pkgs/development/tools/gopls/default.nix index ba549d5aaa..388c34a0c0 100644 --- a/third_party/nixpkgs/pkgs/development/tools/gopls/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/gopls/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gopls"; - version = "0.7.0"; + version = "0.7.1"; src = fetchgit { rev = "gopls/v${version}"; url = "https://go.googlesource.com/tools"; - sha256 = "0vylrsmpszij23yngk7mfysp8rjbf29nyskbrwwysf63r9xbrwbi"; + sha256 = "0cq8mangcc1fz1ii7v4smxbpzynhwy6gvl80n5hvhjpgkp0k4fsm"; }; modRoot = "gopls"; - vendorSha256 = "1mnc84nvl7zhl4pzf90cd0gvid9g1jph6hcxk6lrlnfk2j2m75mj"; + vendorSha256 = "1mzn1nn3l080lch0yhh4g2sq02g95v14nha8k3d373vwvwg45igs"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/java/visualvm/default.nix b/third_party/nixpkgs/pkgs/development/tools/java/visualvm/default.nix index c0082f4630..0eb39f8501 100644 --- a/third_party/nixpkgs/pkgs/development/tools/java/visualvm/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/java/visualvm/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchzip, lib, makeWrapper, makeDesktopItem, jdk, gawk }: stdenv.mkDerivation rec { - version = "2.0.7"; + version = "2.1"; pname = "visualvm"; src = fetchzip { url = "https://github.com/visualvm/visualvm.src/releases/download/${version}/visualvm_${builtins.replaceStrings ["."] [""] version}.zip"; - sha256 = "sha256-IbiyrP3rIj3VToav1bhKnje0scEPSyLwsyclpW7nB+U="; + sha256 = "sha256-faKBYwyBGrMjNMO/0XzQIG+XI1p783p26Bpoj+mSY7s="; }; desktopItem = makeDesktopItem { diff --git a/third_party/nixpkgs/pkgs/development/tools/kustomize/kustomize-sops.nix b/third_party/nixpkgs/pkgs/development/tools/kustomize/kustomize-sops.nix index bea8a33a43..51c7d33408 100644 --- a/third_party/nixpkgs/pkgs/development/tools/kustomize/kustomize-sops.nix +++ b/third_party/nixpkgs/pkgs/development/tools/kustomize/kustomize-sops.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kustomize-sops"; - version = "2.5.7"; + version = "2.6.0"; src = fetchFromGitHub { owner = "viaduct-ai"; repo = pname; rev = "v${version}"; - sha256 = "sha256-CtVFCpj6YZUAjeyRAPOkbd30Js1PSmzapB12SwKZisc="; + sha256 = "sha256-3dSWIDPIT4crsJuaB1TDfrUzobn8RfRlFAhqMXzZbKI="; }; - vendorSha256 = "sha256-kNJkSivSj8LMeXobKazLy9MCTtWzrBn99GmvaH+qIUU="; + vendorSha256 = "sha256-+MVViFwaApGZZxCyTwLzIEWTZDbr7WSx7e/yGbJ309Y="; installPhase = '' mkdir -p $out/lib/viaduct.ai/v1/ksops-exec/ diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix index 13badd48e1..890229ebc8 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "circleci-cli"; - version = "0.1.15663"; + version = "0.1.15824"; src = fetchFromGitHub { owner = "CircleCI-Public"; repo = pname; rev = "v${version}"; - sha256 = "sha256-r5528iMy3RRSSRbTOTilnF1FkWBr5VOUWvAZQU/OBjc="; + sha256 = "sha256-bTRtzjIm5NI89O09hMyiDVL4skkfg1C8/92IEDaIAak="; }; vendorSha256 = "sha256-VOPXM062CZ6a6CJGzYTHav1OkyiH7XUHXWrRdGekaGQ="; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/pwndbg/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/pwndbg/default.nix index 764fa66773..9aa11f3595 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/pwndbg/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/pwndbg/default.nix @@ -21,14 +21,14 @@ let in stdenv.mkDerivation rec { pname = "pwndbg"; - version = "2020.07.23"; + version = "2021.06.22"; format = "other"; src = fetchFromGitHub { owner = "pwndbg"; repo = "pwndbg"; rev = version; - sha256 = "0w1dmjy8ii12367wza8c35a9q9x204fppf6x328q75bhb3gd845c"; + sha256 = "sha256-8jaWhpn7Q3X7FBHURX6nyOAhu+C113DnC4KBSE3FBuE="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/saleae-logic-2/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/saleae-logic-2/default.nix new file mode 100644 index 0000000000..9fcd87f347 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/misc/saleae-logic-2/default.nix @@ -0,0 +1,27 @@ +{ lib, fetchurl, appimageTools }: +let + name = "saleae-logic-2"; + version = "2.3.33"; + src = fetchurl { + url = "https://downloads.saleae.com/logic2/Logic-${version}-master.AppImage"; + sha256 = "09vypl03gj58byk963flskzkhl4qrd9qw1kh0sywbqnzbzvj5cgm"; + }; +in +appimageTools.wrapType2 { + inherit name src; + + extraInstallCommands = + let appimageContents = appimageTools.extractType2 { inherit name src; }; in + '' + mkdir -p $out/etc/udev/rules.d + cp ${appimageContents}/resources/linux/99-SaleaeLogic.rules $out/etc/udev/rules.d/ + ''; + + meta = with lib; { + homepage = "https://www.saleae.com/"; + description = "Software for Saleae logic analyzers"; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + maintainers = [ maintainers.j-hui ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/mockgen/default.nix b/third_party/nixpkgs/pkgs/development/tools/mockgen/default.nix index 06004b9f77..af3e21afc9 100644 --- a/third_party/nixpkgs/pkgs/development/tools/mockgen/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/mockgen/default.nix @@ -1,14 +1,14 @@ { buildGoModule, lib, fetchFromGitHub }: buildGoModule rec { pname = "mockgen"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "golang"; repo = "mock"; rev = "v${version}"; - sha256 = "sha256-YSPfe8/Ra72qk12+T78mTppvkag0Hw6O7WNyfhG4h4o="; + sha256 = "sha256-5Kp7oTmd8kqUN+rzm9cLqp9nb3jZdQyltGGQDiRSWcE="; }; - vendorSha256 = "sha256-cL4a7iOSeaQiG6YO0im9bXxklCL1oyKhEDmB1BtEmEw="; + vendorSha256 = "sha256-5gkrn+OxbNN8J1lbgbxM8jACtKA7t07sbfJ7gVJWpJM="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/mustache-go/default.nix b/third_party/nixpkgs/pkgs/development/tools/mustache-go/default.nix index 40181f1628..ee8edfdf5b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/mustache-go/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/mustache-go/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "mustache-go"; - version = "1.2.0"; + version = "1.2.2"; goPackagePath = "github.com/cbroglie/mustache"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "cbroglie"; repo = "mustache"; rev = "v${version}"; - sha256 = "0mnh5zbpfwymddm1dppg9i9d1r8jqyg03z2gl6c5a8fgbrnxpjvc"; + sha256 = "sha256-ziWfkRUHYYyo1FqVVXFFDlTsBbsn59Ur9YQi2ZnTSRg="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix index 5a4b55cc7f..090794b331 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ ocaml ncurses ]; - phases = "unpackPhase patchPhase buildPhase"; + dontInstall = true; buildPhase = '' make bootstrap make PREFIX=$out all diff --git a/third_party/nixpkgs/pkgs/development/tools/operator-sdk/default.nix b/third_party/nixpkgs/pkgs/development/tools/operator-sdk/default.nix index 2818b75ede..908a5e6c23 100644 --- a/third_party/nixpkgs/pkgs/development/tools/operator-sdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/operator-sdk/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "operator-sdk"; - version = "1.10.0"; + version = "1.11.0"; src = fetchFromGitHub { owner = "operator-framework"; repo = pname; rev = "v${version}"; - sha256 = "1qvwk2gyawa3ihi5zqynrimxf426x22kplr3gdb91m9bx9dwqs3v"; + sha256 = "sha256-5eW2yrlUI0B5YNi9BtDjPsTC2vwavEXAMppa5rv5xhE="; }; - vendorSha256 = "1chfiqxljpq6rad4fnqf3dcri63qr9vb765kphw98ly4s0mwm1aj"; + vendorSha256 = "sha256-gATpYjGKxOfXUnfSZ5uXrVbIydiEbijYR2axPluE5YU="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/oq/default.nix b/third_party/nixpkgs/pkgs/development/tools/oq/default.nix index f10136793b..499398c5c5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/oq/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/oq/default.nix @@ -8,13 +8,13 @@ crystal.buildCrystalPackage rec { pname = "oq"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "Blacksmoke16"; repo = pname; rev = "v${version}"; - sha256 = "sha256-vMW+N3N6H8S6dNm4eBJo2tSxSiouG92t4Nq3cYSWcw0="; + sha256 = "sha256-RJVAEbNLlYNnOL/RDG0R9f8fHhNWtR+IMnnjtLK4e34="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/osslsigncode/default.nix b/third_party/nixpkgs/pkgs/development/tools/osslsigncode/default.nix index e9dd2f08d3..fb4abb21c5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/osslsigncode/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/osslsigncode/default.nix @@ -1,24 +1,26 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , autoreconfHook -, libgsf , pkg-config -, openssl , curl +, openssl }: stdenv.mkDerivation rec { pname = "osslsigncode"; - version = "2.1"; + version = "2.2"; src = fetchFromGitHub { owner = "mtrojnar"; repo = pname; rev = version; - sha256 = "0iwxdzqan2bswz62pmwjcyh01vs6ifpdcannw3s192gqzac1lgg3"; + sha256 = "sha256-/YKj6JkVbQ4Fz+KSmBIRQ7F7A8fxi5Eg+pvKwhjpGYQ="; }; - nativeBuildInputs = [ autoreconfHook libgsf pkg-config openssl curl ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; + + buildInputs = [ curl openssl ]; meta = with lib; { homepage = "https://github.com/mtrojnar/osslsigncode"; diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/byacc/default.nix b/third_party/nixpkgs/pkgs/development/tools/parsing/byacc/default.nix index 1b1b31deae..7f9aacd8ce 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/byacc/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/byacc/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "byacc"; - version = "20210802"; + version = "20210808"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/byacc/${pname}-${version}.tgz" "https://invisible-mirror.net/archives/byacc/${pname}-${version}.tgz" ]; - sha256 = "sha256-KUnGftE71nkX8Mm8yFx22ZowkNIRBep2cqh6NQLjzPY="; + sha256 = "sha256-8VhSm+nQWUJjx/Eah2FqSeoj5VrGNpElKiME+7x9OoM="; }; configureFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-comment.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-comment.json index 54e275adf6..0037ab6c42 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-comment.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-comment.json @@ -1,9 +1,9 @@ { "url": "https://github.com/stsewd/tree-sitter-comment", - "rev": "894b61d68a31d93c33ed48dcc7f427174b440abe", - "date": "2021-04-27T15:25:48-05:00", - "path": "/nix/store/w0yz9imzi33glwk6ilm0jqipcyzl8hgm-tree-sitter-comment", - "sha256": "1vfayzzcv6lj63pgcxr8f7rcd81jkgnfdlmhs39i7w3m0s6dv1qg", + "rev": "8d480c0a86e3b95812252d29292b2686eb92418d", + "date": "2021-08-13T15:03:50-05:00", + "path": "/nix/store/4aqsac34f0pzpa889067dqci743axrmx-tree-sitter-comment", + "sha256": "0fqhgvpd391nxrpyhxcp674h8qph280ax6rm6dz1pj3lqs3grdka", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json index f88c5f9cf9..4de8502e41 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-cpp", - "rev": "c61212414a3e95b5f7507f98e83de1d638044adc", - "date": "2021-03-27T10:08:51-07:00", - "path": "/nix/store/a8cd3sv1j900sd8l7cdjw91iw7pp3jhv-tree-sitter-cpp", - "sha256": "04nv9j03q20idk9pnm2lgw7rbwzy5jf9v0y6l102by68z4lv79fi", + "rev": "53afc568b70e4b71ee799501f34c876ad511f56e", + "date": "2021-08-13T10:48:59-05:00", + "path": "/nix/store/6gj41lh1fnnmcrz4c1bk3ncw0kpm97nm-tree-sitter-cpp", + "sha256": "02avniqmb5hgpkzwmkgxhrxk296dbkra9miyi5pax461ab4j7a9r", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fish.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fish.json index 4dc81284db..4699358f64 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fish.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fish.json @@ -1,9 +1,9 @@ { "url": "https://github.com/ram02z/tree-sitter-fish", - "rev": "db7139393e50765520618fa469f41dfbb0b3822b", - "date": "2021-07-06T21:05:19+02:00", - "path": "/nix/store/k67b4bn67zd3dj9yg0q7jywy3vnkv8gw-tree-sitter-fish", - "sha256": "09l5myivlq3z53nqlx8x8c45sww2k7vmjp8z0rvwzv08rnym0fah", + "rev": "04e54ab6585dfd4fee6ddfe5849af56f101b6d4f", + "date": "2021-08-02T21:46:56+01:00", + "path": "/nix/store/0n3jfh7gk16bmikix34y5m534ac12xgc-tree-sitter-fish", + "sha256": "1810z8ah1b09qpxcr4bh63bxsnxx24r6d2h46v2cpqv1lg0g4z14", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json index 1e00f279d6..1a0bf43fff 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-haskell", - "rev": "a0c1adb59e390f7d839a146c57fdb33d36ed97e6", - "date": "2021-06-18T23:36:08+02:00", - "path": "/nix/store/7rl3najf8rn8ndh31vcxjz5px3r1scky-tree-sitter-haskell", - "sha256": "0a97w0qnj0fwy0yyg7hb9i1fyiwbyiz5mwx77aaw6md4jcsf4di8", + "rev": "30eea3c1339e573cda5dcffd8f9b06003ec31789", + "date": "2021-08-07T14:37:05+02:00", + "path": "/nix/store/b99w2q2y5gjj5h1bxipncaf40dyx5sd2-tree-sitter-haskell", + "sha256": "0cch7bcr4d9ll92vhcp79bjzs9dw0glvdrdj2q2h2mg5mmkzcya8", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-html.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-html.json index 8c190011fd..b2a0b71f41 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-html.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-html.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-html", - "rev": "d93af487cc75120c89257195e6be46c999c6ba18", - "date": "2021-03-04T14:11:18-08:00", - "path": "/nix/store/26yjfh6v17n4ajs9ln7x25sf1m3ijcjg-tree-sitter-html", - "sha256": "1hg7vbcy7bir6b8x11v0a4x0glvqnsqc3i2ixiarbxmycbgl3axy", + "rev": "af9339f3deb131ab99acfac906713b81dbcc41c9", + "date": "2021-07-11T11:04:28-07:00", + "path": "/nix/store/jg23pmi6jfy4kykah645gl44a145929c-tree-sitter-html", + "sha256": "1qb4rfbra3nc0fwmla8q1hb4r48k8cv3nl60zc24xhrw3q1d9zh1", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json index 24fd79d511..08ad936562 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-javascript", - "rev": "6de6d604c243b68f90dce14130d536c694d90dcc", - "date": "2021-06-29T15:54:12-07:00", - "path": "/nix/store/mmz8s440zplg88c0mb0w3dlg94dzgxmf-tree-sitter-javascript", - "sha256": "1bz8xhs7q4lp49q1id6dvz93l7vf0gxgngsbjk3x1nvw8rg171j6", + "rev": "bc2eb3994fd7cc605d27a32f9fcbee80bbb57f6d", + "date": "2021-08-13T14:29:43-07:00", + "path": "/nix/store/jkq26hbij9si8ri8k5agkdadr3p1nmbi-tree-sitter-javascript", + "sha256": "0f6bny38za17mmwqw0q0nmdb4f9i0xs7kbzixxgi44yyd43r5pzp", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-latex.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-latex.json index fdc910c4fd..b96375e3ca 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-latex.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-latex.json @@ -1,9 +1,9 @@ { "url": "https://github.com/latex-lsp/tree-sitter-latex", - "rev": "7f720661de5316c0f8fee956526d4002fa1086d8", - "date": "2021-05-11T16:35:53+02:00", - "path": "/nix/store/ssqxahrza89qmb97bxas6dvhbqd7w0dr-tree-sitter-latex", - "sha256": "14jfmbv3czs643bggcsi3pyxhf81jirpvg8hxcbcdx1f3fzhs16m", + "rev": "2c0d03a36ee979bc697f6a9dd119174cf0ef15e0", + "date": "2021-07-19T17:50:34+02:00", + "path": "/nix/store/vrpfbjfps3bd9vrx8760l0vx7m7ijhja-tree-sitter-latex", + "sha256": "0dfpdv5sibvajf2grlc0mqhyggjf6ip9j01jikk58n1yc9va88ib", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json index ce1e4f1bb3..be89244fc6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json @@ -1,9 +1,9 @@ { "url": "https://github.com/nvim-treesitter/tree-sitter-lua", - "rev": "b6d4e9e10ccb7b3afb45018fbc391b4439306b23", - "date": "2021-03-05T14:55:53+01:00", - "path": "/nix/store/mlvnfmm5q67810qdim11qs4ivq54jrmr-tree-sitter-lua", - "sha256": "17kf1m2qpflqv7xng6ls4v1qxfgdlpgxs4qjwb6rcc8nbcdsj4ms", + "rev": "6f5d40190ec8a0aa8c8410699353d820f4f7d7a6", + "date": "2021-08-02T15:13:28+02:00", + "path": "/nix/store/h1bhl291jac001w2c8fxi9w7dsqxq5q0-tree-sitter-lua", + "sha256": "05ash0l46s66q9yamzzh6ghk8yv0vas13c7dmz0c9xljbjk5ab1d", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json index ff638a08ba..f857c40c4f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json @@ -1,9 +1,9 @@ { "url": "https://github.com/cstrahan/tree-sitter-nix", - "rev": "50f38ceab667f9d482640edfee803d74f4edeba5", - "date": "2021-04-27T17:21:51-05:00", - "path": "/nix/store/fhf3mvxg17g0xli59cgmmwqy4g21fbzj-tree-sitter-nix", - "sha256": "11gifb9b7x9v223hsrcb6wlkqpxbc4p5v4ny9aixzi9k8g0jhb3d", + "rev": "83ee5993560bf15854c69b77d92e34456f8fb655", + "date": "2021-07-21T20:36:40-05:00", + "path": "/nix/store/n5pq9gba570874akpwpvs052d7vyalhh-tree-sitter-nix", + "sha256": "03jhvyrsxq49smk9p2apjj839wmzjmrzy045wcxawz1g7xssp9pr", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json index 6b64a962a5..6f62a595ee 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-php", - "rev": "5e89808d490d893799ebcf229130afe4cf2b0324", - "date": "2021-06-22T09:23:44+02:00", - "path": "/nix/store/5c1pn1p183czqb43a0va7whd4sz81jf1-tree-sitter-php", - "sha256": "1mp5kv305a4rrgh7kklifqfg3680krfsd0h76sxn4i0wxyqfgczi", + "rev": "63cebc37ebed42887f14cdd0baec961d5a1e16c1", + "date": "2021-08-10T20:56:40+02:00", + "path": "/nix/store/bh4yl563l5fgh7r8f95zzybsavci8hyh-tree-sitter-php", + "sha256": "1psiamww22imw05z0h34yks7vh7y4x4bdn62dwic1gpwfbjdrfmr", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json index 75329fc63a..ed48c146fb 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-scala", - "rev": "bfa2a81388019d47f6a0a6a6e9c96910dec830b4", - "date": "2021-06-23T15:37:27-07:00", - "path": "/nix/store/nc5cndwzc5pzq3x64wa51bff0rl36hc8-tree-sitter-scala", - "sha256": "0x0lq78gjfsqi225mfvrpkl2jc6fbb378jgj04syxkm941lxc4bk", + "rev": "ec38674996753f9631615fa558d4f1fa3bf90633", + "date": "2021-08-08T14:43:30-07:00", + "path": "/nix/store/2b0z1j06gvpcn1rvq8hv5vdqlh3qlzmv-tree-sitter-scala", + "sha256": "1xv544wnyd075g5pc8lxi0ix6wrwiv82sdjhzf3wd1np42vxq3d4", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json index 04ad785f76..1a39977295 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-typescript", - "rev": "28e757a2f498486931b3cb13a100a1bcc9261456", - "date": "2021-05-04T14:04:30-07:00", - "path": "/nix/store/d90hgv5g374a6mrwhq9vcxk6d6lp2ags-tree-sitter-typescript", - "sha256": "0dxy5h68hhypzq0z15q8iawjgw3kx7dlpw76zv6xkxh25idqgxqh", + "rev": "d598c96714a2dc9e346589c63369aff6719a51e6", + "date": "2021-08-02T14:05:14-07:00", + "path": "/nix/store/hf714sspmakhzra9bqazhbb0iljva1hi-tree-sitter-typescript", + "sha256": "0yra8fhgv7wqkik85icqyckf980v9ch411mqcjcf50n5dc1siaik", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/editable.nix b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/editable.nix index 12b659d4c3..1365d19032 100644 --- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/editable.nix +++ b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/editable.nix @@ -27,7 +27,7 @@ let (lib.generators.toINI { } pyProject.tool.poetry.plugins); # A python package that contains simple .egg-info and .pth files for an editable installation - editablePackage = python.pkgs.toPythonModule (pkgs.runCommandNoCC "${name}-editable" + editablePackage = python.pkgs.toPythonModule (pkgs.runCommand "${name}-editable" { } '' mkdir -p "$out/${python.sitePackages}" cd "$out/${python.sitePackages}" diff --git a/third_party/nixpkgs/pkgs/development/tools/react-native-debugger/default.nix b/third_party/nixpkgs/pkgs/development/tools/react-native-debugger/default.nix index 1db72dc1c8..ea842c8208 100644 --- a/third_party/nixpkgs/pkgs/development/tools/react-native-debugger/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/react-native-debugger/default.nix @@ -38,10 +38,10 @@ let ]; in stdenv.mkDerivation rec { pname = "react-native-debugger"; - version = "0.11.7"; + version = "0.12.1"; src = fetchurl { url = "https://github.com/jhen0409/react-native-debugger/releases/download/v${version}/rn-debugger-linux-x64.zip"; - sha256 = "sha256-UXKObJKk9UUgWtm8U+nXWvIJUr4NLm2f//pGTHJISYA="; + sha256 = "sha256-DzDZmZn45gpZb/fkSssb0PtR7EVyBk44IjC57beg0RM="; }; nativeBuildInputs = [ unzip ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/renderizer/default.nix b/third_party/nixpkgs/pkgs/development/tools/renderizer/default.nix index ccf1d4a37d..18d5cae542 100644 --- a/third_party/nixpkgs/pkgs/development/tools/renderizer/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/renderizer/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "renderizer"; - version = "2.0.12"; + version = "2.0.13"; src = fetchFromGitHub { owner = "gomatic"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Ji+wTTXLp17EYRIjUiVgd33ZeBdT8K2O8R2Ejq2Ll5I="; + sha256 = "sha256-jl98LuEsGN40L9IfybJhLnbzoYP/XpwFVQnjrlmDL9A="; }; buildFlagsArray = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/rnix-lsp/default.nix b/third_party/nixpkgs/pkgs/development/tools/rnix-lsp/default.nix index 27bad6b51d..09c8531c93 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rnix-lsp/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rnix-lsp/default.nix @@ -1,4 +1,4 @@ -{ callPackage, lib, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "rnix-lsp"; @@ -8,7 +8,6 @@ rustPlatform.buildRustPackage rec { owner = "nix-community"; repo = "rnix-lsp"; rev = "v${version}"; - sha256 = "0fy620c34kxl27sd62x9mj0555bcdmnmbsxavmyiwb497z1m9wnn"; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/bindgen/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/bindgen/default.nix index 267cc4fcfb..cc3907ba7f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/bindgen/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/bindgen/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, rustPlatform, clang, llvmPackages_latest, rustfmt, writeScriptBin +{ lib, fetchFromGitHub, rustPlatform, clang, llvmPackages_latest, rustfmt, writeTextFile , runtimeShell , bash }: @@ -38,12 +38,17 @@ rustPlatform.buildRustPackage rec { doCheck = true; checkInputs = - let fakeRustup = writeScriptBin "rustup" '' - #!${runtimeShell} - shift - shift - exec "$@" - ''; + let fakeRustup = writeTextFile { + name = "fake-rustup"; + executable = true; + destination = "/bin/rustup"; + text = '' + #!${runtimeShell} + shift + shift + exec "$@" + ''; + }; in [ rustfmt fakeRustup # the test suite insists in calling `rustup run nightly rustfmt` diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-watch/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-watch/default.nix index f2d5793f76..46bd0a591a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-watch/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-watch/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, rustPlatform, fetchFromGitHub, CoreServices, rust, libiconv }: +{ stdenv, lib, rustPlatform, fetchFromGitHub, CoreServices, Foundation, rust, libiconv }: rustPlatform.buildRustPackage rec { pname = "cargo-watch"; @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-Xp/pxPKs41TXO/EUY5x8Bha7NUioMabbb73///fFr6U="; - buildInputs = lib.optionals stdenv.isDarwin [ CoreServices libiconv ]; + buildInputs = lib.optionals stdenv.isDarwin [ CoreServices Foundation libiconv ]; # `test with_cargo` tries to call cargo-watch as a cargo subcommand # (calling cargo-watch with command `cargo watch`) diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix index 915dad400b..1700fd14b3 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -7,14 +7,14 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2021-08-09"; - cargoSha256 = "sha256-r01riAztIlwxRjvqQXofmqv5875nqQ0Qb9KALvKy4u8="; + version = "2021-08-16"; + cargoSha256 = "sha256-nTO6NmY0pqVud7kpOltHBOkaLlwfIdCrchV0o93FeVk="; src = fetchFromGitHub { owner = "rust-analyzer"; repo = "rust-analyzer"; rev = version; - sha256 = "sha256-l9F/cznYHxBdnb3NerIXzOMrzRnxdka0vExzUtKkBfw="; + sha256 = "sha256-FD1AwRiSTbj10+ielHBRkDTC7wyBBSatAlzyEow5CNE="; }; buildAndTestSubdir = "crates/rust-analyzer"; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/update.sh b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/update.sh index 91bde976eb..add400e4d0 100755 --- a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/update.sh +++ b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/update.sh @@ -53,13 +53,11 @@ echo "Extension version: $extension_ver" build_deps="../../../../misc/vscode-extensions/rust-analyzer/build-deps" # We need devDependencies to build vsix. -jq '{ name, version: $ver, dependencies: (.dependencies + .devDependencies) }' "$node_src/package.json" \ +# `esbuild` is a binary package an is already in nixpkgs so we omit it here. +jq '{ name, version: $ver, dependencies: (.dependencies + .devDependencies | del(.esbuild)) }' "$node_src/package.json" \ --arg ver "$extension_ver" \ >"$build_deps/package.json.new" -# FIXME: rollup@2.55.0 breaks the build: https://github.com/rollup/rollup/issues/4195 -sed 's/"rollup": ".*"/"rollup": "=2.51.1"/' --in-place "$build_deps/package.json.new" - old_deps="$(jq '.dependencies' "$build_deps"/package.json)" new_deps="$(jq '.dependencies' "$build_deps"/package.json.new)" if [[ "$old_deps" == "$new_deps" ]]; then diff --git a/third_party/nixpkgs/pkgs/development/tools/sd-local/default.nix b/third_party/nixpkgs/pkgs/development/tools/sd-local/default.nix index 1df8c27178..3ec4163ac4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/sd-local/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/sd-local/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "sd-local"; - version = "1.0.31"; + version = "1.0.32"; src = fetchFromGitHub { owner = "screwdriver-cd"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2EhXhgSm6rCCXNBCf0BH+MzHeU7n/XAXYXosCjRGEbo="; + sha256 = "sha256-4VKTp4q2CoIWQTiSgs254deafuowiTpuLVJ79nmqAaA="; }; vendorSha256 = "sha256-4xuWehRrmVdS2F6r00LZLKq/oHlWqCTQ/jYUKeIJ6DI="; diff --git a/third_party/nixpkgs/pkgs/development/tools/sumneko-lua-language-server/default.nix b/third_party/nixpkgs/pkgs/development/tools/sumneko-lua-language-server/default.nix index 95c10ad7d2..9b0bba533f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/sumneko-lua-language-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/sumneko-lua-language-server/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sumneko-lua-language-server"; - version = "1.20.2"; + version = "2.3.6"; src = fetchFromGitHub { owner = "sumneko"; repo = "lua-language-server"; rev = version; - sha256 = "sha256-7Ishq/TonJsteHBGDTNjImIwGPdeRgPS1g60d8bhTYg="; + sha256 = "sha256-iwmH4pbeKNkEYsaSd6I7ULSoEMwAtxOanF7vAutuW64="; fetchSubmodules = true; }; @@ -17,12 +17,19 @@ stdenv.mkDerivation rec { makeWrapper ]; + postPatch = '' + # doesn't work on aarch64, already removed on master: + # https://github.com/actboy168/bee.lua/commit/fd5ee552c8cff2c48eff72edc0c8db5b7bf1ee2c + rm {3rd/luamake/,}3rd/bee.lua/test/test_platform.lua + sed /test_platform/d -i {3rd/luamake/,}3rd/bee.lua/test/test.lua + ''; + preBuild = '' cd 3rd/luamake ''; ninjaFlags = [ - "-fninja/linux.ninja" + "-fcompile/ninja/linux.ninja" ]; postBuild = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/symfony-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/symfony-cli/default.nix index 6ff541b933..a57d666aa8 100644 --- a/third_party/nixpkgs/pkgs/development/tools/symfony-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/symfony-cli/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "symfony-cli"; - version = "4.25.4"; + version = "4.25.5"; src = fetchurl { url = "https://github.com/symfony/cli/releases/download/v${version}/symfony_linux_amd64.gz"; - sha256 = "94ade97d79e6949022ac45e4f8f9c025a9e3efa54a1a891a086a24eb9a9765a7"; + sha256 = "sha256-DMyW2lKuoFVEguCQQ6efXrzvujL5H7PcgI0go98M0xI="; }; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/tabnine/default.nix b/third_party/nixpkgs/pkgs/development/tools/tabnine/default.nix index baff8affcb..8219487f55 100644 --- a/third_party/nixpkgs/pkgs/development/tools/tabnine/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/tabnine/default.nix @@ -1,27 +1,23 @@ { stdenv, lib, fetchurl, unzip }: - let - # You can check the latest version with `curl -sS https://update.tabnine.com/bundles/version` - version = "3.5.37"; - src = - if stdenv.hostPlatform.system == "x86_64-darwin" then - fetchurl - { - url = "https://update.tabnine.com/bundles/${version}/x86_64-apple-darwin/TabNine.zip"; - sha256 = "sha256-Vxmhl4/bhRDeByGgkdSF8yEY5wI23WzT2iH1OFkEpck="; - } - else if stdenv.hostPlatform.system == "x86_64-linux" then - fetchurl - { - url = "https://update.tabnine.com/bundles/${version}/x86_64-unknown-linux-musl/TabNine.zip"; - sha256 = "sha256-pttjlx7WWE3nog9L1APp8HN+a4ShhlBj5irHOaPgqHw="; - } - else throw "Not supported on ${stdenv.hostPlatform.system}"; + platform = + if stdenv.hostPlatform.system == "x86_64-linux" then { + name = "x86_64-unknown-linux-musl"; + sha256 = "sha256-pttjlx7WWE3nog9L1APp8HN+a4ShhlBj5irHOaPgqHw="; + } else if stdenv.hostPlatform.system == "x86_64-darwin" then { + name = "x86_64-apple-darwin"; + sha256 = "sha256-Vxmhl4/bhRDeByGgkdSF8yEY5wI23WzT2iH1OFkEpck="; + } else throw "Not supported on ${stdenv.hostPlatform.system}"; in stdenv.mkDerivation rec { pname = "tabnine"; + # You can check the latest version with `curl -sS https://update.tabnine.com/bundles/version` + version = "3.5.37"; - inherit version src; + src = fetchurl { + url = "https://update.tabnine.com/bundles/${version}/${platform.name}/TabNine.zip"; + inherit (platform) sha256; + }; dontBuild = true; @@ -40,6 +36,8 @@ stdenv.mkDerivation rec { runHook postInstall ''; + passthru.platform = platform.name; + meta = with lib; { homepage = "https://tabnine.com"; description = "Smart Compose for code that uses deep learning to help you write code faster"; diff --git a/third_party/nixpkgs/pkgs/development/tools/tracy/default.nix b/third_party/nixpkgs/pkgs/development/tools/tracy/default.nix index 724e74098d..5bb056d5b3 100644 --- a/third_party/nixpkgs/pkgs/development/tools/tracy/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/tracy/default.nix @@ -4,13 +4,13 @@ let disableLTO = stdenv.cc.isClang && stdenv.isDarwin; # workaround issue #19098 in stdenv.mkDerivation rec { pname = "tracy"; - version = "0.7.7"; + version = "0.7.8"; src = fetchFromGitHub { owner = "wolfpld"; repo = "tracy"; rev = "v${version}"; - sha256 = "sha256-jp+Geqk39ZPoe2KzUJJ0w5hvCnyUlHGwVKn73lJJt94="; + sha256 = "sha256-hOeanY170vvn5W68cCDRUFApia/PW3ymPIgdWx3gwVw="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/treefmt/default.nix b/third_party/nixpkgs/pkgs/development/tools/treefmt/default.nix index 590fae6408..16da8e485b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/treefmt/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/treefmt/default.nix @@ -1,16 +1,16 @@ { lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "treefmt"; - version = "0.2.3"; + version = "0.2.5"; src = fetchFromGitHub { owner = "numtide"; repo = "treefmt"; rev = "v${version}"; - sha256 = "1j505bjdgd6lsq197frlyw26fl1621aw6z339bdp7zc3sa54z0d6"; + sha256 = "0h9xl887620d0b4y17nhkayr0raj8b7m6zsgx8gw4v9vdjkjbbpa"; }; - cargoSha256 = "0aky94rq1gs506yhpinj759lpvlnw3q2k97gvq34svgq0n38drvk"; + cargoSha256 = "04zmc2vaxsm4f1baissv3a6hnji3raixg891m3m8l13vin1a884q"; meta = { description = "one CLI to format the code tree"; diff --git a/third_party/nixpkgs/pkgs/development/tools/uftrace/default.nix b/third_party/nixpkgs/pkgs/development/tools/uftrace/default.nix index 03ee722890..68eb00f4eb 100644 --- a/third_party/nixpkgs/pkgs/development/tools/uftrace/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/uftrace/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "uftrace"; - version = "0.9.4"; + version = "0.10"; src = fetchFromGitHub { owner = "namhyung"; repo = "uftrace"; rev = "v${version}"; - sha256 = "09zj4lgsbx0yp4i8ij9nh7wzylfcj421jzf1kkc2zpnn5hgynsb5"; + sha256 = "sha256-T3HFhFKHsUcOOCXaA1NG3aDE0k5frnhqjCI8aV18EjQ="; }; postUnpack = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/vultr-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/vultr-cli/default.nix index b97a4438c0..b953feea22 100644 --- a/third_party/nixpkgs/pkgs/development/tools/vultr-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/vultr-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "vultr-cli"; - version = "2.4.1"; + version = "2.7.0"; src = fetchFromGitHub { owner = "vultr"; repo = pname; rev = "v${version}"; - sha256 = "sha256:0qbsybs91v9vnkxj4kpwqhzk4hgpkq36wnixxjajg038x7slds4i"; + sha256 = "sha256-3q0in41/ZGuZcMiu+5qT8AGttro2it89xp741RCxAYY="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/generateNix.js b/third_party/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/generateNix.js index cebe7c715d..b82372fd5b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/generateNix.js +++ b/third_party/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/generateNix.js @@ -57,7 +57,7 @@ function fetchgit(fileName, url, rev, branch, builtinFetchGit) { sha256 = "${prefetchgit(url, rev)}"; }; `}in - runCommandNoCC "${fileName}" { buildInputs = [gnutar]; } '' + runCommand "${fileName}" { buildInputs = [gnutar]; } '' # Set u+w because tar-fs can't unpack archives with read-only dirs # https://github.com/mafintosh/tar-fs/issues/79 tar cf $out --mode u+w -C \${repo} . @@ -104,7 +104,7 @@ function fetchLockedDep(builtinFetchGit) { } const HEAD = ` -{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec { +{ fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec { offline_cache = linkFarm "offline" packages; packages = [ `.trim() diff --git a/third_party/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/yarn.nix b/third_party/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/yarn.nix index b8dba6833f..98c19af79f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/yarn.nix +++ b/third_party/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/yarn.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec { +{ fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec { offline_cache = linkFarm "offline" packages; packages = [ { diff --git a/third_party/nixpkgs/pkgs/development/tools/ytt/default.nix b/third_party/nixpkgs/pkgs/development/tools/ytt/default.nix index 1080498004..978016369f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ytt/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ytt/default.nix @@ -1,13 +1,13 @@ { lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "ytt"; - version = "0.31.0"; + version = "0.36.0"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "carvel-ytt"; rev = "v${version}"; - sha256 = "sha256-GXnhI8nd4ciFd22989ypqGy5pozKJm+dzg8MaDDvuZg="; + sha256 = "sha256-/o+SgH0wpQQokzpnlK6Im6K9U3Aax3GHe7IPmVg2etk="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/development/web/deno/default.nix b/third_party/nixpkgs/pkgs/development/web/deno/default.nix index a6c879f77f..875b85f6bd 100644 --- a/third_party/nixpkgs/pkgs/development/web/deno/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/deno/default.nix @@ -17,15 +17,15 @@ rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.13.0"; + version = "1.13.1"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "sha256-iSL9YAcYdeZ9E5diAJG1oHzujPmfblOvheewOu9QIu8="; + sha256 = "sha256-5/n4DpTWPwCVfTk0rqxPhKaKXu3KqotgiYCj8tRAqaM="; }; - cargoSha256 = "sha256-1aibJwZ3o3bU5PWPVPBsRpjGo4JgOsNAgnPVAk1ZQHE="; + cargoSha256 = "sha256-FY8qXqVDKxai4VwdruJ7aBNTdXK5taOuvTr6gTgU8BM="; # Install completions post-install nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/development/web/flyctl/default.nix b/third_party/nixpkgs/pkgs/development/web/flyctl/default.nix index ccac1644b6..71db0f89cd 100644 --- a/third_party/nixpkgs/pkgs/development/web/flyctl/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/flyctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.230"; + version = "0.0.232"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "sha256-TI6pBtpUfI1vPsi+tq7FduFaZv9CvkAooqFmHCGslzI="; + sha256 = "sha256-VpHHkcN7VTMLBFMOTJcO6b2JIOZVcubJDKN04xXQIzA="; }; preBuild = '' diff --git a/third_party/nixpkgs/pkgs/development/web/minify/default.nix b/third_party/nixpkgs/pkgs/development/web/minify/default.nix index 4ef1913fd6..ac040d0a91 100644 --- a/third_party/nixpkgs/pkgs/development/web/minify/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/minify/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "minify"; - version = "2.7.4"; + version = "2.9.21"; src = fetchFromGitHub { owner = "tdewolff"; repo = pname; rev = "v${version}"; - sha256 = "06xzb681g4lfrpqa1rhpq5mm83vpik8qp6gjxqm2n21bfph88jm2"; + sha256 = "sha256-cHoQtvxofMet7j/PDKlFoVB9Qo5EMWcXqAwhqR4vNko="; }; - vendorSha256 = "120d3nzk8cr5496cxp5p6ydlzw9mmpg7dllqhv1kpgwlbxmd8vr3"; + vendorSha256 = "sha256-awlrjXXX9PWs4dt78yK4qNE1wCaA+tGL45tHQxxby8c="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/web/nodejs/v12.nix b/third_party/nixpkgs/pkgs/development/web/nodejs/v12.nix index 66cf2e4904..e59b795942 100644 --- a/third_party/nixpkgs/pkgs/development/web/nodejs/v12.nix +++ b/third_party/nixpkgs/pkgs/development/web/nodejs/v12.nix @@ -8,7 +8,7 @@ let in buildNodejs { inherit enableNpm; - version = "12.22.4"; - sha256 = "0k6dwkhpmjcdb71zd92a5v0l82rsk06p57iyjby84lhy2fmlxka4"; + version = "12.22.5"; + sha256 = "057xhxk440pxlgqpblsh4vfwmfzy0fx1h6q3jr2j79y559ngy9zr"; patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff; } diff --git a/third_party/nixpkgs/pkgs/development/web/nodejs/v14.nix b/third_party/nixpkgs/pkgs/development/web/nodejs/v14.nix index 3b04f751b4..bad8ebfa5a 100644 --- a/third_party/nixpkgs/pkgs/development/web/nodejs/v14.nix +++ b/third_party/nixpkgs/pkgs/development/web/nodejs/v14.nix @@ -7,7 +7,7 @@ let in buildNodejs { inherit enableNpm; - version = "14.17.4"; - sha256 = "0b6gadc53r07gx6qr6281ifr5m9bgprmfdqyz9zh5j7qhkkz8yxf"; + version = "14.17.5"; + sha256 = "1a0zj505nhpfcj19qvjy2hvc5a7gadykv51y0rc6032qhzzsgca2"; patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff; } diff --git a/third_party/nixpkgs/pkgs/development/web/nodejs/v16.nix b/third_party/nixpkgs/pkgs/development/web/nodejs/v16.nix index bee01d7aae..e0aa5fb7bd 100644 --- a/third_party/nixpkgs/pkgs/development/web/nodejs/v16.nix +++ b/third_party/nixpkgs/pkgs/development/web/nodejs/v16.nix @@ -8,7 +8,7 @@ let in buildNodejs { inherit enableNpm; - version = "16.6.1"; - sha256 = "0mz5wfhf2k1qf3d57h4r8b30izhyg93g5m9c8rljlzy6ih2ymcbr"; + version = "16.6.2"; + sha256 = "1svrkm2zq8dyvw2l7gvgm75x2fqarkbpc33970521r3iz6hwp547"; patches = [ ./disable-darwin-v8-system-instrumentation.patch ]; } diff --git a/third_party/nixpkgs/pkgs/games/ballerburg/default.nix b/third_party/nixpkgs/pkgs/games/ballerburg/default.nix index ceb95059ed..43b274a128 100644 --- a/third_party/nixpkgs/pkgs/games/ballerburg/default.nix +++ b/third_party/nixpkgs/pkgs/games/ballerburg/default.nix @@ -1,6 +1,14 @@ -{ lib, stdenv, fetchurl, cmake, SDL }: +{ lib, stdenv, fetchurl, cmake, SDL, makeDesktopItem, copyDesktopItems +, imagemagick }: -stdenv.mkDerivation rec { +let + + icon = fetchurl { + url = "https://baller.tuxfamily.org/king.png"; + sha256 = "1xq2h87s648wjpjl72ds3xnnk2jp8ghbkhjzh2g4hpkq2zdz90hy"; + }; + +in stdenv.mkDerivation rec { pname = "ballerburg"; version = "1.2.0"; @@ -9,10 +17,32 @@ stdenv.mkDerivation rec { sha256 = "sha256-BiX0shPBGA8sshee8rxs41x+mdsrJzBqhpDDic6sYwA="; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake copyDesktopItems imagemagick ]; buildInputs = [ SDL ]; + desktopItems = [ + (makeDesktopItem { + name = "Ballerburg"; + desktopName = "Ballerburg SDL"; + type = "Application"; + exec = "_NET_WM_ICON=ballerburg ballerburg"; + comment = meta.description; + icon = "ballerburg"; + categories = "Game;"; + }) + ]; + + postInstall = '' + # Generate and install icon files + for size in 16 32 48 64 72 96 128 192 512 1024; do + mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps + convert ${icon} -sample "$size"x"$size" \ + -background white -gravity south -extent "$size"x"$size" \ + $out/share/icons/hicolor/"$size"x"$size"/apps/ballerburg.png + done + ''; + meta = with lib; { description = "Classic cannon combat game"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/games/egoboo/default.nix b/third_party/nixpkgs/pkgs/games/egoboo/default.nix index 56ebcb1444..158e81d912 100644 --- a/third_party/nixpkgs/pkgs/games/egoboo/default.nix +++ b/third_party/nixpkgs/pkgs/games/egoboo/default.nix @@ -5,10 +5,11 @@ stdenv.mkDerivation rec { # they fix more, because it even has at least one bugs less than 2.7.4. # 2.8.0 does not start properly on linux # They just starting making that 2.8.0 work on linux. - name = "egoboo-2.7.3"; + pname = "egoboo"; + version = "2.7.3"; src = fetchurl { - url = "mirror://sourceforge/egoboo/${name}.tar.gz"; + url = "mirror://sourceforge/egoboo/egoboo-${version}.tar.gz"; sha256 = "18cjgp9kakrsa90jcb4cl8hhh9k57mi5d1sy5ijjpd3p7zl647hd"; }; @@ -22,10 +23,10 @@ stdenv.mkDerivation rec { # The user will need to have all the files in '.' to run egoboo, with # writeable controls.txt and setup.txt installPhase = '' - mkdir -p $out/share/${name} - cp -v game/egoboo $out/share/${name} + mkdir -p $out/share/egoboo-${version} + cp -v game/egoboo $out/share/egoboo-${version} cd .. - cp -v -Rd controls.txt setup.txt players modules basicdat $out/share/${name} + cp -v -Rd controls.txt setup.txt players modules basicdat $out/share/egoboo-${version} ''; buildInputs = [ libGLU libGL SDL SDL_mixer SDL_image SDL_ttf ]; diff --git a/third_party/nixpkgs/pkgs/games/factorio/versions.json b/third_party/nixpkgs/pkgs/games/factorio/versions.json index d8174417cb..acbc0c4cbc 100644 --- a/third_party/nixpkgs/pkgs/games/factorio/versions.json +++ b/third_party/nixpkgs/pkgs/games/factorio/versions.json @@ -10,30 +10,30 @@ "version": "1.1.37" }, "stable": { - "name": "factorio_alpha_x64-1.1.36.tar.xz", + "name": "factorio_alpha_x64-1.1.37.tar.xz", "needsAuth": true, - "sha256": "1x9a2lv6zbqawqlxg8bcbx04hjy0pq40macfa4sqi8w6h14wgww8", + "sha256": "0aj8w38lx8bx3d894qxr416x515ijadrlcynvvqjaj1zx3acldzh", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.36/alpha/linux64", - "version": "1.1.36" + "url": "https://factorio.com/get-download/1.1.37/alpha/linux64", + "version": "1.1.37" } }, "demo": { "experimental": { - "name": "factorio_demo_x64-1.1.35.tar.xz", + "name": "factorio_demo_x64-1.1.37.tar.xz", "needsAuth": false, - "sha256": "0yqb4gf2avpxr4vwafws9pv74xyd9g84zggfikfc801ldc7sp29f", + "sha256": "06qwx9wd3990d3256y9y5qsxa0936076jgwhinmrlvjp9lxwl4ly", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.35/demo/linux64", - "version": "1.1.35" + "url": "https://factorio.com/get-download/1.1.37/demo/linux64", + "version": "1.1.37" }, "stable": { - "name": "factorio_demo_x64-1.1.36.tar.xz", + "name": "factorio_demo_x64-1.1.37.tar.xz", "needsAuth": false, - "sha256": "15fl4pza7n107rrmmdm26kkc12fnrmpn6rjb4ampgzqzn1fq854s", + "sha256": "06qwx9wd3990d3256y9y5qsxa0936076jgwhinmrlvjp9lxwl4ly", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.36/demo/linux64", - "version": "1.1.36" + "url": "https://factorio.com/get-download/1.1.37/demo/linux64", + "version": "1.1.37" } }, "headless": { @@ -46,12 +46,12 @@ "version": "1.1.37" }, "stable": { - "name": "factorio_headless_x64-1.1.36.tar.xz", + "name": "factorio_headless_x64-1.1.37.tar.xz", "needsAuth": false, - "sha256": "1s8g030xp5nrlmnn21frrd8n4nd7jjmb5hbpj1vhxjrk6vpijh24", + "sha256": "0hawwjdaxgbrkb80vn9jk6dn0286mq35zkgg5vvv5zhi339pqwwg", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.36/headless/linux64", - "version": "1.1.36" + "url": "https://factorio.com/get-download/1.1.37/headless/linux64", + "version": "1.1.37" } } } diff --git a/third_party/nixpkgs/pkgs/games/freeorion/default.nix b/third_party/nixpkgs/pkgs/games/freeorion/default.nix index dea5190d97..5b44070380 100644 --- a/third_party/nixpkgs/pkgs/games/freeorion/default.nix +++ b/third_party/nixpkgs/pkgs/games/freeorion/default.nix @@ -24,14 +24,14 @@ }: stdenv.mkDerivation rec { - version = "0.4.10.1"; + version = "0.4.10.2"; pname = "freeorion"; src = fetchFromGitHub { owner = "freeorion"; repo = "freeorion"; rev = "v${version}"; - sha256 = "sha256-Itt2JIStx+JsnMMBvbeJXSEJpaS/pd1UMvPGNd50k7I="; + sha256 = "sha256-k/YwTg0N2b70igfqRuFl/zwxMQhD2QjbapsazYbi0Ik="; }; buildInputs = [ @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { makeWrapper ]; - # as of 0.4.10.1 FreeOrion doesn't work with "-DOpenGL_GL_PREFERENCE=GLVND" + # as of 0.4.10.2 FreeOrion doesn't work with "-DOpenGL_GL_PREFERENCE=GLVND" cmakeFlags = [ "-DOpenGL_GL_PREFERENCE=LEGACY" ]; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/games/liberation-circuit/default.nix b/third_party/nixpkgs/pkgs/games/liberation-circuit/default.nix new file mode 100644 index 0000000000..478fd60637 --- /dev/null +++ b/third_party/nixpkgs/pkgs/games/liberation-circuit/default.nix @@ -0,0 +1,71 @@ +{ stdenv, lib, fetchFromGitHub, fetchurl, cmake, git, makeWrapper, allegro5, libGL }: + +stdenv.mkDerivation rec { + pname = "liberation-circuit"; + version = "1.3"; + + src = fetchFromGitHub { + owner = "linleyh"; + repo = pname; + rev = "v${version}"; + sha256 = "BAv0wEJw4pK77jV+1bWPHeqyU/u0HtZLBF3ETUoQEAk="; + }; + + patches = [ + # Linux packaging assets + (fetchurl { + url = "https://github.com/linleyh/liberation-circuit/commit/72c1f6f4100bd227540aca14a535e7f4ebdeb851.patch"; + sha256 = "0sad1z1lls0hanv88g1q6x5qr4s8f5p42s8j8v55bmwsdc0s5qys"; + }) + ]; + + # Hack to make binary diffs work + prePatch = '' + function patch { + git apply --whitespace=nowarn "$@" + } + ''; + + postPatch = '' + unset -f patch + substituteInPlace bin/launcher.sh --replace ./libcirc ./liberation-circuit + ''; + + nativeBuildInputs = [ cmake git makeWrapper ]; + buildInputs = [ allegro5 libGL ]; + + cmakeFlags = [ + "-DALLEGRO_LIBRARY=${lib.getDev allegro5}" + "-DALLEGRO_INCLUDE_DIR=${lib.getDev allegro5}/include" + ]; + + NIX_CFLAGS_LINK = "-lallegro_image -lallegro_primitives -lallegro_color -lallegro_acodec -lallegro_audio -lallegro_dialog -lallegro_font -lallegro_main -lallegro -lm"; + hardeningDisable = [ "format" ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/opt + cd .. + cp -r bin $out/opt/liberation-circuit + chmod +x $out/opt/liberation-circuit/launcher.sh + makeWrapper $out/opt/liberation-circuit/launcher.sh $out/bin/liberation-circuit + + install -D linux-packaging/liberation-circuit.desktop $out/share/applications/liberation-circuit.desktop + install -D linux-packaging/liberation-circuit.appdata.xml $out/share/metainfo/liberation-circuit.appdata.xml + install -D linux-packaging/icon-256px.png $out/share/pixmaps/liberation-circuit.png + + runHook postInstall + ''; + + meta = with lib; { + description = "Real-time strategy game with programmable units"; + longDescription = '' + Escape from a hostile computer system! Harvest data to create an armada of battle-processes to aid your escape! Take command directly and play the game as an RTS, or use the game's built-in editor and compiler to write your own unit AI in a simplified version of C. + ''; + homepage = "https://linleyh.itch.io/liberation-circuit"; + maintainers = with maintainers; [ angustrau ]; + license = licenses.gpl3Only; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/games/oh-my-git/default.nix b/third_party/nixpkgs/pkgs/games/oh-my-git/default.nix index 542effa659..881935279f 100644 --- a/third_party/nixpkgs/pkgs/games/oh-my-git/default.nix +++ b/third_party/nixpkgs/pkgs/games/oh-my-git/default.nix @@ -20,6 +20,7 @@ , libglvnd , libpulseaudio , zlib +, udev # for libudev }: stdenv.mkDerivation rec { @@ -54,6 +55,7 @@ stdenv.mkDerivation rec { libglvnd libpulseaudio zlib + udev ]; desktopItems = [ diff --git a/third_party/nixpkgs/pkgs/games/onscripter-en/default.nix b/third_party/nixpkgs/pkgs/games/onscripter-en/default.nix index bcd33eb989..82de61e418 100644 --- a/third_party/nixpkgs/pkgs/games/onscripter-en/default.nix +++ b/third_party/nixpkgs/pkgs/games/onscripter-en/default.nix @@ -4,7 +4,8 @@ stdenv.mkDerivation { - name = "onscripter-en-20110930"; + pname = "onscripter-en"; + version = "20110930"; src = fetchurl { # The website is not available now. diff --git a/third_party/nixpkgs/pkgs/games/osu-lazer/deps.nix b/third_party/nixpkgs/pkgs/games/osu-lazer/deps.nix index d2c19b08d0..533f114d5f 100644 --- a/third_party/nixpkgs/pkgs/games/osu-lazer/deps.nix +++ b/third_party/nixpkgs/pkgs/games/osu-lazer/deps.nix @@ -1,1787 +1,359 @@ { fetchNuGet }: [ - (fetchNuGet { - name = "AutoMapper"; - version = "10.1.1"; - sha256 = "1l1p9g7f7finr8laklbm7h2c45k0swl47iq0ik68js5s6pzvd6f8"; - }) - (fetchNuGet { - name = "DeltaCompressionDotNet"; - version = "2.0.0.0"; - sha256 = "0zhj7m3zaf9wcg51385in9qg1xgkvp8yyzgq3r5k4sagm7y68aqy"; - }) - (fetchNuGet { - name = "DiffPlex"; - version = "1.7.0"; - sha256 = "09a8hkbx99iwikfl8war629945yv7i8llj9480dbc4kyp6qqlr00"; - }) - (fetchNuGet { - name = "DiscordRichPresence"; - version = "1.0.175"; - sha256 = "180sax976327d70qbinv07f65g3w2zbw80n49hckg8wd4rw209vd"; - }) - (fetchNuGet { - name = "FFmpeg.AutoGen"; - version = "4.3.0.1"; - sha256 = "0n6x57mnnvcjnrs8zyvy07h5zm4bcfy9gh4n4bvd9fx5ys4pxkvv"; - }) - (fetchNuGet { - name = "Fody"; - version = "6.5.2"; - sha256 = "0vq97mkfk5ijinwnhpkm212y69ik6cd5x0n61ssyxmz50q1vp84f"; - }) - (fetchNuGet { - name = "HidSharpCore"; - version = "1.2.1.1"; - sha256 = "1zkndglmz0s8rblfhnqcvv90rkq2i7lf4bc380g7z8h1avf2ikll"; - }) - (fetchNuGet { - name = "HtmlAgilityPack"; - version = "1.11.34"; - sha256 = "078dad719hkv806qgj1f0hkn7di5zvvm594awfn5bsgb9afq94a7"; - }) - (fetchNuGet { - name = "Humanizer"; - version = "2.11.10"; - sha256 = "057pqzvdxsbpnnc5f1xkqg7j3ywp68ggia3w74fgqp0158dm6rdk"; - }) - (fetchNuGet { - name = "Humanizer.Core"; - version = "2.11.10"; - sha256 = "0z7kmd5rh1sb6izq0vssk6c2p63n00xglk45s7ga9z18z9aaskxv"; - }) - (fetchNuGet { - name = "Humanizer.Core"; - version = "2.2.0"; - sha256 = "08mzg65y9d3zvq16rsmpapcdan71ggq2mpks6k777h3wlm2sh3p5"; - }) - (fetchNuGet { - name = "Humanizer.Core.af"; - version = "2.11.10"; - sha256 = "18fiixfvjwn8m1i8z2cz4aqykzylvfdqmmpwc2zcd8sr1a2xm86z"; - }) - (fetchNuGet { - name = "Humanizer.Core.ar"; - version = "2.11.10"; - sha256 = "009fpm4jd325izm82ipipsvlwd31824gvskda68bdwi4yqmycz4p"; - }) - (fetchNuGet { - name = "Humanizer.Core.az"; - version = "2.11.10"; - sha256 = "144b9diwprabxwgi5a98k5iy95ajq4p7356phdqi2lhzwbz7b6a9"; - }) - (fetchNuGet { - name = "Humanizer.Core.bg"; - version = "2.11.10"; - sha256 = "1b9y40gvq2kwnj5wa40f8cbywv79jkajcwknagrgr27sykpfadl2"; - }) - (fetchNuGet { - name = "Humanizer.Core.bn-BD"; - version = "2.11.10"; - sha256 = "18pn4jcp36ygcx283l3fi9bs5d7q1a384b72a10g5kl0qckn88ay"; - }) - (fetchNuGet { - name = "Humanizer.Core.cs"; - version = "2.11.10"; - sha256 = "03crw1lnzp32v2kcdmllkrsqh07r4ggw9gyc96qw7cv0nk5ch1h8"; - }) - (fetchNuGet { - name = "Humanizer.Core.da"; - version = "2.11.10"; - sha256 = "0glby12zra3y3yiq4cwq1m6wjcjl8f21v8ghi6s20r48glm8vzy9"; - }) - (fetchNuGet { - name = "Humanizer.Core.de"; - version = "2.11.10"; - sha256 = "0a35xrm1f9p74x0fkr52bw9sd54vdy9d5rnvf565yh8ww43xfk7b"; - }) - (fetchNuGet { - name = "Humanizer.Core.el"; - version = "2.11.10"; - sha256 = "0bhwwdx5vc48zikdsbrkghdhwahxxc2lkff0yaa5nxhbhasl84h8"; - }) - (fetchNuGet { - name = "Humanizer.Core.es"; - version = "2.11.10"; - sha256 = "07bw07qy8nyzlgxl7l2lxv9f78qmkfppgzx7iyq5ikrcnpvc7i9q"; - }) - (fetchNuGet { - name = "Humanizer.Core.fa"; - version = "2.11.10"; - sha256 = "00d4hc1pfmhfkc5wmx9p7i00lgi4r0k6wfcns9kl1syjxv3bs5f2"; - }) - (fetchNuGet { - name = "Humanizer.Core.fi-FI"; - version = "2.11.10"; - sha256 = "0z4is7pl5jpi4pfdvd2zvx5mp00bj26d9l9ksqyc0liax8nfzyik"; - }) - (fetchNuGet { - name = "Humanizer.Core.fr"; - version = "2.11.10"; - sha256 = "0sybpg6kbbhrnk7gxcdk7ppan89lsfqsdssrg4i1dm8w48wgicap"; - }) - (fetchNuGet { - name = "Humanizer.Core.fr-BE"; - version = "2.11.10"; - sha256 = "1s25c86nl9wpsn6fydzwv4rfmdx5sm0vgyd7xhw5344k20gazvhv"; - }) - (fetchNuGet { - name = "Humanizer.Core.he"; - version = "2.11.10"; - sha256 = "1nx61qkjd6p9r36dmnm4942khyv35fpdqmb2w69gz6463g4d7z29"; - }) - (fetchNuGet { - name = "Humanizer.Core.hr"; - version = "2.11.10"; - sha256 = "02jhcyj72prkqsjxyilv04drm0bknqjh2r893jlbsfi9vjg2zay3"; - }) - (fetchNuGet { - name = "Humanizer.Core.hu"; - version = "2.11.10"; - sha256 = "0yb6ly4s1wdyaf96h2dvifqyb575aid6irwl3qx8gcvrs0xpcxdp"; - }) - (fetchNuGet { - name = "Humanizer.Core.hy"; - version = "2.11.10"; - sha256 = "0b7vaqldn7ca3xi4gkvkhjk900kw2zwb0m0d20bg45a83zdlx79c"; - }) - (fetchNuGet { - name = "Humanizer.Core.id"; - version = "2.11.10"; - sha256 = "1yqxirknwga4j18k7ixwgqxlv20479afanhariy3c5mkwvglsr9b"; - }) - (fetchNuGet { - name = "Humanizer.Core.it"; - version = "2.11.10"; - sha256 = "1skwgj5a6kkx3pm9w4f29psch69h1knmwbkdydlmx13h452p1w4l"; - }) - (fetchNuGet { - name = "Humanizer.Core.ja"; - version = "2.11.10"; - sha256 = "1wpc3yz9v611dqbw8j5yimk8dpz0rvpnls4rmlnp1m47gavpj8x4"; - }) - (fetchNuGet { - name = "Humanizer.Core.ko-KR"; - version = "2.11.10"; - sha256 = "1df0kd7vwdc3inxfkb3wsl1aw3d6vbab99dzh08p4m04g7i2c1a9"; - }) - (fetchNuGet { - name = "Humanizer.Core.ku"; - version = "2.11.10"; - sha256 = "17b66xfgwjr0sffx0hw4c6l90h43z7ffylrs26hgav0n110q2nwg"; - }) - (fetchNuGet { - name = "Humanizer.Core.lv"; - version = "2.11.10"; - sha256 = "0czxx4b9g0w7agykdl82wds09zasa9y58dmgjm925amlfz4wkyzs"; - }) - (fetchNuGet { - name = "Humanizer.Core.ms-MY"; - version = "2.11.10"; - sha256 = "0kix95nbw94fx0dziyz80y59i7ii7d21b63f7f94niarljjq36i3"; - }) - (fetchNuGet { - name = "Humanizer.Core.mt"; - version = "2.11.10"; - sha256 = "1rwy6m22pq65gxn86xlr9lv818fp5kb0wz98zxxfljc2iviw1f4p"; - }) - (fetchNuGet { - name = "Humanizer.Core.nb"; - version = "2.11.10"; - sha256 = "0ra2cl0avvv4sylha7z76jxnb4pdiqfbpr5m477snr04dsjxd9q9"; - }) - (fetchNuGet { - name = "Humanizer.Core.nb-NO"; - version = "2.11.10"; - sha256 = "1qszib03pvmjkrg8za7jjd2vzrs9p4fn2rmy82abnzldkhvifipq"; - }) - (fetchNuGet { - name = "Humanizer.Core.nl"; - version = "2.11.10"; - sha256 = "1i9bvy0i2yyasl9mgxiiwrkmfpm2c53d3wwdp9270r6120sxyy63"; - }) - (fetchNuGet { - name = "Humanizer.Core.pl"; - version = "2.11.10"; - sha256 = "0kggh4wgcic7wzgxy548n6w61schss2ccf9kz8alqshfi42xifby"; - }) - (fetchNuGet { - name = "Humanizer.Core.pt"; - version = "2.11.10"; - sha256 = "09j90s8x1lpvhfiy3syfnj8slkgcacf3xjy3pnkgxa6g4mi4f4bd"; - }) - (fetchNuGet { - name = "Humanizer.Core.ro"; - version = "2.11.10"; - sha256 = "1jgidmqfly91v1k22gn687mfql5bz7gjzp1aapi93vq5x635qssy"; - }) - (fetchNuGet { - name = "Humanizer.Core.ru"; - version = "2.11.10"; - sha256 = "13mmlh0ibxfyc85xrz3vx4mcg56mkzqql184iwdryq94p0g5ahil"; - }) - (fetchNuGet { - name = "Humanizer.Core.sk"; - version = "2.11.10"; - sha256 = "04ja06y5jaz1jwkwn117wx9cib04gpbi0vysn58a8sd5jrxmxai5"; - }) - (fetchNuGet { - name = "Humanizer.Core.sl"; - version = "2.11.10"; - sha256 = "05hxk9v3a7fn7s4g9jp5zxk2z6a33b9fkavyb1hjqnl2i37q2wja"; - }) - (fetchNuGet { - name = "Humanizer.Core.sr"; - version = "2.11.10"; - sha256 = "0x6l2msimrx72iywa1g0rqklgy209sdwg0r77i2lz0s1rvk5klm5"; - }) - (fetchNuGet { - name = "Humanizer.Core.sr-Latn"; - version = "2.11.10"; - sha256 = "01hdyn7mmbyy7f3aglawgnsj3nblcdpqjgzdcvniy73l536mira0"; - }) - (fetchNuGet { - name = "Humanizer.Core.sv"; - version = "2.11.10"; - sha256 = "0cbgchivw3d5ndib1zmgzmnymhyvfh9g9f0hijc860g5vaa9fkvh"; - }) - (fetchNuGet { - name = "Humanizer.Core.th-TH"; - version = "2.11.10"; - sha256 = "1v7f9x3b04iwhz9lb3ir8az8128nvcw1gi4park5zh3fg0f3mni0"; - }) - (fetchNuGet { - name = "Humanizer.Core.tr"; - version = "2.11.10"; - sha256 = "02c4ky0dskxkdrkc7vy8yzmvwjr1wqll1kzx0k21afhlx8xynjd4"; - }) - (fetchNuGet { - name = "Humanizer.Core.uk"; - version = "2.11.10"; - sha256 = "0900ilhwj8yvhyzpg1pjr7f5vrl62wp8dsnhk4c2igs20qvnv079"; - }) - (fetchNuGet { - name = "Humanizer.Core.uz-Cyrl-UZ"; - version = "2.11.10"; - sha256 = "09b7p2m8y49j49ckrmx2difgyj6y7fm2mwca093j8psxclsykcyr"; - }) - (fetchNuGet { - name = "Humanizer.Core.uz-Latn-UZ"; - version = "2.11.10"; - sha256 = "029kvkawqhlln52vpjpvr52dhr18ylk01cgsj2z8lxnqaka0q9hk"; - }) - (fetchNuGet { - name = "Humanizer.Core.vi"; - version = "2.11.10"; - sha256 = "0q4d47plsj956ivn82qwyidfxppjr9dp13m8c66aamrvhy4q8ny5"; - }) - (fetchNuGet { - name = "Humanizer.Core.zh-CN"; - version = "2.11.10"; - sha256 = "01dy5kf6ai8id77px92ji4kcxjc8haj39ivv55xy1afcg3qiy7mh"; - }) - (fetchNuGet { - name = "Humanizer.Core.zh-Hans"; - version = "2.11.10"; - sha256 = "16gcxgw2g6gck3nc2hxzlkbsg7wkfaqsjl87kasibxxh47zdqqv2"; - }) - (fetchNuGet { - name = "Humanizer.Core.zh-Hant"; - version = "2.11.10"; - sha256 = "1rjg2xvkwjjw3c7z9mdjjvbnl9lcvvhh4fr7l61rla2ynzdk46cj"; - }) - (fetchNuGet { - name = "JetBrains.Annotations"; - version = "2021.1.0"; - sha256 = "07pnhxxlgx8spmwmakz37nmbvgyb6yjrbrhad5rrn6y767z5r1gb"; - }) - (fetchNuGet { - name = "ManagedBass"; - version = "2.0.4"; - sha256 = "13hwd0yany4j52abbaaqsgq8lag2w9vjxxsj4qfbgwp4qs39x003"; - }) - (fetchNuGet { - name = "ManagedBass.Fx"; - version = "2.0.1"; - sha256 = "1rbjpgpm0ri7l2gqdy691rsv3visna2nbxawgvhdqljw068r8a8d"; - }) - (fetchNuGet { - name = "managed-midi"; - version = "1.9.14"; - sha256 = "025jh146zy98699y4civ7nxlkx312lwkl4sr8pha626q7q1kg89h"; - }) - (fetchNuGet { - name = "Markdig"; - version = "0.25.0"; - sha256 = "1f7iqkaphfyf6szjrp0633rj44wynqgiqyivbja5djyxjy4csfyy"; - }) - (fetchNuGet { - name = "MessagePack"; - version = "2.2.85"; - sha256 = "1y0h8bd0drnlsqf1bvrdiv9j1892zqf1rmyclfjzs49klpf0xphk"; - }) - (fetchNuGet { - name = "MessagePack.Annotations"; - version = "2.2.85"; - sha256 = "00wajml6iy3wid8mixh3jmm6dapfjbccwq95m8qciika4pyd4lq9"; - }) - (fetchNuGet { - name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; - version = "5.0.5"; - sha256 = "026m19pddhkx5idwpi6mp1yl9yfcfgm2qjp1jh54mdja1d7ng0vk"; - }) - (fetchNuGet { - name = "Microsoft.AspNetCore.Connections.Abstractions"; - version = "5.0.7"; - sha256 = "119wk2aqnas2sfyawv0wkg20ygk1cr15lycvvnw2x42kwgcimmks"; - }) - (fetchNuGet { - name = "Microsoft.AspNetCore.Http.Connections.Client"; - version = "5.0.7"; - sha256 = "0jdpqmjv9w29ih13nprzvf2m6cjrg69x0kwyi3d7b371rvz7m66l"; - }) - (fetchNuGet { - name = "Microsoft.AspNetCore.Http.Connections.Common"; - version = "5.0.7"; - sha256 = "1h6bw9hs92xp505c9x0jn1mx1i86r3s6xs7yyycx905grwisga39"; - }) - (fetchNuGet { - name = "Microsoft.AspNetCore.Http.Features"; - version = "5.0.7"; - sha256 = "1v89zxk15c7gswq10cbsf2yr974inpbk5npw2v6qj8vcs66qqwq3"; - }) - (fetchNuGet { - name = "Microsoft.AspNetCore.SignalR.Client"; - version = "5.0.7"; - sha256 = "13mqsa5nks9fcxv6kxm9j75mxafs3h5pikv35a56h7d9z8wdazsr"; - }) - (fetchNuGet { - name = "Microsoft.AspNetCore.SignalR.Client.Core"; - version = "5.0.7"; - sha256 = "033q9ijbbkh3crby96c62azyi61m0c7byiz89xbrdvagpj6ydqn5"; - }) - (fetchNuGet { - name = "Microsoft.AspNetCore.SignalR.Common"; - version = "5.0.7"; - sha256 = "0s04flgfrljv3r8kxplc569mp3gsqd4nwda0h3yly3rqzwmbrnwp"; - }) - (fetchNuGet { - name = "Microsoft.AspNetCore.SignalR.Protocols.Json"; - version = "5.0.7"; - sha256 = "0nb3v6hhhlndagczac255v2iyjs40jfi9gnb0933zh01wqrgkrv7"; - }) - (fetchNuGet { - name = "Microsoft.AspNetCore.SignalR.Protocols.MessagePack"; - version = "5.0.7"; - sha256 = "06clfalw2xn7rfw53y8kiwcf2j3902iz0pl9fn2q4czhfwfp23ld"; - }) - (fetchNuGet { - name = "Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson"; - version = "5.0.7"; - sha256 = "1m2likbhq8mxv33yw5zl2ybgc11ksjzqi7nhjrnx1bc12amb3nw4"; - }) - (fetchNuGet { - name = "Microsoft.Bcl.AsyncInterfaces"; - version = "1.0.0"; - sha256 = "00dx5armvkqjxvkldz3invdlck9nj7w21dlsr2aqp1rqbyrbsbbh"; - }) - (fetchNuGet { - name = "Microsoft.Bcl.AsyncInterfaces"; - version = "1.1.0"; - sha256 = "1dq5yw7cy6s42193yl4iqscfw5vzkjkgv0zyy32scr4jza6ni1a1"; - }) - (fetchNuGet { - name = "Microsoft.Bcl.AsyncInterfaces"; - version = "5.0.0"; - sha256 = "0cp5jbax2mf6xr3dqiljzlwi05fv6n9a35z337s92jcljiq674kf"; - }) - (fetchNuGet { - name = "Microsoft.Build.Framework"; - version = "16.5.0"; - sha256 = "1xgr02r7s9i6s70n237hss4yi9zicssia3zd2ny6s8vyxb7jpdyb"; - }) - (fetchNuGet { - name = "Microsoft.Build.Locator"; - version = "1.4.1"; - sha256 = "0j119rri7a401rca67cxdyrn3rprzdl1b2wrblqc23xsff1xvlrx"; - }) - (fetchNuGet { - name = "Microsoft.CodeAnalysis.Analyzers"; - version = "3.3.2"; - sha256 = "162vb5894zxps0cf5n9gc08an7gwybzz87allx3lsszvllr9ldx4"; - }) - (fetchNuGet { - name = "Microsoft.CodeAnalysis.BannedApiAnalyzers"; - version = "3.3.2"; - sha256 = "1r8mfbpfy8jdinhfviwhv2vjsz950wn2vwz17lfw5kya1n13nj56"; - }) - (fetchNuGet { - name = "Microsoft.CodeAnalysis.Common"; - version = "3.10.0"; - sha256 = "12a7wq45liw89ylnf2b7v374s3m0lbknkx7kazk3bf6nd1b8ny81"; - }) - (fetchNuGet { - name = "Microsoft.CodeAnalysis.CSharp"; - version = "3.10.0"; - sha256 = "0plpvimh9drip1fvic3zfg1gmiw3q8xb85nqjqy1hq140p4him6k"; - }) - (fetchNuGet { - name = "Microsoft.CodeAnalysis.CSharp.Workspaces"; - version = "3.10.0"; - sha256 = "0g12hg6r8h2s99p8a0rx8h71rlmj9aff2hr26fkw7i734n39p070"; - }) - (fetchNuGet { - name = "Microsoft.CodeAnalysis.NetAnalyzers"; - version = "5.0.3"; - sha256 = "1l0zg9wl8yapjq9g2d979zhsmdkr8kfybmxnl7kvgkgldf114fbg"; - }) - (fetchNuGet { - name = "Microsoft.CodeAnalysis.Workspaces.Common"; - version = "3.10.0"; - sha256 = "1hr3ndhb7sw0l63blgp2y0a6d1pgkxah0ls1v7kdxmkdazv35svc"; - }) - (fetchNuGet { - name = "Microsoft.CodeAnalysis.Workspaces.MSBuild"; - version = "3.10.0"; - sha256 = "13h0wza8anac6snkry9fvzd188vnykifzy43ms8x07d40zmqnicd"; - }) - (fetchNuGet { - name = "Microsoft.CSharp"; - version = "4.0.1"; - sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; - }) - (fetchNuGet { - name = "Microsoft.CSharp"; - version = "4.5.0"; - sha256 = "01i28nvzccxbqmiz217fxs6hnjwmd5fafs37rd49a6qp53y6623l"; - }) - (fetchNuGet { - name = "Microsoft.CSharp"; - version = "4.7.0"; - sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; - }) - (fetchNuGet { - name = "Microsoft.Data.Sqlite.Core"; - version = "2.2.6"; - sha256 = "0fx8698k71vzr8pdc6q8bsbzg6r8a42s4hkzmiyv13ibmyb5q68k"; - }) - (fetchNuGet { - name = "Microsoft.Diagnostics.NETCore.Client"; - version = "0.2.221401"; - sha256 = "1k55l60bg8lj5ayl3kixbzvx2684xd7a9nzha5fiqjgp85cimb3r"; - }) - (fetchNuGet { - name = "Microsoft.Diagnostics.Runtime"; - version = "2.0.226801"; - sha256 = "1w8ahqkv8nbq2ch17aa9axhqqnybmc9bsxpdhpiy52ix70mr72w1"; - }) - (fetchNuGet { - name = "Microsoft.DotNet.PlatformAbstractions"; - version = "2.1.0"; - sha256 = "1qydvyyinj3b5mraazjal3n2k7jqhn05b6n1a2f3qjkqkxi63dmy"; - }) - (fetchNuGet { - name = "Microsoft.EntityFrameworkCore"; - version = "2.2.6"; - sha256 = "18j2cr50wsikwv7gy3vrjvmpdxckvv537qma8afdpr3yn2klayh5"; - }) - (fetchNuGet { - name = "Microsoft.EntityFrameworkCore.Abstractions"; - version = "2.2.6"; - sha256 = "1dyxb5ibx24frlgbqy7zch0falq9p1189zvlbxgl94m0hvpml5j3"; - }) - (fetchNuGet { - name = "Microsoft.EntityFrameworkCore.Analyzers"; - version = "2.2.6"; - sha256 = "10f2lxxmh0xrdjvnam31fqfnjkaick23mpfvahj3ca5l07bph0rc"; - }) - (fetchNuGet { - name = "Microsoft.EntityFrameworkCore.Design"; - version = "2.2.6"; - sha256 = "0kjjkh1yfb56wnkmciqzfn9vymqfjap364y5amia0lmqmhfz8g7f"; - }) - (fetchNuGet { - name = "Microsoft.EntityFrameworkCore.Relational"; - version = "2.2.6"; - sha256 = "0c0z4mrqldjfslyxywb2ydk8hn9ybhkvz6lxx3idrfalq3ni5f1z"; - }) - (fetchNuGet { - name = "Microsoft.EntityFrameworkCore.Sqlite"; - version = "2.2.6"; - sha256 = "0z8k5ns841imaqha5abb1ka0rsfzy90k6qkrvix11sp6k9i7lsam"; - }) - (fetchNuGet { - name = "Microsoft.EntityFrameworkCore.Sqlite.Core"; - version = "2.2.6"; - sha256 = "0jzqw4672mzxjvzas09sl0zyzzayfgkv003a7bw5g2gjyiphf630"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.Caching.Abstractions"; - version = "2.2.0"; - sha256 = "0hhxc5dp52faha1bdqw0k426zicsv6x1kfqi30m9agr0b2hixj52"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.Caching.Memory"; - version = "2.2.0"; - sha256 = "0bzrsn5vas86w66bd04xilnlb21nx4l6lz7d3acvy6y8ir2vb5dv"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.Configuration"; - version = "2.2.0"; - sha256 = "02250qrs3jqqbggfvd0mkim82817f79x6jh8fx2i7r58d0m66qkl"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.Configuration.Abstractions"; - version = "2.2.0"; - sha256 = "1fv5277hyhfqmc0gqszyqb1ilwnijm8kc9606yia6hwr8pxyg674"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.Configuration.Abstractions"; - version = "5.0.0"; - sha256 = "0fqxkc9pjxkqylsdf26s9q21ciyk56h1w33pz3v1v4wcv8yv1v6k"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.Configuration.Binder"; - version = "2.2.0"; - sha256 = "10qyjdkymdmag3r807kvbnwag4j3nz65i4cwikbd77jjvz92ya3j"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.DependencyInjection"; - version = "2.2.0"; - sha256 = "0lvv45rvq1xbf47lz818rjydc776zk8mf7svpzh1dml4qwlx9zck"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.DependencyInjection"; - version = "5.0.1"; - sha256 = "06xig49mwyp3b2dvdx98j079ncg6p4c9x8yj4pzs6ppmi3jgaaqk"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.DependencyInjection.Abstractions"; - version = "2.2.0"; - sha256 = "1jyzfdr9651h3x6pxwhpfbb9mysfh8f8z1jvy4g117h9790r9zx5"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.DependencyInjection.Abstractions"; - version = "5.0.0"; - sha256 = "17cz6s80va0ch0a6nqa1wbbbp3p8sqxb96lj4qcw67ivkp2yxiyj"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.DependencyModel"; - version = "2.1.0"; - sha256 = "0dl4qhjgifm6v3jsfzvzkvddyic77ggp9fq49ah661v45gk6ilgd"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.Logging"; - version = "2.2.0"; - sha256 = "0bx3ljyvvcbikradq2h583rl72h8bxdz33aghk026cxzpv2mm3wm"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.Logging"; - version = "5.0.0"; - sha256 = "1qa1l18q2jh9azya8gv1p8anzcdirjzd9dxxisb4911i9m1648i3"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.Logging.Abstractions"; - version = "2.2.0"; - sha256 = "02w7hp6jicr7cl5p456k2cmrjvvhm6spg5kxnlncw3b72358m5wl"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.Logging.Abstractions"; - version = "5.0.0"; - sha256 = "1yza38675dbv1qqnnhqm23alv2bbaqxp0pb7zinjmw8j2mr5r6wc"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.ObjectPool"; - version = "5.0.7"; - sha256 = "047wv490fjizknyhbmxwbbh9fns13pq2inpc9idxq42n2zj3zbij"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.Options"; - version = "2.2.0"; - sha256 = "1b20yh03fg4nmmi3vlf6gf13vrdkmklshfzl3ijygcs4c2hly6v0"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.Options"; - version = "5.0.0"; - sha256 = "1rdmgpg770x8qwaaa6ryc27zh93p697fcyvn5vkxp0wimlhqkbay"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.Primitives"; - version = "2.2.0"; - sha256 = "0znah6arbcqari49ymigg3wiy2hgdifz8zsq8vdc3ynnf45r7h0c"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.Primitives"; - version = "5.0.0"; - sha256 = "0swqcknyh87ns82w539z1mvy804pfwhgzs97cr3nwqk6g5s42gd6"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.Primitives"; - version = "5.0.1"; - sha256 = "01ar5ba2sal9wnpa1xnnikhgb37vzhg2cspz45wf760jflpai2vv"; - }) - (fetchNuGet { - name = "Microsoft.NETCore.App.Runtime.linux-x64"; - version = "5.0.5"; - sha256 = "1h5yry6k9bpqqis2fb1901csb8kipm7anm174fjj41r317vzfjfa"; - }) - (fetchNuGet { - name = "Microsoft.NETCore.Platforms"; - version = "1.0.1"; - sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; - }) - (fetchNuGet { - name = "Microsoft.NETCore.Platforms"; - version = "1.1.0"; - sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; - }) - (fetchNuGet { - name = "Microsoft.NETCore.Platforms"; - version = "2.0.0"; - sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; - }) - (fetchNuGet { - name = "Microsoft.NETCore.Platforms"; - version = "2.1.2"; - sha256 = "1507hnpr9my3z4w1r6xk5n0s1j3y6a2c2cnynj76za7cphxi1141"; - }) - (fetchNuGet { - name = "Microsoft.NETCore.Platforms"; - version = "5.0.0"; - sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; - }) - (fetchNuGet { - name = "Microsoft.NETCore.Targets"; - version = "3.1.0"; - sha256 = "04cc2wl90p7g9zscnxgyj55vzl7srrrjwadl2dxgicfb2x2499ca"; - }) - (fetchNuGet { - name = "Microsoft.NETCore.Targets"; - version = "5.0.0"; - sha256 = "0z3qyv7qal5irvabc8lmkh58zsl42mrzd1i0sssvzhv4q4kl3cg6"; - }) - (fetchNuGet { - name = "Microsoft.Win32.Primitives"; - version = "4.0.1"; - sha256 = "1n8ap0cmljbqskxpf8fjzn7kh1vvlndsa75k01qig26mbw97k2q7"; - }) - (fetchNuGet { - name = "Microsoft.Win32.Primitives"; - version = "4.3.0"; - sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; - }) - (fetchNuGet { - name = "Microsoft.Win32.Registry"; - version = "5.0.0"; - sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; - }) - (fetchNuGet { - name = "MongoDB.Bson"; - version = "2.11.3"; - sha256 = "0fn900i51rwgk3ywpcp4dsf7c9v5glch7hia9l9w8aj8s10qjf1r"; - }) - (fetchNuGet { - name = "Mono.Cecil"; - version = "0.9.6.1"; - sha256 = "1fr7969h5q611l5227xw6nvv5rzap76vbpk0wg9hxbcxk3hn7szf"; - }) - (fetchNuGet { - name = "Mono.Posix.NETStandard"; - version = "1.0.0"; - sha256 = "0xlja36hwpjm837haq15mjh2prcf68lyrmn72nvgpz8qnf9vappw"; - }) - (fetchNuGet { - name = "NETStandard.Library"; - version = "1.6.0"; - sha256 = "0nmmv4yw7gw04ik8ialj3ak0j6pxa9spih67hnn1h2c38ba8h58k"; - }) - (fetchNuGet { - name = "NETStandard.Library"; - version = "1.6.1"; - sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; - }) - (fetchNuGet { - name = "NETStandard.Library"; - version = "2.0.0"; - sha256 = "1bc4ba8ahgk15m8k4nd7x406nhi0kwqzbgjk2dmw52ss553xz7iy"; - }) - (fetchNuGet { - name = "Newtonsoft.Json"; - version = "12.0.2"; - sha256 = "0w2fbji1smd2y7x25qqibf1qrznmv4s6s0jvrbvr6alb7mfyqvh5"; - }) - (fetchNuGet { - name = "Newtonsoft.Json"; - version = "13.0.1"; - sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; - }) - (fetchNuGet { - name = "Newtonsoft.Json"; - version = "9.0.1"; - sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; - }) - (fetchNuGet { - name = "NuGet.Common"; - version = "5.10.0"; - sha256 = "0qy6blgppgvxpfcricmvva3qzddk18dza5vy851jrbqshvf9g7kx"; - }) - (fetchNuGet { - name = "NuGet.Configuration"; - version = "5.10.0"; - sha256 = "0xb1n94lrwa6k83i9xcsq68202086p2gj74gzlbhlvb8c2pw6lbb"; - }) - (fetchNuGet { - name = "NuGet.DependencyResolver.Core"; - version = "5.10.0"; - sha256 = "0dhhclm281ihpfsjzxw34l6zlw49nwzyjiynkmsbcj9icfkp3y4r"; - }) - (fetchNuGet { - name = "NuGet.Frameworks"; - version = "5.10.0"; - sha256 = "0gb6n8rg2jpjp52icgpb3wjdfs3qllh5vbcz8hbcix3l7dncy3v2"; - }) - (fetchNuGet { - name = "NuGet.LibraryModel"; - version = "5.10.0"; - sha256 = "0b6mmq2mqfr06ypc772dmcd8bz55gkyfrgn0j3nrgkcdww4fzf9q"; - }) - (fetchNuGet { - name = "NuGet.Packaging"; - version = "5.10.0"; - sha256 = "11g0v061axhp0nisclq5cm2mc92d69z92giz9l40ih478c5nishw"; - }) - (fetchNuGet { - name = "NuGet.ProjectModel"; - version = "5.10.0"; - sha256 = "1cqg319n986wciskrqsfawfhqp1d7a7i2qjd0qplpckyw8msng2i"; - }) - (fetchNuGet { - name = "NuGet.Protocol"; - version = "5.10.0"; - sha256 = "0cs9qp169zx6g2w5bzrlhxv0q1i8mb8dxlb2nkiq7pkvah86rxkc"; - }) - (fetchNuGet { - name = "NuGet.Versioning"; - version = "5.10.0"; - sha256 = "10vvw6vjpx0c26rlxh7dnpyp4prahn25717ccd8bzkjmyzhm90cs"; - }) - (fetchNuGet { - name = "NUnit"; - version = "3.13.2"; - sha256 = "00bkjgarkwbj497da9d7lajala1ns67h1kx53w4bapwkf32jlcvn"; - }) - (fetchNuGet { - name = "OpenTabletDriver"; - version = "0.5.3.1"; - sha256 = "16xw8w943x9gvnnpbryahff5azzy8n26j2igyqgv88m352jd9rb8"; - }) - (fetchNuGet { - name = "OpenTabletDriver.Plugin"; - version = "0.5.3.1"; - sha256 = "17dxsvcz9g8kzydk5xlfz9kfxl62x9wi20609rh76wjd881bg1br"; - }) - (fetchNuGet { - name = "ppy.LocalisationAnalyser"; - version = "2021.716.0"; - sha256 = "0w45af0mlh4bkjxxhk5p4kb6z0na8fmm6xz10dfzs3b4i61h5x3z"; - }) - (fetchNuGet { - name = "ppy.osu.Framework"; - version = "2021.714.0"; - sha256 = "175i0hcbl01xy633zvij8185nj4g7ja1rsv2lmfz8qdykqj6g9kl"; - }) - (fetchNuGet { - name = "ppy.osu.Framework.NativeLibs"; - version = "2021.115.0"; - sha256 = "00cxrnc78wb8l7d4x7m39g73y85kbgnsnx3qdvv0a9p77lf7lx7z"; - }) - (fetchNuGet { - name = "ppy.osu.Game.Resources"; - version = "2021.706.0"; - sha256 = "1yacqy8h93vph3faf4y0iwhlnlmbny3zj57cm2bh04z2gk0l17am"; - }) - (fetchNuGet { - name = "ppy.osuTK.NS20"; - version = "1.0.173"; - sha256 = "11rrxakrgq5lriv09qlz26189nyc9lh0fjidn5h70labyp2gpa4y"; - }) - (fetchNuGet { - name = "ppy.SDL2-CS"; - version = "1.0.238-alpha"; - sha256 = "1n7pa7gy1hcgsfm3jix334qr6v229n1yymq58njj802l3k5g7980"; - }) - (fetchNuGet { - name = "ppy.squirrel.windows"; - version = "1.9.0.5"; - sha256 = "0nmhrg3q6izapfpwdslq80fqkvjj12ad9r94pd0nr2xx1zw0x1zl"; - }) - (fetchNuGet { - name = "Realm"; - version = "10.3.0"; - sha256 = "12zmp43cf2kilzq1yi9x2hy1jdh51c0kbnddw5s960k1kvyx2s2v"; - }) - (fetchNuGet { - name = "Realm.Fody"; - version = "10.3.0"; - sha256 = "0mhjkahi2ldxcizv08i70mrpwgrvljxdjlr81x3dmwgpxxfji18d"; - }) - (fetchNuGet { - name = "Remotion.Linq"; - version = "2.2.0"; - sha256 = "1y46ni0xswmmiryp8sydjgryafwn458dr91f9xn653w73kdyk4xf"; - }) - (fetchNuGet { - name = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; - }) - (fetchNuGet { - name = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; - }) - (fetchNuGet { - name = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; - }) - (fetchNuGet { - name = "runtime.native.System"; - version = "4.0.0"; - sha256 = "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf"; - }) - (fetchNuGet { - name = "runtime.native.System"; - version = "4.3.0"; - sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; - }) - (fetchNuGet { - name = "runtime.native.System.IO.Compression"; - version = "4.1.0"; - sha256 = "0d720z4lzyfcabmmnvh0bnj76ll7djhji2hmfh3h44sdkjnlkknk"; - }) - (fetchNuGet { - name = "runtime.native.System.IO.Compression"; - version = "4.3.0"; - sha256 = "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"; - }) - (fetchNuGet { - name = "runtime.native.System.Net.Http"; - version = "4.0.1"; - sha256 = "1hgv2bmbaskx77v8glh7waxws973jn4ah35zysnkxmf0196sfxg6"; - }) - (fetchNuGet { - name = "runtime.native.System.Net.Http"; - version = "4.3.0"; - sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; - }) - (fetchNuGet { - name = "runtime.native.System.Security.Cryptography"; - version = "4.0.0"; - sha256 = "0k57aa2c3b10wl3hfqbgrl7xq7g8hh3a3ir44b31dn5p61iiw3z9"; - }) - (fetchNuGet { - name = "runtime.native.System.Security.Cryptography.Apple"; - version = "4.3.0"; - sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; - }) - (fetchNuGet { - name = "runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; - }) - (fetchNuGet { - name = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; - }) - (fetchNuGet { - name = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; - }) - (fetchNuGet { - name = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; - version = "4.3.0"; - sha256 = "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi"; - }) - (fetchNuGet { - name = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; - }) - (fetchNuGet { - name = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; - }) - (fetchNuGet { - name = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; - }) - (fetchNuGet { - name = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; - }) - (fetchNuGet { - name = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; - }) - (fetchNuGet { - name = "Sentry"; - version = "3.6.0"; - sha256 = "1yjz3m8chg796izrdd9vlxvka60rmv6cmsxpnrv9llmsss2mqssz"; - }) - (fetchNuGet { - name = "SharpCompress"; - version = "0.17.1"; - sha256 = "1ffiacghbcnr3fkgvdcad7b1nky54nhmmn2sm43sks9zm8grvva4"; - }) - (fetchNuGet { - name = "SharpCompress"; - version = "0.28.3"; - sha256 = "1svymm2vyg3815p3sbwjdk563mz0a4ag1sr30pm0ki01brqpaaas"; - }) - (fetchNuGet { - name = "SharpFNT"; - version = "2.0.0"; - sha256 = "1bgacgh9hbck0qvji6frbb50sdiqfdng2fvvfgfw8b9qaql91mx0"; - }) - (fetchNuGet { - name = "SixLabors.ImageSharp"; - version = "1.0.3"; - sha256 = "1y43zvhjgi9rhylc8451784hhdi5b551hf7fsa6187b83wgxc47g"; - }) - (fetchNuGet { - name = "Splat"; - version = "1.6.2"; - sha256 = "154w9q0z8697rcpqs4x233crx5ap1z4pl4xc21hsd3csbhw13ykf"; - }) - (fetchNuGet { - name = "SQLitePCLRaw.bundle_green"; - version = "1.1.12"; - sha256 = "0jbyd25ag15fyn9nawjikv0v5ylk2zh5pxgr6gm4kpbpqys86sq9"; - }) - (fetchNuGet { - name = "SQLitePCLRaw.core"; - version = "1.1.12"; - sha256 = "03gflsn2wl6v0a8zvh6y5xdhx0xxmfrn6jfldiy829x3fx74zgdl"; - }) - (fetchNuGet { - name = "SQLitePCLRaw.lib.e_sqlite3.linux"; - version = "1.1.12"; - sha256 = "10mlq914d3zggdjf4bv27w6jx0gqqjf6f91y5ri6pbvaqyhi28h5"; - }) - (fetchNuGet { - name = "SQLitePCLRaw.lib.e_sqlite3.osx"; - version = "1.1.12"; - sha256 = "1hixg6n9sqllfrcihj145lh1l38inv827808difvazd4zr3mi0z1"; - }) - (fetchNuGet { - name = "SQLitePCLRaw.lib.e_sqlite3.v110_xp"; - version = "1.1.12"; - sha256 = "107sivk5p38dg1kyvqrxgp67dj89s8l6brf9l52k6s4vrn4hrrk7"; - }) - (fetchNuGet { - name = "SQLitePCLRaw.provider.e_sqlite3.netstandard11"; - version = "1.1.12"; - sha256 = "0qr2d7ka6f5c7bybdhiyq7nl90c9575szmi0nfpknd9c0w024if4"; - }) - (fetchNuGet { - name = "StbiSharp"; - version = "1.0.13"; - sha256 = "0yaspwlh4x93d7xnqj5w5pxlwzlv9lixvksyvdh176krfa4mjw3q"; - }) - (fetchNuGet { - name = "System.AppContext"; - version = "4.1.0"; - sha256 = "0fv3cma1jp4vgj7a8hqc9n7hr1f1kjp541s6z0q1r6nazb4iz9mz"; - }) - (fetchNuGet { - name = "System.AppContext"; - version = "4.3.0"; - sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; - }) - (fetchNuGet { - name = "System.Buffers"; - version = "4.0.0"; - sha256 = "13s659bcmg9nwb6z78971z1lr6bmh2wghxi1ayqyzl4jijd351gr"; - }) - (fetchNuGet { - name = "System.Buffers"; - version = "4.3.0"; - sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; - }) - (fetchNuGet { - name = "System.Buffers"; - version = "4.4.0"; - sha256 = "183f8063w8zqn99pv0ni0nnwh7fgx46qzxamwnans55hhs2l0g19"; - }) - (fetchNuGet { - name = "System.Buffers"; - version = "4.5.1"; - sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; - }) - (fetchNuGet { - name = "System.CodeDom"; - version = "4.5.0"; - sha256 = "1js3h3ig0zwyynl1q88siynp8ra0gz0pfq1wmvls6ji83jrxsami"; - }) - (fetchNuGet { - name = "System.Collections"; - version = "4.0.11"; - sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; - }) - (fetchNuGet { - name = "System.Collections"; - version = "4.3.0"; - sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; - }) - (fetchNuGet { - name = "System.Collections.Concurrent"; - version = "4.0.12"; - sha256 = "07y08kvrzpak873pmyxs129g1ch8l27zmg51pcyj2jvq03n0r0fc"; - }) - (fetchNuGet { - name = "System.Collections.Concurrent"; - version = "4.3.0"; - sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; - }) - (fetchNuGet { - name = "System.Collections.Immutable"; - version = "1.5.0"; - sha256 = "1d5gjn5afnrf461jlxzawcvihz195gayqpcfbv6dd7pxa9ialn06"; - }) - (fetchNuGet { - name = "System.Collections.Immutable"; - version = "5.0.0"; - sha256 = "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r"; - }) - (fetchNuGet { - name = "System.ComponentModel.Annotations"; - version = "4.5.0"; - sha256 = "1jj6f6g87k0iwsgmg3xmnn67a14mq88np0l1ys5zkxhkvbc8976p"; - }) - (fetchNuGet { - name = "System.ComponentModel.Annotations"; - version = "5.0.0"; - sha256 = "021h7x98lblq9avm1bgpa4i31c2kgsa7zn4sqhxf39g087ar756j"; - }) - (fetchNuGet { - name = "System.Composition"; - version = "1.0.31"; - sha256 = "0aa27jz73qb0xm6dyxv22qhfrmyyqjyn2dvvsd9asi82lcdh9i61"; - }) - (fetchNuGet { - name = "System.Composition.AttributedModel"; - version = "1.0.31"; - sha256 = "1ipyb86hvw754kmk47vjmzyilvj5hymg9nqabz70sbgsz1fygrdv"; - }) - (fetchNuGet { - name = "System.Composition.Convention"; - version = "1.0.31"; - sha256 = "00gqcdrql7vhynxh4xq0s9j5nw27kghmn2n773v7lhzjh3ash18r"; - }) - (fetchNuGet { - name = "System.Composition.Hosting"; - version = "1.0.31"; - sha256 = "1f1bnk3j7ndx9r7zpzibmrhw78clys1pspl20j2dhnmkiwhl23vy"; - }) - (fetchNuGet { - name = "System.Composition.Runtime"; - version = "1.0.31"; - sha256 = "1shfybfzsn4g6aim4pggb5ha31g0fz2kkk0519c4vj6m166g39ws"; - }) - (fetchNuGet { - name = "System.Composition.TypedParts"; - version = "1.0.31"; - sha256 = "1m4j19zx50lbbdx1xxbgpsd1dai2r3kzkyapw47kdvkb89qjkl63"; - }) - (fetchNuGet { - name = "System.Console"; - version = "4.0.0"; - sha256 = "0ynxqbc3z1nwbrc11hkkpw9skw116z4y9wjzn7id49p9yi7mzmlf"; - }) - (fetchNuGet { - name = "System.Console"; - version = "4.3.0"; - sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; - }) - (fetchNuGet { - name = "System.Diagnostics.Debug"; - version = "4.0.11"; - sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; - }) - (fetchNuGet { - name = "System.Diagnostics.Debug"; - version = "4.3.0"; - sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; - }) - (fetchNuGet { - name = "System.Diagnostics.DiagnosticSource"; - version = "4.0.0"; - sha256 = "1n6c3fbz7v8d3pn77h4v5wvsfrfg7v1c57lg3nff3cjyh597v23m"; - }) - (fetchNuGet { - name = "System.Diagnostics.DiagnosticSource"; - version = "4.3.0"; - sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; - }) - (fetchNuGet { - name = "System.Diagnostics.DiagnosticSource"; - version = "4.5.0"; - sha256 = "1y8m0p3127nak5yspapfnz25qc9x53gqpvwr3hdpsvrcd2r1pgyj"; - }) - (fetchNuGet { - name = "System.Diagnostics.DiagnosticSource"; - version = "5.0.0"; - sha256 = "0phd2qizshjvglhzws1jd0cq4m54gscz4ychzr3x6wbgl4vvfrga"; - }) - (fetchNuGet { - name = "System.Diagnostics.Tools"; - version = "4.0.1"; - sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; - }) - (fetchNuGet { - name = "System.Diagnostics.Tools"; - version = "4.3.0"; - sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; - }) - (fetchNuGet { - name = "System.Diagnostics.Tracing"; - version = "4.1.0"; - sha256 = "1d2r76v1x610x61ahfpigda89gd13qydz6vbwzhpqlyvq8jj6394"; - }) - (fetchNuGet { - name = "System.Diagnostics.Tracing"; - version = "4.3.0"; - sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; - }) - (fetchNuGet { - name = "System.Dynamic.Runtime"; - version = "4.0.11"; - sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; - }) - (fetchNuGet { - name = "System.Dynamic.Runtime"; - version = "4.3.0"; - sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; - }) - (fetchNuGet { - name = "System.Formats.Asn1"; - version = "5.0.0"; - sha256 = "1axc8z0839yvqi2cb63l73l6d9j6wd20lsbdymwddz9hvrsgfwpn"; - }) - (fetchNuGet { - name = "System.Globalization"; - version = "4.0.11"; - sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; - }) - (fetchNuGet { - name = "System.Globalization"; - version = "4.3.0"; - sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; - }) - (fetchNuGet { - name = "System.Globalization.Calendars"; - version = "4.0.1"; - sha256 = "0bv0alrm2ck2zk3rz25lfyk9h42f3ywq77mx1syl6vvyncnpg4qh"; - }) - (fetchNuGet { - name = "System.Globalization.Calendars"; - version = "4.3.0"; - sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; - }) - (fetchNuGet { - name = "System.Globalization.Extensions"; - version = "4.0.1"; - sha256 = "0hjhdb5ri8z9l93bw04s7ynwrjrhx2n0p34sf33a9hl9phz69fyc"; - }) - (fetchNuGet { - name = "System.Globalization.Extensions"; - version = "4.3.0"; - sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; - }) - (fetchNuGet { - name = "System.Interactive.Async"; - version = "3.2.0"; - sha256 = "0y5r5y7dlccjpgg17rjrrzi3jya4ysyydamxs33qckkv4jb3534d"; - }) - (fetchNuGet { - name = "System.IO"; - version = "4.1.0"; - sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; - }) - (fetchNuGet { - name = "System.IO"; - version = "4.3.0"; - sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; - }) - (fetchNuGet { - name = "System.IO.Compression"; - version = "4.1.0"; - sha256 = "0iym7s3jkl8n0vzm3jd6xqg9zjjjqni05x45dwxyjr2dy88hlgji"; - }) - (fetchNuGet { - name = "System.IO.Compression"; - version = "4.3.0"; - sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"; - }) - (fetchNuGet { - name = "System.IO.Compression.ZipFile"; - version = "4.0.1"; - sha256 = "0h72znbagmgvswzr46mihn7xm7chfk2fhrp5krzkjf29pz0i6z82"; - }) - (fetchNuGet { - name = "System.IO.Compression.ZipFile"; - version = "4.3.0"; - sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"; - }) - (fetchNuGet { - name = "System.IO.FileSystem"; - version = "4.0.1"; - sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; - }) - (fetchNuGet { - name = "System.IO.FileSystem"; - version = "4.3.0"; - sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; - }) - (fetchNuGet { - name = "System.IO.FileSystem.Primitives"; - version = "4.0.1"; - sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; - }) - (fetchNuGet { - name = "System.IO.FileSystem.Primitives"; - version = "4.3.0"; - sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; - }) - (fetchNuGet { - name = "System.IO.Packaging"; - version = "5.0.0"; - sha256 = "08l85pi8jy65las973szqdnir2awxp0r16h21c0bgrz19gxhs11n"; - }) - (fetchNuGet { - name = "System.IO.Pipelines"; - version = "5.0.1"; - sha256 = "1zvfcd2l1d5qxifsqd0cjyv57nr61a9ac2ca5jinyqmj32wgjd6v"; - }) - (fetchNuGet { - name = "System.Linq"; - version = "4.1.0"; - sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; - }) - (fetchNuGet { - name = "System.Linq"; - version = "4.3.0"; - sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; - }) - (fetchNuGet { - name = "System.Linq.Expressions"; - version = "4.1.0"; - sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; - }) - (fetchNuGet { - name = "System.Linq.Expressions"; - version = "4.3.0"; - sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; - }) - (fetchNuGet { - name = "System.Linq.Queryable"; - version = "4.0.1"; - sha256 = "11jn9k34g245yyf260gr3ldzvaqa9477w2c5nhb1p8vjx4xm3qaw"; - }) - (fetchNuGet { - name = "System.Management"; - version = "4.5.0"; - sha256 = "19z5x23n21xi94bgl531l9hrm64nyw9d5fpd7klfvr5xfsbh9jwr"; - }) - (fetchNuGet { - name = "System.Memory"; - version = "4.5.1"; - sha256 = "0f07d7hny38lq9w69wx4lxkn4wszrqf9m9js6fh9is645csm167c"; - }) - (fetchNuGet { - name = "System.Memory"; - version = "4.5.3"; - sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; - }) - (fetchNuGet { - name = "System.Memory"; - version = "4.5.4"; - sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; - }) - (fetchNuGet { - name = "System.Net.Http"; - version = "4.1.0"; - sha256 = "1i5rqij1icg05j8rrkw4gd4pgia1978mqhjzhsjg69lvwcdfg8yb"; - }) - (fetchNuGet { - name = "System.Net.Http"; - version = "4.3.0"; - sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; - }) - (fetchNuGet { - name = "System.Net.Primitives"; - version = "4.0.11"; - sha256 = "10xzzaynkzkakp7jai1ik3r805zrqjxiz7vcagchyxs2v26a516r"; - }) - (fetchNuGet { - name = "System.Net.Primitives"; - version = "4.3.0"; - sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; - }) - (fetchNuGet { - name = "System.Net.Sockets"; - version = "4.1.0"; - sha256 = "1385fvh8h29da5hh58jm1v78fzi9fi5vj93vhlm2kvqpfahvpqls"; - }) - (fetchNuGet { - name = "System.Net.Sockets"; - version = "4.3.0"; - sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; - }) - (fetchNuGet { - name = "System.Numerics.Vectors"; - version = "4.4.0"; - sha256 = "0rdvma399070b0i46c4qq1h2yvjj3k013sqzkilz4bz5cwmx1rba"; - }) - (fetchNuGet { - name = "System.Numerics.Vectors"; - version = "4.5.0"; - sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; - }) - (fetchNuGet { - name = "System.ObjectModel"; - version = "4.0.12"; - sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; - }) - (fetchNuGet { - name = "System.ObjectModel"; - version = "4.3.0"; - sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; - }) - (fetchNuGet { - name = "System.Reflection"; - version = "4.1.0"; - sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; - }) - (fetchNuGet { - name = "System.Reflection"; - version = "4.3.0"; - sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; - }) - (fetchNuGet { - name = "System.Reflection.Emit"; - version = "4.0.1"; - sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; - }) - (fetchNuGet { - name = "System.Reflection.Emit"; - version = "4.3.0"; - sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; - }) - (fetchNuGet { - name = "System.Reflection.Emit"; - version = "4.6.0"; - sha256 = "18h375q5bn9h7swxnk4krrxym1dxmi9bm26p89xps9ygrj4q6zqw"; - }) - (fetchNuGet { - name = "System.Reflection.Emit"; - version = "4.7.0"; - sha256 = "121l1z2ypwg02yz84dy6gr82phpys0njk7yask3sihgy214w43qp"; - }) - (fetchNuGet { - name = "System.Reflection.Emit.ILGeneration"; - version = "4.0.1"; - sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0"; - }) - (fetchNuGet { - name = "System.Reflection.Emit.ILGeneration"; - version = "4.3.0"; - sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; - }) - (fetchNuGet { - name = "System.Reflection.Emit.Lightweight"; - version = "4.0.1"; - sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr"; - }) - (fetchNuGet { - name = "System.Reflection.Emit.Lightweight"; - version = "4.3.0"; - sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; - }) - (fetchNuGet { - name = "System.Reflection.Emit.Lightweight"; - version = "4.6.0"; - sha256 = "0hry2k6b7kicg4zxnq0hhn0ys52711pxy7l9v5sp7gvp9cicwpgp"; - }) - (fetchNuGet { - name = "System.Reflection.Extensions"; - version = "4.0.1"; - sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; - }) - (fetchNuGet { - name = "System.Reflection.Extensions"; - version = "4.3.0"; - sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; - }) - (fetchNuGet { - name = "System.Reflection.Metadata"; - version = "5.0.0"; - sha256 = "17qsl5nanlqk9iz0l5wijdn6ka632fs1m1fvx18dfgswm258r3ss"; - }) - (fetchNuGet { - name = "System.Reflection.Primitives"; - version = "4.0.1"; - sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; - }) - (fetchNuGet { - name = "System.Reflection.Primitives"; - version = "4.3.0"; - sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; - }) - (fetchNuGet { - name = "System.Reflection.TypeExtensions"; - version = "4.1.0"; - sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; - }) - (fetchNuGet { - name = "System.Reflection.TypeExtensions"; - version = "4.3.0"; - sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; - }) - (fetchNuGet { - name = "System.Resources.ResourceManager"; - version = "4.0.1"; - sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; - }) - (fetchNuGet { - name = "System.Resources.ResourceManager"; - version = "4.3.0"; - sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; - }) - (fetchNuGet { - name = "System.Runtime"; - version = "4.1.0"; - sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; - }) - (fetchNuGet { - name = "System.Runtime"; - version = "4.3.0"; - sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; - }) - (fetchNuGet { - name = "System.Runtime.CompilerServices.Unsafe"; - version = "4.5.1"; - sha256 = "1xcrjx5fwg284qdnxyi2d0lzdm5q4frlpkp0nf6vvkx1kdz2prrf"; - }) - (fetchNuGet { - name = "System.Runtime.CompilerServices.Unsafe"; - version = "4.5.2"; - sha256 = "1vz4275fjij8inf31np78hw50al8nqkngk04p3xv5n4fcmf1grgi"; - }) - (fetchNuGet { - name = "System.Runtime.CompilerServices.Unsafe"; - version = "4.5.3"; - sha256 = "1afi6s2r1mh1kygbjmfba6l4f87pi5sg13p4a48idqafli94qxln"; - }) - (fetchNuGet { - name = "System.Runtime.CompilerServices.Unsafe"; - version = "5.0.0"; - sha256 = "02k25ivn50dmqx5jn8hawwmz24yf0454fjd823qk6lygj9513q4x"; - }) - (fetchNuGet { - name = "System.Runtime.Extensions"; - version = "4.1.0"; - sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; - }) - (fetchNuGet { - name = "System.Runtime.Extensions"; - version = "4.3.0"; - sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; - }) - (fetchNuGet { - name = "System.Runtime.Handles"; - version = "4.0.1"; - sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; - }) - (fetchNuGet { - name = "System.Runtime.Handles"; - version = "4.3.0"; - sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; - }) - (fetchNuGet { - name = "System.Runtime.InteropServices"; - version = "4.1.0"; - sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; - }) - (fetchNuGet { - name = "System.Runtime.InteropServices"; - version = "4.3.0"; - sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; - }) - (fetchNuGet { - name = "System.Runtime.InteropServices.RuntimeInformation"; - version = "4.0.0"; - sha256 = "0glmvarf3jz5xh22iy3w9v3wyragcm4hfdr17v90vs7vcrm7fgp6"; - }) - (fetchNuGet { - name = "System.Runtime.InteropServices.RuntimeInformation"; - version = "4.3.0"; - sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; - }) - (fetchNuGet { - name = "System.Runtime.Numerics"; - version = "4.0.1"; - sha256 = "1y308zfvy0l5nrn46mqqr4wb4z1xk758pkk8svbz8b5ij7jnv4nn"; - }) - (fetchNuGet { - name = "System.Runtime.Numerics"; - version = "4.3.0"; - sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; - }) - (fetchNuGet { - name = "System.Runtime.Serialization.Primitives"; - version = "4.1.1"; - sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; - }) - (fetchNuGet { - name = "System.Security.AccessControl"; - version = "5.0.0"; - sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r"; - }) - (fetchNuGet { - name = "System.Security.Cryptography.Algorithms"; - version = "4.2.0"; - sha256 = "148s9g5dgm33ri7dnh19s4lgnlxbpwvrw2jnzllq2kijj4i4vs85"; - }) - (fetchNuGet { - name = "System.Security.Cryptography.Algorithms"; - version = "4.3.0"; - sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; - }) - (fetchNuGet { - name = "System.Security.Cryptography.Cng"; - version = "4.2.0"; - sha256 = "118jijz446kix20blxip0f0q8mhsh9bz118mwc2ch1p6g7facpzc"; - }) - (fetchNuGet { - name = "System.Security.Cryptography.Cng"; - version = "4.3.0"; - sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; - }) - (fetchNuGet { - name = "System.Security.Cryptography.Cng"; - version = "5.0.0"; - sha256 = "06hkx2za8jifpslkh491dfwzm5dxrsyxzj5lsc0achb6yzg4zqlw"; - }) - (fetchNuGet { - name = "System.Security.Cryptography.Csp"; - version = "4.0.0"; - sha256 = "1cwv8lqj8r15q81d2pz2jwzzbaji0l28xfrpw29kdpsaypm92z2q"; - }) - (fetchNuGet { - name = "System.Security.Cryptography.Csp"; - version = "4.3.0"; - sha256 = "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"; - }) - (fetchNuGet { - name = "System.Security.Cryptography.Encoding"; - version = "4.0.0"; - sha256 = "0a8y1a5wkmpawc787gfmnrnbzdgxmx1a14ax43jf3rj9gxmy3vk4"; - }) - (fetchNuGet { - name = "System.Security.Cryptography.Encoding"; - version = "4.3.0"; - sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; - }) - (fetchNuGet { - name = "System.Security.Cryptography.OpenSsl"; - version = "4.0.0"; - sha256 = "16sx3cig3d0ilvzl8xxgffmxbiqx87zdi8fc73i3i7zjih1a7f4q"; - }) - (fetchNuGet { - name = "System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; - }) - (fetchNuGet { - name = "System.Security.Cryptography.Pkcs"; - version = "5.0.0"; - sha256 = "0hb2mndac3xrw3786bsjxjfh19bwnr991qib54k6wsqjhjyyvbwj"; - }) - (fetchNuGet { - name = "System.Security.Cryptography.Primitives"; - version = "4.0.0"; - sha256 = "0i7cfnwph9a10bm26m538h5xcr8b36jscp9sy1zhgifksxz4yixh"; - }) - (fetchNuGet { - name = "System.Security.Cryptography.Primitives"; - version = "4.3.0"; - sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; - }) - (fetchNuGet { - name = "System.Security.Cryptography.ProtectedData"; - version = "4.4.0"; - sha256 = "1q8ljvqhasyynp94a1d7jknk946m20lkwy2c3wa8zw2pc517fbj6"; - }) - (fetchNuGet { - name = "System.Security.Cryptography.X509Certificates"; - version = "4.1.0"; - sha256 = "0clg1bv55mfv5dq00m19cp634zx6inm31kf8ppbq1jgyjf2185dh"; - }) - (fetchNuGet { - name = "System.Security.Cryptography.X509Certificates"; - version = "4.3.0"; - sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; - }) - (fetchNuGet { - name = "System.Security.Principal.Windows"; - version = "5.0.0"; - sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; - }) - (fetchNuGet { - name = "System.Text.Encoding"; - version = "4.0.11"; - sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; - }) - (fetchNuGet { - name = "System.Text.Encoding"; - version = "4.3.0"; - sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; - }) - (fetchNuGet { - name = "System.Text.Encoding.CodePages"; - version = "4.5.1"; - sha256 = "1z21qyfs6sg76rp68qdx0c9iy57naan89pg7p6i3qpj8kyzn921w"; - }) - (fetchNuGet { - name = "System.Text.Encoding.CodePages"; - version = "5.0.0"; - sha256 = "1bn2pzaaq4wx9ixirr8151vm5hynn3lmrljcgjx9yghmm4k677k0"; - }) - (fetchNuGet { - name = "System.Text.Encoding.Extensions"; - version = "4.0.11"; - sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; - }) - (fetchNuGet { - name = "System.Text.Encoding.Extensions"; - version = "4.3.0"; - sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; - }) - (fetchNuGet { - name = "System.Text.Encodings.Web"; - version = "5.0.1"; - sha256 = "00yg63qnp94q2qryxxggzigi276bibb8b3b96gcvsyrxy7b703n9"; - }) - (fetchNuGet { - name = "System.Text.Json"; - version = "4.7.0"; - sha256 = "0fp3xrysccm5dkaac4yb51d793vywxks978kkl5x4db9gw29rfdr"; - }) - (fetchNuGet { - name = "System.Text.Json"; - version = "5.0.2"; - sha256 = "0vd0wd29cdhgcjngl9sw391sn2s8xm974y15zvym0whsdgjwiqfx"; - }) - (fetchNuGet { - name = "System.Text.RegularExpressions"; - version = "4.1.0"; - sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; - }) - (fetchNuGet { - name = "System.Text.RegularExpressions"; - version = "4.3.0"; - sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; - }) - (fetchNuGet { - name = "System.Threading"; - version = "4.0.11"; - sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; - }) - (fetchNuGet { - name = "System.Threading"; - version = "4.3.0"; - sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; - }) - (fetchNuGet { - name = "System.Threading.Channels"; - version = "5.0.0"; - sha256 = "11z28x3cawry60l5phkqrvavm0mshz84n4c79hrz0p65lq8jpxgs"; - }) - (fetchNuGet { - name = "System.Threading.Tasks"; - version = "4.0.11"; - sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; - }) - (fetchNuGet { - name = "System.Threading.Tasks"; - version = "4.3.0"; - sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; - }) - (fetchNuGet { - name = "System.Threading.Tasks.Extensions"; - version = "4.0.0"; - sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; - }) - (fetchNuGet { - name = "System.Threading.Tasks.Extensions"; - version = "4.3.0"; - sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; - }) - (fetchNuGet { - name = "System.Threading.Tasks.Extensions"; - version = "4.5.2"; - sha256 = "1sh63dz0dymqcwmprp0nadm77b83vmm7lyllpv578c397bslb8hj"; - }) - (fetchNuGet { - name = "System.Threading.Tasks.Extensions"; - version = "4.5.3"; - sha256 = "0g7r6hm572ax8v28axrdxz1gnsblg6kszq17g51pj14a5rn2af7i"; - }) - (fetchNuGet { - name = "System.Threading.Tasks.Extensions"; - version = "4.5.4"; - sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; - }) - (fetchNuGet { - name = "System.Threading.Thread"; - version = "4.0.0"; - sha256 = "1gxxm5fl36pjjpnx1k688dcw8m9l7nmf802nxis6swdaw8k54jzc"; - }) - (fetchNuGet { - name = "System.Threading.Timer"; - version = "4.0.1"; - sha256 = "15n54f1f8nn3mjcjrlzdg6q3520571y012mx7v991x2fvp73lmg6"; - }) - (fetchNuGet { - name = "System.Threading.Timer"; - version = "4.3.0"; - sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; - }) - (fetchNuGet { - name = "System.Xml.ReaderWriter"; - version = "4.0.11"; - sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; - }) - (fetchNuGet { - name = "System.Xml.ReaderWriter"; - version = "4.3.0"; - sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; - }) - (fetchNuGet { - name = "System.Xml.XDocument"; - version = "4.0.11"; - sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; - }) - (fetchNuGet { - name = "System.Xml.XDocument"; - version = "4.3.0"; - sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; - }) + (fetchNuGet { name = "AutoMapper"; version = "10.1.1"; sha256 = "1l1p9g7f7finr8laklbm7h2c45k0swl47iq0ik68js5s6pzvd6f8"; }) + (fetchNuGet { name = "DeltaCompressionDotNet"; version = "2.0.0.0"; sha256 = "0zhj7m3zaf9wcg51385in9qg1xgkvp8yyzgq3r5k4sagm7y68aqy"; }) + (fetchNuGet { name = "DiffPlex"; version = "1.7.0"; sha256 = "09a8hkbx99iwikfl8war629945yv7i8llj9480dbc4kyp6qqlr00"; }) + (fetchNuGet { name = "DiscordRichPresence"; version = "1.0.175"; sha256 = "180sax976327d70qbinv07f65g3w2zbw80n49hckg8wd4rw209vd"; }) + (fetchNuGet { name = "FFmpeg.AutoGen"; version = "4.3.0.1"; sha256 = "0n6x57mnnvcjnrs8zyvy07h5zm4bcfy9gh4n4bvd9fx5ys4pxkvv"; }) + (fetchNuGet { name = "Fody"; version = "6.5.2"; sha256 = "0vq97mkfk5ijinwnhpkm212y69ik6cd5x0n61ssyxmz50q1vp84f"; }) + (fetchNuGet { name = "HidSharpCore"; version = "1.2.1.1"; sha256 = "1zkndglmz0s8rblfhnqcvv90rkq2i7lf4bc380g7z8h1avf2ikll"; }) + (fetchNuGet { name = "HtmlAgilityPack"; version = "1.11.34"; sha256 = "078dad719hkv806qgj1f0hkn7di5zvvm594awfn5bsgb9afq94a7"; }) + (fetchNuGet { name = "Humanizer"; version = "2.11.10"; sha256 = "057pqzvdxsbpnnc5f1xkqg7j3ywp68ggia3w74fgqp0158dm6rdk"; }) + (fetchNuGet { name = "Humanizer.Core"; version = "2.11.10"; sha256 = "0z7kmd5rh1sb6izq0vssk6c2p63n00xglk45s7ga9z18z9aaskxv"; }) + (fetchNuGet { name = "Humanizer.Core"; version = "2.2.0"; sha256 = "08mzg65y9d3zvq16rsmpapcdan71ggq2mpks6k777h3wlm2sh3p5"; }) + (fetchNuGet { name = "Humanizer.Core.af"; version = "2.11.10"; sha256 = "18fiixfvjwn8m1i8z2cz4aqykzylvfdqmmpwc2zcd8sr1a2xm86z"; }) + (fetchNuGet { name = "Humanizer.Core.ar"; version = "2.11.10"; sha256 = "009fpm4jd325izm82ipipsvlwd31824gvskda68bdwi4yqmycz4p"; }) + (fetchNuGet { name = "Humanizer.Core.az"; version = "2.11.10"; sha256 = "144b9diwprabxwgi5a98k5iy95ajq4p7356phdqi2lhzwbz7b6a9"; }) + (fetchNuGet { name = "Humanizer.Core.bg"; version = "2.11.10"; sha256 = "1b9y40gvq2kwnj5wa40f8cbywv79jkajcwknagrgr27sykpfadl2"; }) + (fetchNuGet { name = "Humanizer.Core.bn-BD"; version = "2.11.10"; sha256 = "18pn4jcp36ygcx283l3fi9bs5d7q1a384b72a10g5kl0qckn88ay"; }) + (fetchNuGet { name = "Humanizer.Core.cs"; version = "2.11.10"; sha256 = "03crw1lnzp32v2kcdmllkrsqh07r4ggw9gyc96qw7cv0nk5ch1h8"; }) + (fetchNuGet { name = "Humanizer.Core.da"; version = "2.11.10"; sha256 = "0glby12zra3y3yiq4cwq1m6wjcjl8f21v8ghi6s20r48glm8vzy9"; }) + (fetchNuGet { name = "Humanizer.Core.de"; version = "2.11.10"; sha256 = "0a35xrm1f9p74x0fkr52bw9sd54vdy9d5rnvf565yh8ww43xfk7b"; }) + (fetchNuGet { name = "Humanizer.Core.el"; version = "2.11.10"; sha256 = "0bhwwdx5vc48zikdsbrkghdhwahxxc2lkff0yaa5nxhbhasl84h8"; }) + (fetchNuGet { name = "Humanizer.Core.es"; version = "2.11.10"; sha256 = "07bw07qy8nyzlgxl7l2lxv9f78qmkfppgzx7iyq5ikrcnpvc7i9q"; }) + (fetchNuGet { name = "Humanizer.Core.fa"; version = "2.11.10"; sha256 = "00d4hc1pfmhfkc5wmx9p7i00lgi4r0k6wfcns9kl1syjxv3bs5f2"; }) + (fetchNuGet { name = "Humanizer.Core.fi-FI"; version = "2.11.10"; sha256 = "0z4is7pl5jpi4pfdvd2zvx5mp00bj26d9l9ksqyc0liax8nfzyik"; }) + (fetchNuGet { name = "Humanizer.Core.fr"; version = "2.11.10"; sha256 = "0sybpg6kbbhrnk7gxcdk7ppan89lsfqsdssrg4i1dm8w48wgicap"; }) + (fetchNuGet { name = "Humanizer.Core.fr-BE"; version = "2.11.10"; sha256 = "1s25c86nl9wpsn6fydzwv4rfmdx5sm0vgyd7xhw5344k20gazvhv"; }) + (fetchNuGet { name = "Humanizer.Core.he"; version = "2.11.10"; sha256 = "1nx61qkjd6p9r36dmnm4942khyv35fpdqmb2w69gz6463g4d7z29"; }) + (fetchNuGet { name = "Humanizer.Core.hr"; version = "2.11.10"; sha256 = "02jhcyj72prkqsjxyilv04drm0bknqjh2r893jlbsfi9vjg2zay3"; }) + (fetchNuGet { name = "Humanizer.Core.hu"; version = "2.11.10"; sha256 = "0yb6ly4s1wdyaf96h2dvifqyb575aid6irwl3qx8gcvrs0xpcxdp"; }) + (fetchNuGet { name = "Humanizer.Core.hy"; version = "2.11.10"; sha256 = "0b7vaqldn7ca3xi4gkvkhjk900kw2zwb0m0d20bg45a83zdlx79c"; }) + (fetchNuGet { name = "Humanizer.Core.id"; version = "2.11.10"; sha256 = "1yqxirknwga4j18k7ixwgqxlv20479afanhariy3c5mkwvglsr9b"; }) + (fetchNuGet { name = "Humanizer.Core.it"; version = "2.11.10"; sha256 = "1skwgj5a6kkx3pm9w4f29psch69h1knmwbkdydlmx13h452p1w4l"; }) + (fetchNuGet { name = "Humanizer.Core.ja"; version = "2.11.10"; sha256 = "1wpc3yz9v611dqbw8j5yimk8dpz0rvpnls4rmlnp1m47gavpj8x4"; }) + (fetchNuGet { name = "Humanizer.Core.ko-KR"; version = "2.11.10"; sha256 = "1df0kd7vwdc3inxfkb3wsl1aw3d6vbab99dzh08p4m04g7i2c1a9"; }) + (fetchNuGet { name = "Humanizer.Core.ku"; version = "2.11.10"; sha256 = "17b66xfgwjr0sffx0hw4c6l90h43z7ffylrs26hgav0n110q2nwg"; }) + (fetchNuGet { name = "Humanizer.Core.lv"; version = "2.11.10"; sha256 = "0czxx4b9g0w7agykdl82wds09zasa9y58dmgjm925amlfz4wkyzs"; }) + (fetchNuGet { name = "Humanizer.Core.ms-MY"; version = "2.11.10"; sha256 = "0kix95nbw94fx0dziyz80y59i7ii7d21b63f7f94niarljjq36i3"; }) + (fetchNuGet { name = "Humanizer.Core.mt"; version = "2.11.10"; sha256 = "1rwy6m22pq65gxn86xlr9lv818fp5kb0wz98zxxfljc2iviw1f4p"; }) + (fetchNuGet { name = "Humanizer.Core.nb"; version = "2.11.10"; sha256 = "0ra2cl0avvv4sylha7z76jxnb4pdiqfbpr5m477snr04dsjxd9q9"; }) + (fetchNuGet { name = "Humanizer.Core.nb-NO"; version = "2.11.10"; sha256 = "1qszib03pvmjkrg8za7jjd2vzrs9p4fn2rmy82abnzldkhvifipq"; }) + (fetchNuGet { name = "Humanizer.Core.nl"; version = "2.11.10"; sha256 = "1i9bvy0i2yyasl9mgxiiwrkmfpm2c53d3wwdp9270r6120sxyy63"; }) + (fetchNuGet { name = "Humanizer.Core.pl"; version = "2.11.10"; sha256 = "0kggh4wgcic7wzgxy548n6w61schss2ccf9kz8alqshfi42xifby"; }) + (fetchNuGet { name = "Humanizer.Core.pt"; version = "2.11.10"; sha256 = "09j90s8x1lpvhfiy3syfnj8slkgcacf3xjy3pnkgxa6g4mi4f4bd"; }) + (fetchNuGet { name = "Humanizer.Core.ro"; version = "2.11.10"; sha256 = "1jgidmqfly91v1k22gn687mfql5bz7gjzp1aapi93vq5x635qssy"; }) + (fetchNuGet { name = "Humanizer.Core.ru"; version = "2.11.10"; sha256 = "13mmlh0ibxfyc85xrz3vx4mcg56mkzqql184iwdryq94p0g5ahil"; }) + (fetchNuGet { name = "Humanizer.Core.sk"; version = "2.11.10"; sha256 = "04ja06y5jaz1jwkwn117wx9cib04gpbi0vysn58a8sd5jrxmxai5"; }) + (fetchNuGet { name = "Humanizer.Core.sl"; version = "2.11.10"; sha256 = "05hxk9v3a7fn7s4g9jp5zxk2z6a33b9fkavyb1hjqnl2i37q2wja"; }) + (fetchNuGet { name = "Humanizer.Core.sr"; version = "2.11.10"; sha256 = "0x6l2msimrx72iywa1g0rqklgy209sdwg0r77i2lz0s1rvk5klm5"; }) + (fetchNuGet { name = "Humanizer.Core.sr-Latn"; version = "2.11.10"; sha256 = "01hdyn7mmbyy7f3aglawgnsj3nblcdpqjgzdcvniy73l536mira0"; }) + (fetchNuGet { name = "Humanizer.Core.sv"; version = "2.11.10"; sha256 = "0cbgchivw3d5ndib1zmgzmnymhyvfh9g9f0hijc860g5vaa9fkvh"; }) + (fetchNuGet { name = "Humanizer.Core.th-TH"; version = "2.11.10"; sha256 = "1v7f9x3b04iwhz9lb3ir8az8128nvcw1gi4park5zh3fg0f3mni0"; }) + (fetchNuGet { name = "Humanizer.Core.tr"; version = "2.11.10"; sha256 = "02c4ky0dskxkdrkc7vy8yzmvwjr1wqll1kzx0k21afhlx8xynjd4"; }) + (fetchNuGet { name = "Humanizer.Core.uk"; version = "2.11.10"; sha256 = "0900ilhwj8yvhyzpg1pjr7f5vrl62wp8dsnhk4c2igs20qvnv079"; }) + (fetchNuGet { name = "Humanizer.Core.uz-Cyrl-UZ"; version = "2.11.10"; sha256 = "09b7p2m8y49j49ckrmx2difgyj6y7fm2mwca093j8psxclsykcyr"; }) + (fetchNuGet { name = "Humanizer.Core.uz-Latn-UZ"; version = "2.11.10"; sha256 = "029kvkawqhlln52vpjpvr52dhr18ylk01cgsj2z8lxnqaka0q9hk"; }) + (fetchNuGet { name = "Humanizer.Core.vi"; version = "2.11.10"; sha256 = "0q4d47plsj956ivn82qwyidfxppjr9dp13m8c66aamrvhy4q8ny5"; }) + (fetchNuGet { name = "Humanizer.Core.zh-CN"; version = "2.11.10"; sha256 = "01dy5kf6ai8id77px92ji4kcxjc8haj39ivv55xy1afcg3qiy7mh"; }) + (fetchNuGet { name = "Humanizer.Core.zh-Hans"; version = "2.11.10"; sha256 = "16gcxgw2g6gck3nc2hxzlkbsg7wkfaqsjl87kasibxxh47zdqqv2"; }) + (fetchNuGet { name = "Humanizer.Core.zh-Hant"; version = "2.11.10"; sha256 = "1rjg2xvkwjjw3c7z9mdjjvbnl9lcvvhh4fr7l61rla2ynzdk46cj"; }) + (fetchNuGet { name = "JetBrains.Annotations"; version = "2021.1.0"; sha256 = "07pnhxxlgx8spmwmakz37nmbvgyb6yjrbrhad5rrn6y767z5r1gb"; }) + (fetchNuGet { name = "ManagedBass"; version = "2.0.4"; sha256 = "13hwd0yany4j52abbaaqsgq8lag2w9vjxxsj4qfbgwp4qs39x003"; }) + (fetchNuGet { name = "ManagedBass.Fx"; version = "2.0.1"; sha256 = "1rbjpgpm0ri7l2gqdy691rsv3visna2nbxawgvhdqljw068r8a8d"; }) + (fetchNuGet { name = "managed-midi"; version = "1.9.14"; sha256 = "025jh146zy98699y4civ7nxlkx312lwkl4sr8pha626q7q1kg89h"; }) + (fetchNuGet { name = "Markdig"; version = "0.25.0"; sha256 = "1f7iqkaphfyf6szjrp0633rj44wynqgiqyivbja5djyxjy4csfyy"; }) + (fetchNuGet { name = "MessagePack"; version = "2.2.85"; sha256 = "1y0h8bd0drnlsqf1bvrdiv9j1892zqf1rmyclfjzs49klpf0xphk"; }) + (fetchNuGet { name = "MessagePack.Annotations"; version = "2.2.85"; sha256 = "00wajml6iy3wid8mixh3jmm6dapfjbccwq95m8qciika4pyd4lq9"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "5.0.5"; sha256 = "026m19pddhkx5idwpi6mp1yl9yfcfgm2qjp1jh54mdja1d7ng0vk"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Connections.Abstractions"; version = "5.0.7"; sha256 = "119wk2aqnas2sfyawv0wkg20ygk1cr15lycvvnw2x42kwgcimmks"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Http.Connections.Client"; version = "5.0.7"; sha256 = "0jdpqmjv9w29ih13nprzvf2m6cjrg69x0kwyi3d7b371rvz7m66l"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Http.Connections.Common"; version = "5.0.7"; sha256 = "1h6bw9hs92xp505c9x0jn1mx1i86r3s6xs7yyycx905grwisga39"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Http.Features"; version = "5.0.7"; sha256 = "1v89zxk15c7gswq10cbsf2yr974inpbk5npw2v6qj8vcs66qqwq3"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.SignalR.Client"; version = "5.0.7"; sha256 = "13mqsa5nks9fcxv6kxm9j75mxafs3h5pikv35a56h7d9z8wdazsr"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.SignalR.Client.Core"; version = "5.0.7"; sha256 = "033q9ijbbkh3crby96c62azyi61m0c7byiz89xbrdvagpj6ydqn5"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.SignalR.Common"; version = "5.0.7"; sha256 = "0s04flgfrljv3r8kxplc569mp3gsqd4nwda0h3yly3rqzwmbrnwp"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.SignalR.Protocols.Json"; version = "5.0.7"; sha256 = "0nb3v6hhhlndagczac255v2iyjs40jfi9gnb0933zh01wqrgkrv7"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.SignalR.Protocols.MessagePack"; version = "5.0.7"; sha256 = "06clfalw2xn7rfw53y8kiwcf2j3902iz0pl9fn2q4czhfwfp23ld"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson"; version = "5.0.7"; sha256 = "1m2likbhq8mxv33yw5zl2ybgc11ksjzqi7nhjrnx1bc12amb3nw4"; }) + (fetchNuGet { name = "Microsoft.Bcl.AsyncInterfaces"; version = "1.0.0"; sha256 = "00dx5armvkqjxvkldz3invdlck9nj7w21dlsr2aqp1rqbyrbsbbh"; }) + (fetchNuGet { name = "Microsoft.Bcl.AsyncInterfaces"; version = "1.1.0"; sha256 = "1dq5yw7cy6s42193yl4iqscfw5vzkjkgv0zyy32scr4jza6ni1a1"; }) + (fetchNuGet { name = "Microsoft.Bcl.AsyncInterfaces"; version = "5.0.0"; sha256 = "0cp5jbax2mf6xr3dqiljzlwi05fv6n9a35z337s92jcljiq674kf"; }) + (fetchNuGet { name = "Microsoft.Build.Framework"; version = "16.5.0"; sha256 = "1xgr02r7s9i6s70n237hss4yi9zicssia3zd2ny6s8vyxb7jpdyb"; }) + (fetchNuGet { name = "Microsoft.Build.Locator"; version = "1.4.1"; sha256 = "0j119rri7a401rca67cxdyrn3rprzdl1b2wrblqc23xsff1xvlrx"; }) + (fetchNuGet { name = "Microsoft.CodeAnalysis.Analyzers"; version = "3.3.2"; sha256 = "162vb5894zxps0cf5n9gc08an7gwybzz87allx3lsszvllr9ldx4"; }) + (fetchNuGet { name = "Microsoft.CodeAnalysis.BannedApiAnalyzers"; version = "3.3.2"; sha256 = "1r8mfbpfy8jdinhfviwhv2vjsz950wn2vwz17lfw5kya1n13nj56"; }) + (fetchNuGet { name = "Microsoft.CodeAnalysis.Common"; version = "3.10.0"; sha256 = "12a7wq45liw89ylnf2b7v374s3m0lbknkx7kazk3bf6nd1b8ny81"; }) + (fetchNuGet { name = "Microsoft.CodeAnalysis.CSharp"; version = "3.10.0"; sha256 = "0plpvimh9drip1fvic3zfg1gmiw3q8xb85nqjqy1hq140p4him6k"; }) + (fetchNuGet { name = "Microsoft.CodeAnalysis.CSharp.Workspaces"; version = "3.10.0"; sha256 = "0g12hg6r8h2s99p8a0rx8h71rlmj9aff2hr26fkw7i734n39p070"; }) + (fetchNuGet { name = "Microsoft.CodeAnalysis.NetAnalyzers"; version = "5.0.3"; sha256 = "1l0zg9wl8yapjq9g2d979zhsmdkr8kfybmxnl7kvgkgldf114fbg"; }) + (fetchNuGet { name = "Microsoft.CodeAnalysis.Workspaces.Common"; version = "3.10.0"; sha256 = "1hr3ndhb7sw0l63blgp2y0a6d1pgkxah0ls1v7kdxmkdazv35svc"; }) + (fetchNuGet { name = "Microsoft.CodeAnalysis.Workspaces.MSBuild"; version = "3.10.0"; sha256 = "13h0wza8anac6snkry9fvzd188vnykifzy43ms8x07d40zmqnicd"; }) + (fetchNuGet { name = "Microsoft.CSharp"; version = "4.0.1"; sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; }) + (fetchNuGet { name = "Microsoft.CSharp"; version = "4.5.0"; sha256 = "01i28nvzccxbqmiz217fxs6hnjwmd5fafs37rd49a6qp53y6623l"; }) + (fetchNuGet { name = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; }) + (fetchNuGet { name = "Microsoft.Data.Sqlite.Core"; version = "2.2.6"; sha256 = "0fx8698k71vzr8pdc6q8bsbzg6r8a42s4hkzmiyv13ibmyb5q68k"; }) + (fetchNuGet { name = "Microsoft.Diagnostics.NETCore.Client"; version = "0.2.221401"; sha256 = "1k55l60bg8lj5ayl3kixbzvx2684xd7a9nzha5fiqjgp85cimb3r"; }) + (fetchNuGet { name = "Microsoft.Diagnostics.Runtime"; version = "2.0.226801"; sha256 = "1w8ahqkv8nbq2ch17aa9axhqqnybmc9bsxpdhpiy52ix70mr72w1"; }) + (fetchNuGet { name = "Microsoft.DotNet.PlatformAbstractions"; version = "2.1.0"; sha256 = "1qydvyyinj3b5mraazjal3n2k7jqhn05b6n1a2f3qjkqkxi63dmy"; }) + (fetchNuGet { name = "Microsoft.EntityFrameworkCore"; version = "2.2.6"; sha256 = "18j2cr50wsikwv7gy3vrjvmpdxckvv537qma8afdpr3yn2klayh5"; }) + (fetchNuGet { name = "Microsoft.EntityFrameworkCore.Abstractions"; version = "2.2.6"; sha256 = "1dyxb5ibx24frlgbqy7zch0falq9p1189zvlbxgl94m0hvpml5j3"; }) + (fetchNuGet { name = "Microsoft.EntityFrameworkCore.Analyzers"; version = "2.2.6"; sha256 = "10f2lxxmh0xrdjvnam31fqfnjkaick23mpfvahj3ca5l07bph0rc"; }) + (fetchNuGet { name = "Microsoft.EntityFrameworkCore.Design"; version = "2.2.6"; sha256 = "0kjjkh1yfb56wnkmciqzfn9vymqfjap364y5amia0lmqmhfz8g7f"; }) + (fetchNuGet { name = "Microsoft.EntityFrameworkCore.Relational"; version = "2.2.6"; sha256 = "0c0z4mrqldjfslyxywb2ydk8hn9ybhkvz6lxx3idrfalq3ni5f1z"; }) + (fetchNuGet { name = "Microsoft.EntityFrameworkCore.Sqlite"; version = "2.2.6"; sha256 = "0z8k5ns841imaqha5abb1ka0rsfzy90k6qkrvix11sp6k9i7lsam"; }) + (fetchNuGet { name = "Microsoft.EntityFrameworkCore.Sqlite.Core"; version = "2.2.6"; sha256 = "0jzqw4672mzxjvzas09sl0zyzzayfgkv003a7bw5g2gjyiphf630"; }) + (fetchNuGet { name = "Microsoft.Extensions.Caching.Abstractions"; version = "2.2.0"; sha256 = "0hhxc5dp52faha1bdqw0k426zicsv6x1kfqi30m9agr0b2hixj52"; }) + (fetchNuGet { name = "Microsoft.Extensions.Caching.Memory"; version = "2.2.0"; sha256 = "0bzrsn5vas86w66bd04xilnlb21nx4l6lz7d3acvy6y8ir2vb5dv"; }) + (fetchNuGet { name = "Microsoft.Extensions.Configuration"; version = "2.2.0"; sha256 = "02250qrs3jqqbggfvd0mkim82817f79x6jh8fx2i7r58d0m66qkl"; }) + (fetchNuGet { name = "Microsoft.Extensions.Configuration.Abstractions"; version = "2.2.0"; sha256 = "1fv5277hyhfqmc0gqszyqb1ilwnijm8kc9606yia6hwr8pxyg674"; }) + (fetchNuGet { name = "Microsoft.Extensions.Configuration.Abstractions"; version = "5.0.0"; sha256 = "0fqxkc9pjxkqylsdf26s9q21ciyk56h1w33pz3v1v4wcv8yv1v6k"; }) + (fetchNuGet { name = "Microsoft.Extensions.Configuration.Binder"; version = "2.2.0"; sha256 = "10qyjdkymdmag3r807kvbnwag4j3nz65i4cwikbd77jjvz92ya3j"; }) + (fetchNuGet { name = "Microsoft.Extensions.DependencyInjection"; version = "2.2.0"; sha256 = "0lvv45rvq1xbf47lz818rjydc776zk8mf7svpzh1dml4qwlx9zck"; }) + (fetchNuGet { name = "Microsoft.Extensions.DependencyInjection"; version = "5.0.1"; sha256 = "06xig49mwyp3b2dvdx98j079ncg6p4c9x8yj4pzs6ppmi3jgaaqk"; }) + (fetchNuGet { name = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "2.2.0"; sha256 = "1jyzfdr9651h3x6pxwhpfbb9mysfh8f8z1jvy4g117h9790r9zx5"; }) + (fetchNuGet { name = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "5.0.0"; sha256 = "17cz6s80va0ch0a6nqa1wbbbp3p8sqxb96lj4qcw67ivkp2yxiyj"; }) + (fetchNuGet { name = "Microsoft.Extensions.DependencyModel"; version = "2.1.0"; sha256 = "0dl4qhjgifm6v3jsfzvzkvddyic77ggp9fq49ah661v45gk6ilgd"; }) + (fetchNuGet { name = "Microsoft.Extensions.Logging"; version = "2.2.0"; sha256 = "0bx3ljyvvcbikradq2h583rl72h8bxdz33aghk026cxzpv2mm3wm"; }) + (fetchNuGet { name = "Microsoft.Extensions.Logging"; version = "5.0.0"; sha256 = "1qa1l18q2jh9azya8gv1p8anzcdirjzd9dxxisb4911i9m1648i3"; }) + (fetchNuGet { name = "Microsoft.Extensions.Logging.Abstractions"; version = "2.2.0"; sha256 = "02w7hp6jicr7cl5p456k2cmrjvvhm6spg5kxnlncw3b72358m5wl"; }) + (fetchNuGet { name = "Microsoft.Extensions.Logging.Abstractions"; version = "5.0.0"; sha256 = "1yza38675dbv1qqnnhqm23alv2bbaqxp0pb7zinjmw8j2mr5r6wc"; }) + (fetchNuGet { name = "Microsoft.Extensions.ObjectPool"; version = "5.0.7"; sha256 = "047wv490fjizknyhbmxwbbh9fns13pq2inpc9idxq42n2zj3zbij"; }) + (fetchNuGet { name = "Microsoft.Extensions.Options"; version = "2.2.0"; sha256 = "1b20yh03fg4nmmi3vlf6gf13vrdkmklshfzl3ijygcs4c2hly6v0"; }) + (fetchNuGet { name = "Microsoft.Extensions.Options"; version = "5.0.0"; sha256 = "1rdmgpg770x8qwaaa6ryc27zh93p697fcyvn5vkxp0wimlhqkbay"; }) + (fetchNuGet { name = "Microsoft.Extensions.Primitives"; version = "2.2.0"; sha256 = "0znah6arbcqari49ymigg3wiy2hgdifz8zsq8vdc3ynnf45r7h0c"; }) + (fetchNuGet { name = "Microsoft.Extensions.Primitives"; version = "5.0.0"; sha256 = "0swqcknyh87ns82w539z1mvy804pfwhgzs97cr3nwqk6g5s42gd6"; }) + (fetchNuGet { name = "Microsoft.Extensions.Primitives"; version = "5.0.1"; sha256 = "01ar5ba2sal9wnpa1xnnikhgb37vzhg2cspz45wf760jflpai2vv"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "5.0.5"; sha256 = "1h5yry6k9bpqqis2fb1901csb8kipm7anm174fjj41r317vzfjfa"; }) + (fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) + (fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) + (fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "2.0.0"; sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; }) + (fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "2.1.2"; sha256 = "1507hnpr9my3z4w1r6xk5n0s1j3y6a2c2cnynj76za7cphxi1141"; }) + (fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) + (fetchNuGet { name = "Microsoft.NETCore.Targets"; version = "3.1.0"; sha256 = "04cc2wl90p7g9zscnxgyj55vzl7srrrjwadl2dxgicfb2x2499ca"; }) + (fetchNuGet { name = "Microsoft.NETCore.Targets"; version = "5.0.0"; sha256 = "0z3qyv7qal5irvabc8lmkh58zsl42mrzd1i0sssvzhv4q4kl3cg6"; }) + (fetchNuGet { name = "Microsoft.Win32.Primitives"; version = "4.0.1"; sha256 = "1n8ap0cmljbqskxpf8fjzn7kh1vvlndsa75k01qig26mbw97k2q7"; }) + (fetchNuGet { name = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) + (fetchNuGet { name = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; }) + (fetchNuGet { name = "MongoDB.Bson"; version = "2.11.3"; sha256 = "0fn900i51rwgk3ywpcp4dsf7c9v5glch7hia9l9w8aj8s10qjf1r"; }) + (fetchNuGet { name = "Mono.Cecil"; version = "0.9.6.1"; sha256 = "1fr7969h5q611l5227xw6nvv5rzap76vbpk0wg9hxbcxk3hn7szf"; }) + (fetchNuGet { name = "Mono.Posix.NETStandard"; version = "1.0.0"; sha256 = "0xlja36hwpjm837haq15mjh2prcf68lyrmn72nvgpz8qnf9vappw"; }) + (fetchNuGet { name = "NETStandard.Library"; version = "1.6.0"; sha256 = "0nmmv4yw7gw04ik8ialj3ak0j6pxa9spih67hnn1h2c38ba8h58k"; }) + (fetchNuGet { name = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) + (fetchNuGet { name = "NETStandard.Library"; version = "2.0.0"; sha256 = "1bc4ba8ahgk15m8k4nd7x406nhi0kwqzbgjk2dmw52ss553xz7iy"; }) + (fetchNuGet { name = "Newtonsoft.Json"; version = "12.0.2"; sha256 = "0w2fbji1smd2y7x25qqibf1qrznmv4s6s0jvrbvr6alb7mfyqvh5"; }) + (fetchNuGet { name = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) + (fetchNuGet { name = "Newtonsoft.Json"; version = "9.0.1"; sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; }) + (fetchNuGet { name = "NuGet.Common"; version = "5.10.0"; sha256 = "0qy6blgppgvxpfcricmvva3qzddk18dza5vy851jrbqshvf9g7kx"; }) + (fetchNuGet { name = "NuGet.Configuration"; version = "5.10.0"; sha256 = "0xb1n94lrwa6k83i9xcsq68202086p2gj74gzlbhlvb8c2pw6lbb"; }) + (fetchNuGet { name = "NuGet.DependencyResolver.Core"; version = "5.10.0"; sha256 = "0dhhclm281ihpfsjzxw34l6zlw49nwzyjiynkmsbcj9icfkp3y4r"; }) + (fetchNuGet { name = "NuGet.Frameworks"; version = "5.10.0"; sha256 = "0gb6n8rg2jpjp52icgpb3wjdfs3qllh5vbcz8hbcix3l7dncy3v2"; }) + (fetchNuGet { name = "NuGet.LibraryModel"; version = "5.10.0"; sha256 = "0b6mmq2mqfr06ypc772dmcd8bz55gkyfrgn0j3nrgkcdww4fzf9q"; }) + (fetchNuGet { name = "NuGet.Packaging"; version = "5.10.0"; sha256 = "11g0v061axhp0nisclq5cm2mc92d69z92giz9l40ih478c5nishw"; }) + (fetchNuGet { name = "NuGet.ProjectModel"; version = "5.10.0"; sha256 = "1cqg319n986wciskrqsfawfhqp1d7a7i2qjd0qplpckyw8msng2i"; }) + (fetchNuGet { name = "NuGet.Protocol"; version = "5.10.0"; sha256 = "0cs9qp169zx6g2w5bzrlhxv0q1i8mb8dxlb2nkiq7pkvah86rxkc"; }) + (fetchNuGet { name = "NuGet.Versioning"; version = "5.10.0"; sha256 = "10vvw6vjpx0c26rlxh7dnpyp4prahn25717ccd8bzkjmyzhm90cs"; }) + (fetchNuGet { name = "NUnit"; version = "3.13.2"; sha256 = "00bkjgarkwbj497da9d7lajala1ns67h1kx53w4bapwkf32jlcvn"; }) + (fetchNuGet { name = "OpenTabletDriver"; version = "0.5.3.1"; sha256 = "16xw8w943x9gvnnpbryahff5azzy8n26j2igyqgv88m352jd9rb8"; }) + (fetchNuGet { name = "OpenTabletDriver.Plugin"; version = "0.5.3.1"; sha256 = "17dxsvcz9g8kzydk5xlfz9kfxl62x9wi20609rh76wjd881bg1br"; }) + (fetchNuGet { name = "ppy.LocalisationAnalyser"; version = "2021.716.0"; sha256 = "0w45af0mlh4bkjxxhk5p4kb6z0na8fmm6xz10dfzs3b4i61h5x3z"; }) + (fetchNuGet { name = "ppy.osu.Framework"; version = "2021.714.0"; sha256 = "175i0hcbl01xy633zvij8185nj4g7ja1rsv2lmfz8qdykqj6g9kl"; }) + (fetchNuGet { name = "ppy.osu.Framework.NativeLibs"; version = "2021.115.0"; sha256 = "00cxrnc78wb8l7d4x7m39g73y85kbgnsnx3qdvv0a9p77lf7lx7z"; }) + (fetchNuGet { name = "ppy.osu.Game.Resources"; version = "2021.706.0"; sha256 = "1yacqy8h93vph3faf4y0iwhlnlmbny3zj57cm2bh04z2gk0l17am"; }) + (fetchNuGet { name = "ppy.osuTK.NS20"; version = "1.0.173"; sha256 = "11rrxakrgq5lriv09qlz26189nyc9lh0fjidn5h70labyp2gpa4y"; }) + (fetchNuGet { name = "ppy.SDL2-CS"; version = "1.0.238-alpha"; sha256 = "1n7pa7gy1hcgsfm3jix334qr6v229n1yymq58njj802l3k5g7980"; }) + (fetchNuGet { name = "ppy.squirrel.windows"; version = "1.9.0.5"; sha256 = "0nmhrg3q6izapfpwdslq80fqkvjj12ad9r94pd0nr2xx1zw0x1zl"; }) + (fetchNuGet { name = "Realm"; version = "10.3.0"; sha256 = "12zmp43cf2kilzq1yi9x2hy1jdh51c0kbnddw5s960k1kvyx2s2v"; }) + (fetchNuGet { name = "Realm.Fody"; version = "10.3.0"; sha256 = "0mhjkahi2ldxcizv08i70mrpwgrvljxdjlr81x3dmwgpxxfji18d"; }) + (fetchNuGet { name = "Remotion.Linq"; version = "2.2.0"; sha256 = "1y46ni0xswmmiryp8sydjgryafwn458dr91f9xn653w73kdyk4xf"; }) + (fetchNuGet { name = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; }) + (fetchNuGet { name = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; }) + (fetchNuGet { name = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; }) + (fetchNuGet { name = "runtime.native.System"; version = "4.0.0"; sha256 = "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf"; }) + (fetchNuGet { name = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; }) + (fetchNuGet { name = "runtime.native.System.IO.Compression"; version = "4.1.0"; sha256 = "0d720z4lzyfcabmmnvh0bnj76ll7djhji2hmfh3h44sdkjnlkknk"; }) + (fetchNuGet { name = "runtime.native.System.IO.Compression"; version = "4.3.0"; sha256 = "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"; }) + (fetchNuGet { name = "runtime.native.System.Net.Http"; version = "4.0.1"; sha256 = "1hgv2bmbaskx77v8glh7waxws973jn4ah35zysnkxmf0196sfxg6"; }) + (fetchNuGet { name = "runtime.native.System.Net.Http"; version = "4.3.0"; sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; }) + (fetchNuGet { name = "runtime.native.System.Security.Cryptography"; version = "4.0.0"; sha256 = "0k57aa2c3b10wl3hfqbgrl7xq7g8hh3a3ir44b31dn5p61iiw3z9"; }) + (fetchNuGet { name = "runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; }) + (fetchNuGet { name = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; }) + (fetchNuGet { name = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; }) + (fetchNuGet { name = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; }) + (fetchNuGet { name = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi"; }) + (fetchNuGet { name = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; }) + (fetchNuGet { name = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; }) + (fetchNuGet { name = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; }) + (fetchNuGet { name = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; }) + (fetchNuGet { name = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; }) + (fetchNuGet { name = "Sentry"; version = "3.6.0"; sha256 = "1yjz3m8chg796izrdd9vlxvka60rmv6cmsxpnrv9llmsss2mqssz"; }) + (fetchNuGet { name = "SharpCompress"; version = "0.17.1"; sha256 = "1ffiacghbcnr3fkgvdcad7b1nky54nhmmn2sm43sks9zm8grvva4"; }) + (fetchNuGet { name = "SharpCompress"; version = "0.28.3"; sha256 = "1svymm2vyg3815p3sbwjdk563mz0a4ag1sr30pm0ki01brqpaaas"; }) + (fetchNuGet { name = "SharpFNT"; version = "2.0.0"; sha256 = "1bgacgh9hbck0qvji6frbb50sdiqfdng2fvvfgfw8b9qaql91mx0"; }) + (fetchNuGet { name = "SixLabors.ImageSharp"; version = "1.0.3"; sha256 = "1y43zvhjgi9rhylc8451784hhdi5b551hf7fsa6187b83wgxc47g"; }) + (fetchNuGet { name = "Splat"; version = "1.6.2"; sha256 = "154w9q0z8697rcpqs4x233crx5ap1z4pl4xc21hsd3csbhw13ykf"; }) + (fetchNuGet { name = "SQLitePCLRaw.bundle_green"; version = "1.1.12"; sha256 = "0jbyd25ag15fyn9nawjikv0v5ylk2zh5pxgr6gm4kpbpqys86sq9"; }) + (fetchNuGet { name = "SQLitePCLRaw.core"; version = "1.1.12"; sha256 = "03gflsn2wl6v0a8zvh6y5xdhx0xxmfrn6jfldiy829x3fx74zgdl"; }) + (fetchNuGet { name = "SQLitePCLRaw.lib.e_sqlite3.linux"; version = "1.1.12"; sha256 = "10mlq914d3zggdjf4bv27w6jx0gqqjf6f91y5ri6pbvaqyhi28h5"; }) + (fetchNuGet { name = "SQLitePCLRaw.lib.e_sqlite3.osx"; version = "1.1.12"; sha256 = "1hixg6n9sqllfrcihj145lh1l38inv827808difvazd4zr3mi0z1"; }) + (fetchNuGet { name = "SQLitePCLRaw.lib.e_sqlite3.v110_xp"; version = "1.1.12"; sha256 = "107sivk5p38dg1kyvqrxgp67dj89s8l6brf9l52k6s4vrn4hrrk7"; }) + (fetchNuGet { name = "SQLitePCLRaw.provider.e_sqlite3.netstandard11"; version = "1.1.12"; sha256 = "0qr2d7ka6f5c7bybdhiyq7nl90c9575szmi0nfpknd9c0w024if4"; }) + (fetchNuGet { name = "StbiSharp"; version = "1.0.13"; sha256 = "0yaspwlh4x93d7xnqj5w5pxlwzlv9lixvksyvdh176krfa4mjw3q"; }) + (fetchNuGet { name = "System.AppContext"; version = "4.1.0"; sha256 = "0fv3cma1jp4vgj7a8hqc9n7hr1f1kjp541s6z0q1r6nazb4iz9mz"; }) + (fetchNuGet { name = "System.AppContext"; version = "4.3.0"; sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; }) + (fetchNuGet { name = "System.Buffers"; version = "4.0.0"; sha256 = "13s659bcmg9nwb6z78971z1lr6bmh2wghxi1ayqyzl4jijd351gr"; }) + (fetchNuGet { name = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) + (fetchNuGet { name = "System.Buffers"; version = "4.4.0"; sha256 = "183f8063w8zqn99pv0ni0nnwh7fgx46qzxamwnans55hhs2l0g19"; }) + (fetchNuGet { name = "System.Buffers"; version = "4.5.1"; sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; }) + (fetchNuGet { name = "System.CodeDom"; version = "4.5.0"; sha256 = "1js3h3ig0zwyynl1q88siynp8ra0gz0pfq1wmvls6ji83jrxsami"; }) + (fetchNuGet { name = "System.Collections"; version = "4.0.11"; sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; }) + (fetchNuGet { name = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) + (fetchNuGet { name = "System.Collections.Concurrent"; version = "4.0.12"; sha256 = "07y08kvrzpak873pmyxs129g1ch8l27zmg51pcyj2jvq03n0r0fc"; }) + (fetchNuGet { name = "System.Collections.Concurrent"; version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; }) + (fetchNuGet { name = "System.Collections.Immutable"; version = "1.5.0"; sha256 = "1d5gjn5afnrf461jlxzawcvihz195gayqpcfbv6dd7pxa9ialn06"; }) + (fetchNuGet { name = "System.Collections.Immutable"; version = "5.0.0"; sha256 = "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r"; }) + (fetchNuGet { name = "System.ComponentModel.Annotations"; version = "4.5.0"; sha256 = "1jj6f6g87k0iwsgmg3xmnn67a14mq88np0l1ys5zkxhkvbc8976p"; }) + (fetchNuGet { name = "System.ComponentModel.Annotations"; version = "5.0.0"; sha256 = "021h7x98lblq9avm1bgpa4i31c2kgsa7zn4sqhxf39g087ar756j"; }) + (fetchNuGet { name = "System.Composition"; version = "1.0.31"; sha256 = "0aa27jz73qb0xm6dyxv22qhfrmyyqjyn2dvvsd9asi82lcdh9i61"; }) + (fetchNuGet { name = "System.Composition.AttributedModel"; version = "1.0.31"; sha256 = "1ipyb86hvw754kmk47vjmzyilvj5hymg9nqabz70sbgsz1fygrdv"; }) + (fetchNuGet { name = "System.Composition.Convention"; version = "1.0.31"; sha256 = "00gqcdrql7vhynxh4xq0s9j5nw27kghmn2n773v7lhzjh3ash18r"; }) + (fetchNuGet { name = "System.Composition.Hosting"; version = "1.0.31"; sha256 = "1f1bnk3j7ndx9r7zpzibmrhw78clys1pspl20j2dhnmkiwhl23vy"; }) + (fetchNuGet { name = "System.Composition.Runtime"; version = "1.0.31"; sha256 = "1shfybfzsn4g6aim4pggb5ha31g0fz2kkk0519c4vj6m166g39ws"; }) + (fetchNuGet { name = "System.Composition.TypedParts"; version = "1.0.31"; sha256 = "1m4j19zx50lbbdx1xxbgpsd1dai2r3kzkyapw47kdvkb89qjkl63"; }) + (fetchNuGet { name = "System.Console"; version = "4.0.0"; sha256 = "0ynxqbc3z1nwbrc11hkkpw9skw116z4y9wjzn7id49p9yi7mzmlf"; }) + (fetchNuGet { name = "System.Console"; version = "4.3.0"; sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; }) + (fetchNuGet { name = "System.Diagnostics.Debug"; version = "4.0.11"; sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; }) + (fetchNuGet { name = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) + (fetchNuGet { name = "System.Diagnostics.DiagnosticSource"; version = "4.0.0"; sha256 = "1n6c3fbz7v8d3pn77h4v5wvsfrfg7v1c57lg3nff3cjyh597v23m"; }) + (fetchNuGet { name = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; }) + (fetchNuGet { name = "System.Diagnostics.DiagnosticSource"; version = "4.5.0"; sha256 = "1y8m0p3127nak5yspapfnz25qc9x53gqpvwr3hdpsvrcd2r1pgyj"; }) + (fetchNuGet { name = "System.Diagnostics.DiagnosticSource"; version = "5.0.0"; sha256 = "0phd2qizshjvglhzws1jd0cq4m54gscz4ychzr3x6wbgl4vvfrga"; }) + (fetchNuGet { name = "System.Diagnostics.Tools"; version = "4.0.1"; sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; }) + (fetchNuGet { name = "System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; }) + (fetchNuGet { name = "System.Diagnostics.Tracing"; version = "4.1.0"; sha256 = "1d2r76v1x610x61ahfpigda89gd13qydz6vbwzhpqlyvq8jj6394"; }) + (fetchNuGet { name = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; }) + (fetchNuGet { name = "System.Dynamic.Runtime"; version = "4.0.11"; sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; }) + (fetchNuGet { name = "System.Dynamic.Runtime"; version = "4.3.0"; sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; }) + (fetchNuGet { name = "System.Formats.Asn1"; version = "5.0.0"; sha256 = "1axc8z0839yvqi2cb63l73l6d9j6wd20lsbdymwddz9hvrsgfwpn"; }) + (fetchNuGet { name = "System.Globalization"; version = "4.0.11"; sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; }) + (fetchNuGet { name = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) + (fetchNuGet { name = "System.Globalization.Calendars"; version = "4.0.1"; sha256 = "0bv0alrm2ck2zk3rz25lfyk9h42f3ywq77mx1syl6vvyncnpg4qh"; }) + (fetchNuGet { name = "System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; }) + (fetchNuGet { name = "System.Globalization.Extensions"; version = "4.0.1"; sha256 = "0hjhdb5ri8z9l93bw04s7ynwrjrhx2n0p34sf33a9hl9phz69fyc"; }) + (fetchNuGet { name = "System.Globalization.Extensions"; version = "4.3.0"; sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; }) + (fetchNuGet { name = "System.Interactive.Async"; version = "3.2.0"; sha256 = "0y5r5y7dlccjpgg17rjrrzi3jya4ysyydamxs33qckkv4jb3534d"; }) + (fetchNuGet { name = "System.IO"; version = "4.1.0"; sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; }) + (fetchNuGet { name = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) + (fetchNuGet { name = "System.IO.Compression"; version = "4.1.0"; sha256 = "0iym7s3jkl8n0vzm3jd6xqg9zjjjqni05x45dwxyjr2dy88hlgji"; }) + (fetchNuGet { name = "System.IO.Compression"; version = "4.3.0"; sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"; }) + (fetchNuGet { name = "System.IO.Compression.ZipFile"; version = "4.0.1"; sha256 = "0h72znbagmgvswzr46mihn7xm7chfk2fhrp5krzkjf29pz0i6z82"; }) + (fetchNuGet { name = "System.IO.Compression.ZipFile"; version = "4.3.0"; sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"; }) + (fetchNuGet { name = "System.IO.FileSystem"; version = "4.0.1"; sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; }) + (fetchNuGet { name = "System.IO.FileSystem"; version = "4.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; }) + (fetchNuGet { name = "System.IO.FileSystem.Primitives"; version = "4.0.1"; sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; }) + (fetchNuGet { name = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; }) + (fetchNuGet { name = "System.IO.Packaging"; version = "5.0.0"; sha256 = "08l85pi8jy65las973szqdnir2awxp0r16h21c0bgrz19gxhs11n"; }) + (fetchNuGet { name = "System.IO.Pipelines"; version = "5.0.1"; sha256 = "1zvfcd2l1d5qxifsqd0cjyv57nr61a9ac2ca5jinyqmj32wgjd6v"; }) + (fetchNuGet { name = "System.Linq"; version = "4.1.0"; sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; }) + (fetchNuGet { name = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) + (fetchNuGet { name = "System.Linq.Expressions"; version = "4.1.0"; sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; }) + (fetchNuGet { name = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; }) + (fetchNuGet { name = "System.Linq.Queryable"; version = "4.0.1"; sha256 = "11jn9k34g245yyf260gr3ldzvaqa9477w2c5nhb1p8vjx4xm3qaw"; }) + (fetchNuGet { name = "System.Management"; version = "4.5.0"; sha256 = "19z5x23n21xi94bgl531l9hrm64nyw9d5fpd7klfvr5xfsbh9jwr"; }) + (fetchNuGet { name = "System.Memory"; version = "4.5.1"; sha256 = "0f07d7hny38lq9w69wx4lxkn4wszrqf9m9js6fh9is645csm167c"; }) + (fetchNuGet { name = "System.Memory"; version = "4.5.3"; sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; }) + (fetchNuGet { name = "System.Memory"; version = "4.5.4"; sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; }) + (fetchNuGet { name = "System.Net.Http"; version = "4.1.0"; sha256 = "1i5rqij1icg05j8rrkw4gd4pgia1978mqhjzhsjg69lvwcdfg8yb"; }) + (fetchNuGet { name = "System.Net.Http"; version = "4.3.0"; sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; }) + (fetchNuGet { name = "System.Net.Primitives"; version = "4.0.11"; sha256 = "10xzzaynkzkakp7jai1ik3r805zrqjxiz7vcagchyxs2v26a516r"; }) + (fetchNuGet { name = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; }) + (fetchNuGet { name = "System.Net.Sockets"; version = "4.1.0"; sha256 = "1385fvh8h29da5hh58jm1v78fzi9fi5vj93vhlm2kvqpfahvpqls"; }) + (fetchNuGet { name = "System.Net.Sockets"; version = "4.3.0"; sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; }) + (fetchNuGet { name = "System.Numerics.Vectors"; version = "4.4.0"; sha256 = "0rdvma399070b0i46c4qq1h2yvjj3k013sqzkilz4bz5cwmx1rba"; }) + (fetchNuGet { name = "System.Numerics.Vectors"; version = "4.5.0"; sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; }) + (fetchNuGet { name = "System.ObjectModel"; version = "4.0.12"; sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; }) + (fetchNuGet { name = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; }) + (fetchNuGet { name = "System.Reflection"; version = "4.1.0"; sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; }) + (fetchNuGet { name = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) + (fetchNuGet { name = "System.Reflection.Emit"; version = "4.0.1"; sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; }) + (fetchNuGet { name = "System.Reflection.Emit"; version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; }) + (fetchNuGet { name = "System.Reflection.Emit"; version = "4.6.0"; sha256 = "18h375q5bn9h7swxnk4krrxym1dxmi9bm26p89xps9ygrj4q6zqw"; }) + (fetchNuGet { name = "System.Reflection.Emit"; version = "4.7.0"; sha256 = "121l1z2ypwg02yz84dy6gr82phpys0njk7yask3sihgy214w43qp"; }) + (fetchNuGet { name = "System.Reflection.Emit.ILGeneration"; version = "4.0.1"; sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0"; }) + (fetchNuGet { name = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; }) + (fetchNuGet { name = "System.Reflection.Emit.Lightweight"; version = "4.0.1"; sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr"; }) + (fetchNuGet { name = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; }) + (fetchNuGet { name = "System.Reflection.Emit.Lightweight"; version = "4.6.0"; sha256 = "0hry2k6b7kicg4zxnq0hhn0ys52711pxy7l9v5sp7gvp9cicwpgp"; }) + (fetchNuGet { name = "System.Reflection.Extensions"; version = "4.0.1"; sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; }) + (fetchNuGet { name = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; }) + (fetchNuGet { name = "System.Reflection.Metadata"; version = "5.0.0"; sha256 = "17qsl5nanlqk9iz0l5wijdn6ka632fs1m1fvx18dfgswm258r3ss"; }) + (fetchNuGet { name = "System.Reflection.Primitives"; version = "4.0.1"; sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; }) + (fetchNuGet { name = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) + (fetchNuGet { name = "System.Reflection.TypeExtensions"; version = "4.1.0"; sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; }) + (fetchNuGet { name = "System.Reflection.TypeExtensions"; version = "4.3.0"; sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; }) + (fetchNuGet { name = "System.Resources.ResourceManager"; version = "4.0.1"; sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; }) + (fetchNuGet { name = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) + (fetchNuGet { name = "System.Runtime"; version = "4.1.0"; sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; }) + (fetchNuGet { name = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) + (fetchNuGet { name = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.1"; sha256 = "1xcrjx5fwg284qdnxyi2d0lzdm5q4frlpkp0nf6vvkx1kdz2prrf"; }) + (fetchNuGet { name = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.2"; sha256 = "1vz4275fjij8inf31np78hw50al8nqkngk04p3xv5n4fcmf1grgi"; }) + (fetchNuGet { name = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.3"; sha256 = "1afi6s2r1mh1kygbjmfba6l4f87pi5sg13p4a48idqafli94qxln"; }) + (fetchNuGet { name = "System.Runtime.CompilerServices.Unsafe"; version = "5.0.0"; sha256 = "02k25ivn50dmqx5jn8hawwmz24yf0454fjd823qk6lygj9513q4x"; }) + (fetchNuGet { name = "System.Runtime.Extensions"; version = "4.1.0"; sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; }) + (fetchNuGet { name = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; }) + (fetchNuGet { name = "System.Runtime.Handles"; version = "4.0.1"; sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; }) + (fetchNuGet { name = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; }) + (fetchNuGet { name = "System.Runtime.InteropServices"; version = "4.1.0"; sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; }) + (fetchNuGet { name = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) + (fetchNuGet { name = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.0.0"; sha256 = "0glmvarf3jz5xh22iy3w9v3wyragcm4hfdr17v90vs7vcrm7fgp6"; }) + (fetchNuGet { name = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; }) + (fetchNuGet { name = "System.Runtime.Numerics"; version = "4.0.1"; sha256 = "1y308zfvy0l5nrn46mqqr4wb4z1xk758pkk8svbz8b5ij7jnv4nn"; }) + (fetchNuGet { name = "System.Runtime.Numerics"; version = "4.3.0"; sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; }) + (fetchNuGet { name = "System.Runtime.Serialization.Primitives"; version = "4.1.1"; sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; }) + (fetchNuGet { name = "System.Security.AccessControl"; version = "5.0.0"; sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r"; }) + (fetchNuGet { name = "System.Security.Cryptography.Algorithms"; version = "4.2.0"; sha256 = "148s9g5dgm33ri7dnh19s4lgnlxbpwvrw2jnzllq2kijj4i4vs85"; }) + (fetchNuGet { name = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; }) + (fetchNuGet { name = "System.Security.Cryptography.Cng"; version = "4.2.0"; sha256 = "118jijz446kix20blxip0f0q8mhsh9bz118mwc2ch1p6g7facpzc"; }) + (fetchNuGet { name = "System.Security.Cryptography.Cng"; version = "4.3.0"; sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; }) + (fetchNuGet { name = "System.Security.Cryptography.Cng"; version = "5.0.0"; sha256 = "06hkx2za8jifpslkh491dfwzm5dxrsyxzj5lsc0achb6yzg4zqlw"; }) + (fetchNuGet { name = "System.Security.Cryptography.Csp"; version = "4.0.0"; sha256 = "1cwv8lqj8r15q81d2pz2jwzzbaji0l28xfrpw29kdpsaypm92z2q"; }) + (fetchNuGet { name = "System.Security.Cryptography.Csp"; version = "4.3.0"; sha256 = "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"; }) + (fetchNuGet { name = "System.Security.Cryptography.Encoding"; version = "4.0.0"; sha256 = "0a8y1a5wkmpawc787gfmnrnbzdgxmx1a14ax43jf3rj9gxmy3vk4"; }) + (fetchNuGet { name = "System.Security.Cryptography.Encoding"; version = "4.3.0"; sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; }) + (fetchNuGet { name = "System.Security.Cryptography.OpenSsl"; version = "4.0.0"; sha256 = "16sx3cig3d0ilvzl8xxgffmxbiqx87zdi8fc73i3i7zjih1a7f4q"; }) + (fetchNuGet { name = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; }) + (fetchNuGet { name = "System.Security.Cryptography.Pkcs"; version = "5.0.0"; sha256 = "0hb2mndac3xrw3786bsjxjfh19bwnr991qib54k6wsqjhjyyvbwj"; }) + (fetchNuGet { name = "System.Security.Cryptography.Primitives"; version = "4.0.0"; sha256 = "0i7cfnwph9a10bm26m538h5xcr8b36jscp9sy1zhgifksxz4yixh"; }) + (fetchNuGet { name = "System.Security.Cryptography.Primitives"; version = "4.3.0"; sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; }) + (fetchNuGet { name = "System.Security.Cryptography.ProtectedData"; version = "4.4.0"; sha256 = "1q8ljvqhasyynp94a1d7jknk946m20lkwy2c3wa8zw2pc517fbj6"; }) + (fetchNuGet { name = "System.Security.Cryptography.X509Certificates"; version = "4.1.0"; sha256 = "0clg1bv55mfv5dq00m19cp634zx6inm31kf8ppbq1jgyjf2185dh"; }) + (fetchNuGet { name = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; }) + (fetchNuGet { name = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; }) + (fetchNuGet { name = "System.Text.Encoding"; version = "4.0.11"; sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; }) + (fetchNuGet { name = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) + (fetchNuGet { name = "System.Text.Encoding.CodePages"; version = "4.5.1"; sha256 = "1z21qyfs6sg76rp68qdx0c9iy57naan89pg7p6i3qpj8kyzn921w"; }) + (fetchNuGet { name = "System.Text.Encoding.CodePages"; version = "5.0.0"; sha256 = "1bn2pzaaq4wx9ixirr8151vm5hynn3lmrljcgjx9yghmm4k677k0"; }) + (fetchNuGet { name = "System.Text.Encoding.Extensions"; version = "4.0.11"; sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; }) + (fetchNuGet { name = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) + (fetchNuGet { name = "System.Text.Encodings.Web"; version = "5.0.1"; sha256 = "00yg63qnp94q2qryxxggzigi276bibb8b3b96gcvsyrxy7b703n9"; }) + (fetchNuGet { name = "System.Text.Json"; version = "4.7.0"; sha256 = "0fp3xrysccm5dkaac4yb51d793vywxks978kkl5x4db9gw29rfdr"; }) + (fetchNuGet { name = "System.Text.Json"; version = "5.0.2"; sha256 = "0vd0wd29cdhgcjngl9sw391sn2s8xm974y15zvym0whsdgjwiqfx"; }) + (fetchNuGet { name = "System.Text.RegularExpressions"; version = "4.1.0"; sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; }) + (fetchNuGet { name = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; }) + (fetchNuGet { name = "System.Threading"; version = "4.0.11"; sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; }) + (fetchNuGet { name = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) + (fetchNuGet { name = "System.Threading.Channels"; version = "5.0.0"; sha256 = "11z28x3cawry60l5phkqrvavm0mshz84n4c79hrz0p65lq8jpxgs"; }) + (fetchNuGet { name = "System.Threading.Tasks"; version = "4.0.11"; sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; }) + (fetchNuGet { name = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) + (fetchNuGet { name = "System.Threading.Tasks.Extensions"; version = "4.0.0"; sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; }) + (fetchNuGet { name = "System.Threading.Tasks.Extensions"; version = "4.3.0"; sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; }) + (fetchNuGet { name = "System.Threading.Tasks.Extensions"; version = "4.5.2"; sha256 = "1sh63dz0dymqcwmprp0nadm77b83vmm7lyllpv578c397bslb8hj"; }) + (fetchNuGet { name = "System.Threading.Tasks.Extensions"; version = "4.5.3"; sha256 = "0g7r6hm572ax8v28axrdxz1gnsblg6kszq17g51pj14a5rn2af7i"; }) + (fetchNuGet { name = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; }) + (fetchNuGet { name = "System.Threading.Thread"; version = "4.0.0"; sha256 = "1gxxm5fl36pjjpnx1k688dcw8m9l7nmf802nxis6swdaw8k54jzc"; }) + (fetchNuGet { name = "System.Threading.Timer"; version = "4.0.1"; sha256 = "15n54f1f8nn3mjcjrlzdg6q3520571y012mx7v991x2fvp73lmg6"; }) + (fetchNuGet { name = "System.Threading.Timer"; version = "4.3.0"; sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; }) + (fetchNuGet { name = "System.Xml.ReaderWriter"; version = "4.0.11"; sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; }) + (fetchNuGet { name = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; }) + (fetchNuGet { name = "System.Xml.XDocument"; version = "4.0.11"; sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; }) + (fetchNuGet { name = "System.Xml.XDocument"; version = "4.3.0"; sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; }) ] diff --git a/third_party/nixpkgs/pkgs/games/osu-lazer/update.sh b/third_party/nixpkgs/pkgs/games/osu-lazer/update.sh index b5c8208fe4..2fe30ebec1 100755 --- a/third_party/nixpkgs/pkgs/games/osu-lazer/update.sh +++ b/third_party/nixpkgs/pkgs/games/osu-lazer/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl jq common-updater-scripts dotnet-sdk_5 +#!nix-shell -i bash -p curl jq common-updater-scripts nuget-to-nix dotnet-sdk_5 set -eo pipefail cd "$(dirname "${BASH_SOURCE[0]}")" @@ -25,21 +25,7 @@ pushd "$src" mkdir ./nuget_tmp.packages dotnet restore osu.Desktop --packages ./nuget_tmp.packages --runtime linux-x64 -echo "{ fetchNuGet }: [" >"$deps_file" -while read pkg_spec; do - { read pkg_name; read pkg_version; } < <( - # Build version part should be ignored: `3.0.0-beta2.20059.3+77df2220` -> `3.0.0-beta2.20059.3` - sed -nE 's/.*([^<]*).*/\1/p; s/.*([^<+]*).*/\1/p' "$pkg_spec") - pkg_sha256="$(nix-hash --type sha256 --flat --base32 "$(dirname "$pkg_spec")"/*.nupkg)" - cat >>"$deps_file" <>"$deps_file" +nuget-to-nix ./nuget_tmp.packages > "$deps_file" popd rm -r "$src" diff --git a/third_party/nixpkgs/pkgs/games/ultimatestunts/default.nix b/third_party/nixpkgs/pkgs/games/ultimatestunts/default.nix index 2e3d544591..0ffe86efee 100644 --- a/third_party/nixpkgs/pkgs/games/ultimatestunts/default.nix +++ b/third_party/nixpkgs/pkgs/games/ultimatestunts/default.nix @@ -3,10 +3,10 @@ pkg-config}: stdenv.mkDerivation rec { pname = "ultimate-stunts"; - version = "0.7.6.1"; + version = "0.7.7.1"; src = fetchurl { url = "mirror://sourceforge/ultimatestunts/ultimatestunts-srcdata-${lib.replaceStrings ["."] [""] version}.tar.gz"; - sha256 = "0rd565ml6l927gyq158klhni7myw8mgllhv0xl1fg9m8hlzssgrv"; + sha256 = "sha256-/MBuSi/yxcG9k3ZwrNsHkUDzzg798AV462VZog67JtM="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/games/vassal/default.nix b/third_party/nixpkgs/pkgs/games/vassal/default.nix index e1fc19fa05..1a08fbb4dd 100644 --- a/third_party/nixpkgs/pkgs/games/vassal/default.nix +++ b/third_party/nixpkgs/pkgs/games/vassal/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "VASSAL"; - version = "3.5.3"; + version = "3.5.8"; src = fetchzip { url = "https://github.com/vassalengine/vassal/releases/download/${version}/${pname}-${version}-linux.tar.bz2"; - sha256 = "sha256-r48k4Un623uYsYcdF5UAH6w/uIdgWz8WQ75BiwrApkA="; + sha256 = "sha256-IJ3p7+0fs/2dCbE1BOb2580upR9W/1R2/e3xmkAsJ+M="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/games/xonotic/default.nix b/third_party/nixpkgs/pkgs/games/xonotic/default.nix index b15e111970..6d73277147 100644 --- a/third_party/nixpkgs/pkgs/games/xonotic/default.nix +++ b/third_party/nixpkgs/pkgs/games/xonotic/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchzip, makeWrapper, runCommandNoCC, makeDesktopItem +{ lib, stdenv, fetchurl, fetchzip, makeWrapper, runCommand, makeDesktopItem , xonotic-data, copyDesktopItems , # required for both unzip, libjpeg, zlib, libvorbis, curl @@ -130,7 +130,7 @@ in rec { passthru.version = version; }; - xonotic = runCommandNoCC "xonotic${variant}-${version}" { + xonotic = runCommand "xonotic${variant}-${version}" { inherit xonotic-unwrapped; nativeBuildInputs = [ makeWrapper copyDesktopItems ]; desktopItems = [ desktopItem ]; diff --git a/third_party/nixpkgs/pkgs/misc/cups/drivers/brgenml1cupswrapper/default.nix b/third_party/nixpkgs/pkgs/misc/cups/drivers/brgenml1cupswrapper/default.nix index ec02e8c4f0..e309e8e8b2 100644 --- a/third_party/nixpkgs/pkgs/misc/cups/drivers/brgenml1cupswrapper/default.nix +++ b/third_party/nixpkgs/pkgs/misc/cups/drivers/brgenml1cupswrapper/default.nix @@ -52,10 +52,11 @@ */ stdenv.mkDerivation rec { + pname = "brgenml1cupswrapper"; + version = "3.1.0-1"; - name = "brgenml1cupswrapper-3.1.0-1"; src = fetchurl { - url = "https://download.brother.com/welcome/dlf101125/${name}.i386.deb"; + url = "https://download.brother.com/welcome/dlf101125/brgenml1cupswrapper-${version}.i386.deb"; sha256 = "0kd2a2waqr10kfv1s8is3nd5dlphw4d1343srdsbrlbbndja3s6r"; }; diff --git a/third_party/nixpkgs/pkgs/misc/cups/drivers/brgenml1lpr/default.nix b/third_party/nixpkgs/pkgs/misc/cups/drivers/brgenml1lpr/default.nix index 6cdff2c412..fd439e9cd7 100644 --- a/third_party/nixpkgs/pkgs/misc/cups/drivers/brgenml1lpr/default.nix +++ b/third_party/nixpkgs/pkgs/misc/cups/drivers/brgenml1lpr/default.nix @@ -35,10 +35,11 @@ let ''; in stdenv.mkDerivation rec { + pname = "brgenml1lpr"; + version = "3.1.0-1"; - name = "brgenml1lpr-3.1.0-1"; src = fetchurl { - url = "https://download.brother.com/welcome/dlf101123/${name}.i386.deb"; + url = "https://download.brother.com/welcome/dlf101123/brgenml1lpr-${version}.i386.deb"; sha256 = "0zdvjnrjrz9sba0k525linxp55lr4cyivfhqbkq1c11br2nvy09f"; }; diff --git a/third_party/nixpkgs/pkgs/misc/cups/drivers/canon/default.nix b/third_party/nixpkgs/pkgs/misc/cups/drivers/canon/default.nix index 0d6ec276b5..57efae68af 100644 --- a/third_party/nixpkgs/pkgs/misc/cups/drivers/canon/default.nix +++ b/third_party/nixpkgs/pkgs/misc/cups/drivers/canon/default.nix @@ -1,16 +1,27 @@ -{ lib, stdenv, fetchurl, unzip, autoreconfHook, libtool, makeWrapper, cups -, ghostscript, pkgsi686Linux, zlib }: +{ lib +, stdenv +, fetchurl +, unzip +, autoconf +, automake +, libtool +, makeWrapper +, cups +, ghostscript +, pkgsi686Linux +, zlib +}: let - i686_NIX_GCC = pkgsi686Linux.callPackage ({gcc}: gcc) {}; - i686_libxml2 = pkgsi686Linux.callPackage ({libxml2}: libxml2) {}; + i686_NIX_GCC = pkgsi686Linux.callPackage ({ gcc }: gcc) { }; + i686_libxml2 = pkgsi686Linux.callPackage ({ libxml2 }: libxml2) { }; commonVer = "4.10"; version = "3.70"; dl = "8/0100007658/08"; - versionNoDots = builtins.replaceStrings ["."] [""] version; + versionNoDots = builtins.replaceStrings [ "." ] [ "" ] version; src_canon = fetchurl { url = "http://gdlp01.c-wss.com/gds/${dl}/linux-UFRII-drv-v${versionNoDots}-uken-05.tar.gz"; sha256 = "0424lvyrsvsb94qga4p4ldis7f714c5yw5ydv3f84mdl2a7papg0"; @@ -24,18 +35,18 @@ stdenv.mkDerivation { inherit version; src = src_canon; - phases = [ "unpackPhase" "installPhase" ]; - postUnpack = '' (cd $sourceRoot; tar -xzf Sources/cndrvcups-common-${commonVer}-1.tar.gz) (cd $sourceRoot; tar -xzf Sources/cndrvcups-lb-${version}-1.tar.gz) ''; - nativeBuildInputs = [ makeWrapper unzip autoreconfHook libtool ]; + nativeBuildInputs = [ makeWrapper unzip autoconf automake libtool ]; buildInputs = [ cups zlib ]; installPhase = '' + runHook preInstall + ## ## cndrvcups-common buildPhase ## @@ -213,7 +224,9 @@ stdenv.mkDerivation { makeWrapper "${ghostscript}/bin/gs" "$out/bin/gs" \ --prefix LD_LIBRARY_PATH ":" "$out/lib" \ --prefix PATH ":" "$out/bin" - ''; + + runHook postInstall + ''; meta = with lib; { description = "CUPS Linux drivers for Canon printers"; diff --git a/third_party/nixpkgs/pkgs/misc/cups/drivers/cups-bjnp/default.nix b/third_party/nixpkgs/pkgs/misc/cups/drivers/cups-bjnp/default.nix index 40243bb919..5a6ea08a8e 100644 --- a/third_party/nixpkgs/pkgs/misc/cups/drivers/cups-bjnp/default.nix +++ b/third_party/nixpkgs/pkgs/misc/cups/drivers/cups-bjnp/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl, cups}: stdenv.mkDerivation rec { - name = "cups-bjnp-1.2.2"; + pname = "cups-bjnp"; + version = "1.2.2"; src = fetchurl { - url = "mirror://sourceforge/cups-bjnp/${name}.tar.gz"; + url = "mirror://sourceforge/cups-bjnp/cups-bjnp-${version}.tar.gz"; sha256 = "0sb0vm1sf8ismzd9ba33qswxmsirj2z1b7lnyrc9v5ixm7q0bnrm"; }; diff --git a/third_party/nixpkgs/pkgs/misc/cups/drivers/splix/default.nix b/third_party/nixpkgs/pkgs/misc/cups/drivers/splix/default.nix index eae4212406..cfe53e48d6 100644 --- a/third_party/nixpkgs/pkgs/misc/cups/drivers/splix/default.nix +++ b/third_party/nixpkgs/pkgs/misc/cups/drivers/splix/default.nix @@ -3,7 +3,8 @@ let color-profiles = stdenv.mkDerivation { - name = "splix-color-profiles-20070625"; + pname = "splix-color-profiles"; + version = "unstable-2007-06-25"; src = fetchurl { url = "http://splix.ap2c.org/samsung_cms.tar.bz2"; @@ -17,14 +18,14 @@ let }; in stdenv.mkDerivation rec { - name = "splix-svn-${rev}"; - rev = "315"; + pname = "splix-svn"; + version = "315"; src = fetchsvn { # We build this from svn, because splix hasn't been in released in several years # although the community has been adding some new printer models. url = "svn://svn.code.sf.net/p/splix/code/splix"; - inherit rev; + rev = version; sha256 = "16wbm4xnz35ca3mw2iggf5f4jaxpyna718ia190ka6y4ah932jxl"; }; diff --git a/third_party/nixpkgs/pkgs/misc/drivers/epson-workforce-635-nx625-series/default.nix b/third_party/nixpkgs/pkgs/misc/drivers/epson-workforce-635-nx625-series/default.nix index e06a0c9116..73d88ad19c 100644 --- a/third_party/nixpkgs/pkgs/misc/drivers/epson-workforce-635-nx625-series/default.nix +++ b/third_party/nixpkgs/pkgs/misc/drivers/epson-workforce-635-nx625-series/default.nix @@ -9,14 +9,14 @@ let driver = "epson-inkjet-printer-workforce-635-nx625-series-1.0.1"; }; in stdenv.mkDerivation rec { - name = "epson-inkjet-printer-workforce-635-nx625-series"; + pname = "epson-inkjet-printer-workforce-635-nx625-series"; version = "1.0.1"; src = fetchurl { # NOTE: Don't forget to update the webarchive link too! urls = [ - "https://download.ebz.epson.net/dsc/op/stable/SRPMS/${name}-${version}-1lsb3.2.src.rpm" - "https://web.archive.org/web/https://download.ebz.epson.net/dsc/op/stable/SRPMS/${name}-${version}-1lsb3.2.src.rpm" + "https://download.ebz.epson.net/dsc/op/stable/SRPMS/${pname}-${version}-1lsb3.2.src.rpm" + "https://web.archive.org/web/https://download.ebz.epson.net/dsc/op/stable/SRPMS/${pname}-${version}-1lsb3.2.src.rpm" ]; sha256 = "19nb2h0y9rvv6rg7j262f8sqap9kjvz8kmisxnjg1w0v19zb9zf2"; }; @@ -40,7 +40,7 @@ in stdenv.mkDerivation rec { let filterdir = "$out/cups/lib/filter"; docdir = "$out/share/doc"; - ppddir = "$out/share/cups/model/${name}"; + ppddir = "$out/share/cups/model/${pname}"; libdir = if stdenv.system == "x86_64-linux" then "lib64" else if stdenv.system == "i686_linux" then "lib" @@ -51,7 +51,7 @@ in stdenv.mkDerivation rec { cd ../${srcdirs.driver} for ppd in ppds/*; do - substituteInPlace "$ppd" --replace '/opt/${name}' "$out" + substituteInPlace "$ppd" --replace '/opt/${pname}' "$out" gzip -c "$ppd" > "${ppddir}/''${ppd#*/}" done cp COPYING.EPSON README "${docdir}" @@ -91,7 +91,7 @@ in stdenv.mkDerivation rec { To use the driver adjust your configuration.nix file: services.printing = { enable = true; - drivers = [ pkgs.${name} ]; + drivers = [ pkgs.${pname} ]; }; ''; downloadPage = "https://download.ebz.epson.net/dsc/du/02/DriverDownloadInfo.do?LG2=EN&CN2=&DSCMI=16857&DSCCHK=4334d3487503d7f916ccf5d58071b05b7687294f"; diff --git a/third_party/nixpkgs/pkgs/misc/drivers/foomatic-filters/default.nix b/third_party/nixpkgs/pkgs/misc/drivers/foomatic-filters/default.nix index db1da676a5..5804eb6093 100644 --- a/third_party/nixpkgs/pkgs/misc/drivers/foomatic-filters/default.nix +++ b/third_party/nixpkgs/pkgs/misc/drivers/foomatic-filters/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchpatch, fetchurl, pkg-config, perl, cups, dbus, enscript }: stdenv.mkDerivation rec { - name = "foomatic-filters-4.0.17"; + pname = "foomatic-filters"; + version = "4.0.17"; src = fetchurl { - url = "https://www.openprinting.org/download/foomatic/${name}.tar.gz"; + url = "https://www.openprinting.org/download/foomatic/foomatic-filters-${version}.tar.gz"; sha256 = "1qrkgbm5jay2r7sh9qbyf0aiyrsl1mdc844hxf7fhw95a0zfbqm2"; }; diff --git a/third_party/nixpkgs/pkgs/misc/drivers/gutenprint/default.nix b/third_party/nixpkgs/pkgs/misc/drivers/gutenprint/default.nix index 9cd76c11cc..6b1bfefd70 100644 --- a/third_party/nixpkgs/pkgs/misc/drivers/gutenprint/default.nix +++ b/third_party/nixpkgs/pkgs/misc/drivers/gutenprint/default.nix @@ -6,10 +6,11 @@ }: stdenv.mkDerivation rec { - name = "gutenprint-5.3.4"; + pname = "gutenprint"; + version = "5.3.4"; src = fetchurl { - url = "mirror://sourceforge/gimp-print/${name}.tar.bz2"; + url = "mirror://sourceforge/gimp-print/gutenprint-${version}.tar.bz2"; sha256 = "0s0b14hjwvbxksq7af5v8z9g2rfqv9jdmxd9d81m57f5mh6rad0p"; }; diff --git a/third_party/nixpkgs/pkgs/misc/drivers/m33-linux/default.nix b/third_party/nixpkgs/pkgs/misc/drivers/m33-linux/default.nix index d2ba2685a2..84272898f5 100644 --- a/third_party/nixpkgs/pkgs/misc/drivers/m33-linux/default.nix +++ b/third_party/nixpkgs/pkgs/misc/drivers/m33-linux/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { - name = "M33-Linux-2016-06-23"; + pname = "M33-Linux"; + version = "unstable-2016-06-23"; src = fetchFromGitHub { owner = "donovan6000"; diff --git a/third_party/nixpkgs/pkgs/misc/drivers/xwiimote/default.nix b/third_party/nixpkgs/pkgs/misc/drivers/xwiimote/default.nix index 8fafd1b6eb..414a207fa5 100644 --- a/third_party/nixpkgs/pkgs/misc/drivers/xwiimote/default.nix +++ b/third_party/nixpkgs/pkgs/misc/drivers/xwiimote/default.nix @@ -1,9 +1,11 @@ { lib, stdenv, udev, ncurses, pkg-config, fetchurl, bluez }: stdenv.mkDerivation rec { - name = "xwiimote-2"; + pname = "xwiimote"; + version = "2"; + src = fetchurl { - url = "https://github.com/dvdhrm/xwiimote/releases/download/${name}/${name}.tar.xz"; + url = "https://github.com/dvdhrm/xwiimote/releases/download/xwiimote-${version}/xwiimote-${version}.tar.xz"; sha256 = "1g9cbhblll47l300zr999xr51x2g98y49l222f77fhswd12kjzhd"; }; diff --git a/third_party/nixpkgs/pkgs/misc/emulators/bsod/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/bsod/default.nix index 872ee8571f..869440856f 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/bsod/default.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/bsod/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl, ncurses}: -stdenv.mkDerivation { - name = "bsod-0.1"; +stdenv.mkDerivation rec { + pname = "bsod"; + version = "0.1"; src = fetchurl { - url = "https://www.vanheusden.com/bsod/bsod-0.1.tgz"; + url = "https://www.vanheusden.com/bsod/bsod-${version}.tgz"; sha256 = "0hqwacazyq5rhc04j8w8w0j0dgb6ca8k66c9lxf6bsyi6wvbhvmd"; }; diff --git a/third_party/nixpkgs/pkgs/misc/emulators/dosbox/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/dosbox/default.nix index 160c8733ff..ba4f88dbca 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/dosbox/default.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/dosbox/default.nix @@ -1,10 +1,11 @@ { stdenv, lib, fetchurl, makeDesktopItem, SDL, SDL_net, SDL_sound, libGLU, libGL, libpng, graphicsmagick }: stdenv.mkDerivation rec { - name = "dosbox-0.74-3"; + pname = "dosbox"; + version = "0.74-3"; src = fetchurl { - url = "mirror://sourceforge/dosbox/${name}.tar.gz"; + url = "mirror://sourceforge/dosbox/dosbox-${version}.tar.gz"; sha256 = "02i648i50dwicv1vaql15rccv4g8h5blf5g6inv67lrfxpbkvlf0"; }; diff --git a/third_party/nixpkgs/pkgs/misc/emulators/fakenes/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/fakenes/default.nix index 2011d8ce03..6bc4b1480f 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/fakenes/default.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/fakenes/default.nix @@ -1,10 +1,12 @@ {lib, stdenv, fetchurl, allegro, openal, libGLU, libGL, zlib, hawknl, freeglut, libX11, libXxf86vm, libXcursor, libXpm }: -stdenv.mkDerivation { - name = "fakenes-0.5.9b3"; +stdenv.mkDerivation rec { + pname = "fakenes"; + version = "0.5.9-beta3"; + src = fetchurl { - url = "mirror://sourceforge/fakenes/fakenes-0.5.9-beta3.tar.gz"; + url = "mirror://sourceforge/fakenes/fakenes-${version}.tar.gz"; sha256 = "026h67s4pzc1vma59pmzk02iy379255qbai2q74wln9bxqcpniy4"; }; diff --git a/third_party/nixpkgs/pkgs/misc/emulators/gens-gs/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/gens-gs/default.nix index abc676ffa6..0fbd12fc36 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/gens-gs/default.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/gens-gs/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, gtk2, SDL, nasm, zlib, libpng, libGLU, libGL }: -stdenv.mkDerivation { - name = "gens-gs-7"; +stdenv.mkDerivation rec { + pname = "gens-gs"; + version = "7"; src = fetchurl { - url = "http://retrocdn.net/images/6/6d/Gens-gs-r7.tar.gz"; + url = "http://retrocdn.net/images/6/6d/Gens-gs-r${version}.tar.gz"; sha256 = "1ha5s6d3y7s9aq9f4zmn9p88109c3mrj36z2w68jhiw5xrxws833"; }; diff --git a/third_party/nixpkgs/pkgs/misc/emulators/ryujinx/deps.nix b/third_party/nixpkgs/pkgs/misc/emulators/ryujinx/deps.nix index be92819498..6ae51812b3 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/ryujinx/deps.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/ryujinx/deps.nix @@ -1,1122 +1,226 @@ { fetchNuGet }: [ - (fetchNuGet { - name = "AtkSharp"; - version = "3.22.25.128"; - sha256 = "0fg01zi7v6127043jzxzihirsdp187pyj83gfa6p79cx763l7z94"; - }) - (fetchNuGet { - name = "CairoSharp"; - version = "3.22.25.128"; - sha256 = "1rjdxd4fq5z3n51qx8vrcaf4i277ccc62jxk88xzbsxapdmjjdf9"; - }) - (fetchNuGet { - name = "CommandLineParser"; - version = "2.8.0"; - sha256 = "1m32xyilv2b7k55jy8ddg08c20glbcj2yi545kxs9hj2ahanhrbb"; - }) - (fetchNuGet { - name = "Concentus"; - version = "1.1.7"; - sha256 = "0y5z444wrbhlmsqpy2sxmajl1fbf74843lvgj3y6vz260dn2q0l0"; - }) - (fetchNuGet { - name = "Crc32.NET"; - version = "1.2.0"; - sha256 = "0qaj3192k1vfji87zf50rhydn5mrzyzybrs2k4v7ap29k8i0vi5h"; - }) - (fetchNuGet { - name = "DiscordRichPresence"; - version = "1.0.175"; - sha256 = "180sax976327d70qbinv07f65g3w2zbw80n49hckg8wd4rw209vd"; - }) - (fetchNuGet { - name = "FFmpeg.AutoGen"; - version = "4.4.0"; - sha256 = "02n4az1jv30078019png9gbspygz051inxsn6w4iar20dqp55g2w"; - }) - (fetchNuGet { - name = "GdkSharp"; - version = "3.22.25.128"; - sha256 = "0bmn0ddaw8797pnhpyl03h2zl8i5ha67yv38gly4ydy50az2xhj7"; - }) - (fetchNuGet { - name = "GioSharp"; - version = "3.22.25.128"; - sha256 = "0syfa1f2hg7wsxln5lh86n8m1lihhprc51b6km91gkl25l5hw5bv"; - }) - (fetchNuGet { - name = "GLibSharp"; - version = "3.22.25.128"; - sha256 = "1j8i5izk97ga30z1qpd765zqd2q5w71y8bhnkqq4bj59768fyxp5"; - }) - (fetchNuGet { - name = "GtkSharp.Dependencies"; - version = "1.1.0"; - sha256 = "1g1rhcn38ww97638rds6l5bysra43hkhv47fy71fvq89623zgyxn"; - }) - (fetchNuGet { - name = "GtkSharp"; - version = "3.22.25.128"; - sha256 = "0z0wx0p3gc02r8d7y88k1rw307sb2vapbr1k1yc5qdc38fxz5jsy"; - }) - (fetchNuGet { - name = "LibHac"; - version = "0.12.0"; - sha256 = "08r9b9cdcbz6339sw8r5dfy2a8iw53df0j3xq9rygkg02xspimld"; - }) - (fetchNuGet { - name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; - version = "5.0.5"; - sha256 = "026m19pddhkx5idwpi6mp1yl9yfcfgm2qjp1jh54mdja1d7ng0vk"; - }) - (fetchNuGet { - name = "Microsoft.AspNetCore.App.Runtime.osx-x64"; - version = "5.0.5"; - sha256 = "09nsi9fa8kb3jpnim0hdap3jabskvpr4fmpvnj5wsh3gp91vqvgb"; - }) - (fetchNuGet { - name = "Microsoft.AspNetCore.App.Runtime.win-x64"; - version = "5.0.5"; - sha256 = "10g2vdsz685agqbd7h7dd9gvs584prpai0zv37r59wzlynj1assl"; - }) - (fetchNuGet { - name = "Microsoft.CodeCoverage"; - version = "16.8.0"; - sha256 = "1y05sjk7wgd29a47v1yhn2s1lrd8wgazkilvmjbvivmrrm3fqjs8"; - }) - (fetchNuGet { - name = "Microsoft.CSharp"; - version = "4.0.1"; - sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; - }) - (fetchNuGet { - name = "Microsoft.DotNet.InternalAbstractions"; - version = "1.0.0"; - sha256 = "0mp8ihqlb7fsa789frjzidrfjc1lrhk88qp3xm5qvr7vf4wy4z8x"; - }) - (fetchNuGet { - name = "Microsoft.NET.Test.Sdk"; - version = "16.8.0"; - sha256 = "1ln2mva7j2mpsj9rdhpk8vhm3pgd8wn563xqdcwd38avnhp74rm9"; - }) - (fetchNuGet { - name = "Microsoft.NETCore.App.Host.osx-x64"; - version = "5.0.5"; - sha256 = "14d6wz593dwm2j3apd3ny10idk8bfxqgfrparhc1q7q4i66y21ws"; - }) - (fetchNuGet { - name = "Microsoft.NETCore.App.Host.win-x64"; - version = "5.0.5"; - sha256 = "1233y31z46yqzjgwpa6mmb1h63iqp6wbly6mbwkjqm2adx1wkp47"; - }) - (fetchNuGet { - name = "Microsoft.NETCore.App.Runtime.linux-x64"; - version = "5.0.5"; - sha256 = "1h5yry6k9bpqqis2fb1901csb8kipm7anm174fjj41r317vzfjfa"; - }) - (fetchNuGet { - name = "Microsoft.NETCore.App.Runtime.osx-x64"; - version = "5.0.5"; - sha256 = "1a1ijdk61l0h25sj9ypcf96vz1c08ca7q5809g82qpi9m34kw8b8"; - }) - (fetchNuGet { - name = "Microsoft.NETCore.App.Runtime.win-x64"; - version = "5.0.5"; - sha256 = "1gc4msk61jgj9ill4icp0mn523g411iqpxphp0fykfvqdpqyqg46"; - }) - (fetchNuGet { - name = "Microsoft.NETCore.Platforms"; - version = "1.0.1"; - sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; - }) - (fetchNuGet { - name = "Microsoft.NETCore.Platforms"; - version = "1.1.0"; - sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; - }) - (fetchNuGet { - name = "Microsoft.NETCore.Platforms"; - version = "2.0.0"; - sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; - }) - (fetchNuGet { - name = "Microsoft.NETCore.Platforms"; - version = "5.0.0"; - sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; - }) - (fetchNuGet { - name = "Microsoft.NETCore.Targets"; - version = "1.0.1"; - sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; - }) - (fetchNuGet { - name = "Microsoft.NETCore.Targets"; - version = "1.1.0"; - sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; - }) - (fetchNuGet { - name = "Microsoft.TestPlatform.ObjectModel"; - version = "16.8.0"; - sha256 = "0ii9d88py6mjsxzj9v3zx4izh6rb9ma6s9kj85xmc0xrw7jc2g3m"; - }) - (fetchNuGet { - name = "Microsoft.TestPlatform.TestHost"; - version = "16.8.0"; - sha256 = "1rh8cga1km3jfafkwfjr0dwqrxb4306hf7fipwba9h02w7vlhb9a"; - }) - (fetchNuGet { - name = "Microsoft.Win32.Primitives"; - version = "4.0.1"; - sha256 = "1n8ap0cmljbqskxpf8fjzn7kh1vvlndsa75k01qig26mbw97k2q7"; - }) - (fetchNuGet { - name = "Microsoft.Win32.Primitives"; - version = "4.3.0"; - sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; - }) - (fetchNuGet { - name = "Microsoft.Win32.Registry"; - version = "4.3.0"; - sha256 = "1gxyzxam8163vk1kb6xzxjj4iwspjsz9zhgn1w9rjzciphaz0ig7"; - }) - (fetchNuGet { - name = "Microsoft.Win32.Registry"; - version = "4.5.0"; - sha256 = "1zapbz161ji8h82xiajgriq6zgzmb1f3ar517p2h63plhsq5gh2q"; - }) - (fetchNuGet { - name = "Microsoft.Win32.Registry"; - version = "5.0.0"; - sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; - }) - (fetchNuGet { - name = "Microsoft.Win32.SystemEvents"; - version = "5.0.0"; - sha256 = "0sja4ba0mrvdamn0r9mhq38b9dxi08yb3c1hzh29n1z6ws1hlrcq"; - }) - (fetchNuGet { - name = "Mono.Posix.NETStandard"; - version = "1.0.0"; - sha256 = "0xlja36hwpjm837haq15mjh2prcf68lyrmn72nvgpz8qnf9vappw"; - }) - (fetchNuGet { - name = "MsgPack.Cli"; - version = "1.0.1"; - sha256 = "1dk2bs3g16lsxcjjm7gfx6jxa4667wccw94jlh2ql7y7smvh9z8r"; - }) - (fetchNuGet { - name = "NETStandard.Library"; - version = "1.6.0"; - sha256 = "0nmmv4yw7gw04ik8ialj3ak0j6pxa9spih67hnn1h2c38ba8h58k"; - }) - (fetchNuGet { - name = "NETStandard.Library"; - version = "2.0.0"; - sha256 = "1bc4ba8ahgk15m8k4nd7x406nhi0kwqzbgjk2dmw52ss553xz7iy"; - }) - (fetchNuGet { - name = "Newtonsoft.Json"; - version = "12.0.2"; - sha256 = "0w2fbji1smd2y7x25qqibf1qrznmv4s6s0jvrbvr6alb7mfyqvh5"; - }) - (fetchNuGet { - name = "Newtonsoft.Json"; - version = "9.0.1"; - sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; - }) - (fetchNuGet { - name = "NuGet.Frameworks"; - version = "5.0.0"; - sha256 = "18ijvmj13cwjdrrm52c8fpq021531zaz4mj4b4zapxaqzzxf2qjr"; - }) - (fetchNuGet { - name = "NUnit"; - version = "3.12.0"; - sha256 = "1880j2xwavi8f28vxan3hyvdnph4nlh5sbmh285s4lc9l0b7bdk2"; - }) - (fetchNuGet { - name = "NUnit3TestAdapter"; - version = "3.17.0"; - sha256 = "0kxc6z3b8ccdrcyqz88jm5yh5ch9nbg303v67q8sp5hhs8rl8nk6"; - }) - (fetchNuGet { - name = "OpenTK.Core"; - version = "4.5.0"; - sha256 = "06qxczikp0aah20d4skk3g588dgh2vn2xffn0ajyyv0475m61s9m"; - }) - (fetchNuGet { - name = "OpenTK.Graphics"; - version = "4.5.0"; - sha256 = "180g5c92fhhhpmwl6paihx4h1bil7akaihlz2qy124n28pf4s988"; - }) - (fetchNuGet { - name = "OpenTK.Mathematics"; - version = "4.5.0"; - sha256 = "1h9dxhq1llxdbgdzsi87ijqgj2ilr3rv0zkxhaa65xrc5x8j8fva"; - }) - (fetchNuGet { - name = "OpenTK.OpenAL"; - version = "4.5.0"; - sha256 = "0lqxpc3vnxglql42x2frvq5bpkl5cf3dpnf9nx6pr3q6qnhigkfb"; - }) - (fetchNuGet { - name = "PangoSharp"; - version = "3.22.25.128"; - sha256 = "0dkl9j0yd65s5ds9xj5z6yb7yca7wlycqz25m8dng20d13sqr1zp"; - }) - (fetchNuGet { - name = "runtime.any.System.Collections"; - version = "4.3.0"; - sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; - }) - (fetchNuGet { - name = "runtime.any.System.Diagnostics.Tools"; - version = "4.3.0"; - sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; - }) - (fetchNuGet { - name = "runtime.any.System.Diagnostics.Tracing"; - version = "4.3.0"; - sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; - }) - (fetchNuGet { - name = "runtime.any.System.Globalization.Calendars"; - version = "4.3.0"; - sha256 = "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201"; - }) - (fetchNuGet { - name = "runtime.any.System.Globalization"; - version = "4.3.0"; - sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; - }) - (fetchNuGet { - name = "runtime.any.System.IO"; - version = "4.3.0"; - sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; - }) - (fetchNuGet { - name = "runtime.any.System.Reflection.Extensions"; - version = "4.3.0"; - sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"; - }) - (fetchNuGet { - name = "runtime.any.System.Reflection.Primitives"; - version = "4.3.0"; - sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; - }) - (fetchNuGet { - name = "runtime.any.System.Reflection"; - version = "4.3.0"; - sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; - }) - (fetchNuGet { - name = "runtime.any.System.Resources.ResourceManager"; - version = "4.3.0"; - sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; - }) - (fetchNuGet { - name = "runtime.any.System.Runtime.Handles"; - version = "4.3.0"; - sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; - }) - (fetchNuGet { - name = "runtime.any.System.Runtime.InteropServices"; - version = "4.3.0"; - sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; - }) - (fetchNuGet { - name = "runtime.any.System.Runtime"; - version = "4.3.0"; - sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; - }) - (fetchNuGet { - name = "runtime.any.System.Text.Encoding.Extensions"; - version = "4.3.0"; - sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; - }) - (fetchNuGet { - name = "runtime.any.System.Text.Encoding"; - version = "4.3.0"; - sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; - }) - (fetchNuGet { - name = "runtime.any.System.Threading.Tasks"; - version = "4.3.0"; - sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; - }) - (fetchNuGet { - name = "runtime.any.System.Threading.Timer"; - version = "4.3.0"; - sha256 = "0aw4phrhwqz9m61r79vyfl5la64bjxj8l34qnrcwb28v49fg2086"; - }) - (fetchNuGet { - name = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; - }) - (fetchNuGet { - name = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; - }) - (fetchNuGet { - name = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; - }) - (fetchNuGet { - name = "runtime.native.System.IO.Compression"; - version = "4.1.0"; - sha256 = "0d720z4lzyfcabmmnvh0bnj76ll7djhji2hmfh3h44sdkjnlkknk"; - }) - (fetchNuGet { - name = "runtime.native.System.Net.Http"; - version = "4.0.1"; - sha256 = "1hgv2bmbaskx77v8glh7waxws973jn4ah35zysnkxmf0196sfxg6"; - }) - (fetchNuGet { - name = "runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; - }) - (fetchNuGet { - name = "runtime.native.System.Security.Cryptography"; - version = "4.0.0"; - sha256 = "0k57aa2c3b10wl3hfqbgrl7xq7g8hh3a3ir44b31dn5p61iiw3z9"; - }) - (fetchNuGet { - name = "runtime.native.System"; - version = "4.0.0"; - sha256 = "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf"; - }) - (fetchNuGet { - name = "runtime.native.System"; - version = "4.3.0"; - sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; - }) - (fetchNuGet { - name = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; - }) - (fetchNuGet { - name = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; - }) - (fetchNuGet { - name = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; - }) - (fetchNuGet { - name = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; - }) - (fetchNuGet { - name = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; - }) - (fetchNuGet { - name = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; - }) - (fetchNuGet { - name = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; - }) - (fetchNuGet { - name = "runtime.unix.Microsoft.Win32.Primitives"; - version = "4.3.0"; - sha256 = "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id"; - }) - (fetchNuGet { - name = "runtime.unix.System.Console"; - version = "4.3.0"; - sha256 = "1pfpkvc6x2if8zbdzg9rnc5fx51yllprl8zkm5npni2k50lisy80"; - }) - (fetchNuGet { - name = "runtime.unix.System.Diagnostics.Debug"; - version = "4.3.0"; - sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; - }) - (fetchNuGet { - name = "runtime.unix.System.IO.FileSystem"; - version = "4.3.0"; - sha256 = "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix"; - }) - (fetchNuGet { - name = "runtime.unix.System.Net.Primitives"; - version = "4.3.0"; - sha256 = "0bdnglg59pzx9394sy4ic66kmxhqp8q8bvmykdxcbs5mm0ipwwm4"; - }) - (fetchNuGet { - name = "runtime.unix.System.Net.Sockets"; - version = "4.3.0"; - sha256 = "03npdxzy8gfv035bv1b9rz7c7hv0rxl5904wjz51if491mw0xy12"; - }) - (fetchNuGet { - name = "runtime.unix.System.Private.Uri"; - version = "4.3.0"; - sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; - }) - (fetchNuGet { - name = "runtime.unix.System.Runtime.Extensions"; - version = "4.3.0"; - sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; - }) - (fetchNuGet { - name = "runtime.win.Microsoft.Win32.Primitives"; - version = "4.3.0"; - sha256 = "0k1h8nnp1s0p8rjwgjyj1387cc1yycv0k22igxc963lqdzrx2z36"; - }) - (fetchNuGet { - name = "runtime.win.System.Console"; - version = "4.3.0"; - sha256 = "0x2yajfrbc5zc6g7nmlr44xpjk6p1hxjq47jn3xki5j7i33zw9jc"; - }) - (fetchNuGet { - name = "runtime.win.System.Diagnostics.Debug"; - version = "4.3.0"; - sha256 = "16fbn4bcynad1ygdq0yk1wmckvs8jvrrf104xa5dc2hlc8y3x58f"; - }) - (fetchNuGet { - name = "runtime.win.System.IO.FileSystem"; - version = "4.3.0"; - sha256 = "1c01nklbxywszsbfaxc76hsz7gdxac3jkphrywfkdsi3v4bwd6g8"; - }) - (fetchNuGet { - name = "runtime.win.System.Net.Primitives"; - version = "4.3.0"; - sha256 = "1dixh195bi7473n17hspll6i562gghdz9m4jk8d4kzi1mlzjk9cf"; - }) - (fetchNuGet { - name = "runtime.win.System.Net.Sockets"; - version = "4.3.0"; - sha256 = "0lr3zki831vs6qhk5wckv2b9qbfk9rcj0ds2926qvj1b9y9m6sck"; - }) - (fetchNuGet { - name = "runtime.win.System.Runtime.Extensions"; - version = "4.3.0"; - sha256 = "1700famsxndccfbcdz9q14qb20p49lax67mqwpgy4gx3vja1yczr"; - }) - (fetchNuGet { - name = "Ryujinx.Audio.OpenAL.Dependencies"; - version = "1.21.0.1"; - sha256 = "0z5k42h252nr60d02p2ww9190d7k1kzrb26vil4ydfhxqqqv6w9l"; - }) - (fetchNuGet { - name = "Ryujinx.Graphics.Nvdec.Dependencies"; - version = "4.4.0-build7"; - sha256 = "0g1l3lgs0ffxp64ka81v6q1cgsdirl1qlf73255v29r3v337074m"; - }) - (fetchNuGet { - name = "Ryujinx.SDL2-CS"; - version = "2.0.15-build11"; - sha256 = "0s4h69l2b508l5wxp4v4ip8k83k78p3963xxv8bfamin9517przi"; - }) - (fetchNuGet { - name = "SharpZipLib"; - version = "1.3.0"; - sha256 = "1pizj82wisch28nfdaszwqm9bz19lnl0s5mq8c0zybm2vhnrhvk4"; - }) - (fetchNuGet { - name = "SixLabors.Fonts"; - version = "1.0.0-beta0013"; - sha256 = "0r0aw8xxd32rwcawawcz6asiyggz02hnzg5hvz8gimq8hvwx1wql"; - }) - (fetchNuGet { - name = "SixLabors.ImageSharp.Drawing"; - version = "1.0.0-beta11"; - sha256 = "0hl0rs3kr1zdnx3gdssxgli6fyvmwzcfp99f4db71s0i8j8b2bp5"; - }) - (fetchNuGet { - name = "SixLabors.ImageSharp"; - version = "1.0.2"; - sha256 = "0fhk9sn8k18slfb26wz8mal0j699f7djwhxgv97snz6b10wynfaj"; - }) - (fetchNuGet { - name = "SPB"; - version = "0.0.3-build15"; - sha256 = "0h00yi2j65q31r5npsziq2rpiw832vf9r72j1hjqibp2l5m6v6yw"; - }) - (fetchNuGet { - name = "System.AppContext"; - version = "4.1.0"; - sha256 = "0fv3cma1jp4vgj7a8hqc9n7hr1f1kjp541s6z0q1r6nazb4iz9mz"; - }) - (fetchNuGet { - name = "System.Buffers"; - version = "4.0.0"; - sha256 = "13s659bcmg9nwb6z78971z1lr6bmh2wghxi1ayqyzl4jijd351gr"; - }) - (fetchNuGet { - name = "System.Buffers"; - version = "4.3.0"; - sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; - }) - (fetchNuGet { - name = "System.CodeDom"; - version = "4.4.0"; - sha256 = "1zgbafm5p380r50ap5iddp11kzhr9khrf2pnai6k593wjar74p1g"; - }) - (fetchNuGet { - name = "System.CodeDom"; - version = "5.0.0"; - sha256 = "14zs2wqkmdlxzj8ikx19n321lsbarx5vl2a8wrachymxn8zb5njh"; - }) - (fetchNuGet { - name = "System.Collections.Concurrent"; - version = "4.0.12"; - sha256 = "07y08kvrzpak873pmyxs129g1ch8l27zmg51pcyj2jvq03n0r0fc"; - }) - (fetchNuGet { - name = "System.Collections.NonGeneric"; - version = "4.3.0"; - sha256 = "07q3k0hf3mrcjzwj8fwk6gv3n51cb513w4mgkfxzm3i37sc9kz7k"; - }) - (fetchNuGet { - name = "System.Collections.Specialized"; - version = "4.3.0"; - sha256 = "1sdwkma4f6j85m3dpb53v9vcgd0zyc9jb33f8g63byvijcj39n20"; - }) - (fetchNuGet { - name = "System.Collections"; - version = "4.0.11"; - sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; - }) - (fetchNuGet { - name = "System.Collections"; - version = "4.3.0"; - sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; - }) - (fetchNuGet { - name = "System.ComponentModel.EventBasedAsync"; - version = "4.3.0"; - sha256 = "1rv9bkb8yyhqqqrx6x95njv6mdxlbvv527b44mrd93g8fmgkifl7"; - }) - (fetchNuGet { - name = "System.ComponentModel.Primitives"; - version = "4.3.0"; - sha256 = "1svfmcmgs0w0z9xdw2f2ps05rdxmkxxhf0l17xk9l1l8xfahkqr0"; - }) - (fetchNuGet { - name = "System.ComponentModel.TypeConverter"; - version = "4.3.0"; - sha256 = "17ng0p7v3nbrg3kycz10aqrrlw4lz9hzhws09pfh8gkwicyy481x"; - }) - (fetchNuGet { - name = "System.ComponentModel"; - version = "4.3.0"; - sha256 = "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb"; - }) - (fetchNuGet { - name = "System.Console"; - version = "4.0.0"; - sha256 = "0ynxqbc3z1nwbrc11hkkpw9skw116z4y9wjzn7id49p9yi7mzmlf"; - }) - (fetchNuGet { - name = "System.Diagnostics.Debug"; - version = "4.0.11"; - sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; - }) - (fetchNuGet { - name = "System.Diagnostics.Debug"; - version = "4.3.0"; - sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; - }) - (fetchNuGet { - name = "System.Diagnostics.DiagnosticSource"; - version = "4.0.0"; - sha256 = "1n6c3fbz7v8d3pn77h4v5wvsfrfg7v1c57lg3nff3cjyh597v23m"; - }) - (fetchNuGet { - name = "System.Diagnostics.Process"; - version = "4.3.0"; - sha256 = "0g4prsbkygq8m21naqmcp70f24a1ksyix3dihb1r1f71lpi3cfj7"; - }) - (fetchNuGet { - name = "System.Diagnostics.Tools"; - version = "4.0.1"; - sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; - }) - (fetchNuGet { - name = "System.Diagnostics.Tracing"; - version = "4.1.0"; - sha256 = "1d2r76v1x610x61ahfpigda89gd13qydz6vbwzhpqlyvq8jj6394"; - }) - (fetchNuGet { - name = "System.Diagnostics.Tracing"; - version = "4.3.0"; - sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; - }) - (fetchNuGet { - name = "System.Drawing.Common"; - version = "5.0.1"; - sha256 = "14h722wq58k1wmgxmpws91xc7kh8109ijw0hcxjq9qkbhbi6pwmb"; - }) - (fetchNuGet { - name = "System.Dynamic.Runtime"; - version = "4.0.11"; - sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; - }) - (fetchNuGet { - name = "System.Globalization.Calendars"; - version = "4.0.1"; - sha256 = "0bv0alrm2ck2zk3rz25lfyk9h42f3ywq77mx1syl6vvyncnpg4qh"; - }) - (fetchNuGet { - name = "System.Globalization.Extensions"; - version = "4.0.1"; - sha256 = "0hjhdb5ri8z9l93bw04s7ynwrjrhx2n0p34sf33a9hl9phz69fyc"; - }) - (fetchNuGet { - name = "System.Globalization.Extensions"; - version = "4.3.0"; - sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; - }) - (fetchNuGet { - name = "System.Globalization"; - version = "4.0.11"; - sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; - }) - (fetchNuGet { - name = "System.Globalization"; - version = "4.3.0"; - sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; - }) - (fetchNuGet { - name = "System.IO.Compression.ZipFile"; - version = "4.0.1"; - sha256 = "0h72znbagmgvswzr46mihn7xm7chfk2fhrp5krzkjf29pz0i6z82"; - }) - (fetchNuGet { - name = "System.IO.Compression"; - version = "4.1.0"; - sha256 = "0iym7s3jkl8n0vzm3jd6xqg9zjjjqni05x45dwxyjr2dy88hlgji"; - }) - (fetchNuGet { - name = "System.IO.FileSystem.Primitives"; - version = "4.0.1"; - sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; - }) - (fetchNuGet { - name = "System.IO.FileSystem.Primitives"; - version = "4.3.0"; - sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; - }) - (fetchNuGet { - name = "System.IO.FileSystem"; - version = "4.0.1"; - sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; - }) - (fetchNuGet { - name = "System.IO.FileSystem"; - version = "4.3.0"; - sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; - }) - (fetchNuGet { - name = "System.IO"; - version = "4.1.0"; - sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; - }) - (fetchNuGet { - name = "System.IO"; - version = "4.3.0"; - sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; - }) - (fetchNuGet { - name = "System.Linq.Expressions"; - version = "4.1.0"; - sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; - }) - (fetchNuGet { - name = "System.Linq"; - version = "4.1.0"; - sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; - }) - (fetchNuGet { - name = "System.Linq"; - version = "4.3.0"; - sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; - }) - (fetchNuGet { - name = "System.Management"; - version = "5.0.0"; - sha256 = "09hyv3p0zd549577clydlb2szl84m4gvdjnsry73n8b12ja7d75s"; - }) - (fetchNuGet { - name = "System.Net.Http"; - version = "4.1.0"; - sha256 = "1i5rqij1icg05j8rrkw4gd4pgia1978mqhjzhsjg69lvwcdfg8yb"; - }) - (fetchNuGet { - name = "System.Net.NameResolution"; - version = "4.3.0"; - sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; - }) - (fetchNuGet { - name = "System.Net.Primitives"; - version = "4.0.11"; - sha256 = "10xzzaynkzkakp7jai1ik3r805zrqjxiz7vcagchyxs2v26a516r"; - }) - (fetchNuGet { - name = "System.Net.Sockets"; - version = "4.1.0"; - sha256 = "1385fvh8h29da5hh58jm1v78fzi9fi5vj93vhlm2kvqpfahvpqls"; - }) - (fetchNuGet { - name = "System.Numerics.Vectors"; - version = "4.3.0"; - sha256 = "05kji1mv4sl75iwmc613p873145nynm02xiajx8pn0h2kx53d23s"; - }) - (fetchNuGet { - name = "System.Numerics.Vectors"; - version = "4.5.0"; - sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; - }) - (fetchNuGet { - name = "System.ObjectModel"; - version = "4.0.12"; - sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; - }) - (fetchNuGet { - name = "System.Private.Uri"; - version = "4.3.0"; - sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; - }) - (fetchNuGet { - name = "System.Reflection.Emit.ILGeneration"; - version = "4.0.1"; - sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0"; - }) - (fetchNuGet { - name = "System.Reflection.Emit.ILGeneration"; - version = "4.3.0"; - sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; - }) - (fetchNuGet { - name = "System.Reflection.Emit.Lightweight"; - version = "4.0.1"; - sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr"; - }) - (fetchNuGet { - name = "System.Reflection.Emit.Lightweight"; - version = "4.3.0"; - sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; - }) - (fetchNuGet { - name = "System.Reflection.Emit"; - version = "4.0.1"; - sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; - }) - (fetchNuGet { - name = "System.Reflection.Emit"; - version = "4.3.0"; - sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; - }) - (fetchNuGet { - name = "System.Reflection.Extensions"; - version = "4.0.1"; - sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; - }) - (fetchNuGet { - name = "System.Reflection.Extensions"; - version = "4.3.0"; - sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; - }) - (fetchNuGet { - name = "System.Reflection.Primitives"; - version = "4.0.1"; - sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; - }) - (fetchNuGet { - name = "System.Reflection.Primitives"; - version = "4.3.0"; - sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; - }) - (fetchNuGet { - name = "System.Reflection.TypeExtensions"; - version = "4.1.0"; - sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; - }) - (fetchNuGet { - name = "System.Reflection.TypeExtensions"; - version = "4.3.0"; - sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; - }) - (fetchNuGet { - name = "System.Reflection"; - version = "4.1.0"; - sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; - }) - (fetchNuGet { - name = "System.Reflection"; - version = "4.3.0"; - sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; - }) - (fetchNuGet { - name = "System.Resources.ResourceManager"; - version = "4.0.1"; - sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; - }) - (fetchNuGet { - name = "System.Resources.ResourceManager"; - version = "4.3.0"; - sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; - }) - (fetchNuGet { - name = "System.Runtime.CompilerServices.Unsafe"; - version = "4.7.0"; - sha256 = "16r6sn4czfjk8qhnz7bnqlyiaaszr0ihinb7mq9zzr1wba257r54"; - }) - (fetchNuGet { - name = "System.Runtime.CompilerServices.Unsafe"; - version = "5.0.0-preview.7.20364.11"; - sha256 = "19sl184f6rjhfsizq0vapysazd6yd66lf638rszvrdhqlsxssz2m"; - }) - (fetchNuGet { - name = "System.Runtime.Extensions"; - version = "4.1.0"; - sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; - }) - (fetchNuGet { - name = "System.Runtime.Extensions"; - version = "4.3.0"; - sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; - }) - (fetchNuGet { - name = "System.Runtime.Handles"; - version = "4.0.1"; - sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; - }) - (fetchNuGet { - name = "System.Runtime.Handles"; - version = "4.3.0"; - sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; - }) - (fetchNuGet { - name = "System.Runtime.InteropServices.RuntimeInformation"; - version = "4.0.0"; - sha256 = "0glmvarf3jz5xh22iy3w9v3wyragcm4hfdr17v90vs7vcrm7fgp6"; - }) - (fetchNuGet { - name = "System.Runtime.InteropServices.RuntimeInformation"; - version = "4.3.0"; - sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; - }) - (fetchNuGet { - name = "System.Runtime.InteropServices"; - version = "4.1.0"; - sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; - }) - (fetchNuGet { - name = "System.Runtime.InteropServices"; - version = "4.3.0"; - sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; - }) - (fetchNuGet { - name = "System.Runtime.Numerics"; - version = "4.0.1"; - sha256 = "1y308zfvy0l5nrn46mqqr4wb4z1xk758pkk8svbz8b5ij7jnv4nn"; - }) - (fetchNuGet { - name = "System.Runtime.Serialization.Primitives"; - version = "4.1.1"; - sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; - }) - (fetchNuGet { - name = "System.Runtime"; - version = "4.1.0"; - sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; - }) - (fetchNuGet { - name = "System.Runtime"; - version = "4.3.0"; - sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; - }) - (fetchNuGet { - name = "System.Security.AccessControl"; - version = "4.5.0"; - sha256 = "1wvwanz33fzzbnd2jalar0p0z3x0ba53vzx1kazlskp7pwyhlnq0"; - }) - (fetchNuGet { - name = "System.Security.AccessControl"; - version = "5.0.0"; - sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r"; - }) - (fetchNuGet { - name = "System.Security.Claims"; - version = "4.3.0"; - sha256 = "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn"; - }) - (fetchNuGet { - name = "System.Security.Cryptography.Algorithms"; - version = "4.2.0"; - sha256 = "148s9g5dgm33ri7dnh19s4lgnlxbpwvrw2jnzllq2kijj4i4vs85"; - }) - (fetchNuGet { - name = "System.Security.Cryptography.Cng"; - version = "4.2.0"; - sha256 = "118jijz446kix20blxip0f0q8mhsh9bz118mwc2ch1p6g7facpzc"; - }) - (fetchNuGet { - name = "System.Security.Cryptography.Csp"; - version = "4.0.0"; - sha256 = "1cwv8lqj8r15q81d2pz2jwzzbaji0l28xfrpw29kdpsaypm92z2q"; - }) - (fetchNuGet { - name = "System.Security.Cryptography.Encoding"; - version = "4.0.0"; - sha256 = "0a8y1a5wkmpawc787gfmnrnbzdgxmx1a14ax43jf3rj9gxmy3vk4"; - }) - (fetchNuGet { - name = "System.Security.Cryptography.OpenSsl"; - version = "4.0.0"; - sha256 = "16sx3cig3d0ilvzl8xxgffmxbiqx87zdi8fc73i3i7zjih1a7f4q"; - }) - (fetchNuGet { - name = "System.Security.Cryptography.Primitives"; - version = "4.0.0"; - sha256 = "0i7cfnwph9a10bm26m538h5xcr8b36jscp9sy1zhgifksxz4yixh"; - }) - (fetchNuGet { - name = "System.Security.Cryptography.X509Certificates"; - version = "4.1.0"; - sha256 = "0clg1bv55mfv5dq00m19cp634zx6inm31kf8ppbq1jgyjf2185dh"; - }) - (fetchNuGet { - name = "System.Security.Principal.Windows"; - version = "4.3.0"; - sha256 = "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr"; - }) - (fetchNuGet { - name = "System.Security.Principal.Windows"; - version = "4.5.0"; - sha256 = "0rmj89wsl5yzwh0kqjgx45vzf694v9p92r4x4q6yxldk1cv1hi86"; - }) - (fetchNuGet { - name = "System.Security.Principal.Windows"; - version = "5.0.0"; - sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; - }) - (fetchNuGet { - name = "System.Security.Principal"; - version = "4.3.0"; - sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; - }) - (fetchNuGet { - name = "System.Text.Encoding.Extensions"; - version = "4.0.11"; - sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; - }) - (fetchNuGet { - name = "System.Text.Encoding.Extensions"; - version = "4.3.0"; - sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; - }) - (fetchNuGet { - name = "System.Text.Encoding"; - version = "4.0.11"; - sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; - }) - (fetchNuGet { - name = "System.Text.Encoding"; - version = "4.3.0"; - sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; - }) - (fetchNuGet { - name = "System.Text.RegularExpressions"; - version = "4.1.0"; - sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; - }) - (fetchNuGet { - name = "System.Text.RegularExpressions"; - version = "4.3.0"; - sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; - }) - (fetchNuGet { - name = "System.Threading.Overlapped"; - version = "4.3.0"; - sha256 = "1nahikhqh9nk756dh8p011j36rlcp1bzz3vwi2b4m1l2s3vz8idm"; - }) - (fetchNuGet { - name = "System.Threading.Tasks.Extensions"; - version = "4.0.0"; - sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; - }) - (fetchNuGet { - name = "System.Threading.Tasks.Extensions"; - version = "4.3.0"; - sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; - }) - (fetchNuGet { - name = "System.Threading.Tasks"; - version = "4.0.11"; - sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; - }) - (fetchNuGet { - name = "System.Threading.Tasks"; - version = "4.3.0"; - sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; - }) - (fetchNuGet { - name = "System.Threading.Thread"; - version = "4.3.0"; - sha256 = "0y2xiwdfcph7znm2ysxanrhbqqss6a3shi1z3c779pj2s523mjx4"; - }) - (fetchNuGet { - name = "System.Threading.ThreadPool"; - version = "4.3.0"; - sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; - }) - (fetchNuGet { - name = "System.Threading.Timer"; - version = "4.0.1"; - sha256 = "15n54f1f8nn3mjcjrlzdg6q3520571y012mx7v991x2fvp73lmg6"; - }) - (fetchNuGet { - name = "System.Threading"; - version = "4.0.11"; - sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; - }) - (fetchNuGet { - name = "System.Threading"; - version = "4.3.0"; - sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; - }) - (fetchNuGet { - name = "System.Xml.ReaderWriter"; - version = "4.0.11"; - sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; - }) - (fetchNuGet { - name = "System.Xml.ReaderWriter"; - version = "4.3.0"; - sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; - }) - (fetchNuGet { - name = "System.Xml.XDocument"; - version = "4.0.11"; - sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; - }) - (fetchNuGet { - name = "System.Xml.XmlDocument"; - version = "4.3.0"; - sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi"; - }) - (fetchNuGet { - name = "System.Xml.XPath.XmlDocument"; - version = "4.3.0"; - sha256 = "1h9lh7qkp0lff33z847sdfjj8yaz98ylbnkbxlnsbflhj9xyfqrm"; - }) - (fetchNuGet { - name = "System.Xml.XPath"; - version = "4.3.0"; - sha256 = "1cv2m0p70774a0sd1zxc8fm8jk3i5zk2bla3riqvi8gsm0r4kpci"; - }) + (fetchNuGet { name = "AtkSharp"; version = "3.22.25.128"; sha256 = "0fg01zi7v6127043jzxzihirsdp187pyj83gfa6p79cx763l7z94"; }) + (fetchNuGet { name = "CairoSharp"; version = "3.22.25.128"; sha256 = "1rjdxd4fq5z3n51qx8vrcaf4i277ccc62jxk88xzbsxapdmjjdf9"; }) + (fetchNuGet { name = "CommandLineParser"; version = "2.8.0"; sha256 = "1m32xyilv2b7k55jy8ddg08c20glbcj2yi545kxs9hj2ahanhrbb"; }) + (fetchNuGet { name = "Concentus"; version = "1.1.7"; sha256 = "0y5z444wrbhlmsqpy2sxmajl1fbf74843lvgj3y6vz260dn2q0l0"; }) + (fetchNuGet { name = "Crc32.NET"; version = "1.2.0"; sha256 = "0qaj3192k1vfji87zf50rhydn5mrzyzybrs2k4v7ap29k8i0vi5h"; }) + (fetchNuGet { name = "DiscordRichPresence"; version = "1.0.175"; sha256 = "180sax976327d70qbinv07f65g3w2zbw80n49hckg8wd4rw209vd"; }) + (fetchNuGet { name = "FFmpeg.AutoGen"; version = "4.4.0"; sha256 = "02n4az1jv30078019png9gbspygz051inxsn6w4iar20dqp55g2w"; }) + (fetchNuGet { name = "GdkSharp"; version = "3.22.25.128"; sha256 = "0bmn0ddaw8797pnhpyl03h2zl8i5ha67yv38gly4ydy50az2xhj7"; }) + (fetchNuGet { name = "GioSharp"; version = "3.22.25.128"; sha256 = "0syfa1f2hg7wsxln5lh86n8m1lihhprc51b6km91gkl25l5hw5bv"; }) + (fetchNuGet { name = "GLibSharp"; version = "3.22.25.128"; sha256 = "1j8i5izk97ga30z1qpd765zqd2q5w71y8bhnkqq4bj59768fyxp5"; }) + (fetchNuGet { name = "GtkSharp"; version = "3.22.25.128"; sha256 = "0z0wx0p3gc02r8d7y88k1rw307sb2vapbr1k1yc5qdc38fxz5jsy"; }) + (fetchNuGet { name = "GtkSharp.Dependencies"; version = "1.1.0"; sha256 = "1g1rhcn38ww97638rds6l5bysra43hkhv47fy71fvq89623zgyxn"; }) + (fetchNuGet { name = "LibHac"; version = "0.12.0"; sha256 = "08r9b9cdcbz6339sw8r5dfy2a8iw53df0j3xq9rygkg02xspimld"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "5.0.5"; sha256 = "026m19pddhkx5idwpi6mp1yl9yfcfgm2qjp1jh54mdja1d7ng0vk"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "5.0.5"; sha256 = "09nsi9fa8kb3jpnim0hdap3jabskvpr4fmpvnj5wsh3gp91vqvgb"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "5.0.5"; sha256 = "10g2vdsz685agqbd7h7dd9gvs584prpai0zv37r59wzlynj1assl"; }) + (fetchNuGet { name = "Microsoft.CodeCoverage"; version = "16.8.0"; sha256 = "1y05sjk7wgd29a47v1yhn2s1lrd8wgazkilvmjbvivmrrm3fqjs8"; }) + (fetchNuGet { name = "Microsoft.CSharp"; version = "4.0.1"; sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; }) + (fetchNuGet { name = "Microsoft.DotNet.InternalAbstractions"; version = "1.0.0"; sha256 = "0mp8ihqlb7fsa789frjzidrfjc1lrhk88qp3xm5qvr7vf4wy4z8x"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Host.osx-x64"; version = "5.0.5"; sha256 = "14d6wz593dwm2j3apd3ny10idk8bfxqgfrparhc1q7q4i66y21ws"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Host.win-x64"; version = "5.0.5"; sha256 = "1233y31z46yqzjgwpa6mmb1h63iqp6wbly6mbwkjqm2adx1wkp47"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "5.0.5"; sha256 = "1h5yry6k9bpqqis2fb1901csb8kipm7anm174fjj41r317vzfjfa"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "5.0.5"; sha256 = "1a1ijdk61l0h25sj9ypcf96vz1c08ca7q5809g82qpi9m34kw8b8"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.win-x64"; version = "5.0.5"; sha256 = "1gc4msk61jgj9ill4icp0mn523g411iqpxphp0fykfvqdpqyqg46"; }) + (fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) + (fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) + (fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "2.0.0"; sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; }) + (fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) + (fetchNuGet { name = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; }) + (fetchNuGet { name = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) + (fetchNuGet { name = "Microsoft.NET.Test.Sdk"; version = "16.8.0"; sha256 = "1ln2mva7j2mpsj9rdhpk8vhm3pgd8wn563xqdcwd38avnhp74rm9"; }) + (fetchNuGet { name = "Microsoft.TestPlatform.ObjectModel"; version = "16.8.0"; sha256 = "0ii9d88py6mjsxzj9v3zx4izh6rb9ma6s9kj85xmc0xrw7jc2g3m"; }) + (fetchNuGet { name = "Microsoft.TestPlatform.TestHost"; version = "16.8.0"; sha256 = "1rh8cga1km3jfafkwfjr0dwqrxb4306hf7fipwba9h02w7vlhb9a"; }) + (fetchNuGet { name = "Microsoft.Win32.Primitives"; version = "4.0.1"; sha256 = "1n8ap0cmljbqskxpf8fjzn7kh1vvlndsa75k01qig26mbw97k2q7"; }) + (fetchNuGet { name = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) + (fetchNuGet { name = "Microsoft.Win32.Registry"; version = "4.3.0"; sha256 = "1gxyzxam8163vk1kb6xzxjj4iwspjsz9zhgn1w9rjzciphaz0ig7"; }) + (fetchNuGet { name = "Microsoft.Win32.Registry"; version = "4.5.0"; sha256 = "1zapbz161ji8h82xiajgriq6zgzmb1f3ar517p2h63plhsq5gh2q"; }) + (fetchNuGet { name = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; }) + (fetchNuGet { name = "Microsoft.Win32.SystemEvents"; version = "5.0.0"; sha256 = "0sja4ba0mrvdamn0r9mhq38b9dxi08yb3c1hzh29n1z6ws1hlrcq"; }) + (fetchNuGet { name = "Mono.Posix.NETStandard"; version = "1.0.0"; sha256 = "0xlja36hwpjm837haq15mjh2prcf68lyrmn72nvgpz8qnf9vappw"; }) + (fetchNuGet { name = "MsgPack.Cli"; version = "1.0.1"; sha256 = "1dk2bs3g16lsxcjjm7gfx6jxa4667wccw94jlh2ql7y7smvh9z8r"; }) + (fetchNuGet { name = "NETStandard.Library"; version = "1.6.0"; sha256 = "0nmmv4yw7gw04ik8ialj3ak0j6pxa9spih67hnn1h2c38ba8h58k"; }) + (fetchNuGet { name = "NETStandard.Library"; version = "2.0.0"; sha256 = "1bc4ba8ahgk15m8k4nd7x406nhi0kwqzbgjk2dmw52ss553xz7iy"; }) + (fetchNuGet { name = "Newtonsoft.Json"; version = "12.0.2"; sha256 = "0w2fbji1smd2y7x25qqibf1qrznmv4s6s0jvrbvr6alb7mfyqvh5"; }) + (fetchNuGet { name = "Newtonsoft.Json"; version = "9.0.1"; sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; }) + (fetchNuGet { name = "NuGet.Frameworks"; version = "5.0.0"; sha256 = "18ijvmj13cwjdrrm52c8fpq021531zaz4mj4b4zapxaqzzxf2qjr"; }) + (fetchNuGet { name = "NUnit"; version = "3.12.0"; sha256 = "1880j2xwavi8f28vxan3hyvdnph4nlh5sbmh285s4lc9l0b7bdk2"; }) + (fetchNuGet { name = "NUnit3TestAdapter"; version = "3.17.0"; sha256 = "0kxc6z3b8ccdrcyqz88jm5yh5ch9nbg303v67q8sp5hhs8rl8nk6"; }) + (fetchNuGet { name = "OpenTK.Core"; version = "4.5.0"; sha256 = "06qxczikp0aah20d4skk3g588dgh2vn2xffn0ajyyv0475m61s9m"; }) + (fetchNuGet { name = "OpenTK.Graphics"; version = "4.5.0"; sha256 = "180g5c92fhhhpmwl6paihx4h1bil7akaihlz2qy124n28pf4s988"; }) + (fetchNuGet { name = "OpenTK.Mathematics"; version = "4.5.0"; sha256 = "1h9dxhq1llxdbgdzsi87ijqgj2ilr3rv0zkxhaa65xrc5x8j8fva"; }) + (fetchNuGet { name = "OpenTK.OpenAL"; version = "4.5.0"; sha256 = "0lqxpc3vnxglql42x2frvq5bpkl5cf3dpnf9nx6pr3q6qnhigkfb"; }) + (fetchNuGet { name = "PangoSharp"; version = "3.22.25.128"; sha256 = "0dkl9j0yd65s5ds9xj5z6yb7yca7wlycqz25m8dng20d13sqr1zp"; }) + (fetchNuGet { name = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) + (fetchNuGet { name = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; }) + (fetchNuGet { name = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; }) + (fetchNuGet { name = "runtime.any.System.Globalization"; version = "4.3.0"; sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; }) + (fetchNuGet { name = "runtime.any.System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201"; }) + (fetchNuGet { name = "runtime.any.System.IO"; version = "4.3.0"; sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; }) + (fetchNuGet { name = "runtime.any.System.Reflection"; version = "4.3.0"; sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; }) + (fetchNuGet { name = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"; }) + (fetchNuGet { name = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; }) + (fetchNuGet { name = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; }) + (fetchNuGet { name = "runtime.any.System.Runtime"; version = "4.3.0"; sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; }) + (fetchNuGet { name = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; }) + (fetchNuGet { name = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; }) + (fetchNuGet { name = "runtime.any.System.Text.Encoding"; version = "4.3.0"; sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; }) + (fetchNuGet { name = "runtime.any.System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; }) + (fetchNuGet { name = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; }) + (fetchNuGet { name = "runtime.any.System.Threading.Timer"; version = "4.3.0"; sha256 = "0aw4phrhwqz9m61r79vyfl5la64bjxj8l34qnrcwb28v49fg2086"; }) + (fetchNuGet { name = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; }) + (fetchNuGet { name = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; }) + (fetchNuGet { name = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; }) + (fetchNuGet { name = "runtime.native.System"; version = "4.0.0"; sha256 = "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf"; }) + (fetchNuGet { name = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; }) + (fetchNuGet { name = "runtime.native.System.IO.Compression"; version = "4.1.0"; sha256 = "0d720z4lzyfcabmmnvh0bnj76ll7djhji2hmfh3h44sdkjnlkknk"; }) + (fetchNuGet { name = "runtime.native.System.Net.Http"; version = "4.0.1"; sha256 = "1hgv2bmbaskx77v8glh7waxws973jn4ah35zysnkxmf0196sfxg6"; }) + (fetchNuGet { name = "runtime.native.System.Security.Cryptography"; version = "4.0.0"; sha256 = "0k57aa2c3b10wl3hfqbgrl7xq7g8hh3a3ir44b31dn5p61iiw3z9"; }) + (fetchNuGet { name = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; }) + (fetchNuGet { name = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; }) + (fetchNuGet { name = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; }) + (fetchNuGet { name = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; }) + (fetchNuGet { name = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; }) + (fetchNuGet { name = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; }) + (fetchNuGet { name = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; }) + (fetchNuGet { name = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; }) + (fetchNuGet { name = "runtime.unix.Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id"; }) + (fetchNuGet { name = "runtime.unix.System.Console"; version = "4.3.0"; sha256 = "1pfpkvc6x2if8zbdzg9rnc5fx51yllprl8zkm5npni2k50lisy80"; }) + (fetchNuGet { name = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; }) + (fetchNuGet { name = "runtime.unix.System.IO.FileSystem"; version = "4.3.0"; sha256 = "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix"; }) + (fetchNuGet { name = "runtime.unix.System.Net.Primitives"; version = "4.3.0"; sha256 = "0bdnglg59pzx9394sy4ic66kmxhqp8q8bvmykdxcbs5mm0ipwwm4"; }) + (fetchNuGet { name = "runtime.unix.System.Net.Sockets"; version = "4.3.0"; sha256 = "03npdxzy8gfv035bv1b9rz7c7hv0rxl5904wjz51if491mw0xy12"; }) + (fetchNuGet { name = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) + (fetchNuGet { name = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; }) + (fetchNuGet { name = "runtime.win.Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0k1h8nnp1s0p8rjwgjyj1387cc1yycv0k22igxc963lqdzrx2z36"; }) + (fetchNuGet { name = "runtime.win.System.Console"; version = "4.3.0"; sha256 = "0x2yajfrbc5zc6g7nmlr44xpjk6p1hxjq47jn3xki5j7i33zw9jc"; }) + (fetchNuGet { name = "runtime.win.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "16fbn4bcynad1ygdq0yk1wmckvs8jvrrf104xa5dc2hlc8y3x58f"; }) + (fetchNuGet { name = "runtime.win.System.IO.FileSystem"; version = "4.3.0"; sha256 = "1c01nklbxywszsbfaxc76hsz7gdxac3jkphrywfkdsi3v4bwd6g8"; }) + (fetchNuGet { name = "runtime.win.System.Net.Primitives"; version = "4.3.0"; sha256 = "1dixh195bi7473n17hspll6i562gghdz9m4jk8d4kzi1mlzjk9cf"; }) + (fetchNuGet { name = "runtime.win.System.Net.Sockets"; version = "4.3.0"; sha256 = "0lr3zki831vs6qhk5wckv2b9qbfk9rcj0ds2926qvj1b9y9m6sck"; }) + (fetchNuGet { name = "runtime.win.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1700famsxndccfbcdz9q14qb20p49lax67mqwpgy4gx3vja1yczr"; }) + (fetchNuGet { name = "Ryujinx.Audio.OpenAL.Dependencies"; version = "1.21.0.1"; sha256 = "0z5k42h252nr60d02p2ww9190d7k1kzrb26vil4ydfhxqqqv6w9l"; }) + (fetchNuGet { name = "Ryujinx.Graphics.Nvdec.Dependencies"; version = "4.4.0-build7"; sha256 = "0g1l3lgs0ffxp64ka81v6q1cgsdirl1qlf73255v29r3v337074m"; }) + (fetchNuGet { name = "Ryujinx.SDL2-CS"; version = "2.0.15-build11"; sha256 = "0s4h69l2b508l5wxp4v4ip8k83k78p3963xxv8bfamin9517przi"; }) + (fetchNuGet { name = "SharpZipLib"; version = "1.3.0"; sha256 = "1pizj82wisch28nfdaszwqm9bz19lnl0s5mq8c0zybm2vhnrhvk4"; }) + (fetchNuGet { name = "SixLabors.Fonts"; version = "1.0.0-beta0013"; sha256 = "0r0aw8xxd32rwcawawcz6asiyggz02hnzg5hvz8gimq8hvwx1wql"; }) + (fetchNuGet { name = "SixLabors.ImageSharp"; version = "1.0.2"; sha256 = "0fhk9sn8k18slfb26wz8mal0j699f7djwhxgv97snz6b10wynfaj"; }) + (fetchNuGet { name = "SixLabors.ImageSharp.Drawing"; version = "1.0.0-beta11"; sha256 = "0hl0rs3kr1zdnx3gdssxgli6fyvmwzcfp99f4db71s0i8j8b2bp5"; }) + (fetchNuGet { name = "SPB"; version = "0.0.3-build15"; sha256 = "0h00yi2j65q31r5npsziq2rpiw832vf9r72j1hjqibp2l5m6v6yw"; }) + (fetchNuGet { name = "System.AppContext"; version = "4.1.0"; sha256 = "0fv3cma1jp4vgj7a8hqc9n7hr1f1kjp541s6z0q1r6nazb4iz9mz"; }) + (fetchNuGet { name = "System.Buffers"; version = "4.0.0"; sha256 = "13s659bcmg9nwb6z78971z1lr6bmh2wghxi1ayqyzl4jijd351gr"; }) + (fetchNuGet { name = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) + (fetchNuGet { name = "System.CodeDom"; version = "4.4.0"; sha256 = "1zgbafm5p380r50ap5iddp11kzhr9khrf2pnai6k593wjar74p1g"; }) + (fetchNuGet { name = "System.CodeDom"; version = "5.0.0"; sha256 = "14zs2wqkmdlxzj8ikx19n321lsbarx5vl2a8wrachymxn8zb5njh"; }) + (fetchNuGet { name = "System.Collections"; version = "4.0.11"; sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; }) + (fetchNuGet { name = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) + (fetchNuGet { name = "System.Collections.Concurrent"; version = "4.0.12"; sha256 = "07y08kvrzpak873pmyxs129g1ch8l27zmg51pcyj2jvq03n0r0fc"; }) + (fetchNuGet { name = "System.Collections.NonGeneric"; version = "4.3.0"; sha256 = "07q3k0hf3mrcjzwj8fwk6gv3n51cb513w4mgkfxzm3i37sc9kz7k"; }) + (fetchNuGet { name = "System.Collections.Specialized"; version = "4.3.0"; sha256 = "1sdwkma4f6j85m3dpb53v9vcgd0zyc9jb33f8g63byvijcj39n20"; }) + (fetchNuGet { name = "System.ComponentModel"; version = "4.3.0"; sha256 = "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb"; }) + (fetchNuGet { name = "System.ComponentModel.EventBasedAsync"; version = "4.3.0"; sha256 = "1rv9bkb8yyhqqqrx6x95njv6mdxlbvv527b44mrd93g8fmgkifl7"; }) + (fetchNuGet { name = "System.ComponentModel.Primitives"; version = "4.3.0"; sha256 = "1svfmcmgs0w0z9xdw2f2ps05rdxmkxxhf0l17xk9l1l8xfahkqr0"; }) + (fetchNuGet { name = "System.ComponentModel.TypeConverter"; version = "4.3.0"; sha256 = "17ng0p7v3nbrg3kycz10aqrrlw4lz9hzhws09pfh8gkwicyy481x"; }) + (fetchNuGet { name = "System.Console"; version = "4.0.0"; sha256 = "0ynxqbc3z1nwbrc11hkkpw9skw116z4y9wjzn7id49p9yi7mzmlf"; }) + (fetchNuGet { name = "System.Diagnostics.Debug"; version = "4.0.11"; sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; }) + (fetchNuGet { name = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) + (fetchNuGet { name = "System.Diagnostics.DiagnosticSource"; version = "4.0.0"; sha256 = "1n6c3fbz7v8d3pn77h4v5wvsfrfg7v1c57lg3nff3cjyh597v23m"; }) + (fetchNuGet { name = "System.Diagnostics.Process"; version = "4.3.0"; sha256 = "0g4prsbkygq8m21naqmcp70f24a1ksyix3dihb1r1f71lpi3cfj7"; }) + (fetchNuGet { name = "System.Diagnostics.Tools"; version = "4.0.1"; sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; }) + (fetchNuGet { name = "System.Diagnostics.Tracing"; version = "4.1.0"; sha256 = "1d2r76v1x610x61ahfpigda89gd13qydz6vbwzhpqlyvq8jj6394"; }) + (fetchNuGet { name = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; }) + (fetchNuGet { name = "System.Drawing.Common"; version = "5.0.1"; sha256 = "14h722wq58k1wmgxmpws91xc7kh8109ijw0hcxjq9qkbhbi6pwmb"; }) + (fetchNuGet { name = "System.Dynamic.Runtime"; version = "4.0.11"; sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; }) + (fetchNuGet { name = "System.Globalization"; version = "4.0.11"; sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; }) + (fetchNuGet { name = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) + (fetchNuGet { name = "System.Globalization.Calendars"; version = "4.0.1"; sha256 = "0bv0alrm2ck2zk3rz25lfyk9h42f3ywq77mx1syl6vvyncnpg4qh"; }) + (fetchNuGet { name = "System.Globalization.Extensions"; version = "4.0.1"; sha256 = "0hjhdb5ri8z9l93bw04s7ynwrjrhx2n0p34sf33a9hl9phz69fyc"; }) + (fetchNuGet { name = "System.Globalization.Extensions"; version = "4.3.0"; sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; }) + (fetchNuGet { name = "System.IO"; version = "4.1.0"; sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; }) + (fetchNuGet { name = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) + (fetchNuGet { name = "System.IO.Compression"; version = "4.1.0"; sha256 = "0iym7s3jkl8n0vzm3jd6xqg9zjjjqni05x45dwxyjr2dy88hlgji"; }) + (fetchNuGet { name = "System.IO.Compression.ZipFile"; version = "4.0.1"; sha256 = "0h72znbagmgvswzr46mihn7xm7chfk2fhrp5krzkjf29pz0i6z82"; }) + (fetchNuGet { name = "System.IO.FileSystem"; version = "4.0.1"; sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; }) + (fetchNuGet { name = "System.IO.FileSystem"; version = "4.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; }) + (fetchNuGet { name = "System.IO.FileSystem.Primitives"; version = "4.0.1"; sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; }) + (fetchNuGet { name = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; }) + (fetchNuGet { name = "System.Linq"; version = "4.1.0"; sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; }) + (fetchNuGet { name = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) + (fetchNuGet { name = "System.Linq.Expressions"; version = "4.1.0"; sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; }) + (fetchNuGet { name = "System.Management"; version = "5.0.0"; sha256 = "09hyv3p0zd549577clydlb2szl84m4gvdjnsry73n8b12ja7d75s"; }) + (fetchNuGet { name = "System.Net.Http"; version = "4.1.0"; sha256 = "1i5rqij1icg05j8rrkw4gd4pgia1978mqhjzhsjg69lvwcdfg8yb"; }) + (fetchNuGet { name = "System.Net.NameResolution"; version = "4.3.0"; sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; }) + (fetchNuGet { name = "System.Net.Primitives"; version = "4.0.11"; sha256 = "10xzzaynkzkakp7jai1ik3r805zrqjxiz7vcagchyxs2v26a516r"; }) + (fetchNuGet { name = "System.Net.Sockets"; version = "4.1.0"; sha256 = "1385fvh8h29da5hh58jm1v78fzi9fi5vj93vhlm2kvqpfahvpqls"; }) + (fetchNuGet { name = "System.Numerics.Vectors"; version = "4.3.0"; sha256 = "05kji1mv4sl75iwmc613p873145nynm02xiajx8pn0h2kx53d23s"; }) + (fetchNuGet { name = "System.Numerics.Vectors"; version = "4.5.0"; sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; }) + (fetchNuGet { name = "System.ObjectModel"; version = "4.0.12"; sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; }) + (fetchNuGet { name = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; }) + (fetchNuGet { name = "System.Reflection"; version = "4.1.0"; sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; }) + (fetchNuGet { name = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) + (fetchNuGet { name = "System.Reflection.Emit"; version = "4.0.1"; sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; }) + (fetchNuGet { name = "System.Reflection.Emit"; version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; }) + (fetchNuGet { name = "System.Reflection.Emit.ILGeneration"; version = "4.0.1"; sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0"; }) + (fetchNuGet { name = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; }) + (fetchNuGet { name = "System.Reflection.Emit.Lightweight"; version = "4.0.1"; sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr"; }) + (fetchNuGet { name = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; }) + (fetchNuGet { name = "System.Reflection.Extensions"; version = "4.0.1"; sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; }) + (fetchNuGet { name = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; }) + (fetchNuGet { name = "System.Reflection.Primitives"; version = "4.0.1"; sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; }) + (fetchNuGet { name = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) + (fetchNuGet { name = "System.Reflection.TypeExtensions"; version = "4.1.0"; sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; }) + (fetchNuGet { name = "System.Reflection.TypeExtensions"; version = "4.3.0"; sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; }) + (fetchNuGet { name = "System.Resources.ResourceManager"; version = "4.0.1"; sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; }) + (fetchNuGet { name = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) + (fetchNuGet { name = "System.Runtime"; version = "4.1.0"; sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; }) + (fetchNuGet { name = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) + (fetchNuGet { name = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.0"; sha256 = "16r6sn4czfjk8qhnz7bnqlyiaaszr0ihinb7mq9zzr1wba257r54"; }) + (fetchNuGet { name = "System.Runtime.CompilerServices.Unsafe"; version = "5.0.0-preview.7.20364.11"; sha256 = "19sl184f6rjhfsizq0vapysazd6yd66lf638rszvrdhqlsxssz2m"; }) + (fetchNuGet { name = "System.Runtime.Extensions"; version = "4.1.0"; sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; }) + (fetchNuGet { name = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; }) + (fetchNuGet { name = "System.Runtime.Handles"; version = "4.0.1"; sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; }) + (fetchNuGet { name = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; }) + (fetchNuGet { name = "System.Runtime.InteropServices"; version = "4.1.0"; sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; }) + (fetchNuGet { name = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) + (fetchNuGet { name = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.0.0"; sha256 = "0glmvarf3jz5xh22iy3w9v3wyragcm4hfdr17v90vs7vcrm7fgp6"; }) + (fetchNuGet { name = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; }) + (fetchNuGet { name = "System.Runtime.Numerics"; version = "4.0.1"; sha256 = "1y308zfvy0l5nrn46mqqr4wb4z1xk758pkk8svbz8b5ij7jnv4nn"; }) + (fetchNuGet { name = "System.Runtime.Serialization.Primitives"; version = "4.1.1"; sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; }) + (fetchNuGet { name = "System.Security.AccessControl"; version = "4.5.0"; sha256 = "1wvwanz33fzzbnd2jalar0p0z3x0ba53vzx1kazlskp7pwyhlnq0"; }) + (fetchNuGet { name = "System.Security.AccessControl"; version = "5.0.0"; sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r"; }) + (fetchNuGet { name = "System.Security.Claims"; version = "4.3.0"; sha256 = "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn"; }) + (fetchNuGet { name = "System.Security.Cryptography.Algorithms"; version = "4.2.0"; sha256 = "148s9g5dgm33ri7dnh19s4lgnlxbpwvrw2jnzllq2kijj4i4vs85"; }) + (fetchNuGet { name = "System.Security.Cryptography.Cng"; version = "4.2.0"; sha256 = "118jijz446kix20blxip0f0q8mhsh9bz118mwc2ch1p6g7facpzc"; }) + (fetchNuGet { name = "System.Security.Cryptography.Csp"; version = "4.0.0"; sha256 = "1cwv8lqj8r15q81d2pz2jwzzbaji0l28xfrpw29kdpsaypm92z2q"; }) + (fetchNuGet { name = "System.Security.Cryptography.Encoding"; version = "4.0.0"; sha256 = "0a8y1a5wkmpawc787gfmnrnbzdgxmx1a14ax43jf3rj9gxmy3vk4"; }) + (fetchNuGet { name = "System.Security.Cryptography.OpenSsl"; version = "4.0.0"; sha256 = "16sx3cig3d0ilvzl8xxgffmxbiqx87zdi8fc73i3i7zjih1a7f4q"; }) + (fetchNuGet { name = "System.Security.Cryptography.Primitives"; version = "4.0.0"; sha256 = "0i7cfnwph9a10bm26m538h5xcr8b36jscp9sy1zhgifksxz4yixh"; }) + (fetchNuGet { name = "System.Security.Cryptography.X509Certificates"; version = "4.1.0"; sha256 = "0clg1bv55mfv5dq00m19cp634zx6inm31kf8ppbq1jgyjf2185dh"; }) + (fetchNuGet { name = "System.Security.Principal"; version = "4.3.0"; sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; }) + (fetchNuGet { name = "System.Security.Principal.Windows"; version = "4.3.0"; sha256 = "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr"; }) + (fetchNuGet { name = "System.Security.Principal.Windows"; version = "4.5.0"; sha256 = "0rmj89wsl5yzwh0kqjgx45vzf694v9p92r4x4q6yxldk1cv1hi86"; }) + (fetchNuGet { name = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; }) + (fetchNuGet { name = "System.Text.Encoding"; version = "4.0.11"; sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; }) + (fetchNuGet { name = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) + (fetchNuGet { name = "System.Text.Encoding.Extensions"; version = "4.0.11"; sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; }) + (fetchNuGet { name = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) + (fetchNuGet { name = "System.Text.RegularExpressions"; version = "4.1.0"; sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; }) + (fetchNuGet { name = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; }) + (fetchNuGet { name = "System.Threading"; version = "4.0.11"; sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; }) + (fetchNuGet { name = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) + (fetchNuGet { name = "System.Threading.Overlapped"; version = "4.3.0"; sha256 = "1nahikhqh9nk756dh8p011j36rlcp1bzz3vwi2b4m1l2s3vz8idm"; }) + (fetchNuGet { name = "System.Threading.Tasks"; version = "4.0.11"; sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; }) + (fetchNuGet { name = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) + (fetchNuGet { name = "System.Threading.Tasks.Extensions"; version = "4.0.0"; sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; }) + (fetchNuGet { name = "System.Threading.Tasks.Extensions"; version = "4.3.0"; sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; }) + (fetchNuGet { name = "System.Threading.Thread"; version = "4.3.0"; sha256 = "0y2xiwdfcph7znm2ysxanrhbqqss6a3shi1z3c779pj2s523mjx4"; }) + (fetchNuGet { name = "System.Threading.ThreadPool"; version = "4.3.0"; sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; }) + (fetchNuGet { name = "System.Threading.Timer"; version = "4.0.1"; sha256 = "15n54f1f8nn3mjcjrlzdg6q3520571y012mx7v991x2fvp73lmg6"; }) + (fetchNuGet { name = "System.Xml.ReaderWriter"; version = "4.0.11"; sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; }) + (fetchNuGet { name = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; }) + (fetchNuGet { name = "System.Xml.XDocument"; version = "4.0.11"; sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; }) + (fetchNuGet { name = "System.Xml.XmlDocument"; version = "4.3.0"; sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi"; }) + (fetchNuGet { name = "System.Xml.XPath"; version = "4.3.0"; sha256 = "1cv2m0p70774a0sd1zxc8fm8jk3i5zk2bla3riqvi8gsm0r4kpci"; }) + (fetchNuGet { name = "System.Xml.XPath.XmlDocument"; version = "4.3.0"; sha256 = "1h9lh7qkp0lff33z847sdfjj8yaz98ylbnkbxlnsbflhj9xyfqrm"; }) ] diff --git a/third_party/nixpkgs/pkgs/misc/emulators/ryujinx/updater.sh b/third_party/nixpkgs/pkgs/misc/emulators/ryujinx/updater.sh index a2f47baa06..db8fd9254f 100755 --- a/third_party/nixpkgs/pkgs/misc/emulators/ryujinx/updater.sh +++ b/third_party/nixpkgs/pkgs/misc/emulators/ryujinx/updater.sh @@ -1,5 +1,5 @@ #! /usr/bin/env nix-shell -#! nix-shell -i bash -p coreutils gnused curl common-updater-scripts nix-prefetch-git jq dotnet-sdk_5 +#! nix-shell -i bash -p coreutils gnused curl common-updater-scripts nuget-to-nix nix-prefetch-git jq dotnet-sdk_5 set -eo pipefail cd "$(dirname "${BASH_SOURCE[0]}")" @@ -47,21 +47,7 @@ EOF dotnet restore Ryujinx.sln --configfile ./nuget_tmp.config -echo "{ fetchNuGet }: [" >"$deps_file" -while read pkg_spec; do - { read pkg_name; read pkg_version; } < <( - # Build version part should be ignored: `3.0.0-beta2.20059.3+77df2220` -> `3.0.0-beta2.20059.3` - sed -nE 's/.*([^<]*).*/\1/p; s/.*([^<+]*).*/\1/p' "$pkg_spec") - pkg_sha256="$(nix-hash --type sha256 --flat --base32 "$(dirname "$pkg_spec")"/*.nupkg)" - cat >>"$deps_file" <>"$deps_file" +nuget-to-nix ./nuget_tmp.packages > "$deps_file" popd rm -r "$src" diff --git a/third_party/nixpkgs/pkgs/misc/emulators/sameboy/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/sameboy/default.nix index ee91a010df..db300274f9 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/sameboy/default.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/sameboy/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sameboy"; - version = "0.14.2"; + version = "0.14.5"; src = fetchFromGitHub { owner = "LIJI32"; repo = "SameBoy"; rev = "v${version}"; - sha256 = "sha256-VGyB0Em9VFU1Z1K2XfbS9wGs6gZ8/eH/FiaFAKnFdaA="; + sha256 = "sha256-o2aH9rfga4f4yrf6r01wnrC0foYtD5EwdKFUPf2KGWM="; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/misc/emulators/uae/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/uae/default.nix index 803efe5149..ebbdc667ef 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/uae/default.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/uae/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl, pkg-config, gtk2, alsa-lib, SDL}: stdenv.mkDerivation rec { - name = "uae-0.8.29"; + pname = "uae"; + version = "0.8.29"; src = fetchurl { - url = "http://web.archive.org/web/20130905032631/http://www.amigaemulator.org/files/sources/develop/${name}.tar.bz2"; + url = "http://web.archive.org/web/20130905032631/http://www.amigaemulator.org/files/sources/develop/uae-${version}.tar.bz2"; sha256 = "05s3cd1rd5a970s938qf4c2xm3l7f54g5iaqw56v8smk355m4qr4"; }; diff --git a/third_party/nixpkgs/pkgs/misc/emulators/vice/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/vice/default.nix index f8b9e5906f..ba9d538b66 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/vice/default.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/vice/default.nix @@ -3,10 +3,11 @@ }: stdenv.mkDerivation rec { - name = "vice-3.1"; + pname = "vice"; + version = "3.1"; src = fetchurl { - url = "mirror://sourceforge/vice-emu/vice-3.1.tar.gz"; + url = "mirror://sourceforge/vice-emu/vice-${version}.tar.gz"; sha256 = "0h0jbml02s2a36hr78dxv1zshmfhxp1wadpcdl09aq416fb1bf1y"; }; diff --git a/third_party/nixpkgs/pkgs/misc/emulators/wine/sources.nix b/third_party/nixpkgs/pkgs/misc/emulators/wine/sources.nix index 7e278684ce..59a24c1066 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/wine/sources.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/wine/sources.nix @@ -44,9 +44,9 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "6.14"; + version = "6.15"; url = "https://dl.winehq.org/wine/source/6.x/wine-${version}.tar.xz"; - sha256 = "sha256-ZLRxk5lDvAjjUQJ9tvvCRlwTllCjv/65Flf/DujCUgI="; + sha256 = "sha256-Yf1lo2WDKmK656eEKScMB2+yop8cf0YlldHzVDZRd5s="; inherit (stable) gecko32 gecko64; ## see http://wiki.winehq.org/Mono @@ -65,7 +65,7 @@ in rec { staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases inherit (unstable) version; - sha256 = "sha256-yzpRWNx/e3BDCh1dyf8VdjLgvu6yZ/CXre/cb1roaVs="; + sha256 = "sha256-zT77xmc2gD8xNSk19OPYVJB6nZmh+g6TYRhVW674RFI="; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; diff --git a/third_party/nixpkgs/pkgs/misc/emulators/wxmupen64plus/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/wxmupen64plus/default.nix index 8621d213b7..3b24584f7e 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/wxmupen64plus/default.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/wxmupen64plus/default.nix @@ -1,10 +1,12 @@ { lib, stdenv, fetchurl, python, wxGTK29, mupen64plus, SDL, libX11, libGLU, libGL , wafHook }: -stdenv.mkDerivation { - name = "wxmupen64plus-0.3"; +stdenv.mkDerivation rec { + pname = "wxmupen64plus"; + version = "0.3"; + src = fetchurl { - url = "https://bitbucket.org/auria/wxmupen64plus/get/0.3.tar.bz2"; + url = "https://bitbucket.org/auria/wxmupen64plus/get/${version}.tar.bz2"; sha256 = "1mnxi4k011dd300k35li2p6x4wccwi6im21qz8dkznnz397ps67c"; }; diff --git a/third_party/nixpkgs/pkgs/misc/emulators/zsnes/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/zsnes/default.nix index 4a6b1fbda2..e965816d02 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/zsnes/default.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/zsnes/default.nix @@ -13,7 +13,8 @@ let }; in stdenv.mkDerivation { - name = "zsnes-1.51"; + pname = "zsnes"; + version = "1.51"; src = fetchFromGitHub { owner = "emillon"; diff --git a/third_party/nixpkgs/pkgs/misc/mxt-app/default.nix b/third_party/nixpkgs/pkgs/misc/mxt-app/default.nix index 099300634e..df812d516e 100644 --- a/third_party/nixpkgs/pkgs/misc/mxt-app/default.nix +++ b/third_party/nixpkgs/pkgs/misc/mxt-app/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, libtool }: stdenv.mkDerivation rec { - version="1.32"; + version="1.33"; pname = "mxt-app"; src = fetchFromGitHub { owner = "atmel-maxtouch"; repo = "mxt-app"; rev = "v${version}"; - sha256 = "1z1g5h14j3yw3r9phgir33s9j07ns9c0r5lkl49940pzqycnrwbj"; + sha256 = "sha256-PgIIxoyR7UA5y4UZ6meJERrbi1Bov03pJkN5St4BWss="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/third_party/nixpkgs/pkgs/misc/screensavers/slock/default.nix b/third_party/nixpkgs/pkgs/misc/screensavers/slock/default.nix index 800a81d2ff..63ca76e391 100644 --- a/third_party/nixpkgs/pkgs/misc/screensavers/slock/default.nix +++ b/third_party/nixpkgs/pkgs/misc/screensavers/slock/default.nix @@ -6,10 +6,11 @@ with lib; stdenv.mkDerivation rec { - name = "slock-1.4"; + pname = "slock"; + version = "1.4"; src = fetchurl { - url = "https://dl.suckless.org/tools/${name}.tar.gz"; + url = "https://dl.suckless.org/tools/slock-${version}.tar.gz"; sha256 = "0sif752303dg33f14k6pgwq2jp1hjyhqv6x4sy3sj281qvdljf5m"; }; diff --git a/third_party/nixpkgs/pkgs/misc/screensavers/vlock/default.nix b/third_party/nixpkgs/pkgs/misc/screensavers/vlock/default.nix index 4813e24930..1602c94c09 100644 --- a/third_party/nixpkgs/pkgs/misc/screensavers/vlock/default.nix +++ b/third_party/nixpkgs/pkgs/misc/screensavers/vlock/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pam }: -stdenv.mkDerivation { - name = "vlock-2.2.2"; - src = fetchurl - { - url = "mirror://debian/pool/main/v/vlock/vlock_2.2.2.orig.tar.gz"; +stdenv.mkDerivation rec { + pname = "vlock"; + version = "2.2.2"; + + src = fetchurl { + url = "mirror://debian/pool/main/v/vlock/vlock_${version}.orig.tar.gz"; sha256 = "1b9gv7hmlb8swda5bn40lp1yki8b8wv29vdnhcjqfl6ir98551za"; }; diff --git a/third_party/nixpkgs/pkgs/misc/screensavers/xlockmore/default.nix b/third_party/nixpkgs/pkgs/misc/screensavers/xlockmore/default.nix index 600528a794..680f9c0a5b 100644 --- a/third_party/nixpkgs/pkgs/misc/screensavers/xlockmore/default.nix +++ b/third_party/nixpkgs/pkgs/misc/screensavers/xlockmore/default.nix @@ -2,10 +2,11 @@ , libXdmcp, libXt, autoreconfHook }: stdenv.mkDerivation rec { - name = "xlockmore-5.66"; + pname = "xlockmore"; + version = "5.66"; src = fetchurl { - url = "http://sillycycle.com/xlock/${name}.tar.xz"; + url = "http://sillycycle.com/xlock/xlockmore-${version}.tar.xz"; sha256 = "sha256-WXalw2YoKNFFIskOBvKN3PyOV3iP3gjri3pw6e87q3E="; curlOpts = "--user-agent 'Mozilla/5.0'"; }; diff --git a/third_party/nixpkgs/pkgs/misc/screensavers/xscreensaver/default.nix b/third_party/nixpkgs/pkgs/misc/screensavers/xscreensaver/default.nix index 6b90d6f58e..05ebdde853 100644 --- a/third_party/nixpkgs/pkgs/misc/screensavers/xscreensaver/default.nix +++ b/third_party/nixpkgs/pkgs/misc/screensavers/xscreensaver/default.nix @@ -9,12 +9,12 @@ }: stdenv.mkDerivation rec { - version = "6.00"; + version = "6.01"; pname = "xscreensaver"; src = fetchurl { url = "https://www.jwz.org/${pname}/${pname}-${version}.tar.gz"; - sha256 = "WFCIl0chuCjr1x/T67AZ0b8xITPJVurJZy1h9rSddwY="; + sha256 = "sha256-CFSEZl2R9gtKHe2s2UvPm3Sw+wlrztyJ/xwkUWjlRzs="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/misc/screensavers/xss-lock/default.nix b/third_party/nixpkgs/pkgs/misc/screensavers/xss-lock/default.nix index c6dafd2a81..ec7e8f4e7e 100644 --- a/third_party/nixpkgs/pkgs/misc/screensavers/xss-lock/default.nix +++ b/third_party/nixpkgs/pkgs/misc/screensavers/xss-lock/default.nix @@ -2,7 +2,8 @@ , libXau, libXdmcp, xcbutil }: stdenv.mkDerivation { - name = "xss-lock-git-2018-05-31"; + pname = "xss-lock"; + version = "unstable-2018-05-31"; src = fetchFromGitHub { owner = "xdbob"; diff --git a/third_party/nixpkgs/pkgs/misc/screensavers/xtrlock-pam/default.nix b/third_party/nixpkgs/pkgs/misc/screensavers/xtrlock-pam/default.nix index c563cca05e..6908429e21 100644 --- a/third_party/nixpkgs/pkgs/misc/screensavers/xtrlock-pam/default.nix +++ b/third_party/nixpkgs/pkgs/misc/screensavers/xtrlock-pam/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchgit, python, pkg-config, xlibsWrapper, pam }: stdenv.mkDerivation { - name = "xtrlock-pam-3.4-post-20150909"; + pname = "xtrlock-pam"; + version = "3.4-post-20150909"; src = fetchgit { url = "https://github.com/aanatoly/xtrlock-pam"; diff --git a/third_party/nixpkgs/pkgs/misc/sndio/default.nix b/third_party/nixpkgs/pkgs/misc/sndio/default.nix index 9e4035801f..474e59c590 100644 --- a/third_party/nixpkgs/pkgs/misc/sndio/default.nix +++ b/third_party/nixpkgs/pkgs/misc/sndio/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "sndio"; - version = "1.8.0"; + version = "1.8.1"; src = fetchurl { - url = "http://www.sndio.org/sndio-${version}.tar.gz"; - sha256 = "027hlqji0h2cm96rb8qvkdmwxl56l59bgn828nvmwak2c2i5k703"; + url = "https://www.sndio.org/sndio-${version}.tar.gz"; + sha256 = "08b33bbrhbva1lyzzsj5k6ggcqzrfjfhb2n99a0b8b07kqc3f7gq"; }; nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - homepage = "http://www.sndio.org"; + homepage = "https://www.sndio.org"; description = "Small audio and MIDI framework part of the OpenBSD project"; license = licenses.isc; maintainers = with maintainers; [ chiiruno ]; diff --git a/third_party/nixpkgs/pkgs/misc/solfege/default.nix b/third_party/nixpkgs/pkgs/misc/solfege/default.nix index fc7062d904..c3c22ac8f1 100644 --- a/third_party/nixpkgs/pkgs/misc/solfege/default.nix +++ b/third_party/nixpkgs/pkgs/misc/solfege/default.nix @@ -5,10 +5,11 @@ }: buildPythonApplication rec { - name = "solfege-3.23.4"; + pname = "solfege"; + version = "3.23.4"; src = fetchurl { - url = "mirror://sourceforge/solfege/${name}.tar.gz"; + url = "mirror://sourceforge/solfege/solfege-${version}.tar.gz"; sha256 = "0sc17vf4xz6gy0s0z9ghi68yskikdmyb4gdaxx6imrm40734k8mp"; }; diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix b/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix index 3dc5ef14b0..24b60ea1d9 100644 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix @@ -101,12 +101,12 @@ final: prev: aniseed = buildVimPluginFrom2Nix { pname = "aniseed"; - version = "2021-07-19"; + version = "2021-08-14"; src = fetchFromGitHub { owner = "Olical"; repo = "aniseed"; - rev = "c15c4e49d6ecb7ad7252902bb1b4310ba161617a"; - sha256 = "13pnlx4rqjc51vrq9d8kyjjxb2apw3y6j2xh68ii746klinjpjy5"; + rev = "0b0173592740a4b4c36cbdc195f0aa7422dd4666"; + sha256 = "09mv0yqj8qqj7i8dfqg50vin6whg9sc5scfsxr20jrx278z94j6h"; }; meta.homepage = "https://github.com/Olical/aniseed/"; }; @@ -233,12 +233,12 @@ final: prev: auto-session = buildVimPluginFrom2Nix { pname = "auto-session"; - version = "2021-07-15"; + version = "2021-08-16"; src = fetchFromGitHub { owner = "rmagatti"; repo = "auto-session"; - rev = "f5e5dda7587db72b074edbc3b573d52df639f9a5"; - sha256 = "1ddr28v44llmfsdf2l3ybgwijhv49dddghdk396nk0sw883a3hs8"; + rev = "acd1a7031e71ed053348c2cd4ef3408f4fdfbb19"; + sha256 = "0vxk17p37a2fs9gm68wdlfqfyw8jzw3hp1yjg0n3b4yppl9j50r5"; }; meta.homepage = "https://github.com/rmagatti/auto-session/"; }; @@ -257,12 +257,12 @@ final: prev: awesome-vim-colorschemes = buildVimPluginFrom2Nix { pname = "awesome-vim-colorschemes"; - version = "2021-07-09"; + version = "2021-08-15"; src = fetchFromGitHub { owner = "rafi"; repo = "awesome-vim-colorschemes"; - rev = "dbb29a451bb5441e860e70a35b925e43ab307e3f"; - sha256 = "1qd9rfbq0b9jj38arv2mwyrlg7vfpia293lbyhxgn3ilsl85m63h"; + rev = "facbd7269201b1766369be9abc8bfc183938a9ae"; + sha256 = "11bdzds9qyr56sqwl2c7cy7gll32dd3fzy8bx1b0rg7ylwlyqllf"; }; meta.homepage = "https://github.com/rafi/awesome-vim-colorschemes/"; }; @@ -281,12 +281,12 @@ final: prev: barbar-nvim = buildVimPluginFrom2Nix { pname = "barbar-nvim"; - version = "2021-08-10"; + version = "2021-08-16"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "f4163e2ca987f25c3d1fb5cf3d9329d8ab343f35"; - sha256 = "1wlxfkpa42rvw853x8nalxy3zxaaji0d365jbp3pcvhsy0li33dc"; + rev = "7a19aac3d401c997a6fb7067a7756a4a77184c2e"; + sha256 = "1jbbnd7s2kql44zv7xkv9hmyj0482yjnm57l8nl0kdf8b61zzi3s"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; @@ -437,12 +437,12 @@ final: prev: chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2021-08-10"; + version = "2021-08-16"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "5647222ddcf1bb484103da1267028b4074f55a32"; - sha256 = "02dyhgfp76bxggjlyc0kq9wfcz96319x4y49fqmanqdhgmqbzzxb"; + rev = "80f2d03b1d7d8a5032689a17c9a234d464a67405"; + sha256 = "0k5v490p22j3ghfb6c436z0i3fq18sj0y4x01axrl4iy1jpwn3v2"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -495,6 +495,18 @@ final: prev: meta.homepage = "https://github.com/xavierd/clang_complete/"; }; + clever-f-vim = buildVimPluginFrom2Nix { + pname = "clever-f-vim"; + version = "2021-07-07"; + src = fetchFromGitHub { + owner = "rhysd"; + repo = "clever-f.vim"; + rev = "fd370f27cca93918184a8043220cef1aa440a1fd"; + sha256 = "163gd1vv6k9pyzyfjfcqinn7w001ickwdh1ygg6g62h4s98r2ann"; + }; + meta.homepage = "https://github.com/rhysd/clever-f.vim/"; + }; + clighter8 = buildVimPluginFrom2Nix { pname = "clighter8"; version = "2018-07-25"; @@ -507,6 +519,90 @@ final: prev: meta.homepage = "https://github.com/bbchung/clighter8/"; }; + cmp-buffer = buildVimPluginFrom2Nix { + pname = "cmp-buffer"; + version = "2021-08-11"; + src = fetchFromGitHub { + owner = "hrsh7th"; + repo = "cmp-buffer"; + rev = "5742a1b18ebb4ffc21cd07a312bf8bacba4c81ae"; + sha256 = "0nh53gqzbm500rvwc59hbl1sg12qzpk8za3z6rvsg04s6rqv479f"; + }; + meta.homepage = "https://github.com/hrsh7th/cmp-buffer/"; + }; + + cmp-calc = buildVimPluginFrom2Nix { + pname = "cmp-calc"; + version = "2021-08-08"; + src = fetchFromGitHub { + owner = "hrsh7th"; + repo = "cmp-calc"; + rev = "bac4f988d14665a6a681df3646ff1baa2affc2da"; + sha256 = "09g5pglbfzgnzl0lbn1fa27fh88a5pv2s2agmbw0gh4idnrvi66x"; + }; + meta.homepage = "https://github.com/hrsh7th/cmp-calc/"; + }; + + cmp-emoji = buildVimPluginFrom2Nix { + pname = "cmp-emoji"; + version = "2021-08-09"; + src = fetchFromGitHub { + owner = "hrsh7th"; + repo = "cmp-emoji"; + rev = "a80d20b3461b802b3ff6f4cd60f7b99399fd7757"; + sha256 = "0q70zbd4fw6x62zar7ph1dp6zwri6dqnyprl58p6w3k5n4xgpdrf"; + }; + meta.homepage = "https://github.com/hrsh7th/cmp-emoji/"; + }; + + cmp-nvim-lsp = buildVimPluginFrom2Nix { + pname = "cmp-nvim-lsp"; + version = "2021-08-16"; + src = fetchFromGitHub { + owner = "hrsh7th"; + repo = "cmp-nvim-lsp"; + rev = "09e4ab0fb66ad07d64b311d1bd7916905bf3364b"; + sha256 = "0573ywym8favv12g78qln4zx15j1ic26y8j2rbdlh8n22zll0v1x"; + }; + meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lsp/"; + }; + + cmp-path = buildVimPluginFrom2Nix { + pname = "cmp-path"; + version = "2021-08-09"; + src = fetchFromGitHub { + owner = "hrsh7th"; + repo = "cmp-path"; + rev = "175a3854242f7dd43d706e2e0acc4f08ab1ed9ee"; + sha256 = "1pimzhp5hh9gg7f37x4mklxxg44a7fnzli7mv46p73b3w97vkbl4"; + }; + meta.homepage = "https://github.com/hrsh7th/cmp-path/"; + }; + + cmp-vsnip = buildVimPluginFrom2Nix { + pname = "cmp-vsnip"; + version = "2021-08-13"; + src = fetchFromGitHub { + owner = "hrsh7th"; + repo = "cmp-vsnip"; + rev = "1f7c99719adbb2258c697dc43c31729ab73a8d99"; + sha256 = "1a252mzi5nzcml2g52g5nwlih40dh19yshns6dlk5gmfwa0mf3z6"; + }; + meta.homepage = "https://github.com/hrsh7th/cmp-vsnip/"; + }; + + cmp_luasnip = buildVimPluginFrom2Nix { + pname = "cmp_luasnip"; + version = "2021-08-16"; + src = fetchFromGitHub { + owner = "saadparwaiz1"; + repo = "cmp_luasnip"; + rev = "1852a9e9e3a0e0ba0363e3be6c87f46982fba549"; + sha256 = "1ji3ys0k0sw23yh4yk3pgb2ab895jfsjnsjrpy0idvmxclk20l0m"; + }; + meta.homepage = "https://github.com/saadparwaiz1/cmp_luasnip/"; + }; + coc-clap = buildVimPluginFrom2Nix { pname = "coc-clap"; version = "2021-05-10"; @@ -581,12 +677,12 @@ final: prev: coc-nvim = buildVimPluginFrom2Nix { pname = "coc-nvim"; - version = "2021-08-09"; + version = "2021-08-16"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "6a9a0ee38d2d28fc978db89237cdceb40aea6de3"; - sha256 = "04ywmwbr8y86z6fgcx4w8w779rl0c9c3q8fazncmx24wmcmilhb5"; + rev = "1296df441756a5249319369640f208089a10efe4"; + sha256 = "1p6gikl6fw6fvbb7f76mb88ckcw6vp4llzz601k0f6rrna4xhjab"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -798,12 +894,12 @@ final: prev: conjure = buildVimPluginFrom2Nix { pname = "conjure"; - version = "2021-08-03"; + version = "2021-08-14"; src = fetchFromGitHub { owner = "Olical"; repo = "conjure"; - rev = "998603d240b13e32e3c9571bcb805357ea323fa9"; - sha256 = "1fd7d3nfb8qi0zk2jskkmym3yb8qzys7li88cjfxdqrl9kcqa723"; + rev = "368c5cc0f4a7a6bdc0d1041fc74fb922b31882c9"; + sha256 = "1289gs3w40zbv6rd41s8qqnj1wp1bzgxnn0s91v9ip6g17f31ljm"; }; meta.homepage = "https://github.com/Olical/conjure/"; }; @@ -834,12 +930,12 @@ final: prev: Coqtail = buildVimPluginFrom2Nix { pname = "Coqtail"; - version = "2021-08-11"; + version = "2021-08-13"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "0ca6714f45124afadce133f21bfe00aaa3edc2ad"; - sha256 = "1hy9y34amrcbr64mzllj7xrldkxw0a0qp48mkc17csgxchqc5wxx"; + rev = "46b4fe60778064d7924534c9658d29858d7d67a7"; + sha256 = "16fmzn4vf7ha63r73ra2lpdww1hmg2jnr88bpw2in3c8id6df2rd"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -1352,12 +1448,12 @@ final: prev: doki-theme-vim = buildVimPluginFrom2Nix { pname = "doki-theme-vim"; - version = "2021-08-07"; + version = "2021-08-12"; src = fetchFromGitHub { owner = "doki-theme"; repo = "doki-theme-vim"; - rev = "83f3478dee644b4be534ada9456e915cbb4f37be"; - sha256 = "0s53h7dfyv05z0w186957scrdxihmk6s8db29d4iq7d81hsxckxg"; + rev = "78502433a41589ead80c834f9e61d7a17f97b844"; + sha256 = "1gfxq9sfld0vx320q15r8xk6kwxxbl7jla3ykr6wd167bnr1z7q0"; }; meta.homepage = "https://github.com/doki-theme/doki-theme-vim/"; }; @@ -1388,12 +1484,12 @@ final: prev: echodoc-vim = buildVimPluginFrom2Nix { pname = "echodoc-vim"; - version = "2021-07-09"; + version = "2021-08-12"; src = fetchFromGitHub { owner = "Shougo"; repo = "echodoc.vim"; - rev = "9288bef70cda903edc2561c7612fe2d6a3c73aa5"; - sha256 = "1s6glmc489dfz750d3xikwxm84qqa89qza1jp3vfj7jn47h1r826"; + rev = "3e907e05d0495f999149f50a1e6cd72972ee7cbe"; + sha256 = "0bdiz108l4aa5ma49lbmmp8ks8n17i6wzjsawd94rgsyl3j4j3ri"; }; meta.homepage = "https://github.com/Shougo/echodoc.vim/"; }; @@ -1522,16 +1618,28 @@ final: prev: fastfold = buildVimPluginFrom2Nix { pname = "fastfold"; - version = "2021-08-03"; + version = "2021-08-14"; src = fetchFromGitHub { owner = "konfekt"; repo = "fastfold"; - rev = "066d2347baa8dc180c18f889d0b37a826f23973b"; - sha256 = "0m04jn8701hl4fqjsfc6dalikqvgrql3fwqrc8z81swcjyf6rsaw"; + rev = "20126c1646f96da862af7cbec45ca0fe0a930703"; + sha256 = "12hqr9glh6wpjmacb2ib4phf29icwj9pxccmcap79w9w5p6zy2yn"; }; meta.homepage = "https://github.com/konfekt/fastfold/"; }; + fcitx-vim = buildVimPluginFrom2Nix { + pname = "fcitx-vim"; + version = "2021-08-15"; + src = fetchFromGitHub { + owner = "lilydjwg"; + repo = "fcitx.vim"; + rev = "4042bbb29c50a592062563f5042951abec696702"; + sha256 = "1y5c1nan5gajrz1l0zkqx0y3a8cpam6l62yd7x19z6dzn7m1b5yb"; + }; + meta.homepage = "https://github.com/lilydjwg/fcitx.vim/"; + }; + feline-nvim = buildVimPluginFrom2Nix { pname = "feline-nvim"; version = "2021-07-30"; @@ -1679,12 +1787,12 @@ final: prev: friendly-snippets = buildVimPluginFrom2Nix { pname = "friendly-snippets"; - version = "2021-08-06"; + version = "2021-08-12"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "cafecca6f3586b2ccb3c6b4db2082662f36e8c7f"; - sha256 = "0dsl4ccwnlv2i1pmmjlrxw0ns2amrv1vn8khm1c52hl3377j3dwq"; + rev = "276abeaf7a350724ca948f1c21de0b12d3cedc4f"; + sha256 = "1lbm98ijihmikazjm0a7cckqlc7c32bsqzqk077wbigkx559zam9"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -1859,12 +1967,12 @@ final: prev: git-worktree-nvim = buildVimPluginFrom2Nix { pname = "git-worktree-nvim"; - version = "2021-07-15"; + version = "2021-08-13"; src = fetchFromGitHub { owner = "ThePrimeagen"; repo = "git-worktree.nvim"; - rev = "97adf37032c213201c823e98b0555f7279525d62"; - sha256 = "0vca7pyipch3y3g19sfwqx33l8jh3h7r9wv3hlfw960iyqc2xia7"; + rev = "35007615f75262a6b411e11e8928e504af7ebb5e"; + sha256 = "1kh7nvvb8nrgqnp2h78v5s7swa71xrbj4q3k2xrsiz11s16q72hn"; }; meta.homepage = "https://github.com/ThePrimeagen/git-worktree.nvim/"; }; @@ -1895,12 +2003,12 @@ final: prev: gitsigns-nvim = buildVimPluginFrom2Nix { pname = "gitsigns-nvim"; - version = "2021-08-09"; + version = "2021-08-16"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "083dc2f485571546144e287c38a96368ea2e79a1"; - sha256 = "0vrb900p2rc323axb93hc7jwcxg8455zwqsvxm9vkd2mcsdpn33w"; + rev = "7875d8c4d94f98f7a1a65b898499fa288e7969b3"; + sha256 = "13hzghpzglw6cr4hwsp7qvp6a7dkh2fk2sg4nzzazgmfych485cm"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -2508,12 +2616,12 @@ final: prev: LeaderF = buildVimPluginFrom2Nix { pname = "LeaderF"; - version = "2021-07-22"; + version = "2021-08-16"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "321f1995211b05d5abd73732262432e70eba1218"; - sha256 = "1bg0vjf6pnbjmj76mzcbcrm7gdhsxqi040xspyizfykj72qjqyd4"; + rev = "303f4a17f06b41c99210afaa6b21a7a16da533db"; + sha256 = "0rp1nc4hghn0i7ipbd6n0ja3zb5zv44pm9snfwlai2p5c8awi39z"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; }; @@ -2556,12 +2664,12 @@ final: prev: lexima-vim = buildVimPluginFrom2Nix { pname = "lexima-vim"; - version = "2020-07-31"; + version = "2021-08-12"; src = fetchFromGitHub { owner = "cohama"; repo = "lexima.vim"; - rev = "89bf4dc13539131a29cf938074b3f1ce9d000bfd"; - sha256 = "19b73r3v4i64kiijihzqlbj6bf6jd1w90qc7d3lg95iwlaczd8v0"; + rev = "6b716e2118d842a26620387f0845e57cfd69ffaf"; + sha256 = "1az40rjfyvwg9zkk822abrf0v0ccm29rp5290capirnfna5w71d6"; }; meta.homepage = "https://github.com/cohama/lexima.vim/"; }; @@ -2652,12 +2760,12 @@ final: prev: lightspeed-nvim = buildVimPluginFrom2Nix { pname = "lightspeed-nvim"; - version = "2021-08-10"; + version = "2021-08-16"; src = fetchFromGitHub { owner = "ggandor"; repo = "lightspeed.nvim"; - rev = "889e6360c3026fb35101f5d81db630721c526a18"; - sha256 = "03klvjqk7n2ssji1di2w204py32h13lb0jv4d7h6c52y442k0q37"; + rev = "d1084c0ac413d6ad1ed3ec290604e7e2fbe0aae1"; + sha256 = "1qjs3wj4svjvbangivpvg7j4swm50d7s0ll1qsg61s59jchp1gjq"; }; meta.homepage = "https://github.com/ggandor/lightspeed.nvim/"; }; @@ -2674,6 +2782,18 @@ final: prev: meta.homepage = "https://github.com/junegunn/limelight.vim/"; }; + lir-nvim = buildVimPluginFrom2Nix { + pname = "lir-nvim"; + version = "2021-08-15"; + src = fetchFromGitHub { + owner = "tamago324"; + repo = "lir.nvim"; + rev = "2704b9374c541db9a1cb0da1f095d800cf1c5af3"; + sha256 = "1ixqq5jigm5fdbcgp611sjybvr8fyvfnm7z55g5nk9zk5gql4xma"; + }; + meta.homepage = "https://github.com/tamago324/lir.nvim/"; + }; + lispdocs-nvim = buildVimPluginFrom2Nix { pname = "lispdocs-nvim"; version = "2021-05-16"; @@ -2700,12 +2820,12 @@ final: prev: lsp-rooter-nvim = buildVimPluginFrom2Nix { pname = "lsp-rooter-nvim"; - version = "2021-05-25"; + version = "2021-08-13"; src = fetchFromGitHub { owner = "ahmedkhalf"; repo = "lsp-rooter.nvim"; - rev = "ca8670c8fc4efbd9a05f330f4037304962c9abbb"; - sha256 = "1p24gk4yps21wm8gwrsp9a6c2ynwv6xlp7iny2448l2yvrjw494n"; + rev = "7c83364f5a40db6c91f322fb148a99be8cec7b91"; + sha256 = "1zmjc9a72swndgzzqyax1r6ifi858dq445ygmpxbpav8kp0q7n4g"; }; meta.homepage = "https://github.com/ahmedkhalf/lsp-rooter.nvim/"; }; @@ -2736,24 +2856,24 @@ final: prev: lsp_signature-nvim = buildVimPluginFrom2Nix { pname = "lsp_signature-nvim"; - version = "2021-08-11"; + version = "2021-08-13"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "6f0d7b847334ca460b0484cb527afdf13a9febaa"; - sha256 = "1iy6pfz2y4908b22l5zdgj9bynciy6yb4g5x8irgp824m8s3s6ps"; + rev = "1c4a686e05ef30e4b815d1e3d77507f15efa7e99"; + sha256 = "04k78pijr15c21bdf05f4b3w0zmj3fd4572z4qmb3x9r993zznky"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; lspkind-nvim = buildVimPluginFrom2Nix { pname = "lspkind-nvim"; - version = "2021-08-03"; + version = "2021-08-15"; src = fetchFromGitHub { owner = "onsails"; repo = "lspkind-nvim"; - rev = "7ffcfe88334d0887833c9d8ca6f1231a11612cb5"; - sha256 = "0i40z1a5h8rk4blwadcxpid10i264gbl7lhl16hjllyl77bbvvgs"; + rev = "6298b12a8cd833144997854d37eb6052aedc4bf4"; + sha256 = "169vksccl0qzc98pfn4wx2cihw0l8zl19qvfbs6rjxh9lcnbmijf"; }; meta.homepage = "https://github.com/onsails/lspkind-nvim/"; }; @@ -2796,12 +2916,12 @@ final: prev: luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2021-08-09"; + version = "2021-08-15"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "453b23f1a170f92f378d974d1c72a2739850a018"; - sha256 = "1m1j4g55wzlcflvxf1fci1554ws8g1liihm1qrapccmknpsxcnq6"; + rev = "8cb1b905331463efd55b03de34a1ab519dcb5f04"; + sha256 = "1jn7p1lf0zxhbbnzsriznvlw20f97z0s51afhlj4cqihr1sv81z7"; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; }; @@ -3216,12 +3336,12 @@ final: prev: neogit = buildVimPluginFrom2Nix { pname = "neogit"; - version = "2021-08-03"; + version = "2021-08-16"; src = fetchFromGitHub { owner = "TimUntersberger"; repo = "neogit"; - rev = "3226b98318518bef47f55218041adfdf99c36e9a"; - sha256 = "09r6k5afd940cf44gdb62ffnh0ns32qr20vxxqgsw3rdi5558wfc"; + rev = "16de1b46e993e0b1e749c2345584c79ba14d11c1"; + sha256 = "0171v70ywnzpgzaadrw344511l3z7q60wvm6y5892z9m8mnwlw58"; }; meta.homepage = "https://github.com/TimUntersberger/neogit/"; }; @@ -3276,12 +3396,12 @@ final: prev: neoscroll-nvim = buildVimPluginFrom2Nix { pname = "neoscroll-nvim"; - version = "2021-07-23"; + version = "2021-08-15"; src = fetchFromGitHub { owner = "karb94"; repo = "neoscroll.nvim"; - rev = "bc1dc90b6697931fca5e19fdc4c2fa43d944269f"; - sha256 = "1ji348kp4w77dhw7byfqrdyv1z7xwn7dx54y1nvclpbbj36ya9wk"; + rev = "54879c6957ee5e833924064ff7fc17c144502ae9"; + sha256 = "0r5dxb2qh2nkchiq7ib7aqnr46gy82i9wpv21z3h0kdj03lb12sc"; }; meta.homepage = "https://github.com/karb94/neoscroll.nvim/"; }; @@ -3324,12 +3444,12 @@ final: prev: neoterm = buildVimPluginFrom2Nix { pname = "neoterm"; - version = "2021-07-23"; + version = "2021-08-12"; src = fetchFromGitHub { owner = "kassio"; repo = "neoterm"; - rev = "a626942b2a87a865c73e1d62391ef7e85ddf8bce"; - sha256 = "0145gxpaq8zidrsksq1d40y5g3l2f1ac5z9n5p21b32x512d4diz"; + rev = "e78179a9ceb98de8d0c37bdda435a5deab4d5e71"; + sha256 = "0w962xfcgigdw41wblrv1l55xki0kl5vwkdbm6jlr44hzii0nhgz"; }; meta.homepage = "https://github.com/kassio/neoterm/"; }; @@ -3396,12 +3516,12 @@ final: prev: nerdtree = buildVimPluginFrom2Nix { pname = "nerdtree"; - version = "2021-07-15"; + version = "2021-08-12"; src = fetchFromGitHub { owner = "preservim"; repo = "nerdtree"; - rev = "2c14ed0e153cdcd0a1c7d1eabec6820bb6b3f8a2"; - sha256 = "0gny5xw4knvjlkgazygpkwy8fk2x8igh45f980ypjghfkiw8h5f8"; + rev = "0e71462f90fb4bd09121eeba829512cc24ab5c97"; + sha256 = "0q88xrd0zi0wm7rdpggq9gfrlki56w14qr4bg5x1im3p4y6nj7f3"; }; meta.homepage = "https://github.com/preservim/nerdtree/"; }; @@ -3492,12 +3612,12 @@ final: prev: nord-nvim = buildVimPluginFrom2Nix { pname = "nord-nvim"; - version = "2021-08-06"; + version = "2021-08-16"; src = fetchFromGitHub { owner = "shaunsingh"; repo = "nord.nvim"; - rev = "5cb83dfa9158512ead196e449b86eab952a17931"; - sha256 = "0b8kzgsa9r58ns09bcgxak7jnf45al8d8fk6m812ci0l381xxlkk"; + rev = "4d1bef41e01fbdcb31a47d722e107b29a1f9f428"; + sha256 = "1v9d7dsmchmkzqqf92rzhscv4n0n75jm0hqkq49m11d62dc5aic9"; }; meta.homepage = "https://github.com/shaunsingh/nord.nvim/"; }; @@ -3528,12 +3648,12 @@ final: prev: null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls-nvim"; - version = "2021-08-11"; + version = "2021-08-16"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "1724d220448a327de92be556e2edb2b3cf2117c1"; - sha256 = "0p53pphn03wh1vlscjk4i8bvn36l2xkxm7f83lvy9yb16a8yky29"; + rev = "4db2c4e2b59d16143bd8903c9bc73776b535be50"; + sha256 = "18dg3gdfwxhhz8snvw697r4nmc9aag3ylrzm7g84k67hpfir82r6"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -3576,12 +3696,12 @@ final: prev: nvim-autopairs = buildVimPluginFrom2Nix { pname = "nvim-autopairs"; - version = "2021-08-11"; + version = "2021-08-14"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "d71b3f6060a056dd4d3830b6406fe7143691d631"; - sha256 = "0f4w32gpb3n415x4h6fbfi8cvcmxb0mp3vspnga6n2zynvwv9rfq"; + rev = "afd3b224a0d508af38270dc87d836fc55b347561"; + sha256 = "1xgcp0s9j551l5a573rln1h47xkf9md8gb6wrvwjrxsjkinksl90"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; @@ -3646,6 +3766,18 @@ final: prev: meta.homepage = "https://github.com/roxma/nvim-cm-racer/"; }; + nvim-cmp = buildVimPluginFrom2Nix { + pname = "nvim-cmp"; + version = "2021-08-16"; + src = fetchFromGitHub { + owner = "hrsh7th"; + repo = "nvim-cmp"; + rev = "29ad715924eb8fafa8cd042b1a9eb66b03db0d0d"; + sha256 = "0c8wy66743dwf04p3l3fphndr58g9crlg96x90xkx2kr2s64a9dd"; + }; + meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; + }; + nvim-colorizer-lua = buildVimPluginFrom2Nix { pname = "nvim-colorizer-lua"; version = "2020-06-11"; @@ -3660,12 +3792,12 @@ final: prev: nvim-compe = buildVimPluginFrom2Nix { pname = "nvim-compe"; - version = "2021-08-09"; + version = "2021-08-14"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-compe"; - rev = "8ed6999e005015251b6b05cb5c0bfe857785b1d4"; - sha256 = "0921vgji6n5hcb3z2cppz2gfbkww71yn7wqvh3wvgrw041ird3af"; + rev = "cfbcd727d97958943c0d94e8a8126abe27294ad3"; + sha256 = "0znfd451bshqczalw5w4gy2k7fp8630p7vkmfpp1n4gw7z3vchqg"; }; meta.homepage = "https://github.com/hrsh7th/nvim-compe/"; }; @@ -3684,24 +3816,24 @@ final: prev: nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2021-08-11"; + version = "2021-08-12"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "ef5a201caa05eba06f115515f9c4c8897045fe93"; - sha256 = "1h6dw1zwz57q4if2akfrwhvhgj0fcf1x5c3cax351sjq9gshx86h"; + rev = "7e2906e9f68cce2cab7428af588006795afb40e1"; + sha256 = "0yk6l3bb2dqjrc37h8a7115ywmwaa5wvsijjvxx7psy2dlnv583r"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; nvim-dap-ui = buildVimPluginFrom2Nix { pname = "nvim-dap-ui"; - version = "2021-08-03"; + version = "2021-08-15"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-dap-ui"; - rev = "90a4025a4da7ac7a261026c50439bbd1bdfc8563"; - sha256 = "0apl84djyxy8ldcxv2xs0irgy7rjxcisqnl3wxcfi3fhvfsb0fz3"; + rev = "c9fc568ca157429cd76986ca2bfaa60488a7d2fb"; + sha256 = "09jk0v2ki0hsy1m2hg3dwi66yaqn670vnjbbrbdxrq55n260gds3"; }; meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/"; }; @@ -3718,6 +3850,18 @@ final: prev: meta.homepage = "https://github.com/theHamsta/nvim-dap-virtual-text/"; }; + nvim-expand-expr = buildVimPluginFrom2Nix { + pname = "nvim-expand-expr"; + version = "2021-08-14"; + src = fetchFromGitHub { + owner = "allendang"; + repo = "nvim-expand-expr"; + rev = "365cc2a0111228938fb46cffb9cc1a246d787cf0"; + sha256 = "1nmklzvvq64dz430gzrbq6qpjrvwwfm09lsw4iiffs9fizjp95if"; + }; + meta.homepage = "https://github.com/allendang/nvim-expand-expr/"; + }; + nvim-gdb = buildVimPluginFrom2Nix { pname = "nvim-gdb"; version = "2021-08-02"; @@ -3744,12 +3888,12 @@ final: prev: nvim-hlslens = buildVimPluginFrom2Nix { pname = "nvim-hlslens"; - version = "2021-08-08"; + version = "2021-08-13"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-hlslens"; - rev = "d789c9ccba5c83c0fec6aa4e9cdac3803b5550e7"; - sha256 = "0wm9axsj9ns00xmiix83b2l6lqm2y7qyh81y851z32im9xjfxixk"; + rev = "1e53aeefa949f68214f6b86b4cc4375613d739ca"; + sha256 = "1x5w7j01gkyxz86d7rkwxi2mqh5z54cynrrk0pmjkmijshbxs6s8"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/"; }; @@ -3792,12 +3936,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2021-08-11"; + version = "2021-08-16"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "d2d6e6251172a78436b7d2730a638e572f04b6ce"; - sha256 = "0b146fvcsg5i5x8bqmk9n1gfv9h158b6vss69pp47nr7jf7xfrfd"; + rev = "acb420880b83563c0ce83a3cea278cadfc7023e4"; + sha256 = "16bfn1qkbnicpkpisf5i4snra8glfg4rawvi52fpjqghxj9g1xz2"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -3852,12 +3996,12 @@ final: prev: nvim-scrollview = buildVimPluginFrom2Nix { pname = "nvim-scrollview"; - version = "2021-08-01"; + version = "2021-08-14"; src = fetchFromGitHub { owner = "dstein64"; repo = "nvim-scrollview"; - rev = "8cba9eee2ae26209a05fb5e511f123677d108c96"; - sha256 = "1brbjjjsi8gdzqqba8l0v8n2d5chs396w9mr152iflck6vqfad9c"; + rev = "b95d9bb41ed05c146b76a26b76298644b14a043e"; + sha256 = "0si733xbiwqpkg10xkicfrcv6v5z38p95589qnf34d2c2n1xy5qs"; }; meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; }; @@ -3876,24 +4020,24 @@ final: prev: nvim-toggleterm-lua = buildVimPluginFrom2Nix { pname = "nvim-toggleterm-lua"; - version = "2021-08-06"; + version = "2021-08-15"; src = fetchFromGitHub { owner = "akinsho"; repo = "nvim-toggleterm.lua"; - rev = "cdeb723ffe955ff0d3fdcbbe3776632da2b41513"; - sha256 = "1r67avqfqv7rzjg1whwacy0938nql0j0vxb6rwsc4ay19zv1nng9"; + rev = "775012662eb2070e44b294d43938fa2625a9c836"; + sha256 = "0q39ddq6yb1iscgp1mdgdyhz0cmb794ycbfd5ph3xp8ffly4z7hk"; }; meta.homepage = "https://github.com/akinsho/nvim-toggleterm.lua/"; }; nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree-lua"; - version = "2021-08-08"; + version = "2021-08-14"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-tree.lua"; - rev = "6175d63eaecdc7d80105825f89a6c9864c4dd432"; - sha256 = "0q716l729flcnqkjs98bgjlqpibm8jpknq9h3izcnas2h5bgrmjj"; + rev = "d74af818c085e1ffdcf7e9afc101de8cbe3ad883"; + sha256 = "1524p6zd3q2bmrik7xbqwlin4pdv566vlr54mxhxpb5lx70yn43w"; }; meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/"; }; @@ -4080,24 +4224,24 @@ final: prev: onedark-nvim = buildVimPluginFrom2Nix { pname = "onedark-nvim"; - version = "2021-07-16"; + version = "2021-08-13"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedark.nvim"; - rev = "df80982b43ced71a286933e830b26faabb9a36e9"; - sha256 = "1hddmi543js7z77383ppvdray2dri5jn8lcqivk9xm5l8maz52cz"; + rev = "6541b3a6e8290fed5aa09034980b2d24f00d75a7"; + sha256 = "0nq33b1dir1agm82km0swi2xhr8688s7h6qkml6csix5h3kvvl15"; }; meta.homepage = "https://github.com/olimorris/onedark.nvim/"; }; onedark-vim = buildVimPluginFrom2Nix { pname = "onedark-vim"; - version = "2021-07-12"; + version = "2021-08-12"; src = fetchFromGitHub { owner = "joshdick"; repo = "onedark.vim"; - rev = "ee4b22cbae8a3a434fad832bd89a6981c7c061af"; - sha256 = "1fz3ly97w0n8viarlqil2q38s6hwd0lzyyi2jvpqsg9bj07dg4k3"; + rev = "bd199dfa76cd0ff4abef2a8ad19c44d35552879d"; + sha256 = "1xh3ypma3kmn0nb8szq14flfca6ss8k2f1vlnvyapa8dc9i731yy"; }; meta.homepage = "https://github.com/joshdick/onedark.vim/"; }; @@ -4248,12 +4392,12 @@ final: prev: plenary-nvim = buildVimPluginFrom2Nix { pname = "plenary-nvim"; - version = "2021-08-11"; + version = "2021-08-13"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "adf9d62023e2d39d9d9a2bc550feb3ed7b545d0f"; - sha256 = "1h11a0lil14c13v5mdzdmxxqjpqip5fhvjbm34827czb5pz1hvcz"; + rev = "0b78fe699b9049b8f46942664027b32102979832"; + sha256 = "16ghyvnsqdrfkjb7hawcvwrx56v6llnq4zziw4z1811j4n1v6ypa"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; @@ -4297,12 +4441,12 @@ final: prev: presence-nvim = buildVimPluginFrom2Nix { pname = "presence-nvim"; - version = "2021-08-11"; + version = "2021-08-15"; src = fetchFromGitHub { owner = "andweeb"; repo = "presence.nvim"; - rev = "e632306af10f28a662d53bafed85a8cf8b4f63b7"; - sha256 = "1sa8lc3xyb8sbmh0iwrh2r3j3rqnp5pjmi99h3i0ksm7yqcmkkk4"; + rev = "e7aac8fb011d76ba5d432eebee990e3631bbc71b"; + sha256 = "09450ms1jzb37i8d0p133zr3ffpngcyn88x69d873hxnd1kxm5hm"; }; meta.homepage = "https://github.com/andweeb/presence.nvim/"; }; @@ -4487,6 +4631,18 @@ final: prev: meta.homepage = "https://github.com/chrisbra/Recover.vim/"; }; + refactoring-nvim = buildVimPluginFrom2Nix { + pname = "refactoring-nvim"; + version = "2021-08-16"; + src = fetchFromGitHub { + owner = "theprimeagen"; + repo = "refactoring.nvim"; + rev = "aabd4776d3fd756b76f9e264496e1ea81cab77c4"; + sha256 = "168hpn3nxjsy3a5h3lvzk6gbhcfnh7k7p0xhpjxi67x1f99dnx0s"; + }; + meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/"; + }; + registers-nvim = buildVimPluginFrom2Nix { pname = "registers-nvim"; version = "2021-08-11"; @@ -4585,12 +4741,12 @@ final: prev: rust-tools-nvim = buildVimPluginFrom2Nix { pname = "rust-tools-nvim"; - version = "2021-08-01"; + version = "2021-08-15"; src = fetchFromGitHub { owner = "simrat39"; repo = "rust-tools.nvim"; - rev = "8ead43e5fb5cf94976f1a40319d8f5e74d204e68"; - sha256 = "02hvy6ffzyc0gf7bngp6pngyf5an18f63mzdpxc3ldnxrd5dimjj"; + rev = "c5f8e2d8e05eff2e3142f6808c675f5df087785f"; + sha256 = "1qx2rz5a37dw5q3dn6p02cjsdhkfaip9mwfzi2prrk7hjcf9ix5m"; }; meta.homepage = "https://github.com/simrat39/rust-tools.nvim/"; }; @@ -4935,12 +5091,12 @@ final: prev: sql-nvim = buildVimPluginFrom2Nix { pname = "sql-nvim"; - version = "2021-08-11"; + version = "2021-08-16"; src = fetchFromGitHub { owner = "tami5"; repo = "sql.nvim"; - rev = "2e53ff98879fcdb41a011f5088bb2bbb070350f1"; - sha256 = "176jv5q2bln5gg7smh9f4dd3c2hc6pzskqjjx5pl45hmb4k0akjr"; + rev = "cc7b7cc76427eb321955278587b84e84c0af246e"; + sha256 = "0i2j3s6n9zmpn8jc5waxl3biqca23f5cbiapgr9gwgqj22f1xzd2"; }; meta.homepage = "https://github.com/tami5/sql.nvim/"; }; @@ -5164,12 +5320,12 @@ final: prev: taskwiki = buildVimPluginFrom2Nix { pname = "taskwiki"; - version = "2021-06-27"; + version = "2021-08-13"; src = fetchFromGitHub { owner = "tools-life"; repo = "taskwiki"; - rev = "f9a1e6ab9f10bd02fab05c225ccca6e253e690a0"; - sha256 = "12f1i8dfmd4n3wc4cs45csl6j6aw4g7i6bbqnk017sylwxpiilsq"; + rev = "832293f9f797ce56a35be1a9c28ed8ddc3113364"; + sha256 = "0568xnfhf7kd31nf0l10rxd5gnp90wph3623wrxrg3al5ix7jy6n"; }; meta.homepage = "https://github.com/tools-life/taskwiki/"; }; @@ -5212,12 +5368,12 @@ final: prev: telescope-fzf-native-nvim = buildVimPluginFrom2Nix { pname = "telescope-fzf-native-nvim"; - version = "2021-08-03"; + version = "2021-08-14"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-fzf-native.nvim"; - rev = "2fd60ebe4c372199e0d953310640b1aeaf06166f"; - sha256 = "0zs4fs62nbfm6vi0gmi49c3j430g7bzp81p6r4jl9vpqvb7hfpi2"; + rev = "9fb0d2d2297f7e313abf33a80331fadf4df716a5"; + sha256 = "1dqdh1ay56z9gx2f9qx5zbb8xidn3n6n8lnby7lkmixn3plmbsx0"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-fzf-native.nvim/"; }; @@ -5261,24 +5417,24 @@ final: prev: telescope-z-nvim = buildVimPluginFrom2Nix { pname = "telescope-z-nvim"; - version = "2021-07-19"; + version = "2021-08-12"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-z.nvim"; - rev = "f5776dbd0c687af0862b2e4ee83c62c5f4a7271d"; - sha256 = "08lcszv53d9mqhgdwkdygbnk5w0pyh0q6djxzqhnjb6qphibf3m6"; + rev = "8015020205e702bb62b4077294a59ee445e061f5"; + sha256 = "01vjdzjfz7293dwxilihk5qpgf92j59hdq3cl62630vhfxlbc1m0"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-z.nvim/"; }; telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope-nvim"; - version = "2021-08-11"; + version = "2021-08-13"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "d4a52ded6767ccda6c29e47332247003ac4c2007"; - sha256 = "15d996l9zbd300nrb946nfkw1b39v9qmzm1w2i8p4k11rclm77si"; + rev = "f1a27baf279976845eb43c65e99a71d7f0f92d02"; + sha256 = "069r1pkg82zj7fm55gk21va2f2x2jmrknfwld5bp0py344gh65n1"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -5898,12 +6054,12 @@ final: prev: vim-android = buildVimPluginFrom2Nix { pname = "vim-android"; - version = "2021-07-25"; + version = "2021-08-15"; src = fetchFromGitHub { owner = "hsanson"; repo = "vim-android"; - rev = "aeea4d67e377659077d7db99cf3c582211e941eb"; - sha256 = "07lyyxhf79mwlwrkyp9yq61nfvj2mb2xhcf3gb60adwy7qxcfl2k"; + rev = "e3e3fce70997a8d3ebd08f28b212d58c5daded11"; + sha256 = "0z1zcmry9vmagz03wh0y7smxfwsaf2fc2frhkza48clafx324rf0"; }; meta.homepage = "https://github.com/hsanson/vim-android/"; }; @@ -6150,12 +6306,12 @@ final: prev: vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2021-08-08"; + version = "2021-08-16"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "865b453825f309a204909f13b5afa98d36f7369f"; - sha256 = "1zfbm81qnvz7rgi2awi29id5z0xr6qzv04pj0yaxyhyjmy7frjyk"; + rev = "4a7e9bad08ccfebcf294ea0091d74ee64d98d236"; + sha256 = "0b5ldixvf2f3bk7ivzb3s7zb8s4ir7gayli1i6bdq753flkjq0bx"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -6486,12 +6642,12 @@ final: prev: vim-devicons = buildVimPluginFrom2Nix { pname = "vim-devicons"; - version = "2021-07-27"; + version = "2021-08-12"; src = fetchFromGitHub { owner = "ryanoasis"; repo = "vim-devicons"; - rev = "aa13718e367c44d27a784291a546923eb562fd2a"; - sha256 = "0vvdjqickp1c13ixkams6yayqasrz05r6bqqfb4qbwpqmispvwkl"; + rev = "0291f0ddfd6d34f5d3dfc272e69408510b53df62"; + sha256 = "0c8vzwkf38ldi18g5443wj6v7cgb009cbf6w13qashr6cqazbpga"; }; meta.homepage = "https://github.com/ryanoasis/vim-devicons/"; }; @@ -6546,12 +6702,12 @@ final: prev: vim-dispatch = buildVimPluginFrom2Nix { pname = "vim-dispatch"; - version = "2021-04-17"; + version = "2021-08-12"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-dispatch"; - rev = "250ea269e206445d10700b299afd3eb993e939ad"; - sha256 = "1fcp2nsgamkxm7x0mn1n3xp02dc7x773cdp9p30ikqn44pzgyq10"; + rev = "ed9538655a6ab3e8f48be7c32657ec974242845f"; + sha256 = "0zskv8isxg3yfsqw5bzi0n6ywhha63rnah4k6skjycawcb9i8bvv"; }; meta.homepage = "https://github.com/tpope/vim-dispatch/"; }; @@ -6930,12 +7086,12 @@ final: prev: vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2021-08-11"; + version = "2021-08-14"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "b709d9f782813565be57344538129cf00ea71463"; - sha256 = "0r2z1ahkvwsh54lsgm6r1hpj4bl639pazrf9w551zzw8h30najcl"; + rev = "f3e92c7721505a59738db15e3e80bc5ccff08e36"; + sha256 = "1ciwpk1gxjiay6c304bn2qw1f2cpsy751606l0m2inlscam2pal1"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -7520,12 +7676,12 @@ final: prev: vim-jsdoc = buildVimPluginFrom2Nix { pname = "vim-jsdoc"; - version = "2021-05-04"; + version = "2021-08-15"; src = fetchFromGitHub { owner = "heavenshell"; repo = "vim-jsdoc"; - rev = "e9e8547a57fa113945047c003d321fbbee770e03"; - sha256 = "15j7fb20rz6gndm04ac9lfwrbq9ss5pk9ilxj90rd1dmppvkdkfr"; + rev = "85c248898f5ca66a865e917b30e0e75579fa5463"; + sha256 = "056v6g1fszw77nncbmrz8mv3zchp17g3d5cqmc1sawrfif131gyb"; }; meta.homepage = "https://github.com/heavenshell/vim-jsdoc/"; }; @@ -7580,12 +7736,12 @@ final: prev: vim-kitty-navigator = buildVimPluginFrom2Nix { pname = "vim-kitty-navigator"; - version = "2021-08-02"; + version = "2021-08-14"; src = fetchFromGitHub { owner = "knubie"; repo = "vim-kitty-navigator"; - rev = "68c64c36778dcaca6c94275ffcb703e772aad19f"; - sha256 = "0x79w4lm3qfph4s86jdksyb6m1df2w32gp9yg2vqazk4szbcvd8z"; + rev = "5d6f5347346291b18e4a1ce769ad6f9cb2c46ba0"; + sha256 = "0cv2ppfc847r507v4jrx4z08krgy82i2bkjcqbdmf9k1qmgim00w"; }; meta.homepage = "https://github.com/knubie/vim-kitty-navigator/"; }; @@ -7604,11 +7760,11 @@ final: prev: vim-lastplace = buildVimPluginFrom2Nix { pname = "vim-lastplace"; - version = "2021-03-29"; + version = "2021-08-14"; src = fetchFromGitHub { owner = "farmergreg"; repo = "vim-lastplace"; - rev = "8f6c4454eb462776b6ebdc48e3e29a68ddeb726d"; + rev = "d522829d810f3254ca09da368a896c962d4a3d61"; sha256 = "04x6y9yp5xlds37bswmrc3xlhhjfln9nzrkippvvhl48b0kfnpj8"; }; meta.homepage = "https://github.com/farmergreg/vim-lastplace/"; @@ -7869,12 +8025,12 @@ final: prev: vim-matchup = buildVimPluginFrom2Nix { pname = "vim-matchup"; - version = "2021-08-10"; + version = "2021-08-15"; src = fetchFromGitHub { owner = "andymass"; repo = "vim-matchup"; - rev = "816751e279f1186d10520bad752206d5f91ce173"; - sha256 = "1z7gf14ifcza08yp0skdp1zad918fxpmws2p6b4zavmv4c6945ky"; + rev = "96738bdb81c493a4313b4bc5586ad540bd4ba6ce"; + sha256 = "0nan8crcsixwxmjj1xdbiizr50882102idd1ylynv7ihbf7hgmv8"; }; meta.homepage = "https://github.com/andymass/vim-matchup/"; }; @@ -8217,12 +8373,12 @@ final: prev: vim-oscyank = buildVimPluginFrom2Nix { pname = "vim-oscyank"; - version = "2021-08-09"; + version = "2021-08-16"; src = fetchFromGitHub { owner = "ojroques"; repo = "vim-oscyank"; - rev = "1189ef91c95f522159f9fd267a6bd1ea4b070195"; - sha256 = "12smb5p5lw3gakz6qbbdi11wcbyh8hap70csi8j0crr31fgjmsyf"; + rev = "bc49a0c2b5ded3f13445e47aa3cf8d3a0f972926"; + sha256 = "0l5gaf94p91xck6wn3a55dybd1d820dpq31v3sy3i2bxwfw0g8zd"; }; meta.homepage = "https://github.com/ojroques/vim-oscyank/"; }; @@ -8647,6 +8803,30 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-repeat/"; }; + vim-ReplaceWithRegister = buildVimPluginFrom2Nix { + pname = "vim-ReplaceWithRegister"; + version = "2021-07-05"; + src = fetchFromGitHub { + owner = "inkarkat"; + repo = "vim-ReplaceWithRegister"; + rev = "aad1e8fa31cb4722f20fe40679caa56e25120032"; + sha256 = "1cfgixq5smwbp55x2baaj1kw736w2mykysppphair44vb4w9rlgm"; + }; + meta.homepage = "https://github.com/inkarkat/vim-ReplaceWithRegister/"; + }; + + vim-ReplaceWithSameIndentRegister = buildVimPluginFrom2Nix { + pname = "vim-ReplaceWithSameIndentRegister"; + version = "2020-06-17"; + src = fetchFromGitHub { + owner = "inkarkat"; + repo = "vim-ReplaceWithSameIndentRegister"; + rev = "0b7f542560bd21822a004e8accdf472eb477c9cf"; + sha256 = "04zvhqh9rjfiwfk8r0zci608pw09svqb42nvp8pvqb11xp2ydg2y"; + }; + meta.homepage = "https://github.com/inkarkat/vim-ReplaceWithSameIndentRegister/"; + }; + vim-rhubarb = buildVimPluginFrom2Nix { pname = "vim-rhubarb"; version = "2021-07-16"; @@ -9202,12 +9382,12 @@ final: prev: vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2021-07-08"; + version = "2021-08-13"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "849d378a499ada59d3326c166d44f0a118e4bdbf"; - sha256 = "161a3nh1ggd2ff2d6bllssfds6kcab3z7sckr2q2bbipggl33lkd"; + rev = "b980e646e5f91d6e65659737b584e484ef918984"; + sha256 = "073lpxmrs41zm0mqxf6pmf88xvkq1fngryl8rp1lcgkrwbl7isg4"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; @@ -9370,12 +9550,12 @@ final: prev: vim-tpipeline = buildVimPluginFrom2Nix { pname = "vim-tpipeline"; - version = "2021-08-03"; + version = "2021-08-14"; src = fetchFromGitHub { owner = "vimpostor"; repo = "vim-tpipeline"; - rev = "a22d2e53ec38c11fde58e4cf9aab47d89d6600f6"; - sha256 = "0axdgfvkamywypylpssmlfj0hh0bf5szcp8xri1g8lqks3f5bkv5"; + rev = "2f43d6da23b880375ba53cf55d33b0bc021f6aec"; + sha256 = "1gz8dsjqvyma147qmqgbm512rka8wmfhgvxnlz48mh5i8l2i8ypg"; }; meta.homepage = "https://github.com/vimpostor/vim-tpipeline/"; }; @@ -9430,12 +9610,12 @@ final: prev: vim-ultest = buildVimPluginFrom2Nix { pname = "vim-ultest"; - version = "2021-08-09"; + version = "2021-08-15"; src = fetchFromGitHub { owner = "rcarriga"; repo = "vim-ultest"; - rev = "3e28c3815c86637944e6425c444ab55cdd25528f"; - sha256 = "0b51mqizw4igzpjgs38pn9f0mn83hlalxv43swq3pkxray5vfav2"; + rev = "64545fecb865f8cbe7160a5d7d1b8367cea1656c"; + sha256 = "1m8g6j2086x3fq99158m4g2wcsp8v1s00wim0hka7zhfwz0pd7zp"; }; meta.homepage = "https://github.com/rcarriga/vim-ultest/"; }; @@ -9454,12 +9634,12 @@ final: prev: vim-unimpaired = buildVimPluginFrom2Nix { pname = "vim-unimpaired"; - version = "2021-08-01"; + version = "2021-08-15"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-unimpaired"; - rev = "ee21252c035004efd6fea40335cd311e71cf7a33"; - sha256 = "1grl78f5nhdryg1w0xh9j6fs1xd3j6dcv92vcvl9rp87ixgnmbag"; + rev = "aee3455e19686ce84225752de678a9725866248b"; + sha256 = "0j6xz4m8p351dmvhssi0f699609wpm5nz5q9xysy15vpwxds3nl9"; }; meta.homepage = "https://github.com/tpope/vim-unimpaired/"; }; @@ -9526,12 +9706,12 @@ final: prev: vim-vsnip = buildVimPluginFrom2Nix { pname = "vim-vsnip"; - version = "2021-07-05"; + version = "2021-08-14"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "vim-vsnip"; - rev = "d9d3c2d2942b8e35aedc5c82552913b19958de77"; - sha256 = "06hv1rf3br32n6ks5fic8x9c1m32n3wx4pj4xgmy9q58gf95sn2w"; + rev = "87d144b7451deb3ab55f1a3e3c5124cfab2b02fa"; + sha256 = "17gw992xvxsa6wyirah17xbsdi2gl4lif8ibvbs7dwagnkv01vyb"; }; meta.homepage = "https://github.com/hrsh7th/vim-vsnip/"; }; @@ -9562,12 +9742,12 @@ final: prev: vim-wakatime = buildVimPluginFrom2Nix { pname = "vim-wakatime"; - version = "2020-12-29"; + version = "2021-08-15"; src = fetchFromGitHub { owner = "wakatime"; repo = "vim-wakatime"; - rev = "45dfc28c30b44041183d749cf724e3dba9ac65ef"; - sha256 = "1ipdynpg9v5mll1zimyiaxw4zzj004myh5xjky32z783lgi0qlxl"; + rev = "37544a5d3f028d93f9ad8c4445cd1dc623d08c5e"; + sha256 = "1s8q8hch38ydkfr2fd7259swgbpchs70shjharahl5vm3x72jpgy"; }; meta.homepage = "https://github.com/wakatime/vim-wakatime/"; }; @@ -9658,12 +9838,12 @@ final: prev: vim-xtabline = buildVimPluginFrom2Nix { pname = "vim-xtabline"; - version = "2021-08-08"; + version = "2021-08-13"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-xtabline"; - rev = "da2b4d1094e7771cf2de671ce64bd086da9e8d57"; - sha256 = "0p48dzjvjb403dbn641h9p0jhip4dbd6w7r9zf73b3wbd2ym6y38"; + rev = "9e1ee818616edc38a52dbc3956a3046393384d05"; + sha256 = "0j2z5mkdpfp6wzz7saqnpla0wmsr1c42gvjs0n2i4385phlg93vz"; }; meta.homepage = "https://github.com/mg979/vim-xtabline/"; }; @@ -9863,24 +10043,24 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2021-08-10"; + version = "2021-08-16"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "ae606455d79301f9091c1b6bde0ce87c17512312"; - sha256 = "13l4mli0qnsdillsgwc3f2810vy6mc388g54lc519c62yjc2r14h"; + rev = "cb71390373e793875efd3609e0ad800d816ff4af"; + sha256 = "0l9yklk0pd7kgy39b09rirwpqbryy148ch9vffq3isyhdk6b3v10"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; vimux = buildVimPluginFrom2Nix { pname = "vimux"; - version = "2021-08-11"; + version = "2021-08-15"; src = fetchFromGitHub { owner = "preservim"; repo = "vimux"; - rev = "031cc6208ed93788ce8d8d71b83c9d81fdddeeb3"; - sha256 = "1a5sgrnkyngwn2b771b8bm2awsq36yr5f17wclxg7fcms2y43lgv"; + rev = "89604a4464c3069dbe31f7bc8dd16a5fbc88a303"; + sha256 = "1lr7zqza29xxwbki9fgfazrak6ybyvm1a782kbs3v3zip10xmm3x"; }; meta.homepage = "https://github.com/preservim/vimux/"; }; @@ -9983,12 +10163,12 @@ final: prev: wilder-nvim = buildVimPluginFrom2Nix { pname = "wilder-nvim"; - version = "2021-08-10"; + version = "2021-08-16"; src = fetchFromGitHub { owner = "gelguy"; repo = "wilder.nvim"; - rev = "8f15d62faab17f700798c4eabe75203a9bc4a6d2"; - sha256 = "0sicqzlvpiax38l46ccpnlfgsl8bkks9kn9b613v33n50j20bppc"; + rev = "f70f292f9e680b3645c8e24ebee524264a9e75e2"; + sha256 = "1a45s282b85hjffdzd2375wv6c70dlli7l0wpcsq56ab4pyxamqz"; }; meta.homepage = "https://github.com/gelguy/wilder.nvim/"; }; diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix b/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix index b2dd6f0f5f..5b6b9a2264 100644 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix @@ -126,8 +126,8 @@ self: super: { buildInputs = [ tabnine ]; postFixup = '' - mkdir $target/binaries - ln -s ${tabnine}/bin/TabNine $target/binaries/TabNine_$(uname -s) + mkdir -p $target/binaries/${tabnine.version} + ln -s ${tabnine}/bin/ $target/binaries/${tabnine.version}/${tabnine.passthru.platform} ''; }); @@ -214,6 +214,14 @@ self: super: { dependencies = with self; [ vimproc-vim vimshell-vim self.self forms ]; }); + fcitx-vim = super.fcitx-vim.overrideAttrs (old: { + passthru.python3Dependencies = ps: with ps; [ dbus-python ]; + meta = { + description = "Keep and restore fcitx state when leaving/re-entering insert mode or search mode"; + license = lib.licenses.mit; + }; + }); + forms = super.forms.overrideAttrs (old: { dependencies = with self; [ self.self ]; }); @@ -284,7 +292,7 @@ self: super: { dependencies = with self; [ plenary-nvim ]; }); - plenary-nvim = super.toVimPlugin(luaPackages.plenary-nvim); + # plenary-nvim = super.toVimPlugin(luaPackages.plenary-nvim); gruvbox-nvim = super.gruvbox-nvim.overrideAttrs (old: { dependencies = with self; [ lush-nvim ]; @@ -371,6 +379,10 @@ self: super: { dependencies = with self; [ vim-floaterm ]; }); + lir-nvim = super.lir-nvim.overrideAttrs (old: { + dependencies = with self; [ plenary-nvim ]; + }); + meson = buildVimPluginFrom2Nix { inherit (meson) pname version src; preInstall = "cd data/syntax-highlighting/vim"; @@ -449,6 +461,10 @@ self: super: { configurePhase = "cd vim"; }); + refactoring-nvim = super.refactoring-nvim.overrideAttrs (old: { + dependencies = with self; [ nvim-treesitter plenary-nvim ]; + }); + skim = buildVimPluginFrom2Nix { pname = "skim"; version = skim.version; @@ -655,7 +671,7 @@ self: super: { libiconv ]; - cargoSha256 = "sha256-wYxUo9zfflU7RTsTb7W9wc/WBsXhz3OLjC8CwUkRRiE="; + cargoSha256 = "16lcsi5mxmj79ky5lbpivravn8rjl4z3j3fsxrglb22ab4i7js3n"; }; in '' diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/update.py b/third_party/nixpkgs/pkgs/misc/vim-plugins/update.py index fdb33df972..6f15f5dd27 100755 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/update.py +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/update.py @@ -65,20 +65,20 @@ class VimEditor(pluginupdate.Editor): f.write(textwrap.indent(textwrap.dedent( f""" - {plugin.normalized_name} = buildVimPluginFrom2Nix {{ - pname = "{plugin.normalized_name}"; - version = "{plugin.version}"; - src = fetchFromGitHub {{ - owner = "{owner}"; - repo = "{repo}"; - rev = "{plugin.commit}"; - sha256 = "{plugin.sha256}";{submodule_attr} - }}; - meta.homepage = "https://github.com/{owner}/{repo}/"; - }}; - """ + {plugin.normalized_name} = buildVimPluginFrom2Nix {{ + pname = "{plugin.normalized_name}"; + version = "{plugin.version}"; + src = fetchFromGitHub {{ + owner = "{owner}"; + repo = "{repo}"; + rev = "{plugin.commit}"; + sha256 = "{plugin.sha256}";{submodule_attr} + }}; + meta.homepage = "https://github.com/{owner}/{repo}/"; + }}; +""" ), ' ')) - f.write("\n}") + f.write("\n}\n") print(f"updated {outfile}") 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 139df6fe6c..39973d77e0 100644 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names @@ -9,6 +9,7 @@ ajmwagar/vim-deus akinsho/nvim-bufferline.lua akinsho/nvim-toggleterm.lua aklt/plantuml-syntax +allendang/nvim-expand-expr@main altercation/vim-colors-solarized alvan/vim-closetag alx741/vim-hindent @@ -212,6 +213,13 @@ HerringtonDarkholme/yats.vim honza/vim-snippets hoob3rt/lualine.nvim hotwatermorning/auto-git-diff +hrsh7th/cmp-buffer@main +hrsh7th/cmp-calc@main +hrsh7th/cmp-emoji@main +hrsh7th/cmp-nvim-lsp@main +hrsh7th/cmp-path@main +hrsh7th/cmp-vsnip@main +hrsh7th/nvim-cmp@main hrsh7th/nvim-compe hrsh7th/vim-vsnip hrsh7th/vim-vsnip-integ @@ -223,6 +231,8 @@ ianks/vim-tsx idanarye/vim-merginal idris-hackers/idris-vim Inazuma110/deoplete-greek +inkarkat/vim-ReplaceWithRegister +inkarkat/vim-ReplaceWithSameIndentRegister inkarkat/vim-SyntaxRange int3/vim-extradite Iron-E/nvim-highlite @@ -351,6 +361,7 @@ lifepillar/vim-gruvbox8 lifepillar/vim-mucomplete lighttiger2505/deoplete-vim-lsp lilydjwg/colorizer +lilydjwg/fcitx.vim@fcitx5 liuchengxu/vim-clap liuchengxu/vim-which-key liuchengxu/vista.vim @@ -570,6 +581,7 @@ rbong/vim-flog rcarriga/nvim-dap-ui rcarriga/nvim-notify rcarriga/vim-ultest +rhysd/clever-f.vim rhysd/committia.vim rhysd/conflict-marker.vim rhysd/devdocs.vim @@ -602,6 +614,7 @@ ruifm/gitlinker.nvim rust-lang/rust.vim ryanoasis/vim-devicons ryvnf/readline.vim +saadparwaiz1/cmp_luasnip sainnhe/edge sainnhe/gruvbox-material sainnhe/sonokai @@ -666,6 +679,7 @@ t9md/vim-smalls TaDaa/vimade takac/vim-hardtime tamago324/compe-zsh +tamago324/lir.nvim tami5/compe-conjure tami5/lispdocs.nvim tami5/sql.nvim @@ -678,6 +692,7 @@ tex/vimpreviewpandoc Th3Whit3Wolf/one-nvim@main theHamsta/nvim-dap-virtual-text ThePrimeagen/git-worktree.nvim +theprimeagen/refactoring.nvim ThePrimeagen/vim-apm thinca/vim-ft-diff_fold thinca/vim-prettyprint diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-utils.nix b/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-utils.nix index ca5381c597..2f81820fe7 100644 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-utils.nix +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-utils.nix @@ -3,6 +3,7 @@ , nix-prefetch-hg, nix-prefetch-git , fetchFromGitHub, runtimeShell , hasLuaModule +, python3 }: /* @@ -210,13 +211,24 @@ let # and can simply pass `null`. depsOfOptionalPlugins = lib.subtractLists opt (findDependenciesRecursively opt); startWithDeps = findDependenciesRecursively start; + allPlugins = lib.unique (startWithDeps ++ depsOfOptionalPlugins); + python3Env = python3.withPackages (ps: + lib.flatten (builtins.map (plugin: (plugin.python3Dependencies or (_: [])) ps) allPlugins) + ); in [ "mkdir -p $out/pack/${packageName}/start" ] # To avoid confusion, even dependencies of optional plugins are added # to `start` (except if they are explicitly listed as optional plugins). - ++ (builtins.map (x: link x packageName "start") (lib.unique (startWithDeps ++ depsOfOptionalPlugins))) + ++ (builtins.map (x: link x packageName "start") allPlugins) ++ ["mkdir -p $out/pack/${packageName}/opt"] ++ (builtins.map (x: link x packageName "opt") opt) + # Assemble all python3 dependencies into a single `site-packages` to avoid doing recursive dependency collection + # for each plugin. + # This directory is only for python import search path, and will not slow down the startup time. + ++ [ + "mkdir -p $out/pack/${packageName}/start/__python3_dependencies" + "ln -s ${python3Env}/${python3Env.sitePackages} $out/pack/${packageName}/start/__python3_dependencies/python3" + ] ); packDir = (packages: stdenv.mkDerivation { diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix b/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix index 7a825f4f68..84e727907f 100644 --- a/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix +++ b/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix @@ -816,12 +816,12 @@ let }; }; - jakebecker.elixir-ls = buildVscodeMarketplaceExtension { + elixir-lsp.vscode-elixir-ls = buildVscodeMarketplaceExtension { mktplcRef = { name = "elixir-ls"; publisher = "JakeBecker"; - version = "0.7.0"; - sha256 = "sha256-kFrkElD7qC1SpOx1rpcHW1D2hybHCf7cqvIO7JfPuMc="; + version = "0.8.0"; + sha256 = "sha256-VD1g4DJfA0vDJ0cyHFDEtCEqQo0nXfPC5vknEU91cPk="; }; meta = with lib; { license = licenses.mit; diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json b/third_party/nixpkgs/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json index 1e69d9e81b..a98102c36b 100644 --- a/third_party/nixpkgs/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json +++ b/third_party/nixpkgs/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json @@ -1,12 +1,12 @@ { "name": "rust-analyzer", - "version": "0.2.702", + "version": "0.2.710", "dependencies": { "https-proxy-agent": "^5.0.0", "node-fetch": "^2.6.1", "vscode-languageclient": "^7.1.0-next.5", - "@rollup/plugin-commonjs": "^17.0.0", - "@rollup/plugin-node-resolve": "^13.0.0", + "d3": "^7.0.0", + "d3-graphviz": "^4.0.0", "@types/glob": "^7.1.4", "@types/mocha": "^8.2.3", "@types/node": "~14.17.5", @@ -17,7 +17,6 @@ "eslint": "^7.30.0", "glob": "^7.1.6", "mocha": "^9.0.2", - "rollup": "=2.51.1", "tslib": "^2.3.0", "typescript": "^4.3.5", "typescript-formatter": "^7.2.2", diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/rust-analyzer/default.nix b/third_party/nixpkgs/pkgs/misc/vscode-extensions/rust-analyzer/default.nix index 479f9f4c6e..8249138979 100644 --- a/third_party/nixpkgs/pkgs/misc/vscode-extensions/rust-analyzer/default.nix +++ b/third_party/nixpkgs/pkgs/misc/vscode-extensions/rust-analyzer/default.nix @@ -4,8 +4,9 @@ , jq , rust-analyzer , nodePackages -, setDefaultServerPath ? true , moreutils +, esbuild +, setDefaultServerPath ? true }: let @@ -21,7 +22,7 @@ let releaseTag = rust-analyzer.version; - nativeBuildInputs = [ jq moreutils ]; + nativeBuildInputs = [ jq moreutils esbuild ]; # Follows https://github.com/rust-analyzer/rust-analyzer/blob/41949748a6123fd6061eb984a47f4fe780525e63/xtask/src/dist.rs#L39-L65 postInstall = '' diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/binutils/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/binutils/default.nix index 5dc57f43e4..c5bc50cafd 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/binutils/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/binutils/default.nix @@ -56,8 +56,8 @@ stdenv.mkDerivation { # and using clang directly here is a better option than relying on cctools. # On x86_64-darwin the Clang version is too old to support this mode. + lib.optionalString stdenv.isAarch64 '' - rm $out/bin/as - makeWrapper "${clang-unwrapped}/bin/clang" "$out/bin/as" \ + rm $out/bin/${targetPrefix}as + makeWrapper "${clang-unwrapped}/bin/clang" "$out/bin/${targetPrefix}as" \ --add-flags "-x assembler -integrated-as -c" ''; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix index c9b1d7c5f0..7c195cd2d7 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix @@ -1,18 +1,25 @@ -{ lib, fetchzip }: +{ stdenv +, lib +, fetchurl }: -let version = "3.1"; in +stdenv.mkDerivation rec { + pname = "intel2200BGFirmware"; + version = "3.1"; -fetchzip { - name = "intel2200BGFirmware-${version}"; - url = "https://src.fedoraproject.org/repo/pkgs/ipw2200-firmware/ipw2200-fw-${version}.tgz/eaba788643c7cc7483dd67ace70f6e99/ipw2200-fw-${version}.tgz"; - sha256 = "0zjyjndyc401pn5x5lgypxdal21n82ymi3vbb2ja1b89yszj432b"; + src = fetchurl { + url = "https://src.fedoraproject.org/repo/pkgs/ipw2200-firmware/ipw2200-fw-${version}.tgz/eaba788643c7cc7483dd67ace70f6e99/ipw2200-fw-${version}.tgz"; + hash = "sha256-xoGMEcGMwDDVX/g/ZLK62P7vSF53QvhPlKYdgRpiWL0="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar -xzvf $downloadedFile --strip-components=1 install -D -m644 ipw2200-bss.fw $out/lib/firmware/ipw2200-bss.fw install -D -m644 ipw2200-ibss.fw $out/lib/firmware/ipw2200-ibss.fw install -D -m644 ipw2200-sniffer.fw $out/lib/firmware/ipw2200-sniffer.fw install -D -m644 LICENSE.ipw2200-fw $out/share/doc/intel2200BGFirmware/LICENSE + + runHook postInstall ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/zd1211/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/zd1211/default.nix index 15e5355712..075e46a5de 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/zd1211/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/zd1211/default.nix @@ -1,19 +1,25 @@ -{ lib, fetchzip }: +{ stdenv +, lib +, fetchurl +}: -let +stdenv.mkDerivation rec { pname = "zd1211-firmware"; version = "1.5"; -in fetchzip rec { - name = "${pname}-${version}"; - url = "mirror://sourceforge/zd1211/${name}.tar.bz2"; - postFetch = '' - tar -xjvf $downloadedFile + src = fetchurl { + url = "mirror://sourceforge/zd1211/${pname}-${version}.tar.bz2"; + hash = "sha256-8R04ENf3KDOZf2NFhKWG3M7XGjU/llq/gQYuxDHQKxI="; + }; + + installPhase = '' + runHook preInstall + mkdir -p $out/lib/firmware/zd1211 - cp zd1211-firmware/* $out/lib/firmware/zd1211 - ''; + cp * $out/lib/firmware/zd1211 - sha256 = "0sj2zl3r0549mjz37xy6iilm1hm7ak5ax02gwrn81r5yvphqzd52"; + runHook postInstall + ''; meta = { description = "Firmware for the ZyDAS ZD1211(b) 802.11a/b/g USB WLAN chip"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/fwts/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/fwts/default.nix index ea42e90a3f..585347caac 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/fwts/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/fwts/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "fwts"; - version = "20.11.00"; + version = "21.07.00"; src = fetchzip { url = "https://fwts.ubuntu.com/release/${pname}-V${version}.tar.gz"; - sha256 = "0s8iz6c9qhyndcsjscs3qail2mzfywpbiys1x232igm5kl089vvr"; + sha256 = "sha256-cTm8R7sUJk5aTjXvsxfBXX0J/ehVoqo43ILZ6VqaPTI="; stripRoot = false; }; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/config.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/config.nix index 20f9f5aaa1..973e6d50ad 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/config.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/config.nix @@ -88,7 +88,7 @@ assert (versionAtLeast version "4.9"); INET_MPTCP_DIAG = option no; # Use -fstack-protector-strong (gcc 4.9+) for best stack canary coverage. - CC_STACKPROTECTOR_REGULAR = whenOlder "4.18" no; + CC_STACKPROTECTOR_REGULAR = lib.mkForce (whenOlder "4.18" no); CC_STACKPROTECTOR_STRONG = whenOlder "4.18" yes; # Detect out-of-bound reads/writes and use-after-free diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json index 3acd18a4b2..c3f0aa7425 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -17,12 +17,6 @@ "sha256": "0zqv77k0i4q5w4qhgiknvrh4fav1jc4a2i9cdracwqlrk8fgmiih", "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.57-hardened1/linux-hardened-5.10.57-hardened1.patch" }, - "5.12": { - "extra": "-hardened1", - "name": "linux-hardened-5.12.19-hardened1.patch", - "sha256": "1nr3922gd6il69k5cpp9g3knpy6yjb6jsmpi9k4v02bkvypg86dc", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.12.19-hardened1/linux-hardened-5.12.19-hardened1.patch" - }, "5.4": { "extra": "-hardened1", "name": "linux-hardened-5.4.139-hardened1.patch", diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix index da435b307e..146ff42c06 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,13 +1,13 @@ { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: buildLinux (args // rec { - version = "4.4.279"; + version = "4.4.281"; extraMeta.branch = "4.4"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1d3cfhs7ixk0dhh1mc1z6y73i816a2wl16zhayl1ssp69d4ndpsb"; + sha256 = "12grr2vc2mcvy7k8w1apqs9mhfg0lvz6mrpksym234m4n5yy48ng"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_4 ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix index a0b4391b37..bbc5a58ec0 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,13 +1,13 @@ { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: buildLinux (args // rec { - version = "4.9.279"; + version = "4.9.280"; extraMeta.branch = "4.9"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "01rf3xh2jcz6l2h79g0m02i8f9q51j64wvgvzi8lmq0gx9yvbv91"; + sha256 = "0am9qg9j18j4fc5zi6bk1g0mi8dp31pl62wlihxhhkc5yspzrna3"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_9 ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.12.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.12.nix deleted file mode 100644 index e1e7aec2ce..0000000000 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.12.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, modDirVersionArg ? null, ... } @ args: - -with lib; - -buildLinux (args // rec { - version = "5.12.19"; - - # modDirVersion needs to be x.y.z, will automatically add .0 if needed - modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; - - # branchVersion needs to be x.y - extraMeta.branch = versions.majorMinor version; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0wscz736n13m833cd12lskn47r0b8ki4fhgpjnwga0jsab9iqf79"; - }; - - kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_12 ]; -} // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.13.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.13.nix index 4086299c0c..87be091cd4 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.13.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.13.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.13.9"; + version = "5.13.11"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "16hm6sb64f1hlr0qmf2w81zv55s6flj1x8jr2q326d9ny30przkj"; + sha256 = "0za59652wrh4mlhd9w3dx4y1nnk8nrj9hb56pssgdckdvp7rp4l0"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_13 ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix index 4c49dc9c42..7413728cbf 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.4.129-rt61"; # updated by ./update-rt.sh + version = "5.4.138-rt62"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -14,14 +14,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "1ps64gx85lmbriq445hd2hcv4g4b1d1cwf4r3nd90x6i2cj4c9j4"; + sha256 = "0mw6k9zrcmv1j4b3han5c0q8xbh38bka2wkkbl1y3ralg9r5ffd4"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "0b3hp6a7afkjqd7an4hj423nq6flwzd42kjcyk4pifv5fx6c7pgq"; + sha256 = "1zw7806fxx9cai9n6siv534x5r52d8fc13r07ypgw461pijcy5p6"; }; }; in [ rt-patch ] ++ kernelPatches; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-xanmod.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-xanmod.nix index c2f94a8a03..61b17260f7 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-xanmod.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-xanmod.nix @@ -1,7 +1,7 @@ { lib, stdenv, buildLinux, fetchFromGitHub, ... } @ args: let - version = "5.13.9"; + version = "5.13.11"; release = "1"; suffix = "xanmod${release}-cacule"; in @@ -13,7 +13,7 @@ buildLinux (args // rec { owner = "xanmod"; repo = "linux"; rev = modDirVersion; - sha256 = "sha256-cr5tmJVpjd9czlR1PklJccZ3wc+E1eJgQhhNooFEQ4I="; + sha256 = "sha256-55BRj0JNQKwmSvlquNHr6ZaI7x/sBYzfZPHIblxK4lY="; }; structuredExtraConfig = with lib.kernel; { diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/pcm/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/pcm/default.nix index c0b8b59ebb..e3e7233993 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/pcm/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/pcm/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "202101"; + version = "202107"; pname = "pcm"; src = fetchFromGitHub { owner = "opcm"; repo = "pcm"; rev = version; - sha256 = "sha256-xiC9XDuFcAzD2lVuzBWUvHy1Z1shEXM2KPFabKvgh1Y="; + sha256 = "sha256-2fN+jS6+BpodjjN+TV67uiNgZ0eblWjzbyU3CDp9ee0="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ply/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/ply/default.nix index e62716e479..916aa39eee 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/ply/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/ply/default.nix @@ -1,19 +1,16 @@ { lib, stdenv, kernel, fetchFromGitHub, autoreconfHook, bison, flex, p7zip, rsync }: -assert kernel != null -> lib.versionAtLeast kernel.version "4.0"; - -let - version = "1.0.beta1-9e810b1"; -in stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "ply"; - inherit version; + version = "2.1.1-${lib.substring 0 7 src.rev}"; + nativeBuildInputs = [ autoreconfHook flex bison p7zip rsync ]; src = fetchFromGitHub { owner = "iovisor"; repo = "ply"; - rev = "9e810b157ba079c32c430a7d4c6034826982056e"; - sha256 = "15cp6iczawaqlhsa0af6i37zn5iq53kh6ya8s2hzd018yd7mhg50"; + rev = "e25c9134b856cc7ffe9f562ff95caf9487d16b59"; + sha256 = "1178z7vvnjwnlxc98g2962v16878dy7bd0b2njsgn4vqgrnia7i5"; }; preAutoreconf = '' @@ -34,9 +31,10 @@ in stdenv.mkDerivation { ''; meta = with lib; { - description = "dynamic Tracing in Linux"; + description = "Dynamic tracing in Linux"; homepage = "https://wkz.github.io/ply/"; - license = [ licenses.gpl2 ]; + license = [ licenses.gpl2Only ]; maintainers = with maintainers; [ mic92 mbbx6spp ]; + broken = lib.versionOlder kernel.version "4.0"; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/uclibc/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/uclibc/default.nix index 8dc0d4613f..a724604c72 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/uclibc/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/uclibc/default.nix @@ -48,7 +48,7 @@ let UCLIBC_HAS_FPU n ''; - version = "1.0.37"; + version = "1.0.38"; in stdenv.mkDerivation { @@ -58,7 +58,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://downloads.uclibc-ng.org/releases/${version}/uClibc-ng-${version}.tar.bz2"; # from "${url}.sha256"; - sha256 = "sha256-wThkkRBA42CskGC8kUlgmxk88Qy2Z8qRfLqD6kP8JY0="; + sha256 = "sha256-7wexvOOfDpIsM3XcdhHxESz7GsOW+ZkiA0dfiN5rHrU="; }; # 'ftw' needed to build acl, a coreutils dependency diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/usbutils/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/usbutils/default.nix index fba025b29d..0e0163c2ae 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/usbutils/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/usbutils/default.nix @@ -1,11 +1,12 @@ -{ lib, stdenv, fetchurl, substituteAll, autoreconfHook, pkg-config, libusb1, hwdata , python3 }: +{ lib, stdenv, fetchurl, substituteAll, autoreconfHook, pkg-config, libusb1, hwdata, python3 }: stdenv.mkDerivation rec { - name = "usbutils-013"; + pname = "usbutils"; + version = "014"; src = fetchurl { - url = "mirror://kernel/linux/utils/usb/usbutils/${name}.tar.xz"; - sha256 = "0f0klk6d3hmbpf6p4dcwa1qjzblmkhbxs1wsw87aidvqri7lj8wy"; + url = "mirror://kernel/linux/utils/usb/usbutils/usbutils-${version}.tar.xz"; + sha256 = "sha256-Ogec+tYFYCJ7ZxkkgteBO/ljJvy7ZsBCVIOXFfJ2/Gk="; }; patches = [ @@ -26,6 +27,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://www.linux-usb.org/"; description = "Tools for working with USB devices, such as lsusb"; + maintainers = with maintainers; [ ]; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/v4l2loopback/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/v4l2loopback/default.nix index 53f37e805f..9ff6d03fda 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/v4l2loopback/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/v4l2loopback/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "v4l2loopback"; - version = "unstable-2020-04-22-${kernel.version}"; + version = "unstable-2021-07-13-${kernel.version}"; src = fetchFromGitHub { owner = "umlaeute"; repo = "v4l2loopback"; - rev = "d26e624b4ead762d34152f9f825b3a51fb92fb9c"; - sha256 = "sha256-OA45vmuVieoL7J83D3TD5qi3SBsiqi0kiQn4i1K6dVE="; + rev = "baf9de279afc7a7c7513e9c40a0c9ff88f456af4"; + sha256 = "sha256-uglYTeqz81fgkKYYU9Cw8x9+S088jGxDEGkb3rmkhrw=="; }; hardeningDisable = [ "format" "pic" ]; @@ -23,6 +23,12 @@ stdenv.mkDerivation rec { buildInputs = [ kmod ]; + postInstall = '' + make install-utils PREFIX=$bin + ''; + + outputs = [ "out" "bin" ]; + makeFlags = [ "KERNELRELEASE=${kernel.modDirVersion}" "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" diff --git a/third_party/nixpkgs/pkgs/pkgs-lib/formats.nix b/third_party/nixpkgs/pkgs/pkgs-lib/formats.nix index 4d53956646..44c8f91354 100644 --- a/third_party/nixpkgs/pkgs/pkgs-lib/formats.nix +++ b/third_party/nixpkgs/pkgs/pkgs-lib/formats.nix @@ -38,7 +38,7 @@ rec { }; in valueType; - generate = name: value: pkgs.runCommandNoCC name { + generate = name: value: pkgs.runCommand name { nativeBuildInputs = [ pkgs.jq ]; value = builtins.toJSON value; passAsFile = [ "value" ]; @@ -121,7 +121,7 @@ rec { }; in valueType; - generate = name: value: pkgs.runCommandNoCC name { + generate = name: value: pkgs.runCommand name { nativeBuildInputs = [ pkgs.remarshal ]; value = builtins.toJSON value; passAsFile = [ "value" ]; diff --git a/third_party/nixpkgs/pkgs/pkgs-lib/tests/formats.nix b/third_party/nixpkgs/pkgs/pkgs-lib/tests/formats.nix index 679fde0152..af19f6100e 100644 --- a/third_party/nixpkgs/pkgs/pkgs-lib/tests/formats.nix +++ b/third_party/nixpkgs/pkgs/pkgs-lib/tests/formats.nix @@ -14,7 +14,7 @@ let }) [ def ]); in formatSet.generate "test-format-file" config; - runBuildTest = name: { drv, expected }: pkgs.runCommandNoCC name {} '' + runBuildTest = name: { drv, expected }: pkgs.runCommand name {} '' if diff -u '${builtins.toFile "expected" expected}' '${drv}'; then touch "$out" else diff --git a/third_party/nixpkgs/pkgs/servers/amqp/rabbitmq-server/default.nix b/third_party/nixpkgs/pkgs/servers/amqp/rabbitmq-server/default.nix index bfee203107..a3ff060f93 100644 --- a/third_party/nixpkgs/pkgs/servers/amqp/rabbitmq-server/default.nix +++ b/third_party/nixpkgs/pkgs/servers/amqp/rabbitmq-server/default.nix @@ -27,12 +27,12 @@ stdenv.mkDerivation rec { pname = "rabbitmq-server"; - version = "3.9.1"; + version = "3.9.3"; # when updating, consider bumping elixir version in all-packages.nix src = fetchurl { url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "1qba783ja0y5k1npxh9lprpxs0vx2i6aci5j78di91m60pgyf1hc"; + sha256 = "sha256-33nrS29t/a8D8Rl+d/ipRU2923QKr+EAN3rgxisCR0U="; }; nativeBuildInputs = [ unzip xmlto docbook_xml_dtd_45 docbook_xsl zip rsync ]; @@ -83,6 +83,6 @@ stdenv.mkDerivation rec { description = "An implementation of the AMQP messaging protocol"; license = licenses.mpl20; platforms = platforms.unix; - maintainers = with maintainers; [ Profpatsch ]; + maintainers = with maintainers; [ turion ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/asterisk/default.nix b/third_party/nixpkgs/pkgs/servers/asterisk/default.nix index be0cd87745..e8912f4b53 100644 --- a/third_party/nixpkgs/pkgs/servers/asterisk/default.nix +++ b/third_party/nixpkgs/pkgs/servers/asterisk/default.nix @@ -90,7 +90,16 @@ let sha256 = "1s9idx2miwk178sa731ig9r4fzx4gy1q8xazfqyd7q4lfd70s1cy"; }; -in rec { + # auto-generated by update.py + versions = lib.mapAttrs (_: {version, sha256}: common { + inherit version sha256; + externals = { + "externals_cache/pjproject-2.10.tar.bz2" = pjproject_2_10; + "addons/mp3" = mp3-202; + }; + }) (builtins.fromJSON (builtins.readFile ./versions.json)); + +in { # Supported releases (as of 2020-10-26). # Source: https://wiki.asterisk.org/wiki/display/AST/Asterisk+Versions # Exact version can be found at https://www.asterisk.org/downloads/asterisk/all-asterisk-versions/ @@ -100,43 +109,8 @@ in rec { # 16.x LTS 2018-10-09 2022-10-09 2023-10-09 # 17.x Standard 2019-10-28 2020-10-28 2021-10-28 # 18.x LTS 2020-10-20 2024-10-20 2025-10-20 - asterisk-lts = asterisk_18; - asterisk-stable = asterisk_18; - asterisk = asterisk_18; + asterisk-lts = versions.asterisk_18; + asterisk-stable = versions.asterisk_18; + asterisk = versions.asterisk_18; - asterisk_13 = common { - version = "13.38.2"; - sha256 = "1v7wgsa9vf7qycg3xpvmn2bkandkfh3x15pr8ylg0w0gvfkkf5b9"; - externals = { - "externals_cache/pjproject-2.10.tar.bz2" = pjproject_2_10; - "addons/mp3" = mp3-202; - }; - }; - - asterisk_16 = common { - version = "16.17.0"; - sha256 = "1bzlsk9k735qf8a693b6sa548my7m9ahavmdicwmc14px70wrvnw"; - externals = { - "externals_cache/pjproject-2.10.tar.bz2" = pjproject_2_10; - "addons/mp3" = mp3-202; - }; - }; - - asterisk_17 = common { - version = "17.9.3"; - sha256 = "0nhk0izrxx24pz806fwnhidjmciwrkcrsvxvhrdvibiqyvfk8yk7"; - externals = { - "externals_cache/pjproject-2.10.tar.bz2" = pjproject_2_10; - "addons/mp3" = mp3-202; - }; - }; - - asterisk_18 = common { - version = "18.3.0"; - sha256 = "1xb953i9ay82vcdv8izi5dd5xnspcsvg10ajiyph377jw2xnd5fb"; - externals = { - "externals_cache/pjproject-2.10.tar.bz2" = pjproject_2_10; - "addons/mp3" = mp3-202; - }; - }; -} +} // versions diff --git a/third_party/nixpkgs/pkgs/servers/asterisk/update.py b/third_party/nixpkgs/pkgs/servers/asterisk/update.py new file mode 100755 index 0000000000..5a7fabf9d6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/asterisk/update.py @@ -0,0 +1,36 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i python3 -p python39 python39.pkgs.packaging python39.pkgs.beautifulsoup4 python39.pkgs.requests +from packaging import version +from bs4 import BeautifulSoup +import re, requests, json + +URL = "https://downloads.asterisk.org/pub/telephony/asterisk" + +page = requests.get(URL) +changelog = re.compile("^ChangeLog-\d+\.\d+\.\d+$") +changelogs = [a.get_text() for a in BeautifulSoup(page.text, 'html.parser').find_all('a') if changelog.match(a.get_text())] +major_versions = {} +for changelog in changelogs: + v = version.parse(changelog.removeprefix("ChangeLog-")) + major_versions.setdefault(v.major, []).append(v) + +out = {} +for mv in major_versions.keys(): + v = max(major_versions[mv]) + sha = requests.get(f"{URL}/asterisk-{v}.sha256").text.split()[0] + out["asterisk_" + str(mv)] = { + "version": str(v), + "sha256": sha + } + +try: + with open("versions.json", "r") as in_file: + in_data = json.loads(in_file.read()) + for v in in_data.keys(): + print(v + ":", in_data[v]["version"], "->", out[v]["version"]) +except: + # nice to have for the PR, not a requirement + pass + +with open("versions.json", "w") as out_file: + out_file.write(json.dumps(out, sort_keys=True, indent=2) + "\n") diff --git a/third_party/nixpkgs/pkgs/servers/asterisk/versions.json b/third_party/nixpkgs/pkgs/servers/asterisk/versions.json new file mode 100644 index 0000000000..93d2539993 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/asterisk/versions.json @@ -0,0 +1,18 @@ +{ + "asterisk_13": { + "sha256": "478040705f5819259bb1d22cb4e27970092a5bfdb691d27d321c26235eea4bb3", + "version": "13.38.3" + }, + "asterisk_16": { + "sha256": "c34fc38287cea533c0d0a34959112119e47d12d8ea6ac11bdddf9265afda6d11", + "version": "16.19.1" + }, + "asterisk_17": { + "sha256": "cc0d6b9ef1512d4e279b80ca8bf78032d69fe6e92492c95c22c44023d6c111fa", + "version": "17.9.4" + }, + "asterisk_18": { + "sha256": "e7d78716a0deeadf24b7d537cd24c11c2d9a096265eefc9470565c4da0fc54c7", + "version": "18.5.1" + } +} diff --git a/third_party/nixpkgs/pkgs/servers/bazarr/default.nix b/third_party/nixpkgs/pkgs/servers/bazarr/default.nix index 112e6d2567..1db21cb13b 100644 --- a/third_party/nixpkgs/pkgs/servers/bazarr/default.nix +++ b/third_party/nixpkgs/pkgs/servers/bazarr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bazarr"; - version = "0.9.6"; + version = "0.9.7"; sourceRoot = "."; src = fetchurl { url = "https://github.com/morpheus65535/bazarr/releases/download/v${version}/bazarr.zip"; - sha256 = "sha256-ZSQzDlObnv5DEra2+YgXhox583KPyGIjia0SJyTUPWo="; + sha256 = "sha256-OyH3/KK8d5pWu+Ubzgd4N0IwpumbAe/43Oo+LGg+Erc="; }; nativeBuildInputs = [ unzip makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/servers/caddy/default.nix b/third_party/nixpkgs/pkgs/servers/caddy/default.nix index a2cd3c7eb0..b4c85de84e 100644 --- a/third_party/nixpkgs/pkgs/servers/caddy/default.nix +++ b/third_party/nixpkgs/pkgs/servers/caddy/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "caddy"; - version = "2.4.1"; + version = "2.4.3"; subPackages = [ "cmd/caddy" ]; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "caddyserver"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Wc7eNw5FZWoUT6IP84NhROC59bf4/RCw/gOWLuYI2dc="; + sha256 = "sha256-Z3BVx7gCkls5Hy+H6lA3DOBequRutwa2F34FDt9n+8I="; }; - vendorSha256 = "sha256-ZOrhR03m+cs+mTQio3qEIf+1B0IP0i2+x+vcml5AMco="; + vendorSha256 = "sha256-Zwpakw/vyDVngc1Bn+RdRPECNweruwGxsT4dfvMELkQ="; passthru.tests = { inherit (nixosTests) caddy; }; diff --git a/third_party/nixpkgs/pkgs/servers/dns/nsd/default.nix b/third_party/nixpkgs/pkgs/servers/dns/nsd/default.nix index ddded73391..8c64671251 100644 --- a/third_party/nixpkgs/pkgs/servers/dns/nsd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/dns/nsd/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "nsd"; - version = "4.3.5"; + version = "4.3.7"; src = fetchurl { url = "https://www.nlnetlabs.nl/downloads/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-faK0PjCz1/MHcixgj3Gb+xafDZhcdko0+gZp3DNIRHI="; + sha256 = "sha256-/TuexTu9Fo1Wegv83xQMlmUR/a94vVOdCRwaE8E76K0="; }; prePatch = '' diff --git a/third_party/nixpkgs/pkgs/servers/gotify/yarndeps.nix b/third_party/nixpkgs/pkgs/servers/gotify/yarndeps.nix index c6631cd960..a023766398 100644 --- a/third_party/nixpkgs/pkgs/servers/gotify/yarndeps.nix +++ b/third_party/nixpkgs/pkgs/servers/gotify/yarndeps.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec { +{ fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec { offline_cache = linkFarm "offline" packages; packages = [ { diff --git a/third_party/nixpkgs/pkgs/servers/headscale/default.nix b/third_party/nixpkgs/pkgs/servers/headscale/default.nix index 86754710ff..01abc59651 100644 --- a/third_party/nixpkgs/pkgs/servers/headscale/default.nix +++ b/third_party/nixpkgs/pkgs/servers/headscale/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "headscale"; - version = "0.5.2"; + version = "0.6.1"; src = fetchFromGitHub { owner = "juanfont"; repo = "headscale"; rev = "v${version}"; - sha256 = "sha256-AclIH2Gd8U/Hfy24KOFic/np4qAWELlIMfsPCSkdjog="; + sha256 = "sha256-pzsbCxJ3N30XpjF//02SV6URhA6f6Wz8a6HvGxsK7M4="; }; - vendorSha256 = "sha256-UIBH6Pf2mmXBsdFW0RRvedLQhonNsrl4j2fxxRtum4M="; + vendorSha256 = "sha256-ususDOF/LznhK4EInHE7J/ItMjziGfP9Gn8/Q5wd78g="; # Ldflags are same as build target in the project's Makefile # https://github.com/juanfont/headscale/blob/main/Makefile 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 0231c5fb60..bef068f085 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2021.8.6"; + version = "2021.8.7"; components = { "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ accuweather ]; diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix index 060a000060..a3a2b07c14 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix @@ -88,6 +88,19 @@ let }); }) + # Pinned due to changes in total-connect-client>0.58 which made the tests fails at the moment + (self: super: { + total-connect-client = super.total-connect-client.overridePythonAttrs (oldAttrs: rec { + version = "0.58"; + src = fetchFromGitHub { + owner = "craigjmidwinter"; + repo = "total-connect-client"; + rev = version; + sha256 = "1dqmgvgvwjh235wghygan2jnfvmn9vz789in2as3asig9cifix9z"; + }; + }); + }) + # home-assistant-frontend does not exist in python3.pkgs (self: super: { home-assistant-frontend = self.callPackage ./frontend.nix { }; @@ -121,7 +134,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2021.8.6"; + hassVersion = "2021.8.7"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -138,7 +151,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - sha256 = "1hahxvvlk32dbmv2lhn67w1ii5g24znvjqgsq318qv8c2qh5z5ws"; + sha256 = "0f69jcpxyr0kzziwl6bfj2jbn23hrj1796ml6jsk9mnpfkdsd9vi"; }; # leave this in, so users don't have to constantly update their downstream patch handling diff --git a/third_party/nixpkgs/pkgs/servers/hqplayerd/default.nix b/third_party/nixpkgs/pkgs/servers/hqplayerd/default.nix index 14fe83ea5c..095f09d19a 100644 --- a/third_party/nixpkgs/pkgs/servers/hqplayerd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/hqplayerd/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "hqplayerd"; - version = "4.25.0-64"; + version = "4.25.1-65"; src = fetchurl { url = "https://www.signalyst.eu/bins/${pname}/fc34/${pname}-${version}.fc34.x86_64.rpm"; - sha256 = "sha256-KLP7g1SQzVKu9Hnptb6s0FwmLSjhlAINJoJskja+bDM="; + sha256 = "sha256-1Gfnha0DRAH2q0HJQVZegFKjpnVVK+MxPUmYJsA8Xgc="; }; unpackPhase = '' diff --git a/third_party/nixpkgs/pkgs/servers/http/apache-modules/mod_perl/default.nix b/third_party/nixpkgs/pkgs/servers/http/apache-modules/mod_perl/default.nix index 2762f636f5..e511429bfc 100644 --- a/third_party/nixpkgs/pkgs/servers/http/apache-modules/mod_perl/default.nix +++ b/third_party/nixpkgs/pkgs/servers/http/apache-modules/mod_perl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, apacheHttpd, perl }: +{ stdenv, fetchurl, apacheHttpd, perl, nixosTests }: stdenv.mkDerivation rec { pname = "mod_perl"; @@ -9,6 +9,11 @@ stdenv.mkDerivation rec { sha256 = "0x3gq4nz96y202cymgrf56n8spm7bffkd1p74dh9q3zrrlc9wana"; }; + patches = [ + # Fix build on perl-5.34.0, https://github.com/Perl/perl5/issues/18617 + ../../../../development/perl-modules/mod_perl2-PL_hash_seed.patch + ]; + buildInputs = [ apacheHttpd perl ]; buildPhase = '' perl Makefile.PL \ @@ -23,4 +28,6 @@ stdenv.mkDerivation rec { mv $out${perl}/* $out rm $out/nix -rf ''; + + passthru.tests = nixosTests.mod_perl; } diff --git a/third_party/nixpkgs/pkgs/servers/http/apache-modules/mod_wsgi/default.nix b/third_party/nixpkgs/pkgs/servers/http/apache-modules/mod_wsgi/default.nix index 7f28abe884..6a029ce1dc 100644 --- a/third_party/nixpkgs/pkgs/servers/http/apache-modules/mod_wsgi/default.nix +++ b/third_party/nixpkgs/pkgs/servers/http/apache-modules/mod_wsgi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mod_wsgi"; - version = "4.7.1"; + version = "4.9.0"; src = fetchurl { url = "https://github.com/GrahamDumpleton/mod_wsgi/archive/${version}.tar.gz"; - sha256 = "0dbxhrp3x689ccrhvm2lw2icmmj8i4p86z2lq3xn1zlsf43fax16"; + sha256 = "sha256-Cm84CvhUuFoxUeVKPDO1IMSm4hqZvK165d37/jGnS1A="; }; buildInputs = [ apacheHttpd python ncurses ]; diff --git a/third_party/nixpkgs/pkgs/servers/http/nginx/modules.nix b/third_party/nixpkgs/pkgs/servers/http/nginx/modules.nix index e6cbff3316..568f6d8b9e 100644 --- a/third_party/nixpkgs/pkgs/servers/http/nginx/modules.nix +++ b/third_party/nixpkgs/pkgs/servers/http/nginx/modules.nix @@ -50,7 +50,7 @@ in repo = "ngx_brotli"; rev = "25f86f0bac1101b6512135eac5f93c49c63609e3"; sha256 = "02hfvfa6milj40qc2ikpb9f95sxqvxk4hly3x74kqhysbdi06hhv"; - }; in pkgs.runCommandNoCC "ngx_brotli-src" {} '' + }; in pkgs.runCommand "ngx_brotli-src" {} '' cp -a ${gitsrc} $out substituteInPlace $out/filter/config \ --replace '$ngx_addon_dir/deps/brotli/c' ${lib.getDev pkgs.brotli} diff --git a/third_party/nixpkgs/pkgs/servers/icingaweb2/default.nix b/third_party/nixpkgs/pkgs/servers/icingaweb2/default.nix index bde0cb0100..cf900ffd7f 100644 --- a/third_party/nixpkgs/pkgs/servers/icingaweb2/default.nix +++ b/third_party/nixpkgs/pkgs/servers/icingaweb2/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "icingaweb2"; - version = "2.9.2"; + version = "2.9.3"; src = fetchFromGitHub { owner = "Icinga"; repo = "icingaweb2"; rev = "v${version}"; - sha256 = "sha256-sCglJDxEUOAcBwNowLjglMi6y92QJ4ZF+I/5HPfTE+s="; + sha256 = "sha256-nPzf/SGyjEXuy0Q/Lofe1rSbW+4E6LXKzyi4np3jvF4="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/servers/jackett/default.nix b/third_party/nixpkgs/pkgs/servers/jackett/default.nix index a5b241b207..baa1461df8 100644 --- a/third_party/nixpkgs/pkgs/servers/jackett/default.nix +++ b/third_party/nixpkgs/pkgs/servers/jackett/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jackett"; - version = "0.18.531"; + version = "0.18.545"; src = fetchurl { url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz"; - sha256 = "sha256-ZykgYzE86bt5SNeHng995TQuE15ajWhThgqt2fJFizc="; + sha256 = "sha256-aHb7bhqagf60YkzL5II/mGPeUibH655QH8Qx3+EqWjY="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/servers/jellyfin/nuget-deps.nix b/third_party/nixpkgs/pkgs/servers/jellyfin/nuget-deps.nix index 978a2cff61..6afc41fba6 100644 --- a/third_party/nixpkgs/pkgs/servers/jellyfin/nuget-deps.nix +++ b/third_party/nixpkgs/pkgs/servers/jellyfin/nuget-deps.nix @@ -1,2268 +1,455 @@ -# This file has been generated by the jellyfin updateScript. Do not edit! { fetchNuGet }: [ - (fetchNuGet { - name = "BDInfo"; - version = "0.7.6.1"; - sha256 = "06qhssvd4iicssl9wv7921g3ss6y2s6g9zhf1svgcm8ffs52i38i"; - }) - (fetchNuGet { - name = "BlurHashSharp"; - version = "1.1.1"; - sha256 = "1fbpg9935pfpr93vywxjdxqzjv1c7v3z86ylzh5n2krxm5jygzrv"; - }) - (fetchNuGet { - name = "BlurHashSharp.SkiaSharp"; - version = "1.1.1"; - sha256 = "11ljrrph0kkw2qfxyza9xfzmh6aspbx5iv0pvk4ms0hyzxh1mas0"; - }) - (fetchNuGet { - name = "CommandLineParser"; - version = "2.8.0"; - sha256 = "1m32xyilv2b7k55jy8ddg08c20glbcj2yi545kxs9hj2ahanhrbb"; - }) - (fetchNuGet { - name = "DotNet.Glob"; - version = "3.1.0"; - sha256 = "11rvhb7y420yadah3j8by5xc7ad2ks2bqyhn4aa10m3xb6hiza0i"; - }) - (fetchNuGet { - name = "Humanizer.Core"; - version = "2.8.26"; - sha256 = "1v8xd12yms4qq1md4vh6faxicmqrvahqdd7sdkyzrphab9v44nsm"; - }) - (fetchNuGet { - name = "Jellyfin.XmlTv"; - version = "10.6.2"; - sha256 = "0ngxjl6d99hzccdbisgwf84w27j2fvjxr05awkirvm6nzvbgq16a"; - }) - (fetchNuGet { - name = "Microsoft.AspNetCore.Antiforgery"; - version = "2.2.0"; - sha256 = "026wjdwjx0lgccqv0xi5gxylxzgz5ifgxf25p5pqakgrhkz0a59l"; - }) - (fetchNuGet { - name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; - version = "5.0.5"; - sha256 = "026m19pddhkx5idwpi6mp1yl9yfcfgm2qjp1jh54mdja1d7ng0vk"; - }) - (fetchNuGet { - name = "Microsoft.AspNetCore.Authentication"; - version = "2.2.0"; - sha256 = "0yqfzd0qq5ypmk6b9gnb1yscl75fxx9frq808cxs70ay7y7jqmgn"; - }) - (fetchNuGet { - name = "Microsoft.AspNetCore.Authentication.Abstractions"; - version = "2.2.0"; - sha256 = "0vj7fhpk0d95nkkxz4q0rma6pb4ym96mx6nms4603y0l19h0k5yh"; - }) - (fetchNuGet { - name = "Microsoft.AspNetCore.Authentication.Core"; - version = "2.2.0"; - sha256 = "1wgn45fmdi7dk9cl4cdhzgqc9mdxhfw7zg8zwns3j7qgrhlv6k8h"; - }) - (fetchNuGet { - name = "Microsoft.AspNetCore.Authorization"; - version = "5.0.3"; - sha256 = "0cffsksaaxndmryb3m1bhli1iihq1wc69dinpxzrdwhw8s2bmfxw"; - }) - (fetchNuGet { - name = "Microsoft.AspNetCore.Authorization.Policy"; - version = "2.2.0"; - sha256 = "1d1zh65kfjf81j21ssmhr465vx08bra8424vgnrb22gdx03mhwd2"; - }) - (fetchNuGet { - name = "Microsoft.AspNetCore.Connections.Abstractions"; - version = "2.2.0"; - sha256 = "1rl94r8b0zq14f3dhfnvfjj1ivr81iw9zh5kdgs3zkdv0xc9x21j"; - }) - (fetchNuGet { - name = "Microsoft.AspNetCore.Cors"; - version = "2.2.0"; - sha256 = "0qskbz87i74kfbklxqfyqaccyba21kkx2lcdfa54kxj9r8daq7sc"; - }) - (fetchNuGet { - name = "Microsoft.AspNetCore.Cryptography.Internal"; - version = "2.2.0"; - sha256 = "01lg2fx85b47ldgdrhs6clsivj35x54xwc9r5xk3f1v8rr3gycsv"; - }) - (fetchNuGet { - name = "Microsoft.AspNetCore.DataProtection"; - version = "2.2.0"; - sha256 = "09lzbp084xxy1xxfbxpqdff8phv2pzd1n5v30xfm03hhl7a038gx"; - }) - (fetchNuGet { - name = "Microsoft.AspNetCore.DataProtection.Abstractions"; - version = "2.2.0"; - sha256 = "1gi4hpssmrrdf5lm6idkhvqbfy12bx14976y4gbhmx9z8lxaqcfz"; - }) - (fetchNuGet { - name = "Microsoft.AspNetCore.Diagnostics.Abstractions"; - version = "2.2.0"; - sha256 = "061cdhjh5w2f1frhimcgk68vx8p743jb9h4qik3lm1c734r0drm0"; - }) - (fetchNuGet { - name = "Microsoft.AspNetCore.Hosting"; - version = "2.2.7"; - sha256 = "0pr4kmzlj3rmylxqg6dw2ph8a8sl2m2k630z1qy21kddsb4ac849"; - }) - (fetchNuGet { - name = "Microsoft.AspNetCore.Hosting.Abstractions"; - version = "2.2.0"; - sha256 = "043k651vbfshh3s997x42ymj8nb32419m7q3sjw5q2c27anrhfhv"; - }) - (fetchNuGet { - name = "Microsoft.AspNetCore.Hosting.Server.Abstractions"; - version = "2.2.0"; - sha256 = "0nz73bwrvhc1n7gd7xxm3p5ww2wx9qr9m9i43y20gh0c54adkygh"; - }) - (fetchNuGet { - name = "Microsoft.AspNetCore.Html.Abstractions"; - version = "2.2.0"; - sha256 = "1z5lkzb9h9wprvyxyjw4fj7bjypaibsw0cj4bz769hf0abjz8y1v"; - }) - (fetchNuGet { - name = "Microsoft.AspNetCore.Http"; - version = "2.2.0"; - sha256 = "1fcrafpa57sab3as18idqknzlxkx49n4sxzlzik3sj6pcji5j17q"; - }) - (fetchNuGet { - name = "Microsoft.AspNetCore.Http"; - version = "2.2.2"; - sha256 = "09mgjvpqdyylz9dbngql9arx46lfkiczjdf7aqr9asd5vjqlv2c8"; - }) - (fetchNuGet { - name = "Microsoft.AspNetCore.Http.Abstractions"; - version = "2.2.0"; - sha256 = "13s8cm6jdpydxmr0rgmzrmnp1v2r7i3rs7v9fhabk5spixdgfy6b"; - }) - (fetchNuGet { - name = "Microsoft.AspNetCore.Http.Extensions"; - version = "2.2.0"; - sha256 = "118gp1mfb8ymcvw87fzgjqwlc1d1b0l0sbfki291ydg414cz3dfn"; - }) - (fetchNuGet { - name = "Microsoft.AspNetCore.Http.Features"; - version = "2.2.0"; - sha256 = "0xrlq8i61vzhzzy25n80m7wh2kn593rfaii3aqnxdsxsg6sfgnx1"; - }) - (fetchNuGet { - name = "Microsoft.AspNetCore.JsonPatch"; - version = "2.2.0"; - sha256 = "07cihb5sqkavg42nvircdwjp0b67mhrla97jgx285zdjphplg4h2"; - }) - (fetchNuGet { - name = "Microsoft.AspNetCore.Localization"; - version = "2.2.0"; - sha256 = "08knc70cy7ycid5sbbbzy6my4b7ddj4j760k5xf1qnfb0njxhfh7"; - }) - (fetchNuGet { - name = "Microsoft.AspNetCore.Metadata"; - version = "5.0.3"; - sha256 = "01v2iaqpzz0h6z3hg1vr67za7d3283gs0wym42zvb9yksg6pf0zi"; - }) - (fetchNuGet { - name = "Microsoft.AspNetCore.Mvc"; - version = "2.2.0"; - sha256 = "16jrikcywkd4r4jh551p8gxxw6hj3aizdzd5i7agb06gwpgqqv9c"; - }) - (fetchNuGet { - name = "Microsoft.AspNetCore.Mvc.Abstractions"; - version = "2.2.0"; - sha256 = "09p447ipd19517vy8xx9ykvspn6b4fgbm2rskpmzyw41x9wz4k0b"; - }) - (fetchNuGet { - name = "Microsoft.AspNetCore.Mvc.Analyzers"; - version = "2.2.0"; - sha256 = "1b975z00bzgh2z5hina4bzfksvc2vgnbzmi8g3q962hspg6ylh9f"; - }) - (fetchNuGet { - name = "Microsoft.AspNetCore.Mvc.ApiExplorer"; - version = "2.2.0"; - sha256 = "1ryhd1md30fgrli74qv45mhldivbasdvydw0lllg6x6jzpyrkwpa"; - }) - (fetchNuGet { - name = "Microsoft.AspNetCore.Mvc.Core"; - version = "2.2.0"; - sha256 = "1k6lkgk9zak5sczvyjbwgqnfcwcg9ks74wznqfzck8c6hns1by0m"; - }) - (fetchNuGet { - name = "Microsoft.AspNetCore.Mvc.Cors"; - version = "2.2.0"; - sha256 = "077vjxn0k5rr4s675g50rzkns6scgijxxh5iib59k77ldwpdr14q"; - }) - (fetchNuGet { - name = "Microsoft.AspNetCore.Mvc.DataAnnotations"; - version = "2.2.0"; - sha256 = "0vdhdjarh4az7g71gkvmhq6xpvwhh8si3sbrpdwb8p60i94cdyl6"; - }) - (fetchNuGet { - name = "Microsoft.AspNetCore.Mvc.Formatters.Json"; - version = "2.2.0"; - sha256 = "0421fcf2z8a6z81ql123ili32wbr3x25zpq17xjf4s9fmsr0069a"; - }) - (fetchNuGet { - name = "Microsoft.AspNetCore.Mvc.Localization"; - version = "2.2.0"; - sha256 = "0d27xirwsr3j7jacsrz6g2r4py35hgzjyy6ak6gkd07cm707wgc6"; - }) - (fetchNuGet { - name = "Microsoft.AspNetCore.Mvc.Razor"; - version = "2.2.0"; - sha256 = "06fqg7rfyvfj3hdppkhy37ddjff2d6pg7khj6lccs9lwc732yr7q"; - }) - (fetchNuGet { - name = "Microsoft.AspNetCore.Mvc.Razor.Extensions"; - version = "2.2.0"; - sha256 = "04javqbzv7mkakqjl40j429giaagjj7hmwcljrgj8q1jknk0x9xc"; - }) - (fetchNuGet { - name = "Microsoft.AspNetCore.Mvc.RazorPages"; - version = "2.2.0"; - sha256 = "0zqyqfxzl3lkqfy9chd0ipani75q3109imlxrnhdfiwmxrd8xqbm"; - }) - (fetchNuGet { - name = "Microsoft.AspNetCore.Mvc.TagHelpers"; - version = "2.2.0"; - sha256 = "16aprk81sp2i0n0dmp318cm65mk03i58rhpijm4fz4xz51j7z8li"; - }) - (fetchNuGet { - name = "Microsoft.AspNetCore.Mvc.ViewFeatures"; - version = "2.2.0"; - sha256 = "1isflvb0ff5nfqnvdlyvmszkd42axbbz0xmdaf0d7sah0qkvvi7n"; - }) - (fetchNuGet { - name = "Microsoft.AspNetCore.Razor"; - version = "2.2.0"; - sha256 = "02ybprvsi59nwa0fdq99jvx7r26bs2bg3xjxkilc495clgg98zp0"; - }) - (fetchNuGet { - name = "Microsoft.AspNetCore.Razor.Design"; - version = "2.2.0"; - sha256 = "03pcdcbmyw050hag588b7caqilnq3cb6ndq5g6j0r7j7wf3plsn6"; - }) - (fetchNuGet { - name = "Microsoft.AspNetCore.Razor.Language"; - version = "2.2.0"; - sha256 = "0n58qdipwy5wymfhgm3anickwvnf4svb9ipbrby7ksrhhrkqvx4z"; - }) - (fetchNuGet { - name = "Microsoft.AspNetCore.Razor.Runtime"; - version = "2.2.0"; - sha256 = "1n9j5hjinm5gp39nwmcf26dwg1psl7sf7xkxnvfxsnl44mbcy695"; - }) - (fetchNuGet { - name = "Microsoft.AspNetCore.ResponseCaching.Abstractions"; - version = "2.2.0"; - sha256 = "01sp2i2bgcn6blw1mcvg5nrlc97c9czyawwvgfi6ydzdvs6ang37"; - }) - (fetchNuGet { - name = "Microsoft.AspNetCore.ResponseCompression"; - version = "2.2.0"; - sha256 = "0madnk92752alpc7cv2bazqlihhzgl3yj1s9ajhi3w09vg8n8pz4"; - }) - (fetchNuGet { - name = "Microsoft.AspNetCore.Routing"; - version = "2.2.0"; - sha256 = "12kv602j2rxp43l1v3618yz3pdd7hqc3r98ya0bqz6y2ppvhbyws"; - }) - (fetchNuGet { - name = "Microsoft.AspNetCore.Routing.Abstractions"; - version = "2.2.0"; - sha256 = "0d9wwz1rsh1fslbv1y72jpkvqv2v9n28rl3vslcg0x74lp2678ly"; - }) - (fetchNuGet { - name = "Microsoft.AspNetCore.Server.Kestrel"; - version = "2.2.0"; - sha256 = "0wh7hf09i9qxs9r0d5xdcx3qingsid9nxlwcyjg2r44pjs6cg1rf"; - }) - (fetchNuGet { - name = "Microsoft.AspNetCore.Server.Kestrel.Core"; - version = "2.2.0"; - sha256 = "075ffds8hwp8ps0zf84bsv9pgiaqry9njc403qack701aybci97r"; - }) - (fetchNuGet { - name = "Microsoft.AspNetCore.Server.Kestrel.Https"; - version = "2.2.0"; - sha256 = "08z447wrbzy3l9lmmas353nr17sg9yccwcg62l9ax9a6n1wvds8c"; - }) - (fetchNuGet { - name = "Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions"; - version = "2.2.0"; - sha256 = "08bj95zy4zszyx1rsy8v2ai9kg4120ij6yi0zillwx3ndb3q7vfb"; - }) - (fetchNuGet { - name = "Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets"; - version = "2.2.0"; - sha256 = "0vhicfnv12sz2c81czdgdlffcgrhnn1jzz9zwy3a9c2n4rn8k9k5"; - }) - (fetchNuGet { - name = "Microsoft.AspNetCore.WebSockets"; - version = "2.2.1"; - sha256 = "0gzikr1z2fdz8nzy1m969jsrk2h97ld1hzgmbc6f036qmhiq26hr"; - }) - (fetchNuGet { - name = "Microsoft.AspNetCore.WebUtilities"; - version = "2.2.0"; - sha256 = "0cs1g4ing4alfbwyngxzgvkrv7z964isv1j9dzflafda4p0wxmsi"; - }) - (fetchNuGet { - name = "Microsoft.Build.Tasks.Git"; - version = "1.0.0"; - sha256 = "0avwja8vk56f2kr2pmrqx3h60bnwbs7ds062lhvhcxv87m5yfqnj"; - }) - (fetchNuGet { - name = "Microsoft.CodeAnalysis.Analyzers"; - version = "1.1.0"; - sha256 = "08r667hj2259wbim1p3al5qxkshydykmb7nd9ygbjlg4mmydkapc"; - }) - (fetchNuGet { - name = "Microsoft.CodeAnalysis.Common"; - version = "2.8.0"; - sha256 = "0g4h41fs0r8lqh9pk9s4mc1090kdpa6sbxq4rc866s8hnq9s1h4j"; - }) - (fetchNuGet { - name = "Microsoft.CodeAnalysis.CSharp"; - version = "2.8.0"; - sha256 = "0p1xvw1h2fmnxywv1j4x6p3rgarpc8mfwfgn0vflk5xfnc961f6w"; - }) - (fetchNuGet { - name = "Microsoft.CodeAnalysis.FxCopAnalyzers"; - version = "2.9.8"; - sha256 = "15zv982rln15ds8z2hkpmx04njdg0cmmf1xnb9v1v7cxxf7yxx27"; - }) - (fetchNuGet { - name = "Microsoft.CodeAnalysis.Razor"; - version = "2.2.0"; - sha256 = "03cm9danxxnsnmrzfz2swz6zhckkgg6hrz1ycnvnjrbpk3w4v0d6"; - }) - (fetchNuGet { - name = "Microsoft.CodeAnalysis.VersionCheckAnalyzer"; - version = "2.9.8"; - sha256 = "19v25694f9l172snrm4qik5gxzlifiyrmf0kk2zasz7hrciw36bl"; - }) - (fetchNuGet { - name = "Microsoft.CodeQuality.Analyzers"; - version = "2.9.8"; - sha256 = "17ld069hlpcv4z4ylx6m4rhd398sxd0qd0msadfm0rljlkj6xg83"; - }) - (fetchNuGet { - name = "Microsoft.CSharp"; - version = "4.0.1"; - sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; - }) - (fetchNuGet { - name = "Microsoft.CSharp"; - version = "4.3.0"; - sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; - }) - (fetchNuGet { - name = "Microsoft.CSharp"; - version = "4.5.0"; - sha256 = "01i28nvzccxbqmiz217fxs6hnjwmd5fafs37rd49a6qp53y6623l"; - }) - (fetchNuGet { - name = "Microsoft.CSharp"; - version = "4.7.0"; - sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; - }) - (fetchNuGet { - name = "Microsoft.Data.Sqlite.Core"; - version = "5.0.3"; - sha256 = "1msj8zn2yfdn5lcny3msqiry94rhs8lkmx1l4pv29mhxggchvidr"; - }) - (fetchNuGet { - name = "Microsoft.DotNet.PlatformAbstractions"; - version = "2.0.4"; - sha256 = "1fdzln4im9hb55agzwchbfgm3vmngigmbpci5j89b0gqcxixmv8j"; - }) - (fetchNuGet { - name = "Microsoft.DotNet.PlatformAbstractions"; - version = "2.1.0"; - sha256 = "1qydvyyinj3b5mraazjal3n2k7jqhn05b6n1a2f3qjkqkxi63dmy"; - }) - (fetchNuGet { - name = "Microsoft.DotNet.PlatformAbstractions"; - version = "3.1.6"; - sha256 = "0b9myd7gqbpaw9pkd2bx45jhik9mwj0f1ss57sk2cxmag2lkdws5"; - }) - (fetchNuGet { - name = "Microsoft.EntityFrameworkCore"; - version = "5.0.3"; - sha256 = "1bhkmr15njgyrd57rmvrjdyamj6qm1n8sdrzcgbfyj7wsjav8dmv"; - }) - (fetchNuGet { - name = "Microsoft.EntityFrameworkCore.Abstractions"; - version = "5.0.3"; - sha256 = "1h0cxqsmpgd1fc9jd4mm1v89s8zchpmd24ks4j5fjgc3j83nvgg9"; - }) - (fetchNuGet { - name = "Microsoft.EntityFrameworkCore.Analyzers"; - version = "5.0.3"; - sha256 = "0mgnw1na94gg4mks7ba9r9cfy3k8vnspi08ryc2i8h91m31dibc2"; - }) - (fetchNuGet { - name = "Microsoft.EntityFrameworkCore.Design"; - version = "5.0.3"; - sha256 = "00p9l6ydqg6kmwyqza0dd9q1zfvam7b3hv8b9kafbl590kdxjzl4"; - }) - (fetchNuGet { - name = "Microsoft.EntityFrameworkCore.Relational"; - version = "5.0.3"; - sha256 = "11pancjxzx04yvy7h4x4m6hncwl2ijiwsvr9m1sa1cmq53lrrvlk"; - }) - (fetchNuGet { - name = "Microsoft.EntityFrameworkCore.Sqlite"; - version = "5.0.3"; - sha256 = "16658n7q2jahk4haljand6j3bmkg718hck4g1piy1j8kx2i6dg7p"; - }) - (fetchNuGet { - name = "Microsoft.EntityFrameworkCore.Sqlite.Core"; - version = "5.0.3"; - sha256 = "0ffi0dyrg00891ac15qajrk7mnhwyayi1fdpwjm10zjdxm4nwy26"; - }) - (fetchNuGet { - name = "Microsoft.EntityFrameworkCore.Tools"; - version = "5.0.3"; - sha256 = "074v7y4irv34xw16ps8mmjm5pq8gk1fs17kx4sznw9bgkcfrm0hy"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.ApiDescription.Server"; - version = "3.0.0"; - sha256 = "13a47xcqyi5gz85swxd4mgp7ndgl4kknrvv3xwmbn71hsh953hsh"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.Caching.Abstractions"; - version = "2.2.0"; - sha256 = "0hhxc5dp52faha1bdqw0k426zicsv6x1kfqi30m9agr0b2hixj52"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.Caching.Abstractions"; - version = "5.0.0"; - sha256 = "0j83zapqhgqb4v5f6kn891km095pfhvsqha357a86ccclmv2czvb"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.Caching.Memory"; - version = "2.2.0"; - sha256 = "0bzrsn5vas86w66bd04xilnlb21nx4l6lz7d3acvy6y8ir2vb5dv"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.Caching.Memory"; - version = "5.0.0"; - sha256 = "0l8spndl3kvccjlay202msm31iy5iig0i9ddbsdy92wbcjr97lca"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.Configuration"; - version = "2.0.0"; - sha256 = "0yssxq9di5h6xw2cayp5hj3l9b2p0jw9wcjz73rwk4586spac9s9"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.Configuration"; - version = "2.2.0"; - sha256 = "02250qrs3jqqbggfvd0mkim82817f79x6jh8fx2i7r58d0m66qkl"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.Configuration"; - version = "3.1.2"; - sha256 = "06diq359ac4bf8jlr9msf8mwalk1a85lskkgcd8mcha56l7l7g0r"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.Configuration"; - version = "3.1.6"; - sha256 = "0j0zl05n9vv23m2dg4wy6pc39zy09rvnr0ljwh63sa1gski32fhx"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.Configuration"; - version = "5.0.0"; - sha256 = "01m9vzlq0vg0lhckj2dimwq42niwny8g3lm13c9a401hlyg90z1p"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.Configuration.Abstractions"; - version = "2.0.0"; - sha256 = "1ilz2yrgg9rbjyhn6a5zh9pr51nmh11z7sixb4p7vivgydj9gxwf"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.Configuration.Abstractions"; - version = "2.1.0"; - sha256 = "03gzlr3z9j1xnr1k6y91zgxpz3pj27i3zsvjwj7i8jqnlqmk7pxd"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.Configuration.Abstractions"; - version = "2.2.0"; - sha256 = "1fv5277hyhfqmc0gqszyqb1ilwnijm8kc9606yia6hwr8pxyg674"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.Configuration.Abstractions"; - version = "3.1.2"; - sha256 = "1mfsgiklr4v99bx62z97vnp7y2jbdr9g9gwyyw89xcb67pir0wb9"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.Configuration.Abstractions"; - version = "3.1.6"; - sha256 = "1bqp28717rdlygdj7m3srfdbkvx0x6bqs2ply9h2sib87jqxaz9i"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.Configuration.Abstractions"; - version = "5.0.0"; - sha256 = "0fqxkc9pjxkqylsdf26s9q21ciyk56h1w33pz3v1v4wcv8yv1v6k"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.Configuration.Binder"; - version = "2.0.0"; - sha256 = "1prvdbma6r18n5agbhhabv6g357p1j70gq4m9g0vs859kf44nrgc"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.Configuration.Binder"; - version = "2.2.0"; - sha256 = "10qyjdkymdmag3r807kvbnwag4j3nz65i4cwikbd77jjvz92ya3j"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.Configuration.Binder"; - version = "3.1.2"; - sha256 = "1jksknhlvgxgys51z0j7pi6c4k8m1iqv3ixp8nhrk24bc8hf04br"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.Configuration.Binder"; - version = "3.1.6"; - sha256 = "0lq35v2zqvs9jl7y347nr8qmdghr6xrymmik3b5kndw1zlrflavn"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.Configuration.Binder"; - version = "5.0.0"; - sha256 = "0sld0bh2k5kss32i3nf8mwqkjagmw0d1cdfmxm87ckiicwm413a0"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.Configuration.EnvironmentVariables"; - version = "2.2.4"; - sha256 = "0i5m7ki5jl4q9fbc0capcjakbh2y55g0zhq7cjs9qw38496rb020"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.Configuration.EnvironmentVariables"; - version = "5.0.0"; - sha256 = "03gvckj10ljk1mir9g8cf3cajsnihhvmh8z8341gkr9h5653qkv0"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.Configuration.FileExtensions"; - version = "2.2.0"; - sha256 = "0bwk1kh6q259nmnly90j5rbbzi9w5gigq5vyjr31c1br4j8cjmqd"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.Configuration.FileExtensions"; - version = "5.0.0"; - sha256 = "1wq229r3xcmm9wh9sqdpvmfv4qpbp2zms9x6xk7g7sbb8h32hnz3"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.Configuration.Json"; - version = "5.0.0"; - sha256 = "0hq5i483bjbvprp1la9l3si82x1ydxbvkpfc7r3s7zgxg957fyp9"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.DependencyInjection"; - version = "2.2.0"; - sha256 = "0lvv45rvq1xbf47lz818rjydc776zk8mf7svpzh1dml4qwlx9zck"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.DependencyInjection"; - version = "3.1.2"; - sha256 = "0z3vdzrnfy838afc2vv4knj2ycab7jni55kdj82p7plfjngv01ic"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.DependencyInjection"; - version = "3.1.6"; - sha256 = "0m8b5phfbkx96l92nf0xs3bz6861mhb7i4havxckz7mr81g968l6"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.DependencyInjection"; - version = "5.0.0"; - sha256 = "15sdwcyzz0qlybwbdq854bn3jk6kx7awx28gs864c4shhbqkppj4"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.DependencyInjection"; - version = "5.0.1"; - sha256 = "06xig49mwyp3b2dvdx98j079ncg6p4c9x8yj4pzs6ppmi3jgaaqk"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.DependencyInjection.Abstractions"; - version = "2.0.0"; - sha256 = "1pwrfh9b72k9rq6mb2jab5qhhi225d5rjalzkapiayggmygc8nhz"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.DependencyInjection.Abstractions"; - version = "2.1.0"; - sha256 = "0c0cx8r5xkjpxmcfp51959jnp55qjvq28d9vaslk08avvi1by12s"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.DependencyInjection.Abstractions"; - version = "2.2.0"; - sha256 = "1jyzfdr9651h3x6pxwhpfbb9mysfh8f8z1jvy4g117h9790r9zx5"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.DependencyInjection.Abstractions"; - version = "3.1.2"; - sha256 = "0jh1338ai6060k1130by4m0s7jhz8ky7ij9vagrsgnpcl1yc9k70"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.DependencyInjection.Abstractions"; - version = "3.1.6"; - sha256 = "18mcv1x6b3qlaksmb8q92r34jrv1841la5lmg21qppmb9qs0z293"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.DependencyInjection.Abstractions"; - version = "5.0.0"; - sha256 = "17cz6s80va0ch0a6nqa1wbbbp3p8sqxb96lj4qcw67ivkp2yxiyj"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.DependencyModel"; - version = "2.0.4"; - sha256 = "041i1vlcibpzgalxxzdk81g5pgmqvmz2g61k0rqa2sky0wpvijx9"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.DependencyModel"; - version = "2.1.0"; - sha256 = "0dl4qhjgifm6v3jsfzvzkvddyic77ggp9fq49ah661v45gk6ilgd"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.DependencyModel"; - version = "5.0.0"; - sha256 = "1mma1zxi0b40972cwfvkj9y0w9r7vjbi74784jzcb22pric00k5x"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.Diagnostics.HealthChecks"; - version = "5.0.3"; - sha256 = "0hv4l27bp29gy3rh9cssvvc8xwzy8ffwh277dw870zhv5mm2ha29"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions"; - version = "5.0.3"; - sha256 = "1r1xrlgbyfsf0b447lw6lv6jxq339ssrm61klyjmnk1ady05h9di"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore"; - version = "5.0.3"; - sha256 = "0q0j75i289yn3bv09dhzfirpb4glqm35wrv7p2463kmbf3g551rr"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.FileProviders.Abstractions"; - version = "2.1.0"; - sha256 = "1sxls5f5cgb0wr8cwb05skqmz074683hrhmd3hhq6m5dasnzb8n3"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.FileProviders.Abstractions"; - version = "2.2.0"; - sha256 = "1f83ffb4xjwljg8dgzdsa3pa0582q6b4zm0si467fgkybqzk3c54"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.FileProviders.Abstractions"; - version = "5.0.0"; - sha256 = "01ahgd0b2z2zycrr2lcsq2cl59fn04bh51hdwdp9dcsdkpvnasj1"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.FileProviders.Composite"; - version = "2.2.0"; - sha256 = "0k3qfxb0pn9b63grbf9jv7xw40gk6m1djmi3c4inwys7lxcj2k18"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.FileProviders.Physical"; - version = "2.2.0"; - sha256 = "0lrq4bxf67pw6n9kzwzqsnxkad2ygh2zn46hjias8j7aqljglh7x"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.FileProviders.Physical"; - version = "5.0.0"; - sha256 = "00vii8148a6pk12l9jl0rhjp7apil5q5qcy7v1smnv17lj4p8szd"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.FileSystemGlobbing"; - version = "2.2.0"; - sha256 = "01jw7s1nb44n65qs3rk7xdzc419qwl0s5c34k031f1cc5ag3jvc2"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.FileSystemGlobbing"; - version = "5.0.0"; - sha256 = "0lm6n9vbyjh0l17qcc2y9qwn1cns3dyjmkvbxjp0g9sll32kjpmb"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.Hosting.Abstractions"; - version = "2.1.0"; - sha256 = "04vm9mdjjzg3lpp2rzpgkpn8h5bzdl3bwcr22lshd3kp602ws4k9"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.Hosting.Abstractions"; - version = "2.2.0"; - sha256 = "1xc7xr1nq7akfahyl5in9iyxrygap2xi9nxh39rfm37sf8lk55v1"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.Hosting.Abstractions"; - version = "5.0.0"; - sha256 = "1k28hndmm8ky7sr2j5agdz9lls25mbb08dkypka0b76x5f4hplb5"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.Http"; - version = "3.1.6"; - sha256 = "04ggi7vdx7h5622y1y7xcls6lij880jn9b2xgg73rwrq6bcadj6q"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.Http"; - version = "5.0.0"; - sha256 = "1sx2w6s2giavi3i1wbpa64h1v1xhk5afz3whh7rxhb9fmsn9h1bk"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.Localization"; - version = "2.2.0"; - sha256 = "1k73kk5qmrvdyd7l8qxp19crw18f2p5dgk3cjx59g7vf3rkgmc6k"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.Localization.Abstractions"; - version = "2.2.0"; - sha256 = "1yzqs5x97rj6wlg0rylj0xi3dn1bw4ps26zdqsijx621jl1r97gy"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.Logging"; - version = "2.2.0"; - sha256 = "0bx3ljyvvcbikradq2h583rl72h8bxdz33aghk026cxzpv2mm3wm"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.Logging"; - version = "3.1.2"; - sha256 = "0yh4zbyvm24alrcblcbm0sp7l9ys5ypcxs7l772yj7fdpk0bx3ap"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.Logging"; - version = "3.1.6"; - sha256 = "0brzknkxlalpb1a8m371nmkmpfjf1q3p8x6nls5ylh0w7midxxgp"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.Logging"; - version = "5.0.0"; - sha256 = "1qa1l18q2jh9azya8gv1p8anzcdirjzd9dxxisb4911i9m1648i3"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.Logging.Abstractions"; - version = "2.1.0"; - sha256 = "1gvgif1wcx4k6pv7gc00qv1hid945jdywy1s50s33q0hfd91hbnj"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.Logging.Abstractions"; - version = "2.2.0"; - sha256 = "02w7hp6jicr7cl5p456k2cmrjvvhm6spg5kxnlncw3b72358m5wl"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.Logging.Abstractions"; - version = "3.1.2"; - sha256 = "0givwc5dnz1wm9aa0sfxi4mjws6v9c8v5i5772yg1r4w1wvn3733"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.Logging.Abstractions"; - version = "3.1.6"; - sha256 = "16pk17a3hh0j431a5f7d663iqk1j6n3wjlzk6chmvnfk3dpwfhww"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.Logging.Abstractions"; - version = "5.0.0"; - sha256 = "1yza38675dbv1qqnnhqm23alv2bbaqxp0pb7zinjmw8j2mr5r6wc"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.ObjectPool"; - version = "2.2.0"; - sha256 = "0n1q9lvc24ii1shzy575xldgmz7imnk4dswwwcgmzz93klri9r1z"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.Options"; - version = "2.0.0"; - sha256 = "0g4zadlg73f507krilhaaa7h0jdga216syrzjlyf5fdk25gxmjqh"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.Options"; - version = "2.2.0"; - sha256 = "1b20yh03fg4nmmi3vlf6gf13vrdkmklshfzl3ijygcs4c2hly6v0"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.Options"; - version = "3.1.2"; - sha256 = "005f42rq6n2v5cakqi51266g26dkjc6nsqdd6w62pxvv6g6kp9km"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.Options"; - version = "3.1.6"; - sha256 = "1rdi0pcpcmhvwkn7mxymrpav9q2c4frxhl99ps961mmh1i5738sc"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.Options"; - version = "5.0.0"; - sha256 = "1rdmgpg770x8qwaaa6ryc27zh93p697fcyvn5vkxp0wimlhqkbay"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.Options.ConfigurationExtensions"; - version = "2.0.0"; - sha256 = "1isc3rjbzz60f7wbmgcwslx5d10hm5hisnk7v54vfi2bz7132gll"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.Primitives"; - version = "2.0.0"; - sha256 = "1xppr5jbny04slyjgngxjdm0maxdh47vq481ps944d7jrfs0p3mb"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.Primitives"; - version = "2.1.0"; - sha256 = "1r9gzwdfmb8ysnc4nzmyz5cyar1lw0qmizsvrsh252nhlyg06nmb"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.Primitives"; - version = "2.2.0"; - sha256 = "0znah6arbcqari49ymigg3wiy2hgdifz8zsq8vdc3ynnf45r7h0c"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.Primitives"; - version = "3.1.2"; - sha256 = "04hdb7rd59frgb5ym0sfwc5r67jj6vykcbxljzs8909f8hrs98jb"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.Primitives"; - version = "3.1.6"; - sha256 = "1acl88cph3yqcjz7ami5hzdr69cvxvry24a6r6fmrwnzfcc1i40n"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.Primitives"; - version = "5.0.0"; - sha256 = "0swqcknyh87ns82w539z1mvy804pfwhgzs97cr3nwqk6g5s42gd6"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.WebEncoders"; - version = "2.2.0"; - sha256 = "1mhnichccw6mjf37d38q2i1kr7qp485m7apa1b872ji0q16yy1y3"; - }) - (fetchNuGet { - name = "Microsoft.NetCore.Analyzers"; - version = "2.9.8"; - sha256 = "1klybsdy9yw49zlpmix4vjdhmfaibg5h9yx03vszdnijzap7vpsx"; - }) - (fetchNuGet { - name = "Microsoft.NETCore.App.Runtime.linux-x64"; - version = "5.0.5"; - sha256 = "1h5yry6k9bpqqis2fb1901csb8kipm7anm174fjj41r317vzfjfa"; - }) - (fetchNuGet { - name = "Microsoft.NETCore.Platforms"; - version = "1.0.1"; - sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; - }) - (fetchNuGet { - name = "Microsoft.NETCore.Platforms"; - version = "1.1.0"; - sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; - }) - (fetchNuGet { - name = "Microsoft.NETCore.Platforms"; - version = "1.1.1"; - sha256 = "164wycgng4mi9zqi2pnsf1pq6gccbqvw6ib916mqizgjmd8f44pj"; - }) - (fetchNuGet { - name = "Microsoft.NETCore.Platforms"; - version = "2.0.0"; - sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; - }) - (fetchNuGet { - name = "Microsoft.NETCore.Platforms"; - version = "3.1.1"; - sha256 = "05hmaygd5131rnqi6ipv7agsbpi7ka18779vw45iw6b385l7n987"; - }) - (fetchNuGet { - name = "Microsoft.NETCore.Platforms"; - version = "5.0.0"; - sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; - }) - (fetchNuGet { - name = "Microsoft.NETCore.Targets"; - version = "1.0.1"; - sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; - }) - (fetchNuGet { - name = "Microsoft.NETCore.Targets"; - version = "1.1.0"; - sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; - }) - (fetchNuGet { - name = "Microsoft.NETCore.Targets"; - version = "1.1.3"; - sha256 = "05smkcyxir59rgrmp7d6327vvrlacdgldfxhmyr1azclvga1zfsq"; - }) - (fetchNuGet { - name = "Microsoft.NetFramework.Analyzers"; - version = "2.9.8"; - sha256 = "0mb3gkqcr13ryphrzax40cf05bz0h269a6zm1hnzzsq7gbd5iipb"; - }) - (fetchNuGet { - name = "Microsoft.Net.Http.Headers"; - version = "2.2.0"; - sha256 = "0w6lrk9z67bcirq2cj2ldfhnizc6id77ba6i30hjzgqjlyhh1gx5"; - }) - (fetchNuGet { - name = "Microsoft.Net.Http.Headers"; - version = "2.2.8"; - sha256 = "1s0n68z6v5mbys4jjrd4jdxrrz81iq4dzmmbmxzmlf59769x8rj9"; - }) - (fetchNuGet { - name = "Microsoft.OpenApi"; - version = "1.2.3"; - sha256 = "07b19k89whj69j87afkz86gp9b3iybw8jqwvlgcn43m7fb2y99rr"; - }) - (fetchNuGet { - name = "Microsoft.SourceLink.Common"; - version = "1.0.0"; - sha256 = "1zxkpx01zdv17c39iiy8fx25ran89n14qwddh1f140v1s4dn8z9c"; - }) - (fetchNuGet { - name = "Microsoft.SourceLink.GitHub"; - version = "1.0.0"; - sha256 = "029ixyaqn48cjza87m5qf0g1ynyhlm6irgbx1n09src9g666yhpd"; - }) - (fetchNuGet { - name = "Microsoft.Win32.Primitives"; - version = "4.0.1"; - sha256 = "1n8ap0cmljbqskxpf8fjzn7kh1vvlndsa75k01qig26mbw97k2q7"; - }) - (fetchNuGet { - name = "Microsoft.Win32.Primitives"; - version = "4.3.0"; - sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; - }) - (fetchNuGet { - name = "Microsoft.Win32.Registry"; - version = "4.5.0"; - sha256 = "1zapbz161ji8h82xiajgriq6zgzmb1f3ar517p2h63plhsq5gh2q"; - }) - (fetchNuGet { - name = "Mono.Nat"; - version = "3.0.1"; - sha256 = "1xy3c9wsiz8k3rx8v60y6gnps337rsb5jpyj0r6g384prg6z4vh0"; - }) - (fetchNuGet { - name = "NETStandard.Library"; - version = "1.6.0"; - sha256 = "0nmmv4yw7gw04ik8ialj3ak0j6pxa9spih67hnn1h2c38ba8h58k"; - }) - (fetchNuGet { - name = "NETStandard.Library"; - version = "1.6.1"; - sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; - }) - (fetchNuGet { - name = "Newtonsoft.Json"; - version = "10.0.1"; - sha256 = "15ncqic3p2rzs8q8ppi0irl2miq75kilw4lh8yfgjq96id0ds3hv"; - }) - (fetchNuGet { - name = "Newtonsoft.Json"; - version = "11.0.2"; - sha256 = "1784xi44f4k8v1fr696hsccmwpy94bz7kixxqlri98zhcxn406b2"; - }) - (fetchNuGet { - name = "Newtonsoft.Json"; - version = "12.0.2"; - sha256 = "0w2fbji1smd2y7x25qqibf1qrznmv4s6s0jvrbvr6alb7mfyqvh5"; - }) - (fetchNuGet { - name = "Newtonsoft.Json"; - version = "12.0.3"; - sha256 = "17dzl305d835mzign8r15vkmav2hq8l6g7942dfjpnzr17wwl89x"; - }) - (fetchNuGet { - name = "Newtonsoft.Json"; - version = "9.0.1"; - sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; - }) - (fetchNuGet { - name = "Newtonsoft.Json.Bson"; - version = "1.0.1"; - sha256 = "1r1hvj5gjl466bya2bfl5aaj8rbwyf5x1msg710wf3k2llbci1xa"; - }) - (fetchNuGet { - name = "OptimizedPriorityQueue"; - version = "5.0.0"; - sha256 = "0a0kn4sr80yx1bm5nngbillfbcafv86hqxwp5kxjgh3wcd01c803"; - }) - (fetchNuGet { - name = "PlaylistsNET"; - version = "1.1.3"; - sha256 = "092lgqvvarx6g8mrhm8rdzcqisklzffa0i3gkpc0zbk7b7b0f8yg"; - }) - (fetchNuGet { - name = "prometheus-net"; - version = "3.1.2"; - sha256 = "1jyxvl9cqxvb71mpaglw8aks27i69hg7yzrdwsjc182nmmhh1p03"; - }) - (fetchNuGet { - name = "prometheus-net"; - version = "4.1.1"; - sha256 = "0n016rxlz00xrw1jrikwr6h221rrw96h13d0823mfb5375rdi8rx"; - }) - (fetchNuGet { - name = "prometheus-net.AspNetCore"; - version = "4.1.1"; - sha256 = "0239i5ga7z3ajq6rvqz2ym3a30b1nbfjn6dnmc1iljd9579flzhs"; - }) - (fetchNuGet { - name = "prometheus-net.DotNetRuntime"; - version = "3.4.1"; - sha256 = "1b4a5yh2s8nji4bvp9fcw03dw0wbx58823b7jfga0vva33am3xx8"; - }) - (fetchNuGet { - name = "runtime.any.System.Collections"; - version = "4.3.0"; - sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; - }) - (fetchNuGet { - name = "runtime.any.System.Diagnostics.Tools"; - version = "4.3.0"; - sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; - }) - (fetchNuGet { - name = "runtime.any.System.Diagnostics.Tracing"; - version = "4.3.0"; - sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; - }) - (fetchNuGet { - name = "runtime.any.System.Globalization"; - version = "4.3.0"; - sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; - }) - (fetchNuGet { - name = "runtime.any.System.Globalization.Calendars"; - version = "4.3.0"; - sha256 = "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201"; - }) - (fetchNuGet { - name = "runtime.any.System.IO"; - version = "4.3.0"; - sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; - }) - (fetchNuGet { - name = "runtime.any.System.Reflection"; - version = "4.3.0"; - sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; - }) - (fetchNuGet { - name = "runtime.any.System.Reflection.Extensions"; - version = "4.3.0"; - sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"; - }) - (fetchNuGet { - name = "runtime.any.System.Reflection.Primitives"; - version = "4.3.0"; - sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; - }) - (fetchNuGet { - name = "runtime.any.System.Resources.ResourceManager"; - version = "4.3.0"; - sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; - }) - (fetchNuGet { - name = "runtime.any.System.Runtime"; - version = "4.3.0"; - sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; - }) - (fetchNuGet { - name = "runtime.any.System.Runtime.Handles"; - version = "4.3.0"; - sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; - }) - (fetchNuGet { - name = "runtime.any.System.Runtime.InteropServices"; - version = "4.3.0"; - sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; - }) - (fetchNuGet { - name = "runtime.any.System.Text.Encoding"; - version = "4.3.0"; - sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; - }) - (fetchNuGet { - name = "runtime.any.System.Text.Encoding.Extensions"; - version = "4.3.0"; - sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; - }) - (fetchNuGet { - name = "runtime.any.System.Threading.Tasks"; - version = "4.3.0"; - sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; - }) - (fetchNuGet { - name = "runtime.any.System.Threading.Timer"; - version = "4.3.0"; - sha256 = "0aw4phrhwqz9m61r79vyfl5la64bjxj8l34qnrcwb28v49fg2086"; - }) - (fetchNuGet { - name = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; - }) - (fetchNuGet { - name = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; - }) - (fetchNuGet { - name = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; - }) - (fetchNuGet { - name = "runtime.native.System"; - version = "4.0.0"; - sha256 = "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf"; - }) - (fetchNuGet { - name = "runtime.native.System"; - version = "4.3.0"; - sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; - }) - (fetchNuGet { - name = "runtime.native.System.IO.Compression"; - version = "4.1.0"; - sha256 = "0d720z4lzyfcabmmnvh0bnj76ll7djhji2hmfh3h44sdkjnlkknk"; - }) - (fetchNuGet { - name = "runtime.native.System.IO.Compression"; - version = "4.3.0"; - sha256 = "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"; - }) - (fetchNuGet { - name = "runtime.native.System.Net.Http"; - version = "4.0.1"; - sha256 = "1hgv2bmbaskx77v8glh7waxws973jn4ah35zysnkxmf0196sfxg6"; - }) - (fetchNuGet { - name = "runtime.native.System.Net.Http"; - version = "4.3.0"; - sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; - }) - (fetchNuGet { - name = "runtime.native.System.Security.Cryptography"; - version = "4.0.0"; - sha256 = "0k57aa2c3b10wl3hfqbgrl7xq7g8hh3a3ir44b31dn5p61iiw3z9"; - }) - (fetchNuGet { - name = "runtime.native.System.Security.Cryptography.Apple"; - version = "4.3.0"; - sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; - }) - (fetchNuGet { - name = "runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; - }) - (fetchNuGet { - name = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; - }) - (fetchNuGet { - name = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; - }) - (fetchNuGet { - name = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; - version = "4.3.0"; - sha256 = "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi"; - }) - (fetchNuGet { - name = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; - }) - (fetchNuGet { - name = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; - }) - (fetchNuGet { - name = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; - }) - (fetchNuGet { - name = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; - }) - (fetchNuGet { - name = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; - }) - (fetchNuGet { - name = "runtime.unix.Microsoft.Win32.Primitives"; - version = "4.3.0"; - sha256 = "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id"; - }) - (fetchNuGet { - name = "runtime.unix.System.Console"; - version = "4.3.0"; - sha256 = "1pfpkvc6x2if8zbdzg9rnc5fx51yllprl8zkm5npni2k50lisy80"; - }) - (fetchNuGet { - name = "runtime.unix.System.Console"; - version = "4.3.1"; - sha256 = "15kfi3761mk2i29zg135ipsvavm50nwm4334cy5m5q7iagzsf73p"; - }) - (fetchNuGet { - name = "runtime.unix.System.Diagnostics.Debug"; - version = "4.3.0"; - sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; - }) - (fetchNuGet { - name = "runtime.unix.System.IO.FileSystem"; - version = "4.3.0"; - sha256 = "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix"; - }) - (fetchNuGet { - name = "runtime.unix.System.Net.Primitives"; - version = "4.3.0"; - sha256 = "0bdnglg59pzx9394sy4ic66kmxhqp8q8bvmykdxcbs5mm0ipwwm4"; - }) - (fetchNuGet { - name = "runtime.unix.System.Net.Sockets"; - version = "4.3.0"; - sha256 = "03npdxzy8gfv035bv1b9rz7c7hv0rxl5904wjz51if491mw0xy12"; - }) - (fetchNuGet { - name = "runtime.unix.System.Private.Uri"; - version = "4.3.0"; - sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; - }) - (fetchNuGet { - name = "runtime.unix.System.Runtime.Extensions"; - version = "4.3.0"; - sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; - }) - (fetchNuGet { - name = "Serilog"; - version = "2.3.0"; - sha256 = "0y1111y0csfnil901nfahhj3x251nzdam0c4vab3gw5qh8iqs3my"; - }) - (fetchNuGet { - name = "Serilog"; - version = "2.5.0"; - sha256 = "0lq3kpmb83mv9kzr9zshz46bp6mvgx1kfz4dzjgzpasf6llgmrx0"; - }) - (fetchNuGet { - name = "Serilog"; - version = "2.6.0"; - sha256 = "0xzq2szx5yb9xgnkj2zvjil48baald22jm2j39smnac32gid5gm0"; - }) - (fetchNuGet { - name = "Serilog"; - version = "2.8.0"; - sha256 = "0fnrs05yjnni06mbax7ig74wiiqjyyhrxmr1hrhlpwcmc40zs4ih"; - }) - (fetchNuGet { - name = "Serilog"; - version = "2.9.0"; - sha256 = "0z0ib82w9b229a728bbyhzc2hnlbl0ki7nnvmgnv3l741f2vr4i6"; - }) - (fetchNuGet { - name = "SerilogAnalyzer"; - version = "0.15.0.0"; - sha256 = "0k83cyzl9520q282vp07zb8rs16a56axv7a31l3m5fb1afq2hv9l"; - }) - (fetchNuGet { - name = "Serilog.AspNetCore"; - version = "3.4.0"; - sha256 = "1k59zspma8hlka6j6hvflw8i073092qj8kzz52fdkqrck7w7cbag"; - }) - (fetchNuGet { - name = "Serilog.Enrichers.Thread"; - version = "3.1.0"; - sha256 = "1y75aiv2k1sxnh012ixkx92fq1yl8srqggy8l439igg4p223hcqi"; - }) - (fetchNuGet { - name = "Serilog.Extensions.Hosting"; - version = "3.1.0"; - sha256 = "0n01n2kvapl5hkp80fa0ra8zixacfqhrs05ijkh3hj5bvgnscsx5"; - }) - (fetchNuGet { - name = "Serilog.Extensions.Logging"; - version = "3.0.1"; - sha256 = "069qy7dm5nxb372ij112ppa6m99b4iaimj3sji74m659fwrcrl9a"; - }) - (fetchNuGet { - name = "Serilog.Formatting.Compact"; - version = "1.1.0"; - sha256 = "1w3qhj1jrihb20gr9la4r4gcmdyyy6dai2xflwhzvgqrq05wlycy"; - }) - (fetchNuGet { - name = "Serilog.Settings.Configuration"; - version = "3.1.0"; - sha256 = "1cj5am4n073331gbfm2ylqb9cadl4q3ppzgwmm5c8m1drxpiwkb5"; - }) - (fetchNuGet { - name = "Serilog.Sinks.Async"; - version = "1.4.0"; - sha256 = "00kqrn3xmfzg469y155vihsiby8dbbs382fi6qg8p2zg3i5dih1d"; - }) - (fetchNuGet { - name = "Serilog.Sinks.Console"; - version = "3.1.1"; - sha256 = "0j99as641y1k6havwwkhyr0n08vibiblmfjj6nz051mz8g3864fn"; - }) - (fetchNuGet { - name = "Serilog.Sinks.Debug"; - version = "1.0.1"; - sha256 = "0969mb254kr59bgkq01ybyzca89z3f4n9ng5mdj8m53d5653zf22"; - }) - (fetchNuGet { - name = "Serilog.Sinks.File"; - version = "4.1.0"; - sha256 = "1ry7p9hf1zlnai1j5zjhjp4dqm2agsbpq6cvxgpf5l8m26x6mgca"; - }) - (fetchNuGet { - name = "Serilog.Sinks.Graylog"; - version = "2.2.2"; - sha256 = "0cvl9vfd1qx0hdvvylhh9frnxwqdl9yq4vy21fjsr6wdvgflg2hr"; - }) - (fetchNuGet { - name = "ServiceStack.Text.Core"; - version = "5.10.2"; - sha256 = "0hpqfify017gm8nbah2abkk5d4vnsqrgj86i8b5mx3wy54h82pvb"; - }) - (fetchNuGet { - name = "SharpCompress"; - version = "0.26.0"; - sha256 = "03cygf8p44j1bfn6z9cn2xrw6zhvhq17xac1sph5rgq7vq2m5iq5"; - }) - (fetchNuGet { - name = "SkiaSharp"; - version = "2.80.2"; - sha256 = "17n0f4gfxz69fzd7zmgimbxfja15vq902arap2rqjr1hxp8sck7g"; - }) - (fetchNuGet { - name = "SkiaSharp.NativeAssets.Linux"; - version = "2.80.2"; - sha256 = "1951b7rpisaymb37j846jq01pjd05l4fjlnf56blh33ihxyj2jzi"; - }) - (fetchNuGet { - name = "SmartAnalyzers.MultithreadingAnalyzer"; - version = "1.1.31"; - sha256 = "1qk5s4rx5ma7k2kzkn1h94fsrzmwkivj0z1czsjwmr8z7zhngs2h"; - }) - (fetchNuGet { - name = "SQLitePCL.pretty.netstandard"; - version = "2.1.0"; - sha256 = "03vjk8r0dzyiwya6q5p2z2wp9sxj3b7xi72p7wgsy270a2pb3f28"; - }) - (fetchNuGet { - name = "SQLitePCLRaw.bundle_e_sqlite3"; - version = "2.0.4"; - sha256 = "1l3vbkwismsx5jcy3d5bj4bzh8bni8bk2gq4lqplz82pz5phjpxm"; - }) - (fetchNuGet { - name = "SQLitePCLRaw.core"; - version = "1.1.14"; - sha256 = "1najf6ns5b8rqqlmlxjn4wjcgnb5ch9ni7wiq6iip4155d35c519"; - }) - (fetchNuGet { - name = "SQLitePCLRaw.core"; - version = "2.0.2"; - sha256 = "11mnbnsiirpgmilskqh1issvgzgg08ndq3p3nkrw73hyqr7kl958"; - }) - (fetchNuGet { - name = "SQLitePCLRaw.core"; - version = "2.0.4"; - sha256 = "0lb5vwfl1hd24xzzdaj2p4k2hv2k0i3mgdri6fjj0ssb37mcyir1"; - }) - (fetchNuGet { - name = "SQLitePCLRaw.lib.e_sqlite3"; - version = "2.0.4"; - sha256 = "0kmx1w5qllmwxldr8338qxwmpfzc6g2lmyrah7wfaxd3mvfzky5c"; - }) - (fetchNuGet { - name = "SQLitePCLRaw.provider.dynamic_cdecl"; - version = "2.0.4"; - sha256 = "084r98kilpm0q1aw41idq8slncpd7cz65g0m1wr0p8d12x8z5g6j"; - }) - (fetchNuGet { - name = "SQLitePCLRaw.provider.sqlite3.netstandard11"; - version = "1.1.14"; - sha256 = "00jwin9lannq4qla6r85c4f0m1y8g103r02p8cnjhakxz588dm1y"; - }) - (fetchNuGet { - name = "StyleCop.Analyzers"; - version = "1.1.118"; - sha256 = "0hj4ax64cay2lvrh9693m0g4pmis0fi5wpm12xwzvc7lkizvac0a"; - }) - (fetchNuGet { - name = "Swashbuckle.AspNetCore"; - version = "5.6.3"; - sha256 = "1s8jmvssk8g518szi9nijsq73d85fnlzvink2x0ahf2jkvpakn9p"; - }) - (fetchNuGet { - name = "Swashbuckle.AspNetCore.ReDoc"; - version = "5.6.3"; - sha256 = "1kbn77wbcn03pwcynj4n602p4157y1qrfv775clnmzfq7z5nfaw6"; - }) - (fetchNuGet { - name = "Swashbuckle.AspNetCore.Swagger"; - version = "5.6.3"; - sha256 = "0yg27nlndaiaa6sv7xkcysdpmq1dzf24xjz6xq0vwn51mn84vsg9"; - }) - (fetchNuGet { - name = "Swashbuckle.AspNetCore.SwaggerGen"; - version = "5.6.3"; - sha256 = "15h31wq9n9zcpalb3k1pzgcsafn1mz397mb9bnl55621p6zxrlz2"; - }) - (fetchNuGet { - name = "Swashbuckle.AspNetCore.SwaggerUI"; - version = "5.6.3"; - sha256 = "0vbq3xycsixnpsqw2pphzw77w1liyz8hi1sl4hy9bpgpa18p2sfj"; - }) - (fetchNuGet { - name = "System.AppContext"; - version = "4.1.0"; - sha256 = "0fv3cma1jp4vgj7a8hqc9n7hr1f1kjp541s6z0q1r6nazb4iz9mz"; - }) - (fetchNuGet { - name = "System.AppContext"; - version = "4.3.0"; - sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; - }) - (fetchNuGet { - name = "System.Buffers"; - version = "4.0.0"; - sha256 = "13s659bcmg9nwb6z78971z1lr6bmh2wghxi1ayqyzl4jijd351gr"; - }) - (fetchNuGet { - name = "System.Buffers"; - version = "4.3.0"; - sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; - }) - (fetchNuGet { - name = "System.Buffers"; - version = "4.5.0"; - sha256 = "1ywfqn4md6g3iilpxjn5dsr0f5lx6z0yvhqp4pgjcamygg73cz2c"; - }) - (fetchNuGet { - name = "System.Collections"; - version = "4.0.11"; - sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; - }) - (fetchNuGet { - name = "System.Collections"; - version = "4.3.0"; - sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; - }) - (fetchNuGet { - name = "System.Collections.Concurrent"; - version = "4.0.12"; - sha256 = "07y08kvrzpak873pmyxs129g1ch8l27zmg51pcyj2jvq03n0r0fc"; - }) - (fetchNuGet { - name = "System.Collections.Concurrent"; - version = "4.3.0"; - sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; - }) - (fetchNuGet { - name = "System.Collections.Immutable"; - version = "1.3.1"; - sha256 = "17615br2x5riyx8ivf1dcqwj6q3ipq1bi5hqhw54yfyxmx38ddva"; - }) - (fetchNuGet { - name = "System.Collections.Immutable"; - version = "5.0.0"; - sha256 = "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r"; - }) - (fetchNuGet { - name = "System.Collections.NonGeneric"; - version = "4.0.1"; - sha256 = "19994r5y5bpdhj7di6w047apvil8lh06lh2c2yv9zc4fc5g9bl4d"; - }) - (fetchNuGet { - name = "System.Collections.NonGeneric"; - version = "4.3.0"; - sha256 = "07q3k0hf3mrcjzwj8fwk6gv3n51cb513w4mgkfxzm3i37sc9kz7k"; - }) - (fetchNuGet { - name = "System.Collections.Specialized"; - version = "4.3.0"; - sha256 = "1sdwkma4f6j85m3dpb53v9vcgd0zyc9jb33f8g63byvijcj39n20"; - }) - (fetchNuGet { - name = "System.ComponentModel"; - version = "4.3.0"; - sha256 = "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb"; - }) - (fetchNuGet { - name = "System.ComponentModel.Annotations"; - version = "4.5.0"; - sha256 = "1jj6f6g87k0iwsgmg3xmnn67a14mq88np0l1ys5zkxhkvbc8976p"; - }) - (fetchNuGet { - name = "System.ComponentModel.Annotations"; - version = "5.0.0"; - sha256 = "021h7x98lblq9avm1bgpa4i31c2kgsa7zn4sqhxf39g087ar756j"; - }) - (fetchNuGet { - name = "System.ComponentModel.Primitives"; - version = "4.3.0"; - sha256 = "1svfmcmgs0w0z9xdw2f2ps05rdxmkxxhf0l17xk9l1l8xfahkqr0"; - }) - (fetchNuGet { - name = "System.ComponentModel.TypeConverter"; - version = "4.3.0"; - sha256 = "17ng0p7v3nbrg3kycz10aqrrlw4lz9hzhws09pfh8gkwicyy481x"; - }) - (fetchNuGet { - name = "System.Console"; - version = "4.0.0"; - sha256 = "0ynxqbc3z1nwbrc11hkkpw9skw116z4y9wjzn7id49p9yi7mzmlf"; - }) - (fetchNuGet { - name = "System.Console"; - version = "4.3.0"; - sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; - }) - (fetchNuGet { - name = "System.Diagnostics.Debug"; - version = "4.0.11"; - sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; - }) - (fetchNuGet { - name = "System.Diagnostics.Debug"; - version = "4.3.0"; - sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; - }) - (fetchNuGet { - name = "System.Diagnostics.DiagnosticSource"; - version = "4.0.0"; - sha256 = "1n6c3fbz7v8d3pn77h4v5wvsfrfg7v1c57lg3nff3cjyh597v23m"; - }) - (fetchNuGet { - name = "System.Diagnostics.DiagnosticSource"; - version = "4.3.0"; - sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; - }) - (fetchNuGet { - name = "System.Diagnostics.DiagnosticSource"; - version = "4.5.0"; - sha256 = "1y8m0p3127nak5yspapfnz25qc9x53gqpvwr3hdpsvrcd2r1pgyj"; - }) - (fetchNuGet { - name = "System.Diagnostics.DiagnosticSource"; - version = "4.5.1"; - sha256 = "1j8dgilsgd0n7y87wq1cdlnwck96wijhbyhdp4d01l1gzm3074c1"; - }) - (fetchNuGet { - name = "System.Diagnostics.DiagnosticSource"; - version = "5.0.1"; - sha256 = "0mzw44wsm87vpslb9sn7rirxynpq9m3b00l7gl0q71m8shfh66qs"; - }) - (fetchNuGet { - name = "System.Diagnostics.FileVersionInfo"; - version = "4.3.0"; - sha256 = "094hx249lb3vb336q7dg3v257hbxvz2jnalj695l7cg5kxzqwai7"; - }) - (fetchNuGet { - name = "System.Diagnostics.StackTrace"; - version = "4.3.0"; - sha256 = "0ash4h9k0m7xsm0yl79r0ixrdz369h7y922wipp5gladmlbvpyjd"; - }) - (fetchNuGet { - name = "System.Diagnostics.Tools"; - version = "4.0.1"; - sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; - }) - (fetchNuGet { - name = "System.Diagnostics.Tools"; - version = "4.3.0"; - sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; - }) - (fetchNuGet { - name = "System.Diagnostics.Tracing"; - version = "4.1.0"; - sha256 = "1d2r76v1x610x61ahfpigda89gd13qydz6vbwzhpqlyvq8jj6394"; - }) - (fetchNuGet { - name = "System.Diagnostics.Tracing"; - version = "4.3.0"; - sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; - }) - (fetchNuGet { - name = "System.Dynamic.Runtime"; - version = "4.0.11"; - sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; - }) - (fetchNuGet { - name = "System.Dynamic.Runtime"; - version = "4.3.0"; - sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; - }) - (fetchNuGet { - name = "System.Globalization"; - version = "4.0.11"; - sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; - }) - (fetchNuGet { - name = "System.Globalization"; - version = "4.3.0"; - sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; - }) - (fetchNuGet { - name = "System.Globalization.Calendars"; - version = "4.0.1"; - sha256 = "0bv0alrm2ck2zk3rz25lfyk9h42f3ywq77mx1syl6vvyncnpg4qh"; - }) - (fetchNuGet { - name = "System.Globalization.Calendars"; - version = "4.3.0"; - sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; - }) - (fetchNuGet { - name = "System.Globalization.Extensions"; - version = "4.0.1"; - sha256 = "0hjhdb5ri8z9l93bw04s7ynwrjrhx2n0p34sf33a9hl9phz69fyc"; - }) - (fetchNuGet { - name = "System.Globalization.Extensions"; - version = "4.3.0"; - sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; - }) - (fetchNuGet { - name = "System.IO"; - version = "4.1.0"; - sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; - }) - (fetchNuGet { - name = "System.IO"; - version = "4.3.0"; - sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; - }) - (fetchNuGet { - name = "System.IO.Compression"; - version = "4.1.0"; - sha256 = "0iym7s3jkl8n0vzm3jd6xqg9zjjjqni05x45dwxyjr2dy88hlgji"; - }) - (fetchNuGet { - name = "System.IO.Compression"; - version = "4.3.0"; - sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"; - }) - (fetchNuGet { - name = "System.IO.Compression.ZipFile"; - version = "4.0.1"; - sha256 = "0h72znbagmgvswzr46mihn7xm7chfk2fhrp5krzkjf29pz0i6z82"; - }) - (fetchNuGet { - name = "System.IO.Compression.ZipFile"; - version = "4.3.0"; - sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"; - }) - (fetchNuGet { - name = "System.IO.FileSystem"; - version = "4.0.1"; - sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; - }) - (fetchNuGet { - name = "System.IO.FileSystem"; - version = "4.3.0"; - sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; - }) - (fetchNuGet { - name = "System.IO.FileSystem.Primitives"; - version = "4.0.1"; - sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; - }) - (fetchNuGet { - name = "System.IO.FileSystem.Primitives"; - version = "4.3.0"; - sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; - }) - (fetchNuGet { - name = "System.IO.Pipelines"; - version = "4.5.2"; - sha256 = "045sn3vyk5xysjjm19q4dj5c1g1rf8l98n4qsl9pl9id4fn08yq1"; - }) - (fetchNuGet { - name = "System.Linq"; - version = "4.1.0"; - sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; - }) - (fetchNuGet { - name = "System.Linq"; - version = "4.3.0"; - sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; - }) - (fetchNuGet { - name = "System.Linq.Async"; - version = "5.0.0"; - sha256 = "1bc1bfnahyk6y31mrxn7nd071436m94p4r9b2j835pghcqawqfbc"; - }) - (fetchNuGet { - name = "System.Linq.Expressions"; - version = "4.1.0"; - sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; - }) - (fetchNuGet { - name = "System.Linq.Expressions"; - version = "4.3.0"; - sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; - }) - (fetchNuGet { - name = "System.Memory"; - version = "4.5.0"; - sha256 = "1layqpcx1q4l805fdnj2dfqp6ncx2z42ca06rgsr6ikq4jjgbv30"; - }) - (fetchNuGet { - name = "System.Memory"; - version = "4.5.1"; - sha256 = "0f07d7hny38lq9w69wx4lxkn4wszrqf9m9js6fh9is645csm167c"; - }) - (fetchNuGet { - name = "System.Memory"; - version = "4.5.3"; - sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; - }) - (fetchNuGet { - name = "System.Memory"; - version = "4.5.4"; - sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; - }) - (fetchNuGet { - name = "System.Net.Http"; - version = "4.1.0"; - sha256 = "1i5rqij1icg05j8rrkw4gd4pgia1978mqhjzhsjg69lvwcdfg8yb"; - }) - (fetchNuGet { - name = "System.Net.Http"; - version = "4.3.0"; - sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; - }) - (fetchNuGet { - name = "System.Net.NameResolution"; - version = "4.3.0"; - sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; - }) - (fetchNuGet { - name = "System.Net.Primitives"; - version = "4.0.11"; - sha256 = "10xzzaynkzkakp7jai1ik3r805zrqjxiz7vcagchyxs2v26a516r"; - }) - (fetchNuGet { - name = "System.Net.Primitives"; - version = "4.3.0"; - sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; - }) - (fetchNuGet { - name = "System.Net.Sockets"; - version = "4.1.0"; - sha256 = "1385fvh8h29da5hh58jm1v78fzi9fi5vj93vhlm2kvqpfahvpqls"; - }) - (fetchNuGet { - name = "System.Net.Sockets"; - version = "4.3.0"; - sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; - }) - (fetchNuGet { - name = "System.Net.WebSockets.WebSocketProtocol"; - version = "4.5.3"; - sha256 = "0z9ccndkkq6gpsh35q3pjm4zya47p6vakcyj8nc352g4wiizqc8c"; - }) - (fetchNuGet { - name = "System.Numerics.Vectors"; - version = "4.5.0"; - sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; - }) - (fetchNuGet { - name = "System.ObjectModel"; - version = "4.0.12"; - sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; - }) - (fetchNuGet { - name = "System.ObjectModel"; - version = "4.3.0"; - sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; - }) - (fetchNuGet { - name = "System.Private.Uri"; - version = "4.3.0"; - sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; - }) - (fetchNuGet { - name = "System.Reflection"; - version = "4.1.0"; - sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; - }) - (fetchNuGet { - name = "System.Reflection"; - version = "4.3.0"; - sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; - }) - (fetchNuGet { - name = "System.Reflection.Emit"; - version = "4.0.1"; - sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; - }) - (fetchNuGet { - name = "System.Reflection.Emit"; - version = "4.3.0"; - sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; - }) - (fetchNuGet { - name = "System.Reflection.Emit.ILGeneration"; - version = "4.0.1"; - sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0"; - }) - (fetchNuGet { - name = "System.Reflection.Emit.ILGeneration"; - version = "4.3.0"; - sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; - }) - (fetchNuGet { - name = "System.Reflection.Emit.Lightweight"; - version = "4.0.1"; - sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr"; - }) - (fetchNuGet { - name = "System.Reflection.Emit.Lightweight"; - version = "4.3.0"; - sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; - }) - (fetchNuGet { - name = "System.Reflection.Extensions"; - version = "4.0.1"; - sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; - }) - (fetchNuGet { - name = "System.Reflection.Extensions"; - version = "4.3.0"; - sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; - }) - (fetchNuGet { - name = "System.Reflection.Metadata"; - version = "1.4.2"; - sha256 = "08b7b43vczlliv8k7q43jinjfrxwpljsglw7sxmc6sd7d54pd1vi"; - }) - (fetchNuGet { - name = "System.Reflection.Metadata"; - version = "1.6.0"; - sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; - }) - (fetchNuGet { - name = "System.Reflection.Primitives"; - version = "4.0.1"; - sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; - }) - (fetchNuGet { - name = "System.Reflection.Primitives"; - version = "4.3.0"; - sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; - }) - (fetchNuGet { - name = "System.Reflection.TypeExtensions"; - version = "4.1.0"; - sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; - }) - (fetchNuGet { - name = "System.Reflection.TypeExtensions"; - version = "4.3.0"; - sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; - }) - (fetchNuGet { - name = "System.Resources.ResourceManager"; - version = "4.0.1"; - sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; - }) - (fetchNuGet { - name = "System.Resources.ResourceManager"; - version = "4.3.0"; - sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; - }) - (fetchNuGet { - name = "System.Runtime"; - version = "4.1.0"; - sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; - }) - (fetchNuGet { - name = "System.Runtime"; - version = "4.3.0"; - sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; - }) - (fetchNuGet { - name = "System.Runtime"; - version = "4.3.1"; - sha256 = "03ch4d2acf6q037a4njxpll2kkx3dwzlg07yxr4z5m6j1kqgmm27"; - }) - (fetchNuGet { - name = "System.Runtime.CompilerServices.Unsafe"; - version = "4.4.0"; - sha256 = "0a6ahgi5b148sl5qyfpyw383p3cb4yrkm802k29fsi4mxkiwir29"; - }) - (fetchNuGet { - name = "System.Runtime.CompilerServices.Unsafe"; - version = "4.5.0"; - sha256 = "17labczwqk3jng3kkky73m0jhi8wc21vbl7cz5c0hj2p1dswin43"; - }) - (fetchNuGet { - name = "System.Runtime.CompilerServices.Unsafe"; - version = "4.5.1"; - sha256 = "1xcrjx5fwg284qdnxyi2d0lzdm5q4frlpkp0nf6vvkx1kdz2prrf"; - }) - (fetchNuGet { - name = "System.Runtime.Extensions"; - version = "4.1.0"; - sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; - }) - (fetchNuGet { - name = "System.Runtime.Extensions"; - version = "4.3.0"; - sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; - }) - (fetchNuGet { - name = "System.Runtime.Handles"; - version = "4.0.1"; - sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; - }) - (fetchNuGet { - name = "System.Runtime.Handles"; - version = "4.3.0"; - sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; - }) - (fetchNuGet { - name = "System.Runtime.InteropServices"; - version = "4.1.0"; - sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; - }) - (fetchNuGet { - name = "System.Runtime.InteropServices"; - version = "4.3.0"; - sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; - }) - (fetchNuGet { - name = "System.Runtime.InteropServices.RuntimeInformation"; - version = "4.0.0"; - sha256 = "0glmvarf3jz5xh22iy3w9v3wyragcm4hfdr17v90vs7vcrm7fgp6"; - }) - (fetchNuGet { - name = "System.Runtime.InteropServices.RuntimeInformation"; - version = "4.3.0"; - sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; - }) - (fetchNuGet { - name = "System.Runtime.Numerics"; - version = "4.0.1"; - sha256 = "1y308zfvy0l5nrn46mqqr4wb4z1xk758pkk8svbz8b5ij7jnv4nn"; - }) - (fetchNuGet { - name = "System.Runtime.Numerics"; - version = "4.3.0"; - sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; - }) - (fetchNuGet { - name = "System.Runtime.Serialization.Formatters"; - version = "4.3.0"; - sha256 = "114j35n8gcvn3sqv9ar36r1jjq0y1yws9r0yk8i6wm4aq7n9rs0m"; - }) - (fetchNuGet { - name = "System.Runtime.Serialization.Primitives"; - version = "4.1.1"; - sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; - }) - (fetchNuGet { - name = "System.Runtime.Serialization.Primitives"; - version = "4.3.0"; - sha256 = "01vv2p8h4hsz217xxs0rixvb7f2xzbh6wv1gzbfykcbfrza6dvnf"; - }) - (fetchNuGet { - name = "System.Security.AccessControl"; - version = "4.5.0"; - sha256 = "1wvwanz33fzzbnd2jalar0p0z3x0ba53vzx1kazlskp7pwyhlnq0"; - }) - (fetchNuGet { - name = "System.Security.Claims"; - version = "4.3.0"; - sha256 = "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn"; - }) - (fetchNuGet { - name = "System.Security.Cryptography.Algorithms"; - version = "4.2.0"; - sha256 = "148s9g5dgm33ri7dnh19s4lgnlxbpwvrw2jnzllq2kijj4i4vs85"; - }) - (fetchNuGet { - name = "System.Security.Cryptography.Algorithms"; - version = "4.3.0"; - sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; - }) - (fetchNuGet { - name = "System.Security.Cryptography.Cng"; - version = "4.2.0"; - sha256 = "118jijz446kix20blxip0f0q8mhsh9bz118mwc2ch1p6g7facpzc"; - }) - (fetchNuGet { - name = "System.Security.Cryptography.Cng"; - version = "4.3.0"; - sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; - }) - (fetchNuGet { - name = "System.Security.Cryptography.Cng"; - version = "4.5.0"; - sha256 = "1pm4ykbcz48f1hdmwpia432ha6qbb9kbrxrrp7cg3m8q8xn52ngn"; - }) - (fetchNuGet { - name = "System.Security.Cryptography.Csp"; - version = "4.0.0"; - sha256 = "1cwv8lqj8r15q81d2pz2jwzzbaji0l28xfrpw29kdpsaypm92z2q"; - }) - (fetchNuGet { - name = "System.Security.Cryptography.Csp"; - version = "4.3.0"; - sha256 = "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"; - }) - (fetchNuGet { - name = "System.Security.Cryptography.Encoding"; - version = "4.0.0"; - sha256 = "0a8y1a5wkmpawc787gfmnrnbzdgxmx1a14ax43jf3rj9gxmy3vk4"; - }) - (fetchNuGet { - name = "System.Security.Cryptography.Encoding"; - version = "4.3.0"; - sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; - }) - (fetchNuGet { - name = "System.Security.Cryptography.OpenSsl"; - version = "4.0.0"; - sha256 = "16sx3cig3d0ilvzl8xxgffmxbiqx87zdi8fc73i3i7zjih1a7f4q"; - }) - (fetchNuGet { - name = "System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; - }) - (fetchNuGet { - name = "System.Security.Cryptography.Pkcs"; - version = "4.5.0"; - sha256 = "16dhiz2qypk289dxiqa9rb7jmslnami6bykalv5dvbd8j91zikpy"; - }) - (fetchNuGet { - name = "System.Security.Cryptography.Primitives"; - version = "4.0.0"; - sha256 = "0i7cfnwph9a10bm26m538h5xcr8b36jscp9sy1zhgifksxz4yixh"; - }) - (fetchNuGet { - name = "System.Security.Cryptography.Primitives"; - version = "4.3.0"; - sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; - }) - (fetchNuGet { - name = "System.Security.Cryptography.X509Certificates"; - version = "4.1.0"; - sha256 = "0clg1bv55mfv5dq00m19cp634zx6inm31kf8ppbq1jgyjf2185dh"; - }) - (fetchNuGet { - name = "System.Security.Cryptography.X509Certificates"; - version = "4.3.0"; - sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; - }) - (fetchNuGet { - name = "System.Security.Cryptography.Xml"; - version = "4.5.0"; - sha256 = "1rk40x0msf9k7sxnjyizagjns1z25dh3cf22bx6hsx6vhf0sk08l"; - }) - (fetchNuGet { - name = "System.Security.Permissions"; - version = "4.5.0"; - sha256 = "192ww5rm3c9mirxgl1nzyrwd18am3izqls0hzm0fvcdjl5grvbhm"; - }) - (fetchNuGet { - name = "System.Security.Principal"; - version = "4.3.0"; - sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; - }) - (fetchNuGet { - name = "System.Security.Principal.Windows"; - version = "4.3.0"; - sha256 = "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr"; - }) - (fetchNuGet { - name = "System.Security.Principal.Windows"; - version = "4.5.0"; - sha256 = "0rmj89wsl5yzwh0kqjgx45vzf694v9p92r4x4q6yxldk1cv1hi86"; - }) - (fetchNuGet { - name = "System.Text.Encoding"; - version = "4.0.11"; - sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; - }) - (fetchNuGet { - name = "System.Text.Encoding"; - version = "4.3.0"; - sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; - }) - (fetchNuGet { - name = "System.Text.Encoding.CodePages"; - version = "4.3.0"; - sha256 = "0lgxg1gn7pg7j0f942pfdc9q7wamzxsgq3ng248ikdasxz0iadkv"; - }) - (fetchNuGet { - name = "System.Text.Encoding.CodePages"; - version = "4.7.1"; - sha256 = "1y1hdap9qbl7vp74j8s9zcbh3v1rnrrvcc55wj1hl6has2v3qh1r"; - }) - (fetchNuGet { - name = "System.Text.Encoding.CodePages"; - version = "5.0.0"; - sha256 = "1bn2pzaaq4wx9ixirr8151vm5hynn3lmrljcgjx9yghmm4k677k0"; - }) - (fetchNuGet { - name = "System.Text.Encoding.Extensions"; - version = "4.0.11"; - sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; - }) - (fetchNuGet { - name = "System.Text.Encoding.Extensions"; - version = "4.3.0"; - sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; - }) - (fetchNuGet { - name = "System.Text.Encodings.Web"; - version = "4.5.0"; - sha256 = "0srd5bva52n92i90wd88pzrqjsxnfgka3ilybwh7s6sf469y5s53"; - }) - (fetchNuGet { - name = "System.Text.Json"; - version = "5.0.1"; - sha256 = "1j7via4spxy73ipng754wdz1nb882gsb9qh26jqlql66vzbbm3j3"; - }) - (fetchNuGet { - name = "System.Text.RegularExpressions"; - version = "4.1.0"; - sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; - }) - (fetchNuGet { - name = "System.Text.RegularExpressions"; - version = "4.3.0"; - sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; - }) - (fetchNuGet { - name = "System.Threading"; - version = "4.0.11"; - sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; - }) - (fetchNuGet { - name = "System.Threading"; - version = "4.3.0"; - sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; - }) - (fetchNuGet { - name = "System.Threading.Tasks"; - version = "4.0.11"; - sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; - }) - (fetchNuGet { - name = "System.Threading.Tasks"; - version = "4.3.0"; - sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; - }) - (fetchNuGet { - name = "System.Threading.Tasks.Dataflow"; - version = "5.0.0"; - sha256 = "028fimgwn5j9fv6m547c975a8b90d9qcnb89k5crjyspsnjcqbhy"; - }) - (fetchNuGet { - name = "System.Threading.Tasks.Extensions"; - version = "4.0.0"; - sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; - }) - (fetchNuGet { - name = "System.Threading.Tasks.Extensions"; - version = "4.3.0"; - sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; - }) - (fetchNuGet { - name = "System.Threading.Tasks.Extensions"; - version = "4.5.1"; - sha256 = "1ikrplvw4m6pzjbq3bfbpr572n4i9mni577zvmrkaygvx85q3myw"; - }) - (fetchNuGet { - name = "System.Threading.Tasks.Parallel"; - version = "4.3.0"; - sha256 = "1rr3qa4hxwyj531s4nb3bwrxnxxwz617i0n9gh6x7nr7dd3ayzgh"; - }) - (fetchNuGet { - name = "System.Threading.Thread"; - version = "4.3.0"; - sha256 = "0y2xiwdfcph7znm2ysxanrhbqqss6a3shi1z3c779pj2s523mjx4"; - }) - (fetchNuGet { - name = "System.Threading.ThreadPool"; - version = "4.3.0"; - sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; - }) - (fetchNuGet { - name = "System.Threading.Timer"; - version = "4.0.1"; - sha256 = "15n54f1f8nn3mjcjrlzdg6q3520571y012mx7v991x2fvp73lmg6"; - }) - (fetchNuGet { - name = "System.Threading.Timer"; - version = "4.3.0"; - sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; - }) - (fetchNuGet { - name = "System.ValueTuple"; - version = "4.3.0"; - sha256 = "1227k7fxbxapq7dms4lvwwjdf3pr1jcsmhy2nzzhj6g6hs530hxn"; - }) - (fetchNuGet { - name = "System.Xml.ReaderWriter"; - version = "4.0.11"; - sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; - }) - (fetchNuGet { - name = "System.Xml.ReaderWriter"; - version = "4.3.0"; - sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; - }) - (fetchNuGet { - name = "System.Xml.XDocument"; - version = "4.0.11"; - sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; - }) - (fetchNuGet { - name = "System.Xml.XDocument"; - version = "4.3.0"; - sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; - }) - (fetchNuGet { - name = "System.Xml.XmlDocument"; - version = "4.3.0"; - sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi"; - }) - (fetchNuGet { - name = "System.Xml.XPath"; - version = "4.3.0"; - sha256 = "1cv2m0p70774a0sd1zxc8fm8jk3i5zk2bla3riqvi8gsm0r4kpci"; - }) - (fetchNuGet { - name = "System.Xml.XPath.XDocument"; - version = "4.3.0"; - sha256 = "1wxckyb7n1pi433xzz0qcwcbl1swpra64065mbwwi8dhdc4kiabn"; - }) - (fetchNuGet { - name = "TagLibSharp"; - version = "2.2.0"; - sha256 = "0jb0f84p4jd59ha36spyk9q08g6fjap3xywq32rcs2xwzhhqiq0y"; - }) - (fetchNuGet { - name = "TMDbLib"; - version = "1.7.3-alpha"; - sha256 = "1dfk646w1mn2yj0ali7dcanxqs8q3njprzpw0n2v8wgd53jpava1"; - }) - (fetchNuGet { - name = "TvDbSharper"; - version = "3.2.2"; - sha256 = "0dkxcb7745y7wy8sdg7xic5idwwdmnp7k0x8v05f6s075a8m7nqz"; - }) - (fetchNuGet { - name = "UTF.Unknown"; - version = "2.3.0"; - sha256 = "067hw460y36sfcpdfaw8lirn1hn2g4fvkpnih41nighzvmq1ixzf"; - }) + (fetchNuGet { name = "BDInfo"; version = "0.7.6.1"; sha256 = "06qhssvd4iicssl9wv7921g3ss6y2s6g9zhf1svgcm8ffs52i38i"; }) + (fetchNuGet { name = "BlurHashSharp"; version = "1.1.1"; sha256 = "1fbpg9935pfpr93vywxjdxqzjv1c7v3z86ylzh5n2krxm5jygzrv"; }) + (fetchNuGet { name = "BlurHashSharp.SkiaSharp"; version = "1.1.1"; sha256 = "11ljrrph0kkw2qfxyza9xfzmh6aspbx5iv0pvk4ms0hyzxh1mas0"; }) + (fetchNuGet { name = "CommandLineParser"; version = "2.8.0"; sha256 = "1m32xyilv2b7k55jy8ddg08c20glbcj2yi545kxs9hj2ahanhrbb"; }) + (fetchNuGet { name = "DotNet.Glob"; version = "3.1.0"; sha256 = "11rvhb7y420yadah3j8by5xc7ad2ks2bqyhn4aa10m3xb6hiza0i"; }) + (fetchNuGet { name = "Humanizer.Core"; version = "2.8.26"; sha256 = "1v8xd12yms4qq1md4vh6faxicmqrvahqdd7sdkyzrphab9v44nsm"; }) + (fetchNuGet { name = "Jellyfin.XmlTv"; version = "10.6.2"; sha256 = "0ngxjl6d99hzccdbisgwf84w27j2fvjxr05awkirvm6nzvbgq16a"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Antiforgery"; version = "2.2.0"; sha256 = "026wjdwjx0lgccqv0xi5gxylxzgz5ifgxf25p5pqakgrhkz0a59l"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "5.0.5"; sha256 = "026m19pddhkx5idwpi6mp1yl9yfcfgm2qjp1jh54mdja1d7ng0vk"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Authentication"; version = "2.2.0"; sha256 = "0yqfzd0qq5ypmk6b9gnb1yscl75fxx9frq808cxs70ay7y7jqmgn"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Authentication.Abstractions"; version = "2.2.0"; sha256 = "0vj7fhpk0d95nkkxz4q0rma6pb4ym96mx6nms4603y0l19h0k5yh"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Authentication.Core"; version = "2.2.0"; sha256 = "1wgn45fmdi7dk9cl4cdhzgqc9mdxhfw7zg8zwns3j7qgrhlv6k8h"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Authorization"; version = "5.0.3"; sha256 = "0cffsksaaxndmryb3m1bhli1iihq1wc69dinpxzrdwhw8s2bmfxw"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Authorization.Policy"; version = "2.2.0"; sha256 = "1d1zh65kfjf81j21ssmhr465vx08bra8424vgnrb22gdx03mhwd2"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Connections.Abstractions"; version = "2.2.0"; sha256 = "1rl94r8b0zq14f3dhfnvfjj1ivr81iw9zh5kdgs3zkdv0xc9x21j"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Cors"; version = "2.2.0"; sha256 = "0qskbz87i74kfbklxqfyqaccyba21kkx2lcdfa54kxj9r8daq7sc"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Cryptography.Internal"; version = "2.2.0"; sha256 = "01lg2fx85b47ldgdrhs6clsivj35x54xwc9r5xk3f1v8rr3gycsv"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.DataProtection"; version = "2.2.0"; sha256 = "09lzbp084xxy1xxfbxpqdff8phv2pzd1n5v30xfm03hhl7a038gx"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.DataProtection.Abstractions"; version = "2.2.0"; sha256 = "1gi4hpssmrrdf5lm6idkhvqbfy12bx14976y4gbhmx9z8lxaqcfz"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Diagnostics.Abstractions"; version = "2.2.0"; sha256 = "061cdhjh5w2f1frhimcgk68vx8p743jb9h4qik3lm1c734r0drm0"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Hosting"; version = "2.2.7"; sha256 = "0pr4kmzlj3rmylxqg6dw2ph8a8sl2m2k630z1qy21kddsb4ac849"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Hosting.Abstractions"; version = "2.2.0"; sha256 = "043k651vbfshh3s997x42ymj8nb32419m7q3sjw5q2c27anrhfhv"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Hosting.Server.Abstractions"; version = "2.2.0"; sha256 = "0nz73bwrvhc1n7gd7xxm3p5ww2wx9qr9m9i43y20gh0c54adkygh"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Html.Abstractions"; version = "2.2.0"; sha256 = "1z5lkzb9h9wprvyxyjw4fj7bjypaibsw0cj4bz769hf0abjz8y1v"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Http"; version = "2.2.0"; sha256 = "1fcrafpa57sab3as18idqknzlxkx49n4sxzlzik3sj6pcji5j17q"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Http"; version = "2.2.2"; sha256 = "09mgjvpqdyylz9dbngql9arx46lfkiczjdf7aqr9asd5vjqlv2c8"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Http.Abstractions"; version = "2.2.0"; sha256 = "13s8cm6jdpydxmr0rgmzrmnp1v2r7i3rs7v9fhabk5spixdgfy6b"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Http.Extensions"; version = "2.2.0"; sha256 = "118gp1mfb8ymcvw87fzgjqwlc1d1b0l0sbfki291ydg414cz3dfn"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Http.Features"; version = "2.2.0"; sha256 = "0xrlq8i61vzhzzy25n80m7wh2kn593rfaii3aqnxdsxsg6sfgnx1"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.JsonPatch"; version = "2.2.0"; sha256 = "07cihb5sqkavg42nvircdwjp0b67mhrla97jgx285zdjphplg4h2"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Localization"; version = "2.2.0"; sha256 = "08knc70cy7ycid5sbbbzy6my4b7ddj4j760k5xf1qnfb0njxhfh7"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Metadata"; version = "5.0.3"; sha256 = "01v2iaqpzz0h6z3hg1vr67za7d3283gs0wym42zvb9yksg6pf0zi"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Mvc"; version = "2.2.0"; sha256 = "16jrikcywkd4r4jh551p8gxxw6hj3aizdzd5i7agb06gwpgqqv9c"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Mvc.Abstractions"; version = "2.2.0"; sha256 = "09p447ipd19517vy8xx9ykvspn6b4fgbm2rskpmzyw41x9wz4k0b"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Mvc.Analyzers"; version = "2.2.0"; sha256 = "1b975z00bzgh2z5hina4bzfksvc2vgnbzmi8g3q962hspg6ylh9f"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Mvc.ApiExplorer"; version = "2.2.0"; sha256 = "1ryhd1md30fgrli74qv45mhldivbasdvydw0lllg6x6jzpyrkwpa"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Mvc.Core"; version = "2.2.0"; sha256 = "1k6lkgk9zak5sczvyjbwgqnfcwcg9ks74wznqfzck8c6hns1by0m"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Mvc.Cors"; version = "2.2.0"; sha256 = "077vjxn0k5rr4s675g50rzkns6scgijxxh5iib59k77ldwpdr14q"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Mvc.DataAnnotations"; version = "2.2.0"; sha256 = "0vdhdjarh4az7g71gkvmhq6xpvwhh8si3sbrpdwb8p60i94cdyl6"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Mvc.Formatters.Json"; version = "2.2.0"; sha256 = "0421fcf2z8a6z81ql123ili32wbr3x25zpq17xjf4s9fmsr0069a"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Mvc.Localization"; version = "2.2.0"; sha256 = "0d27xirwsr3j7jacsrz6g2r4py35hgzjyy6ak6gkd07cm707wgc6"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Mvc.Razor"; version = "2.2.0"; sha256 = "06fqg7rfyvfj3hdppkhy37ddjff2d6pg7khj6lccs9lwc732yr7q"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Mvc.Razor.Extensions"; version = "2.2.0"; sha256 = "04javqbzv7mkakqjl40j429giaagjj7hmwcljrgj8q1jknk0x9xc"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Mvc.RazorPages"; version = "2.2.0"; sha256 = "0zqyqfxzl3lkqfy9chd0ipani75q3109imlxrnhdfiwmxrd8xqbm"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Mvc.TagHelpers"; version = "2.2.0"; sha256 = "16aprk81sp2i0n0dmp318cm65mk03i58rhpijm4fz4xz51j7z8li"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Mvc.ViewFeatures"; version = "2.2.0"; sha256 = "1isflvb0ff5nfqnvdlyvmszkd42axbbz0xmdaf0d7sah0qkvvi7n"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Razor"; version = "2.2.0"; sha256 = "02ybprvsi59nwa0fdq99jvx7r26bs2bg3xjxkilc495clgg98zp0"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Razor.Design"; version = "2.2.0"; sha256 = "03pcdcbmyw050hag588b7caqilnq3cb6ndq5g6j0r7j7wf3plsn6"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Razor.Language"; version = "2.2.0"; sha256 = "0n58qdipwy5wymfhgm3anickwvnf4svb9ipbrby7ksrhhrkqvx4z"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Razor.Runtime"; version = "2.2.0"; sha256 = "1n9j5hjinm5gp39nwmcf26dwg1psl7sf7xkxnvfxsnl44mbcy695"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.ResponseCaching.Abstractions"; version = "2.2.0"; sha256 = "01sp2i2bgcn6blw1mcvg5nrlc97c9czyawwvgfi6ydzdvs6ang37"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.ResponseCompression"; version = "2.2.0"; sha256 = "0madnk92752alpc7cv2bazqlihhzgl3yj1s9ajhi3w09vg8n8pz4"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Routing"; version = "2.2.0"; sha256 = "12kv602j2rxp43l1v3618yz3pdd7hqc3r98ya0bqz6y2ppvhbyws"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Routing.Abstractions"; version = "2.2.0"; sha256 = "0d9wwz1rsh1fslbv1y72jpkvqv2v9n28rl3vslcg0x74lp2678ly"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Server.Kestrel"; version = "2.2.0"; sha256 = "0wh7hf09i9qxs9r0d5xdcx3qingsid9nxlwcyjg2r44pjs6cg1rf"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Server.Kestrel.Core"; version = "2.2.0"; sha256 = "075ffds8hwp8ps0zf84bsv9pgiaqry9njc403qack701aybci97r"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Server.Kestrel.Https"; version = "2.2.0"; sha256 = "08z447wrbzy3l9lmmas353nr17sg9yccwcg62l9ax9a6n1wvds8c"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions"; version = "2.2.0"; sha256 = "08bj95zy4zszyx1rsy8v2ai9kg4120ij6yi0zillwx3ndb3q7vfb"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets"; version = "2.2.0"; sha256 = "0vhicfnv12sz2c81czdgdlffcgrhnn1jzz9zwy3a9c2n4rn8k9k5"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.WebSockets"; version = "2.2.1"; sha256 = "0gzikr1z2fdz8nzy1m969jsrk2h97ld1hzgmbc6f036qmhiq26hr"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.WebUtilities"; version = "2.2.0"; sha256 = "0cs1g4ing4alfbwyngxzgvkrv7z964isv1j9dzflafda4p0wxmsi"; }) + (fetchNuGet { name = "Microsoft.Build.Tasks.Git"; version = "1.0.0"; sha256 = "0avwja8vk56f2kr2pmrqx3h60bnwbs7ds062lhvhcxv87m5yfqnj"; }) + (fetchNuGet { name = "Microsoft.CodeAnalysis.Analyzers"; version = "1.1.0"; sha256 = "08r667hj2259wbim1p3al5qxkshydykmb7nd9ygbjlg4mmydkapc"; }) + (fetchNuGet { name = "Microsoft.CodeAnalysis.Common"; version = "2.8.0"; sha256 = "0g4h41fs0r8lqh9pk9s4mc1090kdpa6sbxq4rc866s8hnq9s1h4j"; }) + (fetchNuGet { name = "Microsoft.CodeAnalysis.CSharp"; version = "2.8.0"; sha256 = "0p1xvw1h2fmnxywv1j4x6p3rgarpc8mfwfgn0vflk5xfnc961f6w"; }) + (fetchNuGet { name = "Microsoft.CodeAnalysis.FxCopAnalyzers"; version = "2.9.8"; sha256 = "15zv982rln15ds8z2hkpmx04njdg0cmmf1xnb9v1v7cxxf7yxx27"; }) + (fetchNuGet { name = "Microsoft.CodeAnalysis.Razor"; version = "2.2.0"; sha256 = "03cm9danxxnsnmrzfz2swz6zhckkgg6hrz1ycnvnjrbpk3w4v0d6"; }) + (fetchNuGet { name = "Microsoft.CodeAnalysis.VersionCheckAnalyzer"; version = "2.9.8"; sha256 = "19v25694f9l172snrm4qik5gxzlifiyrmf0kk2zasz7hrciw36bl"; }) + (fetchNuGet { name = "Microsoft.CodeQuality.Analyzers"; version = "2.9.8"; sha256 = "17ld069hlpcv4z4ylx6m4rhd398sxd0qd0msadfm0rljlkj6xg83"; }) + (fetchNuGet { name = "Microsoft.CSharp"; version = "4.0.1"; sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; }) + (fetchNuGet { name = "Microsoft.CSharp"; version = "4.3.0"; sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; }) + (fetchNuGet { name = "Microsoft.CSharp"; version = "4.5.0"; sha256 = "01i28nvzccxbqmiz217fxs6hnjwmd5fafs37rd49a6qp53y6623l"; }) + (fetchNuGet { name = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; }) + (fetchNuGet { name = "Microsoft.Data.Sqlite.Core"; version = "5.0.3"; sha256 = "1msj8zn2yfdn5lcny3msqiry94rhs8lkmx1l4pv29mhxggchvidr"; }) + (fetchNuGet { name = "Microsoft.DotNet.PlatformAbstractions"; version = "2.0.4"; sha256 = "1fdzln4im9hb55agzwchbfgm3vmngigmbpci5j89b0gqcxixmv8j"; }) + (fetchNuGet { name = "Microsoft.DotNet.PlatformAbstractions"; version = "2.1.0"; sha256 = "1qydvyyinj3b5mraazjal3n2k7jqhn05b6n1a2f3qjkqkxi63dmy"; }) + (fetchNuGet { name = "Microsoft.DotNet.PlatformAbstractions"; version = "3.1.6"; sha256 = "0b9myd7gqbpaw9pkd2bx45jhik9mwj0f1ss57sk2cxmag2lkdws5"; }) + (fetchNuGet { name = "Microsoft.EntityFrameworkCore"; version = "5.0.3"; sha256 = "1bhkmr15njgyrd57rmvrjdyamj6qm1n8sdrzcgbfyj7wsjav8dmv"; }) + (fetchNuGet { name = "Microsoft.EntityFrameworkCore.Abstractions"; version = "5.0.3"; sha256 = "1h0cxqsmpgd1fc9jd4mm1v89s8zchpmd24ks4j5fjgc3j83nvgg9"; }) + (fetchNuGet { name = "Microsoft.EntityFrameworkCore.Analyzers"; version = "5.0.3"; sha256 = "0mgnw1na94gg4mks7ba9r9cfy3k8vnspi08ryc2i8h91m31dibc2"; }) + (fetchNuGet { name = "Microsoft.EntityFrameworkCore.Design"; version = "5.0.3"; sha256 = "00p9l6ydqg6kmwyqza0dd9q1zfvam7b3hv8b9kafbl590kdxjzl4"; }) + (fetchNuGet { name = "Microsoft.EntityFrameworkCore.Relational"; version = "5.0.3"; sha256 = "11pancjxzx04yvy7h4x4m6hncwl2ijiwsvr9m1sa1cmq53lrrvlk"; }) + (fetchNuGet { name = "Microsoft.EntityFrameworkCore.Sqlite"; version = "5.0.3"; sha256 = "16658n7q2jahk4haljand6j3bmkg718hck4g1piy1j8kx2i6dg7p"; }) + (fetchNuGet { name = "Microsoft.EntityFrameworkCore.Sqlite.Core"; version = "5.0.3"; sha256 = "0ffi0dyrg00891ac15qajrk7mnhwyayi1fdpwjm10zjdxm4nwy26"; }) + (fetchNuGet { name = "Microsoft.EntityFrameworkCore.Tools"; version = "5.0.3"; sha256 = "074v7y4irv34xw16ps8mmjm5pq8gk1fs17kx4sznw9bgkcfrm0hy"; }) + (fetchNuGet { name = "Microsoft.Extensions.ApiDescription.Server"; version = "3.0.0"; sha256 = "13a47xcqyi5gz85swxd4mgp7ndgl4kknrvv3xwmbn71hsh953hsh"; }) + (fetchNuGet { name = "Microsoft.Extensions.Caching.Abstractions"; version = "2.2.0"; sha256 = "0hhxc5dp52faha1bdqw0k426zicsv6x1kfqi30m9agr0b2hixj52"; }) + (fetchNuGet { name = "Microsoft.Extensions.Caching.Abstractions"; version = "5.0.0"; sha256 = "0j83zapqhgqb4v5f6kn891km095pfhvsqha357a86ccclmv2czvb"; }) + (fetchNuGet { name = "Microsoft.Extensions.Caching.Memory"; version = "2.2.0"; sha256 = "0bzrsn5vas86w66bd04xilnlb21nx4l6lz7d3acvy6y8ir2vb5dv"; }) + (fetchNuGet { name = "Microsoft.Extensions.Caching.Memory"; version = "5.0.0"; sha256 = "0l8spndl3kvccjlay202msm31iy5iig0i9ddbsdy92wbcjr97lca"; }) + (fetchNuGet { name = "Microsoft.Extensions.Configuration"; version = "2.0.0"; sha256 = "0yssxq9di5h6xw2cayp5hj3l9b2p0jw9wcjz73rwk4586spac9s9"; }) + (fetchNuGet { name = "Microsoft.Extensions.Configuration"; version = "2.2.0"; sha256 = "02250qrs3jqqbggfvd0mkim82817f79x6jh8fx2i7r58d0m66qkl"; }) + (fetchNuGet { name = "Microsoft.Extensions.Configuration"; version = "3.1.2"; sha256 = "06diq359ac4bf8jlr9msf8mwalk1a85lskkgcd8mcha56l7l7g0r"; }) + (fetchNuGet { name = "Microsoft.Extensions.Configuration"; version = "3.1.6"; sha256 = "0j0zl05n9vv23m2dg4wy6pc39zy09rvnr0ljwh63sa1gski32fhx"; }) + (fetchNuGet { name = "Microsoft.Extensions.Configuration"; version = "5.0.0"; sha256 = "01m9vzlq0vg0lhckj2dimwq42niwny8g3lm13c9a401hlyg90z1p"; }) + (fetchNuGet { name = "Microsoft.Extensions.Configuration.Abstractions"; version = "2.0.0"; sha256 = "1ilz2yrgg9rbjyhn6a5zh9pr51nmh11z7sixb4p7vivgydj9gxwf"; }) + (fetchNuGet { name = "Microsoft.Extensions.Configuration.Abstractions"; version = "2.1.0"; sha256 = "03gzlr3z9j1xnr1k6y91zgxpz3pj27i3zsvjwj7i8jqnlqmk7pxd"; }) + (fetchNuGet { name = "Microsoft.Extensions.Configuration.Abstractions"; version = "2.2.0"; sha256 = "1fv5277hyhfqmc0gqszyqb1ilwnijm8kc9606yia6hwr8pxyg674"; }) + (fetchNuGet { name = "Microsoft.Extensions.Configuration.Abstractions"; version = "3.1.2"; sha256 = "1mfsgiklr4v99bx62z97vnp7y2jbdr9g9gwyyw89xcb67pir0wb9"; }) + (fetchNuGet { name = "Microsoft.Extensions.Configuration.Abstractions"; version = "3.1.6"; sha256 = "1bqp28717rdlygdj7m3srfdbkvx0x6bqs2ply9h2sib87jqxaz9i"; }) + (fetchNuGet { name = "Microsoft.Extensions.Configuration.Abstractions"; version = "5.0.0"; sha256 = "0fqxkc9pjxkqylsdf26s9q21ciyk56h1w33pz3v1v4wcv8yv1v6k"; }) + (fetchNuGet { name = "Microsoft.Extensions.Configuration.Binder"; version = "2.0.0"; sha256 = "1prvdbma6r18n5agbhhabv6g357p1j70gq4m9g0vs859kf44nrgc"; }) + (fetchNuGet { name = "Microsoft.Extensions.Configuration.Binder"; version = "2.2.0"; sha256 = "10qyjdkymdmag3r807kvbnwag4j3nz65i4cwikbd77jjvz92ya3j"; }) + (fetchNuGet { name = "Microsoft.Extensions.Configuration.Binder"; version = "3.1.2"; sha256 = "1jksknhlvgxgys51z0j7pi6c4k8m1iqv3ixp8nhrk24bc8hf04br"; }) + (fetchNuGet { name = "Microsoft.Extensions.Configuration.Binder"; version = "3.1.6"; sha256 = "0lq35v2zqvs9jl7y347nr8qmdghr6xrymmik3b5kndw1zlrflavn"; }) + (fetchNuGet { name = "Microsoft.Extensions.Configuration.Binder"; version = "5.0.0"; sha256 = "0sld0bh2k5kss32i3nf8mwqkjagmw0d1cdfmxm87ckiicwm413a0"; }) + (fetchNuGet { name = "Microsoft.Extensions.Configuration.EnvironmentVariables"; version = "2.2.4"; sha256 = "0i5m7ki5jl4q9fbc0capcjakbh2y55g0zhq7cjs9qw38496rb020"; }) + (fetchNuGet { name = "Microsoft.Extensions.Configuration.EnvironmentVariables"; version = "5.0.0"; sha256 = "03gvckj10ljk1mir9g8cf3cajsnihhvmh8z8341gkr9h5653qkv0"; }) + (fetchNuGet { name = "Microsoft.Extensions.Configuration.FileExtensions"; version = "2.2.0"; sha256 = "0bwk1kh6q259nmnly90j5rbbzi9w5gigq5vyjr31c1br4j8cjmqd"; }) + (fetchNuGet { name = "Microsoft.Extensions.Configuration.FileExtensions"; version = "5.0.0"; sha256 = "1wq229r3xcmm9wh9sqdpvmfv4qpbp2zms9x6xk7g7sbb8h32hnz3"; }) + (fetchNuGet { name = "Microsoft.Extensions.Configuration.Json"; version = "5.0.0"; sha256 = "0hq5i483bjbvprp1la9l3si82x1ydxbvkpfc7r3s7zgxg957fyp9"; }) + (fetchNuGet { name = "Microsoft.Extensions.DependencyInjection"; version = "2.2.0"; sha256 = "0lvv45rvq1xbf47lz818rjydc776zk8mf7svpzh1dml4qwlx9zck"; }) + (fetchNuGet { name = "Microsoft.Extensions.DependencyInjection"; version = "3.1.2"; sha256 = "0z3vdzrnfy838afc2vv4knj2ycab7jni55kdj82p7plfjngv01ic"; }) + (fetchNuGet { name = "Microsoft.Extensions.DependencyInjection"; version = "3.1.6"; sha256 = "0m8b5phfbkx96l92nf0xs3bz6861mhb7i4havxckz7mr81g968l6"; }) + (fetchNuGet { name = "Microsoft.Extensions.DependencyInjection"; version = "5.0.0"; sha256 = "15sdwcyzz0qlybwbdq854bn3jk6kx7awx28gs864c4shhbqkppj4"; }) + (fetchNuGet { name = "Microsoft.Extensions.DependencyInjection"; version = "5.0.1"; sha256 = "06xig49mwyp3b2dvdx98j079ncg6p4c9x8yj4pzs6ppmi3jgaaqk"; }) + (fetchNuGet { name = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "2.0.0"; sha256 = "1pwrfh9b72k9rq6mb2jab5qhhi225d5rjalzkapiayggmygc8nhz"; }) + (fetchNuGet { name = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "2.1.0"; sha256 = "0c0cx8r5xkjpxmcfp51959jnp55qjvq28d9vaslk08avvi1by12s"; }) + (fetchNuGet { name = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "2.2.0"; sha256 = "1jyzfdr9651h3x6pxwhpfbb9mysfh8f8z1jvy4g117h9790r9zx5"; }) + (fetchNuGet { name = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "3.1.2"; sha256 = "0jh1338ai6060k1130by4m0s7jhz8ky7ij9vagrsgnpcl1yc9k70"; }) + (fetchNuGet { name = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "3.1.6"; sha256 = "18mcv1x6b3qlaksmb8q92r34jrv1841la5lmg21qppmb9qs0z293"; }) + (fetchNuGet { name = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "5.0.0"; sha256 = "17cz6s80va0ch0a6nqa1wbbbp3p8sqxb96lj4qcw67ivkp2yxiyj"; }) + (fetchNuGet { name = "Microsoft.Extensions.DependencyModel"; version = "2.0.4"; sha256 = "041i1vlcibpzgalxxzdk81g5pgmqvmz2g61k0rqa2sky0wpvijx9"; }) + (fetchNuGet { name = "Microsoft.Extensions.DependencyModel"; version = "2.1.0"; sha256 = "0dl4qhjgifm6v3jsfzvzkvddyic77ggp9fq49ah661v45gk6ilgd"; }) + (fetchNuGet { name = "Microsoft.Extensions.DependencyModel"; version = "5.0.0"; sha256 = "1mma1zxi0b40972cwfvkj9y0w9r7vjbi74784jzcb22pric00k5x"; }) + (fetchNuGet { name = "Microsoft.Extensions.Diagnostics.HealthChecks"; version = "5.0.3"; sha256 = "0hv4l27bp29gy3rh9cssvvc8xwzy8ffwh277dw870zhv5mm2ha29"; }) + (fetchNuGet { name = "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions"; version = "5.0.3"; sha256 = "1r1xrlgbyfsf0b447lw6lv6jxq339ssrm61klyjmnk1ady05h9di"; }) + (fetchNuGet { name = "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore"; version = "5.0.3"; sha256 = "0q0j75i289yn3bv09dhzfirpb4glqm35wrv7p2463kmbf3g551rr"; }) + (fetchNuGet { name = "Microsoft.Extensions.FileProviders.Abstractions"; version = "2.1.0"; sha256 = "1sxls5f5cgb0wr8cwb05skqmz074683hrhmd3hhq6m5dasnzb8n3"; }) + (fetchNuGet { name = "Microsoft.Extensions.FileProviders.Abstractions"; version = "2.2.0"; sha256 = "1f83ffb4xjwljg8dgzdsa3pa0582q6b4zm0si467fgkybqzk3c54"; }) + (fetchNuGet { name = "Microsoft.Extensions.FileProviders.Abstractions"; version = "5.0.0"; sha256 = "01ahgd0b2z2zycrr2lcsq2cl59fn04bh51hdwdp9dcsdkpvnasj1"; }) + (fetchNuGet { name = "Microsoft.Extensions.FileProviders.Composite"; version = "2.2.0"; sha256 = "0k3qfxb0pn9b63grbf9jv7xw40gk6m1djmi3c4inwys7lxcj2k18"; }) + (fetchNuGet { name = "Microsoft.Extensions.FileProviders.Physical"; version = "2.2.0"; sha256 = "0lrq4bxf67pw6n9kzwzqsnxkad2ygh2zn46hjias8j7aqljglh7x"; }) + (fetchNuGet { name = "Microsoft.Extensions.FileProviders.Physical"; version = "5.0.0"; sha256 = "00vii8148a6pk12l9jl0rhjp7apil5q5qcy7v1smnv17lj4p8szd"; }) + (fetchNuGet { name = "Microsoft.Extensions.FileSystemGlobbing"; version = "2.2.0"; sha256 = "01jw7s1nb44n65qs3rk7xdzc419qwl0s5c34k031f1cc5ag3jvc2"; }) + (fetchNuGet { name = "Microsoft.Extensions.FileSystemGlobbing"; version = "5.0.0"; sha256 = "0lm6n9vbyjh0l17qcc2y9qwn1cns3dyjmkvbxjp0g9sll32kjpmb"; }) + (fetchNuGet { name = "Microsoft.Extensions.Hosting.Abstractions"; version = "2.1.0"; sha256 = "04vm9mdjjzg3lpp2rzpgkpn8h5bzdl3bwcr22lshd3kp602ws4k9"; }) + (fetchNuGet { name = "Microsoft.Extensions.Hosting.Abstractions"; version = "2.2.0"; sha256 = "1xc7xr1nq7akfahyl5in9iyxrygap2xi9nxh39rfm37sf8lk55v1"; }) + (fetchNuGet { name = "Microsoft.Extensions.Hosting.Abstractions"; version = "5.0.0"; sha256 = "1k28hndmm8ky7sr2j5agdz9lls25mbb08dkypka0b76x5f4hplb5"; }) + (fetchNuGet { name = "Microsoft.Extensions.Http"; version = "3.1.6"; sha256 = "04ggi7vdx7h5622y1y7xcls6lij880jn9b2xgg73rwrq6bcadj6q"; }) + (fetchNuGet { name = "Microsoft.Extensions.Http"; version = "5.0.0"; sha256 = "1sx2w6s2giavi3i1wbpa64h1v1xhk5afz3whh7rxhb9fmsn9h1bk"; }) + (fetchNuGet { name = "Microsoft.Extensions.Localization"; version = "2.2.0"; sha256 = "1k73kk5qmrvdyd7l8qxp19crw18f2p5dgk3cjx59g7vf3rkgmc6k"; }) + (fetchNuGet { name = "Microsoft.Extensions.Localization.Abstractions"; version = "2.2.0"; sha256 = "1yzqs5x97rj6wlg0rylj0xi3dn1bw4ps26zdqsijx621jl1r97gy"; }) + (fetchNuGet { name = "Microsoft.Extensions.Logging"; version = "2.2.0"; sha256 = "0bx3ljyvvcbikradq2h583rl72h8bxdz33aghk026cxzpv2mm3wm"; }) + (fetchNuGet { name = "Microsoft.Extensions.Logging"; version = "3.1.2"; sha256 = "0yh4zbyvm24alrcblcbm0sp7l9ys5ypcxs7l772yj7fdpk0bx3ap"; }) + (fetchNuGet { name = "Microsoft.Extensions.Logging"; version = "3.1.6"; sha256 = "0brzknkxlalpb1a8m371nmkmpfjf1q3p8x6nls5ylh0w7midxxgp"; }) + (fetchNuGet { name = "Microsoft.Extensions.Logging"; version = "5.0.0"; sha256 = "1qa1l18q2jh9azya8gv1p8anzcdirjzd9dxxisb4911i9m1648i3"; }) + (fetchNuGet { name = "Microsoft.Extensions.Logging.Abstractions"; version = "2.1.0"; sha256 = "1gvgif1wcx4k6pv7gc00qv1hid945jdywy1s50s33q0hfd91hbnj"; }) + (fetchNuGet { name = "Microsoft.Extensions.Logging.Abstractions"; version = "2.2.0"; sha256 = "02w7hp6jicr7cl5p456k2cmrjvvhm6spg5kxnlncw3b72358m5wl"; }) + (fetchNuGet { name = "Microsoft.Extensions.Logging.Abstractions"; version = "3.1.2"; sha256 = "0givwc5dnz1wm9aa0sfxi4mjws6v9c8v5i5772yg1r4w1wvn3733"; }) + (fetchNuGet { name = "Microsoft.Extensions.Logging.Abstractions"; version = "3.1.6"; sha256 = "16pk17a3hh0j431a5f7d663iqk1j6n3wjlzk6chmvnfk3dpwfhww"; }) + (fetchNuGet { name = "Microsoft.Extensions.Logging.Abstractions"; version = "5.0.0"; sha256 = "1yza38675dbv1qqnnhqm23alv2bbaqxp0pb7zinjmw8j2mr5r6wc"; }) + (fetchNuGet { name = "Microsoft.Extensions.ObjectPool"; version = "2.2.0"; sha256 = "0n1q9lvc24ii1shzy575xldgmz7imnk4dswwwcgmzz93klri9r1z"; }) + (fetchNuGet { name = "Microsoft.Extensions.Options"; version = "2.0.0"; sha256 = "0g4zadlg73f507krilhaaa7h0jdga216syrzjlyf5fdk25gxmjqh"; }) + (fetchNuGet { name = "Microsoft.Extensions.Options"; version = "2.2.0"; sha256 = "1b20yh03fg4nmmi3vlf6gf13vrdkmklshfzl3ijygcs4c2hly6v0"; }) + (fetchNuGet { name = "Microsoft.Extensions.Options"; version = "3.1.2"; sha256 = "005f42rq6n2v5cakqi51266g26dkjc6nsqdd6w62pxvv6g6kp9km"; }) + (fetchNuGet { name = "Microsoft.Extensions.Options"; version = "3.1.6"; sha256 = "1rdi0pcpcmhvwkn7mxymrpav9q2c4frxhl99ps961mmh1i5738sc"; }) + (fetchNuGet { name = "Microsoft.Extensions.Options"; version = "5.0.0"; sha256 = "1rdmgpg770x8qwaaa6ryc27zh93p697fcyvn5vkxp0wimlhqkbay"; }) + (fetchNuGet { name = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "2.0.0"; sha256 = "1isc3rjbzz60f7wbmgcwslx5d10hm5hisnk7v54vfi2bz7132gll"; }) + (fetchNuGet { name = "Microsoft.Extensions.Primitives"; version = "2.0.0"; sha256 = "1xppr5jbny04slyjgngxjdm0maxdh47vq481ps944d7jrfs0p3mb"; }) + (fetchNuGet { name = "Microsoft.Extensions.Primitives"; version = "2.1.0"; sha256 = "1r9gzwdfmb8ysnc4nzmyz5cyar1lw0qmizsvrsh252nhlyg06nmb"; }) + (fetchNuGet { name = "Microsoft.Extensions.Primitives"; version = "2.2.0"; sha256 = "0znah6arbcqari49ymigg3wiy2hgdifz8zsq8vdc3ynnf45r7h0c"; }) + (fetchNuGet { name = "Microsoft.Extensions.Primitives"; version = "3.1.2"; sha256 = "04hdb7rd59frgb5ym0sfwc5r67jj6vykcbxljzs8909f8hrs98jb"; }) + (fetchNuGet { name = "Microsoft.Extensions.Primitives"; version = "3.1.6"; sha256 = "1acl88cph3yqcjz7ami5hzdr69cvxvry24a6r6fmrwnzfcc1i40n"; }) + (fetchNuGet { name = "Microsoft.Extensions.Primitives"; version = "5.0.0"; sha256 = "0swqcknyh87ns82w539z1mvy804pfwhgzs97cr3nwqk6g5s42gd6"; }) + (fetchNuGet { name = "Microsoft.Extensions.WebEncoders"; version = "2.2.0"; sha256 = "1mhnichccw6mjf37d38q2i1kr7qp485m7apa1b872ji0q16yy1y3"; }) + (fetchNuGet { name = "Microsoft.NetCore.Analyzers"; version = "2.9.8"; sha256 = "1klybsdy9yw49zlpmix4vjdhmfaibg5h9yx03vszdnijzap7vpsx"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "5.0.5"; sha256 = "1h5yry6k9bpqqis2fb1901csb8kipm7anm174fjj41r317vzfjfa"; }) + (fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) + (fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) + (fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "1.1.1"; sha256 = "164wycgng4mi9zqi2pnsf1pq6gccbqvw6ib916mqizgjmd8f44pj"; }) + (fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "2.0.0"; sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; }) + (fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "3.1.1"; sha256 = "05hmaygd5131rnqi6ipv7agsbpi7ka18779vw45iw6b385l7n987"; }) + (fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) + (fetchNuGet { name = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; }) + (fetchNuGet { name = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) + (fetchNuGet { name = "Microsoft.NETCore.Targets"; version = "1.1.3"; sha256 = "05smkcyxir59rgrmp7d6327vvrlacdgldfxhmyr1azclvga1zfsq"; }) + (fetchNuGet { name = "Microsoft.NetFramework.Analyzers"; version = "2.9.8"; sha256 = "0mb3gkqcr13ryphrzax40cf05bz0h269a6zm1hnzzsq7gbd5iipb"; }) + (fetchNuGet { name = "Microsoft.Net.Http.Headers"; version = "2.2.0"; sha256 = "0w6lrk9z67bcirq2cj2ldfhnizc6id77ba6i30hjzgqjlyhh1gx5"; }) + (fetchNuGet { name = "Microsoft.Net.Http.Headers"; version = "2.2.8"; sha256 = "1s0n68z6v5mbys4jjrd4jdxrrz81iq4dzmmbmxzmlf59769x8rj9"; }) + (fetchNuGet { name = "Microsoft.OpenApi"; version = "1.2.3"; sha256 = "07b19k89whj69j87afkz86gp9b3iybw8jqwvlgcn43m7fb2y99rr"; }) + (fetchNuGet { name = "Microsoft.SourceLink.Common"; version = "1.0.0"; sha256 = "1zxkpx01zdv17c39iiy8fx25ran89n14qwddh1f140v1s4dn8z9c"; }) + (fetchNuGet { name = "Microsoft.SourceLink.GitHub"; version = "1.0.0"; sha256 = "029ixyaqn48cjza87m5qf0g1ynyhlm6irgbx1n09src9g666yhpd"; }) + (fetchNuGet { name = "Microsoft.Win32.Primitives"; version = "4.0.1"; sha256 = "1n8ap0cmljbqskxpf8fjzn7kh1vvlndsa75k01qig26mbw97k2q7"; }) + (fetchNuGet { name = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) + (fetchNuGet { name = "Microsoft.Win32.Registry"; version = "4.5.0"; sha256 = "1zapbz161ji8h82xiajgriq6zgzmb1f3ar517p2h63plhsq5gh2q"; }) + (fetchNuGet { name = "Mono.Nat"; version = "3.0.1"; sha256 = "1xy3c9wsiz8k3rx8v60y6gnps337rsb5jpyj0r6g384prg6z4vh0"; }) + (fetchNuGet { name = "NETStandard.Library"; version = "1.6.0"; sha256 = "0nmmv4yw7gw04ik8ialj3ak0j6pxa9spih67hnn1h2c38ba8h58k"; }) + (fetchNuGet { name = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) + (fetchNuGet { name = "Newtonsoft.Json"; version = "10.0.1"; sha256 = "15ncqic3p2rzs8q8ppi0irl2miq75kilw4lh8yfgjq96id0ds3hv"; }) + (fetchNuGet { name = "Newtonsoft.Json"; version = "11.0.2"; sha256 = "1784xi44f4k8v1fr696hsccmwpy94bz7kixxqlri98zhcxn406b2"; }) + (fetchNuGet { name = "Newtonsoft.Json"; version = "12.0.2"; sha256 = "0w2fbji1smd2y7x25qqibf1qrznmv4s6s0jvrbvr6alb7mfyqvh5"; }) + (fetchNuGet { name = "Newtonsoft.Json"; version = "12.0.3"; sha256 = "17dzl305d835mzign8r15vkmav2hq8l6g7942dfjpnzr17wwl89x"; }) + (fetchNuGet { name = "Newtonsoft.Json"; version = "9.0.1"; sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; }) + (fetchNuGet { name = "Newtonsoft.Json.Bson"; version = "1.0.1"; sha256 = "1r1hvj5gjl466bya2bfl5aaj8rbwyf5x1msg710wf3k2llbci1xa"; }) + (fetchNuGet { name = "OptimizedPriorityQueue"; version = "5.0.0"; sha256 = "0a0kn4sr80yx1bm5nngbillfbcafv86hqxwp5kxjgh3wcd01c803"; }) + (fetchNuGet { name = "PlaylistsNET"; version = "1.1.3"; sha256 = "092lgqvvarx6g8mrhm8rdzcqisklzffa0i3gkpc0zbk7b7b0f8yg"; }) + (fetchNuGet { name = "prometheus-net"; version = "3.1.2"; sha256 = "1jyxvl9cqxvb71mpaglw8aks27i69hg7yzrdwsjc182nmmhh1p03"; }) + (fetchNuGet { name = "prometheus-net"; version = "4.1.1"; sha256 = "0n016rxlz00xrw1jrikwr6h221rrw96h13d0823mfb5375rdi8rx"; }) + (fetchNuGet { name = "prometheus-net.AspNetCore"; version = "4.1.1"; sha256 = "0239i5ga7z3ajq6rvqz2ym3a30b1nbfjn6dnmc1iljd9579flzhs"; }) + (fetchNuGet { name = "prometheus-net.DotNetRuntime"; version = "3.4.1"; sha256 = "1b4a5yh2s8nji4bvp9fcw03dw0wbx58823b7jfga0vva33am3xx8"; }) + (fetchNuGet { name = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) + (fetchNuGet { name = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; }) + (fetchNuGet { name = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; }) + (fetchNuGet { name = "runtime.any.System.Globalization"; version = "4.3.0"; sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; }) + (fetchNuGet { name = "runtime.any.System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201"; }) + (fetchNuGet { name = "runtime.any.System.IO"; version = "4.3.0"; sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; }) + (fetchNuGet { name = "runtime.any.System.Reflection"; version = "4.3.0"; sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; }) + (fetchNuGet { name = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"; }) + (fetchNuGet { name = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; }) + (fetchNuGet { name = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; }) + (fetchNuGet { name = "runtime.any.System.Runtime"; version = "4.3.0"; sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; }) + (fetchNuGet { name = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; }) + (fetchNuGet { name = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; }) + (fetchNuGet { name = "runtime.any.System.Text.Encoding"; version = "4.3.0"; sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; }) + (fetchNuGet { name = "runtime.any.System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; }) + (fetchNuGet { name = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; }) + (fetchNuGet { name = "runtime.any.System.Threading.Timer"; version = "4.3.0"; sha256 = "0aw4phrhwqz9m61r79vyfl5la64bjxj8l34qnrcwb28v49fg2086"; }) + (fetchNuGet { name = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; }) + (fetchNuGet { name = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; }) + (fetchNuGet { name = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; }) + (fetchNuGet { name = "runtime.native.System"; version = "4.0.0"; sha256 = "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf"; }) + (fetchNuGet { name = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; }) + (fetchNuGet { name = "runtime.native.System.IO.Compression"; version = "4.1.0"; sha256 = "0d720z4lzyfcabmmnvh0bnj76ll7djhji2hmfh3h44sdkjnlkknk"; }) + (fetchNuGet { name = "runtime.native.System.IO.Compression"; version = "4.3.0"; sha256 = "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"; }) + (fetchNuGet { name = "runtime.native.System.Net.Http"; version = "4.0.1"; sha256 = "1hgv2bmbaskx77v8glh7waxws973jn4ah35zysnkxmf0196sfxg6"; }) + (fetchNuGet { name = "runtime.native.System.Net.Http"; version = "4.3.0"; sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; }) + (fetchNuGet { name = "runtime.native.System.Security.Cryptography"; version = "4.0.0"; sha256 = "0k57aa2c3b10wl3hfqbgrl7xq7g8hh3a3ir44b31dn5p61iiw3z9"; }) + (fetchNuGet { name = "runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; }) + (fetchNuGet { name = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; }) + (fetchNuGet { name = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; }) + (fetchNuGet { name = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; }) + (fetchNuGet { name = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi"; }) + (fetchNuGet { name = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; }) + (fetchNuGet { name = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; }) + (fetchNuGet { name = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; }) + (fetchNuGet { name = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; }) + (fetchNuGet { name = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; }) + (fetchNuGet { name = "runtime.unix.Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id"; }) + (fetchNuGet { name = "runtime.unix.System.Console"; version = "4.3.0"; sha256 = "1pfpkvc6x2if8zbdzg9rnc5fx51yllprl8zkm5npni2k50lisy80"; }) + (fetchNuGet { name = "runtime.unix.System.Console"; version = "4.3.1"; sha256 = "15kfi3761mk2i29zg135ipsvavm50nwm4334cy5m5q7iagzsf73p"; }) + (fetchNuGet { name = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; }) + (fetchNuGet { name = "runtime.unix.System.IO.FileSystem"; version = "4.3.0"; sha256 = "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix"; }) + (fetchNuGet { name = "runtime.unix.System.Net.Primitives"; version = "4.3.0"; sha256 = "0bdnglg59pzx9394sy4ic66kmxhqp8q8bvmykdxcbs5mm0ipwwm4"; }) + (fetchNuGet { name = "runtime.unix.System.Net.Sockets"; version = "4.3.0"; sha256 = "03npdxzy8gfv035bv1b9rz7c7hv0rxl5904wjz51if491mw0xy12"; }) + (fetchNuGet { name = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) + (fetchNuGet { name = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; }) + (fetchNuGet { name = "Serilog"; version = "2.3.0"; sha256 = "0y1111y0csfnil901nfahhj3x251nzdam0c4vab3gw5qh8iqs3my"; }) + (fetchNuGet { name = "Serilog"; version = "2.5.0"; sha256 = "0lq3kpmb83mv9kzr9zshz46bp6mvgx1kfz4dzjgzpasf6llgmrx0"; }) + (fetchNuGet { name = "Serilog"; version = "2.6.0"; sha256 = "0xzq2szx5yb9xgnkj2zvjil48baald22jm2j39smnac32gid5gm0"; }) + (fetchNuGet { name = "Serilog"; version = "2.8.0"; sha256 = "0fnrs05yjnni06mbax7ig74wiiqjyyhrxmr1hrhlpwcmc40zs4ih"; }) + (fetchNuGet { name = "Serilog"; version = "2.9.0"; sha256 = "0z0ib82w9b229a728bbyhzc2hnlbl0ki7nnvmgnv3l741f2vr4i6"; }) + (fetchNuGet { name = "SerilogAnalyzer"; version = "0.15.0.0"; sha256 = "0k83cyzl9520q282vp07zb8rs16a56axv7a31l3m5fb1afq2hv9l"; }) + (fetchNuGet { name = "Serilog.AspNetCore"; version = "3.4.0"; sha256 = "1k59zspma8hlka6j6hvflw8i073092qj8kzz52fdkqrck7w7cbag"; }) + (fetchNuGet { name = "Serilog.Enrichers.Thread"; version = "3.1.0"; sha256 = "1y75aiv2k1sxnh012ixkx92fq1yl8srqggy8l439igg4p223hcqi"; }) + (fetchNuGet { name = "Serilog.Extensions.Hosting"; version = "3.1.0"; sha256 = "0n01n2kvapl5hkp80fa0ra8zixacfqhrs05ijkh3hj5bvgnscsx5"; }) + (fetchNuGet { name = "Serilog.Extensions.Logging"; version = "3.0.1"; sha256 = "069qy7dm5nxb372ij112ppa6m99b4iaimj3sji74m659fwrcrl9a"; }) + (fetchNuGet { name = "Serilog.Formatting.Compact"; version = "1.1.0"; sha256 = "1w3qhj1jrihb20gr9la4r4gcmdyyy6dai2xflwhzvgqrq05wlycy"; }) + (fetchNuGet { name = "Serilog.Settings.Configuration"; version = "3.1.0"; sha256 = "1cj5am4n073331gbfm2ylqb9cadl4q3ppzgwmm5c8m1drxpiwkb5"; }) + (fetchNuGet { name = "Serilog.Sinks.Async"; version = "1.4.0"; sha256 = "00kqrn3xmfzg469y155vihsiby8dbbs382fi6qg8p2zg3i5dih1d"; }) + (fetchNuGet { name = "Serilog.Sinks.Console"; version = "3.1.1"; sha256 = "0j99as641y1k6havwwkhyr0n08vibiblmfjj6nz051mz8g3864fn"; }) + (fetchNuGet { name = "Serilog.Sinks.Debug"; version = "1.0.1"; sha256 = "0969mb254kr59bgkq01ybyzca89z3f4n9ng5mdj8m53d5653zf22"; }) + (fetchNuGet { name = "Serilog.Sinks.File"; version = "4.1.0"; sha256 = "1ry7p9hf1zlnai1j5zjhjp4dqm2agsbpq6cvxgpf5l8m26x6mgca"; }) + (fetchNuGet { name = "Serilog.Sinks.Graylog"; version = "2.2.2"; sha256 = "0cvl9vfd1qx0hdvvylhh9frnxwqdl9yq4vy21fjsr6wdvgflg2hr"; }) + (fetchNuGet { name = "ServiceStack.Text.Core"; version = "5.10.2"; sha256 = "0hpqfify017gm8nbah2abkk5d4vnsqrgj86i8b5mx3wy54h82pvb"; }) + (fetchNuGet { name = "SharpCompress"; version = "0.26.0"; sha256 = "03cygf8p44j1bfn6z9cn2xrw6zhvhq17xac1sph5rgq7vq2m5iq5"; }) + (fetchNuGet { name = "SkiaSharp"; version = "2.80.2"; sha256 = "17n0f4gfxz69fzd7zmgimbxfja15vq902arap2rqjr1hxp8sck7g"; }) + (fetchNuGet { name = "SkiaSharp.NativeAssets.Linux"; version = "2.80.2"; sha256 = "1951b7rpisaymb37j846jq01pjd05l4fjlnf56blh33ihxyj2jzi"; }) + (fetchNuGet { name = "SmartAnalyzers.MultithreadingAnalyzer"; version = "1.1.31"; sha256 = "1qk5s4rx5ma7k2kzkn1h94fsrzmwkivj0z1czsjwmr8z7zhngs2h"; }) + (fetchNuGet { name = "SQLitePCL.pretty.netstandard"; version = "2.1.0"; sha256 = "03vjk8r0dzyiwya6q5p2z2wp9sxj3b7xi72p7wgsy270a2pb3f28"; }) + (fetchNuGet { name = "SQLitePCLRaw.bundle_e_sqlite3"; version = "2.0.4"; sha256 = "1l3vbkwismsx5jcy3d5bj4bzh8bni8bk2gq4lqplz82pz5phjpxm"; }) + (fetchNuGet { name = "SQLitePCLRaw.core"; version = "1.1.14"; sha256 = "1najf6ns5b8rqqlmlxjn4wjcgnb5ch9ni7wiq6iip4155d35c519"; }) + (fetchNuGet { name = "SQLitePCLRaw.core"; version = "2.0.2"; sha256 = "11mnbnsiirpgmilskqh1issvgzgg08ndq3p3nkrw73hyqr7kl958"; }) + (fetchNuGet { name = "SQLitePCLRaw.core"; version = "2.0.4"; sha256 = "0lb5vwfl1hd24xzzdaj2p4k2hv2k0i3mgdri6fjj0ssb37mcyir1"; }) + (fetchNuGet { name = "SQLitePCLRaw.lib.e_sqlite3"; version = "2.0.4"; sha256 = "0kmx1w5qllmwxldr8338qxwmpfzc6g2lmyrah7wfaxd3mvfzky5c"; }) + (fetchNuGet { name = "SQLitePCLRaw.provider.dynamic_cdecl"; version = "2.0.4"; sha256 = "084r98kilpm0q1aw41idq8slncpd7cz65g0m1wr0p8d12x8z5g6j"; }) + (fetchNuGet { name = "SQLitePCLRaw.provider.sqlite3.netstandard11"; version = "1.1.14"; sha256 = "00jwin9lannq4qla6r85c4f0m1y8g103r02p8cnjhakxz588dm1y"; }) + (fetchNuGet { name = "StyleCop.Analyzers"; version = "1.1.118"; sha256 = "0hj4ax64cay2lvrh9693m0g4pmis0fi5wpm12xwzvc7lkizvac0a"; }) + (fetchNuGet { name = "Swashbuckle.AspNetCore"; version = "5.6.3"; sha256 = "1s8jmvssk8g518szi9nijsq73d85fnlzvink2x0ahf2jkvpakn9p"; }) + (fetchNuGet { name = "Swashbuckle.AspNetCore.ReDoc"; version = "5.6.3"; sha256 = "1kbn77wbcn03pwcynj4n602p4157y1qrfv775clnmzfq7z5nfaw6"; }) + (fetchNuGet { name = "Swashbuckle.AspNetCore.Swagger"; version = "5.6.3"; sha256 = "0yg27nlndaiaa6sv7xkcysdpmq1dzf24xjz6xq0vwn51mn84vsg9"; }) + (fetchNuGet { name = "Swashbuckle.AspNetCore.SwaggerGen"; version = "5.6.3"; sha256 = "15h31wq9n9zcpalb3k1pzgcsafn1mz397mb9bnl55621p6zxrlz2"; }) + (fetchNuGet { name = "Swashbuckle.AspNetCore.SwaggerUI"; version = "5.6.3"; sha256 = "0vbq3xycsixnpsqw2pphzw77w1liyz8hi1sl4hy9bpgpa18p2sfj"; }) + (fetchNuGet { name = "System.AppContext"; version = "4.1.0"; sha256 = "0fv3cma1jp4vgj7a8hqc9n7hr1f1kjp541s6z0q1r6nazb4iz9mz"; }) + (fetchNuGet { name = "System.AppContext"; version = "4.3.0"; sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; }) + (fetchNuGet { name = "System.Buffers"; version = "4.0.0"; sha256 = "13s659bcmg9nwb6z78971z1lr6bmh2wghxi1ayqyzl4jijd351gr"; }) + (fetchNuGet { name = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) + (fetchNuGet { name = "System.Buffers"; version = "4.5.0"; sha256 = "1ywfqn4md6g3iilpxjn5dsr0f5lx6z0yvhqp4pgjcamygg73cz2c"; }) + (fetchNuGet { name = "System.Collections"; version = "4.0.11"; sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; }) + (fetchNuGet { name = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) + (fetchNuGet { name = "System.Collections.Concurrent"; version = "4.0.12"; sha256 = "07y08kvrzpak873pmyxs129g1ch8l27zmg51pcyj2jvq03n0r0fc"; }) + (fetchNuGet { name = "System.Collections.Concurrent"; version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; }) + (fetchNuGet { name = "System.Collections.Immutable"; version = "1.3.1"; sha256 = "17615br2x5riyx8ivf1dcqwj6q3ipq1bi5hqhw54yfyxmx38ddva"; }) + (fetchNuGet { name = "System.Collections.Immutable"; version = "5.0.0"; sha256 = "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r"; }) + (fetchNuGet { name = "System.Collections.NonGeneric"; version = "4.0.1"; sha256 = "19994r5y5bpdhj7di6w047apvil8lh06lh2c2yv9zc4fc5g9bl4d"; }) + (fetchNuGet { name = "System.Collections.NonGeneric"; version = "4.3.0"; sha256 = "07q3k0hf3mrcjzwj8fwk6gv3n51cb513w4mgkfxzm3i37sc9kz7k"; }) + (fetchNuGet { name = "System.Collections.Specialized"; version = "4.3.0"; sha256 = "1sdwkma4f6j85m3dpb53v9vcgd0zyc9jb33f8g63byvijcj39n20"; }) + (fetchNuGet { name = "System.ComponentModel"; version = "4.3.0"; sha256 = "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb"; }) + (fetchNuGet { name = "System.ComponentModel.Annotations"; version = "4.5.0"; sha256 = "1jj6f6g87k0iwsgmg3xmnn67a14mq88np0l1ys5zkxhkvbc8976p"; }) + (fetchNuGet { name = "System.ComponentModel.Annotations"; version = "5.0.0"; sha256 = "021h7x98lblq9avm1bgpa4i31c2kgsa7zn4sqhxf39g087ar756j"; }) + (fetchNuGet { name = "System.ComponentModel.Primitives"; version = "4.3.0"; sha256 = "1svfmcmgs0w0z9xdw2f2ps05rdxmkxxhf0l17xk9l1l8xfahkqr0"; }) + (fetchNuGet { name = "System.ComponentModel.TypeConverter"; version = "4.3.0"; sha256 = "17ng0p7v3nbrg3kycz10aqrrlw4lz9hzhws09pfh8gkwicyy481x"; }) + (fetchNuGet { name = "System.Console"; version = "4.0.0"; sha256 = "0ynxqbc3z1nwbrc11hkkpw9skw116z4y9wjzn7id49p9yi7mzmlf"; }) + (fetchNuGet { name = "System.Console"; version = "4.3.0"; sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; }) + (fetchNuGet { name = "System.Diagnostics.Debug"; version = "4.0.11"; sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; }) + (fetchNuGet { name = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) + (fetchNuGet { name = "System.Diagnostics.DiagnosticSource"; version = "4.0.0"; sha256 = "1n6c3fbz7v8d3pn77h4v5wvsfrfg7v1c57lg3nff3cjyh597v23m"; }) + (fetchNuGet { name = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; }) + (fetchNuGet { name = "System.Diagnostics.DiagnosticSource"; version = "4.5.0"; sha256 = "1y8m0p3127nak5yspapfnz25qc9x53gqpvwr3hdpsvrcd2r1pgyj"; }) + (fetchNuGet { name = "System.Diagnostics.DiagnosticSource"; version = "4.5.1"; sha256 = "1j8dgilsgd0n7y87wq1cdlnwck96wijhbyhdp4d01l1gzm3074c1"; }) + (fetchNuGet { name = "System.Diagnostics.DiagnosticSource"; version = "5.0.1"; sha256 = "0mzw44wsm87vpslb9sn7rirxynpq9m3b00l7gl0q71m8shfh66qs"; }) + (fetchNuGet { name = "System.Diagnostics.FileVersionInfo"; version = "4.3.0"; sha256 = "094hx249lb3vb336q7dg3v257hbxvz2jnalj695l7cg5kxzqwai7"; }) + (fetchNuGet { name = "System.Diagnostics.StackTrace"; version = "4.3.0"; sha256 = "0ash4h9k0m7xsm0yl79r0ixrdz369h7y922wipp5gladmlbvpyjd"; }) + (fetchNuGet { name = "System.Diagnostics.Tools"; version = "4.0.1"; sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; }) + (fetchNuGet { name = "System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; }) + (fetchNuGet { name = "System.Diagnostics.Tracing"; version = "4.1.0"; sha256 = "1d2r76v1x610x61ahfpigda89gd13qydz6vbwzhpqlyvq8jj6394"; }) + (fetchNuGet { name = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; }) + (fetchNuGet { name = "System.Dynamic.Runtime"; version = "4.0.11"; sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; }) + (fetchNuGet { name = "System.Dynamic.Runtime"; version = "4.3.0"; sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; }) + (fetchNuGet { name = "System.Globalization"; version = "4.0.11"; sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; }) + (fetchNuGet { name = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) + (fetchNuGet { name = "System.Globalization.Calendars"; version = "4.0.1"; sha256 = "0bv0alrm2ck2zk3rz25lfyk9h42f3ywq77mx1syl6vvyncnpg4qh"; }) + (fetchNuGet { name = "System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; }) + (fetchNuGet { name = "System.Globalization.Extensions"; version = "4.0.1"; sha256 = "0hjhdb5ri8z9l93bw04s7ynwrjrhx2n0p34sf33a9hl9phz69fyc"; }) + (fetchNuGet { name = "System.Globalization.Extensions"; version = "4.3.0"; sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; }) + (fetchNuGet { name = "System.IO"; version = "4.1.0"; sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; }) + (fetchNuGet { name = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) + (fetchNuGet { name = "System.IO.Compression"; version = "4.1.0"; sha256 = "0iym7s3jkl8n0vzm3jd6xqg9zjjjqni05x45dwxyjr2dy88hlgji"; }) + (fetchNuGet { name = "System.IO.Compression"; version = "4.3.0"; sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"; }) + (fetchNuGet { name = "System.IO.Compression.ZipFile"; version = "4.0.1"; sha256 = "0h72znbagmgvswzr46mihn7xm7chfk2fhrp5krzkjf29pz0i6z82"; }) + (fetchNuGet { name = "System.IO.Compression.ZipFile"; version = "4.3.0"; sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"; }) + (fetchNuGet { name = "System.IO.FileSystem"; version = "4.0.1"; sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; }) + (fetchNuGet { name = "System.IO.FileSystem"; version = "4.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; }) + (fetchNuGet { name = "System.IO.FileSystem.Primitives"; version = "4.0.1"; sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; }) + (fetchNuGet { name = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; }) + (fetchNuGet { name = "System.IO.Pipelines"; version = "4.5.2"; sha256 = "045sn3vyk5xysjjm19q4dj5c1g1rf8l98n4qsl9pl9id4fn08yq1"; }) + (fetchNuGet { name = "System.Linq"; version = "4.1.0"; sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; }) + (fetchNuGet { name = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) + (fetchNuGet { name = "System.Linq.Async"; version = "5.0.0"; sha256 = "1bc1bfnahyk6y31mrxn7nd071436m94p4r9b2j835pghcqawqfbc"; }) + (fetchNuGet { name = "System.Linq.Expressions"; version = "4.1.0"; sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; }) + (fetchNuGet { name = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; }) + (fetchNuGet { name = "System.Memory"; version = "4.5.0"; sha256 = "1layqpcx1q4l805fdnj2dfqp6ncx2z42ca06rgsr6ikq4jjgbv30"; }) + (fetchNuGet { name = "System.Memory"; version = "4.5.1"; sha256 = "0f07d7hny38lq9w69wx4lxkn4wszrqf9m9js6fh9is645csm167c"; }) + (fetchNuGet { name = "System.Memory"; version = "4.5.3"; sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; }) + (fetchNuGet { name = "System.Memory"; version = "4.5.4"; sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; }) + (fetchNuGet { name = "System.Net.Http"; version = "4.1.0"; sha256 = "1i5rqij1icg05j8rrkw4gd4pgia1978mqhjzhsjg69lvwcdfg8yb"; }) + (fetchNuGet { name = "System.Net.Http"; version = "4.3.0"; sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; }) + (fetchNuGet { name = "System.Net.NameResolution"; version = "4.3.0"; sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; }) + (fetchNuGet { name = "System.Net.Primitives"; version = "4.0.11"; sha256 = "10xzzaynkzkakp7jai1ik3r805zrqjxiz7vcagchyxs2v26a516r"; }) + (fetchNuGet { name = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; }) + (fetchNuGet { name = "System.Net.Sockets"; version = "4.1.0"; sha256 = "1385fvh8h29da5hh58jm1v78fzi9fi5vj93vhlm2kvqpfahvpqls"; }) + (fetchNuGet { name = "System.Net.Sockets"; version = "4.3.0"; sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; }) + (fetchNuGet { name = "System.Net.WebSockets.WebSocketProtocol"; version = "4.5.3"; sha256 = "0z9ccndkkq6gpsh35q3pjm4zya47p6vakcyj8nc352g4wiizqc8c"; }) + (fetchNuGet { name = "System.Numerics.Vectors"; version = "4.5.0"; sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; }) + (fetchNuGet { name = "System.ObjectModel"; version = "4.0.12"; sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; }) + (fetchNuGet { name = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; }) + (fetchNuGet { name = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; }) + (fetchNuGet { name = "System.Reflection"; version = "4.1.0"; sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; }) + (fetchNuGet { name = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) + (fetchNuGet { name = "System.Reflection.Emit"; version = "4.0.1"; sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; }) + (fetchNuGet { name = "System.Reflection.Emit"; version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; }) + (fetchNuGet { name = "System.Reflection.Emit.ILGeneration"; version = "4.0.1"; sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0"; }) + (fetchNuGet { name = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; }) + (fetchNuGet { name = "System.Reflection.Emit.Lightweight"; version = "4.0.1"; sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr"; }) + (fetchNuGet { name = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; }) + (fetchNuGet { name = "System.Reflection.Extensions"; version = "4.0.1"; sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; }) + (fetchNuGet { name = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; }) + (fetchNuGet { name = "System.Reflection.Metadata"; version = "1.4.2"; sha256 = "08b7b43vczlliv8k7q43jinjfrxwpljsglw7sxmc6sd7d54pd1vi"; }) + (fetchNuGet { name = "System.Reflection.Metadata"; version = "1.6.0"; sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; }) + (fetchNuGet { name = "System.Reflection.Primitives"; version = "4.0.1"; sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; }) + (fetchNuGet { name = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) + (fetchNuGet { name = "System.Reflection.TypeExtensions"; version = "4.1.0"; sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; }) + (fetchNuGet { name = "System.Reflection.TypeExtensions"; version = "4.3.0"; sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; }) + (fetchNuGet { name = "System.Resources.ResourceManager"; version = "4.0.1"; sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; }) + (fetchNuGet { name = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) + (fetchNuGet { name = "System.Runtime"; version = "4.1.0"; sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; }) + (fetchNuGet { name = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) + (fetchNuGet { name = "System.Runtime"; version = "4.3.1"; sha256 = "03ch4d2acf6q037a4njxpll2kkx3dwzlg07yxr4z5m6j1kqgmm27"; }) + (fetchNuGet { name = "System.Runtime.CompilerServices.Unsafe"; version = "4.4.0"; sha256 = "0a6ahgi5b148sl5qyfpyw383p3cb4yrkm802k29fsi4mxkiwir29"; }) + (fetchNuGet { name = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.0"; sha256 = "17labczwqk3jng3kkky73m0jhi8wc21vbl7cz5c0hj2p1dswin43"; }) + (fetchNuGet { name = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.1"; sha256 = "1xcrjx5fwg284qdnxyi2d0lzdm5q4frlpkp0nf6vvkx1kdz2prrf"; }) + (fetchNuGet { name = "System.Runtime.Extensions"; version = "4.1.0"; sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; }) + (fetchNuGet { name = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; }) + (fetchNuGet { name = "System.Runtime.Handles"; version = "4.0.1"; sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; }) + (fetchNuGet { name = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; }) + (fetchNuGet { name = "System.Runtime.InteropServices"; version = "4.1.0"; sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; }) + (fetchNuGet { name = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) + (fetchNuGet { name = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.0.0"; sha256 = "0glmvarf3jz5xh22iy3w9v3wyragcm4hfdr17v90vs7vcrm7fgp6"; }) + (fetchNuGet { name = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; }) + (fetchNuGet { name = "System.Runtime.Numerics"; version = "4.0.1"; sha256 = "1y308zfvy0l5nrn46mqqr4wb4z1xk758pkk8svbz8b5ij7jnv4nn"; }) + (fetchNuGet { name = "System.Runtime.Numerics"; version = "4.3.0"; sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; }) + (fetchNuGet { name = "System.Runtime.Serialization.Formatters"; version = "4.3.0"; sha256 = "114j35n8gcvn3sqv9ar36r1jjq0y1yws9r0yk8i6wm4aq7n9rs0m"; }) + (fetchNuGet { name = "System.Runtime.Serialization.Primitives"; version = "4.1.1"; sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; }) + (fetchNuGet { name = "System.Runtime.Serialization.Primitives"; version = "4.3.0"; sha256 = "01vv2p8h4hsz217xxs0rixvb7f2xzbh6wv1gzbfykcbfrza6dvnf"; }) + (fetchNuGet { name = "System.Security.AccessControl"; version = "4.5.0"; sha256 = "1wvwanz33fzzbnd2jalar0p0z3x0ba53vzx1kazlskp7pwyhlnq0"; }) + (fetchNuGet { name = "System.Security.Claims"; version = "4.3.0"; sha256 = "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn"; }) + (fetchNuGet { name = "System.Security.Cryptography.Algorithms"; version = "4.2.0"; sha256 = "148s9g5dgm33ri7dnh19s4lgnlxbpwvrw2jnzllq2kijj4i4vs85"; }) + (fetchNuGet { name = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; }) + (fetchNuGet { name = "System.Security.Cryptography.Cng"; version = "4.2.0"; sha256 = "118jijz446kix20blxip0f0q8mhsh9bz118mwc2ch1p6g7facpzc"; }) + (fetchNuGet { name = "System.Security.Cryptography.Cng"; version = "4.3.0"; sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; }) + (fetchNuGet { name = "System.Security.Cryptography.Cng"; version = "4.5.0"; sha256 = "1pm4ykbcz48f1hdmwpia432ha6qbb9kbrxrrp7cg3m8q8xn52ngn"; }) + (fetchNuGet { name = "System.Security.Cryptography.Csp"; version = "4.0.0"; sha256 = "1cwv8lqj8r15q81d2pz2jwzzbaji0l28xfrpw29kdpsaypm92z2q"; }) + (fetchNuGet { name = "System.Security.Cryptography.Csp"; version = "4.3.0"; sha256 = "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"; }) + (fetchNuGet { name = "System.Security.Cryptography.Encoding"; version = "4.0.0"; sha256 = "0a8y1a5wkmpawc787gfmnrnbzdgxmx1a14ax43jf3rj9gxmy3vk4"; }) + (fetchNuGet { name = "System.Security.Cryptography.Encoding"; version = "4.3.0"; sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; }) + (fetchNuGet { name = "System.Security.Cryptography.OpenSsl"; version = "4.0.0"; sha256 = "16sx3cig3d0ilvzl8xxgffmxbiqx87zdi8fc73i3i7zjih1a7f4q"; }) + (fetchNuGet { name = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; }) + (fetchNuGet { name = "System.Security.Cryptography.Pkcs"; version = "4.5.0"; sha256 = "16dhiz2qypk289dxiqa9rb7jmslnami6bykalv5dvbd8j91zikpy"; }) + (fetchNuGet { name = "System.Security.Cryptography.Primitives"; version = "4.0.0"; sha256 = "0i7cfnwph9a10bm26m538h5xcr8b36jscp9sy1zhgifksxz4yixh"; }) + (fetchNuGet { name = "System.Security.Cryptography.Primitives"; version = "4.3.0"; sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; }) + (fetchNuGet { name = "System.Security.Cryptography.X509Certificates"; version = "4.1.0"; sha256 = "0clg1bv55mfv5dq00m19cp634zx6inm31kf8ppbq1jgyjf2185dh"; }) + (fetchNuGet { name = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; }) + (fetchNuGet { name = "System.Security.Cryptography.Xml"; version = "4.5.0"; sha256 = "1rk40x0msf9k7sxnjyizagjns1z25dh3cf22bx6hsx6vhf0sk08l"; }) + (fetchNuGet { name = "System.Security.Permissions"; version = "4.5.0"; sha256 = "192ww5rm3c9mirxgl1nzyrwd18am3izqls0hzm0fvcdjl5grvbhm"; }) + (fetchNuGet { name = "System.Security.Principal"; version = "4.3.0"; sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; }) + (fetchNuGet { name = "System.Security.Principal.Windows"; version = "4.3.0"; sha256 = "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr"; }) + (fetchNuGet { name = "System.Security.Principal.Windows"; version = "4.5.0"; sha256 = "0rmj89wsl5yzwh0kqjgx45vzf694v9p92r4x4q6yxldk1cv1hi86"; }) + (fetchNuGet { name = "System.Text.Encoding"; version = "4.0.11"; sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; }) + (fetchNuGet { name = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) + (fetchNuGet { name = "System.Text.Encoding.CodePages"; version = "4.3.0"; sha256 = "0lgxg1gn7pg7j0f942pfdc9q7wamzxsgq3ng248ikdasxz0iadkv"; }) + (fetchNuGet { name = "System.Text.Encoding.CodePages"; version = "4.7.1"; sha256 = "1y1hdap9qbl7vp74j8s9zcbh3v1rnrrvcc55wj1hl6has2v3qh1r"; }) + (fetchNuGet { name = "System.Text.Encoding.CodePages"; version = "5.0.0"; sha256 = "1bn2pzaaq4wx9ixirr8151vm5hynn3lmrljcgjx9yghmm4k677k0"; }) + (fetchNuGet { name = "System.Text.Encoding.Extensions"; version = "4.0.11"; sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; }) + (fetchNuGet { name = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) + (fetchNuGet { name = "System.Text.Encodings.Web"; version = "4.5.0"; sha256 = "0srd5bva52n92i90wd88pzrqjsxnfgka3ilybwh7s6sf469y5s53"; }) + (fetchNuGet { name = "System.Text.Json"; version = "5.0.1"; sha256 = "1j7via4spxy73ipng754wdz1nb882gsb9qh26jqlql66vzbbm3j3"; }) + (fetchNuGet { name = "System.Text.RegularExpressions"; version = "4.1.0"; sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; }) + (fetchNuGet { name = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; }) + (fetchNuGet { name = "System.Threading"; version = "4.0.11"; sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; }) + (fetchNuGet { name = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) + (fetchNuGet { name = "System.Threading.Tasks"; version = "4.0.11"; sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; }) + (fetchNuGet { name = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) + (fetchNuGet { name = "System.Threading.Tasks.Dataflow"; version = "5.0.0"; sha256 = "028fimgwn5j9fv6m547c975a8b90d9qcnb89k5crjyspsnjcqbhy"; }) + (fetchNuGet { name = "System.Threading.Tasks.Extensions"; version = "4.0.0"; sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; }) + (fetchNuGet { name = "System.Threading.Tasks.Extensions"; version = "4.3.0"; sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; }) + (fetchNuGet { name = "System.Threading.Tasks.Extensions"; version = "4.5.1"; sha256 = "1ikrplvw4m6pzjbq3bfbpr572n4i9mni577zvmrkaygvx85q3myw"; }) + (fetchNuGet { name = "System.Threading.Tasks.Parallel"; version = "4.3.0"; sha256 = "1rr3qa4hxwyj531s4nb3bwrxnxxwz617i0n9gh6x7nr7dd3ayzgh"; }) + (fetchNuGet { name = "System.Threading.Thread"; version = "4.3.0"; sha256 = "0y2xiwdfcph7znm2ysxanrhbqqss6a3shi1z3c779pj2s523mjx4"; }) + (fetchNuGet { name = "System.Threading.ThreadPool"; version = "4.3.0"; sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; }) + (fetchNuGet { name = "System.Threading.Timer"; version = "4.0.1"; sha256 = "15n54f1f8nn3mjcjrlzdg6q3520571y012mx7v991x2fvp73lmg6"; }) + (fetchNuGet { name = "System.Threading.Timer"; version = "4.3.0"; sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; }) + (fetchNuGet { name = "System.ValueTuple"; version = "4.3.0"; sha256 = "1227k7fxbxapq7dms4lvwwjdf3pr1jcsmhy2nzzhj6g6hs530hxn"; }) + (fetchNuGet { name = "System.Xml.ReaderWriter"; version = "4.0.11"; sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; }) + (fetchNuGet { name = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; }) + (fetchNuGet { name = "System.Xml.XDocument"; version = "4.0.11"; sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; }) + (fetchNuGet { name = "System.Xml.XDocument"; version = "4.3.0"; sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; }) + (fetchNuGet { name = "System.Xml.XmlDocument"; version = "4.3.0"; sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi"; }) + (fetchNuGet { name = "System.Xml.XPath"; version = "4.3.0"; sha256 = "1cv2m0p70774a0sd1zxc8fm8jk3i5zk2bla3riqvi8gsm0r4kpci"; }) + (fetchNuGet { name = "System.Xml.XPath.XDocument"; version = "4.3.0"; sha256 = "1wxckyb7n1pi433xzz0qcwcbl1swpra64065mbwwi8dhdc4kiabn"; }) + (fetchNuGet { name = "TagLibSharp"; version = "2.2.0"; sha256 = "0jb0f84p4jd59ha36spyk9q08g6fjap3xywq32rcs2xwzhhqiq0y"; }) + (fetchNuGet { name = "TMDbLib"; version = "1.7.3-alpha"; sha256 = "1dfk646w1mn2yj0ali7dcanxqs8q3njprzpw0n2v8wgd53jpava1"; }) + (fetchNuGet { name = "TvDbSharper"; version = "3.2.2"; sha256 = "0dkxcb7745y7wy8sdg7xic5idwwdmnp7k0x8v05f6s075a8m7nqz"; }) + (fetchNuGet { name = "UTF.Unknown"; version = "2.3.0"; sha256 = "067hw460y36sfcpdfaw8lirn1hn2g4fvkpnih41nighzvmq1ixzf"; }) ] diff --git a/third_party/nixpkgs/pkgs/servers/jellyfin/update.sh b/third_party/nixpkgs/pkgs/servers/jellyfin/update.sh index 09bcfecc01..a725dc08fc 100755 --- a/third_party/nixpkgs/pkgs/servers/jellyfin/update.sh +++ b/third_party/nixpkgs/pkgs/servers/jellyfin/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl jq common-updater-scripts dotnetCorePackages.sdk_5_0 gnused nix coreutils findutils +#!nix-shell -i bash -p curl jq common-updater-scripts dotnetCorePackages.sdk_5_0 nuget-to-nix gnused nix coreutils findutils set -euo pipefail @@ -31,22 +31,7 @@ pushd "$src" mkdir ./nuget_tmp.packages dotnet restore Jellyfin.Server --packages ./nuget_tmp.packages --runtime linux-x64 -echo "# This file has been generated by the jellyfin updateScript. Do not edit!" >"$nugetDepsFile" -echo "{ fetchNuGet }: [" >>"$nugetDepsFile" -while read -r pkg_spec; do - { read -r pkg_name; read -r pkg_version; } < <( - # Build version part should be ignored: `3.0.0-beta2.20059.3+77df2220` -> `3.0.0-beta2.20059.3` - sed -nE 's/.*([^<]*).*/\1/p; s/.*([^<+]*).*/\1/p' "$pkg_spec") - pkg_sha256="$(nix-hash --type sha256 --flat --base32 "$(dirname "$pkg_spec")"/*.nupkg)" - cat >>"$nugetDepsFile" <>"$nugetDepsFile" +nuget-to-nix ./nuget_tmp.packages > "$nugetDepsFile" popd rm -r "$src" diff --git a/third_party/nixpkgs/pkgs/servers/libreddit/add-Cargo.lock.patch b/third_party/nixpkgs/pkgs/servers/libreddit/add-Cargo.lock.patch deleted file mode 100644 index c1dc433c7f..0000000000 --- a/third_party/nixpkgs/pkgs/servers/libreddit/add-Cargo.lock.patch +++ /dev/null @@ -1,1466 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -new file mode 100644 -index 0000000..dcb4875 ---- /dev/null -+++ b/Cargo.lock -@@ -0,0 +1,1460 @@ -+# This file is automatically @generated by Cargo. -+# It is not intended for manual editing. -+[[package]] -+name = "aho-corasick" -+version = "0.7.15" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5" -+dependencies = [ -+ "memchr", -+] -+ -+[[package]] -+name = "arrayvec" -+version = "0.5.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" -+ -+[[package]] -+name = "askama" -+version = "0.10.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d298738b6e47e1034e560e5afe63aa488fea34e25ec11b855a76f0d7b8e73134" -+dependencies = [ -+ "askama_derive", -+ "askama_escape", -+ "askama_shared", -+] -+ -+[[package]] -+name = "askama_derive" -+version = "0.10.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ca2925c4c290382f9d2fa3d1c1b6a63fa1427099721ecca4749b154cc9c25522" -+dependencies = [ -+ "askama_shared", -+ "proc-macro2", -+ "syn", -+] -+ -+[[package]] -+name = "askama_escape" -+version = "0.10.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "90c108c1a94380c89d2215d0ac54ce09796823cca0fd91b299cfff3b33e346fb" -+ -+[[package]] -+name = "askama_shared" -+version = "0.11.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2582b77e0f3c506ec4838a25fa8a5f97b9bed72bb6d3d272ea1c031d8bd373bc" -+dependencies = [ -+ "askama_escape", -+ "nom", -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "async-mutex" -+version = "1.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "479db852db25d9dbf6204e6cb6253698f175c15726470f78af0d918e99d6156e" -+dependencies = [ -+ "event-listener", -+] -+ -+[[package]] -+name = "async-recursion" -+version = "0.3.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d7d78656ba01f1b93024b7c3a0467f1608e4be67d725749fdcd7d2c7678fd7a2" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "async-trait" -+version = "0.1.48" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "36ea56748e10732c49404c153638a15ec3d6211ec5ff35d9bb20e13b93576adf" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "autocfg" -+version = "1.0.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" -+ -+[[package]] -+name = "base-x" -+version = "0.2.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a4521f3e3d031370679b3b140beb36dfe4801b09ac77e30c61941f97df3ef28b" -+ -+[[package]] -+name = "base64" -+version = "0.13.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" -+ -+[[package]] -+name = "bitflags" -+version = "1.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" -+ -+[[package]] -+name = "bitvec" -+version = "0.19.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8942c8d352ae1838c9dda0b0ca2ab657696ef2232a20147cf1b30ae1a9cb4321" -+dependencies = [ -+ "funty", -+ "radium", -+ "tap", -+ "wyz", -+] -+ -+[[package]] -+name = "bumpalo" -+version = "3.6.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "63396b8a4b9de3f4fdfb320ab6080762242f66a8ef174c49d8e19b674db4cdbe" -+ -+[[package]] -+name = "bytes" -+version = "1.0.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040" -+ -+[[package]] -+name = "cached" -+version = "0.23.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5e2afe73808fbaac302e39c9754bfc3c4b4d0f99c9c240b9f4e4efc841ad1b74" -+dependencies = [ -+ "async-mutex", -+ "async-trait", -+ "cached_proc_macro", -+ "cached_proc_macro_types", -+ "futures", -+ "hashbrown", -+ "once_cell", -+] -+ -+[[package]] -+name = "cached_proc_macro" -+version = "0.6.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bf857ae42d910aede5c5186e62684b0d7a597ce2fe3bd14448ab8f7ef439848c" -+dependencies = [ -+ "async-mutex", -+ "cached_proc_macro_types", -+ "darling", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "cached_proc_macro_types" -+version = "0.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3a4f925191b4367301851c6d99b09890311d74b0d43f274c0b34c86d308a3663" -+ -+[[package]] -+name = "cc" -+version = "1.0.67" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e3c69b077ad434294d3ce9f1f6143a2a4b89a8a2d54ef813d85003a4fd1137fd" -+ -+[[package]] -+name = "cfg-if" -+version = "1.0.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" -+ -+[[package]] -+name = "clap" -+version = "2.33.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" -+dependencies = [ -+ "bitflags", -+ "textwrap", -+ "unicode-width", -+] -+ -+[[package]] -+name = "const_fn" -+version = "0.4.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "076a6803b0dacd6a88cfe64deba628b01533ff5ef265687e6938280c1afd0a28" -+ -+[[package]] -+name = "cookie" -+version = "0.15.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ffdf8865bac3d9a3bde5bde9088ca431b11f5d37c7a578b8086af77248b76627" -+dependencies = [ -+ "time", -+ "version_check", -+] -+ -+[[package]] -+name = "core-foundation" -+version = "0.9.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0a89e2ae426ea83155dccf10c0fa6b1463ef6d5fcb44cee0b224a408fa640a62" -+dependencies = [ -+ "core-foundation-sys", -+ "libc", -+] -+ -+[[package]] -+name = "core-foundation-sys" -+version = "0.8.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ea221b5284a47e40033bf9b66f35f984ec0ea2931eb03505246cd27a963f981b" -+ -+[[package]] -+name = "ct-logs" -+version = "0.8.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c1a816186fa68d9e426e3cb4ae4dff1fcd8e4a2c34b781bf7a822574a0d0aac8" -+dependencies = [ -+ "sct", -+] -+ -+[[package]] -+name = "darling" -+version = "0.10.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0d706e75d87e35569db781a9b5e2416cff1236a47ed380831f959382ccd5f858" -+dependencies = [ -+ "darling_core", -+ "darling_macro", -+] -+ -+[[package]] -+name = "darling_core" -+version = "0.10.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f0c960ae2da4de88a91b2d920c2a7233b400bc33cb28453a2987822d8392519b" -+dependencies = [ -+ "fnv", -+ "ident_case", -+ "proc-macro2", -+ "quote", -+ "strsim", -+ "syn", -+] -+ -+[[package]] -+name = "darling_macro" -+version = "0.10.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72" -+dependencies = [ -+ "darling_core", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "discard" -+version = "1.0.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0" -+ -+[[package]] -+name = "event-listener" -+version = "2.5.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f7531096570974c3a9dcf9e4b8e1cede1ec26cf5046219fb3b9d897503b9be59" -+ -+[[package]] -+name = "fastrand" -+version = "1.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ca5faf057445ce5c9d4329e382b2ce7ca38550ef3b73a5348362d5f24e0c7fe3" -+dependencies = [ -+ "instant", -+] -+ -+[[package]] -+name = "fnv" -+version = "1.0.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" -+ -+[[package]] -+name = "form_urlencoded" -+version = "1.0.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" -+dependencies = [ -+ "matches", -+ "percent-encoding", -+] -+ -+[[package]] -+name = "funty" -+version = "1.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" -+ -+[[package]] -+name = "futures" -+version = "0.3.14" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a9d5813545e459ad3ca1bff9915e9ad7f1a47dc6a91b627ce321d5863b7dd253" -+dependencies = [ -+ "futures-channel", -+ "futures-core", -+ "futures-executor", -+ "futures-io", -+ "futures-sink", -+ "futures-task", -+ "futures-util", -+] -+ -+[[package]] -+name = "futures-channel" -+version = "0.3.14" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ce79c6a52a299137a6013061e0cf0e688fce5d7f1bc60125f520912fdb29ec25" -+dependencies = [ -+ "futures-core", -+ "futures-sink", -+] -+ -+[[package]] -+name = "futures-core" -+version = "0.3.14" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "098cd1c6dda6ca01650f1a37a794245eb73181d0d4d4e955e2f3c37db7af1815" -+ -+[[package]] -+name = "futures-executor" -+version = "0.3.14" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "10f6cb7042eda00f0049b1d2080aa4b93442997ee507eb3828e8bd7577f94c9d" -+dependencies = [ -+ "futures-core", -+ "futures-task", -+ "futures-util", -+] -+ -+[[package]] -+name = "futures-io" -+version = "0.3.14" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "365a1a1fb30ea1c03a830fdb2158f5236833ac81fa0ad12fe35b29cddc35cb04" -+ -+[[package]] -+name = "futures-lite" -+version = "1.11.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b4481d0cd0de1d204a4fa55e7d45f07b1d958abcb06714b3446438e2eff695fb" -+dependencies = [ -+ "fastrand", -+ "futures-core", -+ "futures-io", -+ "memchr", -+ "parking", -+ "pin-project-lite", -+ "waker-fn", -+] -+ -+[[package]] -+name = "futures-macro" -+version = "0.3.14" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "668c6733a182cd7deb4f1de7ba3bf2120823835b3bcfbeacf7d2c4a773c1bb8b" -+dependencies = [ -+ "proc-macro-hack", -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "futures-sink" -+version = "0.3.14" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5c5629433c555de3d82861a7a4e3794a4c40040390907cfbfd7143a92a426c23" -+ -+[[package]] -+name = "futures-task" -+version = "0.3.14" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ba7aa51095076f3ba6d9a1f702f74bd05ec65f555d70d2033d55ba8d69f581bc" -+ -+[[package]] -+name = "futures-util" -+version = "0.3.14" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3c144ad54d60f23927f0a6b6d816e4271278b64f005ad65e4e35291d2de9c025" -+dependencies = [ -+ "futures-channel", -+ "futures-core", -+ "futures-io", -+ "futures-macro", -+ "futures-sink", -+ "futures-task", -+ "memchr", -+ "pin-project-lite", -+ "pin-utils", -+ "proc-macro-hack", -+ "proc-macro-nested", -+ "slab", -+] -+ -+[[package]] -+name = "h2" -+version = "0.3.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fc018e188373e2777d0ef2467ebff62a08e66c3f5857b23c8fbec3018210dc00" -+dependencies = [ -+ "bytes", -+ "fnv", -+ "futures-core", -+ "futures-sink", -+ "futures-util", -+ "http", -+ "indexmap", -+ "slab", -+ "tokio", -+ "tokio-util", -+ "tracing", -+] -+ -+[[package]] -+name = "hashbrown" -+version = "0.9.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04" -+ -+[[package]] -+name = "hermit-abi" -+version = "0.1.18" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c" -+dependencies = [ -+ "libc", -+] -+ -+[[package]] -+name = "http" -+version = "0.2.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "527e8c9ac747e28542699a951517aa9a6945af506cd1f2e1b53a576c17b6cc11" -+dependencies = [ -+ "bytes", -+ "fnv", -+ "itoa", -+] -+ -+[[package]] -+name = "http-body" -+version = "0.4.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5dfb77c123b4e2f72a2069aeae0b4b4949cc7e966df277813fc16347e7549737" -+dependencies = [ -+ "bytes", -+ "http", -+ "pin-project-lite", -+] -+ -+[[package]] -+name = "httparse" -+version = "1.3.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bc35c995b9d93ec174cf9a27d425c7892722101e14993cd227fdb51d70cf9589" -+ -+[[package]] -+name = "httpdate" -+version = "0.3.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "494b4d60369511e7dea41cf646832512a94e542f68bb9c49e54518e0f468eb47" -+ -+[[package]] -+name = "hyper" -+version = "0.14.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8bf09f61b52cfcf4c00de50df88ae423d6c02354e385a86341133b5338630ad1" -+dependencies = [ -+ "bytes", -+ "futures-channel", -+ "futures-core", -+ "futures-util", -+ "h2", -+ "http", -+ "http-body", -+ "httparse", -+ "httpdate", -+ "itoa", -+ "pin-project", -+ "socket2", -+ "tokio", -+ "tower-service", -+ "tracing", -+ "want", -+] -+ -+[[package]] -+name = "hyper-rustls" -+version = "0.22.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5f9f7a97316d44c0af9b0301e65010573a853a9fc97046d7331d7f6bc0fd5a64" -+dependencies = [ -+ "ct-logs", -+ "futures-util", -+ "hyper", -+ "log", -+ "rustls", -+ "rustls-native-certs", -+ "tokio", -+ "tokio-rustls", -+ "webpki", -+] -+ -+[[package]] -+name = "ident_case" -+version = "1.0.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" -+ -+[[package]] -+name = "idna" -+version = "0.2.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "89829a5d69c23d348314a7ac337fe39173b61149a9864deabd260983aed48c21" -+dependencies = [ -+ "matches", -+ "unicode-bidi", -+ "unicode-normalization", -+] -+ -+[[package]] -+name = "indexmap" -+version = "1.6.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "824845a0bf897a9042383849b02c1bc219c2383772efcd5c6f9766fa4b81aef3" -+dependencies = [ -+ "autocfg", -+ "hashbrown", -+] -+ -+[[package]] -+name = "instant" -+version = "0.1.9" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec" -+dependencies = [ -+ "cfg-if", -+] -+ -+[[package]] -+name = "itoa" -+version = "0.4.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" -+ -+[[package]] -+name = "js-sys" -+version = "0.3.50" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2d99f9e3e84b8f67f846ef5b4cbbc3b1c29f6c759fcbce6f01aa0e73d932a24c" -+dependencies = [ -+ "wasm-bindgen", -+] -+ -+[[package]] -+name = "lazy_static" -+version = "1.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -+ -+[[package]] -+name = "lexical-core" -+version = "0.7.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "21f866863575d0e1d654fbeeabdc927292fdf862873dc3c96c6f753357e13374" -+dependencies = [ -+ "arrayvec", -+ "bitflags", -+ "cfg-if", -+ "ryu", -+ "static_assertions", -+] -+ -+[[package]] -+name = "libc" -+version = "0.2.93" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9385f66bf6105b241aa65a61cb923ef20efc665cb9f9bb50ac2f0c4b7f378d41" -+ -+[[package]] -+name = "libreddit" -+version = "0.10.1" -+dependencies = [ -+ "askama", -+ "async-recursion", -+ "cached", -+ "clap", -+ "cookie", -+ "futures-lite", -+ "hyper", -+ "hyper-rustls", -+ "regex", -+ "route-recognizer", -+ "serde", -+ "serde_json", -+ "time", -+ "tokio", -+ "url", -+] -+ -+[[package]] -+name = "lock_api" -+version = "0.4.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5a3c91c24eae6777794bb1997ad98bbb87daf92890acab859f7eaa4320333176" -+dependencies = [ -+ "scopeguard", -+] -+ -+[[package]] -+name = "log" -+version = "0.4.14" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" -+dependencies = [ -+ "cfg-if", -+] -+ -+[[package]] -+name = "matches" -+version = "0.1.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" -+ -+[[package]] -+name = "memchr" -+version = "2.3.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525" -+ -+[[package]] -+name = "mio" -+version = "0.7.11" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cf80d3e903b34e0bd7282b218398aec54e082c840d9baf8339e0080a0c542956" -+dependencies = [ -+ "libc", -+ "log", -+ "miow", -+ "ntapi", -+ "winapi", -+] -+ -+[[package]] -+name = "miow" -+version = "0.3.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" -+dependencies = [ -+ "winapi", -+] -+ -+[[package]] -+name = "nom" -+version = "6.1.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e7413f999671bd4745a7b624bd370a569fb6bc574b23c83a3c5ed2e453f3d5e2" -+dependencies = [ -+ "bitvec", -+ "funty", -+ "lexical-core", -+ "memchr", -+ "version_check", -+] -+ -+[[package]] -+name = "ntapi" -+version = "0.3.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44" -+dependencies = [ -+ "winapi", -+] -+ -+[[package]] -+name = "num_cpus" -+version = "1.13.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" -+dependencies = [ -+ "hermit-abi", -+ "libc", -+] -+ -+[[package]] -+name = "once_cell" -+version = "1.7.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3" -+ -+[[package]] -+name = "openssl-probe" -+version = "0.1.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" -+ -+[[package]] -+name = "parking" -+version = "2.0.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72" -+ -+[[package]] -+name = "parking_lot" -+version = "0.11.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb" -+dependencies = [ -+ "instant", -+ "lock_api", -+ "parking_lot_core", -+] -+ -+[[package]] -+name = "parking_lot_core" -+version = "0.8.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018" -+dependencies = [ -+ "cfg-if", -+ "instant", -+ "libc", -+ "redox_syscall", -+ "smallvec", -+ "winapi", -+] -+ -+[[package]] -+name = "percent-encoding" -+version = "2.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" -+ -+[[package]] -+name = "pin-project" -+version = "1.0.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bc174859768806e91ae575187ada95c91a29e96a98dc5d2cd9a1fed039501ba6" -+dependencies = [ -+ "pin-project-internal", -+] -+ -+[[package]] -+name = "pin-project-internal" -+version = "1.0.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a490329918e856ed1b083f244e3bfe2d8c4f336407e4ea9e1a9f479ff09049e5" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "pin-project-lite" -+version = "0.2.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dc0e1f259c92177c30a4c9d177246edd0a3568b25756a977d0632cf8fa37e905" -+ -+[[package]] -+name = "pin-utils" -+version = "0.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" -+ -+[[package]] -+name = "proc-macro-hack" -+version = "0.5.19" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" -+ -+[[package]] -+name = "proc-macro-nested" -+version = "0.1.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086" -+ -+[[package]] -+name = "proc-macro2" -+version = "1.0.26" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a152013215dca273577e18d2bf00fa862b89b24169fb78c4c95aeb07992c9cec" -+dependencies = [ -+ "unicode-xid", -+] -+ -+[[package]] -+name = "quote" -+version = "1.0.9" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" -+dependencies = [ -+ "proc-macro2", -+] -+ -+[[package]] -+name = "radium" -+version = "0.5.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8" -+ -+[[package]] -+name = "redox_syscall" -+version = "0.2.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "94341e4e44e24f6b591b59e47a8a027df12e008d73fd5672dbea9cc22f4507d9" -+dependencies = [ -+ "bitflags", -+] -+ -+[[package]] -+name = "regex" -+version = "1.4.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "957056ecddbeba1b26965114e191d2e8589ce74db242b6ea25fc4062427a5c19" -+dependencies = [ -+ "aho-corasick", -+ "memchr", -+ "regex-syntax", -+] -+ -+[[package]] -+name = "regex-syntax" -+version = "0.6.23" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "24d5f089152e60f62d28b835fbff2cd2e8dc0baf1ac13343bef92ab7eed84548" -+ -+[[package]] -+name = "ring" -+version = "0.16.20" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" -+dependencies = [ -+ "cc", -+ "libc", -+ "once_cell", -+ "spin", -+ "untrusted", -+ "web-sys", -+ "winapi", -+] -+ -+[[package]] -+name = "route-recognizer" -+version = "0.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "824172f0afccf3773c3905f5550ac94572144efe0deaf49a1f22bbca188d193e" -+ -+[[package]] -+name = "rustc_version" -+version = "0.2.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -+dependencies = [ -+ "semver", -+] -+ -+[[package]] -+name = "rustls" -+version = "0.19.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "064fd21ff87c6e87ed4506e68beb42459caa4a0e2eb144932e6776768556980b" -+dependencies = [ -+ "base64", -+ "log", -+ "ring", -+ "sct", -+ "webpki", -+] -+ -+[[package]] -+name = "rustls-native-certs" -+version = "0.5.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5a07b7c1885bd8ed3831c289b7870b13ef46fe0e856d288c30d9cc17d75a2092" -+dependencies = [ -+ "openssl-probe", -+ "rustls", -+ "schannel", -+ "security-framework", -+] -+ -+[[package]] -+name = "ryu" -+version = "1.0.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" -+ -+[[package]] -+name = "schannel" -+version = "0.1.19" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75" -+dependencies = [ -+ "lazy_static", -+ "winapi", -+] -+ -+[[package]] -+name = "scopeguard" -+version = "1.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" -+ -+[[package]] -+name = "sct" -+version = "0.6.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce" -+dependencies = [ -+ "ring", -+ "untrusted", -+] -+ -+[[package]] -+name = "security-framework" -+version = "2.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3670b1d2fdf6084d192bc71ead7aabe6c06aa2ea3fbd9cc3ac111fa5c2b1bd84" -+dependencies = [ -+ "bitflags", -+ "core-foundation", -+ "core-foundation-sys", -+ "libc", -+ "security-framework-sys", -+] -+ -+[[package]] -+name = "security-framework-sys" -+version = "2.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3676258fd3cfe2c9a0ec99ce3038798d847ce3e4bb17746373eb9f0f1ac16339" -+dependencies = [ -+ "core-foundation-sys", -+ "libc", -+] -+ -+[[package]] -+name = "semver" -+version = "0.9.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" -+dependencies = [ -+ "semver-parser", -+] -+ -+[[package]] -+name = "semver-parser" -+version = "0.7.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" -+ -+[[package]] -+name = "serde" -+version = "1.0.125" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "558dc50e1a5a5fa7112ca2ce4effcb321b0300c0d4ccf0776a9f60cd89031171" -+dependencies = [ -+ "serde_derive", -+] -+ -+[[package]] -+name = "serde_derive" -+version = "1.0.125" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b093b7a2bb58203b5da3056c05b4ec1fed827dcfdb37347a8841695263b3d06d" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "serde_json" -+version = "1.0.64" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79" -+dependencies = [ -+ "itoa", -+ "ryu", -+ "serde", -+] -+ -+[[package]] -+name = "sha1" -+version = "0.6.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d" -+ -+[[package]] -+name = "signal-hook-registry" -+version = "1.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "16f1d0fef1604ba8f7a073c7e701f213e056707210e9020af4528e0101ce11a6" -+dependencies = [ -+ "libc", -+] -+ -+[[package]] -+name = "slab" -+version = "0.4.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" -+ -+[[package]] -+name = "smallvec" -+version = "1.6.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" -+ -+[[package]] -+name = "socket2" -+version = "0.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9e3dfc207c526015c632472a77be09cf1b6e46866581aecae5cc38fb4235dea2" -+dependencies = [ -+ "libc", -+ "winapi", -+] -+ -+[[package]] -+name = "spin" -+version = "0.5.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" -+ -+[[package]] -+name = "standback" -+version = "0.2.17" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff" -+dependencies = [ -+ "version_check", -+] -+ -+[[package]] -+name = "static_assertions" -+version = "1.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" -+ -+[[package]] -+name = "stdweb" -+version = "0.4.20" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5" -+dependencies = [ -+ "discard", -+ "rustc_version", -+ "stdweb-derive", -+ "stdweb-internal-macros", -+ "stdweb-internal-runtime", -+ "wasm-bindgen", -+] -+ -+[[package]] -+name = "stdweb-derive" -+version = "0.5.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "serde", -+ "serde_derive", -+ "syn", -+] -+ -+[[package]] -+name = "stdweb-internal-macros" -+version = "0.2.9" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11" -+dependencies = [ -+ "base-x", -+ "proc-macro2", -+ "quote", -+ "serde", -+ "serde_derive", -+ "serde_json", -+ "sha1", -+ "syn", -+] -+ -+[[package]] -+name = "stdweb-internal-runtime" -+version = "0.1.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0" -+ -+[[package]] -+name = "strsim" -+version = "0.9.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c" -+ -+[[package]] -+name = "syn" -+version = "1.0.69" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "48fe99c6bd8b1cc636890bcc071842de909d902c81ac7dab53ba33c421ab8ffb" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "unicode-xid", -+] -+ -+[[package]] -+name = "tap" -+version = "1.0.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" -+ -+[[package]] -+name = "textwrap" -+version = "0.11.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -+dependencies = [ -+ "unicode-width", -+] -+ -+[[package]] -+name = "time" -+version = "0.2.26" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "08a8cbfbf47955132d0202d1662f49b2423ae35862aee471f3ba4b133358f372" -+dependencies = [ -+ "const_fn", -+ "libc", -+ "standback", -+ "stdweb", -+ "time-macros", -+ "version_check", -+ "winapi", -+] -+ -+[[package]] -+name = "time-macros" -+version = "0.1.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "957e9c6e26f12cb6d0dd7fc776bb67a706312e7299aed74c8dd5b17ebb27e2f1" -+dependencies = [ -+ "proc-macro-hack", -+ "time-macros-impl", -+] -+ -+[[package]] -+name = "time-macros-impl" -+version = "0.1.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e5c3be1edfad6027c69f5491cf4cb310d1a71ecd6af742788c6ff8bced86b8fa" -+dependencies = [ -+ "proc-macro-hack", -+ "proc-macro2", -+ "quote", -+ "standback", -+ "syn", -+] -+ -+[[package]] -+name = "tinyvec" -+version = "1.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5b5220f05bb7de7f3f53c7c065e1199b3172696fe2db9f9c4d8ad9b4ee74c342" -+dependencies = [ -+ "tinyvec_macros", -+] -+ -+[[package]] -+name = "tinyvec_macros" -+version = "0.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" -+ -+[[package]] -+name = "tokio" -+version = "1.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "134af885d758d645f0f0505c9a8b3f9bf8a348fd822e112ab5248138348f1722" -+dependencies = [ -+ "autocfg", -+ "bytes", -+ "libc", -+ "memchr", -+ "mio", -+ "num_cpus", -+ "once_cell", -+ "parking_lot", -+ "pin-project-lite", -+ "signal-hook-registry", -+ "tokio-macros", -+ "winapi", -+] -+ -+[[package]] -+name = "tokio-macros" -+version = "1.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "caf7b11a536f46a809a8a9f0bb4237020f70ecbf115b842360afb127ea2fda57" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "tokio-rustls" -+version = "0.22.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6" -+dependencies = [ -+ "rustls", -+ "tokio", -+ "webpki", -+] -+ -+[[package]] -+name = "tokio-util" -+version = "0.6.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5143d049e85af7fbc36f5454d990e62c2df705b3589f123b71f441b6b59f443f" -+dependencies = [ -+ "bytes", -+ "futures-core", -+ "futures-sink", -+ "log", -+ "pin-project-lite", -+ "tokio", -+] -+ -+[[package]] -+name = "tower-service" -+version = "0.3.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" -+ -+[[package]] -+name = "tracing" -+version = "0.1.25" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "01ebdc2bb4498ab1ab5f5b73c5803825e60199229ccba0698170e3be0e7f959f" -+dependencies = [ -+ "cfg-if", -+ "pin-project-lite", -+ "tracing-core", -+] -+ -+[[package]] -+name = "tracing-core" -+version = "0.1.17" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f50de3927f93d202783f4513cda820ab47ef17f624b03c096e86ef00c67e6b5f" -+dependencies = [ -+ "lazy_static", -+] -+ -+[[package]] -+name = "try-lock" -+version = "0.2.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" -+ -+[[package]] -+name = "unicode-bidi" -+version = "0.3.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "eeb8be209bb1c96b7c177c7420d26e04eccacb0eeae6b980e35fcb74678107e0" -+dependencies = [ -+ "matches", -+] -+ -+[[package]] -+name = "unicode-normalization" -+version = "0.1.17" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "07fbfce1c8a97d547e8b5334978438d9d6ec8c20e38f56d4a4374d181493eaef" -+dependencies = [ -+ "tinyvec", -+] -+ -+[[package]] -+name = "unicode-width" -+version = "0.1.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" -+ -+[[package]] -+name = "unicode-xid" -+version = "0.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" -+ -+[[package]] -+name = "untrusted" -+version = "0.7.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" -+ -+[[package]] -+name = "url" -+version = "2.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9ccd964113622c8e9322cfac19eb1004a07e636c545f325da085d5cdde6f1f8b" -+dependencies = [ -+ "form_urlencoded", -+ "idna", -+ "matches", -+ "percent-encoding", -+] -+ -+[[package]] -+name = "version_check" -+version = "0.9.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" -+ -+[[package]] -+name = "waker-fn" -+version = "1.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" -+ -+[[package]] -+name = "want" -+version = "0.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" -+dependencies = [ -+ "log", -+ "try-lock", -+] -+ -+[[package]] -+name = "wasm-bindgen" -+version = "0.2.73" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "83240549659d187488f91f33c0f8547cbfef0b2088bc470c116d1d260ef623d9" -+dependencies = [ -+ "cfg-if", -+ "wasm-bindgen-macro", -+] -+ -+[[package]] -+name = "wasm-bindgen-backend" -+version = "0.2.73" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ae70622411ca953215ca6d06d3ebeb1e915f0f6613e3b495122878d7ebec7dae" -+dependencies = [ -+ "bumpalo", -+ "lazy_static", -+ "log", -+ "proc-macro2", -+ "quote", -+ "syn", -+ "wasm-bindgen-shared", -+] -+ -+[[package]] -+name = "wasm-bindgen-macro" -+version = "0.2.73" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3e734d91443f177bfdb41969de821e15c516931c3c3db3d318fa1b68975d0f6f" -+dependencies = [ -+ "quote", -+ "wasm-bindgen-macro-support", -+] -+ -+[[package]] -+name = "wasm-bindgen-macro-support" -+version = "0.2.73" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d53739ff08c8a68b0fdbcd54c372b8ab800b1449ab3c9d706503bc7dd1621b2c" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+ "wasm-bindgen-backend", -+ "wasm-bindgen-shared", -+] -+ -+[[package]] -+name = "wasm-bindgen-shared" -+version = "0.2.73" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d9a543ae66aa233d14bb765ed9af4a33e81b8b58d1584cf1b47ff8cd0b9e4489" -+ -+[[package]] -+name = "web-sys" -+version = "0.3.50" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a905d57e488fec8861446d3393670fb50d27a262344013181c2cdf9fff5481be" -+dependencies = [ -+ "js-sys", -+ "wasm-bindgen", -+] -+ -+[[package]] -+name = "webpki" -+version = "0.21.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea" -+dependencies = [ -+ "ring", -+ "untrusted", -+] -+ -+[[package]] -+name = "winapi" -+version = "0.3.9" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -+dependencies = [ -+ "winapi-i686-pc-windows-gnu", -+ "winapi-x86_64-pc-windows-gnu", -+] -+ -+[[package]] -+name = "winapi-i686-pc-windows-gnu" -+version = "0.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" -+ -+[[package]] -+name = "winapi-x86_64-pc-windows-gnu" -+version = "0.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -+ -+[[package]] -+name = "wyz" -+version = "0.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214" diff --git a/third_party/nixpkgs/pkgs/servers/libreddit/default.nix b/third_party/nixpkgs/pkgs/servers/libreddit/default.nix index 374c0d1e36..744b5efe21 100644 --- a/third_party/nixpkgs/pkgs/servers/libreddit/default.nix +++ b/third_party/nixpkgs/pkgs/servers/libreddit/default.nix @@ -8,25 +8,19 @@ rustPlatform.buildRustPackage rec { pname = "libreddit"; - version = "0.10.1"; + version = "0.14.14"; src = fetchFromGitHub { owner = "spikecodes"; repo = pname; rev = "v${version}"; - sha256 = "0f5xla6fgq4l9g95gwwvfxksaxj4zpayrsjacf53akjpxaqvqxdj"; + sha256 = "sha256-duirX+X8moByV1urdgXjzTQ2zOfCfz7etzjDxkSKvhk="; }; - cargoSha256 = "039k6kncdgy6q2lbcssj5dm9npk0yss5m081ps4nmdj2vjrkphf0"; + cargoSha256 = "sha256-pFCERBnN386rW8ajpLWUHteCTWRmEiR19Sp5d8HXc5Y="; buildInputs = lib.optional stdenv.isDarwin Security; - cargoPatches = [ - # Patch file to add/update Cargo.lock in the source code - # https://github.com/spikecodes/libreddit/issues/191 - ./add-Cargo.lock.patch - ]; - passthru.tests = { inherit (nixosTests) libreddit; }; diff --git a/third_party/nixpkgs/pkgs/servers/maddy/default.nix b/third_party/nixpkgs/pkgs/servers/maddy/default.nix index 1a84cb9873..bc6071bff0 100644 --- a/third_party/nixpkgs/pkgs/servers/maddy/default.nix +++ b/third_party/nixpkgs/pkgs/servers/maddy/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "maddy"; - version = "0.4.4"; + version = "0.5.0"; src = fetchFromGitHub { owner = "foxcpp"; repo = "maddy"; rev = "v${version}"; - sha256 = "sha256-IhVEb6tjfbWqhQdw1UYxy4I8my2L+eSOCd/BEz0qis0="; + sha256 = "sha256-SxJfuNZBtwaILF4zD4hrTANc/GlOG53XVwg3NvKYAkg="; }; - vendorSha256 = "sha256-FrKWlZ3pQB+oo+rfHA8AgGRAr7YRUcb064bZGTDSKkk="; + vendorSha256 = "sha256-bxKEQaOubjRfLX+dMxVDzLOUInHykUdy9X8wvFE6Va4="; buildFlagsArray = [ "-ldflags=-s -w -X github.com/foxcpp/maddy.Version=${version}" ]; diff --git a/third_party/nixpkgs/pkgs/servers/mastodon/yarn.nix b/third_party/nixpkgs/pkgs/servers/mastodon/yarn.nix index 01aa11cfca..be436875f9 100644 --- a/third_party/nixpkgs/pkgs/servers/mastodon/yarn.nix +++ b/third_party/nixpkgs/pkgs/servers/mastodon/yarn.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec { +{ fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec { offline_cache = linkFarm "offline" packages; packages = [ { diff --git a/third_party/nixpkgs/pkgs/servers/matrix-appservice-discord/yarn-dependencies.nix b/third_party/nixpkgs/pkgs/servers/matrix-appservice-discord/yarn-dependencies.nix index 83923458bf..1d2246034e 100644 --- a/third_party/nixpkgs/pkgs/servers/matrix-appservice-discord/yarn-dependencies.nix +++ b/third_party/nixpkgs/pkgs/servers/matrix-appservice-discord/yarn-dependencies.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec { +{ fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec { offline_cache = linkFarm "offline" packages; packages = [ { @@ -683,7 +683,7 @@ sha256 = "1iy8as2ax50xqp1bkqb18dspkdjw6qdmvz803xaijp14bwx0shja"; }; in - runCommandNoCC "git___github.com_Sorunome_better_discord.js.git" { buildInputs = [gnutar]; } '' + runCommand "git___github.com_Sorunome_better_discord.js.git" { buildInputs = [gnutar]; } '' # Set u+w because tar-fs can't unpack archives with read-only dirs # https://github.com/mafintosh/tar-fs/issues/79 tar cf $out --mode u+w -C ${repo} . @@ -1291,7 +1291,7 @@ sha256 = "0p7hlgdyfcipfjjx5hxwkqd524cmys9yxgqx29wmqkgjxp8xgwhy"; }; in - runCommandNoCC "git___github.com_Sorunome_discord_markdown.git" { buildInputs = [gnutar]; } '' + runCommand "git___github.com_Sorunome_discord_markdown.git" { buildInputs = [gnutar]; } '' # Set u+w because tar-fs can't unpack archives with read-only dirs # https://github.com/mafintosh/tar-fs/issues/79 tar cf $out --mode u+w -C ${repo} . diff --git a/third_party/nixpkgs/pkgs/servers/matrix-synapse/0001-setup-add-homeserver-as-console-script.patch b/third_party/nixpkgs/pkgs/servers/matrix-synapse/0001-setup-add-homeserver-as-console-script.patch new file mode 100644 index 0000000000..eb70d21ed5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/matrix-synapse/0001-setup-add-homeserver-as-console-script.patch @@ -0,0 +1,33 @@ +From 36ffbb7ad2c535180cae473b470a43f9db4fbdcd Mon Sep 17 00:00:00 2001 +From: Maximilian Bosch +Date: Mon, 16 Aug 2021 13:27:28 +0200 +Subject: [PATCH] setup: add homeserver as console script + +With this change, it will be added to `$out/bin` in `nixpkgs` directly. +This became necessary since our old workaround, calling it as script, +doesn't work anymore since the shebangs were removed[1]. + +[1] https://github.com/matrix-org/synapse/pull/10415 +--- + setup.py | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/setup.py b/setup.py +index c47856351..27f1d842c 100755 +--- a/setup.py ++++ b/setup.py +@@ -133,6 +133,11 @@ setup( + long_description=long_description, + long_description_content_type="text/x-rst", + python_requires="~=3.6", ++ entry_points={ ++ 'console_scripts': [ ++ 'homeserver = synapse.app.homeserver:main' ++ ] ++ }, + classifiers=[ + "Development Status :: 5 - Production/Stable", + "Topic :: Communications :: Chat", +-- +2.31.1 + diff --git a/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix b/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix index 982ced37df..4cac9bdcb3 100644 --- a/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix +++ b/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix @@ -12,16 +12,15 @@ let in buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.39.0"; + version = "1.40.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-dErfNHDUo0yGLbrRQdwbNkMVfnMfbrO3f7bsRwgRQMM="; + sha256 = "sha256-5RCeKTAtuFERQSoz4WinGz36tMuKtijnupPR/X02hCU="; }; patches = [ - # adds an entry point for the service - ./homeserver-script.patch + ./0001-setup-add-homeserver-as-console-script.patch ]; buildInputs = [ openssl ]; diff --git a/third_party/nixpkgs/pkgs/servers/matrix-synapse/homeserver-script.patch b/third_party/nixpkgs/pkgs/servers/matrix-synapse/homeserver-script.patch deleted file mode 100644 index 554a2c5f66..0000000000 --- a/third_party/nixpkgs/pkgs/servers/matrix-synapse/homeserver-script.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/homeserver b/homeserver -new file mode 120000 -index 000000000..2f1d41351 ---- /dev/null -+++ b/homeserver -@@ -0,0 +1 @@ -+synapse/app/homeserver.py -\ No newline at end of file -diff --git a/setup.py b/setup.py -index 5ce06c898..f1ccd95bc 100755 ---- a/setup.py -+++ b/setup.py -@@ -115,6 +115,6 @@ setup( - "Programming Language :: Python :: 3.6", - "Programming Language :: Python :: 3.7", - ], -- scripts=["synctl"] + glob.glob("scripts/*"), -+ scripts=["synctl", "homeserver"] + glob.glob("scripts/*"), - cmdclass={"test": TestCommand}, - ) --- -2.22.0 - diff --git a/third_party/nixpkgs/pkgs/servers/matterbridge/default.nix b/third_party/nixpkgs/pkgs/servers/matterbridge/default.nix index a3e898e048..575069cce8 100644 --- a/third_party/nixpkgs/pkgs/servers/matterbridge/default.nix +++ b/third_party/nixpkgs/pkgs/servers/matterbridge/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "matterbridge"; - version = "1.22.2"; + version = "1.22.3"; src = fetchFromGitHub { owner = "42wim"; repo = pname; rev = "v${version}"; - sha256 = "sha256-H6Cy6yvX57QLNfZPeansZv6IJ4uQVqr0h24QsAlrLx8="; + sha256 = "sha256-YBIDNyjS8Si7A2Bciz5M8jY3JrgKOmlDPT0m5QM/9+Y="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/servers/mattermost/matterircd.nix b/third_party/nixpkgs/pkgs/servers/mattermost/matterircd.nix index af2f9e6af1..fa10d140e4 100644 --- a/third_party/nixpkgs/pkgs/servers/mattermost/matterircd.nix +++ b/third_party/nixpkgs/pkgs/servers/mattermost/matterircd.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "matterircd"; - version = "0.23.1"; + version = "0.24.2"; src = fetchFromGitHub { owner = "42wim"; repo = "matterircd"; rev = "v${version}"; - sha256 = "sha256-1oItl0mLyAFah9qaaYl+IAT/H4X+GW82GBHYuLWacVI="; + sha256 = "sha256-SatnrRKYCngBZJwRNMad9Vt2xd7FktH79t3TB83cwhg="; }; goPackagePath = "github.com/42wim/matterircd"; diff --git a/third_party/nixpkgs/pkgs/servers/mautrix-signal/default.nix b/third_party/nixpkgs/pkgs/servers/mautrix-signal/default.nix index 76897d9282..365df2fec6 100644 --- a/third_party/nixpkgs/pkgs/servers/mautrix-signal/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mautrix-signal/default.nix @@ -2,13 +2,13 @@ python3.pkgs.buildPythonPackage rec { pname = "mautrix-signal"; - version = "unstable-2021-07-01"; + version = "unstable-2021-08-12"; src = fetchFromGitHub { owner = "tulir"; repo = "mautrix-signal"; - rev = "56eb24412fcafb4836f29375fba9cc6db1715d6f"; - sha256 = "10nbfl48yb7h23znkxvkqh1dgp2xgldvxsigwfmwa1qbq0l4dljl"; + rev = "a592baaaa6c9ab7ec29edc84f069b9e9e2fc1b03"; + sha256 = "0rvidf4ah23x8m7k7hbkwm2xrs838wnli99gh99b5hr6fqmacbwl"; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/servers/mautrix-telegram/default.nix b/third_party/nixpkgs/pkgs/servers/mautrix-telegram/default.nix index 41d0d5b046..9764e4ab3e 100644 --- a/third_party/nixpkgs/pkgs/servers/mautrix-telegram/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mautrix-telegram/default.nix @@ -23,21 +23,24 @@ let in python.pkgs.buildPythonPackage rec { pname = "mautrix-telegram"; - version = "0.10.0"; + version = "unstable-2021-08-12"; disabled = python.pythonOlder "3.7"; src = fetchFromGitHub { owner = "tulir"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-lLVKD+/pKqs8oWBdyL+R1lk22LqQOC9nbMlxhCK39xA="; + rev = "ec64c83cb01791525a39f937f3b847368021dce8"; + sha256 = "0rg4f4abdddhhf1xpz74y4468dv3mnm7k8nj161r1xszrk9f2n76"; }; patches = [ ./0001-Re-add-entrypoint.patch ./0002-Don-t-depend-on-pytest-runner.patch ]; postPatch = '' sed -i -e '/alembic>/d' requirements.txt + substituteInPlace requirements.txt \ + --replace "telethon>=1.22,<1.23" "telethon" ''; + propagatedBuildInputs = with python.pkgs; ([ Mako aiohttp diff --git a/third_party/nixpkgs/pkgs/servers/misc/navidrome/default.nix b/third_party/nixpkgs/pkgs/servers/misc/navidrome/default.nix index 065184b771..15c424394f 100644 --- a/third_party/nixpkgs/pkgs/servers/misc/navidrome/default.nix +++ b/third_party/nixpkgs/pkgs/servers/misc/navidrome/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchurl, ffmpeg, ffmpegSupport ? true, makeWrapper }: +{ lib, stdenv, fetchurl, ffmpeg, ffmpegSupport ? true, makeWrapper, nixosTests }: with lib; stdenv.mkDerivation rec { pname = "navidrome"; - version = "0.43.0"; + version = "0.44.1"; src = fetchurl { url = "https://github.com/deluan/navidrome/releases/download/v${version}/navidrome_${version}_Linux_x86_64.tar.gz"; - sha256 = "0y7a5n8phffxga1bjkaf7x5ijripqg1nfjljkrrj26778550vqb5"; + sha256 = "sha256-2lnj6aNLPeLwxgyRUQFOQJDsOSMu9Banez8RMMQs74Y="; }; nativeBuildInputs = [ makeWrapper ]; @@ -31,6 +31,8 @@ stdenv.mkDerivation rec { --prefix PATH : ${makeBinPath (optional ffmpegSupport ffmpeg)} ''; + passthru.tests.navidrome = nixosTests.navidrome; + meta = { description = "Navidrome Music Server and Streamer compatible with Subsonic/Airsonic"; homepage = "https://www.navidrome.org/"; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/grafana-agent/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/grafana-agent/default.nix index 6b9067d65d..c7c3fb37b7 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/grafana-agent/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/grafana-agent/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "grafana-agent"; - version = "0.18.1"; + version = "0.18.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "grafana"; repo = "agent"; - sha256 = "sha256-sKD9ulA6iaaI5yMja0ohDlXDNH4jZzyJWlXdvJo3Q2g="; + sha256 = "sha256-yTCFMnOSRgMqL9KD26cYeJcQ1rrUBOf8I+i7IPExP9I="; }; vendorSha256 = "sha256-MZGOZB/mS3pmZuI35E/QkaNLLhbuW2DfZiih9OCXMj0="; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/grafana-image-renderer/yarn.nix b/third_party/nixpkgs/pkgs/servers/monitoring/grafana-image-renderer/yarn.nix index 7eb3a3bb8a..5cec9f36ef 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/grafana-image-renderer/yarn.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/grafana-image-renderer/yarn.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec { +{ fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec { offline_cache = linkFarm "offline" packages; packages = [ { diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/promscale.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/promscale.nix index 5b0b308c5e..0727616de3 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/promscale.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/promscale.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "promscale"; - version = "0.4.1"; + version = "0.5.1"; src = fetchFromGitHub { owner = "timescale"; repo = pname; rev = version; - sha256 = "sha256-RdhsQtrD+I8eAgFNr1hvW83Ho22aNhWBX8crCM0b8jU="; + sha256 = "sha256-u9qlABTuQ4EWEfyei6nN/AZ7j9QJXQ61GvyhP8wEmK0="; }; - vendorSha256 = "sha256-82E82O0yaLbu+oSTX7AQoYXFYy3wYVdBCevV7pHZVOA="; + vendorSha256 = "sha256-DFDTYT7UK1cYwGeCgeQcJmrCoqGPDzicusRPPUbH0Gs="; buildFlagsArray = [ "-ldflags=-s -w -X github.com/timescale/promscale/pkg/version.Version=${version} -X github.com/timescale/promscale/pkg/version.CommitHash=${src.rev}" ]; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/webui-yarndeps.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/webui-yarndeps.nix index 496d2fff4a..c8c4e50e0e 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/webui-yarndeps.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/webui-yarndeps.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec { +{ fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec { offline_cache = linkFarm "offline" packages; packages = [ { diff --git a/third_party/nixpkgs/pkgs/servers/nats-server/default.nix b/third_party/nixpkgs/pkgs/servers/nats-server/default.nix index 4f62c6f777..0d7904d69c 100644 --- a/third_party/nixpkgs/pkgs/servers/nats-server/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nats-server/default.nix @@ -4,7 +4,7 @@ with lib; buildGoPackage rec { pname = "nats-server"; - version = "2.2.1"; + version = "2.3.4"; goPackagePath = "github.com/nats-io/${pname}"; @@ -12,7 +12,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "nats-io"; repo = pname; - sha256 = "sha256-LQ817nZrFkF1zdj2m2SQK58BqDbUPSnncSWR+Woi+Ao="; + sha256 = "sha256-VNnL1v7R8cko9C/494XJh4aMRZv459tAHys9nmrA9QE="; }; meta = { diff --git a/third_party/nixpkgs/pkgs/servers/nats-streaming-server/default.nix b/third_party/nixpkgs/pkgs/servers/nats-streaming-server/default.nix index bf6d95b65d..3de95b4f11 100644 --- a/third_party/nixpkgs/pkgs/servers/nats-streaming-server/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nats-streaming-server/default.nix @@ -4,14 +4,14 @@ with lib; buildGoPackage rec { pname = "nats-streaming-server"; - version = "0.21.1"; + version = "0.22.1"; goPackagePath = "github.com/nats-io/${pname}"; src = fetchFromGitHub { rev = "v${version}"; owner = "nats-io"; repo = pname; - sha256 = "sha256-GqnIGnXcOcfbAgUruVxsTSvi6pH1E3QugEmZr3tPiIY="; + sha256 = "sha256-VdYyui0fyoNf1q3M1xTg/UMlxIFABqAbqQaD0bLpKCY="; }; meta = { diff --git a/third_party/nixpkgs/pkgs/servers/nosql/influxdb2/influx-ui-yarndeps.nix b/third_party/nixpkgs/pkgs/servers/nosql/influxdb2/influx-ui-yarndeps.nix index 53795e7632..bc92013b14 100644 --- a/third_party/nixpkgs/pkgs/servers/nosql/influxdb2/influx-ui-yarndeps.nix +++ b/third_party/nixpkgs/pkgs/servers/nosql/influxdb2/influx-ui-yarndeps.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec { +{ fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec { offline_cache = linkFarm "offline" packages; packages = [ { diff --git a/third_party/nixpkgs/pkgs/servers/nosql/mongodb/mongodb.nix b/third_party/nixpkgs/pkgs/servers/nosql/mongodb/mongodb.nix index 8a66528d81..7c66d348ff 100644 --- a/third_party/nixpkgs/pkgs/servers/nosql/mongodb/mongodb.nix +++ b/third_party/nixpkgs/pkgs/servers/nosql/mongodb/mongodb.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, sconsPackages, boost, gperftools, pcre-cpp, snappy, zlib, libyamlcpp -, sasl, openssl, libpcap, python27, python38, curl, Security, CoreFoundation, cctools }: +, sasl, openssl, libpcap, curl, Security, CoreFoundation, cctools }: # Note: # The command line tools are written in Go as part of a different package (mongodb-tools) @@ -12,17 +12,16 @@ with lib; let variants = if versionAtLeast version "4.2" - then { python = python38.withPackages (ps: with ps; [ pyyaml cheetah3 psutil setuptools ]); + then rec { python = scons.python.withPackages (ps: with ps; [ pyyaml cheetah3 psutil setuptools ]); scons = sconsPackages.scons_latest; mozjsVersion = "60"; mozjsReplace = "defined(HAVE___SINCOS)"; } - else { python = python27.withPackages (ps: with ps; [ pyyaml typing cheetah ]); + else rec { python = scons.python.withPackages (ps: with ps; [ pyyaml typing cheetah ]); scons = sconsPackages.scons_3_1_2; mozjsVersion = "45"; mozjsReplace = "defined(HAVE_SINCOS)"; }; - python = python27.withPackages (ps: with ps; [ pyyaml typing cheetah ]); system-libraries = [ "boost" "pcre" diff --git a/third_party/nixpkgs/pkgs/servers/plex/raw.nix b/third_party/nixpkgs/pkgs/servers/plex/raw.nix index 1d404f1fa1..40c2d3310f 100644 --- a/third_party/nixpkgs/pkgs/servers/plex/raw.nix +++ b/third_party/nixpkgs/pkgs/servers/plex/raw.nix @@ -12,16 +12,16 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.23.6.4881-e2e58f321"; + version = "1.24.0.4930-ab6e1a058"; pname = "plexmediaserver"; # Fetch the source src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb"; - sha256 = "02vmisqcrchr48pdx61ysfd9j95i5vyr30k20inx3xk4rj50a3cl"; + sha256 = "0fhbm2ykk2nx1j619kpzgw32rgbh2snh8g25m7k42cpmg4a3zz4m"; } else fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb"; - sha256 = "1wf48h8aqzg5wszp2rcx9mv8xv6xsnqh405z3jna65mxhycf4cv9"; + sha256 = "0h1vk8ads1jrb5adcpfrz1qdf60jw4wiss9zzcyamfry1ir94n3r"; }; outputs = [ "out" "basedb" ]; diff --git a/third_party/nixpkgs/pkgs/servers/pounce/default.nix b/third_party/nixpkgs/pkgs/servers/pounce/default.nix index 3ff6b112a9..8e1b0864c9 100644 --- a/third_party/nixpkgs/pkgs/servers/pounce/default.nix +++ b/third_party/nixpkgs/pkgs/servers/pounce/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pounce"; - version = "2.3"; + version = "2.4"; src = fetchzip { url = "https://git.causal.agency/pounce/snapshot/pounce-${version}.tar.gz"; - sha256 = "0pk3kwr6k6dz2vdx1kyv7mhj756j4bwsmdlmjzhh8ghczjqp2s2x"; + sha256 = "sha256-bEObiqgkSarYILwZE70OjRyEUy3QZg+FLocWljFRGNc="; }; buildInputs = [ libressl ]; diff --git a/third_party/nixpkgs/pkgs/servers/rtsp-simple-server/default.nix b/third_party/nixpkgs/pkgs/servers/rtsp-simple-server/default.nix index baf364cfec..df4825149f 100644 --- a/third_party/nixpkgs/pkgs/servers/rtsp-simple-server/default.nix +++ b/third_party/nixpkgs/pkgs/servers/rtsp-simple-server/default.nix @@ -5,22 +5,24 @@ buildGoModule rec { pname = "rtsp-simple-server"; - version = "0.15.4"; + version = "0.17.1"; src = fetchFromGitHub { owner = "aler9"; repo = pname; rev = "v${version}"; - sha256 = "sha256-6XdX4HEjDRt9WtqyHIv/NLt7IytNDeJLgCeTHTGybRI="; + sha256 = "sha256-8g9taSFEprJEEPM0hrbCf5QDE41uVdgVVIWjhfEICpU="; }; - vendorSha256 = "sha256-T5LWbxYsKnG5eaYLR/rms6+2DXv2lV9o39BvF7HapZY="; + vendorSha256 = "sha256-buQW5jMnHyHc/oYdmfTnoktFRG3V3SNxn7t5mAwmiJI="; # Tests need docker doCheck = false; buildFlagsArray = [ - "-ldflags=-X main.Version=${version}" + # In the future, we might need to switch to `main.Version`, considering: + # https://github.com/aler9/rtsp-simple-server/issues/503 + "-ldflags=-X github.com/aler9/rtsp-simple-server/internal/core.version=v${version}" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/servers/samba/4.x.nix b/third_party/nixpkgs/pkgs/servers/samba/4.x.nix index eb03ea3ef6..d75b204db2 100644 --- a/third_party/nixpkgs/pkgs/servers/samba/4.x.nix +++ b/third_party/nixpkgs/pkgs/servers/samba/4.x.nix @@ -139,6 +139,9 @@ stdenv.mkDerivation rec { ++ optional (!enablePam) "--without-pam" ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "--bundled-libraries=!asn1_compile,!compile_et" + ] ++ optional stdenv.isAarch32 [ + # https://bugs.gentoo.org/683148 + "--jobs 1" ]; # python-config from build Python gives incorrect values when cross-compiling. diff --git a/third_party/nixpkgs/pkgs/servers/sql/dolt/default.nix b/third_party/nixpkgs/pkgs/servers/sql/dolt/default.nix index 113866c391..2d9bf72832 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/dolt/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/dolt/default.nix @@ -1,27 +1,26 @@ { fetchFromGitHub, lib, buildGoModule }: buildGoModule rec { - pname = "dolt"; - version = "0.27.2"; + pname = "dolt"; + version = "0.27.4"; - src = fetchFromGitHub { - owner = "liquidata-inc"; - repo = "dolt"; - rev = "v${version}"; - sha256 = "sha256-Px2b0s10N5uDYsz95/1cT2tfS/NfhRfKmCdXIaMb5Po="; - }; + src = fetchFromGitHub { + owner = "liquidata-inc"; + repo = "dolt"; + rev = "v${version}"; + sha256 = "sha256-q3zs402E3mqvxAuf/ll/ao9/c9NOWR7uYJMbieFXS1U="; + }; - modRoot = "./go"; - subPackages = [ "cmd/dolt" "cmd/git-dolt" "cmd/git-dolt-smudge" ]; - vendorSha256 = "sha256-6KjSmxNLY0msMqpPZR7LUZV63Pj6JGhGVRWTKbbnDtk="; + modRoot = "./go"; + subPackages = [ "cmd/dolt" "cmd/git-dolt" "cmd/git-dolt-smudge" ]; + vendorSha256 = "sha256-zF7pofbYrVzEiW6zttyePuEWueqKRKclc0WrYwb1bCU="; doCheck = false; - meta = with lib; { - description = "Relational database with version control and CLI a-la Git"; - homepage = "https://github.com/liquidata-inc/dolt"; - license = licenses.asl20; - maintainers = with maintainers; [ danbst ]; - platforms = platforms.linux ++ platforms.darwin; - }; + meta = with lib; { + description = "Relational database with version control and CLI a-la Git"; + homepage = "https://github.com/liquidata-inc/dolt"; + license = licenses.asl20; + maintainers = with maintainers; [ danbst ]; + }; } diff --git a/third_party/nixpkgs/pkgs/servers/teleport/default.nix b/third_party/nixpkgs/pkgs/servers/teleport/default.nix index fc5910a1ae..97c8568e40 100644 --- a/third_party/nixpkgs/pkgs/servers/teleport/default.nix +++ b/third_party/nixpkgs/pkgs/servers/teleport/default.nix @@ -1,5 +1,5 @@ # This file was generated by https://github.com/kamilchm/go2nix v2.0-dev -{ lib, buildGoModule, zip, fetchFromGitHub, makeWrapper, xdg-utils }: +{ lib, buildGoModule, fetchFromGitHub, makeWrapper, xdg-utils }: let webassets = fetchFromGitHub { owner = "gravitational"; @@ -10,14 +10,14 @@ let in buildGoModule rec { pname = "teleport"; - version = "7.0.0"; + version = "7.0.2"; # This repo has a private submodule "e" which fetchgit cannot handle without failing. src = fetchFromGitHub { owner = "gravitational"; repo = "teleport"; rev = "v${version}"; - sha256 = "sha256-2GQ3IP5jfT6vSni5hfDex09wXrnUmTpcvH2S6zc399I="; + sha256 = "sha256-Sj7WQRgEiU5G/MDKFtEy/KJ2g0WENxbCnMA9CNcTUaY="; }; vendorSha256 = null; @@ -25,7 +25,7 @@ buildGoModule rec { subPackages = [ "tool/tctl" "tool/teleport" "tool/tsh" ]; tags = [ "webassets_embed" ]; - nativeBuildInputs = [ zip makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; patches = [ # https://github.com/NixOS/nixpkgs/issues/120738 @@ -41,7 +41,7 @@ buildGoModule rec { mkdir -p build echo "making webassets" cp -r ${webassets}/* webassets/ - make lib/web/build/webassets.zip + make lib/web/build/webassets ''; preCheck = '' diff --git a/third_party/nixpkgs/pkgs/servers/unpackerr/default.nix b/third_party/nixpkgs/pkgs/servers/unpackerr/default.nix index d9cde6b7ab..0d1505a91c 100644 --- a/third_party/nixpkgs/pkgs/servers/unpackerr/default.nix +++ b/third_party/nixpkgs/pkgs/servers/unpackerr/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "unpackerr"; - version = "0.9.6"; + version = "0.9.7"; src = fetchFromGitHub { owner = "davidnewhall"; repo = "unpackerr"; rev = "v${version}"; - sha256 = "1jyqrfik6fy7d4lr1y0ryp4iz8yn898ksyxwaryvrhykznqivp0y"; + sha256 = "sha256-OJDFPSXbJffiKW1SmMptPxj69YU7cuOU1LgIiInurCM="; }; - vendorSha256 = "0ilpg7xfll0c5lsv8zf4h3i72yabddkddih4d292hczyz9wi3j4z"; + vendorSha256 = "sha256-n8gRefr+MyiSaATG1mZrS3lx4oDEfbQ1LQxQ6vp5l0Y="; buildInputs = lib.optionals stdenv.isDarwin [ Cocoa WebKit ]; diff --git a/third_party/nixpkgs/pkgs/servers/urserver/default.nix b/third_party/nixpkgs/pkgs/servers/urserver/default.nix index 9047ea0ee3..392277eeed 100644 --- a/third_party/nixpkgs/pkgs/servers/urserver/default.nix +++ b/third_party/nixpkgs/pkgs/servers/urserver/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "urserver"; - version = "3.9.0.2465"; + version = "3.10.0.2467"; src = fetchurl { url = "https://www.unifiedremote.com/static/builds/server/linux-x64/${builtins.elemAt (builtins.splitVersion version) 3}/urserver-${version}.tar.gz"; - sha256 = "sha256-3DIroodWCMbq1fzPjhuGLk/2fY/qFxFISLzjkjJ4i90="; + sha256 = "sha256-IaLRhia6mb4h7x5MbBRtPJxJ3uTlkfOzmoTwYzwfbWA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/servers/varnish/default.nix b/third_party/nixpkgs/pkgs/servers/varnish/default.nix index 1fbb36257d..1d4a3276cc 100644 --- a/third_party/nixpkgs/pkgs/servers/varnish/default.nix +++ b/third_party/nixpkgs/pkgs/servers/varnish/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pcre, libxslt, groff, ncurses, pkg-config, readline, libedit +{ lib, stdenv, fetchurl, pcre, libxslt, groff, ncurses, pkg-config, readline, libedit, coreutils , python3, makeWrapper }: let @@ -21,6 +21,10 @@ let buildFlags = [ "localstatedir=/var/spool" ]; + postPatch = '' + substituteInPlace bin/varnishtest/vtc_main.c --replace /bin/rm "${coreutils}/bin/rm" + ''; + postInstall = '' wrapProgram "$out/sbin/varnishd" --prefix PATH : "${lib.makeBinPath [ stdenv.cc ]}" ''; @@ -44,12 +48,8 @@ in version = "6.0.7"; sha256 = "0njs6xpc30nc4chjdm4d4g63bigbxhi4dc46f4az3qcz51r8zl2a"; }; - varnish62 = common { - version = "6.2.3"; - sha256 = "02b6pqh5j1d4n362n42q42bfjzjrngd6x49b13q7wzsy6igd1jsy"; - }; - varnish63 = common { - version = "6.3.2"; - sha256 = "1f5ahzdh3am6fij5jhiybv3knwl11rhc5r3ig1ybzw55ai7788q8"; + varnish65 = common { + version = "6.5.2"; + sha256 = "041gc22h8cwsb8jw7zdv6yk5h8xg2q0g655m5zhi5jxq35f2sljx"; }; } diff --git a/third_party/nixpkgs/pkgs/servers/varnish/digest.nix b/third_party/nixpkgs/pkgs/servers/varnish/digest.nix index 4511eb3a72..31aaad835b 100644 --- a/third_party/nixpkgs/pkgs/servers/varnish/digest.nix +++ b/third_party/nixpkgs/pkgs/servers/varnish/digest.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, varnish, libmhash, docutils }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, varnish, libmhash, docutils, coreutils, version, sha256 }: stdenv.mkDerivation rec { - version = "1.0.2"; pname = "${varnish.name}-digest"; + inherit version; src = fetchFromGitHub { owner = "varnish"; repo = "libvmod-digest"; - rev = "libvmod-digest-${version}"; - sha256 = "0jwkqqalydn0pwfdhirl5zjhbc3hldvhh09hxrahibr72fgmgpbx"; + rev = version; + inherit sha256; }; nativeBuildInputs = [ autoreconfHook pkg-config docutils ]; diff --git a/third_party/nixpkgs/pkgs/servers/varnish/dynamic.nix b/third_party/nixpkgs/pkgs/servers/varnish/dynamic.nix index 637380a5ab..78fd4d1064 100644 --- a/third_party/nixpkgs/pkgs/servers/varnish/dynamic.nix +++ b/third_party/nixpkgs/pkgs/servers/varnish/dynamic.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook269, pkg-config, varnish, docutils }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook269, pkg-config, varnish, docutils, version, sha256 }: -stdenv.mkDerivation rec { - version = "0.4"; +stdenv.mkDerivation { pname = "${varnish.name}-dynamic"; + inherit version; src = fetchFromGitHub { owner = "nigoroll"; repo = "libvmod-dynamic"; rev = "v${version}"; - sha256 = "1n94slrm6vn3hpymfkla03gw9603jajclg84bjhwb8kxsk3rxpmk"; + inherit sha256; }; nativeBuildInputs = [ pkg-config docutils autoreconfHook269 varnish.python ]; diff --git a/third_party/nixpkgs/pkgs/servers/varnish/packages.nix b/third_party/nixpkgs/pkgs/servers/varnish/packages.nix index a5c5fe868d..647247acaf 100644 --- a/third_party/nixpkgs/pkgs/servers/varnish/packages.nix +++ b/third_party/nixpkgs/pkgs/servers/varnish/packages.nix @@ -1,15 +1,28 @@ -{ callPackage, varnish60, varnish62, varnish63 }: - -{ - varnish60Packages = { +{ callPackage, varnish60, varnish65, fetchFromGitHub }: { + varnish60Packages = rec { varnish = varnish60; - digest = callPackage ./digest.nix { varnish = varnish60; }; - dynamic = callPackage ./dynamic.nix { varnish = varnish60; }; + digest = callPackage ./digest.nix { + inherit varnish; + version = "libvmod-digest-1.0.2"; + sha256 = "0jwkqqalydn0pwfdhirl5zjhbc3hldvhh09hxrahibr72fgmgpbx"; + }; + dynamic = callPackage ./dynamic.nix { + inherit varnish; + version = "0.4"; + sha256 = "1n94slrm6vn3hpymfkla03gw9603jajclg84bjhwb8kxsk3rxpmk"; + }; }; - varnish62Packages = { - varnish = varnish62; - }; - varnish63Packages = { - varnish = varnish63; + varnish65Packages = rec { + varnish = varnish65; + digest = callPackage ./digest.nix { + inherit varnish; + version = "6.6"; + sha256 = "0n33g8ml4bsyvcvl5lk7yng1ikvmcv8dd6bc1mv2lj4729pp97nn"; + }; + dynamic = callPackage ./dynamic.nix { + inherit varnish; + version = "2.3.1"; + sha256 = "060vkba7jwcvx5704hh6ds0g0kfzpkdrg8548frvkrkz2s5j9y88"; + }; }; } diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/auto_generated_path.patch b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/auto_generated_path.patch new file mode 100644 index 0000000000..9dcb1cb559 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/auto_generated_path.patch @@ -0,0 +1,13 @@ +diff --git a/lib/plugin/instance.rb b/lib/plugin/instance.rb +index 380a63e987..b2ce7fa982 100644 +--- a/lib/plugin/instance.rb ++++ b/lib/plugin/instance.rb +@@ -403,7 +403,7 @@ class Plugin::Instance + end + + def auto_generated_path +- File.dirname(path) << "/auto_generated" ++ "#{Rails.root}/public/assets/auto_generated_plugin_assets/#{name}" + end + + def after_initialize(&block) diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/default.nix index 74bd9a7223..ca0f30d789 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/default.nix @@ -1,4 +1,4 @@ -{ stdenv, makeWrapper, runCommandNoCC, lib, nixosTests, writeShellScript +{ stdenv, pkgs, makeWrapper, runCommand, lib, writeShellScript , fetchFromGitHub, bundlerEnv, callPackage , ruby, replace, gzip, gnutar, git, cacert, util-linux, gawk @@ -6,16 +6,16 @@ , redis, postgresql, which, brotli, procps, rsync, nodePackages, v8 , plugins ? [] -}: +}@args: let - version = "2.7.5"; + version = "2.7.7"; src = fetchFromGitHub { owner = "discourse"; repo = "discourse"; rev = "v${version}"; - sha256 = "sha256-OykWaiBAHcZy41i+aRzBHCRgwnfQUBijHjb+ofIk25M="; + sha256 = "sha256-rhcTQyirgPX0ITjgotJAYLLSU957GanxAYYhy9j123U="; }; runtimeDeps = [ @@ -55,6 +55,7 @@ let , version ? null , meta ? null , bundlerEnvArgs ? {} + , preserveGemsDir ? false , src , ... }@args: @@ -71,14 +72,23 @@ let runHook preInstall mkdir -p $out cp -r * $out/ - '' + lib.optionalString (bundlerEnvArgs != {}) '' - ln -sf ${rubyEnv}/lib/ruby/gems $out/gems - '' + '' + '' + lib.optionalString (bundlerEnvArgs != {}) ( + if preserveGemsDir then '' + cp -r ${rubyEnv}/lib/ruby/gems/* $out/gems/ + '' + else '' + if [[ -e $out/gems ]]; then + echo "Warning: The repo contains a 'gems' directory which will be removed!" + echo " If you need to preserve it, set 'preserveGemsDir = true'." + rm -r $out/gems + fi + ln -sf ${rubyEnv}/lib/ruby/gems $out/gems + '' + '' runHook postInstall - ''; + ''); }); - rake = runCommandNoCC "discourse-rake" { + rake = runCommand "discourse-rake" { nativeBuildInputs = [ makeWrapper ]; } '' mkdir -p $out/bin @@ -158,6 +168,11 @@ let # Use the Ruby API version in the plugin gem path, to match the # one constructed by bundlerEnv ./plugin_gem_api_version.patch + + # Change the path to the auto generated plugin assets, which + # defaults to the plugin's directory and isn't writable at the + # time of asset generation + ./auto_generated_path.patch ]; # We have to set up an environment that is close enough to @@ -244,6 +259,11 @@ let # Use mv instead of rename, since rename doesn't work across # device boundaries ./use_mv_instead_of_rename.patch + + # Change the path to the auto generated plugin assets, which + # defaults to the plugin's directory and isn't writable at the + # time of asset generation + ./auto_generated_path.patch ]; postPatch = '' @@ -274,7 +294,6 @@ let ln -sf /run/discourse/config $out/share/discourse/config ln -sf /run/discourse/assets/javascripts/plugins $out/share/discourse/app/assets/javascripts/plugins ln -sf /run/discourse/public $out/share/discourse/public - ln -sf /run/discourse/plugins $out/share/discourse/plugins ln -sf ${assets} $out/share/discourse/public.dist/assets ${lib.concatMapStringsSep "\n" (p: "ln -sf ${p} $out/share/discourse/plugins/${p.pluginName or ""}") plugins} @@ -294,7 +313,7 @@ let enabledPlugins = plugins; plugins = callPackage ./plugins/all-plugins.nix { inherit mkDiscoursePlugin; }; ruby = rubyEnv.wrappedRuby; - tests = nixosTests.discourse; + tests = import ../../../../nixos/tests/discourse.nix { package = pkgs.discourse.override args; }; }; }; in discourse diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile index 8c192fc038..bda8e6ec3c 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile +++ b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile @@ -2,4 +2,7 @@ source "https://rubygems.org" +git_source(:github) { |repo_name| "https://github.com/#{repo_name}" } + +# gem "rails" gem 'rrule', '0.4.2', require: false diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile.lock b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile.lock index b3c21c857d..d5622c0ac3 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile.lock +++ b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile.lock @@ -18,7 +18,7 @@ GEM zeitwerk (2.4.2) PLATFORMS - x86_64-linux + ruby DEPENDENCIES rrule (= 0.4.2) diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix index f4f179c07c..b610a5c21a 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix @@ -6,8 +6,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-calendar"; - rev = "567712d8c02640574fbab081eb54b2f26349c88d"; - sha256 = "sha256-r6rfbi/ScbM+SiAjeijXmr5R9wpJxzxGl52X5oV++5w="; + rev = "519cf403ae3003291de20145aca243e2ffbcb4a2"; + sha256 = "0398cf7k03i7j7v5w1mysjzk2npbkvr7icj5sjwa8i8xzg34gck4"; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-calendar"; diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-canned-replies/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-canned-replies/default.nix index 558abec36f..f90fabc057 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-canned-replies/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-canned-replies/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-canned-replies"; - rev = "e3f1de8928df5955b64994079b7e2073556e5456"; - sha256 = "1g4fazm6cn6hbfd08mq2zhc6dgm4qj1r1f1amhbgxhk6qsxf42cd"; + rev = "672a96a8160d3767cf5fd6647309c7b5dcf8a55d"; + sha256 = "105zgpc7j3xmlkaz3cgxw1rfgy5d3dzln58ix569jmzifbsijml7"; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-canned-replies"; diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-data-explorer/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-data-explorer/default.nix index 983c8b7fe8..90218759ca 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-data-explorer/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-data-explorer/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-data-explorer"; - rev = "7a348aaa8b2a6b3a75db72e99a7370a1a6fcb2b8"; - sha256 = "sha256-4X0oor3dIKrQO5IrScQ9+DBr39R7PJJ8dg9UQseV6IU="; + rev = "23287ece952cb45203819e7b470ebc194c58cb13"; + sha256 = "1vc2072r72fkvcfpy6vpn9x4gl9lpjk29pnj8095xs22im8j5in1"; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-data-explorer"; diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock index 0486ea1402..b6ebd834a5 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock +++ b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock @@ -3,7 +3,7 @@ GEM specs: addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) - faraday (1.5.0) + faraday (1.7.0) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) faraday-excon (~> 1.1) @@ -11,6 +11,7 @@ GEM faraday-net_http (~> 1.0) faraday-net_http_persistent (~> 1.1) faraday-patron (~> 1.0) + faraday-rack (~> 1.0) multipart-post (>= 1.2, < 3) ruby2_keywords (>= 0.0.4) faraday-em_http (1.0.0) @@ -18,20 +19,21 @@ GEM faraday-excon (1.1.0) faraday-httpclient (1.0.1) faraday-net_http (1.0.1) - faraday-net_http_persistent (1.1.0) + faraday-net_http_persistent (1.2.0) faraday-patron (1.0.0) + faraday-rack (1.0.0) multipart-post (2.1.1) octokit (4.21.0) faraday (>= 0.9) sawyer (~> 0.8.0, >= 0.5.3) public_suffix (4.0.6) - ruby2_keywords (0.0.4) + ruby2_keywords (0.0.5) sawyer (0.8.2) addressable (>= 2.3.5) faraday (> 0.8, < 2.0) PLATFORMS - x86_64-linux + ruby DEPENDENCIES octokit (= 4.21.0) diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix index bb6d16bfe4..63488de18f 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix @@ -6,8 +6,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-github"; - rev = "154fd5ea597640c2259ce489b4ce75b48ac1973c"; - sha256 = "0wb5p219z42rc035rnh2iwrbsj000nxa9shbmc325rzcg6xlhdhw"; + rev = "b6ad8e39a13e2ad5c6943ea697ca23f2c5f9fec1"; + sha256 = "0vxwp4kbf44clcqilb8ni0ykk4jrgiv4rbd05pgfvndcp3izm2i6"; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-github"; diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix index ae20ec8952..90009a3beb 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix @@ -11,15 +11,15 @@ version = "2.8.0"; }; faraday = { - dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-httpclient" "faraday-net_http" "faraday-net_http_persistent" "faraday-patron" "multipart-post" "ruby2_keywords"]; + dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-httpclient" "faraday-net_http" "faraday-net_http_persistent" "faraday-patron" "faraday-rack" "multipart-post" "ruby2_keywords"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gwbii45plm9bljk22bwzhzxrc5xid8qx24f54vrm74q3zaz00ah"; + sha256 = "0r6ik2yvsbx6jj30vck32da2bbvj4m0gf4jhp09vr75i1d6jzfvb"; type = "gem"; }; - version = "1.5.0"; + version = "1.7.0"; }; faraday-em_http = { groups = ["default"]; @@ -76,10 +76,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0l2c835wl7gv34xp49fhd1bl4czkpw2g3ahqsak2251iqv5589ka"; + sha256 = "0dc36ih95qw3rlccffcb0vgxjhmipsvxhn6cw71l7ffs0f7vq30b"; type = "gem"; }; - version = "1.1.0"; + version = "1.2.0"; }; faraday-patron = { groups = ["default"]; @@ -91,6 +91,16 @@ }; version = "1.0.0"; }; + faraday-rack = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1h184g4vqql5jv9s9im6igy00jp6mrah2h14py6mpf9bkabfqq7g"; + type = "gem"; + }; + version = "1.0.0"; + }; multipart-post = { groups = ["default"]; platforms = []; @@ -127,10 +137,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15wfcqxyfgka05v2a7kpg64x57gl1y4xzvnc9lh60bqx5sf1iqrs"; + sha256 = "1vz322p8n39hz3b4a9gkmz9y7a5jaz41zrm2ywf31dvkqm03glgz"; type = "gem"; }; - version = "0.0.4"; + version = "0.0.5"; }; sawyer = { dependencies = ["addressable" "faraday"]; diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix index 2d451418bd..c92c5a1016 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-solved"; - rev = "b96374bf4ab7e6d5cecb0761918b060a524eb9bf"; - sha256 = "0zrv70p0wz93akpcj6gpwjkw7az3iz9bx4n2z630kyrlmxdbj32a"; + rev = "8bf54370200fe9d94541f69339430a7dc1019d62"; + sha256 = "1sk91h4dilkxm1wpv8zw59wgw860ywwlcgiw2kd23ybdk9n7b3lh"; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-solved"; diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/update.py b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/update.py index 4832e8638e..127088dafb 100755 --- a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/update.py +++ b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/update.py @@ -12,6 +12,7 @@ import os import stat import json import requests +import textwrap from distutils.version import LooseVersion from pathlib import Path from typing import Iterable @@ -77,7 +78,11 @@ def _call_nix_update(pkg, version): def _nix_eval(expr: str): nixpkgs_path = Path(__file__).parent / '../../../../' - return json.loads(subprocess.check_output(['nix', 'eval', '--json', f'(with import {nixpkgs_path} {{}}; {expr})'], text=True)) + try: + output = subprocess.check_output(['nix', 'eval', '--json', f'(with import {nixpkgs_path} {{}}; {expr})'], text=True) + except subprocess.CalledProcessError: + return None + return json.loads(output) def _get_current_package_version(pkg: str): @@ -111,6 +116,18 @@ def _diff_file(filepath: str, old_version: str, new_version: str): return +def _remove_platforms(rubyenv_dir: Path): + for platform in ['arm64-darwin-20', 'x86_64-darwin-18', + 'x86_64-darwin-19', 'x86_64-darwin-20', + 'x86_64-linux']: + with open(rubyenv_dir / 'Gemfile.lock', 'r') as f: + for line in f: + if platform in line: + subprocess.check_output( + ['bundle', 'lock', '--remove-platform', platform], cwd=rubyenv_dir) + break + + @click_log.simple_verbosity_option(logger) @@ -173,10 +190,7 @@ def update(rev): f.write(repo.get_file(fn, rev)) subprocess.check_output(['bundle', 'lock'], cwd=rubyenv_dir) - for platform in ['arm64-darwin-20', 'x86_64-darwin-18', - 'x86_64-darwin-19', 'x86_64-darwin-20', - 'x86_64-linux']: - subprocess.check_output(['bundle', 'lock', '--remove-platform', platform], cwd=rubyenv_dir) + _remove_platforms(rubyenv_dir) subprocess.check_output(['bundix'], cwd=rubyenv_dir) _call_nix_update('discourse', repo.rev2version(rev)) @@ -206,13 +220,59 @@ def update_plugins(): repo_name = plugin.get('repo_name') or name repo = DiscourseRepo(owner=owner, repo=repo_name) + + filename = _nix_eval(f'builtins.unsafeGetAttrPos "src" discourse.plugins.{name}') + if filename is None: + filename = Path(__file__).parent / 'plugins' / name / 'default.nix' + filename.parent.mkdir() + + has_ruby_deps = False + for line in repo.get_file('plugin.rb', repo.latest_commit_sha).splitlines(): + if 'gem ' in line: + has_ruby_deps = True + break + + with open(filename, 'w') as f: + f.write(textwrap.dedent(f""" + {{ lib, mkDiscoursePlugin, fetchFromGitHub }}: + + mkDiscoursePlugin {{ + name = "{name}";"""[1:] + (""" + bundlerEnvArgs.gemdir = ./.;""" if has_ruby_deps else "") + f""" + src = {fetcher} {{ + owner = "{owner}"; + repo = "{repo_name}"; + rev = "replace-with-git-rev"; + sha256 = "replace-with-sha256"; + }}; + meta = with lib; {{ + homepage = ""; + maintainers = with maintainers; [ ]; + license = licenses.mit; # change to the correct license! + description = ""; + }}; + }}""")) + + all_plugins_filename = Path(__file__).parent / 'plugins' / 'all-plugins.nix' + with open(all_plugins_filename, 'r+') as f: + content = f.read() + pos = -1 + while content[pos] != '}': + pos -= 1 + content = content[:pos] + f' {name} = callPackage ./{name} {{}};' + os.linesep + content[pos:] + f.seek(0) + f.write(content) + f.truncate() + + else: + filename = filename['file'] + prev_commit_sha = _nix_eval(f'discourse.plugins.{name}.src.rev') if prev_commit_sha == repo.latest_commit_sha: click.echo(f'Plugin {name} is already at the latest revision') continue - filename = _nix_eval(f'builtins.unsafeGetAttrPos "src" discourse.plugins.{name}')['file'] prev_hash = _nix_eval(f'discourse.plugins.{name}.src.outputHash') new_hash = subprocess.check_output([ 'nix-universal-prefetch', fetcher, @@ -248,7 +308,9 @@ def update_plugins(): with open(gemfile, 'a') as f: f.write(gemfile_text) + subprocess.check_output(['bundle', 'lock', '--add-platform', 'ruby'], cwd=rubyenv_dir) subprocess.check_output(['bundle', 'lock', '--update'], cwd=rubyenv_dir) + _remove_platforms(rubyenv_dir) subprocess.check_output(['bundix'], cwd=rubyenv_dir) diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/hedgedoc/yarn.nix b/third_party/nixpkgs/pkgs/servers/web-apps/hedgedoc/yarn.nix index d18891f619..5d7cbc1c02 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/hedgedoc/yarn.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/hedgedoc/yarn.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec { +{ fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec { offline_cache = linkFarm "offline" packages; packages = [ { @@ -651,7 +651,7 @@ sha256 = "1pa8cqbr758vx1q2ymsmbkp9cz3b7bghxzi90zc4hfq1nzav5w85"; }; in - runCommandNoCC "Idle.js" { buildInputs = [gnutar]; } '' + runCommand "Idle.js" { buildInputs = [gnutar]; } '' # Set u+w because tar-fs can't unpack archives with read-only dirs # https://github.com/mafintosh/tar-fs/issues/79 tar cf $out --mode u+w -C ${repo} . @@ -2403,7 +2403,7 @@ sha256 = "0b6axzi9kwsd24pcqfk5rmy9nhsdyklpd3z8w9wiynd64435dilz"; }; in - runCommandNoCC "CodeMirror.git" { buildInputs = [gnutar]; } '' + runCommand "CodeMirror.git" { buildInputs = [gnutar]; } '' # Set u+w because tar-fs can't unpack archives with read-only dirs # https://github.com/mafintosh/tar-fs/issues/79 tar cf $out --mode u+w -C ${repo} . @@ -3531,7 +3531,7 @@ sha256 = "0hlv66cxrqih7spnissl44jd8f8x9dyvzc68fn0g2fwwrnpjjib7"; }; in - runCommandNoCC "diff-match-patch.git" { buildInputs = [gnutar]; } '' + runCommand "diff-match-patch.git" { buildInputs = [gnutar]; } '' # Set u+w because tar-fs can't unpack archives with read-only dirs # https://github.com/mafintosh/tar-fs/issues/79 tar cf $out --mode u+w -C ${repo} . @@ -6203,7 +6203,7 @@ sha256 = "0d2zf62fmad760rg9hrkyhp03k5apms3fm0mf64yy8q6p3iw7jvw"; }; in - runCommandNoCC "js-sequence-diagrams.git" { buildInputs = [gnutar]; } '' + runCommand "js-sequence-diagrams.git" { buildInputs = [gnutar]; } '' # Set u+w because tar-fs can't unpack archives with read-only dirs # https://github.com/mafintosh/tar-fs/issues/79 tar cf $out --mode u+w -C ${repo} . @@ -6923,7 +6923,7 @@ sha256 = "036v1a9z79mc961xxx0rw8p6n2w1z8bnqpapgfg2kbw8f87jfxyi"; }; in - runCommandNoCC "lz-string.git" { buildInputs = [gnutar]; } '' + runCommand "lz-string.git" { buildInputs = [gnutar]; } '' # Set u+w because tar-fs can't unpack archives with read-only dirs # https://github.com/mafintosh/tar-fs/issues/79 tar cf $out --mode u+w -C ${repo} . @@ -7323,7 +7323,7 @@ sha256 = "1rgmap95akwf9z72msxpqcfy95h8pqz9c8vn9xvvibfb5jf46lv0"; }; in - runCommandNoCC "meta-marked" { buildInputs = [gnutar]; } '' + runCommand "meta-marked" { buildInputs = [gnutar]; } '' # Set u+w because tar-fs can't unpack archives with read-only dirs # https://github.com/mafintosh/tar-fs/issues/79 tar cf $out --mode u+w -C ${repo} . diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/plausible/yarn.nix b/third_party/nixpkgs/pkgs/servers/web-apps/plausible/yarn.nix index 303ccb31c5..3b29c31144 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/plausible/yarn.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/plausible/yarn.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec { +{ fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec { offline_cache = linkFarm "offline" packages; packages = [ { diff --git a/third_party/nixpkgs/pkgs/shells/oil/default.nix b/third_party/nixpkgs/pkgs/shells/oil/default.nix index 4d66f0d401..38ff6a7681 100644 --- a/third_party/nixpkgs/pkgs/shells/oil/default.nix +++ b/third_party/nixpkgs/pkgs/shells/oil/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "oil"; - version = "0.8.12"; + version = "0.9.0"; src = fetchurl { url = "https://www.oilshell.org/download/oil-${version}.tar.xz"; - sha256 = "sha256-M8JdMru2DDcPWa7qQq9m1NQwjI7kVkHvK5I4W5U1XPU="; + sha256 = "sha256-xk4io2ZXVupU6mCqmD94k1AaE8Kk0cf3PIx28X6gNjY="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/shells/zsh/pure-prompt/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/pure-prompt/default.nix index 0ba449870b..d5ed2641d5 100644 --- a/third_party/nixpkgs/pkgs/shells/zsh/pure-prompt/default.nix +++ b/third_party/nixpkgs/pkgs/shells/zsh/pure-prompt/default.nix @@ -4,13 +4,13 @@ with lib; stdenv.mkDerivation rec { pname = "pure-prompt"; - version = "1.17.0"; + version = "1.17.1"; src = fetchFromGitHub { owner = "sindresorhus"; repo = "pure"; rev = "v${version}"; - sha256 = "sha256-6j6QZtsA5ZgfXthYjXRrND2zAJwZx0/6WRI1f3c+2mE="; + sha256 = "sha256-bWp04xT+/Xhgxj1Rm0FgTkRtLH9nuSFtqBsO3B7Exvo="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/shells/zsh/spaceship-prompt/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/spaceship-prompt/default.nix index 1e699997fd..618a35c2f6 100644 --- a/third_party/nixpkgs/pkgs/shells/zsh/spaceship-prompt/default.nix +++ b/third_party/nixpkgs/pkgs/shells/zsh/spaceship-prompt/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "spaceship-prompt"; - version = "3.12.25"; + version = "3.14.0"; src = fetchFromGitHub { owner = "denysdovhan"; repo = pname; rev = "v${version}"; - sha256 = "sha256-qDy0HkaX3N7VGptv88gB3284yDTbp2EpiZ1kvaLX8dc="; + sha256 = "sha256-K9dNQAMW/Ms6rlAmfgQCqMiA7S4gLh9ZhvUoQiLoHOY="; }; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/test/texlive/default.nix b/third_party/nixpkgs/pkgs/test/texlive/default.nix index 2444334f52..217a862e1c 100644 --- a/third_party/nixpkgs/pkgs/test/texlive/default.nix +++ b/third_party/nixpkgs/pkgs/test/texlive/default.nix @@ -1,7 +1,7 @@ -{ lib, runCommandNoCC, fetchurl, file, texlive, writeShellScript }: +{ lib, runCommand, fetchurl, file, texlive, writeShellScript }: { - chktex = runCommandNoCC "texlive-test-chktex" { + chktex = runCommand "texlive-test-chktex" { nativeBuildInputs = [ (with texlive; combine { inherit scheme-infraonly chktex; }) ]; @@ -18,7 +18,7 @@ dvipng = lib.recurseIntoAttrs { # https://github.com/NixOS/nixpkgs/issues/75605 - basic = runCommandNoCC "texlive-test-dvipng-basic" { + basic = runCommand "texlive-test-dvipng-basic" { nativeBuildInputs = [ file texlive.combined.scheme-medium ]; input = fetchurl { name = "test_dvipng.tex"; @@ -40,7 +40,7 @@ ''; # test dvipng's limited capability to render postscript specials via GS - ghostscript = runCommandNoCC "texlive-test-ghostscript" { + ghostscript = runCommand "texlive-test-ghostscript" { nativeBuildInputs = [ file (with texlive; combine { inherit scheme-small dvipng; }) ]; input = builtins.toFile "postscript-sample.tex" '' \documentclass{minimal} @@ -81,7 +81,7 @@ }; # https://github.com/NixOS/nixpkgs/issues/75070 - dvisvgm = runCommandNoCC "texlive-test-dvisvgm" { + dvisvgm = runCommand "texlive-test-dvisvgm" { nativeBuildInputs = [ file texlive.combined.scheme-medium ]; input = builtins.toFile "dvisvgm-sample.tex" '' \documentclass{article} @@ -106,7 +106,7 @@ mv document*.svg "$out"/ ''; - texdoc = runCommandNoCC "texlive-test-texdoc" { + texdoc = runCommand "texlive-test-texdoc" { nativeBuildInputs = [ (with texlive; combine { inherit scheme-infraonly luatex texdoc; @@ -121,7 +121,7 @@ ''; # test that language files are generated as expected - hyphen-base = runCommandNoCC "texlive-test-hyphen-base" { + hyphen-base = runCommand "texlive-test-hyphen-base" { hyphenBase = lib.head texlive.hyphen-base.pkgs; schemeFull = texlive.combined.scheme-full; schemeInfraOnly = texlive.combined.scheme-infraonly; @@ -154,7 +154,7 @@ ''; # test that fmtutil.cnf is fully regenerated on scheme-full - fmtutilCnf = runCommandNoCC "texlive-test-fmtutil.cnf" { + fmtutilCnf = runCommand "texlive-test-fmtutil.cnf" { kpathsea = lib.head texlive.kpathsea.pkgs; schemeFull = texlive.combined.scheme-full; } '' diff --git a/third_party/nixpkgs/pkgs/tools/X11/opentabletdriver/deps.nix b/third_party/nixpkgs/pkgs/tools/X11/opentabletdriver/deps.nix index 45ded85558..33891b6338 100644 --- a/third_party/nixpkgs/pkgs/tools/X11/opentabletdriver/deps.nix +++ b/third_party/nixpkgs/pkgs/tools/X11/opentabletdriver/deps.nix @@ -1,462 +1,94 @@ { fetchNuGet }: [ - (fetchNuGet { - name = "AtkSharp"; - version = "3.24.24.34"; - sha256 = "1jn1vgi9xm0jp7769k6sbdi8d273kigjrsh93i6s4c03hqxv7cqs"; - }) - (fetchNuGet { - name = "CairoSharp"; - version = "3.24.24.34"; - sha256 = "0pydn1k0cam1gclg9sc1sbnmbyzh28qlc5qanyxcylwghink3kgz"; - }) - (fetchNuGet { - name = "Eto.Forms"; - version = "2.5.10"; - sha256 = "1d71wglk4ixfqfbm6sxmj753x5iwbar8i9zzjy3bh64fy1dn8lz7"; - }) - (fetchNuGet { - name = "Eto.Forms"; - version = "2.5.11"; - sha256 = "0h86jc19wy3ssj7pb34w1h02v92mg29gdipszwjs3y15piy66z3s"; - }) - (fetchNuGet { - name = "Eto.Platform.Gtk"; - version = "2.5.11"; - sha256 = "1s9njz7l9zghrbzli7lbiav5ss3glqf17npj07f3jldd933nb95j"; - }) - (fetchNuGet { - name = "GdkSharp"; - version = "3.24.24.34"; - sha256 = "0r0x0yib7chwsyrbpvicrfwldwqx5lyqq4p86zaxpmzd6zdaj0x5"; - }) - (fetchNuGet { - name = "GioSharp"; - version = "3.24.24.34"; - sha256 = "02hxvgjd4w9jpzbkk7qf9q9bkvyp5hfzwxfqp10vg5lpl9yl3xpx"; - }) - (fetchNuGet { - name = "GLibSharp"; - version = "3.24.24.34"; - sha256 = "0kvp033fgdwc8p2abfp5z9pzq66cvwbnjfvr4v4bkpy5s5h181kq"; - }) - (fetchNuGet { - name = "GtkSharp"; - version = "3.24.24.34"; - sha256 = "0028hzmmqyfx87qqmaf9cgb5psn7gkbmqvixcid67x1d6mzxjicb"; - }) - (fetchNuGet { - name = "HidSharpCore"; - version = "1.2.1.1"; - sha256 = "1zkndglmz0s8rblfhnqcvv90rkq2i7lf4bc380g7z8h1avf2ikll"; - }) - (fetchNuGet { - name = "MessagePack.Annotations"; - version = "2.1.194"; - sha256 = "1jkhq3hiy4brvzsywl4p4jb9jrnzs3vmgr3s8fxpb1dzafadw8b0"; - }) - (fetchNuGet { - name = "MessagePack"; - version = "2.1.194"; - sha256 = "1v2gyd9sd6hppfhlzngmzzhnpr39b95rwrqq0r9zzp480b6vzaj0"; - }) - (fetchNuGet { - name = "Microsoft.Bcl.AsyncInterfaces"; - version = "1.1.1"; - sha256 = "0a1ahssqds2ympr7s4xcxv5y8jgxs7ahd6ah6fbgglj4rki1f1vw"; - }) - (fetchNuGet { - name = "Microsoft.CSharp"; - version = "4.4.1"; - sha256 = "0z6d1i6xcf0c00z6rs75rgw4ncs9q2m8amasf6mmbf40fm02ry7g"; - }) - (fetchNuGet { - name = "Microsoft.NETCore.Platforms"; - version = "1.1.0"; - sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; - }) - (fetchNuGet { - name = "Microsoft.NETCore.Platforms"; - version = "1.1.1"; - sha256 = "164wycgng4mi9zqi2pnsf1pq6gccbqvw6ib916mqizgjmd8f44pj"; - }) - (fetchNuGet { - name = "Microsoft.NETCore.Platforms"; - version = "3.0.0"; - sha256 = "1bk8r4r3ihmi6322jmcag14jmw11mjqys202azqjzglcx59pxh51"; - }) - (fetchNuGet { - name = "Microsoft.NETCore.Targets"; - version = "1.1.0"; - sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; - }) - (fetchNuGet { - name = "Microsoft.VisualStudio.Threading.Analyzers"; - version = "16.7.56"; - sha256 = "04v9df0k7bsc0rzgkw4mnvi43pdrh42vk6xdcwn9m6im33m0nnz2"; - }) - (fetchNuGet { - name = "Microsoft.VisualStudio.Threading"; - version = "16.7.56"; - sha256 = "13x0xrsjxd86clf9cjjwmpzlyp8pkrf13riya7igs8zy93zw2qap"; - }) - (fetchNuGet { - name = "Microsoft.VisualStudio.Validation"; - version = "15.5.31"; - sha256 = "1ah99rn922qa0sd2k3h64m324f2r32pw8cn4cfihgvwx4qdrpmgw"; - }) - (fetchNuGet { - name = "Microsoft.Win32.Primitives"; - version = "4.3.0"; - sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; - }) - (fetchNuGet { - name = "Microsoft.Win32.Registry"; - version = "4.6.0"; - sha256 = "0i4y782yrqqyx85pg597m20gm0v126w0j9ddk5z7xb3crx4z9f2s"; - }) - (fetchNuGet { - name = "Nerdbank.Streams"; - version = "2.6.77"; - sha256 = "13dnfwxa8syx7vfjmd5pcrqz31k0q8y3mmh6yz6bmljhjri65q5c"; - }) - (fetchNuGet { - name = "Newtonsoft.Json"; - version = "12.0.2"; - sha256 = "0w2fbji1smd2y7x25qqibf1qrznmv4s6s0jvrbvr6alb7mfyqvh5"; - }) - (fetchNuGet { - name = "Octokit"; - version = "0.50.0"; - sha256 = "1ignj5i6a1c19qqrw00wlr9fdjmwrxkxz7gdxj0x653w84gbv7qq"; - }) - (fetchNuGet { - name = "PangoSharp"; - version = "3.24.24.34"; - sha256 = "1r0h14cklglfpv1lhv93cxmzi2w7d5s03gzpq3j5dmrz43flg9zw"; - }) - (fetchNuGet { - name = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.2"; - sha256 = "0rwpqngkqiapqc5c2cpkj7idhngrgss5qpnqg0yh40mbyflcxf8i"; - }) - (fetchNuGet { - name = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.2"; - sha256 = "1n06gxwlinhs0w7s8a94r1q3lwqzvynxwd3mp10ws9bg6gck8n4r"; - }) - (fetchNuGet { - name = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.2"; - sha256 = "0404wqrc7f2yc0wxv71y3nnybvqx8v4j9d47hlscxy759a525mc3"; - }) - (fetchNuGet { - name = "runtime.native.System.Net.Http"; - version = "4.3.0"; - sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; - }) - (fetchNuGet { - name = "runtime.native.System.Security.Cryptography.Apple"; - version = "4.3.0"; - sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; - }) - (fetchNuGet { - name = "runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.2"; - sha256 = "0zy5r25jppz48i2bkg8b9lfig24xixg6nm3xyr1379zdnqnpm8f6"; - }) - (fetchNuGet { - name = "runtime.native.System"; - version = "4.3.0"; - sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; - }) - (fetchNuGet { - name = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.2"; - sha256 = "096ch4n4s8k82xga80lfmpimpzahd2ip1mgwdqgar0ywbbl6x438"; - }) - (fetchNuGet { - name = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.2"; - sha256 = "1dm8fifl7rf1gy7lnwln78ch4rw54g0pl5g1c189vawavll7p6rj"; - }) - (fetchNuGet { - name = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; - version = "4.3.0"; - sha256 = "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi"; - }) - (fetchNuGet { - name = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.2"; - sha256 = "1m9z1k9kzva9n9kwinqxl97x2vgl79qhqjlv17k9s2ymcyv2bwr6"; - }) - (fetchNuGet { - name = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.2"; - sha256 = "1cpx56mcfxz7cpn57wvj18sjisvzq8b5vd9rw16ihd2i6mcp3wa1"; - }) - (fetchNuGet { - name = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.2"; - sha256 = "15gsm1a8jdmgmf8j5v1slfz8ks124nfdhk2vxs2rw3asrxalg8hi"; - }) - (fetchNuGet { - name = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.2"; - sha256 = "0q0n5q1r1wnqmr5i5idsrd9ywl33k0js4pngkwq9p368mbxp8x1w"; - }) - (fetchNuGet { - name = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.2"; - sha256 = "1x0g58pbpjrmj2x2qw17rdwwnrcl0wvim2hdwz48lixvwvp22n9c"; - }) - (fetchNuGet { - name = "SharpZipLib"; - version = "1.3.1"; - sha256 = "09zypjfils38143da507s5fi4hzvdlz32wfav219hksnpl35y8x0"; - }) - (fetchNuGet { - name = "StreamJsonRpc"; - version = "2.6.121"; - sha256 = "0xzvpk17w2skndzdg47j7gkrrvw6521db4mv8lc3v8hm97vs9m76"; - }) - (fetchNuGet { - name = "System.Collections.Concurrent"; - version = "4.3.0"; - sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; - }) - (fetchNuGet { - name = "System.Collections.Immutable"; - version = "1.7.1"; - sha256 = "1nh4nlxfc7lbnbl86wwk1a3jwl6myz5j6hvgh5sp4krim9901hsq"; - }) - (fetchNuGet { - name = "System.Collections"; - version = "4.3.0"; - sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; - }) - (fetchNuGet { - name = "System.CommandLine"; - version = "2.0.0-beta1.20253.1"; - sha256 = "16saf1fm9q80bb624fkqz0ksrwpnbw9617d7xg3jib7a2wgagm2r"; - }) - (fetchNuGet { - name = "System.ComponentModel.Annotations"; - version = "4.7.0"; - sha256 = "06x1m46ddxj0ng28d7gry9gjkqdg2kp89jyf480g5gznyybbs49z"; - }) - (fetchNuGet { - name = "System.Diagnostics.Debug"; - version = "4.3.0"; - sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; - }) - (fetchNuGet { - name = "System.Diagnostics.DiagnosticSource"; - version = "4.3.0"; - sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; - }) - (fetchNuGet { - name = "System.Diagnostics.Tracing"; - version = "4.3.0"; - sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; - }) - (fetchNuGet { - name = "System.Globalization.Calendars"; - version = "4.3.0"; - sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; - }) - (fetchNuGet { - name = "System.Globalization.Extensions"; - version = "4.3.0"; - sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; - }) - (fetchNuGet { - name = "System.Globalization"; - version = "4.3.0"; - sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; - }) - (fetchNuGet { - name = "System.IO.FileSystem.Primitives"; - version = "4.3.0"; - sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; - }) - (fetchNuGet { - name = "System.IO.FileSystem"; - version = "4.3.0"; - sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; - }) - (fetchNuGet { - name = "System.IO.Pipelines"; - version = "4.7.2"; - sha256 = "16v4qaypm72cfsfqr8z3k6yrpzn0m3apgkh6aljfwpycdk150sf9"; - }) - (fetchNuGet { - name = "System.IO"; - version = "4.3.0"; - sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; - }) - (fetchNuGet { - name = "System.Linq"; - version = "4.3.0"; - sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; - }) - (fetchNuGet { - name = "System.Memory"; - version = "4.5.3"; - sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; - }) - (fetchNuGet { - name = "System.Memory"; - version = "4.5.4"; - sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; - }) - (fetchNuGet { - name = "System.Net.Http"; - version = "4.3.4"; - sha256 = "0kdp31b8819v88l719j6my0yas6myv9d1viql3qz5577mv819jhl"; - }) - (fetchNuGet { - name = "System.Net.Primitives"; - version = "4.3.0"; - sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; - }) - (fetchNuGet { - name = "System.Net.WebSockets"; - version = "4.3.0"; - sha256 = "1gfj800078kggcgl0xyl00a6y5k4wwh2k2qm69rjy22wbmq7fy4p"; - }) - (fetchNuGet { - name = "System.Reflection.Emit.Lightweight"; - version = "4.6.0"; - sha256 = "0hry2k6b7kicg4zxnq0hhn0ys52711pxy7l9v5sp7gvp9cicwpgp"; - }) - (fetchNuGet { - name = "System.Reflection.Emit"; - version = "4.7.0"; - sha256 = "121l1z2ypwg02yz84dy6gr82phpys0njk7yask3sihgy214w43qp"; - }) - (fetchNuGet { - name = "System.Reflection.Primitives"; - version = "4.3.0"; - sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; - }) - (fetchNuGet { - name = "System.Reflection"; - version = "4.3.0"; - sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; - }) - (fetchNuGet { - name = "System.Resources.ResourceManager"; - version = "4.3.0"; - sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; - }) - (fetchNuGet { - name = "System.Runtime.CompilerServices.Unsafe"; - version = "4.5.2"; - sha256 = "1vz4275fjij8inf31np78hw50al8nqkngk04p3xv5n4fcmf1grgi"; - }) - (fetchNuGet { - name = "System.Runtime.CompilerServices.Unsafe"; - version = "4.7.1"; - sha256 = "119br3pd85lq8zcgh4f60jzmv1g976q1kdgi3hvqdlhfbw6siz2j"; - }) - (fetchNuGet { - name = "System.Runtime.Extensions"; - version = "4.3.0"; - sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; - }) - (fetchNuGet { - name = "System.Runtime.Handles"; - version = "4.3.0"; - sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; - }) - (fetchNuGet { - name = "System.Runtime.InteropServices"; - version = "4.3.0"; - sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; - }) - (fetchNuGet { - name = "System.Runtime.Numerics"; - version = "4.3.0"; - sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; - }) - (fetchNuGet { - name = "System.Runtime"; - version = "4.3.0"; - sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; - }) - (fetchNuGet { - name = "System.Security.AccessControl"; - version = "4.6.0"; - sha256 = "1wl1dyghi0qhpap1vgfhg2ybdyyhy9vc2a7dpm1xb30vfgmlkjmf"; - }) - (fetchNuGet { - name = "System.Security.Cryptography.Algorithms"; - version = "4.3.0"; - sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; - }) - (fetchNuGet { - name = "System.Security.Cryptography.Cng"; - version = "4.3.0"; - sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; - }) - (fetchNuGet { - name = "System.Security.Cryptography.Csp"; - version = "4.3.0"; - sha256 = "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"; - }) - (fetchNuGet { - name = "System.Security.Cryptography.Encoding"; - version = "4.3.0"; - sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; - }) - (fetchNuGet { - name = "System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; - }) - (fetchNuGet { - name = "System.Security.Cryptography.Primitives"; - version = "4.3.0"; - sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; - }) - (fetchNuGet { - name = "System.Security.Cryptography.X509Certificates"; - version = "4.3.0"; - sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; - }) - (fetchNuGet { - name = "System.Security.Principal.Windows"; - version = "4.6.0"; - sha256 = "1jmfzfz1n8hp63s5lja5xxpzkinbp6g59l3km9h8avjiisdrg5wm"; - }) - (fetchNuGet { - name = "System.Text.Encoding"; - version = "4.3.0"; - sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; - }) - (fetchNuGet { - name = "System.Threading.Tasks.Dataflow"; - version = "4.11.1"; - sha256 = "09fbfsiay1xcbpvnq2j38b6mb2scvf0s8mpn78bcqsldidg7k2vw"; - }) - (fetchNuGet { - name = "System.Threading.Tasks.Extensions"; - version = "4.5.4"; - sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; - }) - (fetchNuGet { - name = "System.Threading.Tasks"; - version = "4.3.0"; - sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; - }) - (fetchNuGet { - name = "System.Threading"; - version = "4.3.0"; - sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; - }) - (fetchNuGet { - name = "WaylandNET"; - version = "0.2.0"; - sha256 = "1qjpvra08vdqdw4j1gamz6451x5sd5r1j86lsvrl8akq4nymfr8k"; - }) + (fetchNuGet { name = "AtkSharp"; version = "3.24.24.34"; sha256 = "1jn1vgi9xm0jp7769k6sbdi8d273kigjrsh93i6s4c03hqxv7cqs"; }) + (fetchNuGet { name = "CairoSharp"; version = "3.24.24.34"; sha256 = "0pydn1k0cam1gclg9sc1sbnmbyzh28qlc5qanyxcylwghink3kgz"; }) + (fetchNuGet { name = "Eto.Forms"; version = "2.5.10"; sha256 = "1d71wglk4ixfqfbm6sxmj753x5iwbar8i9zzjy3bh64fy1dn8lz7"; }) + (fetchNuGet { name = "Eto.Forms"; version = "2.5.11"; sha256 = "0h86jc19wy3ssj7pb34w1h02v92mg29gdipszwjs3y15piy66z3s"; }) + (fetchNuGet { name = "Eto.Platform.Gtk"; version = "2.5.11"; sha256 = "1s9njz7l9zghrbzli7lbiav5ss3glqf17npj07f3jldd933nb95j"; }) + (fetchNuGet { name = "GdkSharp"; version = "3.24.24.34"; sha256 = "0r0x0yib7chwsyrbpvicrfwldwqx5lyqq4p86zaxpmzd6zdaj0x5"; }) + (fetchNuGet { name = "GioSharp"; version = "3.24.24.34"; sha256 = "02hxvgjd4w9jpzbkk7qf9q9bkvyp5hfzwxfqp10vg5lpl9yl3xpx"; }) + (fetchNuGet { name = "GLibSharp"; version = "3.24.24.34"; sha256 = "0kvp033fgdwc8p2abfp5z9pzq66cvwbnjfvr4v4bkpy5s5h181kq"; }) + (fetchNuGet { name = "GtkSharp"; version = "3.24.24.34"; sha256 = "0028hzmmqyfx87qqmaf9cgb5psn7gkbmqvixcid67x1d6mzxjicb"; }) + (fetchNuGet { name = "HidSharpCore"; version = "1.2.1.1"; sha256 = "1zkndglmz0s8rblfhnqcvv90rkq2i7lf4bc380g7z8h1avf2ikll"; }) + (fetchNuGet { name = "MessagePack"; version = "2.1.194"; sha256 = "1v2gyd9sd6hppfhlzngmzzhnpr39b95rwrqq0r9zzp480b6vzaj0"; }) + (fetchNuGet { name = "MessagePack.Annotations"; version = "2.1.194"; sha256 = "1jkhq3hiy4brvzsywl4p4jb9jrnzs3vmgr3s8fxpb1dzafadw8b0"; }) + (fetchNuGet { name = "Microsoft.Bcl.AsyncInterfaces"; version = "1.1.1"; sha256 = "0a1ahssqds2ympr7s4xcxv5y8jgxs7ahd6ah6fbgglj4rki1f1vw"; }) + (fetchNuGet { name = "Microsoft.CSharp"; version = "4.4.1"; sha256 = "0z6d1i6xcf0c00z6rs75rgw4ncs9q2m8amasf6mmbf40fm02ry7g"; }) + (fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) + (fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "1.1.1"; sha256 = "164wycgng4mi9zqi2pnsf1pq6gccbqvw6ib916mqizgjmd8f44pj"; }) + (fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "3.0.0"; sha256 = "1bk8r4r3ihmi6322jmcag14jmw11mjqys202azqjzglcx59pxh51"; }) + (fetchNuGet { name = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) + (fetchNuGet { name = "Microsoft.VisualStudio.Threading"; version = "16.7.56"; sha256 = "13x0xrsjxd86clf9cjjwmpzlyp8pkrf13riya7igs8zy93zw2qap"; }) + (fetchNuGet { name = "Microsoft.VisualStudio.Threading.Analyzers"; version = "16.7.56"; sha256 = "04v9df0k7bsc0rzgkw4mnvi43pdrh42vk6xdcwn9m6im33m0nnz2"; }) + (fetchNuGet { name = "Microsoft.VisualStudio.Validation"; version = "15.5.31"; sha256 = "1ah99rn922qa0sd2k3h64m324f2r32pw8cn4cfihgvwx4qdrpmgw"; }) + (fetchNuGet { name = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) + (fetchNuGet { name = "Microsoft.Win32.Registry"; version = "4.6.0"; sha256 = "0i4y782yrqqyx85pg597m20gm0v126w0j9ddk5z7xb3crx4z9f2s"; }) + (fetchNuGet { name = "Nerdbank.Streams"; version = "2.6.77"; sha256 = "13dnfwxa8syx7vfjmd5pcrqz31k0q8y3mmh6yz6bmljhjri65q5c"; }) + (fetchNuGet { name = "Newtonsoft.Json"; version = "12.0.2"; sha256 = "0w2fbji1smd2y7x25qqibf1qrznmv4s6s0jvrbvr6alb7mfyqvh5"; }) + (fetchNuGet { name = "Octokit"; version = "0.50.0"; sha256 = "1ignj5i6a1c19qqrw00wlr9fdjmwrxkxz7gdxj0x653w84gbv7qq"; }) + (fetchNuGet { name = "PangoSharp"; version = "3.24.24.34"; sha256 = "1r0h14cklglfpv1lhv93cxmzi2w7d5s03gzpq3j5dmrz43flg9zw"; }) + (fetchNuGet { name = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "0rwpqngkqiapqc5c2cpkj7idhngrgss5qpnqg0yh40mbyflcxf8i"; }) + (fetchNuGet { name = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1n06gxwlinhs0w7s8a94r1q3lwqzvynxwd3mp10ws9bg6gck8n4r"; }) + (fetchNuGet { name = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "0404wqrc7f2yc0wxv71y3nnybvqx8v4j9d47hlscxy759a525mc3"; }) + (fetchNuGet { name = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; }) + (fetchNuGet { name = "runtime.native.System.Net.Http"; version = "4.3.0"; sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; }) + (fetchNuGet { name = "runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; }) + (fetchNuGet { name = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "0zy5r25jppz48i2bkg8b9lfig24xixg6nm3xyr1379zdnqnpm8f6"; }) + (fetchNuGet { name = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "096ch4n4s8k82xga80lfmpimpzahd2ip1mgwdqgar0ywbbl6x438"; }) + (fetchNuGet { name = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1dm8fifl7rf1gy7lnwln78ch4rw54g0pl5g1c189vawavll7p6rj"; }) + (fetchNuGet { name = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi"; }) + (fetchNuGet { name = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1m9z1k9kzva9n9kwinqxl97x2vgl79qhqjlv17k9s2ymcyv2bwr6"; }) + (fetchNuGet { name = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1cpx56mcfxz7cpn57wvj18sjisvzq8b5vd9rw16ihd2i6mcp3wa1"; }) + (fetchNuGet { name = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "15gsm1a8jdmgmf8j5v1slfz8ks124nfdhk2vxs2rw3asrxalg8hi"; }) + (fetchNuGet { name = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "0q0n5q1r1wnqmr5i5idsrd9ywl33k0js4pngkwq9p368mbxp8x1w"; }) + (fetchNuGet { name = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1x0g58pbpjrmj2x2qw17rdwwnrcl0wvim2hdwz48lixvwvp22n9c"; }) + (fetchNuGet { name = "SharpZipLib"; version = "1.3.1"; sha256 = "09zypjfils38143da507s5fi4hzvdlz32wfav219hksnpl35y8x0"; }) + (fetchNuGet { name = "StreamJsonRpc"; version = "2.6.121"; sha256 = "0xzvpk17w2skndzdg47j7gkrrvw6521db4mv8lc3v8hm97vs9m76"; }) + (fetchNuGet { name = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) + (fetchNuGet { name = "System.Collections.Concurrent"; version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; }) + (fetchNuGet { name = "System.Collections.Immutable"; version = "1.7.1"; sha256 = "1nh4nlxfc7lbnbl86wwk1a3jwl6myz5j6hvgh5sp4krim9901hsq"; }) + (fetchNuGet { name = "System.CommandLine"; version = "2.0.0-beta1.20253.1"; sha256 = "16saf1fm9q80bb624fkqz0ksrwpnbw9617d7xg3jib7a2wgagm2r"; }) + (fetchNuGet { name = "System.ComponentModel.Annotations"; version = "4.7.0"; sha256 = "06x1m46ddxj0ng28d7gry9gjkqdg2kp89jyf480g5gznyybbs49z"; }) + (fetchNuGet { name = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) + (fetchNuGet { name = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; }) + (fetchNuGet { name = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; }) + (fetchNuGet { name = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) + (fetchNuGet { name = "System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; }) + (fetchNuGet { name = "System.Globalization.Extensions"; version = "4.3.0"; sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; }) + (fetchNuGet { name = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) + (fetchNuGet { name = "System.IO.FileSystem"; version = "4.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; }) + (fetchNuGet { name = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; }) + (fetchNuGet { name = "System.IO.Pipelines"; version = "4.7.2"; sha256 = "16v4qaypm72cfsfqr8z3k6yrpzn0m3apgkh6aljfwpycdk150sf9"; }) + (fetchNuGet { name = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) + (fetchNuGet { name = "System.Memory"; version = "4.5.3"; sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; }) + (fetchNuGet { name = "System.Memory"; version = "4.5.4"; sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; }) + (fetchNuGet { name = "System.Net.Http"; version = "4.3.4"; sha256 = "0kdp31b8819v88l719j6my0yas6myv9d1viql3qz5577mv819jhl"; }) + (fetchNuGet { name = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; }) + (fetchNuGet { name = "System.Net.WebSockets"; version = "4.3.0"; sha256 = "1gfj800078kggcgl0xyl00a6y5k4wwh2k2qm69rjy22wbmq7fy4p"; }) + (fetchNuGet { name = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) + (fetchNuGet { name = "System.Reflection.Emit"; version = "4.7.0"; sha256 = "121l1z2ypwg02yz84dy6gr82phpys0njk7yask3sihgy214w43qp"; }) + (fetchNuGet { name = "System.Reflection.Emit.Lightweight"; version = "4.6.0"; sha256 = "0hry2k6b7kicg4zxnq0hhn0ys52711pxy7l9v5sp7gvp9cicwpgp"; }) + (fetchNuGet { name = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) + (fetchNuGet { name = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) + (fetchNuGet { name = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) + (fetchNuGet { name = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.2"; sha256 = "1vz4275fjij8inf31np78hw50al8nqkngk04p3xv5n4fcmf1grgi"; }) + (fetchNuGet { name = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.1"; sha256 = "119br3pd85lq8zcgh4f60jzmv1g976q1kdgi3hvqdlhfbw6siz2j"; }) + (fetchNuGet { name = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; }) + (fetchNuGet { name = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; }) + (fetchNuGet { name = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) + (fetchNuGet { name = "System.Runtime.Numerics"; version = "4.3.0"; sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; }) + (fetchNuGet { name = "System.Security.AccessControl"; version = "4.6.0"; sha256 = "1wl1dyghi0qhpap1vgfhg2ybdyyhy9vc2a7dpm1xb30vfgmlkjmf"; }) + (fetchNuGet { name = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; }) + (fetchNuGet { name = "System.Security.Cryptography.Cng"; version = "4.3.0"; sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; }) + (fetchNuGet { name = "System.Security.Cryptography.Csp"; version = "4.3.0"; sha256 = "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"; }) + (fetchNuGet { name = "System.Security.Cryptography.Encoding"; version = "4.3.0"; sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; }) + (fetchNuGet { name = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; }) + (fetchNuGet { name = "System.Security.Cryptography.Primitives"; version = "4.3.0"; sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; }) + (fetchNuGet { name = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; }) + (fetchNuGet { name = "System.Security.Principal.Windows"; version = "4.6.0"; sha256 = "1jmfzfz1n8hp63s5lja5xxpzkinbp6g59l3km9h8avjiisdrg5wm"; }) + (fetchNuGet { name = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) + (fetchNuGet { name = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) + (fetchNuGet { name = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) + (fetchNuGet { name = "System.Threading.Tasks.Dataflow"; version = "4.11.1"; sha256 = "09fbfsiay1xcbpvnq2j38b6mb2scvf0s8mpn78bcqsldidg7k2vw"; }) + (fetchNuGet { name = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; }) + (fetchNuGet { name = "WaylandNET"; version = "0.2.0"; sha256 = "1qjpvra08vdqdw4j1gamz6451x5sd5r1j86lsvrl8akq4nymfr8k"; }) ] diff --git a/third_party/nixpkgs/pkgs/tools/X11/opentabletdriver/shell.nix b/third_party/nixpkgs/pkgs/tools/X11/opentabletdriver/shell.nix index 4367d22e9d..bb60dfd503 100644 --- a/third_party/nixpkgs/pkgs/tools/X11/opentabletdriver/shell.nix +++ b/third_party/nixpkgs/pkgs/tools/X11/opentabletdriver/shell.nix @@ -5,6 +5,7 @@ with pkgs; mkShell { packages = [ common-updater-scripts + nuget-to-nix curl dotnetCorePackages.sdk_5_0 jq diff --git a/third_party/nixpkgs/pkgs/tools/X11/opentabletdriver/update.sh b/third_party/nixpkgs/pkgs/tools/X11/opentabletdriver/update.sh index 9944bb0b6d..b73a5a4b7c 100755 --- a/third_party/nixpkgs/pkgs/tools/X11/opentabletdriver/update.sh +++ b/third_party/nixpkgs/pkgs/tools/X11/opentabletdriver/update.sh @@ -52,21 +52,7 @@ for project in OpenTabletDriver.{Console,Daemon,UX.Gtk}; do dotnet restore $project --configfile ./nuget_tmp.config done -echo "{ fetchNuGet }: [" >"$deps_file" -while read pkg_spec; do - { read pkg_name; read pkg_version; } < <( - # Build version part should be ignored: `3.0.0-beta2.20059.3+77df2220` -> `3.0.0-beta2.20059.3` - sed -nE 's/.*([^<]*).*/\1/p; s/.*([^<+]*).*/\1/p' "$pkg_spec") - pkg_sha256="$(nix-hash --type sha256 --flat --base32 "$(dirname "$pkg_spec")"/*.nupkg)" - cat >>"$deps_file" <>"$deps_file" +nuget-to-nix ./nuget_tmp.packages > "$deps_file" popd rm -r "$src" diff --git a/third_party/nixpkgs/pkgs/tools/X11/xdotool/default.nix b/third_party/nixpkgs/pkgs/tools/X11/xdotool/default.nix index 5779f5270f..d917e54ec3 100644 --- a/third_party/nixpkgs/pkgs/tools/X11/xdotool/default.nix +++ b/third_party/nixpkgs/pkgs/tools/X11/xdotool/default.nix @@ -1,16 +1,18 @@ -{ lib, stdenv, fetchurl, pkg-config, libX11, perl, libXtst, xorgproto, libXi, libXinerama, libxkbcommon }: +{ lib, stdenv, fetchFromGitHub, pkg-config, libX11, perl, libXtst, xorgproto, libXi, libXinerama, libxkbcommon, libXext }: stdenv.mkDerivation rec { pname = "xdotool"; - version = "3.20160805.1"; + version = "3.20210804.2"; - src = fetchurl { - url = "https://github.com/jordansissel/xdotool/releases/download/v${version}/xdotool-${version}.tar.gz"; - sha256 = "1a6c1zr86zb53352yxv104l76l8x21gfl2bgw6h21iphxpv5zgim"; + src = fetchFromGitHub { + owner = "jordansissel"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-7N5f/BFtq/m5MsXe7ZCTUTc1yp+JDJNRF1P9qB2l554="; }; nativeBuildInputs = [ pkg-config perl ]; - buildInputs = [ libX11 libXtst xorgproto libXi libXinerama libxkbcommon ]; + buildInputs = [ libX11 libXtst xorgproto libXi libXinerama libxkbcommon libXext ]; preBuild = '' mkdir -p $out/lib diff --git a/third_party/nixpkgs/pkgs/tools/X11/xkbset/default.nix b/third_party/nixpkgs/pkgs/tools/X11/xkbset/default.nix index 31bcfc10d6..645770f7e0 100644 --- a/third_party/nixpkgs/pkgs/tools/X11/xkbset/default.nix +++ b/third_party/nixpkgs/pkgs/tools/X11/xkbset/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "xkbset"; - version = "0.5"; + version = "0.6"; src = fetchurl { url = "http://faculty.missouri.edu/~stephen/software/xkbset/xkbset-${version}.tar.gz"; - sha256 = "01c2579495b39e00d870f50225c441888dc88021e9ee3b693a842dd72554d172"; + sha256 = "sha256-rAMv7EnExPDyMY0/RhiXDFFBkbFC4GxRpmH+I0KlNaU="; }; buildInputs = [ perl libX11 ]; diff --git a/third_party/nixpkgs/pkgs/tools/X11/xosview2/default.nix b/third_party/nixpkgs/pkgs/tools/X11/xosview2/default.nix index fbee1e0ef6..771cc772d7 100644 --- a/third_party/nixpkgs/pkgs/tools/X11/xosview2/default.nix +++ b/third_party/nixpkgs/pkgs/tools/X11/xosview2/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "xosview2"; - version = "2.3.1"; + version = "2.3.2"; src = fetchurl { url = "mirror://sourceforge/xosview/${pname}-${version}.tar.gz"; - sha256 = "1drp0n6qjbxyc0104a3aw2g94rh5p218wmrqwxh3kwwm7pmr9xip"; + sha256 = "sha256-ex1GDBgx9Zzx5tOkZ2IRYskmBh/bUYpRTXHWRoE30vA="; }; # The software failed to buid with this enabled; it seemed tests were not implemented diff --git a/third_party/nixpkgs/pkgs/tools/X11/xwallpaper/default.nix b/third_party/nixpkgs/pkgs/tools/X11/xwallpaper/default.nix index d99a6ec8da..a05ef18dc9 100644 --- a/third_party/nixpkgs/pkgs/tools/X11/xwallpaper/default.nix +++ b/third_party/nixpkgs/pkgs/tools/X11/xwallpaper/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "xwallpaper"; - version = "0.7.0"; + version = "0.7.3"; src = fetchFromGitHub { owner = "stoeckmann"; repo = "xwallpaper"; rev = "v${version}"; - sha256 = "1bpymspnllbscha8j9y67w9ck2l6yv66zdbknv8s13hz5qi1ishk"; + sha256 = "sha256-O4VynpP3VJY/p6+NLUuKetwoMfbp93aXTiRoQJkgW+c="; }; nativeBuildInputs = [ pkg-config autoreconfHook installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/tools/admin/daemontools/default.nix b/third_party/nixpkgs/pkgs/tools/admin/daemontools/default.nix index 6fafc1c253..ad12234bf2 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/daemontools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/daemontools/default.nix @@ -1,24 +1,25 @@ { fetchurl, bash, glibc, lib, stdenv }: stdenv.mkDerivation rec { - name = "daemontools-0.76"; + pname = "daemontools"; + version = "0.76"; src = fetchurl { - url = "https://cr.yp.to/daemontools/${name}.tar.gz"; + url = "https://cr.yp.to/daemontools/daemontools-${version}.tar.gz"; sha256 = "07scvw88faxkscxi91031pjkpccql6wspk4yrlnsbrrb5c0kamd5"; }; patches = [ ./fix-nix-usernamespace-build.patch ]; configurePhase = '' - cd ${name} + cd daemontools-${version} sed -ie '1 s_$_ -include ${glibc.dev}/include/errno.h_' src/conf-cc substituteInPlace src/Makefile \ --replace '/bin/sh' '${bash}/bin/bash -oxtrace' - sed -ie "s_^PATH=.*_PATH=$src/${name}/compile:''${PATH}_" src/rts.tests + sed -ie "s_^PATH=.*_PATH=$src/daemontools-${version}/compile:''${PATH}_" src/rts.tests cat ${glibc.dev}/include/errno.h ''; diff --git a/third_party/nixpkgs/pkgs/tools/admin/drawterm/default.nix b/third_party/nixpkgs/pkgs/tools/admin/drawterm/default.nix new file mode 100644 index 0000000000..d3785a737f --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/admin/drawterm/default.nix @@ -0,0 +1,37 @@ +{ stdenv +, lib +, fetchgit +, xorg +}: + +stdenv.mkDerivation rec { + pname = "drawterm"; + version = "unstable-2021-08-02"; + + src = fetchgit { + url = "git://git.9front.org/plan9front/drawterm"; + rev = "a130d441722ac3f759d2d83b98eb6aef7e84f97e"; + sha256 = "R+W1XMqQqCrMwgX9lHRhxJPG6ZOvtQrU6HUsKfvfrBQ="; + }; + + buildInputs = [ + xorg.libX11 + xorg.libXt + ]; + + # TODO: macos + makeFlags = [ "CONF=unix" ]; + + installPhase = '' + install -Dm755 -t $out/bin/ drawterm + install -Dm644 -t $out/man/man1/ drawterm.1 + ''; + + meta = with lib; { + description = "Connect to Plan9 CPU servers from other operating systems."; + homepage = "https://drawterm.9front.org/"; + license = licenses.mit; + maintainers = with maintainers; [ luc65r ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/admin/eksctl/default.nix b/third_party/nixpkgs/pkgs/tools/admin/eksctl/default.nix index a51d33735b..7d0809b099 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/eksctl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/eksctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.60.0"; + version = "0.61.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "sha256-zRwdluwVi4hbDZGlRwhNWkeq05c2VTZ52KrxvyFIBio="; + sha256 = "sha256-8/1imYCPtSTZjk27nCkXOVi4hYzczsCzrn2k3WqHFzc="; }; - vendorSha256 = "sha256-mapok/c3uh7xmLZnN5S9zavgxSOfytqtqxBScv4Ao8w="; + vendorSha256 = "sha256-AWNTjqEeSEoXO9wcpEXM3y1AeqQYlbswjr0kXvXqGjk="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix index 9025217434..0ffa33a167 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "exoscale-cli"; - version = "1.40.0"; + version = "1.40.2"; src = fetchFromGitHub { owner = "exoscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-zhVG9mtkW0avMTtSnJ36qkxuy4SiiAENrKZqE5mXvaA="; + sha256 = "sha256-J5Wid/Xq3wYY+2/RoFgdY5ZDdNQu8TkTF9W6YLvnwvM="; }; goPackagePath = "github.com/exoscale/cli"; diff --git a/third_party/nixpkgs/pkgs/tools/admin/fioctl/default.nix b/third_party/nixpkgs/pkgs/tools/admin/fioctl/default.nix index 068d87a3bf..e271b2d154 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/fioctl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/fioctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fioctl"; - version = "0.18"; + version = "0.19.1"; src = fetchFromGitHub { owner = "foundriesio"; repo = "fioctl"; rev = "v${version}"; - sha256 = "sha256-uqJ08ftaU39gmhDtl+noVtGscu6utcl42rXz4XaGtWc="; + sha256 = "sha256-s6L/B01TaSCDMyRjZxNBDdhR46H7kDeXvVVP7b1e9Iw="; }; - vendorSha256 = "sha256-6a+JMj3hh6GPuqnLknv7/uR8vsUsOgsS+pdxHoMqH5w="; + vendorSha256 = "sha256-SuUY4xwinky5QO+GxyotrFiYX1LnWQNjwWXIUpfVHUE="; runVend = true; diff --git a/third_party/nixpkgs/pkgs/tools/admin/meshcentral/yarn.nix b/third_party/nixpkgs/pkgs/tools/admin/meshcentral/yarn.nix index 6e78523b66..2fd6d90075 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/meshcentral/yarn.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/meshcentral/yarn.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec { +{ fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec { offline_cache = linkFarm "offline" packages; packages = [ { diff --git a/third_party/nixpkgs/pkgs/tools/admin/pulumi/data.nix b/third_party/nixpkgs/pkgs/tools/admin/pulumi/data.nix index d874dea286..9f1239923e 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/pulumi/data.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/pulumi/data.nix @@ -1,24 +1,24 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "3.9.0"; + version = "3.10.0"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.9.0-linux-x64.tar.gz"; - sha256 = "0gxi3zi6scfl9d3b26q7i1f6z39q9npqgik0cgb178an0ygpk3w5"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.10.0-linux-x64.tar.gz"; + sha256 = "0rhsdxiz5lz4hlw6a1pkjfblsh42vnk9bw8xg7wbjl9wpld3rys1"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.2.0-linux-amd64.tar.gz"; sha256 = "0d88xfi7zzmpyrnvakwxsyavdx6d5hmfrcf4jhmd53mni0m0551l"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.14.0-linux-amd64.tar.gz"; - sha256 = "0sk2qmyw7cchlyqrzq2ny516iq9qxh2ywiql8111c5ph2kx8m7az"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.15.0-linux-amd64.tar.gz"; + sha256 = "1s8w5kh9nfdv1vcdrpa2m76r2470k0j4frc3j3ijmqq1i0vv5yhk"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v3.3.0-linux-amd64.tar.gz"; - sha256 = "1w626m38qr0qa9ccpb3f6wdggk3dridqh3jnx9z1zf6bdg2vspa1"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v3.4.0-linux-amd64.tar.gz"; + sha256 = "0scisiswjs3jx0wm6q8i7pgpr2js3kiilq7wc29afyjck6xa14rh"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.2.0-linux-amd64.tar.gz"; @@ -29,8 +29,8 @@ sha256 = "1ppwha1zk73w39msp6jym9in7jsrxzc530qgj4lj0961mb9rdkra"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.5.0-linux-amd64.tar.gz"; - sha256 = "0pdizb132a7r9n07hqmhrz57hhpmggvgbnmcc87xlpbzc5b72sin"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.6.0-linux-amd64.tar.gz"; + sha256 = "1a62af80czj9sahb52fiz25p59nbzjlr1h7ycdxpjl9m1bxhvlfr"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.0.0-linux-amd64.tar.gz"; @@ -41,8 +41,8 @@ sha256 = "0yhdcjscdkvvai95z2v6xabvvsfvaqi38ngpqrb73ahlwqhz3nys"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.13.0-linux-amd64.tar.gz"; - sha256 = "1xdldrsgh52lffbkxwc865qllr5sd9hsqksl55v0gm55acqh8jhd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.15.0-linux-amd64.tar.gz"; + sha256 = "11m1f80i33m4dh13z96yh655pfiwvk46sjspwql7s80kapl93pq9"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.2.0-linux-amd64.tar.gz"; @@ -53,16 +53,16 @@ sha256 = "13rchk54wpjwci26kfa519gqagwfrp31w6a9nk1xfdxj45ha9d3x"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.1.1-linux-amd64.tar.gz"; - sha256 = "03475c9qhd5wb174xnzi84dj74zf1fy2i43d5b7911w09mdqrzb6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.2.0-linux-amd64.tar.gz"; + sha256 = "0inx40vasjlxfvzr0pxbzm6rki50h5x5qkzx2wc51vv3gjln104q"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.5.1-linux-amd64.tar.gz"; - sha256 = "09jf18fmdvgnhx8nx5zbpyc8xgh0zr8w50z463vy4h62r3xyafs5"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.6.0-linux-amd64.tar.gz"; + sha256 = "19zvqxf13lr98sp3p1ry3q1fvzx0rpxwz5wbk331n5jn0ljzr783"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.2.0-linux-amd64.tar.gz"; - sha256 = "1lvb3vs2yp0ybz2xn2za5f0nfipiisrpzwzfn0wgl9arh17v0phc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.3.0-linux-amd64.tar.gz"; + sha256 = "0vyqzphk75h1mk9p6wblgsw2cypycv32glzrnk4fildj48dakm5y"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.1.0-linux-amd64.tar.gz"; @@ -73,8 +73,8 @@ sha256 = "04gaimdzh04v7f11xw1b7p95rbb142kbnix1zqas68wd6vpw9kyp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.2.0-linux-amd64.tar.gz"; - sha256 = "1np74bfvp4hr70izb8sarxvga3nnvyi9j7y6f0lqqgrfk2ixn48r"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.3.0-linux-amd64.tar.gz"; + sha256 = "0rpf48snjm5n1xn7s6lnda6ny1gjgmfsqmbibw6w7h7la0ff78jp"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-packet-v3.2.2-linux-amd64.tar.gz"; @@ -89,8 +89,8 @@ sha256 = "02g59jaifyjfcx185ir79d8lqic38dgaa9cb8dpi3xhvv32z0b0q"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v4.2.0-linux-amd64.tar.gz"; - sha256 = "1jvq530gz7bjcljlb3y6yvgfj1fgksgcxs48vl2j6xzyl6y56f6g"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v4.3.0-linux-amd64.tar.gz"; + sha256 = "0rmk55qivand0wa82mxgvyzgg16nz1r3q99k0n9zdlvh9dbffnc8"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.0.1-linux-amd64.tar.gz"; @@ -99,20 +99,20 @@ ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.9.0-darwin-x64.tar.gz"; - sha256 = "11smw4vy4pzy56smw2mkdaxs2ymkgq9zkhrlq512nx4xh3z46aiv"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.10.0-darwin-x64.tar.gz"; + sha256 = "18q1v1n3a497wbbzzjngpl90wpjnffn9wnpdp171r47k6xvbcsyq"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.2.0-darwin-amd64.tar.gz"; sha256 = "12mkr0xczdnp21k0k7qn4r3swkaq3pr6v2z853p1db7ksz5kds23"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.14.0-darwin-amd64.tar.gz"; - sha256 = "1fdqp3lhqsm06crbwvyq5qbxy97n432mcnyqcrsd5202yyk6dzbs"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.15.0-darwin-amd64.tar.gz"; + sha256 = "1jnwlhfyyxz7196igi3gas3459k4nq1f4m1i4vdnxhkskp5838l0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v3.3.0-darwin-amd64.tar.gz"; - sha256 = "1h5rvwy4mdb8566nj4hkxnfva77xrj33y7sxssk7y9gi6k0yx7qa"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v3.4.0-darwin-amd64.tar.gz"; + sha256 = "0wy4ayrfqizf8izz5dgwv8xi5hvjh03jrg5lvglfph6549d4lpwc"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.2.0-darwin-amd64.tar.gz"; @@ -123,8 +123,8 @@ sha256 = "1wwldhy6r6985rwx9vv73jb1nsna387sk6mba81lyc55ar67nsp9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.5.0-darwin-amd64.tar.gz"; - sha256 = "0ww91jbi9z8qf0n820h6bx60x2jp4hvwy0aazw37392aczz1kz6d"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.6.0-darwin-amd64.tar.gz"; + sha256 = "062xzx7408xqlppw1nixs205i83436n0cbjngzc65wm03bzzj7mh"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.0.0-darwin-amd64.tar.gz"; @@ -135,8 +135,8 @@ sha256 = "1dpsbq3b0fz86355jy7rz4kcsa1lnw4azn25vzlis89ay1ncbblc"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.13.0-darwin-amd64.tar.gz"; - sha256 = "036msa4h2s5glyfh58kgnimzkiyq4m2k8vhq20wj5mgzpza4gp8v"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.15.0-darwin-amd64.tar.gz"; + sha256 = "01vrivbdhsl50kiv092j2a5jvikhrw1kzpa5ags701l721zslycq"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.2.0-darwin-amd64.tar.gz"; @@ -147,16 +147,16 @@ sha256 = "0qbw4b5zm6dmwdilaz4bjdg55gc5lilwagrxwrab37vq4a8and4c"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.1.1-darwin-amd64.tar.gz"; - sha256 = "02pfb2j5wsvz0mc99sqpv7fkg00drdmi8bwzvwkg3gr1kqlgvjbv"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.2.0-darwin-amd64.tar.gz"; + sha256 = "0bj7ir7dpkfsb75bjl45irwi692zxnys0125kmwdn8gnamlij5fx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.5.1-darwin-amd64.tar.gz"; - sha256 = "1ddz2lh8sz4zy5dzwxnzq32ln9y24dx1b8pvkx8h66z3n0dwa368"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.6.0-darwin-amd64.tar.gz"; + sha256 = "0i06q1hrxi84r8ss3ck7jgk3g4lblkjvgm3wx35v551l0ynmmqqw"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.2.0-darwin-amd64.tar.gz"; - sha256 = "008jqnrl08g3gd38vg2yjwxdn288z75sbp3ghl2cbncfah2lwwja"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.3.0-darwin-amd64.tar.gz"; + sha256 = "0fwbh02n7cjmv6d9jbqpjnmvvdp1cnsyhy7gxd2863j4w5f17q48"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.1.0-darwin-amd64.tar.gz"; @@ -167,8 +167,8 @@ sha256 = "18vrp0zzi92x4l5nkjszvd0zr7pk6nl6s3h5a3hvsz5qrj2830q3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.2.0-darwin-amd64.tar.gz"; - sha256 = "08rmknpwrbc9h57a3ddg05s0idxbbrcf46i2gkqknjzs7dr6wzas"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.3.0-darwin-amd64.tar.gz"; + sha256 = "0jlvdnvcmml009a84lfa6745qwjsifa9zmdrv4gqy9p76iydfs1n"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-packet-v3.2.2-darwin-amd64.tar.gz"; @@ -183,8 +183,8 @@ sha256 = "0gd3xnl31892qp8ilz9lc1zdps77nf07jgvh0k37mink8f0ppy2z"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v4.2.0-darwin-amd64.tar.gz"; - sha256 = "0cg806zpax6q69nr9gdnj00i5lqfh5ljs62181m8jrpczdaryxcn"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v4.3.0-darwin-amd64.tar.gz"; + sha256 = "0ay8d84fc1hr1n4fpy1a4nj7bmhxzp86p0x68gz4rr9iwrd7xfgl"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.0.1-darwin-amd64.tar.gz"; diff --git a/third_party/nixpkgs/pkgs/tools/admin/pulumi/update.sh b/third_party/nixpkgs/pkgs/tools/admin/pulumi/update.sh index dc603283ad..b65ea5e349 100755 --- a/third_party/nixpkgs/pkgs/tools/admin/pulumi/update.sh +++ b/third_party/nixpkgs/pkgs/tools/admin/pulumi/update.sh @@ -3,32 +3,32 @@ # Version of Pulumi from # https://www.pulumi.com/docs/get-started/install/versions/ -VERSION="3.9.0" +VERSION="3.10.0" # Grab latest release ${VERSION} from # https://github.com/pulumi/pulumi-${NAME}/releases plugins=( "auth0=2.2.0" - "aws=4.14.0" - "cloudflare=3.3.0" + "aws=4.15.0" + "cloudflare=3.4.0" "consul=3.2.0" "datadog=3.3.0" - "digitalocean=4.5.0" + "digitalocean=4.6.0" "docker=3.0.0" "equinix-metal=2.0.0" - "gcp=5.13.0" + "gcp=5.15.0" "github=4.2.0" "gitlab=4.1.0" - "hcloud=1.1.1" - "kubernetes=3.5.1" - "linode=3.2.0" + "hcloud=1.2.0" + "kubernetes=3.6.0" + "linode=3.3.0" "mailgun=3.1.0" "mysql=3.0.0" - "openstack=3.2.0" + "openstack=3.3.0" "packet=3.2.2" "postgresql=3.1.0" "random=4.2.0" - "vault=4.2.0" + "vault=4.3.0" "vsphere=4.0.1" ) diff --git a/third_party/nixpkgs/pkgs/tools/admin/tightvnc/default.nix b/third_party/nixpkgs/pkgs/tools/admin/tightvnc/default.nix index 1bfb3be113..0da2e7875f 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/tightvnc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/tightvnc/default.nix @@ -1,11 +1,12 @@ { lib, stdenv, fetchurl, xlibsWrapper, zlib, libjpeg, imake, gccmakedep, libXmu , libXaw, libXpm, libXp , perl, xauth, fontDirectories, openssh }: -stdenv.mkDerivation { - name = "tightvnc-1.3.10"; +stdenv.mkDerivation rec { + pname = "tightvnc"; + version = "1.3.10"; src = fetchurl { - url = "mirror://sourceforge/vnc-tight/tightvnc-1.3.10_unixsrc.tar.bz2"; + url = "mirror://sourceforge/vnc-tight/tightvnc-${version}_unixsrc.tar.bz2"; sha256 = "f48c70fea08d03744ae18df6b1499976362f16934eda3275cead87baad585c0d"; }; diff --git a/third_party/nixpkgs/pkgs/tools/archivers/atool/default.nix b/third_party/nixpkgs/pkgs/tools/archivers/atool/default.nix index 419a7d04ee..8303a1b427 100644 --- a/third_party/nixpkgs/pkgs/tools/archivers/atool/default.nix +++ b/third_party/nixpkgs/pkgs/tools/archivers/atool/default.nix @@ -1,9 +1,11 @@ {lib, stdenv, fetchurl, perl, bash}: -stdenv.mkDerivation { - name = "atool-0.39.0"; +stdenv.mkDerivation rec { + pname = "atool"; + version = "0.39.0"; + src = fetchurl { - url = "mirror://savannah/atool/atool-0.39.0.tar.gz"; + url = "mirror://savannah/atool/atool-${version}.tar.gz"; sha256 = "aaf60095884abb872e25f8e919a8a63d0dabaeca46faeba87d12812d6efc703b"; }; diff --git a/third_party/nixpkgs/pkgs/tools/archivers/cabextract/default.nix b/third_party/nixpkgs/pkgs/tools/archivers/cabextract/default.nix index 3ed07544bb..4dddc4a5a6 100644 --- a/third_party/nixpkgs/pkgs/tools/archivers/cabextract/default.nix +++ b/third_party/nixpkgs/pkgs/tools/archivers/cabextract/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "cabextract-1.9.1"; + pname = "cabextract"; + version = "1.9.1"; src = fetchurl { - url = "https://www.cabextract.org.uk/${name}.tar.gz"; + url = "https://www.cabextract.org.uk/cabextract-${version}.tar.gz"; sha256 = "19qwhl2r8ip95q4vxzxg2kp4p125hjmc9762sns1dwwf7ikm7hmg"; }; diff --git a/third_party/nixpkgs/pkgs/tools/archivers/cromfs/default.nix b/third_party/nixpkgs/pkgs/tools/archivers/cromfs/default.nix index bed0485e44..899640d90c 100644 --- a/third_party/nixpkgs/pkgs/tools/archivers/cromfs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/archivers/cromfs/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, fuse, perl }: stdenv.mkDerivation rec { - name = "cromfs-1.5.10.2"; + pname = "cromfs"; + version = "1.5.10.2"; src = fetchurl { - url = "https://bisqwit.iki.fi/src/arch/${name}.tar.bz2"; + url = "https://bisqwit.iki.fi/src/arch/cromfs-${version}.tar.bz2"; sha256 = "0xy2x1ws1qqfp7hfj6yzm80zhrxzmhn0w2yns77im1lmd2h18817"; }; diff --git a/third_party/nixpkgs/pkgs/tools/archivers/innoextract/default.nix b/third_party/nixpkgs/pkgs/tools/archivers/innoextract/default.nix index 4822ea82d1..d2e1bebb36 100644 --- a/third_party/nixpkgs/pkgs/tools/archivers/innoextract/default.nix +++ b/third_party/nixpkgs/pkgs/tools/archivers/innoextract/default.nix @@ -3,10 +3,11 @@ , withGog ? false, unar ? null }: stdenv.mkDerivation rec { - name = "innoextract-1.9"; + pname = "innoextract"; + version = "1.9"; src = fetchurl { - url = "https://constexpr.org/innoextract/files/${name}.tar.gz"; + url = "https://constexpr.org/innoextract/files/innoextract-${version}.tar.gz"; sha256 = "09l1z1nbl6ijqqwszdwch9mqr54qb7df0wp2sd77v17dq6gsci33"; }; diff --git a/third_party/nixpkgs/pkgs/tools/archivers/maxcso/default.nix b/third_party/nixpkgs/pkgs/tools/archivers/maxcso/default.nix index ed81a18252..1e7fe73728 100644 --- a/third_party/nixpkgs/pkgs/tools/archivers/maxcso/default.nix +++ b/third_party/nixpkgs/pkgs/tools/archivers/maxcso/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "maxcso"; - version = "1.12.0"; + version = "1.13.0"; src = fetchFromGitHub { owner = "unknownbrackets"; repo = "maxcso"; rev = "v${version}"; - sha256 = "10r0vb3ndpq1pw5224d48nim5xz8jj94zhlfy29br6h6jblq8zap"; + sha256 = "sha256-6LjR1ZMZsi6toz9swPzNmSAlrUykwvVdYi1mR8Ctq5U="; }; buildInputs = [ libuv lz4 zlib ]; diff --git a/third_party/nixpkgs/pkgs/tools/archivers/pxattr/default.nix b/third_party/nixpkgs/pkgs/tools/archivers/pxattr/default.nix index 79a40e6ca6..57eb7e6f87 100644 --- a/third_party/nixpkgs/pkgs/tools/archivers/pxattr/default.nix +++ b/third_party/nixpkgs/pkgs/tools/archivers/pxattr/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, gcc }: -stdenv.mkDerivation { - name = "pxattr-2.1.0"; +stdenv.mkDerivation rec { + pname = "pxattr"; + version = "2.1.0"; src = fetchurl { - url = "https://www.lesbonscomptes.com/pxattr/pxattr-2.1.0.tar.gz"; + url = "https://www.lesbonscomptes.com/pxattr/pxattr-${version}.tar.gz"; sha256 = "1dwcqc5z7gzma1zhis2md49bj2nq7m6jimh4zlx9szw6svisz56z"; }; diff --git a/third_party/nixpkgs/pkgs/tools/archivers/wimlib/default.nix b/third_party/nixpkgs/pkgs/tools/archivers/wimlib/default.nix index 4f397b9bf5..cca62edfce 100644 --- a/third_party/nixpkgs/pkgs/tools/archivers/wimlib/default.nix +++ b/third_party/nixpkgs/pkgs/tools/archivers/wimlib/default.nix @@ -8,7 +8,7 @@ }: stdenv.mkDerivation rec { - version = "1.13.2"; + version = "1.13.4"; pname = "wimlib"; nativeBuildInputs = [ pkg-config makeWrapper ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://wimlib.net/downloads/${pname}-${version}.tar.gz"; - sha256 = "0id9ym3hzij4kpdrk0sz3ijxp5r0z1md5jch83pml9hdy1zbx5bj"; + sha256 = "sha256-S4fdCtnMGljO5XIa/ruYAR2rVJ5y8rVVM/MV8Isu3hI="; }; preBuild = '' diff --git a/third_party/nixpkgs/pkgs/tools/audio/audiowaveform/default.nix b/third_party/nixpkgs/pkgs/tools/audio/audiowaveform/default.nix index e120f6fcbf..ab56a9890b 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/audiowaveform/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/audiowaveform/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "audiowaveform"; - version = "1.4.2"; + version = "1.5.1"; src = fetchFromGitHub { owner = "bbc"; repo = "audiowaveform"; rev = version; - sha256 = "0k2s2f2hgq4pnjzfkgvjwgsflihmzdq7shicfjn0z2mzw4d1bvp2"; + sha256 = "sha256-WODAgiwZ7UfoukTcujXE5atw/Z03+Vo6aR2jubPwQeU="; }; nativeBuildInputs = [ cmake gtest ]; @@ -16,8 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ boost gd libsndfile libmad libid3tag ]; preConfigure = '' - ln -s ${gtest.src}/googletest googletest - ln -s ${gtest.src}/googlemock googlemock + ln -s ${gtest.src} googletest ''; # One test is failing, see PR #101947 diff --git a/third_party/nixpkgs/pkgs/tools/audio/gvolicon/default.nix b/third_party/nixpkgs/pkgs/tools/audio/gvolicon/default.nix index 9ef8eb4377..852f538d6e 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/gvolicon/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/gvolicon/default.nix @@ -1,7 +1,9 @@ { lib, stdenv, makeWrapper, alsa-lib, pkg-config, fetchgit, gtk3, gnome, gdk-pixbuf, librsvg, wrapGAppsHook }: stdenv.mkDerivation { - name = "gvolicon-2014-04-28"; + pname = "gvolicon"; + version = "unstable-2014-04-28"; + src = fetchgit { url = "https://github.com/Unia/gvolicon"; rev = "0d65a396ba11f519d5785c37fec3e9a816217a07"; diff --git a/third_party/nixpkgs/pkgs/tools/audio/midicsv/default.nix b/third_party/nixpkgs/pkgs/tools/audio/midicsv/default.nix index cf55e0dd81..698205a2b0 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/midicsv/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/midicsv/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "midicsv-1.1"; + pname = "midicsv"; + version = "1.1"; src = fetchurl { - url = "http://www.fourmilab.ch/webtools/midicsv/${name}.tar.gz"; + url = "http://www.fourmilab.ch/webtools/midicsv/midicsv-${version}.tar.gz"; sha256 = "1vvhk2nf9ilfw0wchmxy8l13hbw9cnpz079nsx5srsy4nnd78nkw"; }; diff --git a/third_party/nixpkgs/pkgs/tools/audio/mpdsync/default.nix b/third_party/nixpkgs/pkgs/tools/audio/mpdsync/default.nix index 51f5ba6561..c89404fbba 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/mpdsync/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/mpdsync/default.nix @@ -1,7 +1,8 @@ { stdenv, python2, fetchFromGitHub }: with python2.pkgs; stdenv.mkDerivation { - name = "mpdsync-2017-06-15"; + pname = "mpdsync"; + version = "unstable-2017-06-15"; src = fetchFromGitHub { owner = "alphapapa"; diff --git a/third_party/nixpkgs/pkgs/tools/audio/pa-applet/default.nix b/third_party/nixpkgs/pkgs/tools/audio/pa-applet/default.nix index 358e662ca1..6adc24e530 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/pa-applet/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/pa-applet/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchgit, libpulseaudio, pkg-config, gtk3, glibc, autoconf, automake, libnotify, libX11, xf86inputevdev }: stdenv.mkDerivation { - name = "pa-applet-2012-04-11"; + pname = "pa-applet"; + version = "unstable-2012-04-11"; src = fetchgit { url = "git://github.com/fernandotcl/pa-applet.git"; diff --git a/third_party/nixpkgs/pkgs/tools/audio/picotts/default.nix b/third_party/nixpkgs/pkgs/tools/audio/picotts/default.nix index 03f446dc21..5c995f407a 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/picotts/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/picotts/default.nix @@ -1,7 +1,9 @@ { lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, popt }: stdenv.mkDerivation { - name = "picotts-unstable-2018-10-19"; + pname = "picotts"; + version = "unstable-2018-10-19"; + src = fetchFromGitHub { repo = "picotts"; owner = "naggety"; diff --git a/third_party/nixpkgs/pkgs/tools/backup/dirvish/default.nix b/third_party/nixpkgs/pkgs/tools/backup/dirvish/default.nix index a26bdb0d9a..4f99e60f4d 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/dirvish/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/dirvish/default.nix @@ -1,9 +1,11 @@ { fetchurl, lib, stdenv, makeWrapper, perl, perlPackages }: stdenv.mkDerivation rec { - name = "dirvish-1.2.1"; + pname = "dirvish"; + version = "1.2.1"; + src = fetchurl { - url = "http://dirvish.org/${name}.tgz"; + url = "http://dirvish.org/dirvish${version}.tgz"; sha256 = "6b7f29c3541448db3d317607bda3eb9bac9fb3c51f970611ffe27e9d63507dcd"; }; diff --git a/third_party/nixpkgs/pkgs/tools/backup/discordchatexporter-cli/deps.nix b/third_party/nixpkgs/pkgs/tools/backup/discordchatexporter-cli/deps.nix index a745a43591..f861a9cfdf 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/discordchatexporter-cli/deps.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/discordchatexporter-cli/deps.nix @@ -1,72 +1,16 @@ { fetchNuGet }: [ - (fetchNuGet { - name = "CliFx"; - version = "2.0.6"; - sha256 = "09yyjgpp52b0r3mqlvx75ld4vjp8hry7ql7r20nnvj0lach6fyh6"; - }) - (fetchNuGet { - name = "Gress"; - version = "1.2.0"; - sha256 = "0aidc9whi0718gh896j7xkyndki9x7rifd8n1n681afb2zbxw4bn"; - }) - (fetchNuGet { - name = "JsonExtensions"; - version = "1.1.0"; - sha256 = "1fqxb2jdbvjgg135wmy890qf63r056dq16jy7wgzkgp21m3j0lgy"; - }) - (fetchNuGet { - name = "Microsoft.AspNetCore.App.Ref"; - version = "3.1.10"; - sha256 = "0xn4zh7shvijqlr03fqsmps6gz856isd9bg9rk4z2c4599ggal77"; - }) - (fetchNuGet { - name = "Microsoft.NETCore.App.Host.linux-x64"; - version = "3.1.14"; - sha256 = "11rqnascx9asfyxgxzwgxgr9gxxndm552k4dn4p1s57ciz7vkg9h"; - }) - (fetchNuGet { - name = "Microsoft.NETCore.App.Ref"; - version = "3.1.0"; - sha256 = "08svsiilx9spvjamcnjswv0dlpdrgryhr3asdz7cvnl914gjzq4y"; - }) - (fetchNuGet { - name = "MiniRazor.CodeGen"; - version = "2.1.4"; - sha256 = "1856hfw2wl3ilxmpg4jmwpigmq0rm50i9pmy3sq8f1xc8j44kzl2"; - }) - (fetchNuGet { - name = "MiniRazor.Runtime"; - version = "2.1.4"; - sha256 = "1pc3kjbnz810a8bb94k6355rflmayigfmpfmc4jzzx6l6iavnnc4"; - }) - (fetchNuGet { - name = "Polly"; - version = "7.2.2"; - sha256 = "0s15n5zwj44i6sw3v40ca8l6j0ijydxcakvad49j52rp49iwrmkn"; - }) - (fetchNuGet { - name = "Spectre.Console"; - version = "0.41.0"; - sha256 = "104vyzwbbq5m75dm31xk7ilvmik8hw1cj3bc301a8w6gq8i0fpk3"; - }) - (fetchNuGet { - name = "Superpower"; - version = "2.3.0"; - sha256 = "0bdsc3c0d6jb0wr67siqfba0ldl0jxbwis6xr0whzqzf6m2cyahm"; - }) - (fetchNuGet { - name = "System.Memory"; - version = "4.5.0"; - sha256 = "1layqpcx1q4l805fdnj2dfqp6ncx2z42ca06rgsr6ikq4jjgbv30"; - }) - (fetchNuGet { - name = "Tyrrrz.Extensions"; - version = "1.6.5"; - sha256 = "1yzsii1pbp6b066wxwwws310p7h809apl81bhb8ad55hqlzy1rg3"; - }) - (fetchNuGet { - name = "Wcwidth"; - version = "0.2.0"; - sha256 = "0p7zaisix9ql4v5nyl9gfc93xcyj74j01rwvgm7jw29js3wlj10s"; - }) + (fetchNuGet { name = "CliFx"; version = "2.0.6"; sha256 = "09yyjgpp52b0r3mqlvx75ld4vjp8hry7ql7r20nnvj0lach6fyh6"; }) + (fetchNuGet { name = "Gress"; version = "1.2.0"; sha256 = "0aidc9whi0718gh896j7xkyndki9x7rifd8n1n681afb2zbxw4bn"; }) + (fetchNuGet { name = "JsonExtensions"; version = "1.1.0"; sha256 = "1fqxb2jdbvjgg135wmy890qf63r056dq16jy7wgzkgp21m3j0lgy"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.App.Ref"; version = "3.1.10"; sha256 = "0xn4zh7shvijqlr03fqsmps6gz856isd9bg9rk4z2c4599ggal77"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Host.linux-x64"; version = "3.1.14"; sha256 = "11rqnascx9asfyxgxzwgxgr9gxxndm552k4dn4p1s57ciz7vkg9h"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Ref"; version = "3.1.0"; sha256 = "08svsiilx9spvjamcnjswv0dlpdrgryhr3asdz7cvnl914gjzq4y"; }) + (fetchNuGet { name = "MiniRazor.CodeGen"; version = "2.1.4"; sha256 = "1856hfw2wl3ilxmpg4jmwpigmq0rm50i9pmy3sq8f1xc8j44kzl2"; }) + (fetchNuGet { name = "MiniRazor.Runtime"; version = "2.1.4"; sha256 = "1pc3kjbnz810a8bb94k6355rflmayigfmpfmc4jzzx6l6iavnnc4"; }) + (fetchNuGet { name = "Polly"; version = "7.2.2"; sha256 = "0s15n5zwj44i6sw3v40ca8l6j0ijydxcakvad49j52rp49iwrmkn"; }) + (fetchNuGet { name = "Spectre.Console"; version = "0.41.0"; sha256 = "104vyzwbbq5m75dm31xk7ilvmik8hw1cj3bc301a8w6gq8i0fpk3"; }) + (fetchNuGet { name = "Superpower"; version = "2.3.0"; sha256 = "0bdsc3c0d6jb0wr67siqfba0ldl0jxbwis6xr0whzqzf6m2cyahm"; }) + (fetchNuGet { name = "System.Memory"; version = "4.5.0"; sha256 = "1layqpcx1q4l805fdnj2dfqp6ncx2z42ca06rgsr6ikq4jjgbv30"; }) + (fetchNuGet { name = "Tyrrrz.Extensions"; version = "1.6.5"; sha256 = "1yzsii1pbp6b066wxwwws310p7h809apl81bhb8ad55hqlzy1rg3"; }) + (fetchNuGet { name = "Wcwidth"; version = "0.2.0"; sha256 = "0p7zaisix9ql4v5nyl9gfc93xcyj74j01rwvgm7jw29js3wlj10s"; }) ] diff --git a/third_party/nixpkgs/pkgs/tools/backup/discordchatexporter-cli/updater.sh b/third_party/nixpkgs/pkgs/tools/backup/discordchatexporter-cli/updater.sh index ff5c44a19b..1fc261c298 100755 --- a/third_party/nixpkgs/pkgs/tools/backup/discordchatexporter-cli/updater.sh +++ b/third_party/nixpkgs/pkgs/tools/backup/discordchatexporter-cli/updater.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl jq common-updater-scripts dotnet-sdk_5 +#!nix-shell -i bash -p curl jq common-updater-scripts nuget-to-nix dotnet-sdk_5 set -eo pipefail cd "$(dirname "${BASH_SOURCE[0]}")" @@ -24,21 +24,7 @@ pushd "$src" mkdir ./nuget_tmp.packages dotnet restore DiscordChatExporter.Cli/DiscordChatExporter.Cli.csproj --packages ./nuget_tmp.packages -echo "{ fetchNuGet }: [" >"$deps_file" -while read pkg_spec; do - { read pkg_name; read pkg_version; } < <( - # Build version part should be ignored: `3.0.0-beta2.20059.3+77df2220` -> `3.0.0-beta2.20059.3` - sed -nE 's/.*([^<]*).*/\1/p; s/.*([^<+]*).*/\1/p' "$pkg_spec") - pkg_sha256="$(nix-hash --type sha256 --flat --base32 "$(dirname "$pkg_spec")"/*.nupkg)" - cat >>"$deps_file" <>"$deps_file" +nuget-to-nix ./nuget_tmp.packages > "$deps_file" popd rm -r "$src" diff --git a/third_party/nixpkgs/pkgs/tools/backup/monolith/default.nix b/third_party/nixpkgs/pkgs/tools/backup/monolith/default.nix index 8c2be78af2..bc31d5dfd3 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/monolith/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/monolith/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "monolith"; - version = "2.4.1"; + version = "2.6.1"; src = fetchFromGitHub { owner = "Y2Z"; repo = pname; rev = "v${version}"; - sha256 = "sha256-n89rfZwR8B6SKeLtzmbeHRyw2G9NIQ1BY6JvJuZmC/w="; + sha256 = "sha256-JhQkoVGJpMesNz2hRe+kWNX4zYrIcKzT0Z6owrXlRN4="; }; - cargoSha256 = "sha256-+UGGsBU12PzkrZ8Po8fJBs1pygdOvoHp0tKmipjVMQ4="; + cargoSha256 = "sha256-BikzJr50Aua9llyQgbP/paIoC7dvsG0RYyVXmbdeGIA="; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; buildInputs = lib.optionals stdenv.isLinux [ openssl ] diff --git a/third_party/nixpkgs/pkgs/tools/backup/mt-st/default.nix b/third_party/nixpkgs/pkgs/tools/backup/mt-st/default.nix index 804c50830c..8c62ad6512 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/mt-st/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/mt-st/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "mt-st-1.3"; + pname = "mt-st"; + version = "1.3"; src = fetchurl { - url = "https://github.com/iustin/mt-st/releases/download/${name}/${name}.tar.gz"; + url = "https://github.com/iustin/mt-st/releases/download/mt-st-${version}/mt-st-${version}.tar.gz"; sha256 = "b552775326a327cdcc076c431c5cbc4f4e235ac7c41aa931ad83f94cccb9f6de"; }; diff --git a/third_party/nixpkgs/pkgs/tools/backup/mtx/default.nix b/third_party/nixpkgs/pkgs/tools/backup/mtx/default.nix index aa72b02afb..b847695494 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/mtx/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/mtx/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "mtx-1.3.12"; + pname = "mtx"; + version = "1.3.12"; src = fetchurl { - url = "mirror://gentoo/distfiles/${name}.tar.gz"; + url = "mirror://gentoo/distfiles/mtx-${version}.tar.gz"; sha256 = "0261c5e90b98b6138cd23dadecbc7bc6e2830235145ed2740290e1f35672d843"; }; diff --git a/third_party/nixpkgs/pkgs/tools/backup/partimage/default.nix b/third_party/nixpkgs/pkgs/tools/backup/partimage/default.nix index 2477fa6e44..afb8489e1f 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/partimage/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/partimage/default.nix @@ -9,12 +9,14 @@ , slang , autoreconfHook }: -stdenv.mkDerivation { - name = "partimage-0.6.9"; +stdenv.mkDerivation rec { + pname = "partimage"; + version = "0.6.9"; + enableParallelBuilding = true; src = fetchurl { - url = "mirror://sourceforge/partimage/partimage-0.6.9.tar.bz2"; + url = "mirror://sourceforge/partimage/partimage-${version}.tar.bz2"; sha256 = "0db6xiphk6xnlpbxraiy31c5xzj0ql6k4rfkmqzh665yyj0nqfkm"; }; diff --git a/third_party/nixpkgs/pkgs/tools/backup/rsnapshot/default.nix b/third_party/nixpkgs/pkgs/tools/backup/rsnapshot/default.nix index 9322e62a3d..3ded8c6b84 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/rsnapshot/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/rsnapshot/default.nix @@ -1,10 +1,11 @@ { fetchurl, lib, stdenv, perl, openssh, rsync, logger }: stdenv.mkDerivation rec { - name = "rsnapshot-1.4.3"; + pname = "rsnapshot"; + version = "1.4.3"; src = fetchurl { - url = "https://rsnapshot.org/downloads/${name}.tar.gz"; + url = "https://rsnapshot.org/downloads/rsnapshot-${version}.tar.gz"; sha256 = "1lavqmmsf53pim0nvming7fkng6p0nk2a51k2c2jdq0l7snpl31b"; }; diff --git a/third_party/nixpkgs/pkgs/tools/backup/s3ql/default.nix b/third_party/nixpkgs/pkgs/tools/backup/s3ql/default.nix index f67b546707..00d3b427d6 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/s3ql/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/s3ql/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "s3ql"; - version = "3.7.2"; + version = "3.7.3"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "release-${version}"; - sha256 = "11f8k5vzfq69slzv17vddj135mzlcpmcj3cj3bigq717qb8vd6wl"; + sha256 = "042fvkvranfnv2xxxz9d92cgia14p1hwmpjgm0rr94pjd36n1sfs"; }; checkInputs = [ which ] ++ (with python3Packages; [ cython pytest pytest-trio ]); diff --git a/third_party/nixpkgs/pkgs/tools/bluetooth/obex-data-server/default.nix b/third_party/nixpkgs/pkgs/tools/bluetooth/obex-data-server/default.nix index f580080e87..cc6754b4a8 100644 --- a/third_party/nixpkgs/pkgs/tools/bluetooth/obex-data-server/default.nix +++ b/third_party/nixpkgs/pkgs/tools/bluetooth/obex-data-server/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, libusb-compat-0_1, glib, dbus-glib, bluez, openobex, dbus }: stdenv.mkDerivation rec { - name = "obex-data-server-0.4.6"; + pname = "obex-data-server"; + version = "0.4.6"; src = fetchurl { - url = "http://tadas.dailyda.com/software/${name}.tar.gz"; + url = "http://tadas.dailyda.com/software/obex-data-server-${version}.tar.gz"; sha256 = "0kq940wqs9j8qjnl58d6l3zhx0jaszci356xprx23l6nvdfld6dk"; }; diff --git a/third_party/nixpkgs/pkgs/tools/bluetooth/obexd/default.nix b/third_party/nixpkgs/pkgs/tools/bluetooth/obexd/default.nix index 6ddbcd5652..c18aa3a1c2 100644 --- a/third_party/nixpkgs/pkgs/tools/bluetooth/obexd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/bluetooth/obexd/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, glib, dbus, openobex, bluez, libical }: stdenv.mkDerivation rec { - name = "obexd-0.48"; + pname = "obexd"; + version = "0.48"; src = fetchurl { - url = "mirror://kernel/linux/bluetooth/${name}.tar.bz2"; + url = "mirror://kernel/linux/bluetooth/obexd-${version}.tar.bz2"; sha256 = "1i20dnibvnq9lnkkhajr5xx3kxlwf9q5c4jm19kyb0q1klzgzlb8"; }; diff --git a/third_party/nixpkgs/pkgs/tools/bluetooth/obexfs/default.nix b/third_party/nixpkgs/pkgs/tools/bluetooth/obexfs/default.nix index b81e8c4ea5..2783c63899 100644 --- a/third_party/nixpkgs/pkgs/tools/bluetooth/obexfs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/bluetooth/obexfs/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, bluez, fuse, obexftp }: stdenv.mkDerivation rec { - name = "obexfs-0.12"; + pname = "obexfs"; + version = "0.12"; src = fetchurl { - url = "mirror://sourceforge/openobex/${name}.tar.gz"; + url = "mirror://sourceforge/openobex/obexfs-${version}.tar.gz"; sha256 = "1g3krpygk6swa47vbmp9j9s8ahqqcl9ra8r25ybgzv2d9pmjm9kj"; }; diff --git a/third_party/nixpkgs/pkgs/tools/bluetooth/obexftp/default.nix b/third_party/nixpkgs/pkgs/tools/bluetooth/obexftp/default.nix index fc2ff6128f..3d9eda383d 100644 --- a/third_party/nixpkgs/pkgs/tools/bluetooth/obexftp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/bluetooth/obexftp/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, openobex, bluez, cmake }: stdenv.mkDerivation rec { - name = "obexftp-0.24.2"; + pname = "obexftp"; + version = "0.24.2"; src = fetchurl { - url = "mirror://sourceforge/openobex/${name}-Source.tar.gz"; + url = "mirror://sourceforge/openobex/obexftp-${version}-Source.tar.gz"; sha256 = "18w9r78z78ri5qc8fjym4nk1jfbrkyr789sq7rxrkshf1a7b83yl"; }; diff --git a/third_party/nixpkgs/pkgs/tools/bluetooth/openobex/default.nix b/third_party/nixpkgs/pkgs/tools/bluetooth/openobex/default.nix index 1079623cf2..831644bd4a 100644 --- a/third_party/nixpkgs/pkgs/tools/bluetooth/openobex/default.nix +++ b/third_party/nixpkgs/pkgs/tools/bluetooth/openobex/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, bluez, libusb-compat-0_1, cmake }: stdenv.mkDerivation rec { - name = "openobex-1.7.2"; + pname = "openobex"; + version = "1.7.2"; src = fetchurl { - url = "mirror://sourceforge/openobex/${name}-Source.tar.gz"; + url = "mirror://sourceforge/openobex/openobex-${version}-Source.tar.gz"; sha256 = "1z6l7pbwgs5pjx3861cyd3r6vq5av984bdp4r3hgrw2jxam6120m"; }; diff --git a/third_party/nixpkgs/pkgs/tools/cd-dvd/ccd2iso/default.nix b/third_party/nixpkgs/pkgs/tools/cd-dvd/ccd2iso/default.nix index 10f8d9701d..ad3fee9792 100644 --- a/third_party/nixpkgs/pkgs/tools/cd-dvd/ccd2iso/default.nix +++ b/third_party/nixpkgs/pkgs/tools/cd-dvd/ccd2iso/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "ccd2iso-0.3"; + pname = "ccd2iso"; + version = "0.3"; src = fetchurl { - url = "mirror://sourceforge/ccd2iso/${name}.tar.gz"; + url = "mirror://sourceforge/ccd2iso/ccd2iso-${version}.tar.gz"; sha256 = "1z000zi7hpr2h9cabj6hzf3n6a6gd6glmm8nn36v4b8i4vzbhx7q"; }; diff --git a/third_party/nixpkgs/pkgs/tools/cd-dvd/cdrdao/default.nix b/third_party/nixpkgs/pkgs/tools/cd-dvd/cdrdao/default.nix index 3fca8b2cd3..c9d49cfd43 100644 --- a/third_party/nixpkgs/pkgs/tools/cd-dvd/cdrdao/default.nix +++ b/third_party/nixpkgs/pkgs/tools/cd-dvd/cdrdao/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl, libvorbis, libmad, pkg-config, libao}: -stdenv.mkDerivation { - name = "cdrdao-1.2.3"; +stdenv.mkDerivation rec { + pname = "cdrdao"; + version = "1.2.3"; src = fetchurl { - url = "mirror://sourceforge/cdrdao/cdrdao-1.2.3.tar.bz2"; + url = "mirror://sourceforge/cdrdao/cdrdao-${version}.tar.bz2"; sha256 = "0pmpgx91j984snrsxbq1dgf3ximks2dfh1sqqmic72lrls7wp4w1"; }; diff --git a/third_party/nixpkgs/pkgs/tools/cd-dvd/cdrkit/default.nix b/third_party/nixpkgs/pkgs/tools/cd-dvd/cdrkit/default.nix index 28ed61ebd5..1bc84cf59d 100644 --- a/third_party/nixpkgs/pkgs/tools/cd-dvd/cdrkit/default.nix +++ b/third_party/nixpkgs/pkgs/tools/cd-dvd/cdrkit/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl, cmake, libcap, zlib, bzip2, perl}: stdenv.mkDerivation rec { - name = "cdrkit-1.1.11"; + pname = "cdrkit"; + version = "1.1.11"; src = fetchurl { - url = "http://cdrkit.org/releases/${name}.tar.gz"; + url = "http://cdrkit.org/releases/cdrkit-${version}.tar.gz"; sha256 = "1nj7iv3xrq600i37na9a5idd718piiiqbs4zxvpjs66cdrsk1h6i"; }; diff --git a/third_party/nixpkgs/pkgs/tools/cd-dvd/uif2iso/default.nix b/third_party/nixpkgs/pkgs/tools/cd-dvd/uif2iso/default.nix index ac0879e321..7a8a6569e5 100644 --- a/third_party/nixpkgs/pkgs/tools/cd-dvd/uif2iso/default.nix +++ b/third_party/nixpkgs/pkgs/tools/cd-dvd/uif2iso/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, unzip, zlib }: stdenv.mkDerivation rec { - nameNoVer = "uif2iso"; - name = "${nameNoVer}-0.1.7"; + pname = "uif2iso"; + version = "0.1.7"; src = fetchurl { - url = "http://aluigi.altervista.org/mytoolz/${nameNoVer}.zip"; + url = "http://aluigi.altervista.org/mytoolz/uif2iso.zip"; sha256 = "1v18fmlzhkkhv8xdc9dyvl8vamwg3ka4dsrg7vvmk1f2iczdx3dp"; }; diff --git a/third_party/nixpkgs/pkgs/tools/cd-dvd/unetbootin/default.nix b/third_party/nixpkgs/pkgs/tools/cd-dvd/unetbootin/default.nix index f80f606084..88fab512b0 100644 --- a/third_party/nixpkgs/pkgs/tools/cd-dvd/unetbootin/default.nix +++ b/third_party/nixpkgs/pkgs/tools/cd-dvd/unetbootin/default.nix @@ -2,10 +2,12 @@ , stdenv , coreutils , fetchFromGitHub -, libsForQt5 , mtools , p7zip -, qt5 +, wrapQtAppsHook +, qtbase +, qttools +, qmake , syslinux , util-linux , which @@ -27,14 +29,12 @@ stdenv.mkDerivation rec { ''; buildInputs = [ - qt5.qtbase - qt5.qttools - libsForQt5.qmake + qtbase + qttools + qmake ]; - nativeBuildInputs = [ qt5.wrapQtAppsHook ]; - - enableParallelBuilding = true; + nativeBuildInputs = [ wrapQtAppsHook ]; # Lots of nice hard-coded paths... postPatch = '' @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A tool to create bootable live USB drives from ISO images"; - homepage = "http://unetbootin.github.io/"; + homepage = "https://unetbootin.github.io/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ ebzzry ]; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/tools/cd-dvd/vobcopy/default.nix b/third_party/nixpkgs/pkgs/tools/cd-dvd/vobcopy/default.nix index a31354670a..2ebe9e5e0a 100644 --- a/third_party/nixpkgs/pkgs/tools/cd-dvd/vobcopy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/cd-dvd/vobcopy/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, libdvdread, libdvdcss }: stdenv.mkDerivation rec { - name = "vobcopy-1.2.0"; + pname = "vobcopy"; + version = "1.2.0"; src = fetchurl { - url = "http://www.vobcopy.org/download/${name}.tar.bz2"; + url = "http://www.vobcopy.org/download/vobcopy-${version}.tar.bz2"; sha256 = "01l1yihbd73srzghzzx5dgfg3yfb5kml5dix52mq0snhjp8h89c9"; }; diff --git a/third_party/nixpkgs/pkgs/tools/cd-dvd/vobsub2srt/default.nix b/third_party/nixpkgs/pkgs/tools/cd-dvd/vobsub2srt/default.nix index 5262fe0696..54df481cd6 100644 --- a/third_party/nixpkgs/pkgs/tools/cd-dvd/vobsub2srt/default.nix +++ b/third_party/nixpkgs/pkgs/tools/cd-dvd/vobsub2srt/default.nix @@ -1,10 +1,9 @@ { lib, stdenv, fetchgit, cmake, libtiff, pkg-config, tesseract }: -let rev = "a6abbd61127a6392d420bbbebdf7612608c943c2"; - shortRev = builtins.substring 0 7 rev; -in -stdenv.mkDerivation { - name = "vobsub2srt-git-20140817-${shortRev}"; +stdenv.mkDerivation rec { + pname = "vobsub2srt-git"; + version = "20140817-${builtins.substring 0 7 rev}"; + rev = "a6abbd61127a6392d420bbbebdf7612608c943c2"; src = fetchgit { inherit rev; diff --git a/third_party/nixpkgs/pkgs/tools/compression/lzham/default.nix b/third_party/nixpkgs/pkgs/tools/compression/lzham/default.nix index 7f4273163a..5915d1439d 100644 --- a/third_party/nixpkgs/pkgs/tools/compression/lzham/default.nix +++ b/third_party/nixpkgs/pkgs/tools/compression/lzham/default.nix @@ -1,12 +1,13 @@ { lib, stdenv, fetchFromGitHub, cmake } : -stdenv.mkDerivation { - name = "lzham-1.0"; +stdenv.mkDerivation rec { + pname = "lzham"; + version = "1.0"; src = fetchFromGitHub { owner = "richgel999"; repo = "lzham_codec"; - rev = "v1_0_release"; + rev = "v${lib.replaceStrings ["."] ["_"] version}_release"; sha256 = "14c1zvzmp1ylp4pgayfdfk1kqjb23xj4f7ll1ra7b18wjxc9ja1v"; }; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/9pfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/9pfs/default.nix index bf817a5087..03f082a403 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/9pfs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/9pfs/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchFromGitHub, fuse }: stdenv.mkDerivation { - name = "9pfs-20150918"; + pname = "9pfs"; + version = "unstable-2015-09-18"; src = fetchFromGitHub { owner = "mischief"; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/aefs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/aefs/default.nix index fb6fa01894..c523255ddb 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/aefs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/aefs/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, fetchpatch, fuse }: stdenv.mkDerivation rec { - name = "aefs-0.4pre259-8843b7c"; + pname = "aefs"; + version = "0.4pre259-8843b7c"; src = fetchurl { - url = "http://tarballs.nixos.org/${name}.tar.bz2"; + url = "http://tarballs.nixos.org/aefs-${version}.tar.bz2"; sha256 = "167hp58hmgdavg2mqn5dx1xgq24v08n8d6psf33jhbdabzx6a6zq"; }; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/archivemount/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/archivemount/default.nix index 32c942aea5..22e41611ae 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/archivemount/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/archivemount/default.nix @@ -1,13 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, fuse, libarchive }: -let - name = "archivemount-0.9.1"; -in -stdenv.mkDerivation { - inherit name; +stdenv.mkDerivation rec { + pname = "archivemount"; + version = "0.9.1"; src = fetchurl { - url = "https://www.cybernoia.de/software/archivemount/${name}.tar.gz"; + url = "https://www.cybernoia.de/software/archivemount/archivemount-${version}.tar.gz"; sha256 = "1cy5b6qril9c3ry6fv7ir87s8iyy5vxxmbyx90dm86fbra0vjaf5"; }; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/bonnie/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/bonnie/default.nix index e34e5289ad..f2d55b4716 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/bonnie/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/bonnie/default.nix @@ -1,9 +1,11 @@ { lib, stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - name = "bonnie++-1.98"; + pname = "bonnie++"; + version = "1.98"; + src = fetchurl { - url = "https://www.coker.com.au/bonnie++/${name}.tgz"; + url = "https://www.coker.com.au/bonnie++/bonnie++-${version}.tgz"; sha256 = "010bmlmi0nrlp3aq7p624sfaj5a65lswnyyxk3cnz1bqig0cn2vf"; }; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/catcli/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/catcli/default.nix index be9349daa2..2deeeb2fc0 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/catcli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/catcli/default.nix @@ -7,13 +7,13 @@ buildPythonApplication rec { pname = "catcli"; - version = "0.6.2"; + version = "0.7.0"; src = fetchFromGitHub { owner = "deadc0de6"; repo = pname; rev = "v${version}"; - sha256 = "0704022gbm987q6x6vcflq4b4p4hvcqm5ikiyndy5n8fj1q8lq95"; + sha256 = "1r30345wzpg8yk542fmgh3khdb91s4sr9hnqxh1s71ifjsrgmpph"; }; propagatedBuildInputs = [ docopt anytree ]; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/ciopfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/ciopfs/default.nix index cfe80cfce6..31311756ab 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/ciopfs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/ciopfs/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, fuse, glib, attr }: stdenv.mkDerivation rec { - name = "ciopfs-0.4"; + pname = "ciopfs"; + version = "0.4"; src = fetchurl { - url = "http://www.brain-dump.org/projects/ciopfs/${name}.tar.gz"; + url = "http://www.brain-dump.org/projects/ciopfs/ciopfs-${version}.tar.gz"; sha256 = "0sr9i9b3qfwbfvzvk00yrrg3x2xqk1njadbldkvn7hwwa4z5bm9l"; }; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/davfs2/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/davfs2/default.nix index 7652cc9787..2b573f9afd 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/davfs2/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/davfs2/default.nix @@ -9,10 +9,11 @@ }: stdenv.mkDerivation rec { - name = "davfs2-1.6.0"; + pname = "davfs2"; + version = "1.6.0"; src = fetchurl { - url = "mirror://savannah/davfs2/${name}.tar.gz"; + url = "mirror://savannah/davfs2/davfs2-${version}.tar.gz"; sha256 = "sha256-LmtnVoW9kXdyvmDwmZrgmMgPef8g3BMej+xFR8u2O1A="; }; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/fsfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/fsfs/default.nix index 114c83e84f..836b94dc79 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/fsfs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/fsfs/default.nix @@ -2,10 +2,12 @@ throw "It still does not build" -stdenv.mkDerivation { - name = "fsfs-0.1.1"; +stdenv.mkDerivation rec { + pname = "fsfs"; + version = "0.1.1"; + src = fetchurl { - url = "mirror://sourceforge/fsfs/fsfs-0.1.1.tar.gz"; + url = "mirror://sourceforge/fsfs/fsfs-${version}.tar.gz"; sha256 = "05wka9aq182li2r7gxcd8bb3rhpns7ads0k59v7w1jza60l57c74"; }; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/genext2fs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/genext2fs/default.nix index ccc048f757..dc0b902bf3 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/genext2fs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/genext2fs/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: -stdenv.mkDerivation { - name = "genext2fs-1.4.1"; +stdenv.mkDerivation rec { + pname = "genext2fs"; + version = "1.4.1"; src = fetchurl { - url = "mirror://sourceforge/genext2fs/genext2fs-1.4.1.tar.gz"; + url = "mirror://sourceforge/genext2fs/genext2fs-${version}.tar.gz"; sha256 = "1z7czvsf3ircvz2cw1cf53yifsq29ljxmj15hbgc79l6gbxbnka0"; }; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/gfs2-utils/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/gfs2-utils/default.nix new file mode 100644 index 0000000000..ba479b87aa --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/filesystems/gfs2-utils/default.nix @@ -0,0 +1,32 @@ +{ lib, stdenv, fetchurl +, autoreconfHook, bison, flex, pkg-config +, bzip2, check, ncurses, util-linux, zlib +}: + +stdenv.mkDerivation rec { + pname = "gfs2-utils"; + version = "3.4.1"; + + src = fetchurl { + url = "https://pagure.io/gfs2-utils/archive/${version}/gfs2-utils-${version}.tar.gz"; + sha256 = "sha256-gwKxBBG5PtG4/RxX4sUC25ZeG8K2urqVkFDKL7NS4ZI="; + }; + + outputs = [ "bin" "doc" "out" "man" ]; + + nativeBuildInputs = [ autoreconfHook bison flex pkg-config ]; + buildInputs = [ bzip2 ncurses util-linux zlib ]; + + checkInputs = [ check ]; + doCheck = true; + + enableParallelBuilding = true; + + meta = with lib; { + homepage = "https://pagure.io/gfs2-utils"; + description = "Tools for creating, checking and working with gfs2 filesystems"; + maintainers = with maintainers; [ qyliss ]; + license = [ licenses.gpl2Plus licenses.lgpl2Plus ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/httpfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/httpfs/default.nix index f107add29c..61843e4c65 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/httpfs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/httpfs/default.nix @@ -2,10 +2,11 @@ , docbook_xml_dtd_45, docbook_xsl , libxml2, libxslt }: stdenv.mkDerivation rec { - name = "httpfs2-0.1.5"; + pname = "httpfs2"; + version = "0.1.5"; src = fetchurl { - url = "mirror://sourceforge/httpfs/httpfs2/${name}.tar.gz"; + url = "mirror://sourceforge/httpfs/httpfs2/httpfs2-${version}.tar.gz"; sha256 = "1h8ggvhw30n2r6w11n1s458ypggdqx6ldwd61ma4yd7binrlpjq1"; }; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/jfsutils/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/jfsutils/default.nix index fadc639fbf..290bc31391 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/jfsutils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/jfsutils/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, fetchpatch, libuuid, autoreconfHook }: stdenv.mkDerivation rec { - name = "jfsutils-1.1.15"; + pname = "jfsutils"; + version = "1.1.15"; src = fetchurl { - url = "http://jfs.sourceforge.net/project/pub/${name}.tar.gz"; + url = "http://jfs.sourceforge.net/project/pub/jfsutils-${version}.tar.gz"; sha256 = "0kbsy2sk1jv4m82rxyl25gwrlkzvl3hzdga9gshkxkhm83v1aji4"; }; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/mtools/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/mtools/default.nix index d6fa4c4164..41259f2a45 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/mtools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/mtools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mtools"; - version = "4.0.34"; + version = "4.0.35"; src = fetchurl { url = "mirror://gnu/mtools/${pname}-${version}.tar.bz2"; - sha256 = "1aqc6qncpd8dlndwk05vgrnjh7pa151n6hpfsi059zhg3gml79dd"; + sha256 = "sha256-NHaeFzdR0vDYkaCMdsgEJ+kpuO5DQ4AZuGZsw9ekR0k="; }; patches = lib.optional stdenv.isDarwin ./UNUSED-darwin.patch; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/mtpfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/mtpfs/default.nix index e0b1cffe4d..a2dc01f8c0 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/mtpfs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/mtpfs/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchurl, pkg-config, fuse, libmtp, glib, libmad, libid3tag }: stdenv.mkDerivation rec { - name = "mtpfs-1.1"; + pname = "mtpfs"; + version = "1.1"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ fuse libmtp glib libid3tag libmad ]; @@ -14,7 +15,7 @@ stdenv.mkDerivation rec { ''; src = fetchurl { - url = "https://www.adebenham.com/files/mtp/${name}.tar.gz"; + url = "https://www.adebenham.com/files/mtp/mtpfs-${version}.tar.gz"; sha256 = "07acrqb17kpif2xcsqfqh5j4axvsa4rnh6xwnpqab5b9w5ykbbqv"; }; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/netatalk/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/netatalk/default.nix index 486963f44b..258b25c369 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/netatalk/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/netatalk/default.nix @@ -4,10 +4,11 @@ }: stdenv.mkDerivation rec { - name = "netatalk-3.1.12"; + pname = "netatalk"; + version = "3.1.12"; src = fetchurl { - url = "mirror://sourceforge/netatalk/netatalk/${name}.tar.bz2"; + url = "mirror://sourceforge/netatalk/netatalk/netatalk-${version}.tar.bz2"; sha256 = "1ld5mnz88ixic21m6f0xcgf8v6qm08j6xabh1dzfj6x47lxghq0m"; }; diff --git a/third_party/nixpkgs/pkgs/tools/games/joystickwake/default.nix b/third_party/nixpkgs/pkgs/tools/games/joystickwake/default.nix index 01800aff84..4f324c36d8 100644 --- a/third_party/nixpkgs/pkgs/tools/games/joystickwake/default.nix +++ b/third_party/nixpkgs/pkgs/tools/games/joystickwake/default.nix @@ -1,13 +1,13 @@ { lib, python3, fetchFromGitHub }: python3.pkgs.buildPythonApplication rec { pname = "joystickwake"; - version = "0.2.4"; + version = "0.2.5"; src = fetchFromGitHub { owner = "foresto"; repo = pname; rev = "v${version}"; - sha256 = "0j8xwfmzzmc9s88zvzc3lv67821r6x28vy6vli3srvx859wprppd"; + sha256 = "1yhzv4gbz0c0ircxk91m1d4ygf14mla137z4nfxggmbvjs0aa4y0"; }; propagatedBuildInputs = with python3.pkgs; [ pyudev xlib ]; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/dcraw/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/dcraw/default.nix index 488fdb2b26..35657cf8fc 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/dcraw/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/dcraw/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl, libjpeg, lcms2, gettext, libiconv }: stdenv.mkDerivation rec { - name = "dcraw-9.28.0"; + pname = "dcraw"; + version = "9.28.0"; src = fetchurl { - url = "https://www.dechifro.org/dcraw/archive/${name}.tar.gz"; + url = "https://www.dechifro.org/dcraw/archive/dcraw-${version}.tar.gz"; sha256 = "1fdl3xa1fbm71xzc3760rsjkvf0x5jdjrvdzyg2l9ka24vdc7418"; }; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/editres/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/editres/default.nix index 3a55524dc0..c9c1544c9a 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/editres/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/editres/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, libXt, libXaw, libXres, utilmacros }: stdenv.mkDerivation rec { - name = "editres-1.0.7"; + pname = "editres"; + version = "1.0.7"; src = fetchurl { - url = "mirror://xorg/individual/app/${name}.tar.gz"; + url = "mirror://xorg/individual/app/editres-${version}.tar.gz"; sha256 = "10mbgijb6ac6wqb2grpy9mrazzw68jxjkxr9cbdf1111pa64yj19"; }; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/escrotum/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/escrotum/default.nix index decb92615f..6a0a2b2683 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/escrotum/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/escrotum/default.nix @@ -2,7 +2,8 @@ }: with python2Packages; buildPythonApplication { - name = "escrotum-2019-06-10"; + pname = "escrotum"; + version = "unstable-2019-06-10"; src = fetchFromGitHub { owner = "Roger"; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/exiftags/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/exiftags/default.nix index afe8a5ecbc..6823f6bc20 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/exiftags/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/exiftags/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl}: -stdenv.mkDerivation { - name = "exiftags-1.01"; +stdenv.mkDerivation rec { + pname = "exiftags"; + version = "1.01"; src = fetchurl { - url = "https://johnst.org/sw/exiftags/exiftags-1.01.tar.gz"; + url = "https://johnst.org/sw/exiftags/exiftags-${version}.tar.gz"; sha256 = "194ifl6hybx2a5x8jhlh9i56k3qfc6p2l72z0ii1b7v0bzg48myr"; }; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/fgallery/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/fgallery/default.nix index 28deabb98d..484a11e322 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/fgallery/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/fgallery/default.nix @@ -9,10 +9,11 @@ # } stdenv.mkDerivation rec { - name = "fgallery-1.8.2"; + pname = "fgallery"; + version = "1.8.2"; src = fetchurl { - url = "https://www.thregr.org/~wavexx/software/fgallery/releases/${name}.zip"; + url = "https://www.thregr.org/~wavexx/software/fgallery/releases/fgallery-${version}.zip"; sha256 = "18wlvqbxcng8pawimbc8f2422s8fnk840hfr6946lzsxr0ijakvf"; }; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/icoutils/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/icoutils/default.nix index 9fe41d91db..62b4ab6b30 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/icoutils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/icoutils/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, libpng, perl, perlPackages, makeWrapper }: stdenv.mkDerivation rec { - name = "icoutils-0.32.3"; + pname = "icoutils"; + version = "0.32.3"; src = fetchurl { - url = "mirror://savannah/icoutils/${name}.tar.bz2"; + url = "mirror://savannah/icoutils/icoutils-${version}.tar.bz2"; sha256 = "1q66cksms4l62y0wizb8vfavhmf7kyfgcfkynil3n99s0hny1aqp"; }; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/jbig2enc/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/jbig2enc/default.nix index a4b396c3d2..c04862610b 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/jbig2enc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/jbig2enc/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, leptonica, zlib, libwebp, giflib, libjpeg, libpng, libtiff }: -stdenv.mkDerivation { - name = "jbig2enc-0.28"; +stdenv.mkDerivation rec { + pname = "jbig2enc"; + version = "0.28"; src = fetchurl { - url = "https://github.com/agl/jbig2enc/archive/0.28-dist.tar.gz"; + url = "https://github.com/agl/jbig2enc/archive/${version}-dist.tar.gz"; sha256 = "1wc0lmqz4jag3rhhk1xczlqpfv2qqp3fz7wzic2lba3vsbi1rrw3"; }; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/leela/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/leela/default.nix index cf10c92286..e50716f7a5 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/leela/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/leela/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchFromGitHub, pkg-config, poppler }: stdenv.mkDerivation { - name = "leela-12.fe7a35a"; + pname = "leela"; + version = "12.fe7a35a"; src = fetchFromGitHub { owner = "TrilbyWhite"; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/netpbm/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/netpbm/default.nix index 30b69c862c..dea9aa6d97 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/netpbm/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/netpbm/default.nix @@ -19,7 +19,8 @@ stdenv.mkDerivation { # Determine version and revision from: # https://sourceforge.net/p/netpbm/code/HEAD/log/?path=/advanced - name = "netpbm-10.92.0"; + pname = "netpbm"; + version = "10.92.0"; outputs = [ "bin" "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/optipng/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/optipng/default.nix index 72caf6f86a..65ebd8ddbd 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/optipng/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/optipng/default.nix @@ -7,10 +7,11 @@ with lib; stdenv.mkDerivation rec { - name = "optipng-0.7.7"; + pname = "optipng"; + version = "0.7.7"; src = fetchurl { - url = "mirror://sourceforge/optipng/${name}.tar.gz"; + url = "mirror://sourceforge/optipng/optipng-${version}.tar.gz"; sha256 = "0lj4clb851fzpaq446wgj0sfy922zs5l5misbpwv6w7qrqrz4cjg"; }; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/pikchr/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/pikchr/default.nix index 432c70231d..ca4f647dfa 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/pikchr/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/pikchr/default.nix @@ -5,11 +5,12 @@ stdenv.mkDerivation { pname = "pikchr"; - version = "unstable-2021-04-07"; + # To update, use the last check-in in https://pikchr.org/home/timeline?r=trunk + version = "unstable-2021-07-22"; src = fetchurl { - url = "https://pikchr.org/home/tarball/90b6d5b4a3834ff0/pikchr.tar.gz"; - sha256 = "1cqpnljy12gl82rcbb7mwhgv9szcliwkbwwh67hzdv020h1scxym"; + url = "https://pikchr.org/home/tarball/d9e1502ed74c6aab/pikchr.tar.gz"; + sha256 = "sha256-YSy95GiSodOS1YJgl9arBniqEJzYPrZ9CHNSCee9Yfg="; }; # can't open generated html files diff --git a/third_party/nixpkgs/pkgs/tools/graphics/plotutils/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/plotutils/default.nix index 001b4cd174..57cfe988b0 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/plotutils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/plotutils/default.nix @@ -6,10 +6,11 @@ # I'm only interested in making pstoedit convert to svg stdenv.mkDerivation rec { - name = "plotutils-2.6"; + pname = "plotutils"; + version = "2.6"; src = fetchurl { - url = "mirror://gnu/plotutils/${name}.tar.gz"; + url = "mirror://gnu/plotutils/plotutils-${version}.tar.gz"; sha256 = "1arkyizn5wbgvbh53aziv3s6lmd3wm9lqzkhxb3hijlp1y124hjg"; }; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/pngcheck/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/pngcheck/default.nix index 579dcad4cc..266b85c54c 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/pngcheck/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/pngcheck/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, zlib }: stdenv.mkDerivation rec { - name = "pngcheck-3.0.2"; + pname = "pngcheck"; + version = "3.0.2"; src = fetchurl { - url = "mirror://sourceforge/png-mng/${name}.tar.gz"; + url = "mirror://sourceforge/png-mng/pngcheck-${version}.tar.gz"; sha256 = "sha256-DX4mLyQRb93yhHqM61yS2fXybvtC6f/2PsK7dnYTHKc="; }; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/pngcrush/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/pngcrush/default.nix index 18a156ea50..16c710ceb7 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/pngcrush/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/pngcrush/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, libpng }: stdenv.mkDerivation rec { - name = "pngcrush-1.8.13"; + pname = "pngcrush"; + version = "1.8.13"; src = fetchurl { - url = "mirror://sourceforge/pmt/${name}-nolib.tar.xz"; + url = "mirror://sourceforge/pmt/pngcrush-${version}-nolib.tar.xz"; sha256 = "0l43c59d6v9l0g07z3q3ywhb8xb3vz74llv3mna0izk9bj6aqkiv"; }; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/pngnq/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/pngnq/default.nix index bec86e20ce..81f33c65af 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/pngnq/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/pngnq/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, libpng, zlib }: stdenv.mkDerivation rec { - name = "pngnq-1.1"; + pname = "pngnq"; + version = "1.1"; src = fetchurl { - url = "mirror://sourceforge/pngnq/${name}.tar.gz"; + url = "mirror://sourceforge/pngnq/pngnq-${version}.tar.gz"; sha256 = "1qmnnl846agg55i7h4vmrn11lgb8kg6gvs8byqz34bdkjh5gwiy1"; }; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/pngout/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/pngout/default.nix index d1d069c7ff..c2de8a4fb2 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/pngout/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/pngout/default.nix @@ -5,11 +5,12 @@ let else if stdenv.hostPlatform.system == "x86_64-linux" then "x86_64" else throw "Unsupported system: ${stdenv.hostPlatform.system}"; in -stdenv.mkDerivation { - name = "pngout-20150319"; +stdenv.mkDerivation rec { + pname = "pngout"; + version = "20150319"; src = fetchurl { - url = "http://static.jonof.id.au/dl/kenutils/pngout-20150319-linux.tar.gz"; + url = "http://static.jonof.id.au/dl/kenutils/pngout-${version}-linux.tar.gz"; sha256 = "0iwv941hgs2g7ljpx48fxs24a70m2whrwarkrb77jkfcd309x2h7"; }; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/pngtoico/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/pngtoico/default.nix index 7eabfb89d5..7abf94f0a3 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/pngtoico/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/pngtoico/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, libpng }: -stdenv.mkDerivation { - name = "pngtoico-1.0"; +stdenv.mkDerivation rec { + pname = "pngtoico"; + version = "1.0"; src = fetchurl { - url = "mirror://kernel/software/graphics/pngtoico/pngtoico-1.0.tar.gz"; + url = "mirror://kernel/software/graphics/pngtoico/pngtoico-${version}.tar.gz"; sha256 = "1xb4aa57sjvgqfp01br3dm72hf7q0gb2ad144s1ifrs09215fgph"; }; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/pstoedit/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/pstoedit/default.nix index 57e16a4925..dd5b51041b 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/pstoedit/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/pstoedit/default.nix @@ -4,10 +4,11 @@ }: stdenv.mkDerivation rec { - name = "pstoedit-3.75"; + pname = "pstoedit"; + version = "3.75"; src = fetchurl { - url = "mirror://sourceforge/pstoedit/${name}.tar.gz"; + url = "mirror://sourceforge/pstoedit/pstoedit-${version}.tar.gz"; sha256 = "1kv46g2wsvsvcngkavxl5gnw3l6g5xqnh4kmyx4b39a01d8xiddp"; }; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/puppeteer-cli/yarn.nix b/third_party/nixpkgs/pkgs/tools/graphics/puppeteer-cli/yarn.nix index 773acc84f3..469e2f23e0 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/puppeteer-cli/yarn.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/puppeteer-cli/yarn.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec { +{ fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec { offline_cache = linkFarm "offline" packages; packages = [ { diff --git a/third_party/nixpkgs/pkgs/tools/graphics/resvg/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/resvg/default.nix index a770d208b4..b4e4a7a1d8 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/resvg/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/resvg/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "resvg"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "RazrFalcon"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fd97w6yd9ZX2k8Vq+Vh6jouufGdFE02ZV8mb+BtA3tk="; + sha256 = "sha256-FjL/7SC1XtQyI+vlkDbQR2848vhV4Lvx3htSN3RSohw="; }; - cargoSha256 = "sha256-uP+YAJYZtMCUnLZWcwnoAw8E5cJeFxXx0qd2Li4byQM="; + cargoSha256 = "sha256-FfTkturHQqnTAzkEHDn/M/UiLMH1L/+Kv/zov8n8sek="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/transfig/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/transfig/default.nix index a6c9cd988c..617ecbf90e 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/transfig/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/transfig/default.nix @@ -1,9 +1,11 @@ { lib, stdenv, fetchurl, zlib, libjpeg, libpng, imake, gccmakedep }: -stdenv.mkDerivation { - name = "transfig-3.2.4"; +stdenv.mkDerivation rec { + pname = "transfig"; + version = "3.2.4"; + src = fetchurl { - url = "ftp://ftp.tex.ac.uk/pub/archive/graphics/transfig/transfig.3.2.4.tar.gz"; + url = "ftp://ftp.tex.ac.uk/pub/archive/graphics/transfig/transfig.${version}.tar.gz"; sha256 = "0429snhp5acbz61pvblwlrwv8nxr6gf12p37f9xxwrkqv4ir7dd4"; }; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/vips/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/vips/default.nix index 18025f92e3..7e291c7821 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/vips/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/vips/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { pname = "vips"; - version = "8.10.6"; + version = "8.11.2"; outputs = [ "bin" "out" "man" "dev" ]; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { owner = "libvips"; repo = "libvips"; rev = "v${version}"; - sha256 = "sha256-hdpkBC76PnPTN+rnNchLVk1CrhcClTtbaWyUcyUtuAk="; + sha256 = "sha256-Psb+LrpTWtZwO9ekOLJIXsy8W49jW4Jdi+EmiJ+1MsQ="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' diff --git a/third_party/nixpkgs/pkgs/tools/graphics/xcftools/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/xcftools/default.nix index c1b12ca5fe..e83e3c13ae 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/xcftools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/xcftools/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl, libpng, perl, gettext }: -stdenv.mkDerivation { - name = "xcftools-1.0.7"; +stdenv.mkDerivation rec { + pname = "xcftools"; + version = "1.0.7"; src = fetchurl { - url = "http://henning.makholm.net/xcftools/xcftools-1.0.7.tar.gz"; + url = "http://henning.makholm.net/xcftools/xcftools-${version}.tar.gz"; sha256 = "19i0x7yhlw6hd2gp013884zchg63yzjdj4hpany011il0n26vgqy"; }; diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/anthy/default.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/anthy/default.nix index 03c692de8e..23e2da0e41 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/anthy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/anthy/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "anthy-9100h"; + pname = "anthy"; + version = "9100h"; meta = with lib; { description = "Hiragana text to Kana Kanji mixed text Japanese input method"; @@ -12,7 +13,7 @@ stdenv.mkDerivation rec { }; src = fetchurl { - url = "mirror://osdn/anthy/37536/${name}.tar.gz"; + url = "mirror://osdn/anthy/37536/anthy-${version}.tar.gz"; sha256 = "0ism4zibcsa5nl77wwi12vdsfjys3waxcphn1p5s7d0qy1sz0mnj"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/footswitch/default.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/footswitch/default.nix new file mode 100644 index 0000000000..9cfdbd393b --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/footswitch/default.nix @@ -0,0 +1,35 @@ +{ lib, stdenv, fetchFromGitHub, pkg-config, hidapi }: + +stdenv.mkDerivation { + pname = "footswitch"; + version = "unstable-20201-03-17"; + + src = fetchFromGitHub { + owner = "rgerganov"; + repo = "footswitch"; + rev = "aa0b10f00d3e76dac27b55b88c8d44c0c406f7f0"; + sha256 = "sha256-SikYiBN7jbH5I1x5wPCF+buwFp1dt35cVxAN6lWkTN0="; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ hidapi ]; + + postPatch = '' + substituteInPlace Makefile \ + --replace /usr/local $out \ + --replace /usr/bin/install install \ + --replace /etc/udev/rules.d $out/lib/udev/rules.d + ''; + + preInstall = '' + mkdir -p $out/bin $out/lib/udev/rules.d + ''; + + meta = with lib; { + description = "Command line utlities for programming PCsensor and Scythe foot switches."; + homepage = "https://github.com/rgerganov/footswitch"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ baloo ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix index ac29545db3..9dcde821e1 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "ibus-table"; - version = "1.12.4"; + version = "1.14.0"; src = fetchFromGitHub { owner = "kaio"; repo = "ibus-table"; rev = version; - sha256 = "sha256-2qST5k2+8gfSf1/FaxXW4qwSQgNw/QKM+1mMWDdrjCU="; + sha256 = "sha256-HGSa8T1fY3PGow/rB9ixAPTibLCykImcs0kM/dUIwmQ="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/m17n-db/default.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/m17n-db/default.nix index 7feb14080e..9344951dff 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/m17n-db/default.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/m17n-db/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, gettext }: stdenv.mkDerivation rec { - name = "m17n-db-1.8.0"; + pname = "m17n-db"; + version = "1.8.0"; src = fetchurl { - url = "https://download.savannah.gnu.org/releases/m17n/${name}.tar.gz"; + url = "https://download.savannah.gnu.org/releases/m17n/m17n-db-${version}.tar.gz"; sha256 = "0vfw7z9i2s9np6nmx1d4dlsywm044rkaqarn7akffmb6bf1j6zv5"; }; diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/m17n-lib/default.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/m17n-lib/default.nix index 51e52ce4e9..c80f973631 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/m17n-lib/default.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/m17n-lib/default.nix @@ -1,9 +1,10 @@ {lib, stdenv, fetchurl, m17n_db}: stdenv.mkDerivation rec { - name = "m17n-lib-1.8.0"; + pname = "m17n-lib"; + version = "1.8.0"; src = fetchurl { - url = "https://download.savannah.gnu.org/releases/m17n/${name}.tar.gz"; + url = "https://download.savannah.gnu.org/releases/m17n/m17n-lib-${version}.tar.gz"; sha256 = "0jp61y09xqj10mclpip48qlfhniw8gwy8b28cbzxy8hq8pkwmfkq"; }; diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/nabi/default.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/nabi/default.nix index 5b6b0223a0..72f13d4eb2 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/nabi/default.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/nabi/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, gtk2, libhangul }: -stdenv.mkDerivation { - name = "nabi-1.0.0"; +stdenv.mkDerivation rec { + pname = "nabi"; + version = "1.0.0"; src = fetchurl { - url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/nabi/nabi-1.0.0.tar.gz"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/nabi/nabi-${version}.tar.gz"; sha256 = "0craa24pw7b70sh253arv9bg9sy4q3mhsjwfss3bnv5nf0xwnncw"; }; diff --git a/third_party/nixpkgs/pkgs/tools/misc/cicero-tui/default.nix b/third_party/nixpkgs/pkgs/tools/misc/cicero-tui/default.nix index 72721020e1..249e814fd3 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/cicero-tui/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/cicero-tui/default.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage rec { pname = "cicero-tui"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "eyeplum"; repo = "cicero-tui"; rev = "v${version}"; - sha256 = "sha256-FwjD+BdRc8y/g5MQLmBB/qkUj33cywbH2wjTp0y0s8A="; + sha256 = "sha256-j/AIuNE5WBNdUeXuKvvc4NqsVVk252tm4KR3w0e6bT8="; }; nativeBuildInputs = [ @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { freetype ]; - cargoSha256 = "sha256-JygEE7K8swbFvJ2aDXs+INhfoLuhy+LY7T8AUr4lgJY="; + cargoSha256 = "sha256-yup6hluGF2x+0XDwK+JETyNu4TFNPmqD4Y0Wthxrbcc="; meta = with lib; { description = "Unicode tool with a terminal user interface"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/coreutils/default.nix b/third_party/nixpkgs/pkgs/tools/misc/coreutils/default.nix index 0b2b03ba8d..f22a7268fb 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/coreutils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/coreutils/default.nix @@ -112,7 +112,8 @@ stdenv.mkDerivation (rec { # and {Open,Free}BSD. # With non-standard storeDir: https://github.com/NixOS/nix/issues/512 doCheck = stdenv.hostPlatform == stdenv.buildPlatform - && (stdenv.hostPlatform.libc == "glibc" || stdenv.hostPlatform.isMusl); + && (stdenv.hostPlatform.libc == "glibc" || stdenv.hostPlatform.isMusl) + && !stdenv.isAarch32; # Prevents attempts of running 'help2man' on cross-built binaries. PERL = if stdenv.hostPlatform == stdenv.buildPlatform then null else "missing"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/disfetch/default.nix b/third_party/nixpkgs/pkgs/tools/misc/disfetch/default.nix index 1e6c466d8f..238bd9c4b0 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/disfetch/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/disfetch/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "disfetch"; - version = "2.9"; + version = "2.12"; src = fetchFromGitHub { owner = "q60"; repo = "disfetch"; rev = version; - sha256 = "sha256-dmDDO1DcDMGWtQtIQncOjSc114tL5QH1Jaq1n4vAe5M="; + sha256 = "sha256-+6U5BdLmdTaFzgZmjSH7rIL9JTwIX7bFkQqm0rNuTRY="; }; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/tools/misc/entr/default.nix b/third_party/nixpkgs/pkgs/tools/misc/entr/default.nix index abfd12523d..8309bc1294 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/entr/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/entr/default.nix @@ -2,23 +2,13 @@ stdenv.mkDerivation rec { pname = "entr"; - version = "4.9"; + version = "5.0"; src = fetchurl { url = "https://eradman.com/entrproject/code/${pname}-${version}.tar.gz"; - sha256 = "sha256-4lak0vvkb2EyRggzukR+ZdfzW6nQsmXnxBUDl8xEBaI="; + sha256 = "1fqyshn9i213h6hiy31xlm719f6vayskfna92kvbd2aykryvp1ra"; }; - patches = lib.optionals stdenv.isDarwin [ - # Fix v4.9 segfault on Darwin. remove with the next update - # https://github.com/eradman/entr/issues/74 - (fetchpatch { - url = "https://github.com/eradman/entr/commit/468d77d45925abba826bb1dcda01487dbe37eb33.patch"; - sha256 = "17kkcrsnac0pb930sf2kix71h4c7krzsrvz8pskx0vm39n1c9xfi"; - includes = [ "entr.c" ]; - }) - ]; - postPatch = '' substituteInPlace Makefile.bsd --replace /bin/echo echo substituteInPlace entr.c --replace /bin/cat ${coreutils}/bin/cat diff --git a/third_party/nixpkgs/pkgs/tools/misc/exa/default.nix b/third_party/nixpkgs/pkgs/tools/misc/exa/default.nix index 632eb45905..9cabff9a9b 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/exa/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/exa/default.nix @@ -18,16 +18,21 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-ah8IjShmivS6IWL3ku/4/j+WNr/LdUnh1YJnPdaFdcM="; - nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ]; + nativeBuildInputs = [ + cmake pkg-config installShellFiles + # ghc is not supported on aarch64-darwin yet. + ] ++ lib.optional (stdenv.hostPlatform.system != "aarch64-darwin") pandoc; + buildInputs = [ zlib ] ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; - outputs = [ "out" "man" ]; + outputs = [ "out" ] ++ lib.optional (stdenv.hostPlatform.system != "aarch64-darwin") "man"; - postInstall = '' + postInstall = lib.optionalString (stdenv.hostPlatform.system != "aarch64-darwin") '' pandoc --standalone -f markdown -t man man/exa.1.md > man/exa.1 pandoc --standalone -f markdown -t man man/exa_colors.5.md > man/exa_colors.5 installManPage man/exa.1 man/exa_colors.5 + '' + '' installShellCompletion \ --name exa completions/completions.bash \ --name exa.fish completions/completions.fish \ diff --git a/third_party/nixpkgs/pkgs/tools/misc/fontforge/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fontforge/default.nix index 5f64057c46..0f66fa55ac 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/fontforge/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/fontforge/default.nix @@ -7,7 +7,7 @@ , withGUI ? withGTK , withPython ? true , withExtras ? true -, Carbon ? null, Cocoa ? null +, Carbon, Cocoa }: assert withGTK -> withGUI; @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { readline uthash woff2 zeromq libuninameslist python freetype zlib glib giflib libpng libjpeg libtiff libxml2 ] - ++ lib.optionals withSpiro [libspiro] + ++ lib.optionals withSpiro [ libspiro ] ++ lib.optionals withGUI [ gtk3 cairo pango ] ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa ]; @@ -71,11 +71,11 @@ stdenv.mkDerivation rec { rm -r "$out/share/fontforge/python" ''; - meta = { + meta = with lib; { description = "A font editor"; - homepage = "http://fontforge.github.io"; - platforms = lib.platforms.all; - license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.erictapen ]; + homepage = "https://fontforge.github.io"; + platforms = platforms.all; + license = licenses.bsd3; + maintainers = [ maintainers.erictapen ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/fwup/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fwup/default.nix index 69b76cf648..e2b6df253a 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/fwup/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/fwup/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "fwup"; - version = "1.8.4"; + version = "1.9.0"; src = fetchFromGitHub { owner = "fhunleth"; repo = "fwup"; rev = "v${version}"; - sha256 = "sha256-NaSA3mFWf3C03SAGssMqLT0vr5KMfxD5y/iragGNKjw="; + sha256 = "sha256-ARwBm9p6o/iC09F6pc5c4qq3WClNTyAvLPsG58YQOAM="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/misc/interactsh/default.nix b/third_party/nixpkgs/pkgs/tools/misc/interactsh/default.nix index 8bc70967b1..b623faea39 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/interactsh/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/interactsh/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "interactsh"; - version = "0.0.3"; + version = "0.0.4"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - sha256 = "0a3jfdnhh5idf2j14gppjxmdhqnyymg42z7nlnbr2zaigkvgz487"; + sha256 = "sha256-9tmEeYuMRZVkcUupBzJv3rCuy7Il46yh5i0UEUNCNtc="; }; - vendorSha256 = "sha256-hLnxtARre+7HqEtU7bB9SvEieOaAoBM6VFUnKvLCD60="; + vendorSha256 = "sha256-YTzo8YjnJUNXZrYKYTCHOgZAUrMlYzbEEP3yXYfNZqo="; modRoot = "."; subPackages = [ diff --git a/third_party/nixpkgs/pkgs/tools/misc/lifecycled/default.nix b/third_party/nixpkgs/pkgs/tools/misc/lifecycled/default.nix index 1c30b760a9..6a9fe05ca7 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/lifecycled/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/lifecycled/default.nix @@ -4,16 +4,16 @@ }: buildGoModule rec { pname = "lifecycled"; - version = "3.1.0"; + version = "3.2.0"; src = fetchFromGitHub { owner = "buildkite"; repo = "lifecycled"; rev = "v${version}"; - sha256 = "F9eovZpwbigP0AMdjAIxULPLDC3zO6GxQmPdt5Xvpkk="; + sha256 = "sha256-+Ts2ERoEZcBdxMXQlxPVtQe3pst5NXWKU3rmS5CgR7A="; }; - vendorSha256 = "q5wYKSLHRzL+UGn29kr8+mUupOPR1zohTscbzjMRCS0="; + vendorSha256 = "sha256-q5wYKSLHRzL+UGn29kr8+mUupOPR1zohTscbzjMRCS0="; postInstall = '' mkdir -p $out/lib/systemd/system diff --git a/third_party/nixpkgs/pkgs/tools/misc/lokalise2-cli/default.nix b/third_party/nixpkgs/pkgs/tools/misc/lokalise2-cli/default.nix index 6c1f175908..087a5ce7f9 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/lokalise2-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/lokalise2-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "lokalise2-cli"; - version = "2.6.4"; + version = "2.6.7"; src = fetchFromGitHub { owner = "lokalise"; repo = "lokalise-cli-2-go"; rev = "v${version}"; - sha256 = "sha256-D/I1I7r3IuDz1MZZrzKVMhdLIZxbN2bYeGmqJVlUU6g="; + sha256 = "sha256-p3JvaDDebbIgOvTh0e7yYe3qOXvj1pLSG95hpK62M7s="; }; - vendorSha256 = "sha256-iWYlbGeLp/SiF8/OyWGIHJQB1RJjma9/EDc3zOsjNG8="; + vendorSha256 = "sha256-KJ8haktP9qoG5QsKnTOkvE8L+SQ9Z6hrsjUeS0wrdLs="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/misc/lua-format/default.nix b/third_party/nixpkgs/pkgs/tools/misc/lua-format/default.nix new file mode 100644 index 0000000000..9aad25ce72 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/lua-format/default.nix @@ -0,0 +1,32 @@ +{ lib, stdenv, fetchFromGitHub, substituteAll, antlr4, libargs, catch2, cmake, libyamlcpp }: + +stdenv.mkDerivation rec { + pname = "lua-format"; + version = "1.3.6"; + + src = fetchFromGitHub { + owner = "Koihik"; + repo = "LuaFormatter"; + rev = version; + sha256 = "14l1f9hrp6m7z3cm5yl0njba6gfixzdirxjl8nihp9val0685vm0"; + }; + + patches = [ + (substituteAll { + src = ./fix-lib-paths.patch; + antlr4RuntimeCpp = antlr4.runtime.cpp.dev; + inherit libargs catch2 libyamlcpp; + }) + ]; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ antlr4.runtime.cpp libyamlcpp ]; + + meta = with lib; { + description = "Code formatter for Lua"; + homepage = "https://github.com/Koihik/LuaFormatter"; + license = licenses.asl20; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/lua-format/fix-lib-paths.patch b/third_party/nixpkgs/pkgs/tools/misc/lua-format/fix-lib-paths.patch new file mode 100644 index 0000000000..fce2347d8e --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/lua-format/fix-lib-paths.patch @@ -0,0 +1,67 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4a21b94..0ac7911 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -67,10 +67,10 @@ endif() + + include_directories( + ${PROJECT_SOURCE_DIR}/generated/ +- ${PROJECT_SOURCE_DIR}/third_party/ +- ${PROJECT_SOURCE_DIR}/third_party/Catch2/single_include +- ${PROJECT_SOURCE_DIR}/third_party/yaml-cpp/include +- ${PROJECT_SOURCE_DIR}/third_party/antlr4/runtime/Cpp/runtime/src ++ @libargs@/include ++ @catch2@/include ++ @libyamlcpp@/include ++ @antlr4RuntimeCpp@/include/antlr4-runtime + ${PROJECT_SOURCE_DIR}/src/ + ) + +@@ -92,9 +92,6 @@ file(GLOB_RECURSE yaml-cpp-src + ${PROJECT_SOURCE_DIR}/third_party/yaml-cpp/src/*.cpp + ) + +-add_library (antlr4-cpp-runtime ${antlr4-cpp-src}) +-add_library (yaml-cpp ${yaml-cpp-src}) +- + add_executable(lua-format ${src_dir} src/main.cpp) + + if(WIN32) +@@ -104,7 +101,7 @@ endif() + + set_target_properties(lua-format PROPERTIES LINKER_LANGUAGE CXX) + +-target_link_libraries(lua-format yaml-cpp antlr4-cpp-runtime ${extra-libs}) ++target_link_libraries(lua-format yaml-cpp antlr4-runtime ${extra-libs}) + + install(TARGETS lua-format + RUNTIME DESTINATION bin +@@ -135,7 +132,7 @@ if(BUILD_TESTS) + endif() + + target_compile_definitions(lua-format-test PUBLIC PROJECT_PATH="${PROJECT_SOURCE_DIR}") +- target_link_libraries(lua-format-test yaml-cpp antlr4-cpp-runtime ${extra-libs}) ++ target_link_libraries(lua-format-test yaml-cpp antlr4-runtime ${extra-libs}) + + add_test(NAME args COMMAND lua-format-test [args]) + add_test(NAME config COMMAND lua-format-test [config]) +diff --git a/src/main.cpp b/src/main.cpp +index 38962a2..332aad6 100644 +--- a/src/main.cpp ++++ b/src/main.cpp +@@ -1,4 +1,4 @@ +-#include ++#include + #include + #include + #include +diff --git a/test/test_args.cpp b/test/test_args.cpp +index 69a5746..b988d00 100644 +--- a/test/test_args.cpp ++++ b/test/test_args.cpp +@@ -1,4 +1,4 @@ +-#include ++#include + #include + #include + #include diff --git a/third_party/nixpkgs/pkgs/tools/misc/mdbtools/default.nix b/third_party/nixpkgs/pkgs/tools/misc/mdbtools/default.nix index b25a850311..7eb5786357 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/mdbtools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/mdbtools/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "mdbtools"; - version = "0.9.3"; + version = "0.9.4"; src = fetchFromGitHub { owner = "mdbtools"; repo = "mdbtools"; rev = "v${version}"; - sha256 = "11cv7hh8j8akpgm1a6pp7im6iacpgx6wzcg9n9rmb41j0fgxamdf"; + sha256 = "sha256-Hnub8h0a3qx5cxVn1tp/IVbz9aORjGGWizD3Z4rPl2s="; }; configureFlags = [ "--disable-scrollkeeper" ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/mdr/default.nix b/third_party/nixpkgs/pkgs/tools/misc/mdr/default.nix new file mode 100644 index 0000000000..095e7f35fe --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/mdr/default.nix @@ -0,0 +1,30 @@ +{ lib, fetchFromGitHub, buildGoModule }: + +buildGoModule rec { + pname = "mdr"; + version = "0.2.5"; + + src = fetchFromGitHub { + owner = "MichaelMure"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-ibM3303pXnseAFP9qFTOzj0G/SxRPX+UeRfbJ+MCABk="; + }; + + vendorSha256 = "sha256-5jzU4EybEGKoEXCFhnu7z4tFRS9fgf2wJXhkvigRM0E="; + + ldflags = [ + "-s" + "-w" + "-X main.GitCommit=${src.rev}" + "-X main.GitLastTag=${version}" + "-X main.GitExactTag=${version}" + ]; + + meta = with lib; { + description = "MarkDown Renderer for the terminal"; + homepage = "https://github.com/MichaelMure/mdr"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/microplane/default.nix b/third_party/nixpkgs/pkgs/tools/misc/microplane/default.nix index 89b0bc4d8b..26ae9f4f16 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/microplane/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/microplane/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "microplane"; - version = "0.0.32"; + version = "0.0.34"; src = fetchFromGitHub { owner = "Clever"; repo = "microplane"; rev = "v${version}"; - sha256 = "sha256-QYii/UmYus5hloTUsbVKsw50bSfI4bArUgGzFSK8Cas="; + sha256 = "sha256-ZrBkVXRGZp8yGFIBo7sLGvJ8pMQq7Cq0xJiko57z164="; }; - vendorSha256 = "sha256-1XtpoGqQ//2ccJdl8E7jnSBQhYoA4/YVBbHeI+OfaR0="; + vendorSha256 = "sha256-PqSjSFTVrIsQ065blIxZ9H/ARku6BEcnjboH+0K0G14="; buildFlagsArray = '' -ldflags=-s -w -X main.version=${version} diff --git a/third_party/nixpkgs/pkgs/tools/misc/neo-cowsay/default.nix b/third_party/nixpkgs/pkgs/tools/misc/neo-cowsay/default.nix index 4ed1bd5169..e6e95968a0 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/neo-cowsay/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/neo-cowsay/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "neo-cowsay"; - version = "1.0.1"; + version = "1.0.3"; src = fetchFromGitHub { owner = "Code-Hex"; repo = "Neo-cowsay"; rev = "v${version}"; - sha256 = "0c6lygdqi26mczij41sn8ckc3g6qaakkkh3iasf10a4d07amxci1"; + sha256 = "sha256-n01C6Z9nV2DDbSqgbOIZTqZAWXo6h4/NJdyFiOCh79A="; }; - vendorSha256 = "1clar59x2dvn7yj4fbylby9nrzy8kdixi48hkbmrv8g5l8n0wdl2"; + vendorSha256 = "sha256-4qMsyNFD2MclsseE+IAaNm5r0wHWdcwLLPsZ0JJ3qpw="; doCheck = false; 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 1d6cce6334..3250047e0e 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/opentelemetry-collector/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/opentelemetry-collector/default.nix @@ -1,21 +1,20 @@ { buildGoModule , fetchFromGitHub -, stdenv , lib }: buildGoModule rec { pname = "opentelemetry-collector"; - version = "0.26.0"; + version = "0.31.0"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-collector-contrib"; rev = "v${version}"; - sha256 = "03713b4bkhcz61maz0r5mkd36kv3rq8rji3qcpi9zf5bkkjs1yzb"; + sha256 = "sha256-iJL3EFoBtp4UOLm4/b4JBwzK6iZSTE0cb6EzmlziOLk="; }; - vendorSha256 = "sha256-sNI2OoDsSNtcQP8rNO4OCboFqSC7v6g4xEPNRKjv3sQ="; + vendorSha256 = "sha256-LNlglYys4F7+W7PUmBT9cBnYs7y6AlB9wdaDibaxqC0="; proxyVendor = true; subPackages = [ "cmd/otelcontribcol" ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/osm2pgsql/default.nix b/third_party/nixpkgs/pkgs/tools/misc/osm2pgsql/default.nix index 062b49e8bb..a0803a3683 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/osm2pgsql/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/osm2pgsql/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "osm2pgsql"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "openstreetmap"; repo = pname; rev = version; - sha256 = "sha256-PHr9wP+DgsiQAvrVNO8Aa/X/dkrAUnlPDwAzSISa0GM="; + sha256 = "sha256-0mUGvu5o2MhlriNAUAUoyDrFgTw2weGGbQcBzaauKEQ="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/ostree/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ostree/default.nix index b5c0940910..1508e6f93c 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/ostree/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/ostree/default.nix @@ -41,13 +41,13 @@ let ])); in stdenv.mkDerivation rec { pname = "ostree"; - version = "2021.1"; + version = "2021.3"; outputs = [ "out" "dev" "man" "installedTests" ]; src = fetchurl { url = "https://github.com/ostreedev/ostree/releases/download/v${version}/libostree-${version}.tar.xz"; - sha256 = "sha256-kbS9kmSDHSD/AOxELUjt5SbbVTeb2RdgaGPAX0O4WlE="; + sha256 = "sha256-D6Wjnww+WMIEATPkIpyyhmDGG5eM1KKj0vbpfvTI0LM="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/tools/misc/pcb2gcode/default.nix b/third_party/nixpkgs/pkgs/tools/misc/pcb2gcode/default.nix index d7f6a3d873..48fc7bc32b 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/pcb2gcode/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/pcb2gcode/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "pcb2gcode"; - version = "2.3.1"; + version = "2.4.0"; src = fetchFromGitHub { owner = "pcb2gcode"; repo = "pcb2gcode"; rev = "v${version}"; - sha256 = "sha256-blbfpMBe7X3OrNbBiz8fNzKcS/bbViQUTXtdxZpXPBk="; + sha256 = "sha256-3VQlYtSi6yWWNuxTlBzvBtkM5hAss47xat+sEW+P79E="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/rlwrap/default.nix b/third_party/nixpkgs/pkgs/tools/misc/rlwrap/default.nix index a78d6f143a..7766237753 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/rlwrap/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/rlwrap/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rlwrap"; - version = "0.45"; + version = "0.45.2"; src = fetchFromGitHub { owner = "hanslub42"; repo = "rlwrap"; rev = "v${version}"; - sha256 = "1ppkjdnxrxh99g4xaiaglm5bmp24006rfahci0cn1g7zwilkjy8s"; + sha256 = "sha256-ubhAOyswdDG0mFKpnSDDq5f7umyCHsW/m721IHdjNMc="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/misc/smenu/default.nix b/third_party/nixpkgs/pkgs/tools/misc/smenu/default.nix index 1d1ed78b2f..5ba4164346 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/smenu/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/smenu/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, ncurses }: stdenv.mkDerivation rec { - version = "0.9.17"; + version = "0.9.18"; pname = "smenu"; src = fetchFromGitHub { owner = "p-gen"; repo = "smenu"; rev = "v${version}"; - sha256 = "1p8y1fgrfb7jxmv5ycvvnqaz7ghdi50paisgzk71169fqwp1crfa"; + sha256 = "sha256-8ALY3dsUEJxGsDnYTOxNAmJbwmmZIV8GuHjNg0vPFUQ="; }; buildInputs = [ ncurses ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/tmux-mem-cpu-load/default.nix b/third_party/nixpkgs/pkgs/tools/misc/tmux-mem-cpu-load/default.nix index 2f9f436a14..45a5edd6ae 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/tmux-mem-cpu-load/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/tmux-mem-cpu-load/default.nix @@ -2,20 +2,20 @@ stdenv.mkDerivation rec { pname = "tmux-mem-cpu-load"; - version = "3.4.0"; + version = "3.5.1"; src = fetchFromGitHub { owner = "thewtex"; repo = "tmux-mem-cpu-load"; rev = "v${version}"; - sha256 = "1ybj513l4953jhayrzb47dlh4yv9bkvs0q1lfvky17v9fdkxgn2j"; + sha256 = "sha256-4ZMF+RacZL9dJRCz63XPNuigTKHOW+ZcA4vB4jsnASc="; }; nativeBuildInputs = [ cmake ]; meta = with lib; { description = "CPU, RAM, and load monitor for use with tmux"; - homepage = https://github.com/thewtex/tmux-mem-cpu-load; + homepage = "https://github.com/thewtex/tmux-mem-cpu-load"; license = licenses.asl20; maintainers = with maintainers; [ thomasjm ]; platforms = platforms.all; diff --git a/third_party/nixpkgs/pkgs/tools/misc/toybox/default.nix b/third_party/nixpkgs/pkgs/tools/misc/toybox/default.nix index 25db7e6686..9e3b1ecc6b 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/toybox/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/toybox/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "toybox"; - version = "0.8.4"; + version = "0.8.5"; src = fetchFromGitHub { owner = "landley"; repo = pname; rev = version; - sha256 = "0cgbmv6qk1haj709hjx5q4sl7wgh91i459gzs1203adwc7rvk6jv"; + sha256 = "sha256-32LQiPsBjBh5LpRZuaYT+Dr/oETNTQERGqrpwWPhMTo="; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; # needed for cross diff --git a/third_party/nixpkgs/pkgs/tools/misc/vector/default.nix b/third_party/nixpkgs/pkgs/tools/misc/vector/default.nix index 392b03f21a..49e07b7507 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/vector/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/vector/default.nix @@ -28,16 +28,16 @@ rustPlatform.buildRustPackage rec { pname = "vector"; - version = "0.15.1"; + version = "0.15.2"; src = fetchFromGitHub { owner = "timberio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9Q0jRh8nlgiWslmlFAth8eff+hir5gIT8YL898FMSqk="; + sha256 = "sha256-u/KHiny9o/q74dh/w3cShAb6oEkMxNaTMF2lOFx+1po="; }; - cargoSha256 = "sha256-DFFA6t+ZgpGieq5kT80PW5ZSByIp54ia2UvcBYY2+Lg="; + cargoSha256 = "sha256-wUNF+810Yh4hPQzraWo2mDi8KSmRKp9Z9D+4kwKQ+IU="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ oniguruma openssl protobuf rdkafka zstd ] ++ lib.optionals stdenv.isDarwin [ Security libiconv coreutils CoreServices ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/wimboot/default.nix b/third_party/nixpkgs/pkgs/tools/misc/wimboot/default.nix index 04dbca9ed6..538f5113fd 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/wimboot/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/wimboot/default.nix @@ -1,38 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, libbfd, zlib, libiberty }: +{ lib, stdenv, fetchFromGitHub, libbfd, zlib, libiberty }: stdenv.mkDerivation rec { pname = "wimboot"; - version = "2.6.0"; + version = "2.7.3"; src = fetchFromGitHub { owner = "ipxe"; repo = "wimboot"; rev = "v${version}"; - sha256 = "134wqqr147az5vbj4szd0xffwa99b4rar7w33zm3119zsn7sd79k"; + sha256 = "12c677agkmiqs35qfpqfj7c4kxkizhbk9l6hig36dslzp4fwpl70"; }; - NIX_CFLAGS_COMPILE = "-Wno-address-of-packed-member"; # Fails on gcc9 - - patches = [ - # Fixes for newer binutils - # Add R_X86_64_PLT32 as known reloc target - (fetchpatch { - url = "https://github.com/ipxe/wimboot/commit/91be50c17d4d9f463109d5baafd70f9fdadd86db.patch"; - sha256 = "113448n49hmk8nz1dxbhxiciwl281zwalvb8z5p9xfnjvibj8274"; - }) - # Fix building with binutils 2.34 (bfd_get_section_* removed in favour of bfd_section_*) - (fetchpatch { - url = "https://github.com/ipxe/wimboot/commit/2f97e681703d30b33a4d5032a8025ab8b9f2de75.patch"; - sha256 = "0476mp74jaq3k099b654al6yi2yhgn37d9biz0wv3ln2q1gy94yf"; - }) - ]; - - # We cannot use sourceRoot because the patch wouldn't apply - postPatch = '' - cd src - ''; - - hardeningDisable = [ "pic" ]; + sourceRoot = "source/src"; buildInputs = [ libbfd zlib libiberty ]; makeFlags = [ "wimboot.x86_64.efi" ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/woeusb/default.nix b/third_party/nixpkgs/pkgs/tools/misc/woeusb/default.nix index ade752e09f..23d1f9cccb 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/woeusb/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/woeusb/default.nix @@ -2,14 +2,14 @@ , coreutils, dosfstools, findutils, gawk, gnugrep, grub2_light, ncurses, ntfs3g, parted, p7zip, util-linux, wimlib, wget }: stdenv.mkDerivation rec { - version = "5.1.0"; + version = "5.1.2"; pname = "woeusb"; src = fetchFromGitHub { owner = "WoeUSB"; repo = "WoeUSB"; rev = "v${version}"; - sha256 = "1qakk7lnj71m061rn72nabk4c37vw0vkx2a28xgxas8v8cwvkkam"; + sha256 = "sha256-7NuUCo1uN6RZIpdDJFZr1DULrr4UNcXdPzx9A5t79O8="; }; nativeBuildInputs = [ installShellFiles makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/you-get/default.nix b/third_party/nixpkgs/pkgs/tools/misc/you-get/default.nix index f58fb349c9..8bd618d5a9 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/you-get/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/you-get/default.nix @@ -2,7 +2,7 @@ buildPythonApplication rec { pname = "you-get"; - version = "0.4.1500"; + version = "0.4.1536"; # Tests aren't packaged, but they all hit the real network so # probably aren't suitable for a build environment anyway. @@ -10,7 +10,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "5a6cc0d661fe0cd4210bf467d6c89afd8611609e402690254722c1415736da92"; + sha256 = "78c9a113950344e06d18940bd11fe9a2f78b9d0bc8963cde300017ac1ffcef09"; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/misc/yubikey-manager-qt/default.nix b/third_party/nixpkgs/pkgs/tools/misc/yubikey-manager-qt/default.nix index cb575adf75..5ef75778f2 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/yubikey-manager-qt/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/yubikey-manager-qt/default.nix @@ -14,11 +14,11 @@ mkDerivation rec { pname = "yubikey-manager-qt"; - version = "1.2.2"; + version = "1.2.3"; src = fetchurl { url = "https://developers.yubico.com/${pname}/Releases/${pname}-${version}.tar.gz"; - sha256 = "1jqibv7na9h2r8nxgzp40j9qpyiwx97c65krivkcqjwdjk5lrahl"; + sha256 = "sha256-54HvuJXjm846sBxwNHLmaBXvO24bbBDyK8YvY4I6LjY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/networking/burpsuite/default.nix b/third_party/nixpkgs/pkgs/tools/networking/burpsuite/default.nix index abe5325af0..e4783ddb0e 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/burpsuite/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/burpsuite/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "burpsuite"; - version = "2021.8"; + version = "2021.8.1"; src = fetchurl { name = "burpsuite.jar"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { "https://portswigger.net/Burp/Releases/Download?productId=100&version=${version}&type=Jar" "https://web.archive.org/web/https://portswigger.net/Burp/Releases/Download?productId=100&version=${version}&type=Jar" ]; - sha256 = "sha256-IiuwPag4045X9MaXhCNyGhJQi1302ciLfGfNlC0zO0w="; + sha256 = "sha256-R1WV3oaweW4nfszUOtmrfBlbKJm8HDNjwtbj97dFzB0="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/tools/networking/cbftp/default.nix b/third_party/nixpkgs/pkgs/tools/networking/cbftp/default.nix new file mode 100644 index 0000000000..e78b8a93dc --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/networking/cbftp/default.nix @@ -0,0 +1,46 @@ +{ lib +, stdenv +, fetchurl +, ncurses +, openssl +}: + +stdenv.mkDerivation rec { + pname = "cbftp"; + version = "1173"; + + src = fetchurl { + url = "https://cbftp.eu/${pname}-r${version}.tar.gz"; + hash = "sha256-DE6fnLzWsx6Skz2LRJAaijjIqrYFB8/HPp45P5CcEc8="; + }; + + buildInputs = [ + ncurses + openssl + ]; + + dontConfigure = true; + + installPhase = '' + runHook preInstall + + install -D bin/* -t $out/bin/ + install -D API README -t $out/share/doc/${pname}/ + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://cbftp.eu/"; + description = " An advanced multi-purpose FTP/FXP client"; + longDescription = '' + Cbftp is an advanced multi-purpose FTP/FXP client that focuses on + efficient large-scale data spreading, while also supporting most regular + FTP/FXP use cases in a modern way. It runs in a terminal and provides a + semi-graphical user interface through ncurses. + ''; + license = licenses.mit; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = with platforms; unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/networking/croc/default.nix b/third_party/nixpkgs/pkgs/tools/networking/croc/default.nix index 485ce66dbd..9deb7d6c94 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/croc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/croc/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "croc"; - version = "9.2.1"; + version = "9.3.0"; src = fetchFromGitHub { owner = "schollz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pEW20IbPVywNq2udfdQ/U71aDEku73+JGiy2iRADJ8Y="; + sha256 = "sha256-chSVAQXGtcAFs4GzqywjAUM9qng9j6j7KOrlQalxdOw="; }; - vendorSha256 = "sha256-z5G56PiBisceNc4tfZJVKh9tZmUkyamQBYG2mQ6kuXg="; + vendorSha256 = "sha256-z8xU1IH+xemx/kxE4crj90roF73QW5D9jFLpykH7meo="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/networking/dnscrypt-proxy2/default.nix b/third_party/nixpkgs/pkgs/tools/networking/dnscrypt-proxy2/default.nix index 8aedb40326..ced5b47746 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/dnscrypt-proxy2/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/dnscrypt-proxy2/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "dnscrypt-proxy2"; - version = "2.0.45"; + version = "2.1.0"; vendorSha256 = null; @@ -12,7 +12,7 @@ buildGoModule rec { owner = "DNSCrypt"; repo = "dnscrypt-proxy"; rev = version; - sha256 = "sha256-BvCxrFMRWPVVjK2sDlVbJKC/YK/bi4lBquIsdwOFXkw="; + sha256 = "sha256-HU5iy1dJbCp/PHnJjLi6MM+axz5Nrlcad5GEkD2p874="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/networking/ipinfo/default.nix b/third_party/nixpkgs/pkgs/tools/networking/ipinfo/default.nix index 91bc654c83..926e46bf22 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/ipinfo/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/ipinfo/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "ipinfo"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = pname; repo = "cli"; rev = "${pname}-${version}"; - sha256 = "00rqqkybvzxcpa6fy799fxmn95xqx7s3z3mqfryzi35dlmjdfzqy"; + sha256 = "05448p3bp01l5wyhl94023ywxxkmanm4gp4sdz1b71xicy2fnsmz"; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/tools/networking/mu/default.nix b/third_party/nixpkgs/pkgs/tools/networking/mu/default.nix index e224cc33a0..468bc12722 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/mu/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/mu/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "mu"; - version = "1.6.2"; + version = "1.6.3"; src = fetchFromGitHub { owner = "djcb"; repo = "mu"; rev = version; - sha256 = "EYERtDYIf0aw9nMLFZPGZ5s1i+erSq9H3tP29KwCAgQ="; + sha256 = "hmP2bcoBWMd2GZBE8XtJ5QePpWnkJV5pu69aDmL5V4g="; }; postPatch = lib.optionalString (batchSize != null) '' diff --git a/third_party/nixpkgs/pkgs/tools/networking/mubeng/default.nix b/third_party/nixpkgs/pkgs/tools/networking/mubeng/default.nix index 11ebe338c9..2c560cffb0 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/mubeng/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/mubeng/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "mubeng"; - version = "0.4.5"; + version = "0.5.2"; src = fetchFromGitHub { owner = "kitabisa"; repo = pname; rev = "v${version}"; - sha256 = "03hm4wqlvsbi06g0ijrhvbk9i2ahmd1m8l80wbcijznhbdl5msl8"; + sha256 = "sha256-jwBDa/TfXrD+f0q4nyQkpi52Jwl1XWZrMd3fPowNzgA="; }; - vendorSha256 = "1qcxix6724ly0klsr8bw3nv6pxn0wixqiqcgqkcp6sia4dxbbg14"; + vendorSha256 = "sha256-/K1kBuxGEDUCBC7PiSpQRv1NEvTKwN+vNg2rz7pg838="; meta = with lib; { description = "Proxy checker and IP rotator"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/nfdump/default.nix b/third_party/nixpkgs/pkgs/tools/networking/nfdump/default.nix index 1319e7997d..30ab31013b 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/nfdump/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/nfdump/default.nix @@ -2,7 +2,7 @@ , autoconf, automake, libtool, pkg-config , bzip2, libpcap, flex, bison }: -let version = "1.6.22"; in +let version = "1.6.23"; in stdenv.mkDerivation { pname = "nfdump"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { owner = "phaag"; repo = "nfdump"; rev = "v${version}"; - sha256 = "14x2k85ard1kp99hhd90zsmvyw24g03m84rn13gb4grm9gjggzrj"; + sha256 = "sha256-aM7U+JD8EtxEusvObsRgqS0aqfTfF3vYxCqvw0bgX20="; }; nativeBuildInputs = [ autoconf automake flex libtool pkg-config bison ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/nzbget/default.nix b/third_party/nixpkgs/pkgs/tools/networking/nzbget/default.nix index 375896258b..4934cb1296 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/nzbget/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/nzbget/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "nzbget"; - version = "21.0"; + version = "21.1"; src = fetchurl { url = "https://github.com/nzbget/nzbget/releases/download/v${version}/nzbget-${version}-src.tar.gz"; - sha256 = "0lwd0pfrs4a5ms193hgz2qiyf7grrc925dw6y0nfc0gkp27db9b5"; + sha256 = "sha256-To/BvrgNwq8tajajOjP0Te3d1EhgAsZE9MR5MEMHICU="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/oapi-codegen/default.nix b/third_party/nixpkgs/pkgs/tools/networking/oapi-codegen/default.nix index ce490cafef..41e80a3e12 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/oapi-codegen/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/oapi-codegen/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "oapi-codegen"; - version = "1.6.0"; + version = "1.8.2"; src = fetchFromGitHub { owner = "deepmap"; repo = pname; rev = "v${version}"; - sha256 = "sha256-doJ1ceuJ/gL9vlGgV/hKIJeAErAseH0dtHKJX2z7pV0="; + sha256 = "sha256-8hyRuGKspWqv+uBeSz4i12Grl83EQVPWB1weEVf9yhA="; }; - vendorSha256 = "sha256-Y4WM+o+5jiwj8/99UyNHLpBNbtJkKteIGW2P1Jd9L6M="; + vendorSha256 = "sha256-YCZzIsu1mMAAjLGHISrDkfY4Lx0az2SZV8bnZOMalx8="; # Tests use network doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/networking/oneshot/default.nix b/third_party/nixpkgs/pkgs/tools/networking/oneshot/default.nix index 48c2064358..2e809eb2d1 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/oneshot/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/oneshot/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "oneshot"; - version = "1.4.1"; + version = "1.5.0"; src = fetchFromGitHub { owner = "raphaelreyna"; repo = "oneshot"; rev = "v${version}"; - sha256 = "sha256-UD67xYBb1rvGMSPurte5z2Hcd7+JtXDPbgp3BVBdLuk="; + sha256 = "sha256-LxLMETZzoeu7qEHpUFmo/h+7sdly+R5ZWsNhyttcbpA="; }; - vendorSha256 = "sha256-d+YE618OywSDOWiiULHENFEqzRmFVUFKPuPXnL1JubM="; + vendorSha256 = "sha256-rL/NWIIggvngTrdTDm1g1uH3vC55JF3cWllPc6Yb5jc="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/networking/openapi-generator-cli/default.nix b/third_party/nixpkgs/pkgs/tools/networking/openapi-generator-cli/default.nix index 34d2c22fb2..606b3b4ee9 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/openapi-generator-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/openapi-generator-cli/default.nix @@ -1,7 +1,7 @@ { callPackage, lib, stdenv, fetchurl, jre, makeWrapper }: let this = stdenv.mkDerivation rec { - version = "5.1.0"; + version = "5.2.0"; pname = "openapi-generator-cli"; jarfilename = "${pname}-${version}.jar"; @@ -12,7 +12,7 @@ let this = stdenv.mkDerivation rec { src = fetchurl { url = "mirror://maven/org/openapitools/${pname}/${version}/${jarfilename}"; - sha256 = "06dvy4pwgpyf209n0b27qwkjj7zlgadg2czwxapy94fd1wpq9yb2"; + sha256 = "sha256-mZYGCIR7XOvONnNFDM86qSM7iug48noNgBcHdik81vk="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/tools/networking/opensm/default.nix b/third_party/nixpkgs/pkgs/tools/networking/opensm/default.nix index a21fe68e81..6026292f38 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/opensm/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/opensm/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "opensm"; - version = "3.3.23"; + version = "3.3.24"; src = fetchFromGitHub { owner = "linux-rdma"; repo = "opensm"; rev = version; - sha256 = "0r0nw7b2711ca6mrj19ymg97x862hdxv54fhhm4kiqvdh6n75y0s"; + sha256 = "sha256-/bqo5r9pVt7vg29xaRRO/9k21AMlmoe2327Ot5gVIwc="; }; nativeBuildInputs = [ autoconf automake libtool bison flex ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/openssh/copyid.nix b/third_party/nixpkgs/pkgs/tools/networking/openssh/copyid.nix index 71baa6a23f..40707c2a73 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/openssh/copyid.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/openssh/copyid.nix @@ -1,6 +1,6 @@ -{ runCommandNoCC, openssh }: +{ runCommand, openssh }: -runCommandNoCC "ssh-copy-id-${openssh.version}" { +runCommand "ssh-copy-id-${openssh.version}" { meta = openssh.meta // { description = "A tool to copy SSH public keys to a remote machine"; priority = (openssh.meta.priority or 0) - 1; diff --git a/third_party/nixpkgs/pkgs/tools/nix/nixos-generators/default.nix b/third_party/nixpkgs/pkgs/tools/nix/nixos-generators/default.nix index 004a734752..01e12e9fd5 100644 --- a/third_party/nixpkgs/pkgs/tools/nix/nixos-generators/default.nix +++ b/third_party/nixpkgs/pkgs/tools/nix/nixos-generators/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "nixos-generators"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "nix-community"; repo = "nixos-generators"; rev = version; - sha256 = "1gbj2jw7zv3mnq1lyj4q53jpfj642jy7lvg0kp060znvhws3370y"; + sha256 = "1kn2anp8abpi0n3p7j0yczbpy7mdhk8rv84ywyghqdvf2wjmnlnp"; }; nativeBuildInputs = [ makeWrapper ]; installFlags = [ "PREFIX=$(out)" ]; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/cargo-kcov/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/cargo-kcov/default.nix index c37a730636..f94c4fa5c0 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/cargo-kcov/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/cargo-kcov/default.nix @@ -1,6 +1,8 @@ { lib , rustPlatform , fetchFromGitHub +, makeWrapper +, kcov }: rustPlatform.buildRustPackage rec { @@ -17,6 +19,13 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0m5gfyjzzwd8wkbb388vmd785dy334x0migq3ssi7dlah9zx62bj"; doCheck = false; + nativeBuildInputs = [ makeWrapper ]; + + postInstall = '' + wrapProgram $out/bin/cargo-kcov \ + --prefix PATH : ${lib.makeBinPath [ kcov ]} + ''; + meta = with lib; { description = "Cargo subcommand to run kcov to get coverage report on Linux"; homepage = "https://github.com/kennytm/cargo-kcov"; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/libdnf/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/libdnf/default.nix index 7a421aaeeb..5e1562fa43 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/libdnf/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/libdnf/default.nix @@ -1,5 +1,5 @@ { gcc9Stdenv, lib, stdenv, fetchFromGitHub, cmake, gettext, pkg-config, gpgme, libsolv, openssl, check -, json_c, libmodulemd, libsmartcols, sqlite, librepo, libyaml, rpm }: +, json_c, libmodulemd, libsmartcols, sqlite, librepo, libyaml, rpm, zchunk }: gcc9Stdenv.mkDerivation rec { pname = "libdnf"; @@ -26,6 +26,7 @@ gcc9Stdenv.mkDerivation rec { libsmartcols libyaml libmodulemd + zchunk ]; propagatedBuildInputs = [ @@ -51,7 +52,6 @@ gcc9Stdenv.mkDerivation rec { "-DWITH_GTKDOC=OFF" "-DWITH_HTML=OFF" "-DWITH_BINDINGS=OFF" - "-DWITH_ZCHUNK=OFF" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nfpm/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/nfpm/default.nix index 521616a547..69d2f0d29f 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/nfpm/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/nfpm/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "nfpm"; - version = "2.3.1"; + version = "2.6.0"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zS8HXzu0oX66oVmupMU9YZKXGF+IQ/tCrO32PXfHPGY="; + sha256 = "sha256-GKdfi4hdvpB9VY8VqGYNjTezmPxotrzL/XSm1H5VLQs="; }; - vendorSha256 = "sha256-1zPrCmC+J9LbD3tRKzdJbyWbyTtD6SiPZ6efc9CSjsg="; + vendorSha256 = "sha256-APF6WHuH+YzgX3GbkSzZArGdiE7xPsLljEzCu96BvO4="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/security/bpb/default.nix b/third_party/nixpkgs/pkgs/tools/security/bpb/default.nix new file mode 100644 index 0000000000..121c5674c0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/bpb/default.nix @@ -0,0 +1,29 @@ +{ stdenv +, lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "bpb"; + version = "unstable-2018-07-27"; + + src = fetchFromGitHub { + owner = "withoutboats"; + repo = "bpb"; + rev = "b1ef5ca1d2dea0e2ec0b1616f087f110ea17adfa"; + sha256 = "sVfM8tlAsF4uKLxl3g/nSYgOx+znHIdPalSIiCd18o4="; + }; + + cargoSha256 = "7cARRJWRxF1kMySX6KcB6nrVf8k1p/nr3OyAwNLmztc="; + + # a nightly compiler is required unless we use this cheat code. + RUSTC_BOOTSTRAP = 1; + + meta = with lib; { + description = "Tool to automatically sign git commits, replacing gpg for that purpose"; + homepage = "https://github.com/withoutboats/bpb"; + license = licenses.mit; + maintainers = with maintainers; [ jtojnar ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/security/doas/0001-add-NixOS-specific-dirs-to-safe-PATH.patch b/third_party/nixpkgs/pkgs/tools/security/doas/0001-add-NixOS-specific-dirs-to-safe-PATH.patch index d1a1997ba1..a22781269d 100644 --- a/third_party/nixpkgs/pkgs/tools/security/doas/0001-add-NixOS-specific-dirs-to-safe-PATH.patch +++ b/third_party/nixpkgs/pkgs/tools/security/doas/0001-add-NixOS-specific-dirs-to-safe-PATH.patch @@ -15,7 +15,7 @@ index e253905..2fdb20f 100644 main(int argc, char **argv) { const char *safepath = "/bin:/sbin:/usr/bin:/usr/sbin:" -+ "/run/current-system/sw/bin:/run/current-system/sw/sbin:/run/wrappers/bin:" ++ "/run/wrappers/bin:/run/current-system/sw/bin:/run/current-system/sw/sbin:" "/usr/local/bin:/usr/local/sbin"; const char *confpath = NULL; char *shargv[] = { NULL, NULL }; diff --git a/third_party/nixpkgs/pkgs/tools/security/eid-mw/default.nix b/third_party/nixpkgs/pkgs/tools/security/eid-mw/default.nix index a2a6caf2b1..2b37336096 100644 --- a/third_party/nixpkgs/pkgs/tools/security/eid-mw/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/eid-mw/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "eid-mw"; # NOTE: Don't just blindly update to the latest version/tag. Releases are always for a specific OS. - version = "5.0.23"; + version = "5.0.28"; src = fetchFromGitHub { - rev = "v${version}"; - sha256 = "0annkm0hqhkpjmfa6ywvzgn1n9619baqdzdbhjfhzfi4hf7mml1d"; - repo = "eid-mw"; owner = "Fedict"; + repo = "eid-mw"; + rev = "v${version}"; + sha256 = "rrrzw8i271ZZkwY3L6aRw2Nlz+GmDr/1ahYYlUBvtzo="; }; nativeBuildInputs = [ autoreconfHook autoconf-archive pkg-config makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/exploitdb/default.nix b/third_party/nixpkgs/pkgs/tools/security/exploitdb/default.nix index 0e92047c63..5197fa96cc 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-11"; + version = "2021-08-17"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "sha256-OSEG0pWnxSvUS1h9v1j9/poo15ZoouNqiG+qB/JrOHc="; + sha256 = "sha256-rtnlPt5fsiN44AlaAZ6v7Z2u6by+OFvtMtwtWVYQvdg="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/tools/security/lethe/default.nix b/third_party/nixpkgs/pkgs/tools/security/lethe/default.nix index 6ae4527881..4f9e65b49b 100644 --- a/third_party/nixpkgs/pkgs/tools/security/lethe/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/lethe/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "lethe"; - version = "0.5.1"; + version = "0.6.0"; src = fetchFromGitHub { owner = "kostassoid"; repo = pname; rev = "v${version}"; - sha256 = "173ms4fd09iclm4v5zkmvc60l6iyyb5lzxc6dxd6q21zy0pvs35g"; + sha256 = "sha256-WYDO44S2cBPe14vv/4i51tgtnoR+6FN2GyAbjJ7AYy8="; }; - cargoSha256 = "11l7wxadinidf0bsxv14j1kv8gdhq1d6ffnb76n54igxid8gza14"; + cargoSha256 = "sha256-5fWclZgt5EuWrsYRheTX9otNiGbJ41Q/fTYdKMWRMHc="; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/third_party/nixpkgs/pkgs/tools/security/pass2csv/default.nix b/third_party/nixpkgs/pkgs/tools/security/pass2csv/default.nix new file mode 100644 index 0000000000..50de7dc7e8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/pass2csv/default.nix @@ -0,0 +1,30 @@ +{ buildPythonApplication +, fetchPypi +, lib +, python-gnupg +}: + +buildPythonApplication rec { + pname = "pass2csv"; + version = "0.3.1"; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-qY094A5F7W2exGcsS9AJuO5RrBcAn0cCrJquOc6zGZM="; + }; + + propagatedBuildInputs = [ + python-gnupg + ]; + + # Project has no tests. + doCheck = false; + + meta = with lib; { + description = "Export pass(1), \"the standard unix password manager\", to CSV"; + homepage = "https://github.com/reinefjord/pass2csv"; + license = licenses.mit; + maintainers = with maintainers; [ wolfangaukang ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/security/pinentry/default.nix b/third_party/nixpkgs/pkgs/tools/security/pinentry/default.nix index 909bbbaed1..97426e0be8 100644 --- a/third_party/nixpkgs/pkgs/tools/security/pinentry/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/pinentry/default.nix @@ -2,7 +2,9 @@ , libgpgerror, libassuan, qtbase, wrapQtAppsHook , ncurses, gtk2, gcr , libcap ? null, libsecret ? null -, enabledFlavors ? [ "curses" "tty" "gtk2" "qt" "emacs" ] ++ lib.optionals stdenv.isLinux [ "gnome3" ] +, enabledFlavors ? [ "curses" "tty" "gtk2" "emacs" ] + ++ lib.optionals stdenv.isLinux [ "gnome3" ] + ++ lib.optionals (stdenv.hostPlatform.system != "aarch64-darwin") [ "qt" ] }: with lib; diff --git a/third_party/nixpkgs/pkgs/tools/security/rnp/cmake_nogit.patch b/third_party/nixpkgs/pkgs/tools/security/rnp/cmake_nogit.patch new file mode 100644 index 0000000000..733b093de5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/rnp/cmake_nogit.patch @@ -0,0 +1,51 @@ +diff --git i/cmake/version.cmake w/cmake/version.cmake +index 0ed123b5..4348e7e1 100644 +--- i/cmake/version.cmake ++++ w/cmake/version.cmake +@@ -90,41 +90,12 @@ function(determine_version source_dir var_prefix) + else() + message(STATUS "Found no version.txt.") + endif() +- # for GIT_EXECUTABLE +- find_package(Git REQUIRED) +- # get a description of the version, something like: +- # v1.9.1-0-g38ffe82 (a tagged release) +- # v1.9.1-0-g38ffe82-dirty (a tagged release with local modifications) +- # v1.9.0-3-g5b92266 (post-release snapshot) +- # v1.9.0-3-g5b92266-dirty (post-release snapshot with local modifications) +- _git(version describe --abbrev=${GIT_REV_LEN} --match "v[0-9]*" --long --dirty) +- if (NOT _git_ec EQUAL 0) +- # no annotated tags, fake one +- message(STATUS "Found no annotated tags.") +- _git(revision rev-parse --short=${GIT_REV_LEN} --verify HEAD) +- if (_git_ec EQUAL 0) +- set(version "v${base_version}-0-g${revision}") +- # check if dirty (this won't detect untracked files, but should be ok) +- _git(changes diff-index --quiet HEAD --) +- if (NOT _git_ec EQUAL 0) +- string(APPEND version "-dirty") +- endif() +- # append the commit timestamp of the most recent commit (only +- # in non-release branches -- typically master) +- _git(commit_timestamp show -s --format=%ct) +- if (_git_ec EQUAL 0) +- string(APPEND version "+${commit_timestamp}") +- endif() +- elseif(has_version_txt) +- # Nothing to get from git - so use version.txt completely +- set(version "${version_file}") +- else() +- # Sad case - no git, no version.txt +- set(version "v${base_version}") +- endif() ++ if(has_version_txt) ++ # Nothing to get from git - so use version.txt completely ++ set(version "${version_file}") + else() +- set(has_release_tag YES) +- message(STATUS "Found annotated tag ${version}") ++ # Sad case - no git, no version.txt ++ set(version "v${base_version}") + endif() + extract_version_info("${version}" "${local_prefix}") + if ("${has_version_txt}" AND NOT ${base_version} STREQUAL ${local_prefix}_VERSION) diff --git a/third_party/nixpkgs/pkgs/tools/security/rnp/default.nix b/third_party/nixpkgs/pkgs/tools/security/rnp/default.nix index 3c60190f12..38e6c80428 100644 --- a/third_party/nixpkgs/pkgs/tools/security/rnp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/rnp/default.nix @@ -15,15 +15,17 @@ stdenv.mkDerivation rec { pname = "rnp"; - version = "0.15.1"; + version = "0.15.2"; src = fetchFromGitHub { owner = "rnpgp"; repo = "rnp"; rev = "v${version}"; - sha256 = "1l7y99rcss5w24lil6nqwr0dzh2jvq0qxmdvq7j5yx3fdssd5xsv"; + sha256 = "1jph69nsz245fbv04nalh1qmhniyh88sacsf3nxv1vxm190314i9"; }; + patches = [ ./cmake_nogit.patch ]; + buildInputs = [ zlib bzip2 json_c botan2 ]; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/tools/system/kmon/default.nix b/third_party/nixpkgs/pkgs/tools/system/kmon/default.nix index 85d9df5df4..7bf2c81029 100644 --- a/third_party/nixpkgs/pkgs/tools/system/kmon/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/kmon/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "kmon"; - version = "1.5.4"; + version = "1.5.5"; src = fetchFromGitHub { owner = "orhun"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zbTS4nGb2jDYGhNYxoPaVv9kAc51CQOi9qiHiSLjAjo="; + sha256 = "sha256-x4P9p2zXthGtokfKcWR/xaX/E7a9mEuQiK6cjFw4nS8="; }; - cargoSha256 = "sha256-ujVlOShZOuaV3B1ydggVJXLNMQHoTZC0dJaw+/ajVFg="; + cargoSha256 = "sha256-ZAHp7eR2pu+xEP9NZOLoczEF8QSFA5Z/8bKsCYqk4Ww="; nativeBuildInputs = [ python3 ]; diff --git a/third_party/nixpkgs/pkgs/tools/system/minijail/default.nix b/third_party/nixpkgs/pkgs/tools/system/minijail/default.nix index fac934f7bb..01873cb86a 100644 --- a/third_party/nixpkgs/pkgs/tools/system/minijail/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/minijail/default.nix @@ -11,12 +11,12 @@ in stdenv.mkDerivation rec { pname = "minijail"; - version = "16"; + version = "17"; src = fetchFromGitiles { url = "https://android.googlesource.com/platform/external/minijail"; rev = "linux-v${version}"; - sha256 = "0pxazds3w12c30msq6bxs4a9cbds0dkj6n3ca0i1wqvgz864yrgs"; + sha256 = "1j65h50wa39m6qvgnh1pf59fv9jdsdbc6a6c1na7y0rgljxhmdzv"; }; nativeBuildInputs = @@ -50,6 +50,8 @@ stdenv.mkDerivation rec { cp -v constants.json $out/share/minijail ''; + enableParallelBuilding = true; + meta = with lib; { homepage = "https://android.googlesource.com/platform/external/minijail/"; description = "Sandboxing library and application using Linux namespaces and capabilities"; diff --git a/third_party/nixpkgs/pkgs/tools/system/nvtop/default.nix b/third_party/nixpkgs/pkgs/tools/system/nvtop/default.nix index fdbfeb1c31..d310c1a7e8 100644 --- a/third_party/nixpkgs/pkgs/tools/system/nvtop/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/nvtop/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nvtop"; - version = "1.1.0"; + version = "1.2.2"; src = fetchFromGitHub { owner = "Syllo"; repo = "nvtop"; rev = version; - sha256 = "1h24ppdz7l6l0znwbgir49f7r1fshzjavc6i5j33c6bvr318dpqb"; + sha256 = "sha256-B/SRTOMp3VYShjSGxnF1ll58ijddJG7w/7nPK1fMltk="; }; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/tools/system/sleuthkit/default.nix b/third_party/nixpkgs/pkgs/tools/system/sleuthkit/default.nix index 912afb7021..6dc84da1e1 100644 --- a/third_party/nixpkgs/pkgs/tools/system/sleuthkit/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/sleuthkit/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, libewf, afflib, openssl, zlib }: stdenv.mkDerivation rec { - version = "4.10.2"; + version = "4.11.0"; pname = "sleuthkit"; src = fetchFromGitHub { owner = "sleuthkit"; repo = "sleuthkit"; rev = "${pname}-${version}"; - sha256 = "sha256-N0/spV/Bxk/UNULPot82Vw1uTIxy/Arf84wqUp6W2Tc="; + sha256 = "sha256-cY55zK6N3tyCLBJtZn4LhK9kLkikJjg640Pm/NA0ALY="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/system/uptimed/default.nix b/third_party/nixpkgs/pkgs/tools/system/uptimed/default.nix index ac991436f5..8e02657553 100644 --- a/third_party/nixpkgs/pkgs/tools/system/uptimed/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/uptimed/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "uptimed"; - version = "0.4.3"; + version = "0.4.4"; src = fetchFromGitHub { - sha256 = "sha256-X/LnH+EWjXlw8RktfL4ckAUmP2DPV1qlb6Ii4N985cU="; + sha256 = "sha256-DSvxE9BZpjpDQi2SxbM5iuAAHgUCaiwimcgxivD4mck="; rev = "v${version}"; repo = "uptimed"; owner = "rpodgorny"; diff --git a/third_party/nixpkgs/pkgs/tools/text/catdoc/default.nix b/third_party/nixpkgs/pkgs/tools/text/catdoc/default.nix index 61570a70b7..db57243efd 100644 --- a/third_party/nixpkgs/pkgs/tools/text/catdoc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/catdoc/default.nix @@ -16,6 +16,12 @@ stdenv.mkDerivation rec { }) ]; + # Remove INSTALL file to avoid `make` misinterpreting it as an up-to-date + # target on case-insensitive filesystems e.g. Darwin + preInstall = '' + rm -v INSTALL + ''; + configureFlags = [ "--disable-wordview" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/text/crowdin-cli/default.nix b/third_party/nixpkgs/pkgs/tools/text/crowdin-cli/default.nix new file mode 100644 index 0000000000..6bd10614e9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/text/crowdin-cli/default.nix @@ -0,0 +1,45 @@ +{ lib +, stdenv +, fetchurl +, gawk +, git +, gnugrep +, installShellFiles +, jre +, makeWrapper +, unzip +}: + +stdenv.mkDerivation rec { + pname = "crowdin-cli"; + version = "3.6.4"; + + src = fetchurl { + url = "https://github.com/crowdin/${pname}/releases/download/${version}/${pname}.zip"; + sha256 = "123mv0s1jppidmwsvr8a6f8429xmpskxmnv4p8jpnfa9zrw86aaw"; + }; + + nativeBuildInputs = [ installShellFiles makeWrapper unzip ]; + + installPhase = '' + runHook preInstall + + install -D crowdin-cli.jar $out/lib/crowdin-cli.jar + + installShellCompletion --cmd crowdin --bash ./crowdin_completion + + makeWrapper ${jre}/bin/java $out/bin/crowdin \ + --argv0 crowdin \ + --add-flags "-jar $out/lib/crowdin-cli.jar" \ + --prefix PATH : ${lib.makeBinPath [ gawk gnugrep git ]} + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/crowdin/crowdin-cli/"; + description = "A command-line client for the Crowdin API"; + license = licenses.mit; + maintainers = with maintainers; [ DamienCassou ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/text/mark/default.nix b/third_party/nixpkgs/pkgs/tools/text/mark/default.nix index 0cccb644f9..d289e56bf9 100644 --- a/third_party/nixpkgs/pkgs/tools/text/mark/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/mark/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mark"; - version = "5.5"; + version = "6.0"; src = fetchFromGitHub { owner = "kovetskiy"; repo = "mark"; rev = version; - sha256 = "sha256-+mDUT9zkawa6Ad1uptc34RGK3bhU6WowwUZdwKbOnj4="; + sha256 = "sha256-zap6YE6Pi/Db0mY4jagJXB1JXhs7q3y3BNw9EucJkAM="; }; - vendorSha256 = "sha256-nneQ0B7PyHAqiOzrmWqSssZM8B3np4VFUJLBqUvkjZE="; + vendorSha256 = "sha256-y3Q8UebNbLy1jmxUC37mv+2l8dCU3b/Fk8XHn5u57p0="; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; diff --git a/third_party/nixpkgs/pkgs/tools/text/recode/default.nix b/third_party/nixpkgs/pkgs/tools/text/recode/default.nix index 9b77c9d8b7..ce377fada9 100644 --- a/third_party/nixpkgs/pkgs/tools/text/recode/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/recode/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "recode"; - version = "3.7.8"; + version = "3.7.9"; # Use official tarball, avoid need to bootstrap/generate build system src = fetchurl { url = "https://github.com/rrthomas/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "19yg20z1smj9kag1axgvc4s4kd6jmw75h0pa8xqxl3xqqyn5rdsg"; + sha256 = "sha256-5DIKaw9c2DfNtFT7WFQBjd+pcJEWCOHwHMLGX2M2csQ="; }; nativeBuildInputs = [ python3 python3.pkgs.cython perl intltool flex texinfo libiconv ]; diff --git a/third_party/nixpkgs/pkgs/tools/text/ruplacer/default.nix b/third_party/nixpkgs/pkgs/tools/text/ruplacer/default.nix index 2f9249711e..ccf1abe539 100644 --- a/third_party/nixpkgs/pkgs/tools/text/ruplacer/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/ruplacer/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "ruplacer"; - version = "0.4.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "TankerHQ"; repo = pname; rev = "v${version}"; - sha256 = "0yj753d9wsnp4s5a71ph241jym5rfz3161a1v3qxfc4w23v86j1q"; + sha256 = "sha256-gme/p/F+LvfzynPNKmaPbNsKbwNKFCeEbAADk5PyMh8="; }; - cargoSha256 = "0z1i1yfj1wdzbzapnvfr9ngn9z30xwlkrfhz52npbirysy1al5xk"; + cargoSha256 = "sha256-/37TBl/FnCtkiufusPuJIpirD2WVO882xSqrfWVMNW0="; buildInputs = (lib.optional stdenv.isDarwin Security); diff --git a/third_party/nixpkgs/pkgs/tools/text/ugrep/default.nix b/third_party/nixpkgs/pkgs/tools/text/ugrep/default.nix index 17503829e7..2a00ba0557 100644 --- a/third_party/nixpkgs/pkgs/tools/text/ugrep/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/ugrep/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "ugrep"; - version = "3.3"; + version = "3.3.7"; src = fetchFromGitHub { owner = "Genivia"; repo = pname; rev = "v${version}"; - sha256 = "0qk8rzsll69pf220m6n41giyk3faqvwagml7i2xwgp7pcax607nl"; + sha256 = "sha256-FnSOurICD4n2Z/snP0ysWZ30DnyEDZMqpjRrS1WxG+Q="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/text/xidel/default.nix b/third_party/nixpkgs/pkgs/tools/text/xidel/default.nix index 0996cf944e..97c74e3700 100644 --- a/third_party/nixpkgs/pkgs/tools/text/xidel/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/xidel/default.nix @@ -1,48 +1,92 @@ -{ lib, stdenv, fetchurl, dpkg }: +{ lib, stdenv, fetchsvn, fetchFromGitHub, fpc }: -stdenv.mkDerivation rec { +let + flreSrc = fetchFromGitHub { + owner = "benibela"; + repo = "flre"; + rev = "5aa8a9e032feff7a5790104f2d53fa74c70bb1d9"; # latest as of 0.9.8 release date + sha256 = "1zny494jm92fjgfirzwmxff988j4yygblaxmaclkkmcvzkjrzs05"; + }; + synapseSrc = fetchsvn { + url = "http://svn.code.sf.net/p/synalist/code/synapse/40/"; + rev = 237; + sha256 = "0ciqd2xgpinwrk42cpyinh9gz2i5s5rlww4mdlsca1h6saivji96"; + }; + rcmdlineSrc = fetchFromGitHub { + owner = "benibela"; + repo = "rcmdline"; + rev = "96859e574e82d76eae49d5552a8c5aa7574a5987"; # latest as of 0.9.8 release date + sha256 = "0vwvpwrxsy9axicbck143yfxxrdifc026pv9c2lzqxzskf9fd78b"; + }; + internettoolsSrc = fetchFromGitHub { + owner = "benibela"; + repo = "internettools"; + rev = "c9c5cc3a87271180d4fb5bb0b17040763d2cfe06"; # latest as of 0.9.8 release date + sha256 = "057hn7cb1vy827gvim3b6vwgfdh2ckjy8h9yj1ry7lv6hw8ynx6n"; + }; +in stdenv.mkDerivation rec { pname = "xidel"; - version = "0.9.6"; + version = "0.9.8"; - ## Source archive lacks file (manageUtils.sh), using pre-built package for now. - #src = fetchurl { - # url = "mirror://sourceforge/videlibri/Xidel/Xidel%20${version}/${name}.src.tar.gz"; - # sha256 = "1h5xn16lgzx0s94iyhxa50lk05yf0af44nzm5w5k57615nd82kz2"; - #}; + src = fetchFromGitHub { + owner = "benibela"; + repo = pname; + rev = "Xidel_${version}"; + sha256 = "0q75jjyciybvj6y17s2283zis9fcw8w5pfsq8bn7diinnbjnzgl6"; + }; - src = - if stdenv.hostPlatform.system == "x86_64-linux" then - fetchurl { - url = "mirror://sourceforge/videlibri/Xidel/Xidel%20${version}/xidel_${version}-1_amd64.deb"; - sha256 = "0hskc74y7p4j1x33yx0w4fvr610p2yimas8pxhr6bs7mb9b300h7"; - } - else if stdenv.hostPlatform.system == "i686-linux" then - fetchurl { - url = "mirror://sourceforge/videlibri/Xidel/Xidel%20${version}/xidel_${version}-1_i386.deb"; - sha256 = "07yk5sk1p4jm0jmgjwdm2wq8d2wybi1wkn1qq5j5y03z1pdc3fi6"; - } - else throw "xidel is not supported on ${stdenv.hostPlatform.system}"; + nativeBuildInputs = [ fpc ]; - buildInputs = [ dpkg ]; - - unpackPhase = '' - dpkg-deb -x ${src} ./ + patchPhase = '' + patchShebangs \ + build.sh \ + tests/test.sh \ + tests/tests-file-module.sh \ + tests/tests.sh \ + tests/downloadTest.sh \ + tests/downloadTests.sh \ + tests/zorbajsoniq.sh \ + tests/zorbajsoniq/download.sh ''; - dontBuild = true; + preBuildPhase = '' + mkdir -p import/{flre,synapse} rcmdline internettools + cp -R ${flreSrc}/. import/flre + cp -R ${synapseSrc}/. import/synapse + cp -R ${rcmdlineSrc}/. rcmdline + cp -R ${internettoolsSrc}/. internettools + ''; + + buildPhase = '' + runHook preBuildPhase + ./build.sh + runHook postBuildPhase + ''; installPhase = '' - mkdir -p "$out/bin" - cp -a usr/* "$out/" - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/bin/xidel" + mkdir -p "$out/bin" "$out/share/man/man1" + cp meta/xidel.1 "$out/share/man/man1/" + cp xidel "$out/bin/" + ''; + + doCheck = true; + + checkPhase = '' + # Not all, if any, of these tests are blockers. Failing or not this phase will pass. + # As of 2021-08-15, all of 37 failed tests are linked with the lack of network access. + ./tests/tests.sh + ''; + + doInstallCheck = true; + + installCheckPhase = '' + $out/bin/xidel --version | grep "${version}" ''; meta = with lib; { - description = "Command line tool to download and extract data from html/xml pages"; - homepage = "http://videlibri.sourceforge.net/xidel.html"; - # source contains no license info (AFAICS), but sourceforge says GPLv2 - license = licenses.gpl2; - # more platforms will be supported when we switch to source build + description = "Command line tool to download and extract data from HTML/XML pages as well as JSON APIs"; + homepage = "https://www.videlibri.de/xidel.html"; + license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; }; diff --git a/third_party/nixpkgs/pkgs/tools/text/xurls/default.nix b/third_party/nixpkgs/pkgs/tools/text/xurls/default.nix index fa5418b458..774626561c 100644 --- a/third_party/nixpkgs/pkgs/tools/text/xurls/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/xurls/default.nix @@ -1,14 +1,14 @@ { buildGoPackage, lib, fetchFromGitHub }: buildGoPackage rec { - version = "2.2.0"; + version = "2.3.0"; pname = "xurls"; src = fetchFromGitHub { owner = "mvdan"; repo = "xurls"; rev = "v${version}"; - sha256 = "0w7i1yfl5q24wvmsfb3fz1zcqsdh4c6qikjnmswxbjc7wva8rngg"; + sha256 = "sha256-+oWYW7ZigkNS6VADNmVwarIsYyd730RAdDwnNIAYvlA="; }; goPackagePath = "mvdan.cc/xurls/v2"; diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/lowdown/shared.patch b/third_party/nixpkgs/pkgs/tools/typesetting/lowdown/shared.patch index ed9f266b3f..75ee03da97 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/lowdown/shared.patch +++ b/third_party/nixpkgs/pkgs/tools/typesetting/lowdown/shared.patch @@ -11,10 +11,11 @@ index 955f737..2c9532c 100644 www: $(HTMLS) $(PDFS) $(THUMBS) lowdown.tar.gz lowdown.tar.gz.sha512 -@@ -101,6 +101,9 @@ lowdown-diff: lowdown +@@ -101,6 +101,10 @@ lowdown-diff: lowdown liblowdown.a: $(OBJS) $(COMPAT_OBJS) $(AR) rs $@ $(OBJS) $(COMPAT_OBJS) ++%.o: CFLAGS += -fPIC +liblowdown.so: $(OBJS) $(COMPAT_OBJS) + $(CC) -shared -o $@ $(OBJS) $(COMPAT_OBJS) $(LDFLAGS) + diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/linode-cli/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/linode-cli/default.nix index f169ec7b85..8f71a22b96 100644 --- a/third_party/nixpkgs/pkgs/tools/virtualization/linode-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/virtualization/linode-cli/default.nix @@ -12,17 +12,17 @@ let # specVersion taken from: https://www.linode.com/docs/api/openapi.yaml at `info.version`. - specVersion = "4.99.0"; + specVersion = "4.101.0"; spec = fetchurl { url = "https://raw.githubusercontent.com/linode/linode-api-docs/v${specVersion}/openapi.yaml"; - sha256 = "10z63a2clbiskdnmnyf4m8v2hgc4bdm703y7s2dpw0q09msx9aca"; + sha256 = "1l4xi82b2pvkj7p1bq26ax2ava5vnv324j5sw3hvkkqqf1fmpdl5"; }; in buildPythonApplication rec { pname = "linode-cli"; - version = "5.5.2"; + version = "5.6.0"; src = fetchFromGitHub { owner = "linode"; diff --git a/third_party/nixpkgs/pkgs/tools/wayland/wob/default.nix b/third_party/nixpkgs/pkgs/tools/wayland/wob/default.nix index 07fd6f433d..7f5b7b61c6 100644 --- a/third_party/nixpkgs/pkgs/tools/wayland/wob/default.nix +++ b/third_party/nixpkgs/pkgs/tools/wayland/wob/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "wob"; - version = "0.11"; + version = "0.12"; src = fetchFromGitHub { owner = "francma"; repo = pname; rev = version; - sha256 = "13mx6nzab6msp57s9mv9ambz53a4zkafms9v97xv5zvd6xarnrya"; + sha256 = "sha256-gVQqZbz6ylBBlmhSgyaSEvAyMi48QiuviwZodPVGJxI="; }; nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ]; diff --git a/third_party/nixpkgs/pkgs/top-level/aliases.nix b/third_party/nixpkgs/pkgs/top-level/aliases.nix index 87c5829874..2790610e51 100644 --- a/third_party/nixpkgs/pkgs/top-level/aliases.nix +++ b/third_party/nixpkgs/pkgs/top-level/aliases.nix @@ -448,6 +448,20 @@ mapAliases ({ linuxPackages_xen_dom0_hardened = linuxPackages_hardened; linuxPackages_latest_xen_dom0_hardened = linuxPackages_latest_hardened; + # added 2021-08-16 + linuxPackages_latest_hardened = throw '' + The attribute `linuxPackages_hardened_latest' was dropped because the hardened patches + frequently lag behind the upstream kernel. In some cases this meant that this attribute + had to refer to an older kernel[1] because the latest hardened kernel was EOL and + the latest supported kernel didn't have patches. + + If you want to use a hardened kernel, please check which kernel minors are supported + and use a versioned attribute, e.g. `linuxPackages_5_10_hardened'. + + [1] for more context: https://github.com/NixOS/nixpkgs/pull/133587 + ''; + linux_latest_hardened = linuxPackages_latest_hardened; + linux-steam-integration = throw "linux-steam-integration has been removed, as the upstream project has been abandoned"; # added 2020-05-22 loadcaffe = throw "loadcaffe has been removed, as the upstream project has been abandoned"; # added 2020-03-28 lobster-two = google-fonts; # added 2021-07-22 @@ -473,7 +487,9 @@ mapAliases ({ mess = mame; # added 2019-10-30 mcgrid = throw "mcgrid has been removed from nixpkgs, as it's not compatible with rivet 3"; # added 2020-05-23 mcomix = throw "mcomix has been removed from nixpkgs, as it's unmaintained; try mcomix3 a Python 3 fork"; # added 2019-12-10, modified 2020-11-25 - mirage = throw "mirage has been femoved from nixpkgs, as it's unmaintained"; # added 2019-12-10 + mirage = throw "mirage has been removed from nixpkgs, as it's unmaintained"; # added 2019-12-10 + minergate = throw "minergate has been removed from nixpkgs, because the package is unmaintained and the site has a bad reputation"; # added 2021-08-13 + minergate-cli = throw "minergatecli has been removed from nixpkgs, because the package is unmaintained and the site has a bad reputation"; # added 2021-08-13 mopidy-gmusic = throw "mopidy-gmusic has been removed because Google Play Music was discontinued"; # added 2021-03-07 mopidy-local-images = throw "mopidy-local-images has been removed as it's unmaintained. It's functionality has been merged into the mopidy-local extension."; # added 2020-10-18 mopidy-local-sqlite = throw "mopidy-local-sqlite has been removed as it's unmaintained. It's functionality has been merged into the mopidy-local extension."; # added 2020-10-18 @@ -551,6 +567,7 @@ mapAliases ({ owncloudclient = owncloud-client; # added 2016-08 ocz-ssd-guru = throw "ocz-ssd-guru has been removed due to there being no source available"; # added 2021-07-12 p11_kit = p11-kit; # added 2018-02-25 + paperless = paperless-ng; # added 2021-06-06 parity = openethereum; # added 2020-08-01 parquet-cpp = arrow-cpp; # added 2018-09-08 pass-otp = pass.withExtensions (ext: [ext.pass-otp]); # added 2018-05-04 @@ -726,6 +743,8 @@ mapAliases ({ rubyPackages_2_5 = throw "rubyPackages_2_5 was deprecated in 2021-02: use a newer version of rubyPackages instead"; rubygems = throw "rubygems was deprecated on 2016-03-02: rubygems is now bundled with ruby"; rubyMinimal = throw "rubyMinimal was removed due to being unused"; + runCommandNoCC = runCommand; + runCommandNoCCLocal = runCommandLocal; runwayml = throw "runwayml is now a webapp"; # added 2021-04-17 rxvt_unicode-with-plugins = rxvt-unicode; # added 2020-02-02 rxvt_unicode = rxvt-unicode-unwrapped; # added 2020-02-02 @@ -894,6 +913,8 @@ mapAliases ({ v8_3_16_14 = throw "v8_3_16_14 was removed in 2019-11-01: no longer referenced by other packages"; valadoc = throw "valadoc was deprecated on 2019-10-10: valadoc was merged into vala 0.38"; vamp = { vampSDK = vamp-plugin-sdk; }; # added 2020-03-26 + varnish62 = throw "varnish62 was removed from nixpkgs, because it is unmaintained upstream. Please switch to a different release."; # 2021-07-26 + varnish63 = throw "varnish63 was removed from nixpkgs, because it is unmaintained upstream. Please switch to a different release."; # 2021-07-26 venus = throw "venus has been removed from nixpkgs, as it's unmaintained"; # added 2021-02-05 vdirsyncerStable = vdirsyncer; # added 2020-11-08, see https://github.com/NixOS/nixpkgs/issues/103026#issuecomment-723428168 vimbWrapper = vimb; # added 2015-01 diff --git a/third_party/nixpkgs/pkgs/top-level/all-packages.nix b/third_party/nixpkgs/pkgs/top-level/all-packages.nix index 85a4be3fbe..43ecc12882 100644 --- a/third_party/nixpkgs/pkgs/top-level/all-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/all-packages.nix @@ -581,6 +581,7 @@ with pkgs; fetchNuGet = callPackage ../build-support/fetchnuget { }; buildDotnetPackage = callPackage ../build-support/build-dotnet-package { }; + nuget-to-nix = callPackage ../build-support/nuget-to-nix { }; fetchgx = callPackage ../build-support/fetchgx { }; @@ -970,6 +971,8 @@ with pkgs; logseq = callPackage ../applications/misc/logseq { }; + lua-format = callPackage ../tools/misc/lua-format { }; + lxterminal = callPackage ../applications/terminal-emulators/lxterminal { }; microcom = callPackage ../applications/terminal-emulators/microcom { }; @@ -1143,15 +1146,15 @@ with pkgs; arduino = arduino-core.override { withGui = true; }; - arduino-ci = callPackage ../development/arduino/arduino-ci { }; + arduino-ci = callPackage ../development/embedded/arduino/arduino-ci { }; - arduino-cli = callPackage ../development/arduino/arduino-cli { }; + arduino-cli = callPackage ../development/embedded/arduino/arduino-cli { }; - arduino-core = callPackage ../development/arduino/arduino-core { }; + arduino-core = callPackage ../development/embedded/arduino/arduino-core { }; - arduino-mk = callPackage ../development/arduino/arduino-mk {}; + arduino-mk = callPackage ../development/embedded/arduino/arduino-mk {}; - apio = python3Packages.callPackage ../development/tools/misc/apio { }; + apio = python3Packages.callPackage ../development/embedded/fpga/apio { }; apitrace = libsForQt514.callPackage ../applications/graphics/apitrace {}; @@ -1671,6 +1674,8 @@ with pkgs; lsix = callPackage ../tools/graphics/lsix { }; + mdr = callPackage ../tools/misc/mdr { }; + mpdevil = callPackage ../applications/audio/mpdevil { }; pacparser = callPackage ../tools/networking/pacparser { }; @@ -2067,6 +2072,8 @@ with pkgs; bozohttpd = callPackage ../servers/http/bozohttpd { }; bozohttpd-minimal = callPackage ../servers/http/bozohttpd { minimal = true; }; + bpb = callPackage ../tools/security/bpb { }; + bpytop = callPackage ../tools/system/bpytop { }; brasero-original = lowPrio (callPackage ../tools/cd-dvd/brasero { }); @@ -2169,7 +2176,9 @@ with pkgs; ''; }); - caddy = callPackage ../servers/caddy { }; + caddy = callPackage ../servers/caddy { + buildGoModule = buildGo115Module; + }; traefik = callPackage ../servers/traefik { }; @@ -2229,6 +2238,8 @@ with pkgs; croc = callPackage ../tools/networking/croc { }; + cbftp = callPackage ../tools/networking/cbftp { }; + cddl = callPackage ../development/tools/cddl { }; cedille = callPackage ../applications/science/logic/cedille @@ -4958,6 +4969,8 @@ with pkgs; fontmatrix = libsForQt514.callPackage ../applications/graphics/fontmatrix {}; + footswitch = callPackage ../tools/inputmethods/footswitch { }; + foremost = callPackage ../tools/system/foremost { }; forktty = callPackage ../os-specific/linux/forktty {}; @@ -5151,6 +5164,8 @@ with pkgs; gtk = gtk2; }; + gfs2-utils = callPackage ../tools/filesystems/gfs2-utils { }; + gfbgraph = callPackage ../development/libraries/gfbgraph { }; ggobi = callPackage ../tools/graphics/ggobi { }; @@ -6590,10 +6605,6 @@ with pkgs; mhonarc = perlPackages.MHonArc; - minergate = callPackage ../applications/misc/minergate { }; - - minergate-cli = callPackage ../applications/misc/minergate-cli { }; - minica = callPackage ../tools/security/minica { }; minidlna = callPackage ../tools/networking/minidlna { }; @@ -7429,25 +7440,20 @@ with pkgs; noip = callPackage ../tools/networking/noip { }; - nomad = nomad_1_0; + nomad = nomad_1_1; # Nomad never updates major go versions within a release series and is unsupported # on Go versions that it did not ship with. Due to historic bugs when compiled # with different versions we pin Go for all versions. # Upstream partially documents used Go versions here # https://github.com/hashicorp/nomad/blob/master/contributing/golang.md - nomad_0_12 = callPackage ../applications/networking/cluster/nomad/0.12.nix { - buildGoPackage = buildGo114Package; - inherit (linuxPackages) nvidia_x11; - nvidiaGpuSupport = config.cudaSupport or false; - }; nomad_1_0 = callPackage ../applications/networking/cluster/nomad/1.0.nix { buildGoPackage = buildGo115Package; inherit (linuxPackages) nvidia_x11; nvidiaGpuSupport = config.cudaSupport or false; }; nomad_1_1 = callPackage ../applications/networking/cluster/nomad/1.1.nix { - buildGoPackage = buildGo116Package; + buildGoModule = buildGo116Module; inherit (linuxPackages) nvidia_x11; nvidiaGpuSupport = config.cudaSupport or false; }; @@ -7634,7 +7640,7 @@ with pkgs; opencorsairlink = callPackage ../tools/misc/opencorsairlink { }; - openfpgaloader = callPackage ../development/tools/misc/openfpgaloader { }; + openfpgaloader = callPackage ../development/embedded/fpga/openfpgaloader { }; openfortivpn = callPackage ../tools/networking/openfortivpn { }; @@ -7887,7 +7893,7 @@ with pkgs; pamtester = callPackage ../tools/security/pamtester { }; - paperless = callPackage ../applications/office/paperless { }; + paperless-ng = callPackage ../applications/office/paperless-ng { }; paperwork = callPackage ../applications/office/paperwork/paperwork-gtk.nix { }; @@ -8093,7 +8099,7 @@ with pkgs; plan9port = callPackage ../tools/system/plan9port { }; - platformioPackages = dontRecurseIntoAttrs (callPackage ../development/arduino/platformio { }); + platformioPackages = dontRecurseIntoAttrs (callPackage ../development/embedded/platformio { }); platformio = platformioPackages.platformio-chrootenv; platinum-searcher = callPackage ../tools/text/platinum-searcher { }; @@ -9304,6 +9310,10 @@ with pkgs; tartube = callPackage ../applications/video/tartube { }; + tartube-yt-dlp = callPackage ../applications/video/tartube { + youtube-dl = yt-dlp; + }; + tayga = callPackage ../tools/networking/tayga { }; tcpcrypt = callPackage ../tools/security/tcpcrypt { }; @@ -9434,7 +9444,7 @@ with pkgs; tinyobjloader = callPackage ../development/libraries/tinyobjloader { }; - tinyprog = callPackage ../development/tools/misc/tinyprog { }; + tinyprog = callPackage ../development/embedded/fpga/tinyprog { }; tinyproxy = callPackage ../tools/networking/tinyproxy { }; @@ -9678,7 +9688,7 @@ with pkgs; umlet = callPackage ../tools/misc/umlet { }; - unetbootin = callPackage ../tools/cd-dvd/unetbootin { }; + unetbootin = libsForQt5.callPackage ../tools/cd-dvd/unetbootin { }; unfs3 = callPackage ../servers/unfs3 { }; @@ -10148,13 +10158,11 @@ with pkgs; valum = callPackage ../development/web/valum { }; inherit (callPackages ../servers/varnish { }) - varnish60 varnish62 varnish63; + varnish60 varnish65; inherit (callPackages ../servers/varnish/packages.nix { }) - varnish60Packages - varnish62Packages - varnish63Packages; + varnish60Packages varnish65Packages; - varnishPackages = varnish63Packages; + varnishPackages = varnish65Packages; varnish = varnishPackages.varnish; hitch = callPackage ../servers/hitch { }; @@ -12251,7 +12259,7 @@ with pkgs; }; cargo-valgrind = callPackage ../development/tools/rust/cargo-valgrind { }; cargo-watch = callPackage ../development/tools/rust/cargo-watch { - inherit (darwin.apple_sdk.frameworks) CoreServices; + inherit (darwin.apple_sdk.frameworks) CoreServices Foundation; }; cargo-wipe = callPackage ../development/tools/rust/cargo-wipe { }; cargo-xbuild = callPackage ../development/tools/rust/cargo-xbuild { }; @@ -12994,7 +13002,7 @@ with pkgs; avr8burnomat = callPackage ../development/misc/avr8-burn-omat { }; - betaflight = callPackage ../development/misc/stm32/betaflight { + betaflight = callPackage ../development/embedded/stm32/betaflight { gcc-arm-embedded = pkgsCross.arm-embedded.buildPackages.gcc; binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils; }; @@ -13052,7 +13060,7 @@ with pkgs; guile = guile_2_0; }; - inav = callPackage ../development/misc/stm32/inav { + inav = callPackage ../development/embedded/stm32/inav { gcc-arm-embedded = pkgsCross.arm-embedded.buildPackages.gcc; binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils; }; @@ -13206,7 +13214,7 @@ with pkgs; automoc4 = callPackage ../development/tools/misc/automoc4 { }; - avrdude = callPackage ../development/tools/misc/avrdude { }; + avrdude = callPackage ../development/embedded/avrdude { }; b4 = callPackage ../development/tools/b4 { }; @@ -13360,13 +13368,13 @@ with pkgs; black-macchiato = with python3Packages; toPythonApplication black-macchiato; - blackmagic = callPackage ../development/tools/misc/blackmagic { }; + blackmagic = callPackage ../development/embedded/blackmagic { }; bloaty = callPackage ../development/tools/bloaty { }; bloop = callPackage ../development/tools/build-managers/bloop { }; - bossa = callPackage ../development/tools/misc/bossa { + bossa = callPackage ../development/embedded/bossa { wxGTK = wxGTK30; }; @@ -13394,7 +13402,7 @@ with pkgs; cbrowser = callPackage ../development/tools/misc/cbrowser { }; - cc-tool = callPackage ../development/tools/misc/cc-tool { }; + cc-tool = callPackage ../development/embedded/cc-tool { }; ccache = callPackage ../development/tools/misc/ccache { asciidoc = asciidoc-full; @@ -13619,7 +13627,7 @@ with pkgs; ddd = callPackage ../development/tools/misc/ddd { }; - lattice-diamond = callPackage ../development/tools/lattice-diamond { }; + lattice-diamond = callPackage ../development/embedded/fpga/lattice-diamond { }; direvent = callPackage ../development/tools/misc/direvent { }; @@ -13680,7 +13688,7 @@ with pkgs; drush = callPackage ../development/tools/misc/drush { }; - easypdkprog = callPackage ../development/tools/misc/easypdkprog { }; + easypdkprog = callPackage ../development/embedded/easypdkprog { }; editorconfig-checker = callPackage ../development/tools/misc/editorconfig-checker { }; @@ -13753,7 +13761,7 @@ with pkgs; fsearch = callPackage ../tools/misc/fsearch { }; - fujprog = callPackage ../development/tools/misc/fujprog { + fujprog = callPackage ../development/embedded/fpga/fujprog { inherit (darwin.apple_sdk.frameworks) IOKit; }; @@ -13846,7 +13854,7 @@ with pkgs; gprbuild = callPackage ../development/tools/build-managers/gprbuild { }; - gputils = callPackage ../development/tools/misc/gputils { }; + gputils = callPackage ../development/embedded/gputils { }; gpuvis = callPackage ../development/tools/misc/gpuvis { }; @@ -13874,6 +13882,8 @@ with pkgs; gtkdialog = callPackage ../development/tools/misc/gtkdialog { }; + crowdin-cli = callPackage ../tools/text/crowdin-cli { }; + gtranslator = callPackage ../tools/text/gtranslator { }; guff = callPackage ../tools/graphics/guff { }; @@ -13906,7 +13916,7 @@ with pkgs; iaca_3_0 = callPackage ../development/tools/iaca/3.0.nix { }; iaca = iaca_3_0; - icestorm = callPackage ../development/tools/icestorm { }; + icestorm = callPackage ../development/embedded/fpga/icestorm { }; icmake = callPackage ../development/tools/build-managers/icmake { }; @@ -13922,7 +13932,7 @@ with pkgs; indent = callPackage ../development/tools/misc/indent { }; - ino = callPackage ../development/arduino/ino { }; + ino = callPackage ../development/embedded/arduino/ino { }; inotify-tools = callPackage ../development/tools/misc/inotify-tools { }; @@ -14171,7 +14181,7 @@ with pkgs; opengrok = callPackage ../development/tools/misc/opengrok { }; - openocd = callPackage ../development/tools/misc/openocd { }; + openocd = callPackage ../development/embedded/openocd { }; oprofile = callPackage ../development/tools/profiling/oprofile { libiberty_static = libiberty.override { staticBuild = true; }; @@ -14344,6 +14354,8 @@ with pkgs; saleae-logic = callPackage ../development/tools/misc/saleae-logic { }; + saleae-logic-2 = callPackage ../development/tools/misc/saleae-logic-2 { }; + sauce-connect = callPackage ../development/tools/sauce-connect { }; sd-local = callPackage ../development/tools/sd-local { }; @@ -14462,9 +14474,9 @@ with pkgs; sselp = callPackage ../tools/X11/sselp{ }; - stm32cubemx = callPackage ../development/tools/misc/stm32cubemx { }; + stm32cubemx = callPackage ../development/embedded/stm32/stm32cubemx { }; - stm32flash = callPackage ../development/tools/misc/stm32flash { }; + stm32flash = callPackage ../development/embedded/stm32/stm32flash { }; strace = callPackage ../development/tools/misc/strace { }; @@ -14519,7 +14531,7 @@ with pkgs; teensyduino = arduino-core.override { withGui = true; withTeensyduino = true; }; - teensy-loader-cli = callPackage ../development/tools/misc/teensy-loader-cli { }; + teensy-loader-cli = callPackage ../development/embedded/teensy-loader-cli { }; terracognita = callPackage ../development/tools/misc/terracognita { }; @@ -14564,7 +14576,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - trellis = callPackage ../development/tools/trellis { }; + trellis = callPackage ../development/embedded/fpga/trellis { }; ttyd = callPackage ../servers/ttyd { }; @@ -14587,7 +14599,7 @@ with pkgs; boost = boost17x; }; - uisp = callPackage ../development/tools/misc/uisp { }; + uisp = callPackage ../development/embedded/uisp { }; uncrustify = callPackage ../development/tools/misc/uncrustify { }; @@ -14641,7 +14653,7 @@ with pkgs; webdis = callPackage ../development/tools/database/webdis { }; - xc3sprog = callPackage ../development/tools/misc/xc3sprog { }; + xc3sprog = callPackage ../development/embedded/xc3sprog { }; xcb-imdkit = callPackage ../development/libraries/xcb-imdkit { }; @@ -14893,7 +14905,6 @@ with pkgs; boost160 = callPackage ../development/libraries/boost/1.60.nix { }; boost165 = callPackage ../development/libraries/boost/1.65.nix { }; boost166 = callPackage ../development/libraries/boost/1.66.nix { }; - boost167 = callPackage ../development/libraries/boost/1.67.nix { }; boost168 = callPackage ../development/libraries/boost/1.68.nix { }; boost169 = callPackage ../development/libraries/boost/1.69.nix { }; boost16x = boost169; @@ -16348,6 +16359,8 @@ with pkgs; libayatana-appindicator-gtk3 = libayatana-appindicator.override { gtkVersion = "3"; }; libayatana-appindicator = callPackage ../development/libraries/libayatana-appindicator { }; + libargs = callPackage ../development/libraries/libargs { }; + libarchive = callPackage ../development/libraries/libarchive { autoreconfHook = buildPackages.autoreconfHook269; }; @@ -18028,7 +18041,6 @@ with pkgs; openvdb = callPackage ../development/libraries/openvdb {}; inherit (callPackages ../development/libraries/libressl { }) - libressl_3_1 libressl_3_2; # Please keep this pointed to the latest version. See also @@ -18464,7 +18476,7 @@ with pkgs; ronn = callPackage ../development/tools/ronn { }; - rshell = python3.pkgs.callPackage ../development/tools/rshell { }; + rshell = python3.pkgs.callPackage ../development/embedded/rshell { }; rttr = callPackage ../development/libraries/rttr { }; @@ -18591,10 +18603,15 @@ with pkgs; buildPackage = callPackage ../build-support/skaware/build-skaware-package.nix { inherit cleanPackaging; }; + buildManPages = callPackage ../build-support/skaware/build-skaware-man-pages.nix { }; skalibs = callPackage ../development/libraries/skalibs { }; execline = callPackage ../tools/misc/execline { }; + execline-man-pages = callPackage ../data/documentation/execline-man-pages { + inherit buildManPages; + }; + s6 = callPackage ../tools/system/s6 { }; s6-dns = callPackage ../tools/networking/s6-dns { }; s6-linux-init = callPackage ../os-specific/linux/s6-linux-init { }; @@ -18602,6 +18619,12 @@ with pkgs; s6-networking = callPackage ../tools/networking/s6-networking { }; s6-portable-utils = callPackage ../tools/misc/s6-portable-utils { }; s6-rc = callPackage ../tools/system/s6-rc { }; + s6-man-pages = callPackage ../data/documentation/s6-man-pages { + inherit buildManPages; + }; + s6-networking-man-pages = callPackage ../data/documentation/s6-networking-man-pages { + inherit buildManPages; + }; mdevd = callPackage ../os-specific/linux/mdevd { }; nsss = callPackage ../development/libraries/nsss { }; @@ -19889,6 +19912,8 @@ with pkgs; mailman-web = with python3.pkgs; toPythonApplication mailman-web; + listadmin = callPackage ../applications/networking/listadmin {}; + maker-panel = callPackage ../tools/misc/maker-panel { }; mastodon = callPackage ../servers/mastodon { }; @@ -21175,13 +21200,6 @@ with pkgs; ]; }; - linux_5_12 = callPackage ../os-specific/linux/kernel/linux-5.12.nix { - kernelPatches = [ - kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - ]; - }; - linux_5_13 = callPackage ../os-specific/linux/kernel/linux-5.13.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -21505,7 +21523,6 @@ with pkgs; linuxPackages_4_19 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_19); linuxPackages_5_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_4); linuxPackages_5_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_10); - linuxPackages_5_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_12); linuxPackages_5_13 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_13); # When adding to the list above: @@ -21537,11 +21554,8 @@ with pkgs; linuxPackages_testing_bcachefs = recurseIntoAttrs (linuxPackagesFor pkgs.linux_testing_bcachefs); # Hardened Linux - hardenedLinuxPackagesFor = kernel': overrides: - let # Note: We use this hack since the hardened patches can lag behind and we don't want to delay updates: - linux_latest_for_hardened = pkgs.linux_5_12; - kernel = (if kernel' == pkgs.linux_latest then linux_latest_for_hardened else kernel').override overrides; - in linuxPackagesFor (kernel.override { + hardenedLinuxPackagesFor = kernel: overrides: + linuxPackagesFor (kernel.override { structuredExtraConfig = import ../os-specific/linux/kernel/hardened/config.nix { inherit lib; inherit (kernel) version; @@ -21556,8 +21570,17 @@ with pkgs; linuxPackages_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux { }); linux_hardened = linuxPackages_hardened.kernel; - linuxPackages_latest_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux_latest { }); - linux_latest_hardened = linuxPackages_latest_hardened.kernel; + linuxPackages_4_14_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux_4_14 { }); + linux_4_14_hardened = linuxPackages_4_14_hardened.kernel; + + linuxPackages_4_19_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux_4_19 { }); + linux_4_19_hardened = linuxPackages_4_19_hardened.kernel; + + linuxPackages_5_4_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux_5_4 { }); + linux_5_4_hardened = linuxPackages_5_4_hardened.kernel; + + linuxPackages_5_10_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux_5_10 { }); + linux_5_10_hardened = linuxPackages_5_10_hardened.kernel; # Hardkernel (Odroid) kernels. linuxPackages_hardkernel_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_hardkernel_4_14); @@ -22494,6 +22517,8 @@ with pkgs; envdir = callPackage ../tools/misc/envdir-go { }; + execline-man-pages = skawarePackages.execline-man-pages; + fantasque-sans-mono = callPackage ../data/fonts/fantasque-sans-mono {}; fira = callPackage ../data/fonts/fira { }; @@ -23010,6 +23035,10 @@ with pkgs; open-fonts = callPackage ../data/fonts/open-fonts { }; + s6-man-pages = skawarePackages.s6-man-pages; + + s6-networking-man-pages = skawarePackages.s6-networking-man-pages; + scientifica = callPackage ../data/fonts/scientifica { }; siji = callPackage ../data/fonts/siji @@ -23754,6 +23783,7 @@ with pkgs; comical = callPackage ../applications/graphics/comical { }; containerd = callPackage ../applications/virtualization/containerd { }; + containerd_1_4 = callPackage ../applications/virtualization/containerd/1.4.nix { }; convchain = callPackage ../tools/graphics/convchain {}; @@ -23924,12 +23954,14 @@ with pkgs; drawio = callPackage ../applications/graphics/drawio {}; - drawpile = libsForQt514.callPackage ../applications/graphics/drawpile { }; - drawpile-server-headless = libsForQt514.callPackage ../applications/graphics/drawpile { + drawpile = libsForQt5.callPackage ../applications/graphics/drawpile { }; + drawpile-server-headless = libsForQt5.callPackage ../applications/graphics/drawpile { buildClient = false; buildServerGui = false; }; + drawterm = callPackage ../tools/admin/drawterm { }; + droopy = python3Packages.callPackage ../applications/networking/droopy { }; drumgizmo = callPackage ../applications/audio/drumgizmo { }; @@ -23988,7 +24020,7 @@ with pkgs; jdk = jdk11; }); - ecpdap = callPackage ../development/tools/ecpdap { + ecpdap = callPackage ../development/embedded/fpga/ecpdap { inherit (darwin.apple_sdk.frameworks) AppKit; }; @@ -24488,7 +24520,7 @@ with pkgs; }; firefox-bin = wrapFirefox firefox-bin-unwrapped { - browserName = "firefox"; + applicationName = "firefox"; pname = "firefox-bin"; desktopName = "Firefox"; }; @@ -24499,7 +24531,7 @@ with pkgs; }; firefox-beta-bin = res.wrapFirefox firefox-beta-bin-unwrapped { - browserName = "firefox"; + applicationName = "firefox"; pname = "firefox-beta-bin"; desktopName = "Firefox Beta"; }; @@ -24510,7 +24542,7 @@ with pkgs; }; firefox-devedition-bin = res.wrapFirefox firefox-devedition-bin-unwrapped { - browserName = "firefox"; + applicationName = "firefox"; nameSuffix = "-devedition"; pname = "firefox-devedition-bin"; desktopName = "Firefox DevEdition"; @@ -25030,6 +25062,8 @@ with pkgs; musikcube = callPackage ../applications/audio/musikcube {}; + pass2csv = python3Packages.callPackage ../tools/security/pass2csv {}; + pass-secret-service = callPackage ../applications/misc/pass-secret-service { }; pinboard = with python3Packages; toPythonApplication pinboard; @@ -25967,6 +26001,8 @@ with pkgs; xmrig = callPackage ../applications/misc/xmrig { }; + xmrig-mo = callPackage ../applications/misc/xmrig/moneroocean.nix { }; + xmrig-proxy = callPackage ../applications/misc/xmrig/proxy.nix { }; molot-lite = callPackage ../applications/audio/molot-lite { }; @@ -27648,22 +27684,28 @@ with pkgs; thonny = callPackage ../applications/editors/thonny { }; - thunderbird = thunderbird-78; + thunderbirdPackages = recurseIntoAttrs (callPackage ../applications/networking/mailreaders/thunderbird/packages.nix { + callPackage = pkgs.newScope { + inherit (rustPackages) cargo rustc; + libpng = libpng_apng; + gnused = gnused_422; + inherit (darwin.apple_sdk.frameworks) CoreMedia ExceptionHandling + Kerberos AVFoundation MediaToolbox + CoreLocation Foundation AddressBook; + inherit (darwin) libobjc; + }; + }); - thunderbird-78 = callPackage ../applications/networking/mailreaders/thunderbird { - # Using older Rust for workaround: - # https://bugzilla.mozilla.org/show_bug.cgi?id=1663715 - inherit (rustPackages_1_45) cargo rustc; - libpng = libpng_apng; - icu = icu67; - libvpx = libvpx_1_8; - gtk3Support = true; - }; + thunderbird-unwrapped = thunderbirdPackages.thunderbird; + thunderbird-78-unwrapped = thunderbirdPackages.thunderbird-78; + thunderbird = wrapThunderbird thunderbird-unwrapped { }; + thunderbird-78 = wrapThunderbird thunderbird-78-unwrapped { }; + thunderbird-wayland = wrapThunderbird thunderbird-unwrapped { forceWayland = true; }; thunderbolt = callPackage ../os-specific/linux/thunderbolt {}; - thunderbird-bin = thunderbird-bin-78; - thunderbird-bin-78 = callPackage ../applications/networking/mailreaders/thunderbird-bin { }; + thunderbird-bin = thunderbird-bin-91; + thunderbird-bin-91 = callPackage ../applications/networking/mailreaders/thunderbird-bin { }; ticpp = callPackage ../development/libraries/ticpp { }; @@ -28278,6 +28320,8 @@ with pkgs; wrapFirefox = callPackage ../applications/networking/browsers/firefox/wrapper.nix { }; + wrapThunderbird = callPackage ../applications/networking/mailreaders/thunderbird/wrapper.nix { }; + wp-cli = callPackage ../development/tools/wp-cli { }; retroArchCores = @@ -29426,6 +29470,8 @@ with pkgs; liberal-crime-squad = callPackage ../games/liberal-crime-squad { }; + liberation-circuit = callPackage ../games/liberation-circuit { }; + lincity = callPackage ../games/lincity {}; lincity_ng = callPackage ../games/lincity/ng.nix { diff --git a/third_party/nixpkgs/pkgs/top-level/coq-packages.nix b/third_party/nixpkgs/pkgs/top-level/coq-packages.nix index 35cde1b123..2b707d3d3e 100644 --- a/third_party/nixpkgs/pkgs/top-level/coq-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/coq-packages.nix @@ -14,6 +14,7 @@ let (callPackage ../development/coq-modules/contribs {}); aac-tactics = callPackage ../development/coq-modules/aac-tactics {}; + addition-chains = callPackage ../development/coq-modules/addition-chains {}; autosubst = callPackage ../development/coq-modules/autosubst {}; bignums = if lib.versionAtLeast coq.coq-version "8.6" then callPackage ../development/coq-modules/bignums {} @@ -40,6 +41,7 @@ let fiat_HEAD = callPackage ../development/coq-modules/fiat/HEAD.nix {}; flocq = callPackage ../development/coq-modules/flocq {}; fourcolor = callPackage ../development/coq-modules/fourcolor {}; + gaia = callPackage ../development/coq-modules/gaia {}; gappalib = callPackage ../development/coq-modules/gappalib {}; goedel = callPackage ../development/coq-modules/goedel {}; graph-theory = callPackage ../development/coq-modules/graph-theory {}; @@ -78,6 +80,7 @@ let reglang = callPackage ../development/coq-modules/reglang {}; relation-algebra = callPackage ../development/coq-modules/relation-algebra {}; semantics = callPackage ../development/coq-modules/semantics {}; + serapi = callPackage ../development/coq-modules/serapi {}; simple-io = callPackage ../development/coq-modules/simple-io { }; stdpp = callPackage ../development/coq-modules/stdpp { }; StructTact = callPackage ../development/coq-modules/StructTact {}; diff --git a/third_party/nixpkgs/pkgs/top-level/nixpkgs-basic-release-checks.nix b/third_party/nixpkgs/pkgs/top-level/nixpkgs-basic-release-checks.nix index ffd92d587b..777cce7e5e 100644 --- a/third_party/nixpkgs/pkgs/top-level/nixpkgs-basic-release-checks.nix +++ b/third_party/nixpkgs/pkgs/top-level/nixpkgs-basic-release-checks.nix @@ -34,6 +34,7 @@ pkgs.runCommand "nixpkgs-release-checks" { src = nixpkgs; buildInputs = [nix]; } nix-env -f $src \ --show-trace --argstr system "$platform" \ + --arg config '{ allowAliases = false; }' \ -qa --drv-path --system-filter \* --system \ "''${opts[@]}" 2>&1 >/dev/null | tee eval-warnings.log @@ -45,6 +46,7 @@ pkgs.runCommand "nixpkgs-release-checks" { src = nixpkgs; buildInputs = [nix]; } nix-env -f $src \ --show-trace --argstr system "$platform" \ + --arg config '{ allowAliases = false; }' \ -qa --drv-path --system-filter \* --system --meta --xml \ "''${opts[@]}" > /dev/null done diff --git a/third_party/nixpkgs/pkgs/top-level/packages-config.nix b/third_party/nixpkgs/pkgs/top-level/packages-config.nix index 84db6fa21e..d7dfbf5860 100644 --- a/third_party/nixpkgs/pkgs/top-level/packages-config.nix +++ b/third_party/nixpkgs/pkgs/top-level/packages-config.nix @@ -6,37 +6,32 @@ # Enable recursion into attribute sets that nix-env normally doesn't look into # so that we can get a more complete picture of the available packages for the # purposes of the index. - packageOverrides = super: - let - recurseIntoAttrs = sets: - super.lib.genAttrs - (builtins.filter (set: builtins.hasAttr set super) sets) - (set: super.recurseIntoAttrs (builtins.getAttr set super)); - in recurseIntoAttrs [ - "roundcubePlugins" - "emscriptenfastcompPackages" - "fdbPackages" - "nodePackages_latest" - "nodePackages" - "platformioPackages" - "haskellPackages" - "idrisPackages" - "sconsPackages" - "gns3Packages" - "quicklispPackagesClisp" - "quicklispPackagesSBCL" - "rPackages" - "apacheHttpdPackages_2_4" - "zabbix50" - "zabbix40" - "zabbix30" - "fusePackages" - "nvidiaPackages" - "sourceHanPackages" - "atomPackages" - "emacs27.pkgs" - "steamPackages" - "ut2004Packages" - "zeroadPackages" - ]; + packageOverrides = super: with super; lib.mapAttrs (_: set: recurseIntoAttrs set) { + inherit (super) + apacheHttpdPackages + atomPackages + fdbPackages + fusePackages + gns3Packages + haskellPackages + idrisPackages + nodePackages + nodePackages_latest + platformioPackages + quicklispPackagesClisp + quicklispPackagesSBCL + rPackages + roundcubePlugins + sconsPackages + sourceHanPackages + steamPackages + ut2004Packages + zabbix40 + zabbix50 + zeroadPackages + ; + + # This is an alias which we disallow by default; explicitly allow it + emacs27Packages = emacs27.pkgs; + }; } diff --git a/third_party/nixpkgs/pkgs/top-level/perl-packages.nix b/third_party/nixpkgs/pkgs/top-level/perl-packages.nix index fb2f2db19d..4361f2eccd 100644 --- a/third_party/nixpkgs/pkgs/top-level/perl-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/perl-packages.nix @@ -9,6 +9,7 @@ , stdenv, lib, buildPackages, pkgs , fetchurl, fetchgit, fetchpatch, fetchFromGitHub , perl, overrides, buildPerl, shortenPerlShebang +, nixosTests }: # cpan2nix assumes that perl-packages.nix will be used only with perl 5.30.3 or above @@ -13721,6 +13722,12 @@ let url = "mirror://cpan/authors/id/S/SH/SHAY/mod_perl-2.0.11.tar.gz"; sha256 = "0x3gq4nz96y202cymgrf56n8spm7bffkd1p74dh9q3zrrlc9wana"; }; + + patches = [ + # Fix build on perl-5.34.0, https://github.com/Perl/perl5/issues/18617 + ../development/perl-modules/mod_perl2-PL_hash_seed.patch + ]; + makeMakerFlags = "MP_AP_DESTDIR=$out"; buildInputs = [ pkgs.apacheHttpd ]; doCheck = false; # would try to start Apache HTTP server @@ -13728,6 +13735,8 @@ let description = "Embed a Perl interpreter in the Apache HTTP server"; license = lib.licenses.asl20; }; + + passthru.tests = nixosTests.mod_perl; }; Mojolicious = buildPerlPackage { @@ -15181,6 +15190,20 @@ let }; }; + NetINET6Glue = buildPerlPackage { + pname = "Net-INET6Glue"; + version = "0.604"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SU/SULLR/Net-INET6Glue-0.604.tar.gz"; + sha256 = "05xvbdrqq88npzg14bjm9wmjykzplwirzcm8rp61852hz6c67hwh"; + }; + meta = { + homepage = "https://github.com/noxxi/p5-net-inet6glue"; + description = "Make common modules IPv6 ready by hotpatching"; + license = lib.licenses.artistic1; + }; + }; + NetAddrIP = buildPerlPackage { pname = "NetAddr-IP"; version = "4.079"; diff --git a/third_party/nixpkgs/pkgs/top-level/python-aliases.nix b/third_party/nixpkgs/pkgs/top-level/python-aliases.nix index ba92d25afc..3f60f90e08 100644 --- a/third_party/nixpkgs/pkgs/top-level/python-aliases.nix +++ b/third_party/nixpkgs/pkgs/top-level/python-aliases.nix @@ -49,6 +49,7 @@ mapAliases ({ glances = throw "glances has moved to pkgs.glances"; # added 2020-20-28 google_api_python_client = google-api-python-client; # added 2021-03-19 googleapis_common_protos = googleapis-common-protos; # added 2021-03-19 + grpc_google_iam_v1 = grpc-google-iam-v1; # added 2021-08-21 HAP-python = hap-python; # added 2021-06-01 lammps-cython = throw "no longer builds and is unmaintained"; MechanicalSoup = mechanicalsoup; # added 2021-06-01 diff --git a/third_party/nixpkgs/pkgs/top-level/python-packages.nix b/third_party/nixpkgs/pkgs/top-level/python-packages.nix index e705d50932..38a487cfcc 100644 --- a/third_party/nixpkgs/pkgs/top-level/python-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/python-packages.nix @@ -397,6 +397,8 @@ in { alarmdecoder = callPackage ../development/python-modules/alarmdecoder { }; + alectryon = callPackage ../development/python-modules/alectryon { }; + alembic = callPackage ../development/python-modules/alembic { }; algebraic-data-types = callPackage ../development/python-modules/algebraic-data-types { }; @@ -1427,6 +1429,8 @@ in { cherrypy = callPackage ../development/python-modules/cherrypy { }; + chess = callPackage ../development/python-modules/chess { }; + chevron = callPackage ../development/python-modules/chevron { }; chiabip158 = callPackage ../development/python-modules/chiabip158 { }; @@ -2782,6 +2786,8 @@ in { furl = callPackage ../development/python-modules/furl { }; + furo = callPackage ../development/python-modules/furo { }; + fuse = callPackage ../development/python-modules/fuse-python { inherit (pkgs) fuse; }; @@ -2995,6 +3001,8 @@ in { google-cloud-core = callPackage ../development/python-modules/google-cloud-core { }; + google-cloud-datacatalog = callPackage ../development/python-modules/google-cloud-datacatalog { }; + google-cloud-dataproc = callPackage ../development/python-modules/google-cloud-dataproc { }; google-cloud-datastore = callPackage ../development/python-modules/google-cloud-datastore { }; @@ -3162,7 +3170,7 @@ in { grip = callPackage ../development/python-modules/grip { }; - grpc_google_iam_v1 = callPackage ../development/python-modules/grpc_google_iam_v1 { }; + grpc-google-iam-v1 = callPackage ../development/python-modules/grpc-google-iam-v1 { }; grpcio = callPackage ../development/python-modules/grpcio { }; @@ -3577,6 +3585,8 @@ in { inotify-simple = callPackage ../development/python-modules/inotify-simple { }; + inotifyrecursive = callPackage ../development/python-modules/inotifyrecursive { }; + inquirer = callPackage ../development/python-modules/inquirer { }; intake = callPackage ../development/python-modules/intake { }; @@ -7305,6 +7315,8 @@ in { pyturbojpeg = callPackage ../development/python-modules/pyturbojpeg { }; + pytwitchapi = callPackage ../development/python-modules/pytwitchapi { }; + pytz = callPackage ../development/python-modules/pytz { }; pytzdata = callPackage ../development/python-modules/pytzdata { }; @@ -8477,6 +8489,8 @@ in { subliminal = callPackage ../development/python-modules/subliminal { }; + subprocess-tee = callPackage ../development/python-modules/subprocess-tee { }; + subunit = callPackage ../development/python-modules/subunit { inherit (pkgs) subunit cppunit check; }; @@ -8734,6 +8748,8 @@ in { tifffile = callPackage ../development/python-modules/tifffile { }; + tika = callPackage ../development/python-modules/tika { }; + tiledb = callPackage ../development/python-modules/tiledb { inherit (pkgs) tiledb; }; diff --git a/third_party/nixpkgs/pkgs/top-level/release.nix b/third_party/nixpkgs/pkgs/top-level/release.nix index dfb3b639b2..571d345d21 100644 --- a/third_party/nixpkgs/pkgs/top-level/release.nix +++ b/third_party/nixpkgs/pkgs/top-level/release.nix @@ -104,7 +104,7 @@ let jobs.nix-info.x86_64-linux jobs.nix-info-tested.x86_64-linux # Ensure that X11/GTK are in order. - jobs.thunderbird.x86_64-linux + jobs.thunderbird-unwrapped.x86_64-linux jobs.cachix.x86_64-linux /* diff --git a/third_party/nixpkgs/pkgs/top-level/stage.nix b/third_party/nixpkgs/pkgs/top-level/stage.nix index b2e717fda6..dc43bbec9d 100644 --- a/third_party/nixpkgs/pkgs/top-level/stage.nix +++ b/third_party/nixpkgs/pkgs/top-level/stage.nix @@ -239,6 +239,8 @@ let gnu = lib.systems.parse.abis.musl; gnueabi = lib.systems.parse.abis.musleabi; gnueabihf = lib.systems.parse.abis.musleabihf; + musleabi = lib.systems.parse.abis.musleabi; + musleabihf = lib.systems.parse.abis.musleabihf; }.${stdenv.hostPlatform.parsed.abi.name} or lib.systems.parse.abis.musl; };